v0.0.8

Author: mishanga

.csscomb.json

@@ -5,10 +5,27 @@
     ],
     "colon-space": true,
     "rule-indent": true,
+    "block-indent": true,
     "stick-brace": "\n",
     "strip-spaces": true,
     "always-semicolon": true,
     "sort-order": [
+        [
+            "font",
+            "font-family",
+            "font-size",
+            "font-weight",
+            "font-style",
+            "font-variant",
+            "font-size-adjust",
+            "font-stretch",
+            "font-effect",
+            "font-emphasize",
+            "font-emphasize-position",
+            "font-emphasize-style",
+            "font-smooth",
+            "line-height"
+        ],
         [
             "position",
             "z-index",
@@ -302,22 +319,6 @@
             "filter:progid:DXImageTransform.Microsoft.gradient",
             "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
             "text-shadow"
-        ],
-        [
-            "font",
-            "font-family",
-            "font-size",
-            "font-weight",
-            "font-style",
-            "font-variant",
-            "font-size-adjust",
-            "font-stretch",
-            "font-effect",
-            "font-emphasize",
-            "font-emphasize-position",
-            "font-emphasize-style",
-            "font-smooth",
-            "line-height"
         ]
     ]
 }

README.md

@@ -34,6 +34,8 @@ Example configuration:
 {
     "exclude": ["node_modules/**"],
     "colon-space": true,
+    "rule-indent": true,
+    "block-indent": true,
     "stick-brace": true,
     "strip-spaces": true,
     "always-semicolon": true
@@ -46,4 +48,6 @@ Run `npm test` for tests.
 
 ## Other projects
 * https://github.com/senchalabs/cssbeautify
-* http://www.codebeautifier.com/
+* http://www.codebeautifier.com
+* https://github.com/css/gonzales
+* https://github.com/css/csso

lib/csscomb.js

@@ -1,4 +1,4 @@
-var cssp = require('cssp');
+var gonzales = require('gonzales');
 var minimatch = require('minimatch');
 var vow = require('vow');
 var vfs = require('vow-fs');
@@ -11,11 +11,12 @@ var vfs = require('vow-fs');
 var Comb = function() {
     this._handlers;
     this._options = [
+        'always-semicolon',
         'strip-spaces',
         'stick-brace',
         'colon-space',
         'rule-indent',
-        'always-semicolon',
+        'block-indent',
         'sort-order'
     ];
     this._config = {};
@@ -54,23 +55,25 @@ Comb.prototype = {
      * @returns {Array}
      */
     processTree: function(tree) {
-        this.processNode(['tree', tree]);
+        this.processNode(['tree', tree], 0);
         return tree;
     },
 
     /**
      * Processes tree node.
      * @param {Array} node Tree node
+     * @param {Number} level Indent level
      */
     processNode: function(node, level) {
         var _this = this;
         node.forEach(function(node) {
             if (!Array.isArray(node)) return;
             var nodeType = node.shift();
             _this._handlers.forEach(function(handler) {
-                handler.process(nodeType, node);
+                handler.process(nodeType, node, level);
             });
             node.unshift(nodeType);
+            if (nodeType === 'atrulers') level++;
             _this.processNode(node, level);
         });
     },
@@ -82,12 +85,20 @@ Comb.prototype = {
      */
     processString: function(text, filename) {
         var tree;
+        var string = JSON.stringify;
+        if (typeof text === 'undefined') {
+            throw new Error('Undefined file content ' + filename + ': ' + string(text));
+        }
         try {
-            tree = this.processTree(cssp.parse(text));
+            tree = gonzales.srcToCSSP(text);
         } catch (e) {
             throw new Error('Parsing error at ' + filename + ': ' + e.message);
         }
-        return cssp.translate(tree);
+        if (typeof tree === 'undefined') {
+            throw new Error('Undefined tree at ' + filename + ': ' + string(text) + ' => ' + string(tree));
+        }
+        tree = this.processTree(tree);
+        return gonzales.csspToSrc(tree);
     },
 
     /**
@@ -117,18 +128,17 @@ Comb.prototype = {
         return vfs.listDir(path).then(function(filenames) {
             return vow.all(filenames.map(function(filename) {
                 var fullname = path + '/' + filename;
-                return vfs.stat(fullname).then(function(stat) {
-                    if (_this._shouldProcess(fullname)) {
+                if (_this._shouldProcess(fullname)) {
+                    return vfs.stat(fullname).then(function(stat) {
                         if (stat.isDirectory()) {
                             return _this.processDirectory(fullname);
                         } else if (fullname.match(/\.css$/)) {
                             return vow.when(_this.processFile(fullname)).then(function(errors) {
                                 if (errors) return errors;
                             });
                         }
-                    }
-                    return;
-                });
+                    });
+                }
             })).then(function(results) {
                 return [].concat.apply([], results);
             });

lib/options/block-indent.js

@@ -0,0 +1,73 @@
+module.exports = {
+
+    /**
+     * Sets handler value.
+     *
+     * @param {String|Number|Boolean} value Option value
+     * @returns {Object}
+     */
+    setValue: function(value) {
+        this._value = false;
+        if (value === true) value = 4;
+        if (typeof value === 'number' && value === Math.abs(Math.round(value))) value = new Array(value + 1).join(' ');
+        if (typeof value === 'string' && value.match(/^[ \t]*$/)) this._value = value;
+        if (!this._value) return;
+        return this;
+    },
+
+    /**
+     * Processes tree node.
+     * @param {String} nodeType
+     * @param {node} node
+     */
+    process: function(nodeType, node, level) {
+        // Add right space before closing brace
+        if (nodeType === 'atrulers' || nodeType === 'block') {
+            var value = '\n' + new Array(level + 1).join(this._value);
+            if (node[node.length - 1][0] === 's') node.pop();
+            node.push(['s', value]);
+        }
+
+        // Add right space before rule declaration
+        if (nodeType === 'stylesheet' || nodeType === 'atrulers') {
+            // Level up hack
+            if (nodeType === 'atrulers') level++;
+
+            // Prevent line break at file start
+            var isFirst;
+            if (nodeType === 'stylesheet') {
+                var first = node[0];
+                if (first[0] !== 's' || first[1].match('\n') === null) isFirst = true;
+            }
+
+            for (var i = 0; i < node.length; i++) {
+                var nodeItem = node[i];
+                if (nodeItem[0] === 'atruler' || nodeItem[0] === 'ruleset') {
+                    var value = (i < 2 && isFirst ? '' : '\n') + new Array(level + 1).join(this._value);
+                    isFirst = false;
+
+                    var space = node[i - 1];
+                    if (!space || space[0] !== 's') {
+                        space = ['s', ''];
+                        if (i) {
+                            var tail = node.splice(i);
+                            tail.unshift(space);
+                            Array.prototype.push.apply(node, tail);
+                            i++;
+                        }
+                    }
+                    space[1] = space[1].replace(/(\n)?([\t ]+)?$/, value);
+                }
+            }
+        }
+
+        // Add space before block opening brace
+        if (nodeType === 'simpleselector') {
+            var space = node[node.length - 1];
+            if (space[0] === 's' && space[1].match('\n')) {
+                space[1] += new Array(level + 1).join(this._value);
+            }
+        }
+    }
+
+};

lib/options/rule-indent.js

@@ -0,0 +1,48 @@
+module.exports = {
+
+    /**
+     * Sets handler value.
+     *
+     * @param {String|Number|Boolean} value Option value
+     * @returns {Object}
+     */
+    setValue: function(value) {
+        this._value = false;
+        if (value === true) value = 4;
+        if (typeof value === 'number' && value === Math.abs(Math.round(value))) value = new Array(value + 1).join(' ');
+        if (typeof value === 'string' && value.match(/^[ \t]*$/)) this._value = value;
+        if (!this._value) return;
+        return this;
+    },
+
+    /**
+     * Processes tree node.
+     * @param {String} nodeType
+     * @param {node} node
+     */
+    process: function(nodeType, node, level) {
+        if (nodeType === 'block') {
+            if (node[0][0] !== 's') {
+                node.unshift(['s', '']);
+            }
+            for (var i = 0; i < node.length; i++) {
+                var nodeItem = node[i];
+                if (nodeItem[0] === 'declaration') {
+                    var value = '\n' + new Array(level + 2).join(this._value);
+                    var space = node[i - 1];
+                    var tail;
+
+                    if (space[0] !== 's') {
+                        space = ['s', ''];
+                        tail = node.splice(i);
+                        tail.unshift(space);
+                        Array.prototype.push.apply(node, tail);
+                        i++;
+                    }
+                    space[1] = space[1].replace(/(\n)?([\t ]+)?$/, value);
+                }
+            };
+        }
+    }
+
+};

lib/options/stick-brace.js

@@ -20,10 +20,10 @@ module.exports = {
      * @param {node} node
      */
     process: function(nodeType, node) {
-        if (nodeType === 'selector') {
+        if (nodeType === 'selector' || nodeType === 'atruler') {
             for (var i = node.length; i--;) {
                 var nodeItem = node[i];
-                if (nodeItem[0] === 'simpleselector') {
+                if (nodeItem[0] === 'simpleselector' || nodeItem[0] === 'atrulerq') {
                     if (nodeItem[nodeItem.length - 1][0] === 's') nodeItem.pop();
                     nodeItem.push(['s', this._value]);
                     break;

package.json

@@ -1,7 +1,7 @@
 {
     "name": "csscomb",
     "description": "Tool for beautify CSS",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "homepage": "http://csscomb.com/",
     "author": "Mikhail Troshev <mishanga@yandex-team.ru>",
     "repository": "https://github.com/csscomb/csscomb.js",
@@ -22,7 +22,7 @@
     },
     "dependencies": {
         "commander": "1.1.1",
-        "cssp": "1.0.6",
+        "gonzales": "1.0.6",
         "minimatch": "0.2.12",
         "vow": "0.3.7",
         "vow-fs": "0.1.13"

test/block-indent.js

@@ -0,0 +1,44 @@
+var Comb = require('../lib/csscomb');
+var assert = require('assert');
+
+describe('options/block-indent', function() {
+    var comb;
+    beforeEach(function() {
+        comb = new Comb();
+    });
+    it('Invalid Number value should not change space after brace', function() {
+        comb.configure({ 'block-indent': 3.5 });
+        assert.equal(
+            comb.processString('a { color: red }'),
+            'a { color: red }'
+        );
+    });
+    it('Invalid String value should not change space after brace', function() {
+        comb.configure({ 'block-indent': 'foobar' });
+        assert.equal(
+            comb.processString('a { color: red }'),
+            'a { color: red }'
+        );
+    });
+    it('True Boolean value should set 4 spaces indent', function() {
+        comb.configure({ 'block-indent': true });
+        assert.equal(
+            comb.processString(' \n a { color: red }  @media all { .input__control { color: #000;\n}\n}'),
+            ' \na { color: red \n}\n@media all {\n    .input__control { color: #000;\n    }\n}'
+        );
+    });
+    it('Valid Number value should set equal space after brace', function() {
+        comb.configure({ 'block-indent': 3 });
+        assert.equal(
+            comb.processString(' a\n{ color: red }  @media all { .input__control\n{ color: #000;\n}\n}'),
+            'a\n{ color: red \n}\n@media all {\n   .input__control\n   { color: #000;\n   }\n}'
+        );
+    });
+    it('Valid String value should set equal space after brace', function() {
+        comb.configure({ 'block-indent': '\t' });
+        assert.equal(
+            comb.processString(' a { color: red }  @media all { .input__control\n{ color: #000;\n}\n}'),
+            'a { color: red \n}\n@media all {\n\t.input__control\n\t{ color: #000;\n\t}\n}'
+        );
+    });
+});