Update names of node types

tonyganch · tonyganch · commit 6960b0328297 · 2015-02-02T11:34:50.000+03:00
diff --git a/lib/options/always-semicolon.js b/lib/options/always-semicolon.js
@@ -21,7 +21,7 @@ module.exports = {
             var nodeWithoutSemicolon;
 
             // Skip nodes that already have `;` at the end:
-            if (currentNodeType === 'declDelim') break;
+            if (currentNodeType === 'declarationDelimiter') break;
 
             // Add semicolon only after declarations and includes.
             // If current node is include, insert semicolon right into it.
@@ -50,7 +50,7 @@ module.exports = {
                 if (lastNode === 'block') {
                     isBlock = true;
                     break;
-                } else if (['s', 'commentML', 'commentSL'].indexOf(lastNode) === -1) break;
+                } else if (['space', 'multilineComment', 'singlelineComment'].indexOf(lastNode) === -1) break;
 
                 space.unshift(nodeWithoutSemicolon.content[j]);
             }
@@ -60,7 +60,7 @@ module.exports = {
             // Temporarily remove last spaces and comments and insert `;`
             // before them:
             nodeWithoutSemicolon.content.splice(nodeWithoutSemicolon.content.length - space.length);
-            var declDelim = gonzales.createNode({ type: 'declDelim', content: ';' });
+            var declDelim = gonzales.createNode({ type: 'declarationDelimiter', content: ';' });
             var args = [i + 1, 0, declDelim].concat(space);
             node.splice.apply(node, args);
             break;
diff --git a/lib/options/block-indent.js b/lib/options/block-indent.js
@@ -10,7 +10,7 @@ module.exports = (function() {
         for (i = node.length; i--;) {
             whitespaceNode = node.get(i);
 
-            if (!whitespaceNode.is('s')) continue;
+            if (!whitespaceNode.is('space')) continue;
 
             spaces = whitespaceNode.content.replace(/\n[ \t]+/gm, '\n');
 
@@ -34,7 +34,7 @@ module.exports = (function() {
                 }
 
                 // Continue only with space nodes inside {...}:
-                if (syntax !== 'sass' && level !== 0 && n.is('s')) {
+                if (syntax !== 'sass' && level !== 0 && n.is('space')) {
                     processSpaceNode(n, level, value);
                 }
 
@@ -55,7 +55,7 @@ module.exports = (function() {
         for (i = node.length; i--;) {
             whitespaceNode = node.get(i);
 
-            if (!whitespaceNode.is('s')) continue;
+            if (!whitespaceNode.is('space')) continue;
 
             if (whitespaceNode.content === '\n') continue;
 
diff --git a/lib/options/color-case.js b/lib/options/color-case.js
@@ -11,7 +11,7 @@ module.exports = {
      */
     process: function(node) {
         var value = this.getValue('color-case');
-        if (node.type === 'vhash') {
+        if (node.type === 'color') {
             if (value === 'lower') {
                 node.content = node.content.toLowerCase();
             } else if (value === 'upper') {
diff --git a/lib/options/color-shorthand.js b/lib/options/color-shorthand.js
@@ -10,7 +10,7 @@ module.exports = {
      * @param {node} node
      */
     process: function(node) {
-        if (node.type === 'vhash') {
+        if (node.type === 'color') {
             if (this.getValue('color-shorthand')) {
                 node.content = node.content.replace(/(\w)\1(\w)\2(\w)\3/i, '$1$2$3');
             } else {
diff --git a/lib/options/element-case.js b/lib/options/element-case.js
@@ -15,7 +15,7 @@ module.exports = {
 
         for (var x = node.content.length; x--;) {
             var selector = node.content[x];
-            if (selector.type !== 'simpleselector') continue;
+            if (selector.type !== 'simpleSelector') continue;
 
             for (var i = selector.content.length; i--;) {
                 var simpleselector = selector.content[i];
diff --git a/lib/options/eof-newline.js b/lib/options/eof-newline.js
@@ -12,8 +12,8 @@ module.exports = {
     process: function(node) {
         if (node.type === 'stylesheet') {
             var lastChild = node.content[node.content.length - 1];
-            if (lastChild.type !== 's') {
-                lastChild = { type: 's', content: '' };
+            if (lastChild.type !== 'space') {
+                lastChild = { type: 'space', content: '' };
                 node.content.push(lastChild);
             }
             lastChild.content = lastChild.content.replace(/\n$/, '');
diff --git a/lib/options/remove-empty-rulesets.js b/lib/options/remove-empty-rulesets.js
@@ -57,7 +57,7 @@ module.exports = (function() {
 
         var isEmpty = true;
         node.forEach(function(childNode) {
-            if (childNode.type !== 's') isEmpty = false;
+            if (childNode.type !== 'space') isEmpty = false;
         });
         return isEmpty;
     }
@@ -67,7 +67,7 @@ module.exports = (function() {
     }
 
     function isWhitespace(node) {
-        return node.type === 's';
+        return node.type === 'space';
     }
 
 
diff --git a/lib/options/sort-order.js b/lib/options/sort-order.js
@@ -40,10 +40,10 @@ module.exports = {
     process: function(node) {
         var _this = this;
         // Types of nodes that can be sorted:
-        var NODES = ['atruleb', 'atruler', 'atrules', 'commentML', 'commentSL',
-            'declaration', 's', 'include'];
+        var NODES = ['atruleb', 'atruler', 'atrules', 'multilineComment', 'singlelineComment',
+            'declaration', 'space', 'include'];
         // Spaces and comments:
-        var SC = ['commentML', 'commentSL', 's'];
+        var SC = ['multilineComment', 'singlelineComment', 'space'];
 
         var currentNode;
         // Sort order of properties:
@@ -129,7 +129,7 @@ module.exports = {
                 // If there is no node, or it is nor spaces neither comment, stop:
                 if (!currentNode || SC.indexOf(currentNode.type) === -1) break;
 
-                if (currentNode.is('commentML') || currentNode.is('commentSL')) {
+                if (currentNode.is('multilineComment') || currentNode.is('singlelineComment')) {
                     sc.push(currentNode);
                     d.push(i + 1);
                     continue;
@@ -204,7 +204,7 @@ module.exports = {
 
             // If there is `;` right after the declaration, save it with the
             // declaration and mark it for removing from parent node:
-            if (currentNode && nextNode && nextNode.is('declDelim')) {
+            if (currentNode && nextNode && nextNode.is('declarationDelimiter')) {
                 extendedNode.delim.push(nextNode);
                 deleted.push(i + 1);
                 i++;
@@ -358,7 +358,7 @@ module.exports = {
 
                 // Divide declarations from different groups with an empty line:
                 if (prevNode && currentNode.groupIndex > prevNode.groupIndex) {
-                    if (sc0[0] && sc0[0].is('s') &&
+                    if (sc0[0] && sc0[0].is('space') &&
                        (this.syntax === 'sass' ||
                         sc0[0].content.match(/\n/g) &&
                         sc0[0].content.match(/\n/g).length < 2)) {
@@ -371,7 +371,7 @@ module.exports = {
                 }
                 if (currentNode.delim.length > 0) {
                     var delim = this.syntax === 'sass' ? '\n' : ';';
-                    var declDelim = gonzales.createNode({ type: 'declDelim', content: delim });
+                    var declDelim = gonzales.createNode({ type: 'declarationDelimiter', content: delim });
                     node.content.unshift(declDelim);
                 }
                 for (j = 0, nl = sc1.length; j < nl; j++) {
diff --git a/lib/options/space-after-colon.js b/lib/options/space-after-colon.js
@@ -23,14 +23,14 @@ module.exports = {
         var value = this.getValue('space-after-colon');
 
         for (var i = node.content.length; i--;) {
-            if (!node.content[i].is('propertyDelim')) continue;
+            if (!node.content[i].is('propertyDelimiter')) continue;
 
             if (this.getSyntax() === 'sass' && !node.content[i - 1]) break;
 
             // Remove any spaces after colon:
-            if (node.content[i + 1].is('s')) node.content.splice(i + 1, 1);
+            if (node.content[i + 1].is('space')) node.content.splice(i + 1, 1);
             // If the value set in config is not empty, add spaces:
-            var space = gonzales.createNode({ type: 's', content: value });
+            var space = gonzales.createNode({ type: 'space', content: value });
             if (value !== '') node.content.splice(i + 1, 0, space);
 
             break;
diff --git a/lib/options/space-after-combinator.js b/lib/options/space-after-combinator.js
@@ -27,10 +27,10 @@ module.exports = {
             for (var j = subSelector.content.length; j--;) {
                 if (!subSelector.content[j].is('combinator')) continue;
 
-                if (subSelector.content[j + 1].is('s')) {
+                if (subSelector.content[j + 1].is('space')) {
                     subSelector.content[j + 1].content = value;
                 } else {
-                    var space = gonzales.createNode({ type: 's', content: value });
+                    var space = gonzales.createNode({ type: 'space', content: value });
                     subSelector.content.splice(j + 1, 0, space);
                 }
             }
diff --git a/lib/options/space-after-opening-brace.js b/lib/options/space-after-opening-brace.js
@@ -23,10 +23,10 @@ module.exports = {
 
         var value = this.getValue('space-after-opening-brace');
 
-        if (node.content[0].is('s')) {
+        if (node.content[0].is('space')) {
             node.content[0].content = value;
         } else if (value !== '') {
-            var space = gonzales.createNode({ type: 's', content: value });
+            var space = gonzales.createNode({ type: 'space', content: value });
             node.content.unshift(space);
         }
     },
@@ -40,7 +40,7 @@ module.exports = {
     detect: function(nodeType, node) {
         if (nodeType !== 'block' && nodeType !== 'atrulers') return;
 
-        if (node[0][0] === 's') {
+        if (node[0][0] === 'space') {
             return node[0][1];
         } else {
             return '';
diff --git a/lib/options/space-after-selector-delimiter.js b/lib/options/space-after-selector-delimiter.js
@@ -23,14 +23,14 @@ module.exports = {
         var value = this.getValue('space-after-selector-delimiter');
 
         for (var i = node.content.length; i--;) {
-            if (!node.content[i].is('delim')) continue;
+            if (!node.content[i].is('delimiter')) continue;
 
-            if (node.content[i + 1].is('s')) {
+            if (node.content[i + 1].is('space')) {
                 node.content[i + 1].content = value;
-            } else if (node.content[i + 1].content[0].is('s')) {
+            } else if (node.content[i + 1].content[0].is('space')) {
                 node.content[i + 1].content[0].content = value;
             } else {
-                var space = gonzales.createNode({ type: 's', content: value });
+                var space = gonzales.createNode({ type: 'space', content: value });
                 node.content[i + 1].content.unshift(space);
             }
         }
diff --git a/lib/options/space-before-closing-brace.js b/lib/options/space-before-closing-brace.js
@@ -7,7 +7,7 @@ module.exports = (function() {
         if (!lastNode || !lastNode.content) return null;
 
         if (lastNode.is('block')) return null;
-        if (lastNode.is('s')) return lastNode;
+        if (lastNode.is('space')) return lastNode;
 
         return getLastWhitespaceNode(lastNode);
     }
@@ -57,7 +57,7 @@ module.exports = (function() {
                         if (whitespaceNode) {
                             whitespaceNode.content = value;
                         } else if (value !== '') {
-                            var space = gonzales.createNode({ type: 's', content: value });
+                            var space = gonzales.createNode({ type: 'space', content: value });
                             if (Array.isArray(node.content))
                                 node.content.push(space);
                         }
diff --git a/lib/options/space-before-colon.js b/lib/options/space-before-colon.js
@@ -23,17 +23,17 @@ module.exports = {
         var value = this.getValue('space-before-colon');
 
         for (var i = node.content.length; i--;) {
-            if (!node.content[i].is('propertyDelim')) continue;
+            if (!node.content[i].is('propertyDelimiter')) continue;
 
             if (this.getSyntax() === 'sass' && !node.content[i - 1]) break;
 
             // Remove any spaces before colon:
-            if (node.content[i - 1].is('s')) {
+            if (node.content[i - 1].is('space')) {
                 node.content.splice(i - 1, 1);
                 i--;
             }
             // If the value set in config is not empty, add spaces:
-            var space = gonzales.createNode({ type: 's', content: value });
+            var space = gonzales.createNode({ type: 'space', content: value });
             if (value !== '') node.content.splice(i, 0, space);
 
             break;
diff --git a/lib/options/space-before-combinator.js b/lib/options/space-before-combinator.js
@@ -26,10 +26,10 @@ module.exports = {
             var subSelector = node.get(i);
             for (var j = subSelector.length; j--;) {
                 if (!subSelector.get(j).is('combinator')) continue;
-                if (subSelector.get(j - 1).is('s')) {
+                if (subSelector.get(j - 1).is('space')) {
                     subSelector.get(j - 1).content = value;
                 } else {
-                    var space = gonzales.createNode({ type: 's', content: value });
+                    var space = gonzales.createNode({ type: 'space', content: value });
                     subSelector.insert(j, space);
                 }
             }
diff --git a/lib/options/space-before-opening-brace.js b/lib/options/space-before-opening-brace.js
@@ -10,7 +10,7 @@ module.exports = (function() {
      */
     function getLastWhitespaceNode(node) {
         if (typeof node !== 'object') return;
-        if (node.is('s')) return node;
+        if (node.is('space')) return node;
 
         return getLastWhitespaceNode(node.last());
     }
@@ -40,7 +40,7 @@ module.exports = (function() {
                 if (!node.get(i) || typeof node.get(i) === 'string') continue;
 
                 try {
-                    node.get(i).is('s');
+                    node.get(i).is('space');
                 } catch (e) {
                     console.log(node);
                 }
@@ -57,7 +57,7 @@ module.exports = (function() {
                 if (whitespaceNode) {
                     whitespaceNode.content = value;
                 } else if (value !== '') {
-                    var space = gonzales.createNode({ type: 's', content: value });
+                    var space = gonzales.createNode({ type: 'space', content: value });
                     if (node.get(i - 1).is('atrulerq')) {
                         node.get(i - 1).content.push(space);
                     } else {
diff --git a/lib/options/space-before-selector-delimiter.js b/lib/options/space-before-selector-delimiter.js
@@ -22,12 +22,12 @@ module.exports = {
 
         var value = this.getValue('space-before-selector-delimiter');
 
-        node.forEach('delim', function(delim, i) {
+        node.forEach('delimiter', function(delim, i) {
             var previousNode = node.get(i - 1);
-            if (previousNode.last().is('s')) {
+            if (previousNode.last().is('space')) {
                 previousNode.last().content = value;
             } else {
-                var space = gonzales.createNode({ type: 's', content: value });
+                var space = gonzales.createNode({ type: 'space', content: value });
                 previousNode.content.push(space);
             }
         });
diff --git a/lib/options/space-between-declarations.js b/lib/options/space-between-declarations.js
@@ -5,17 +5,17 @@ module.exports = (function() {
         for (;i < node.length; i++) {
             if (!node.get(i + 1) || typeof node.get(i + 1) === 'string') {
                 return 0;
-            } else if (node.get(i + 1).is('s')) {
+            } else if (node.get(i + 1).is('space')) {
                 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.get(i + 2) && node.get(i + 2).is('commentML')) {
+                } else if (node.get(i + 2) && node.get(i + 2).is('multilineComment')) {
                     if (node.get(i + 3) && node.get(i + 3).is('declaration')) {
                         return i + 2;
-                    } else if (node.get(i + 3) && node.get(i + 3).is('s')) {
+                    } else if (node.get(i + 3) && node.get(i + 3).is('space')) {
                         if (node.get(i + 4) && node.get(i + 4).is('declaration')) {
                             return i + 2;
                         } else {
@@ -29,10 +29,10 @@ module.exports = (function() {
                 }
             } else if (node.get(i + 1).is('declaration')) {
                 return i;
-            } else if (node.get(i + 1).is('commentML')) {
+            } else if (node.get(i + 1).is('multilineComment')) {
                 if (node.get(i + 2) && node.get(i + 2).is('declaration')) {
                     return i + 1;
-                } else if (node.get(i + 2) && node.get(i + 2).is('s')) {
+                } else if (node.get(i + 2) && node.get(i + 2).is('space')) {
                     if (node.get(i + 3) && node.get(i + 3).is('declaration')) {
                         return i + 1;
                     }
@@ -68,7 +68,7 @@ module.exports = (function() {
             // TODO: Limit nodes to blocks, stylesheet, etc.
 
             for (var i = 0, l = node.length; i < l; i++) {
-                if (!node.get(i) || !node.get(i).is('declDelim')) continue;
+                if (!node.get(i) || !node.get(i).is('declarationDelimiter')) continue;
 
                 // Grom user's point of view "declaration" includes semicolons
                 // and comments placed on the same line.
@@ -81,12 +81,12 @@ module.exports = (function() {
                 }
 
                 var nextNode = node.get(i + 1);
-                if (nextNode.is('s')) {
+                if (nextNode.is('space')) {
                     nextNode.content = value;
                 } else {
                     i++;
                     l++;
-                    var space = gonzales.createNode({ type: 's', content: value });
+                    var space = gonzales.createNode({ type: 'space', content: value });
                     node.insert(i, space);
                 }
             }
diff --git a/lib/options/strip-spaces.js b/lib/options/strip-spaces.js
diff --git a/lib/options/tab-size.js b/lib/options/tab-size.js
diff --git a/lib/options/vendor-prefix-align.js b/lib/options/vendor-prefix-align.js

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ module.exports = (function() {`
`57`	`57`
`58`	`58`	`var isEmpty = true;`
`59`	`59`	`node.forEach(function(childNode) {`
`60`		`- if (childNode.type !== 's') isEmpty = false;`
	`60`	`+ if (childNode.type !== 'space') isEmpty = false;`
`61`	`61`	`});`
`62`	`62`	`return isEmpty;`
`63`	`63`	`}`
`@@ -67,7 +67,7 @@ module.exports = (function() {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`function isWhitespace(node) {`
`70`		`- return node.type === 's';`
	`70`	`+ return node.type === 'space';`
`71`	`71`	`}`
`72`	`72`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@ module.exports = {`
`27`	`27`	`for (var j = subSelector.content.length; j--;) {`
`28`	`28`	`if (!subSelector.content[j].is('combinator')) continue;`
`29`	`29`
`30`		`- if (subSelector.content[j + 1].is('s')) {`
	`30`	`+ if (subSelector.content[j + 1].is('space')) {`
`31`	`31`	`subSelector.content[j + 1].content = value;`
`32`	`32`	`} else {`
`33`		`- var space = gonzales.createNode({ type: 's', content: value });`
	`33`	`+ var space = gonzales.createNode({ type: 'space', content: value });`
`34`	`34`	`subSelector.content.splice(j + 1, 0, space);`
`35`	`35`	`}`
`36`	`36`	`}`