Expand directories. Fixes #429

Author: tmcw

lib/input/dependency.js

@@ -4,8 +4,10 @@ var mdeps = require('module-deps-sortable'),
   fs = require('fs'),
   path = require('path'),
   babelify = require('babelify'),
+  filterJS = require('../filter_js'),
   concat = require('concat-stream'),
-  moduleFilters = require('../../lib/module_filters');
+  moduleFilters = require('../../lib/module_filters'),
+  expandDirectories = require('./expand_directories');
 
 /**
  * Returns a readable stream of dependencies, given an array of entry
@@ -20,6 +22,7 @@ var mdeps = require('module-deps-sortable'),
  * @returns {undefined} calls callback
  */
 function dependencyStream(indexes, options, callback) {
+  var filterer = filterJS(options.extension, options.polyglot);
   var md = mdeps({
     filter: function (id) {
       return !!options.external || moduleFilters.internalOnly(id);
@@ -34,7 +37,7 @@ function dependencyStream(indexes, options, callback) {
     })],
     postFilter: moduleFilters.externals(indexes, options)
   });
-  indexes.forEach(function (index) {
+  expandDirectories(indexes, filterer).forEach(function (index) {
     md.write(path.resolve(index));
   });
   md.end();

lib/input/expand_directories.js

@@ -0,0 +1,29 @@
+var fs = require('fs');
+var path = require('path');
+var _ = require('lodash');
+
+function expandDirectories(indexes, filterer) {
+  return _.flatMap(indexes, function (index) {
+    if (typeof index !== 'string') {
+      return index;
+    }
+    try {
+      var stat = fs.statSync(index);
+      if (stat.isFile()) {
+        return index;
+      } else if (stat.isDirectory()) {
+        return fs.readdirSync(index)
+          .filter(function (file) {
+            return filterer({ file: file });
+          })
+          .map(function (file) {
+            return path.join(index, file);
+          });
+      }
+    } catch (e) {
+      throw new Error('Input file ' + index + ' not found!');
+    }
+  });
+}
+
+module.exports = expandDirectories;

lib/input/shallow.js

@@ -1,6 +1,8 @@
 'use strict';
 
 var fs = require('fs');
+var filterJS = require('../filter_js');
+var expandDirectories = require('./expand_directories');
 
 /**
  * A readable source for content that doesn't do dependency resolution, but
@@ -20,13 +22,14 @@ var fs = require('fs');
  * @return {undefined} calls callback
  */
 module.exports = function (indexes, options, callback) {
-  return callback(null, indexes.map(function (index) {
-    if (typeof index === 'string') {
+  var filterer = filterJS(options.extension, options.polyglot);
+  return callback(null, expandDirectories(indexes, filterer).map(function (file) {
+    if (typeof file === 'string') {
       return {
-        source: fs.readFileSync(index, 'utf8'),
-        file: index
+        source: fs.readFileSync(file, 'utf8'),
+        file: file
       };
     }
-    return index;
+    return file;
   }));
 };

test/lib/input/shallow.js

@@ -25,6 +25,26 @@ test('shallow deps multi', function (t) {
   });
 });
 
+test('shallow deps directory', function (t) {
+  shallow([
+    path.resolve(path.join(__dirname, '../../fixture/html'))
+  ], {}, function (err, deps) {
+    t.ifError(err);
+    t.equal(deps.length, 1);
+    t.ok(deps[0].file.match(/input.js/), 'is the input file');
+    t.end();
+  });
+});
+
+test('shallow deps not found', function (t) {
+  t.throws(function () {
+    shallow([
+      'not-found-file'
+    ], {});
+  }, 'not found');
+  t.end();
+});
+
 test('shallow deps literal', function (t) {
   var obj = {
     file: 'foo.js',