From 62231cbaff43b88ca49d6f70530f32e9c08d5998 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Wed, 24 Jan 2018 03:28:40 +0100
Subject: [PATCH] Isolate single block at-rules

---
 src/css_composer/model/CssRule.js |  6 +--
 src/parser/model/ParserCss.js     | 67 ++++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/src/css_composer/model/CssRule.js b/src/css_composer/model/CssRule.js
index 23ae3490b..f0f63b923 100644
--- a/src/css_composer/model/CssRule.js
+++ b/src/css_composer/model/CssRule.js
@@ -28,7 +28,7 @@ module.exports = Backbone.Model.extend(Styleable).extend({
 
     // This particolar property is used only on at-rules, like 'page' or
     // 'font-face', where the block containes only style declarations
-    noSelectors: 0,
+    singleAtRule: 0,
 
     // If true, sets '!important' on all properties
     // You can use an array to specify properties to set important
@@ -91,10 +91,10 @@ module.exports = Backbone.Model.extend(Styleable).extend({
     const atRule = this.getAtRule();
     const style = this.styleToString(opts);
     const selectors = this.selectorsToString();
-    const noSelectors = this.get('noSelectors');
+    const singleAtRule = this.get('singleAtRule');
 
     if (selectors && style) {
-      result = noSelectors ? style : `${selectors}{${style}}`;
+      result = singleAtRule ? style : `${selectors}{${style}}`;
     }
 
     if (atRule && result) {
diff --git a/src/parser/model/ParserCss.js b/src/parser/model/ParserCss.js
index e2f544af6..c25e35dac 100644
--- a/src/parser/model/ParserCss.js
+++ b/src/parser/model/ParserCss.js
@@ -14,6 +14,7 @@ const atRules = {
   15: 'viewport'
 };
 const atRuleKeys = keys(atRules);
+const singleAtRules = ['5', '6', '11', '15'];
 
 module.exports = config => ({
   /**
@@ -31,7 +32,7 @@ module.exports = config => ({
    * //add: ['.test2 .test3']
    * //}
    */
-  parseSelector(str) {
+  parseSelector(str = '') {
     var add = [];
     var result = [];
     var sels = str.split(',');
@@ -71,6 +72,21 @@ module.exports = config => ({
     return style;
   },
 
+  /**
+   * Get the condition when possible
+   * @param  {CSSRule} node
+   * @return {string}
+   */
+  parseCondition(node) {
+    const condition =
+      node.conditionText ||
+      (node.media && node.media.mediaText) ||
+      node.name ||
+      node.selectorText ||
+      '';
+    return condition.trim();
+  },
+
   /**
    * Fetch data from node
    * @param  {StyleSheet|CSSRule} el
@@ -81,44 +97,44 @@ module.exports = config => ({
     var nodes = el.cssRules || [];
 
     for (var i = 0, len = nodes.length; i < len; i++) {
-      var node = nodes[i];
-      var sels = node.selectorText;
-      var selsAdd = [];
+      const node = nodes[i];
       const type = node.type.toString();
-
-      if (atRuleKeys.indexOf(type) >= 0) {
+      let singleAtRule = 0;
+      let atRuleType = '';
+      let condition = '';
+      let sels = node.selectorText;
+      const isSingleAtRule = singleAtRules.indexOf(type) >= 0;
+
+      // Check if the node is an at-rule
+      if (isSingleAtRule) {
+        singleAtRule = 1;
+        atRuleType = atRules[type];
+        condition = this.parseCondition(node);
         console.log(node);
+      } else if (atRuleKeys.indexOf(type) >= 0) {
         var subRules = this.parseNode(node);
-        const condition =
-          node.conditionText ||
-          (node.media && node.media.mediaText) ||
-          node.name ||
-          sels ||
-          '';
+        condition = this.parseCondition(node);
 
         for (var s = 0, lens = subRules.length; s < lens; s++) {
           var subRule = subRules[s];
-          subRule.mediaText = condition.trim();
+          subRule.mediaText = condition;
           subRule.atRuleType = atRules[type];
         }
-        console.log(subRules);
+
         result = result.concat(subRules);
       }
 
-      if (!sels) continue;
-
-      var selsParsed = this.parseSelector(sels);
-      sels = selsParsed.result;
-      selsAdd = selsParsed.add;
-
-      // Create the style object from the big one
+      if (!sels && !isSingleAtRule) continue;
       const style = this.parseStyle(node);
+      const selsParsed = this.parseSelector(sels);
+      const selsAdd = selsParsed.add;
+      sels = selsParsed.result;
 
-      var lastRule = '';
+      let lastRule;
       // For each group of selectors
       for (var k = 0, len3 = sels.length; k < len3; k++) {
         var selArr = sels[k];
-        var model = {};
+        var model = { singleAtRule, atRuleType };
 
         //Isolate state from selector
         var stateArr = selArr[selArr.length - 1].split(/:(.+)/);
@@ -142,12 +158,17 @@ module.exports = config => ({
           lastRule.selectorsAdd = selsAddStr;
         } else {
           result.push({
+            singleAtRule,
+            atRuleType,
             selectors: [],
             selectorsAdd: selsAddStr,
+            mediaText: condition,
             style
           });
         }
       }
+
+      console.log('Last PUSH', result[result.length - 1]);
     }
 
     return result;