fix(ConfigNameResolver): fixes an issues with unknown environment v…

…ariables

src/ConfigCache.js

@@ -37,7 +37,6 @@ class ConfigCache extends Map {
     }
 
     /**
-     * @protected
      * @readonly
      * @type {ConfigEnvironment}
      */

src/ConfigContainer.js

@@ -6,7 +6,7 @@ import Config from './Config';
 import ConfigCache from './ConfigCache';
 import ConfigEnvironment from './ConfigEnvironment';
 import ConfigPatternCache from './ConfigPatternCache';
-import ConfigNameResolver from './ConfigNameResolver';
+import ConfigStringResolver from './ConfigStringResolver';
 import ConfigPathResolver from './ConfigPathResolver';
 import ConfigLoader from './ConfigLoader';
 import ConfigFinder from './ConfigFinder';
@@ -57,12 +57,12 @@ class ConfigContainer {
             ConfigEnvironment
         ]);
         container.bindValue(ConfigPatternCache, new ConfigPatternCache());
-        container.bindClass(ConfigNameResolver, ConfigNameResolver, [
+        container.bindClass(ConfigStringResolver, ConfigStringResolver, [
             ConfigEnvironment,
             ConfigPatternCache
         ]);
         container.bindClass(ConfigPathResolver, ConfigPathResolver, [
-            ConfigNameResolver
+            ConfigStringResolver
         ]);
         container.bindClass(ConfigLoader, ConfigLoader, [
             ConfigPathResolver,
@@ -85,7 +85,7 @@ class ConfigContainer {
             ConfigFactory
         ]));
         container.bindClass(ConfigOptionsResolver, ConfigOptionsResolver, [
-            ConfigNameResolver
+            ConfigStringResolver
         ]);
         container.bindClass(ConfigDefaultsCommand, ConfigDefaultsCommand, [
             ConfigOptionsResolver

src/ConfigFinder.js

@@ -43,7 +43,6 @@ class ConfigFinder {
     }
 
     /**
-     * @protected
      * @readonly
      * @type {ConfigPathResolver}
      */

src/ConfigOptionsResolver.js

@@ -19,26 +19,26 @@ import RecursiveIterator from 'recursive-iterator';
  * @private
  * @type {WeakMap}
  */
-const NAME_RESOLVER = new WeakMap();
+const STRING_RESOLVER = new WeakMap();
 
 /**
  * @class
  */
 class ConfigOptionsResolver {
     /**
      * @constructor
-     * @param {ConfigNameResolver} nameResolver
+     * @param {ConfigStringResolver} stringResolver
      */
-    constructor(nameResolver) {
-        NAME_RESOLVER.set(this, nameResolver);
+    constructor(stringResolver) {
+        STRING_RESOLVER.set(this, stringResolver);
     }
 
     /**
      * @readonly
-     * @type {ConfigNameResolver}
+     * @type {ConfigStringResolver}
      */
-    get nameResolver() {
-        return NAME_RESOLVER.get(this);
+    get stringResolver() {
+        return STRING_RESOLVER.get(this);
     }
 
     /**
@@ -61,7 +61,7 @@ class ConfigOptionsResolver {
 
         for (const {parent, node, key} of new RecursiveIterator(value, 1, true)) {
             if (isString(node)) {
-                parent[key] = this.nameResolver.resolve(node);
+                parent[key] = this.stringResolver.resolve(node);
             }
         }
 

src/ConfigPathDefaultResolvers.js

@@ -0,0 +1,44 @@
+import {
+    resolve
+} from 'path';
+
+/**
+ * @private
+ * @type {String}
+ */
+const MODULE_PREFIX = 'webpack-config';
+
+export default [
+    /**
+     * `require('<module-name>')`
+     * @param {String} value
+     * @returns {String|Error}
+     */
+    value => {
+        try {
+            return require.resolve(value);
+        } catch (err) {
+            return err;
+        }
+    },
+
+    /**
+     * `require('webpack-config-<name>')`
+     * @param {String} value
+     * @returns {String|Error}
+     */
+    value => {
+        try {
+            return require.resolve(`${MODULE_PREFIX}-${value}`);
+        } catch (err) {
+            return err;
+        }
+    },
+
+    /**
+     * `path.resolve('<file-name>')`
+     * @param {String} value
+     * @returns {String}
+     */
+    value => resolve(value)
+];

src/ConfigPathResolver.js

@@ -2,109 +2,58 @@ import {
     isString,
     isError
 } from 'lodash';
-import {
-    resolve
-} from 'path';
+import DEFAULT_RESOLVERS from './ConfigPathDefaultResolvers';
 
 /**
  * @private
  * @type {WeakMap}
  */
-const NAME_RESOLVER = new WeakMap();
-
-/**
- * @private
- * @type {String}
- */
-const MODULE_PREFIX = 'webpack-config';
-
-/* eslint-disable valid-jsdoc */
-/**
- * @private
- * @type {Function[]}
- */
-const DEFAULT_RESOLVERS = [
-    /**
-     * `require('<module-name>')`
-     * @param {String} value
-     * @returns {String|Error}
-     */
-    value => {
-        try {
-            return require.resolve(value);
-        } catch (err) {
-            return err;
-        }
-    },
-
-    /**
-     * `require('webpack-config-<name>')`
-     * @param {String} value
-     * @returns {String|Error}
-     */
-    value => {
-        try {
-            return require.resolve(`${MODULE_PREFIX}-${value}`);
-        } catch (err) {
-            return err;
-        }
-    },
-
-    /**
-     * `path.resolve('<file-name>')`
-     * @param {String} value
-     * @returns {String}
-     */
-    value => resolve(value)
-];
-/* eslint-enable valid-jsdoc */
+const PATH_RESOLVERS = new WeakMap();
 
 /**
  * @private
  * @type {WeakMap}
  */
-const RESOLVERS = new WeakMap();
+const STRING_RESOLVER = new WeakMap();
 
 /**
  * @class
  */
 class ConfigPathResolver {
     /**
      * @constructor
-     * @param {ConfigNameResolver} nameResolver
-     * @param {Function[]} [resolvers]
+     * @param {ConfigStringResolver} stringResolver
+     * @param {Function[]} [pathResolvers]
      */
-    constructor(nameResolver, resolvers = DEFAULT_RESOLVERS) {
-        NAME_RESOLVER.set(this, nameResolver);
-        RESOLVERS.set(this, resolvers);
+    constructor(stringResolver, pathResolvers = DEFAULT_RESOLVERS) {
+        STRING_RESOLVER.set(this, stringResolver);
+        PATH_RESOLVERS.set(this, pathResolvers);
     }
 
     /**
-     * @protected
      * @readonly
-     * @type {ConfigNameResolver}
+     * @type {ConfigStringResolver}
      */
-    get nameResolver() {
-        return NAME_RESOLVER.get(this);
+    get stringResolver() {
+        return STRING_RESOLVER.get(this);
     }
 
     /**
-     * @protected
      * @readonly
      * @type {Function[]}
      */
-    get resolvers() {
-        return RESOLVERS.get(this);
+    get pathResolvers() {
+        return PATH_RESOLVERS.get(this);
     }
 
     /**
      * @param {String} value
      * @returns {String}
      */
     resolve(value) {
-        value = this.nameResolver.resolve(value);
+        value = this.stringResolver.resolve(value);
 
-        for (const resolver of this.resolvers) {
+        for (const resolver of this.pathResolvers) {
             const resolvedValue = resolver(value),
                 throwsError = isError(value) || value instanceof Error;
 

src/ConfigNameResolver.js → src/ConfigStringResolver.js

@@ -13,7 +13,7 @@ const PATTERN_CACHE = new WeakMap();
 /**
  * @class
  */
-class ConfigNameResolver {
+class ConfigStringResolver {
     /**
      * @constructor
      * @param {ConfigEnvironment} environment
@@ -25,7 +25,6 @@ class ConfigNameResolver {
     }
 
     /**
-     * @protected
      * @readonly
      * @type {ConfigEnvironment}
      */
@@ -34,7 +33,6 @@ class ConfigNameResolver {
     }
 
     /**
-     * @protected
      * @readonly
      * @type {ConfigPatternCache}
      */
@@ -53,8 +51,16 @@ class ConfigNameResolver {
             options[key] = this.environment.valueOf(key);
         }
 
-        return this.patternCache.eval(value, options);
+        let resolvedValue;
+
+        try {
+            resolvedValue = this.patternCache.eval(value, options);
+        } catch (e) {
+            resolvedValue = value;
+        }
+
+        return resolvedValue;
     }
 }
 
-export default ConfigNameResolver;
+export default ConfigStringResolver;