Gonzales 3.0: Update space-between-declarations

Author: tonyganch

lib/options/space-between-declarations.js

@@ -1,37 +1,39 @@
+var gonzales = require('gonzales-pe');
+
 module.exports = (function() {
     function getDeclarationEnd(node, i) {
         for (;i < node.length; i++) {
-            if (!node[i + 1]) {
+            if (!node.get(i + 1) || typeof node.get(i + 1) === 'string') {
                 return 0;
-            } else if (node[i + 1][0] === 's') {
-                if (node[i + 1][1].indexOf('\n') > -1) {
-                    if (node[i + 2] && node[i + 2][0] === 'declaration') {
+            } else if (node.get(i + 1).is('s')) {
+                if (node.get(i + 1).content.indexOf('\n') > -1) {
+                    if (node.get(i + 2) && node.get(i + 2).is('declaration')) {
                         return i;
                     } else {
                         return 0;
                     }
-                } else if (node[i + 2] && node[i + 2][0] === 'commentML') {
-                    if (node[i + 3] && node[i + 3][0] === 'declaration') {
+                } else if (node.get(i + 2) && node.get(i + 2).is('commentML')) {
+                    if (node.get(i + 3) && node.get(i + 3).is('declaration')) {
                         return i + 2;
-                    } else if (node[i + 3] && node[i + 3][0] === 's') {
-                        if (node[i + 4] && node[i + 4][0] === 'declaration') {
+                    } else if (node.get(i + 3) && node.get(i + 3).is('s')) {
+                        if (node.get(i + 4) && node.get(i + 4).is('declaration')) {
                             return i + 2;
                         } else {
                             return 0;
                         }
                     } else {
                         return 0;
                     }
-                } else if (node[i + 2] && node[i + 2][0] === 'declaration') {
+                } else if (node.get(i + 2) && node.get(i + 2).is('declaration')) {
                     return i;
                 }
-            } else if (node[i + 1][0] === 'declaration') {
+            } else if (node.get(i + 1).is('declaration')) {
                 return i;
-            } else if (node[i + 1][0] === 'commentML') {
-                if (node[i + 2] && node[i + 2][0] === 'declaration') {
+            } else if (node.get(i + 1).is('commentML')) {
+                if (node.get(i + 2) && node.get(i + 2).is('declaration')) {
                     return i + 1;
-                } else if (node[i + 2] && node[i + 2][0] === 's') {
-                    if (node[i + 3] && node[i + 3][0] === 'declaration') {
+                } else if (node.get(i + 2) && node.get(i + 2).is('s')) {
+                    if (node.get(i + 3) && node.get(i + 3).is('declaration')) {
                         return i + 1;
                     }
                 } else {
@@ -58,18 +60,15 @@ module.exports = (function() {
         /**
          * Processes tree node.
          *
-         * @param {String} nodeType
          * @param {node} node
          */
-        process: function(nodeType, node) {
+        process: function(node) {
             var value = this.getValue('space-between-declarations');
 
             // TODO: Limit nodes to blocks, stylesheet, etc.
 
             for (var i = 0, l = node.length; i < l; i++) {
-                var currentNode = node[i];
-
-                if (currentNode[0] !== 'declDelim') continue;
+                if (!node.get(i) || !node.get(i).is('declDelim')) continue;
 
                 // Grom user's point of view "declaration" includes semicolons
                 // and comments placed on the same line.
@@ -81,13 +80,14 @@ module.exports = (function() {
                     i = declarationEnd;
                 }
 
-                var nextNode = node[i + 1];
-                if (nextNode[0] === 's') {
-                    nextNode[1] = value;
+                var nextNode = node.get(i + 1);
+                if (nextNode.is('s')) {
+                    nextNode.content = value;
                 } else {
                     i++;
                     l++;
-                    node.splice(i, 0, ['s', value]);
+                    var space = gonzales.createNode({ type: 's', content: value });
+                    node.insert(i, space);
                 }
             }
         }

test/options/space-between-declarations/test.js

@@ -1,4 +1,4 @@
-describe.skip('options/space-between-declarations:', function() {
+describe('options/space-between-declarations:', function() {
     it('Array value => should not change anything', function() {
         this.comb.configure({ 'space-between-declarations': ['', ' '] });
         this.shouldBeEqual('test.css');