Merge pull request #8 from elwynelwyn/master

Fixed bug where `replaceMap` option was ignored
songkick · Jan 3, 2017 · 0cf30b9 · 0cf30b9
2 parents cc6a070 + a8ddc6c
commit 0cf30b9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -132,6 +132,8 @@ var options = {
   replaceMap: {
     foo: 'bar'
   }
+  // or, specify a path to your replaceMap json file
+  // replaceMapPath: './map.json'
 };
 
 replaceinfiles(options)
@@ -142,3 +144,4 @@ replaceinfiles(options)
     // ...
   });
 ```
+If you do not specify `replaceMap` or `replaceMapPath` then `stdin` will be used.
diff --git a/index.js b/index.js
@@ -128,7 +128,7 @@ function runPaths(sourcePaths, options) {
 module.exports = function run(options) {
   return Promise.all([
     listPaths(options.source),
-    getReplaceMap(options.encoding, options.replaceMapPath)
+    getReplaceMap(options.encoding, options.replaceMapPath, options.replaceMap)
   ]).then(function(results){
     var sourcePaths = results[0];
     var replaceMap = results[1];

diff --git a/lib/getReplaceMap.js b/lib/getReplaceMap.js
@@ -1,6 +1,11 @@
 var fs = require('fs');
 
-module.exports = function getReplaceMap(encoding, path) {
+module.exports = function getReplaceMap(encoding, path, replaceMap) {
+  if (path && replaceMap) {
+      return Promise.reject(new Error('Cannot specify both replaceMapPath and replaceMap.'));
+  } else if (replaceMap) {
+      return Promise.resolve(replaceMap);
+  }
   return getReadStreamOrStdin(encoding, path)
     .then(parseStreamToJSON);
 }