version 1.2.0. strict mode

Author: Valentyn

index.js

@@ -7,18 +7,12 @@ function processOptions(source, options) {
       options.search = new RegExp(options.search, options.flags);
     }
 
-    newSource = source.replace(options.search, options.replace);
-    if (options.strict === true && newSource === source) {
+    var newSource = source.replace(options.search, options.replace);
+    if (options.strict && (newSource === source)) {
       throw new Error('Cannot replace ' + options.search + ' → ' + options.replace);
     }
-  }
-
-  if (options.strict === true && _.isUndefined(options.search)) {
-    throw new Error('Cannot replace: search option is not defined → ' + JSON.stringify(options));
-  }
-
-  if (options.strict === true && _.isUndefined(options.replace)) {
-    throw new Error('Cannot replace: replace option is not defined → ' + JSON.stringify(options));
+  } else if (options.strict) {
+    throw new Error('Cannot replace: undefined search or/and option(s) → ' + JSON.stringify(options));
   }
 
   return newSource;
@@ -31,7 +25,7 @@ module.exports = function (source) {
 
   if (_.isArray(options.multiple)) {
     options.multiple.forEach(function (suboptions) {
-      suboptions.strict = !_.isUndefined(suboptions.strict) ? suboptions.strict : options.strict;
+      suboptions.strict = (!_.isUndefined(suboptions.strict) ? suboptions.strict : options.strict);
       source = processOptions(source, suboptions);
     });
   } else {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "string-replace-loader",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Replace loader for Webpack",
   "keywords": [
     "webpack",

test/index.test.js

@@ -187,29 +187,6 @@ describe('Webpack replace loader ...', function () {
     );
   });
 
-  it('should not throw error when cannot replace in single mode and strict is object', function (done) {
-    webpack(getTestWebPackConfig(
-      {
-        test: /\.js$/,
-        loader: '__this-loader',
-        query: {
-          search: 'unexisting value',
-          replace: 'var a',
-          strict: 'some string'
-        }
-      }),
-      function (error, stats) {
-        expect(error).to.equal(null);
-
-        fs.readFile(outputFilePath, 'utf8', function (error, contents) {
-          expect(error).to.equal(null);
-          expect(contents).is.not.include('Cannot replace unexisting value → var a');
-          done();
-        });
-      }
-    );
-  });
-
   it('should not throw error when cannot replace in multiple mode', function (done) {
     webpack(getTestWebPackConfig(
       {
@@ -311,7 +288,7 @@ describe('Webpack replace loader ...', function () {
         fs.readFile(outputFilePath, 'utf8', function (error, contents) {
           expect(error).to.equal(null);
           expect(contents).to.be.a('string');
-          expect(contents).is.include('Cannot replace: search option is not defined');
+          expect(contents).is.include('Cannot replace: undefined search or/and option(s)');
           done();
         });
       }