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

* See #347

Author: valeriangalliat

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

@@ -148,13 +148,20 @@ export default function sassdoc(...args) {
         onEmpty(data, env);
       });
 
+    let transform = pipe(
+      recurse(),
+      exclude(env.exclude || []),
+      converter({ from: 'sass', to: 'scss' }),
+      filter
+    );
+
     /* jshint ignore:start */
 
     /**
      * Returned Promise await the full sequence,
      * instead of just the parsing step.
      */
-    filter.promise = new Promise((resolve, reject) => {
+    transform.promise = new Promise((resolve, reject) => {
 
       async function documentize() {
         try {
@@ -179,7 +186,7 @@ export default function sassdoc(...args) {
 
     /* jshint ignore:end */
 
-    return filter;
+    return transform;
   }
 }