Made test command will check 3 types of AST.

Author: cwdoh

lib/cli.js

@@ -1,92 +1,90 @@
 #!/usr/bin/env node
 
-(function () {
-	var colors	   = require('colors');
-	var cssparser  = require('./cssparser.js');
-	var nomnom     = require('nomnom');
-	var fs         = require('fs');
-	var path       = require('path');
-	
-	var version = require('../package.json').version;
-	
-	var opts = require("nomnom")
-	  .script('cssparser')
-	  .option('file', {
-	    flag: true,
-	    position: 0,
-	    help: 'CSS document file'
-	  })
-	  .option('outfile', {
-	    abbr: 'o',
-	    metavar: 'FILE',
-	    help: 'Filename or base name of the generated JSON'
-	  })
-	  .option('indent', {
-	    abbr: 'i',
-	    default: 4,
-	    help: 'indentation(string or number)'
-	  })
-	  .option('type', {
-	    abbr: 't',
-	    default: 'simple',
-	    choices: [ 'simple', 'deep', 'atomic' ],
-	    metavar: 'TYPE',
-	    help: 'The type of JSON to generate (simple, deep, atomic)'
-	  })
-	  .option('console', {
-	    abbr: 'c',
-	    flag: true,
-	    help: 'Display JSON to console only. this option will ignore output-file options.'
-	  })
-	  .option('version', {
-	    abbr: 'V',
-	    flag: true,
-	    help: 'print version and exit',
-	    callback: function() {
-	       return version;
-	    }
-	  })
-	  .parse();
-	  
-	function toJSON( raw, type, indent ) {
-		var parser = new cssparser.Parser();
-		
-		return JSON.stringify( parser.parse( raw ), null, indent );
-	}
-	
-    if (opts.file) {
-		try {
-	        var raw = fs.readFileSync(path.normalize(opts.file), 'utf8');
-		}
-		catch (e) {
-			console.error( e.toString().red + '\n' + e.stack.red );
-			return;
-		}
+(function() {
+  var colors = require('colors');
+  var cssparser = require('./cssparser.js');
+  var nomnom = require('nomnom');
+  var fs = require('fs');
+  var path = require('path');
 
-		var name = path.basename((opts.outfile||opts.file)).replace(/\..*$/g,'');
-		var type = opts.type;
-		var indent = opts.indent;
+  var version = require('../package.json').version;
 
-		try {
-			var json = toJSON(raw, type, indent);
-		}
-		catch (e) {
-			var output = e.message
-			if ('stack' in e) {
-				output += '\n' + e.stack
-			}
-			if ('hash' in e) {
-				output += '\n' + JSON.stringify(e[e.hash], null, '\t')
-			}
-			console.error( output.red );
-			return;
-		}
+  var opts = require("nomnom")
+    .script('cssparser')
+    .option('file', {
+      flag: true,
+      position: 0,
+      help: 'CSS document file'
+    })
+    .option('outfile', {
+      abbr: 'o',
+      metavar: 'FILE',
+      help: 'Filename or base name of the generated JSON'
+    })
+    .option('indent', {
+      abbr: 'i',
+      default: 4,
+      help: 'indentation(string or number)'
+    })
+    .option('type', {
+      abbr: 't',
+      default: 'simple',
+      choices: ['simple', 'deep', 'atomic'],
+      metavar: 'TYPE',
+      help: 'The type of JSON to generate (simple, deep, atomic)'
+    })
+    .option('console', {
+      abbr: 'c',
+      flag: true,
+      help: 'Display JSON to console only. this option will ignore output-file options.'
+    })
+    .option('version', {
+      abbr: 'V',
+      flag: true,
+      help: 'print version and exit',
+      callback: function() {
+        return version;
+      }
+    })
+    .parse();
 
-		if ( opts.console ) {
-			console.log( json );
-		}
-		else {
-			fs.writeFileSync(opts.outfile||(name + '.json'), json );
-		}
+  function toJSON(raw, type, indent) {
+    var parser = new cssparser.Parser();
+    var ast = parser.parse(raw)
+
+    return JSON.stringify(ast.toJSON(type), null, indent);
+  }
+
+  if (opts.file) {
+    try {
+      var raw = fs.readFileSync(path.normalize(opts.file), 'utf8');
+    } catch (e) {
+      console.error(e.toString().red + '\n' + e.stack.red);
+      return;
+    }
+
+    var name = path.basename((opts.outfile || opts.file)).replace(/\..*$/g, '');
+    var type = opts.type;
+    var indent = opts.indent;
+
+    try {
+      var json = toJSON(raw, type, indent);
+    } catch (e) {
+      var output = e.message
+      if ('stack' in e) {
+        output += '\n' + e.stack
+      }
+      if ('hash' in e) {
+        output += '\n' + JSON.stringify(e[e.hash], null, '\t')
+      }
+      console.error(output.red);
+      return;
+    }
+
+    if (opts.console) {
+      console.log(json);
+    } else {
+      fs.writeFileSync(opts.outfile || (name + '.json'), json);
     }
-})();
+  }
+})();

package.json

@@ -52,12 +52,14 @@
   "scripts": {
     "es6": "gulp merge-js && babel dist/js -d dist/babel",
     "generate": "gulp merge-jison && jison dist/jison/cssparser.y dist/jison/css.l -o lib/cssparser.js",
-    "simple-test": "node lib/cli.js test/test.css -c",
-    "copy-web": "cp ./lib/cssparser.js ./web/",
     "build": "npm run es6 && npm run generate",
-    "test": "npm run build && npm run simple-test",
+    "test-simple": "node lib/cli.js test/test.css -c -t simple",
+    "test-deep": "node lib/cli.js test/test.css -c -t deep",
+    "test-atomic": "node lib/cli.js test/test.css -c -t deep",
+    "test-all": "npm run test-simple && npm run test-deep && npm run test-atomic",
+    "copy-web": "cp ./lib/cssparser.js ./web/",
     "release": "npm run build && npm run copy-web",
-    "test-only": "npm run simple-test"
+    "test": "npm run release && npm run test-all"
   },
   "homepage": "https://cwdoh.github.io/cssparser.js/",
   "optionalDependencies": {},

src/yacc/roots.y

@@ -4,10 +4,9 @@
 
 stylesheet
   : StylesheetList EOF
-    %{
-      console.log(JSON.stringify($1.toJSON(), null, 4))
-      $$ = $1
-    }%
+    {
+      return $1
+    }
   ;
 
 StylesheetList