Gonzales 3.0: Update remove-empty-rulesets

Author: tonyganch

lib/options/remove-empty-rulesets.js

@@ -1,32 +1,30 @@
 module.exports = (function() {
-    function processStylesheetContent(nodeContent) {
-        removeEmptyRulesets(nodeContent);
-        mergeAdjacentWhitespace(nodeContent);
+    function processStylesheetContent(node) {
+        removeEmptyRulesets(node);
+        mergeAdjacentWhitespace(node);
     }
 
-    function removeEmptyRulesets(nodeContent) {
-        var i = nodeContent.length;
+    function removeEmptyRulesets(stylesheet) {
+        var i = stylesheet.content.length;
         // Loop through node and try to find a ruleset:
         while (i--) {
-            var node = nodeContent[i];
+            var node = stylesheet.content[i];
             if (!isRuleset(node)) continue;
             // If a ruleset is found, try to find its nested rulesets and remove
             // all empty ones:
-            var j = node.length;
+            var j = node.content.length;
             while (j--) {
                 // Nested rulesets are located inside blocks, that's why look
                 // for blocks only:
-                var blockNode = node[j];
-                if (blockNode[0] !== 'block') continue;
-                blockNode.shift();
+                var blockNode = node.content[j];
+                if (blockNode.type !== 'block') continue;
                 processStylesheetContent(blockNode);
-                blockNode.unshift('block');
-                node[j] = blockNode;
+                node.content[j] = blockNode;
             }
             // If after removing all empty nested rulesets the parent has also
             // become empty, remove it too:
             if (isEmptyRuleset(node)) {
-                nodeContent.splice(i, 1);
+                stylesheet.content.splice(i, 1);
             }
         }
     }
@@ -37,42 +35,41 @@ module.exports = (function() {
      * To ensure correctness of further processing we should merge such nodes into one.
      * [space, space] => [space]
      */
-    function mergeAdjacentWhitespace(nodeContent) {
-        var i = nodeContent.length - 1;
+    function mergeAdjacentWhitespace(node) {
+        var i = node.content.length - 1;
         while (i-- > 0) {
-            if (isWhitespace(nodeContent[i]) && isWhitespace(nodeContent[i + 1])) {
-                nodeContent[i][1] += nodeContent[i + 1][1];
-                nodeContent.splice(i + 1, 1);
+            if (isWhitespace(node.content[i]) && isWhitespace(node.content[i + 1])) {
+                node.content[i].content += node.content[i + 1].content;
+                node.content.splice(i + 1, 1);
             }
         }
     }
 
     function isEmptyRuleset(ruleset) {
-        return ruleset.filter(isBlock).every(isEmptyBlock, this);
+        return isEmptyBlock(ruleset.first('block'));
     }
 
     /**
      * Block is considered empty when it has nothing but spaces.
      */
     function isEmptyBlock(node) {
-        return node.length === 1 || !node.some(isNotWhitespace);
-    }
+        if (!node.content.length) return true;
 
-    function isRuleset(node) {
-        return node[0] === 'ruleset';
+        var isEmpty = true;
+        node.forEach(function(childNode) {
+            if (childNode.type !== 's') isEmpty = false;
+        });
+        return isEmpty;
     }
 
-    function isBlock(node) {
-        return node[0] === 'block';
+    function isRuleset(node) {
+        return node.type === 'ruleset';
     }
 
     function isWhitespace(node) {
-        return node[0] === 's';
+        return node.type === 's';
     }
 
-    function isNotWhitespace(node) {
-        return typeof node === 'object' && node[0] !== 's';
-    }
 
     return {
         name: 'remove-empty-rulesets',
@@ -86,12 +83,11 @@ module.exports = (function() {
         /**
          * Remove rulesets with no declarations.
          *
-         * @param {String} nodeType
-         * @param {Array} nodeContent
+         * @param {String} node
          */
-        process: function(nodeType, nodeContent) {
-            if (nodeType === 'stylesheet') {
-                processStylesheetContent(nodeContent);
+        process: function(node) {
+            if (node.type === 'stylesheet') {
+                processStylesheetContent(node);
             }
         },
 

test/options/remove-empty-rulesets-less/test.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
 
-describe.skip('options/remove-empty-rulesets (less):', function() {
+describe('options/remove-empty-rulesets (less):', function() {
     it('Issue 201. Test 1', function() {
         this.comb.configure({ 'remove-empty-rulesets': true });
         this.shouldBeEqual('1.less', '1.expected.less');

test/options/remove-empty-rulesets-scss/test.js

@@ -1,4 +1,4 @@
-describe.skip('options/remove-empty-rulesets (scss)', function() {
+describe('options/remove-empty-rulesets (scss)', function() {
     beforeEach(function() {
         this.comb.configure({ 'remove-empty-rulesets': true });
     });

test/options/remove-empty-rulesets/test.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
 
-describe.skip('options/remove-empty-rulesets', function() {
+describe('options/remove-empty-rulesets', function() {
     it('Configured with invalid value, should not remove empty ruleset', function() {
         this.comb.configure({ 'remove-empty-rulesets': 'foobar' });
         assert.equal(this.comb.processString('a { width: 10px; } b {}'), 'a { width: 10px; } b {}');
@@ -28,7 +28,7 @@ describe.skip('options/remove-empty-rulesets', function() {
         });
     });
 
-    describe('detecting the value', function() {
+    describe.skip('detecting the value', function() {
         it('Should detect this option set to `true`', function() {
             this.shouldDetect(
                 ['remove-empty-rulesets'],