Have multiple CWDs for each pattern

lib/remapify.js

@@ -6,9 +6,11 @@ var _ = require('lodash')
   , processCwd = process.cwd()
   , eachPattern
   , eachFile
+  , eachCwd
   , setLogger
   , log
   , transformAliases
+  , turnIntoArray
 
 setLogger = function setLogger(verbose){
   if (!verbose) log = _.noop
@@ -28,7 +30,6 @@ transformAliases = function transformAliases(b, results){
       return total + count
     }).valueOf()
     , aliasMap = {}
-    , realPaths = []
 
 
   if (expandedAliasesCount) {
@@ -41,9 +42,6 @@ transformAliases = function transformAliases(b, results){
 
         // console.log(aliasNames[0])
 
-        realPaths.push(realityPath)
-        // b.require(realityPath)
-        // b.ignore(aliasGroup[aliasNames[0]])
         aliasNames.forEach(function addToAliasMap(alias){
           aliasMap[alias] = realityPath
         })
@@ -63,8 +61,7 @@ transformAliases = function transformAliases(b, results){
 
 // expects to be called with the context of a bundle
 eachFile = function eachFile(b, file, pattern){
-  var cwd = pattern.cwd || processCwd
-    // we'll send the process-relative path to aliasify
+  var cwd = pattern.cwd
     , aliasifyFilePath = './' + path.relative(process.cwd(), path.resolve(path.join(cwd, file)))
     // we'll use the relative path to create our alias
     , relativeFilePath = file.replace(cwd, '')
@@ -109,19 +106,42 @@ eachFile = function eachFile(b, file, pattern){
   return expandedAliases
 }
 
-// expects to be called with the context of a bundle
-eachPattern = function forEachPattern(b, pattern){
+eachCwd = function eachCwd(b, pattern) {
   // TODO: it would be nice to go back to this being async, but I'm not sure if
   // browserify will cooperate
   var realityFiles = glob.sync(pattern.src, pattern)
     , parsedFiles = realityFiles.map(function getAliases(file){
       return eachFile(b, file, pattern)
     })
 
+  return {realityFiles: realityFiles, aliases: parsedFiles}
+}
+
+turnIntoArray = function turnIntoArray(value) {
+  // Browserify Command Line bug
+  if (value._)
+    return value._
+  else if (_.isArray(value))
+    return value
+  else
+    return [value]
+}
+
+// expects to be called with the context of a bundle
+eachPattern = function forEachPattern(b, pattern){
+  var cwds = turnIntoArray(pattern.cwd || processCwd)
+
+  // Does a reverse concat, so the first CWD comes at the end
+  , result = cwds.reduce(function getCwds(acc, cwd) {
+    var cwdAlias = eachCwd(b, _.extend(pattern, {cwd: cwd}))
+    return {realityFiles: cwdAlias.realityFiles.concat(acc.realityFiles)
+           , aliases: cwdAlias.aliases.concat(acc.aliases)}
+  }, {realityFiles: [], aliases: []})
+
   // emit the files we found and their alias mappings as one object
-  b.emit('remapify:files', realityFiles, _.assign.apply(_, parsedFiles), pattern)
+  b.emit('remapify:files', result.realityFiles, _.assign.apply(_, result.aliases), pattern)
 
-  return {pattern: pattern, aliases: parsedFiles}
+  return {pattern: pattern, aliases: result.aliases}
 }
 
 module.exports = function remapify(b, options){

test/fixtures/target2/a.js

@@ -0,0 +1 @@
+module.exports = function(){return 'a thing'}

test/test.js

@@ -158,6 +158,46 @@ describe('remapify', function(){
     }])
   })
 
+  it('looks for files in multiple directories, in precedence', function(done){
+    b.on('remapify:files', function(files, expandedAliases){
+      expandedAliases.should.contain.keys(
+        'a.js',
+        'b.js'
+      )
+      expandedAliases['a.js'].split(path.sep).join('/').should.equal('./test/fixtures/target2/a.js')
+      expandedAliases['b.js'].split(path.sep).join('/').should.equal('./test/fixtures/target/b.js')
+
+      b.emit.should.not.have.been.calledWith('error')
+
+      done()
+    })
+
+    plugin(b, [{
+      src: '**/*.js'
+      , cwd: ['./test/fixtures/target2', './test/fixtures/target']
+    }])
+  })
+
+  it('multiple cwds works when passing in an array from command line', function(done){
+    b.on('remapify:files', function(files, expandedAliases){
+      expandedAliases.should.contain.keys(
+        'a.js',
+        'b.js'
+      )
+      expandedAliases['a.js'].split(path.sep).join('/').should.equal('./test/fixtures/target2/a.js')
+      expandedAliases['b.js'].split(path.sep).join('/').should.equal('./test/fixtures/target/b.js')
+
+      b.emit.should.not.have.been.calledWith('error')
+
+      done()
+    })
+
+    plugin(b, [{
+      src: '**/*.js'
+      , cwd: {'_': ['./test/fixtures/target2', './test/fixtures/target'] }
+    }])
+  })
+
   it('works with non-standard extensions', function(done){
     // setup
     b._extensions = b._extensions.concat('.coffee')