add .type to all nodes. Closes #18

Makefile

@@ -2,6 +2,7 @@
 test:
 	@./node_modules/.bin/mocha \
 		--require should \
-		--reporter spec
+		--reporter spec \
+		--bail
 
-.PHONY: test
+.PHONY: test

index.js

@@ -6,7 +6,12 @@ module.exports = function(css){
    */
 
   function stylesheet() {
-    return { stylesheet: { rules: rules() }};
+    return {
+      type: 'stylesheet',
+      stylesheet: {
+        rules: rules()
+      }
+    };
   }
 
   /**
@@ -86,7 +91,10 @@ module.exports = function(css){
     css = css.slice(i);
     whitespace();
 
-    return { comment: str };
+    return {
+      type: 'comment',
+      comment: str
+    };
   }
 
   /**
@@ -120,7 +128,11 @@ module.exports = function(css){
     // ;
     match(/^[;\s]*/);
 
-    return { property: prop, value: val };
+    return {
+      type: 'declaration',
+      property: prop,
+      value: val
+    };
   }
 
   /**
@@ -139,6 +151,7 @@ module.exports = function(css){
     if (!vals.length) return;
 
     return {
+      type: 'keyframe',
       values: vals,
       declarations: declarations()
     };
@@ -171,6 +184,7 @@ module.exports = function(css){
     if (!close()) return;
 
     return {
+      type: 'keyframes',
       name: name,
       vendor: vendor,
       keyframes: frames
@@ -193,7 +207,11 @@ module.exports = function(css){
 
     if (!close()) return;
 
-    return { supports: supports, rules: style };
+    return {
+      type: 'supports',
+      supports: supports,
+      rules: style
+    };
   }
 
   /**
@@ -212,7 +230,11 @@ module.exports = function(css){
 
     if (!close()) return;
 
-    return { media: media, rules: style };
+    return {
+      type: 'media',
+      media: media,
+      rules: style
+    };
   }
 
   /**
@@ -231,15 +253,15 @@ module.exports = function(css){
 
     // declarations
     var decl;
-    while (decl = declaration() || atmargin()) {
+    while (decl = declaration()) {
       decls.push(decl);
       comments();
     }
 
     if (!close()) return;
 
     return {
-      type: "page",
+      type: 'page',
       selectors: sel,
       declarations: decls
     };
@@ -263,33 +285,19 @@ module.exports = function(css){
     if (!close()) return;
 
     return {
+      type: 'document',
       document: doc,
       vendor: vendor,
       rules: style
     };
   }
 
-  /**
-   * Parse margin at-rules
-   */
-
-  function atmargin() {
-    var m = match(/^@([a-z\-]+) */);
-    if (!m) return;
-    var type = m[1]
-
-    return {
-      type: type,
-      declarations: declarations()
-    }
-  }
-
   /**
    * Parse import
    */
 
   function atimport() {
-    return _atrule('import')
+    return _atrule('import');
   }
 
   /**
@@ -315,7 +323,7 @@ module.exports = function(css){
   function _atrule(name) {
     var m = match(new RegExp('^@' + name + ' *([^;\\n]+);\\s*'));
     if (!m) return;
-    var ret = {}
+    var ret = { type: name };
     ret[name] = m[1].trim();
     return ret;
   }
@@ -364,7 +372,11 @@ module.exports = function(css){
     var sel = selector();
     if (!sel) return;
     comments();
-    return { selectors: sel, declarations: declarations() };
+    return {
+      type: 'rule',
+      selectors: sel,
+      declarations: declarations()
+    };
   }
 
   return stylesheet();

test/cases/charset.json

@@ -1,16 +1,21 @@
 {
+  "type": "stylesheet",
   "stylesheet": {
     "rules": [
       {
+        "type": "charset",
         "charset": "\"UTF-8\""
       },
       {
+        "type": "comment",
         "comment": " Set the encoding of the style sheet to Unicode UTF-8"
       },
       {
+        "type": "charset",
         "charset": "'iso-8859-15'"
       },
       {
+        "type": "comment",
         "comment": " Set the encoding of the style sheet to Latin-9 (Western European languages, with euro sign) "
       }
     ]

test/cases/comment.json

@@ -1,21 +1,27 @@
 {
+  "type": "stylesheet",
   "stylesheet": {
     "rules": [
       {
+        "type": "comment",
         "comment": " foo "
       },
       {
+        "type": "comment",
         "comment": " bar "
       },
       {
+        "type": "comment",
         "comment": " baz\n\nasdfasdfasdf\nasdfasdfasdf\nasdfasdfasdf\nasdfasdfasdf\n\n"
       },
       {
+        "type": "rule",
         "selectors": [
           "foo"
         ],
         "declarations": [
           {
+            "type": "declaration",
             "property": "bar",
             "value": "baz"
           }

test/cases/comment.url.json

@@ -1,23 +1,28 @@
 {
+  "type": "stylesheet",
   "stylesheet": {
     "rules": [
       {
+        "type": "comment",
         "comment": " http://foo.com/bar/baz.html "
       },
       {
+        "type": "comment",
         "comment": ""
       },
       {
+        "type": "rule",
         "selectors": [
           "foo"
         ],
         "declarations": [
           {
+            "type": "declaration",
             "property": "bar",
             "value": "baz"
           }
         ]
       }
     ]
   }
-}
+}

test/cases/document.json

@@ -1,16 +1,20 @@
 {
+  "type": "stylesheet",
   "stylesheet": {
     "rules": [
       {
+        "type": "document",
         "document": "url-prefix()",
         "vendor": "-moz-",
         "rules": [
           {
+            "type": "rule",
             "selectors": [
               ".ui-select .ui-btn select"
             ],
             "declarations": [
               {
+                "type": "declaration",
                 "property": "opacity",
                 "value": ".0001"
               }
@@ -20,4 +24,4 @@
       }
     ]
   }
-}
+}

test/cases/empty.json

@@ -1,4 +1,5 @@
 {
+  "type": "stylesheet",
   "stylesheet": {
     "rules": []
   }

test/cases/import.json

@@ -1,19 +1,25 @@
 {
+  "type": "stylesheet",
   "stylesheet": {
     "rules": [
       {
+        "type": "import",
         "import": "url(\"fineprint.css\") print"
       },
       {
+        "type": "import",
         "import": "url(\"bluish.css\") projection, tv"
       },
       {
+        "type": "import",
         "import": "'custom.css'"
       },
       {
+        "type": "import",
         "import": "\"common.css\" screen, projection"
       },
       {
+        "type": "import",
         "import": "url('landscape.css') screen and (orientation:landscape)"
       }
     ]

test/cases/import.messed.json

@@ -1,19 +1,25 @@
 {
+  "type": "stylesheet",
   "stylesheet": {
     "rules": [
       {
+        "type": "import",
         "import": "url(\"fineprint.css\") print"
       },
       {
+        "type": "import",
         "import": "url(\"bluish.css\") projection, tv"
       },
       {
+        "type": "import",
         "import": "'custom.css'"
       },
       {
+        "type": "import",
         "import": "\"common.css\" screen, projection"
       },
       {
+        "type": "import",
         "import": "url('landscape.css') screen and (orientation:landscape)"
       }
     ]

test/cases/invalid.json

@@ -1,4 +1,5 @@
 {
+  "type": "stylesheet",
   "stylesheet": {
     "rules": []
   }