Default to ./ when no <src> and support - as stdin

* See #347

Author: valeriangalliat

Makefile

@@ -23,9 +23,10 @@ test: test/data/expected.stream.json dist
 	mocha test/env/*.test.js test/utils/*.test.js
 	rm -rf sassdoc && $(MOCHA) test/api/*.test.js
 	$(SASSDOC) --parse test/data/test.scss | diff - test/data/expected.json
-	$(SASSDOC) --parse < test/data/test.scss | diff - test/data/expected.stream.json
+	$(SASSDOC) --parse - < test/data/test.scss | diff - test/data/expected.stream.json
+	cd test/data && $(SASSDOC) --parse | diff - expected.json
 	rm -rf sassdoc && $(SASSDOC) test/data/test.scss && [ -d sassdoc ]
-	rm -rf sassdoc && $(SASSDOC) < test/data/test.scss && [ -d sassdoc ]
+	rm -rf sassdoc && $(SASSDOC) - < test/data/test.scss && [ -d sassdoc ]
 
 test/data/expected.stream.json: test/data/expected.json
 	test/data/stream $< > $@

package.json

@@ -82,6 +82,7 @@
     "concat-stream": "^1.4.7",
     "core-js": "^0.4.3",
     "docopt": "^0.4.1",
+    "event-stream": "^3.2.1",
     "glob": "^4.3.1",
     "glob2base": "0.0.12",
     "js-yaml": "^3.2.1",

src/cli.js

@@ -20,6 +20,8 @@ Options:
 `;
 
 const docopt = require('docopt').docopt;
+const es = require('event-stream');
+const vfs = require('vinyl-fs');
 const source = require('vinyl-source-stream');
 const pkg = require('../package.json');
 const Environment = require('./environment');
@@ -70,13 +72,31 @@ export default function cli(argv = process.argv.slice(2)) {
   }
 
   if (!options['<src>'].length) {
-    return process.stdin
-      .pipe(source())
-      .pipe(handler(env))
-      .on('data', cb);
+    options['<src>'].push('.');
   }
 
-  handler(options['<src>'], env).then(cb);
+  let stdin = false;
+
+  let sources = vfs.src(options['<src>'].filter(x => {
+    if (x === '-') {
+      stdin = true;
+      return false;
+    }
+
+    return true;
+  }));
+
+  if (stdin) {
+    sources = es.merge(
+      process.stdin.pipe(source()),
+      sources
+    );
+  }
+
+  let stream = handler(env);
+  stream.promise.then(cb);
+
+  sources.pipe(stream).resume();
 }
 
 /**

src/recurse.js

@@ -10,7 +10,7 @@ const vfs = require('vinyl-fs');
  */
 export default function recurse() {
   return through.obj(function (file, enc, cb) {
-    if (file.isBuffer()) {
+    if (file.isBuffer() || file.isStream()) {
       // Pass-through.
       return cb(null, file);
     }

src/sassdoc.js

@@ -34,10 +34,17 @@ export function parseFilter(env = {}) {
   let parser = new Parser(env, env.theme && env.theme.annotations);
   let filter = parser.stream();
 
-  filter.promise
+  let transform = pipe(
+    recurse(),
+    exclude(env.exclude || []),
+    converter({ from: 'sass', to: 'scss' }),
+    filter
+  );
+
+  transform.promise = filter.promise
     .then(data => sorter(data));
 
-  return filter;
+  return transform;
 }
 
 /**
@@ -199,9 +206,7 @@ export function parse(...args) { // jshint ignore:line
    * @return {Promise}
    */
   async function documentize(env) {
-    let data = await baseDocumentize(env);
-
-    return data;
+    return await baseDocumentize(env);
   }
 
   /* jshint ignore:end */
@@ -220,7 +225,10 @@ export function parse(...args) { // jshint ignore:line
       }, cb);
     });
 
-    return pipe(parse, filter);
+    let transform = pipe(parse, filter);
+    transform.promise = parse.promise;
+
+    return transform;
   }
 }