Update gonzales to v2.0.0-rc0

– Use new method names
– Allow processing of *.scss files
– Check syntax name (css or scss)
- Use one `include` node for both `@include` and `@extend`
– Update tests

Author: tonyganch

.jshint-groups.js

@@ -27,7 +27,7 @@ module.exports = {
         test: {
             options: {
                 node: true,
-                predef: ['describe', 'beforeEach', 'it']
+                predef: ['describe', 'beforeEach', 'afterEach', 'it']
             },
             includes: ['test/*.js']
         }

lib/csscomb.js

@@ -103,22 +103,23 @@ Comb.prototype = {
     /**
      * Process file provided with a string.
      * @param {String} text
+     * @param {String} [syntax] Syntax name (e.g. `scss`)
      * @param {String} [filename]
      */
-    processString: function(text, filename) {
+    processString: function(text, syntax, filename) {
         if (!text) return text;
         var tree;
         var string = JSON.stringify;
         try {
-            tree = gonzales.srcToCSSP(text);
+            tree = gonzales.cssToAST({ syntax: syntax, css: text });
         } catch (e) {
             throw new Error('Parsing error at ' + filename + ': ' + e.message);
         }
         if (typeof tree === 'undefined') {
             throw new Error('Undefined tree at ' + filename + ': ' + string(text) + ' => ' + string(tree));
         }
         tree = this.processTree(tree);
-        return gonzales.csspToSrc(tree);
+        return gonzales.astToCSS({ syntax: syntax, ast: tree });
     },
 
     /**
@@ -129,9 +130,11 @@ Comb.prototype = {
      */
     processFile: function(path) {
         var _this = this;
-        if (this._shouldProcess(path) && path.match(/\.css$/)) {
+        // TODO: Move extension check into `_shouldProcess` method
+        if (this._shouldProcess(path) && path.match(/\.[css, scss]$/)) {
             return vfs.read(path, 'utf8').then(function(data) {
-                var processedData = _this.processString(data, path);
+                var syntax = path.split('.').pop();
+                var processedData = _this.processString(data, syntax, path);
                 var changed = data !== processedData;
                 var lint = _this._lint;
 

lib/options/always-semicolon.js

@@ -29,7 +29,7 @@ module.exports = {
                 if (type === 'declaration') {
                     var space = [];
                     for (var j = value.length; j--;) {
-                        if (value[j][0] !== 's' && value[j][0] !== 'comment') break;
+                        if (['s', 'commentML', 'commentSL'].indexOf(value[j][0]) === -1) break;
                         space.unshift(value.splice(j)[0]);
                     }
                     node.splice.apply(node, [i + 1, 0, ['decldelim']].concat(space));

lib/options/remove-empty-rulesets.js

@@ -67,7 +67,7 @@ module.exports = {
     },
 
     _isDeclarationOrComment: function(node) {
-        return node[0] === 'declaration' || node[0] === 'comment';
+        return ['declaration', 'commentML', 'commentSL'].indexOf(node[0]) > -1;
     },
 
     _isRuleset: function(node) {

lib/options/sort-order.js

@@ -26,11 +26,10 @@ module.exports = {
      */
     process: function(nodeType, node) {
         // Types of nodes that can be sorted:
-        var NODES = ['atruleb', 'atruler', 'atrules', 'comment', 'declaration', 's'];
-        // Special @-rules that can be sorted:
-        var ATRULES = ['extend', 'import', 'include'];
+        var NODES = ['atruleb', 'atruler', 'atrules', 'commentML', 'commentSL',
+            'declaration', 's', 'include'];
         // Spaces and comments:
-        var SC = ['comment', 's'];
+        var SC = ['commentML', 'commentSL', 's'];
 
         var currentNode;
         // Sort order of properties:
@@ -64,10 +63,9 @@ module.exports = {
 
             for (; i < l; i++) {
                 currentNode = node[i];
-                // If there is no node, or it is nor spaces neither comment,
+                // If there is no node left,
                 // stop and do nothing with previously found spaces/comments:
-                if (!currentNode ||
-                    NODES.indexOf(currentNode[0]) === -1) {
+                if (!currentNode) {
                     return false;
                 }
 
@@ -104,7 +102,7 @@ module.exports = {
                 // If there is no node, or it is nor spaces neither comment, stop:
                 if (!currentNode || SC.indexOf(currentNode[0]) === -1) break;
 
-                if (currentNode[0] === 'comment') {
+                if (['commentML', 'commentSL'].indexOf(currentNode[0]) > -1) {
                     sc.push(currentNode);
                     d.push(i + 1);
                     continue;
@@ -166,15 +164,15 @@ 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[0] === 'decldelim') {
+            if (currentNode && nextNode && nextNode[0] === 'decldelim') {
                 extendedNode.delim.push(nextNode);
                 deleted.push(i + 1);
                 i++;
             }
 
             // Save spaces and comments which follow right after the declaration
             // and mark them for removing from parent node:
-            extendedNode.sc1 = checkSC1(i);
+            extendedNode.sc1 = checkSC1();
 
             return extendedNode;
         };
@@ -207,17 +205,21 @@ module.exports = {
             // with a valid property (e.g. `color` or `$width`).
             // If not, proceed with the next node:
             propertyName = null;
-            for (j = 1, nl = node[i].length; j < nl; j++) {
-                currentNode = node[i][j];
-                if (currentNode[0] === 'property') {
-                    propertyName = currentNode[1][0] === 'variable' ?
-                        '$variable' : currentNode[1][1];
-                    break;
-                } else if (currentNode[0] === 'atkeyword') {
-                    if (ATRULES.indexOf(currentNode[1][1]) > -1) {
-                        propertyName = '$' + currentNode[1][1];
+            // Look for includes:
+            if (node[i][0] === 'include') {
+                propertyName = '$include';
+            } else {
+                for (j = 1, nl = node[i].length; j < nl; j++) {
+                    currentNode = node[i][j];
+                    if (currentNode[0] === 'property') {
+                        propertyName = currentNode[1][0] === 'variable' ?
+                            '$variable' : currentNode[1][1];
+                        break;
+                    } else if (currentNode[0] === 'atkeyword' &&
+                        currentNode[1][1] === 'import') { // Look for imports
+                        propertyName = '$import';
+                        break;
                     }
-                    break;
                 }
             }
 

package.json

@@ -40,7 +40,7 @@
     },
     "dependencies": {
         "commander": "2.0.0",
-        "gonzales": "1.0.7",
+        "gonzales-pe": "2.0.0-rc0",
         "minimatch": "0.2.12",
         "vow": "0.3.11",
         "vow-fs": "0.2.3"