multiple source

.vscode/launch.json

@@ -0,0 +1,35 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "type": "node",
+        "request": "launch",
+        "name": "Jest All",
+        "program": "${workspaceFolder}/node_modules/.bin/jest",
+        "args": ["--runInBand", "--watch"],
+        "console": "integratedTerminal",
+        "internalConsoleOptions": "neverOpen",
+        "disableOptimisticBPs": true,
+        "windows": {
+          "program": "${workspaceFolder}/node_modules/jest/bin/jest",
+        }
+      },
+      {
+        "type": "node",
+        "request": "launch",
+        "name": "Jest Current File",
+        "program": "${workspaceFolder}/node_modules/.bin/jest",
+        "args": [
+          "${fileBasenameNoExtension}",
+          "--config",
+          "jest.config.js"
+        ],
+        "console": "integratedTerminal",
+        "internalConsoleOptions": "neverOpen",
+        "disableOptimisticBPs": true,
+        "windows": {
+          "program": "${workspaceFolder}/node_modules/jest/bin/jest",
+        }
+      }
+    ]
+  }

docs/api.md

@@ -6,6 +6,8 @@ const stream = majo()
 
 ## stream.source(globs, [options])
 
+May be used multiple times before processing, but will simply console warn if multiple files under the same name are found returning only the last found.
+
 ### globs
 
 Type: `Array` `string`<br>

src/index.js

@@ -16,6 +16,9 @@ class Majo extends EventEmitter {
      * @type {{[k: string]: any}}
      */
     this.meta = {}
+    this.baseDir = []
+    this.sourcePatterns = []
+    this.dotFiles = []
   }
 
   /**
@@ -26,9 +29,10 @@ class Majo extends EventEmitter {
    * @param opts.dotFiles Including dot files
    */
   source(patterns, { baseDir = '.', dotFiles = true } = {}) {
-    this.baseDir = path.resolve(baseDir)
-    this.sourcePatterns = patterns
-    this.dotFiles = dotFiles
+    this.currentDir = path.resolve('.')
+    this.baseDir.push(path.resolve(baseDir))
+    this.sourcePatterns.push(patterns)
+    this.dotFiles.push(dotFiles)
     return this
   }
 
@@ -45,11 +49,22 @@ class Majo extends EventEmitter {
    * Process middlewares against files
    */
   async process() {
-    const allStats = await glob(this.sourcePatterns, {
-      cwd: this.baseDir,
-      dot: this.dotFiles,
-      stats: true
-    })
+    const { baseDir, dotFiles, sourcePatterns } = this
+    const allStats = await Promise.all(sourcePatterns.map((x, i) => {
+      return glob(x, {
+        cwd: baseDir[i],
+        dot: dotFiles[i],
+        stats: true
+      })
+    }))
+
+    const flattened = allStats.reduce((a, set, i) => {
+      set.forEach(x => {
+        x.absPath = path.resolve(baseDir[i], x.path)
+        a.push(x)
+      })
+      return a
+    }, [])
 
     /**
      * @typedef {{path: string, stats: fs.Stats, contents: Buffer}} File
@@ -58,10 +73,13 @@ class Majo extends EventEmitter {
     this.files = {}
 
     await Promise.all(
-      allStats.map(stats => {
-        const absolutePath = path.resolve(this.baseDir, stats.path)
-        return fs.readFile(absolutePath).then(contents => {
-          const file = { contents, stats, path: absolutePath }
+      flattened.map(stats => {
+        const { absPath } = stats
+        return fs.readFile(absPath).then(contents => {
+          const file = { contents, stats, path: absPath }
+          if (typeof this.files[stats.path] !== 'undefined') {
+            console.warn('majo has encountered duplicate relative path and has overwritten initial one due duplicate sources for: ' + stats.path)
+          }
           this.files[stats.path] = file
         })
       })
@@ -199,7 +217,7 @@ class Majo extends EventEmitter {
   rename(fromPath, toPath) {
     const file = this.files[fromPath]
     this.createFile(toPath, {
-      path: path.resolve(this.baseDir, toPath),
+      path: file.path,
       stats: file.stats,
       contents: file.contents
     })

test/index.test.js

@@ -66,3 +66,26 @@ test('rename', async () => {
 
   expect(stream.fileList).toEqual(['b/c.txt'])
 })
+
+test('double source', async () => {
+  const stream = majo()
+
+  stream.source('**/*.md', { baseDir: path.join(__dirname, 'fixture/doubleSource') })
+  stream.source('**/*.md', { baseDir: path.join(__dirname, 'fixture/stats') })
+
+  await stream.process()
+
+  expect(stream.files['bar.md']).toBeDefined()
+  expect(stream.files['foo.md']).toBeDefined()
+})
+
+test.skip('duplicates not overwritten with double source', async () => {
+  const stream = majo()
+
+  stream.source('**/foo.md', { baseDir: path.join(__dirname, 'fixture/doubleSource') })
+  stream.source('**/foo.md', { baseDir: path.join(__dirname, 'fixture/stats') })
+
+  await stream.process()
+
+  // foo from different dirs
+})