fixes for a last PR. multiple search-replace pairs support. version 1.0.0

Author: Val

README.md

@@ -16,23 +16,23 @@ In your `webpack.config.js`:
 
 ```javascript
 module.exports = {
-    // ...
-    module: {
-      loaders: [
-        {
-          test: /fileInWhichJQueryIsUndefined\.js$/,
-          loader: 'string-replace',
-          query: {
-            search: 'jQuery',
-            replace: 'window.$'
-          }
+  // ...
+  module: {
+    loaders: [
+      {
+        test: /fileInWhichJQueryIsUndefined\.js$/,
+        loader: 'string-replace',
+        query: {
+          search: 'jQuery',
+          replace: 'window.$'
         }
-      ]
-    }
+      }
+    ]
+  }
 }
 ```
 
-### Regex replacement:
+### RegEx replacement:
 
 To achieve regular expression replacement you should specify the `flags` query param
 (as an empty string if you do not want any flags). In this case, `search` and `flags` are being
@@ -42,43 +42,46 @@ In your `webpack.config.js`:
 
 ```javascript
 module.exports = {
-    // ...
-    module: {
-      loaders: [
-        {
-          test: /fileInWhichJQueryIsUndefined\.js$/,
-          loader: 'string-replace',
-          query: {
-            search: /jquery/i,
-            replace: 'window.$'
-          }
+  // ...
+  module: {
+    loaders: [
+      {
+        test: /fileInWhichJQueryIsUndefined\.js$/,
+        loader: 'string-replace',
+        query: {
+          search: 'jquery',
+          replace: 'window.$',
+          flags: 'i'
         }
-      ]
-    }
+      }
+    ]
+  }
 }
 ```
 
-### Array replacement:
+### Multiple replacement:
+
+Also, you can pass an array of search-replace pairs this way:
 
 In your `webpack.config.js`:
 
 ```javascript
 module.exports = {
-    // ...
-    module: {
-      loaders: [
-        {
-          test: /\.js$/,
-          loader: 'string-replace',
-          query: {
-            multiple: [
-               {search: 'framework', replace: 'flamewar'},
-               {search: 'ants', replace: 'super ants'},
-            ]
-          }
+  // ...
+  module: {
+    loaders: [
+      {
+        test: /\.js$/,
+        loader: 'string-replace',
+        query: {
+          multiple: [
+             { search: 'jQuery', replace: 'window.$' },
+             { search: '_', replace: 'window.lodash' }
+          ]
         }
-      ]
-    }
+      }
+    ]
+  }
 }
 ```
 

index.js

@@ -1,28 +1,30 @@
+var _ = require('lodash');
 var utils = require('loader-utils');
 
-function processQuery(source, option) {
-  if (typeof option.search !== 'undefined' && typeof option.replace !== 'undefined') {
-    return source.split(option.search).join(option.replace);
+function processQuery(source, query) {
+  if (!_.isUndefined(query.search) && !_.isUndefined(query.replace)) {
+    if (!_.isUndefined(query.flags)) {
+      query.search = new RegExp(query.search, query.flags);
+    }
+
+    return source.replace(query.search, query.replace);
   }
 
   return source;
 }
 
-module.exports = function(source) {
+module.exports = function (source) {
   this.cacheable();
 
   var query = utils.parseQuery(this.query);
 
-  if (Array.isArray(query.multiple)) {
-    var length = query.multiple.length;
-
-    for (var i = 0; i < length; i++) {
-      var option = query.multiple[i];
-      source = processQuery(source, option);
-    }
-
-    return source;
+  if (_.isArray(query.multiple)) {
+    query.multiple.forEach(function (subquery) {
+      source = processQuery(source, subquery);
+    });
+  } else {
+    source = processQuery(source, query);
   }
 
-  return processQuery(source, query);
+  return source;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "string-replace-loader",
-  "version": "0.1.1",
+  "version": "1.0.0",
   "description": "Replace loader for Webpack",
   "keywords": [
     "webpack",
@@ -15,7 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "loader-utils": "^0.2.11"
+    "loader-utils": "^0.2.11",
+    "lodash": "^3.10.1"
   },
   "devDependencies": {
     "chai": "^3.2.0",

test/index.test.js

@@ -124,7 +124,52 @@ describe('Webpack replace loader ...', function () {
     );
   });
 
-  it('should replace using string query', function (done) {
+  it('should replace using multiple queries', function (done) {
+    webpack(
+      {
+        entry: entryFilePath,
+        output: {
+          path: outputDirPath,
+          filename: outputFileName
+        },
+        module: {
+          loaders: [
+            {
+              test: /\.js$/,
+              loader: '__this',
+              query: {
+                multiple: [
+                  {
+                    search: 'var value',
+                    replace: 'var a'
+                  },
+                  {
+                    search: 'module.exports = value',
+                    replace: 'module.exports = a'
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      },
+      function (error, stats) {
+        expect(error).to.equal(null);
+
+        fs.readFile(outputFilePath, 'utf8', function (error, contents) {
+          expect(error).to.equal(null);
+          expect(contents).to.be.a('string');
+          expect(contents.indexOf('var value')).to.equal(-1);
+          expect(contents.indexOf('var a')).to.not.equal(-1);
+          expect(contents.indexOf('module.exports = value')).to.equal(-1);
+          expect(contents.indexOf('module.exports = a')).to.not.equal(-1);
+          done();
+        });
+      }
+    );
+  });
+
+  it('should replace using multiple queries as strings', function (done) {
     webpack(
       {
         entry: entryFilePath,