add ruleset support. Closes reworkcss#1

Author: tj

examples/example.css

@@ -1,15 +1,4 @@
 
-@charset "utf-8"
-
-@import "foo.css"
-
-body
-  padding: 50px
-  background: black
-  color: white
-
-// just an example comment
-
 button
   // moar comments
   // hurrrrrrrr
@@ -27,4 +16,4 @@ button
 
   button
     border-radius: 0
-    width: 100%
+    width: 100%

lib/compiler.js

@@ -15,7 +15,7 @@ var debug = require('debug')('css-whitespace:parser')
  */
 
 module.exports = function(node){
-  var indents = 1;
+  var indents = 0;
   var rules = [];
   var stash = [];
   var level = 0;
@@ -36,9 +36,9 @@ module.exports = function(node){
       case 'root':
         return root(node);
       case 'rule':
-        if ('@' == node[1][0]) ++nest;
+        if ('@' == node[1][0][0]) ++nest;
         var ret = rule(node);
-        if ('@' == node[1][0]) --nest;
+        if ('@' == node[1][0][0]) --nest;
         return ret;
       case 'block':
         ++level;
@@ -84,27 +84,33 @@ module.exports = function(node){
   function rule(node) {
     var rule = node[1];
     var block = node[2];
+    var buf;
 
-    if (!block) return rule + ';';
+    // TODO: tests
+    if (!block) return rule.join(',\n') + ';';
 
     rules.push(node);
 
-    if ('@' == rule[0]) {
-      var buf = join(rules) + '{\n'
+    if ('@' == rule[0][0]) {
+      buf = join(rules) + '{\n';
       visit(block);
       buf += stash.join('\n');
       buf += '\n}';
       stash = [];
     } else if (nest) {
+      indents = 1;
+      buf = join(rules, 1) + ' {\n';
       indents = 2;
-      var buf = '  ' + join(rules, 1) + '{\n';
       buf += visit(block);
       buf += '  }';
       indents = 1;
     } else {
-      var buf = join(rules) + '{\n'
-        + visit(block)
-        + '}';
+      indents = 0;
+      buf = join(rules) + '{\n'
+      indents = 1;
+      buf += visit(block);
+      indents = 0;
+      buf += '}';
     }
 
     if (rules.length > 1) {
@@ -133,6 +139,42 @@ module.exports = function(node){
     return buf.join('\n\n');
   }
 
+  /**
+   * Join the given rules.
+   *
+   * @param {Array} rules
+   * @param {Number} [offset]
+   * @return {String}
+   * @api private
+   */
+  
+  function join(rules, offset) {
+    offset = offset || 0;
+    var selectors = [];
+    var buf = [];
+    var curr;
+    var next;
+  
+    function compile(rules, i) {
+      if (offset != i) {
+        rules[i][1].forEach(function(selector){
+          buf.unshift(selector);
+          compile(rules, i - 1);
+          buf.shift();
+        });
+      } else {
+        rules[i][1].forEach(function(selector){
+          var tail = buf.join(' ');
+          selectors.push(indent() + selector + ' ' + tail);
+        });
+      }
+    }
+  
+    compile(rules, rules.length - 1);
+  
+    return selectors.join(',\n');
+  }
+
   /**
    * Return indent.
    */
@@ -142,31 +184,6 @@ module.exports = function(node){
   }
 };
 
-/**
- * Join the given rules.
- *
- * @param {Array} rules
- * @param {Number} [offset]
- * @return {String}
- * @api private
- */
-
-function join(rules, offset) {
-  var buf = '';
-  var curr;
-  var next;
-
-  for (var i = offset || 0; i < rules.length; ++i) {
-    curr = rules[i];
-    next = rules[i + 1];
-    buf += curr[1];
-    if (next && next.parent) continue;
-    buf += ' ';
-  }
-
-  return buf;
-}
-
 /**
  * Check if `block` has properties.
  *

lib/lexer.js

@@ -125,7 +125,7 @@ module.exports = function(str) {
   }
 
   /**
-   * &<val>
+   * Parent reference.
    */
 
   function parent() {
@@ -138,7 +138,7 @@ module.exports = function(str) {
   }
 
   /**
-   * <prop>: <val>
+   * Property.
    */
 
   function prop() {
@@ -149,14 +149,14 @@ module.exports = function(str) {
   }
 
   /**
-   * (^ newline)+
+   * Rule.
    */
 
   function rule() {
-    var line = str.match(/^[^\n]+/);
-    if (!line) return;
-    line = line[0];
-    str = str.slice(line.length);
-    return ['rule', line];
+    var m = str.match(/^([^\n,]+, *\n|[^\n]+)+/);
+    if (!m) return;
+    str = str.slice(m[0].length);
+    m = m[0].split(/\s*,\s*/);
+    return ['rule', m];
   }
 }

lib/parser.js

@@ -91,7 +91,7 @@ module.exports = function(str) {
       next();
       while (!is('outdent')) {
         var tok = next();
-        prop[2] += ' ' + tok[1];
+        prop[2] += ' ' + tok[1].join(', ');
       }
       expect('outdent');
     }

test/cases/combinations.css

@@ -0,0 +1,23 @@
+
+ol,
+ul
+  margin: 0
+  li
+    a
+      color: blue
+
+@media print
+  .content
+    ul
+      li.first,
+      li.last,
+      li.odd
+        display: none
+  body
+    padding: 0
+  
+  ul,
+  ol
+    li
+      a
+        color: blue

test/cases/combinations.out.css

@@ -0,0 +1,24 @@
+ol ,
+ul {
+  margin: 0;
+}
+
+ol li a,
+ul li a{
+  color: blue;
+}
+
+@media print {
+  .content ul li.first,
+  .content ul li.last,
+  .content ul li.odd {
+    display: none;
+  }
+  body  {
+    padding: 0;
+  }
+  ul li a,
+  ol li a {
+    color: blue;
+  }
+}

test/cases/comments.css

@@ -0,0 +1,11 @@
+
+// foo
+button
+  // bar
+  color: #eee
+  // bar
+  
+  
+  
+  // baz
+  background: blue

test/cases/comments.out.css

@@ -0,0 +1,4 @@
+button {
+  color: #eee;
+  background: blue;
+}

test/cases/media.out.css

@@ -3,7 +3,7 @@ body {
 }
 
 @media print {
-  body {
+  body  {
     padding: 0;
   }
   ul li a {

test/cases/multiline.css

@@ -0,0 +1,9 @@
+
+button
+  border-radius: 5px
+  padding: 5px 10px
+  box-shadow:
+    0 0 3px red,
+    0 0 10px green,
+    inset 0 0 3px blue
+  color: blue

test/cases/multiline.out.css

@@ -0,0 +1,6 @@
+button {
+  border-radius: 5px;
+  padding: 5px 10px;
+  box-shadow:  0 0 3px red, 0 0 10px green, inset 0 0 3px blue;
+  color: blue;
+}

test/cases/nesting.out.css

@@ -2,15 +2,15 @@ body {
   padding: 50px;
 }
 
-body ul li a {
+body ul li a{
   color: blue;
 }
 
-body ul li {
+body ul li{
   list-style: none;
 }
 
-body ul {
+body ul{
   margin: 0;
   padding: 0;
 }

test/cases/parent.out.css

@@ -1,14 +0,0 @@
-ul {
-}
-
-ul li:hover {
-  background: white;
-}
-
-ul li:active {
-  background: #ddd;
-}
-
-ul li {
-  background: #eee;
-}