config 3.3.9 → 3.3.10

package/lib/config.js

@@ -4,22 +4,25 @@
 // http://lorenwest.github.com/node-config
 
 // Dependencies
-var DeferredConfig = require('../defer').DeferredConfig,
-    RawConfig = require('../raw').RawConfig,
-    Parser = require('../parser'),
-    Utils = require('util'),
-    Path = require('path'),
-    FileSystem = require('fs');
+const DeferredConfig = require('../defer').DeferredConfig;
+const RawConfig = require('../raw').RawConfig;
+let Parser = require('../parser');
+const Utils = require('util');
+const Path = require('path');
+const FileSystem = require('fs');
 
 // Static members
-var DEFAULT_CLONE_DEPTH = 20,
-    CONFIG_DIR, NODE_ENV, APP_INSTANCE,
-    CONFIG_SKIP_GITCRYPT, NODE_ENV_VAR_NAME,
-    NODE_CONFIG_PARSER,
-    env = {},
-    configSources = [],          // Configuration sources - array of {name, original, parsed}
-    checkMutability = true,      // Check for mutability/immutability on first get
-    gitCryptTestRegex = /^.GITCRYPT/; // regular expression to test for gitcrypt files.
+const DEFAULT_CLONE_DEPTH = 20;
+let CONFIG_DIR;
+let NODE_ENV;
+let APP_INSTANCE;
+let CONFIG_SKIP_GITCRYPT;
+let NODE_ENV_VAR_NAME;
+let NODE_CONFIG_PARSER;
+const env = {};
+const configSources = [];          // Configuration sources - array of {name, original, parsed}
+let checkMutability = true;      // Check for mutability/immutability on first get
+const gitCryptTestRegex = /^.GITCRYPT/; // regular expression to test for gitcrypt files.
 
 /**
  * <p>Application Configurations</p>
@@ -55,7 +58,7 @@ var DEFAULT_CLONE_DEPTH = 20,
  * <p>
  *
  * <pre>
- *   var CONFIG = require('config').customer;
+ *   const CONFIG = require('config').customer;
  *   ...
  *   newCustomer.creditLimit = CONFIG.initialCredit;
  *   database.open(CONFIG.db.name, CONFIG.db.port);
@@ -79,7 +82,7 @@ var DEFAULT_CLONE_DEPTH = 20,
  * for file/module scope. If you want the root of the object, you can do this:
  * </p>
  * <pre>
- * var CONFIG = require('config');
+ * const CONFIG = require('config');
  * </pre>
  *
  * <p>
@@ -87,9 +90,9 @@ var DEFAULT_CLONE_DEPTH = 20,
  * object.  In that case you could do this at the top of your file:
  * </p>
  * <pre>
- * var CONFIG = require('config').customer;
+ * const CONFIG = require('config').customer;
  * or
- * var CUSTOMER_CONFIG = require('config').customer;
+ * const CUSTOMER_CONFIG = require('config').customer;
  * </pre>
  *
  * <script type="text/javascript">
@@ -99,11 +102,11 @@ var DEFAULT_CLONE_DEPTH = 20,
  * @method constructor
  * @return CONFIG {object} - The top level configuration object
  */
-var Config = function() {
-  var t = this;
+const Config = function() {
+  const t = this;
 
   // Bind all utility functions to this
-  for (var fnName in util) {
+  for (const fnName in util) {
     if (typeof util[fnName] === 'function') {
       util[fnName] = util[fnName].bind(t);
     }
@@ -120,7 +123,7 @@ var Config = function() {
 /**
  * Utilities are under the util namespace vs. at the top level
  */
-var util = Config.prototype.util = {};
+const util = Config.prototype.util = {};
 
 /**
  * Underlying get mechanism
@@ -131,11 +134,11 @@ var util = Config.prototype.util = {};
  * @param property {string|string[]} - The property name to get (as an array or '.' delimited string)
  * @return value {*} - Property value, including undefined if not defined.
  */
-var getImpl= function(object, property) {
-  var t = this,
-      elems = Array.isArray(property) ? property : property.split('.'),
-      name = elems[0],
-      value = object[name];
+const getImpl= function(object, property) {
+  const t = this;
+  const elems = Array.isArray(property) ? property : property.split('.');
+  const name = elems[0];
+  const value = object[name];
   if (elems.length <= 1) {
     return value;
   }
@@ -160,7 +163,7 @@ var getImpl= function(object, property) {
  * @return value {*} - The property value
  */
 Config.prototype.get = function(property) {
-  if(property === null || property === undefined){
+  if(property === null || typeof property === "undefined"){
     throw new Error("Calling config.get with null or undefined argument");
   }
 
@@ -171,11 +174,11 @@ Config.prototype.get = function(property) {
     }
     checkMutability = false;
   }
-  var t = this,
-      value = getImpl(t, property);
+  const t = this;
+  const value = getImpl(t, property);
 
   // Produce an exception if the property doesn't exist
-  if (value === undefined) {
+  if (typeof value === "undefined") {
     throw new Error('Configuration property "' + property + '" is not defined');
   }
 
@@ -187,7 +190,7 @@ Config.prototype.get = function(property) {
  * Test that a configuration parameter exists
  *
  * <pre>
- *    var config = require('config');
+ *    const config = require('config');
  *    if (config.has('customer.dbName')) {
  *      console.log('Customer database name: ' + config.customer.dbName);
  *    }
@@ -199,11 +202,11 @@ Config.prototype.get = function(property) {
  */
 Config.prototype.has = function(property) {
   // While get() throws an exception for undefined input, has() is designed to test validity, so false is appropriate
-  if(property === null || property === undefined){
+  if(property === null || typeof property === "undefined"){
     return false;
   }
-  var t = this;
-  return (getImpl(t, property) !== undefined);
+  const t = this;
+  return typeof getImpl(t, property) !== "undefined";
 };
 
 /**
@@ -219,7 +222,7 @@ Config.prototype.has = function(property) {
  *
  * <p>Using the function within your module:</p>
  * <pre>
- *   var CONFIG = require("config");
+ *   const CONFIG = require("config");
  *   CONFIG.util.setModuleDefaults("MyModule", {
  *   &nbsp;&nbsp;templateName: "t-50",
  *   &nbsp;&nbsp;colorScheme: "green"
@@ -242,8 +245,8 @@ Config.prototype.has = function(property) {
 util.setModuleDefaults = function (moduleName, defaultProperties) {
 
   // Copy the properties into a new object
-  var t = this,
-    moduleConfig = util.cloneDeep(defaultProperties);
+  const t = this;
+  const moduleConfig = util.cloneDeep(defaultProperties);
 
   // Set module defaults into the first sources element
   if (configSources.length === 0 || configSources[0].name !== 'Module Defaults') {
@@ -296,7 +299,7 @@ util.setModuleDefaults = function (moduleName, defaultProperties) {
  *
  * <p>Example:</p>
  * <pre>
- *   var CONFIG = require('config');
+ *   const CONFIG = require('config');
  *   ...
  *
  *   // Hide the Amazon S3 credentials
@@ -351,8 +354,8 @@ util.makeHidden = function(object, property, value) {
  *
  * <p>Example:</p>
  * <pre>
- *   var config = require('config');
- *   var myObject = {hello:'world'};
+ *   const config = require('config');
+ *   const myObject = {hello:'world'};
  *   config.util.makeImmutable(myObject);
  * </pre>
  *
@@ -369,7 +372,7 @@ util.makeImmutable = function(object, property, value) {
   if (Buffer.isBuffer(object)) {
     return object;
   }
-  var properties = null;
+  let properties = null;
 
   // Backwards compatibility mode where property/value can be specified
   if (typeof property === 'string') {
@@ -389,9 +392,9 @@ util.makeImmutable = function(object, property, value) {
   }
 
   // Process each property
-  for (var i = 0; i < properties.length; i++) {
-    var propertyName = properties[i],
-        value = object[propertyName];
+  for (let i = 0; i < properties.length; i++) {
+    const propertyName = properties[i];
+    let value = object[propertyName];
 
     if (value instanceof RawConfig) {
       Object.defineProperty(object, propertyName, {
@@ -449,7 +452,7 @@ util.makeImmutable = function(object, property, value) {
  *    name, original, and parsed elements
  */
 util.getConfigSources = function() {
-  var t = this;
+  const t = this;
   return configSources.slice(0);
 };
 
@@ -468,7 +471,7 @@ util.getConfigSources = function() {
  * @return options[optionName] if defined, defaultValue if not.
  */
 util.getOption = function(options, optionName, defaultValue) {
-  if (options !== undefined && options[optionName] !== undefined){
+  if (options !== undefined && typeof options[optionName] !== 'undefined'){
     return options[optionName];
   } else {
     return defaultValue;
@@ -541,11 +544,11 @@ util.getOption = function(options, optionName, defaultValue) {
 util.loadFileConfigs = function(configDir, options) {
 
   // Initialize
-  var t = this,
-      config = {};
+  const t = this;
+  const config = {};
 
   // Specify variables that can be used to define the environment
-  var node_env_var_names = ['NODE_CONFIG_ENV', 'NODE_ENV'];
+  const node_env_var_names = ['NODE_CONFIG_ENV', 'NODE_ENV'];
 
   // Loop through the variables to try and set environment
   for (const node_env_var_name of node_env_var_names) {
@@ -568,19 +571,19 @@ util.loadFileConfigs = function(configDir, options) {
   // Split files name, for loading multiple files.
   NODE_ENV = NODE_ENV.split(',');
 
-  var dir = configDir || util.initParam('NODE_CONFIG_DIR', Path.join( process.cwd(), 'config') );
+  let dir = configDir || util.initParam('NODE_CONFIG_DIR', Path.join( process.cwd(), 'config') );
   dir = _toAbsolutePath(dir);
 
   APP_INSTANCE = util.initParam('NODE_APP_INSTANCE');
   CONFIG_SKIP_GITCRYPT = util.initParam('CONFIG_SKIP_GITCRYPT');
 
   // This is for backward compatibility
-  var runtimeFilename = util.initParam('NODE_CONFIG_RUNTIME_JSON', Path.join(dir , 'runtime.json') );
+  const runtimeFilename = util.initParam('NODE_CONFIG_RUNTIME_JSON', Path.join(dir , 'runtime.json') );
 
   NODE_CONFIG_PARSER = util.initParam('NODE_CONFIG_PARSER');
   if (NODE_CONFIG_PARSER) {
     try {
-      var parserModule = Path.isAbsolute(NODE_CONFIG_PARSER)
+      const parserModule = Path.isAbsolute(NODE_CONFIG_PARSER)
         ? NODE_CONFIG_PARSER
         : Path.join(dir, NODE_CONFIG_PARSER);
       Parser = require(parserModule);
@@ -591,16 +594,15 @@ util.loadFileConfigs = function(configDir, options) {
     }
   }
 
-  var HOST = util.initParam('HOST');
-  var HOSTNAME = util.initParam('HOSTNAME');
+  const HOST = util.initParam('HOST');
+  const HOSTNAME = util.initParam('HOSTNAME');
 
   // Determine the host name from the OS module, $HOST, or $HOSTNAME
   // Remove any . appendages, and default to null if not set
+  let hostName = HOST || HOSTNAME;
   try {
-    var hostName = HOST || HOSTNAME;
-
     if (!hostName) {
-        var OS = require('os');
+        const OS = require('os');
         hostName = OS.hostname();
     }
   } catch (e) {
@@ -611,11 +613,11 @@ util.loadFileConfigs = function(configDir, options) {
   env.HOSTNAME = hostName;
 
   // Read each file in turn
-  var baseNames = ['default'].concat(NODE_ENV);
+  const baseNames = ['default'].concat(NODE_ENV);
 
   // #236: Also add full hostname when they are different.
   if (hostName) {
-    var firstDomain = hostName.split('.')[0];
+    const firstDomain = hostName.split('.')[0];
 
     NODE_ENV.forEach(function(env) {
       // Backward compatibility
@@ -632,9 +634,9 @@ util.loadFileConfigs = function(configDir, options) {
     baseNames.push('local', 'local-' + env);
   });
 
-  var allowedFiles = {};
-  var resolutionIndex = 1;
-  var extNames = Parser.getFilesOrder();
+  const allowedFiles = {};
+  let resolutionIndex = 1;
+  const extNames = Parser.getFilesOrder();
   baseNames.forEach(function(baseName) {
     extNames.forEach(function(extName) {
       allowedFiles[baseName + '.' + extName] = resolutionIndex++;
@@ -644,9 +646,9 @@ util.loadFileConfigs = function(configDir, options) {
     });
   });
 
-  var locatedFiles = util.locateMatchingFiles(dir, allowedFiles);
+  const locatedFiles = util.locateMatchingFiles(dir, allowedFiles);
   locatedFiles.forEach(function(fullFilename) {
-    var configObj = util.parseFile(fullFilename, options);
+    const configObj = util.parseFile(fullFilename, options);
     if (configObj) {
       util.extendDeep(config, configObj);
     }
@@ -655,7 +657,7 @@ util.loadFileConfigs = function(configDir, options) {
   // Override configurations from the $NODE_CONFIG environment variable
   // NODE_CONFIG only applies to the base config
   if (!configDir) {
-    var envConfig = {};
+    let envConfig = {};
 
     CONFIG_DIR = dir;
 
@@ -666,7 +668,7 @@ util.loadFileConfigs = function(configDir, options) {
         console.error('The $NODE_CONFIG environment variable is malformed JSON');
       }
       util.extendDeep(config, envConfig);
-      var skipConfigSources = util.getOption(options,'skipConfigSources', false);
+      const skipConfigSources = util.getOption(options,'skipConfigSources', false);
       if (!skipConfigSources){
         configSources.push({
           name: "$NODE_CONFIG",
@@ -676,7 +678,7 @@ util.loadFileConfigs = function(configDir, options) {
     }
 
     // Override configurations from the --NODE_CONFIG command line
-    var cmdLineConfig = util.getCmdLineArg('NODE_CONFIG');
+    let cmdLineConfig = util.getCmdLineArg('NODE_CONFIG');
     if (cmdLineConfig) {
       try {
         cmdLineConfig = JSON.parse(cmdLineConfig);
@@ -684,7 +686,7 @@ util.loadFileConfigs = function(configDir, options) {
         console.error('The --NODE_CONFIG={json} command line argument is malformed JSON');
       }
       util.extendDeep(config, cmdLineConfig);
-      var skipConfigSources = util.getOption(options,'skipConfigSources', false);
+      const skipConfigSources = util.getOption(options,'skipConfigSources', false);
       if (!skipConfigSources){
         configSources.push({
           name: "--NODE_CONFIG argument",
@@ -698,11 +700,11 @@ util.loadFileConfigs = function(configDir, options) {
   }
 
   // Override with environment variables if there is a custom-environment-variables.EXT mapping file
-  var customEnvVars = util.getCustomEnvVars(dir, extNames);
+  const customEnvVars = util.getCustomEnvVars(dir, extNames);
   util.extendDeep(config, customEnvVars);
 
   // Extend the original config with the contents of runtime.json (backwards compatibility)
-  var runtimeJson = util.parseFile(runtimeFilename) || {};
+  const runtimeJson = util.parseFile(runtimeFilename) || {};
   util.extendDeep(config, runtimeJson);
 
   util.resolveDeferredConfigs(config);
@@ -744,15 +746,15 @@ util.locateMatchingFiles = function(configDirs, allowedFiles) {
 
 // Using basic recursion pattern, find all the deferred values and resolve them.
 util.resolveDeferredConfigs = function (config) {
-  var deferred = [];
+  const deferred = [];
 
   function _iterate (prop) {
 
     // We put the properties we are going to look it in an array to keep the order predictable
-    var propsToSort = [];
+    const propsToSort = [];
 
     // First step is to put the properties of interest in an array
-    for (var property in prop) {
+    for (const property in prop) {
       if (Object.hasOwnProperty.call(prop, property) && prop[property] != null) {
         propsToSort.push(property);
       }
@@ -763,7 +765,7 @@ util.resolveDeferredConfigs = function (config) {
       if (prop[property].constructor === Object) {
         _iterate(prop[property]);
       } else if (prop[property].constructor === Array) {
-        for (var i = 0; i < prop[property].length; i++) {
+        for (let i = 0; i < prop[property].length; i++) {
           if (prop[property][i] instanceof DeferredConfig) {
             deferred.push(prop[property][i].prepare(config, prop[property], i));
           }
@@ -812,10 +814,10 @@ util.resolveDeferredConfigs = function (config) {
  * @return configObject {object|null} The configuration object parsed from the file
  */
 util.parseFile = function(fullFilename, options) {
-  var t = this,  // Initialize
-      configObject = null,
-      fileContent = null,
-      stat = null;
+  const t = this;  // Initialize
+  let configObject = null;
+  let fileContent = null;
+  const stat = null;
 
   // Note that all methods here are the Sync versions.  This is appropriate during
   // module loading (which is a synchronous operation), but not thereafter.
@@ -854,7 +856,7 @@ util.parseFile = function(fullFilename, options) {
   }
 
   // Keep track of this configuration sources, including empty ones, unless the skipConfigSources flag is set to true in the options
-  var skipConfigSources = util.getOption(options,'skipConfigSources', false);
+  const skipConfigSources = util.getOption(options,'skipConfigSources', false);
   if (typeof configObject === 'object' && !skipConfigSources) {
     configSources.push({
       name: fullFilename,
@@ -893,7 +895,7 @@ util.parseFile = function(fullFilename, options) {
  * @return {configObject} The configuration object parsed from the string
  */
 util.parseString = function (content, format) {
-  var parser = Parser.getParser(format);
+  const parser = Parser.getParser(format);
   if (typeof parser === 'function') {
     return parser(null, content);
   }
@@ -908,7 +910,7 @@ util.parseString = function (content, format) {
  * </p>
  *
  * <pre>
- *   var CUST_CONFIG = require('config').Customer;
+ *   const CUST_CONFIG = require('config').Customer;
  *   CUST_CONFIG.get(...)
  * </pre>
  *
@@ -924,7 +926,7 @@ util.attachProtoDeep = function(toObject, depth) {
   }
 
   // Recursion detection
-  var t = this;
+  const t = this;
   depth = (depth === null ? DEFAULT_CLONE_DEPTH : depth);
   if (depth < 0) {
     return toObject;
@@ -932,14 +934,14 @@ util.attachProtoDeep = function(toObject, depth) {
 
   // Adding Config.prototype methods directly to toObject as hidden properties
   // because adding to toObject.__proto__ exposes the function in toObject
-  for (var fnName in Config.prototype) {
+  for (const fnName in Config.prototype) {
     if (!toObject[fnName]) {
       util.makeHidden(toObject, fnName, Config.prototype[fnName]);
     }
   }
 
   // Add prototypes to sub-objects
-  for (var prop in toObject) {
+  for (const prop in toObject) {
     if (util.isObject(toObject[prop])) {
       util.attachProtoDeep(toObject[prop], depth - 1);
     }
@@ -976,10 +978,10 @@ util.attachProtoDeep = function(toObject, depth) {
 util.cloneDeep = function cloneDeep(parent, depth, circular, prototype) {
   // maintain two arrays for circular references, where corresponding parents
   // and children have the same index
-  var allParents = [];
-  var allChildren = [];
+  const allParents = [];
+  const allChildren = [];
 
-  var useBuffer = typeof Buffer != 'undefined';
+  const useBuffer = typeof Buffer !== 'undefined';
 
   if (typeof circular === 'undefined')
     circular = true;
@@ -996,7 +998,7 @@ util.cloneDeep = function cloneDeep(parent, depth, circular, prototype) {
     if (depth === 0)
       return parent;
 
-    var child;
+    let child;
     if (typeof parent != 'object') {
       return parent;
     }
@@ -1018,7 +1020,7 @@ util.cloneDeep = function cloneDeep(parent, depth, circular, prototype) {
     }
 
     if (circular) {
-      var index = allParents.indexOf(parent);
+      const index = allParents.indexOf(parent);
 
       if (index != -1) {
         return allChildren[index];
@@ -1027,9 +1029,9 @@ util.cloneDeep = function cloneDeep(parent, depth, circular, prototype) {
       allChildren.push(child);
     }
 
-    for (var i in parent) {
-      var propDescriptor  = Object.getOwnPropertyDescriptor(parent,i);
-      var hasGetter = ((propDescriptor !== undefined) && (propDescriptor.get !== undefined));
+    for (const i in parent) {
+      const propDescriptor  = Object.getOwnPropertyDescriptor(parent,i);
+      const hasGetter = ((typeof propDescriptor !== 'undefined') && (typeof propDescriptor.get !== 'undefined'));
 
       if (hasGetter){
         Object.defineProperty(child,i,propDescriptor);
@@ -1056,7 +1058,7 @@ util.cloneDeep = function cloneDeep(parent, depth, circular, prototype) {
  * @param value {*} - value to set, ignoring null
  */
 util.setPath = function (object, path, value) {
-  var nextKey = null;
+  let nextKey = null;
   if (value === null || path.length === 0) {
     return;
   }
@@ -1087,20 +1089,22 @@ util.setPath = function (object, path, value) {
  *      corresponded to a key in `variables`
  */
 util.substituteDeep = function (substitutionMap, variables) {
-  var result = {};
+  const result = {};
 
   function _substituteVars(map, vars, pathTo) {
-    for (var prop in map) {
-      var value = map[prop];
+    let parsedValue;
+    for (const prop in map) {
+      const value = map[prop];
       if (typeof(value) === 'string') { // We found a leaf variable name
-        if (vars[value] !== undefined && vars[value] !== '') { // if the vars provide a value set the value in the result map
+        if (typeof vars[value] !== 'undefined' && vars[value] !== '') { // if the vars provide a value set the value in the result map
           util.setPath(result, pathTo.concat(prop), vars[value]);
         }
       }
       else if (util.isObject(value)) { // work on the subtree, giving it a clone of the pathTo
-        if ('__name' in value && '__format' in value && vars[value.__name] !== undefined && vars[value.__name] !== '') {
+        if ('__name' in value && '__format' in value && typeof vars[value.__name] !== 'undefined' && vars[value.__name] !== '') {
+          let parsedValue;
           try {
-            var parsedValue = util.parseString(vars[value.__name], value.__format);
+            parsedValue = util.parseString(vars[value.__name], value.__format);
           } catch(err) {
             err.message = '__format parser error in ' + value.__name + ': ' + err.message;
             throw err;
@@ -1132,17 +1136,17 @@ util.substituteDeep = function (substitutionMap, variables) {
  * @returns {object} - mapped environment variables or {} if there are none
  */
 util.getCustomEnvVars = function (configDir, extNames) {
-  var result = {};
-  var resolutionIndex = 1;
-  var allowedFiles = {};
+  const result = {};
+  let resolutionIndex = 1;
+  const allowedFiles = {};
   extNames.forEach(function (extName) {
     allowedFiles['custom-environment-variables' + '.' + extName] = resolutionIndex++;
   });
-  var locatedFiles = util.locateMatchingFiles(configDir, allowedFiles);
+  const locatedFiles = util.locateMatchingFiles(configDir, allowedFiles);
   locatedFiles.forEach(function (fullFilename) {
-    var configObj = util.parseFile(fullFilename);
+    const configObj = util.parseFile(fullFilename);
     if (configObj) {
-      var environmentSubstitutions = util.substituteDeep(configObj, process.env);
+      const environmentSubstitutions = util.substituteDeep(configObj, process.env);
       util.extendDeep(result, environmentSubstitutions);
     }
   });
@@ -1162,7 +1166,7 @@ util.getCustomEnvVars = function (configDir, extNames) {
 util.equalsDeep = function(object1, object2, depth) {
 
   // Recursion detection
-  var t = this;
+  const t = this;
   depth = (depth === null ? DEFAULT_CLONE_DEPTH : depth);
   if (depth < 0) {
     return {};
@@ -1187,7 +1191,7 @@ util.equalsDeep = function(object1, object2, depth) {
   }
 
   // Compare the values
-  for (var prop in object1) {
+  for (const prop in object1) {
 
     // Call recursively if an object or array
     if (object1[prop] && typeof(object1[prop]) === 'object') {
@@ -1229,7 +1233,8 @@ util.equalsDeep = function(object1, object2, depth) {
 util.diffDeep = function(object1, object2, depth) {
 
   // Recursion detection
-  var t = this, diff = {};
+  const t = this;
+  const diff = {};
   depth = (depth === null ? DEFAULT_CLONE_DEPTH : depth);
   if (depth < 0) {
     return {};
@@ -1237,9 +1242,9 @@ util.diffDeep = function(object1, object2, depth) {
 
   // Process each element from object2, adding any element that's different
   // from object 1.
-  for (var parm in object2) {
-    var value1 = object1[parm];
-    var value2 = object2[parm];
+  for (const parm in object2) {
+    const value1 = object1[parm];
+    const value2 = object2[parm];
     if (value1 && value2 && util.isObject(value2)) {
       if (!(util.equalsDeep(value1, value2))) {
         diff[parm] = util.diffDeep(value1, value2, depth - 1);
@@ -1276,9 +1281,9 @@ util.diffDeep = function(object1, object2, depth) {
 util.extendDeep = function(mergeInto) {
 
   // Initialize
-  var t = this;
-  var vargs = Array.prototype.slice.call(arguments, 1);
-  var depth = vargs.pop();
+  const t = this;
+  const vargs = Array.prototype.slice.call(arguments, 1);
+  let depth = vargs.pop();
   if (typeof(depth) != 'number') {
     vargs.push(depth);
     depth = DEFAULT_CLONE_DEPTH;
@@ -1293,11 +1298,11 @@ util.extendDeep = function(mergeInto) {
   vargs.forEach(function(mergeFrom) {
 
     // Cycle through each element of the object to merge from
-    for (var prop in mergeFrom) {
+    for (const prop in mergeFrom) {
 
       // save original value in deferred elements
-      var fromIsDeferredFunc = mergeFrom[prop] instanceof DeferredConfig;
-      var isDeferredFunc = mergeInto[prop] instanceof DeferredConfig;
+      const fromIsDeferredFunc = mergeFrom[prop] instanceof DeferredConfig;
+      const isDeferredFunc = mergeInto[prop] instanceof DeferredConfig;
 
       if (fromIsDeferredFunc && Object.hasOwnProperty.call(mergeInto, prop)) {
         mergeFrom[prop]._original = isDeferredFunc ? mergeInto[prop]._original : mergeInto[prop];
@@ -1373,10 +1378,10 @@ util.isPromise = function(obj) {
  * @return {Any} The found value, or default value
  */
 util.initParam = function (paramName, defaultValue) {
-  var t = this;
+  const t = this;
 
   // Record and return the value
-  var value = util.getCmdLineArg(paramName) || process.env[paramName] || defaultValue;
+  const value = util.getCmdLineArg(paramName) || process.env[paramName] || defaultValue;
   env[paramName] = value;
   return value;
 }
@@ -1397,10 +1402,10 @@ util.initParam = function (paramName, defaultValue) {
  * @return {*} false if the argument was not found, the argument value if found
  */
 util.getCmdLineArg = function (searchFor) {
-    var cmdLineArgs = process.argv.slice(2, process.argv.length),
-        argName = '--' + searchFor + '=';
+    const cmdLineArgs = process.argv.slice(2, process.argv.length);
+    const argName = '--' + searchFor + '=';
 
-    for (var argvIt = 0; argvIt < cmdLineArgs.length; argvIt++) {
+    for (let argvIt = 0; argvIt < cmdLineArgs.length; argvIt++) {
       if (cmdLineArgs[argvIt].indexOf(argName) === 0) {
         return cmdLineArgs[argvIt].substr(argName.length);
       }
@@ -1434,7 +1439,7 @@ util.getEnv = function (varName) {
  * @returns {string} Flags
  */
 util.getRegExpFlags = function (re) {
-  var flags = '';
+  let flags = '';
   re.global && (flags += 'g');
   re.ignoreCase && (flags += 'i');
   re.multiline && (flags += 'm');
@@ -1453,15 +1458,15 @@ util.toObject = function(config) {
 
 // Run strictness checks on NODE_ENV and NODE_APP_INSTANCE and throw an error if there's a problem.
 util.runStrictnessChecks = function (config) {
-  var sources = config.util.getConfigSources();
+  const sources = config.util.getConfigSources();
 
-  var sourceFilenames = sources.map(function (src) {
+  const sourceFilenames = sources.map(function (src) {
     return Path.basename(src.name);
   });
 
   NODE_ENV.forEach(function(env) {
     // Throw an exception if there's no explicit config file for NODE_ENV
-    var anyFilesMatchEnv = sourceFilenames.some(function (filename) {
+    const anyFilesMatchEnv = sourceFilenames.some(function (filename) {
         return filename.match(env);
     });
     // development is special-cased because it's the default value
@@ -1475,7 +1480,7 @@ util.runStrictnessChecks = function (config) {
   });
 
   // Throw an exception if there's no explicit config file for NODE_APP_INSTANCE
-  var anyFilesMatchInstance = sourceFilenames.some(function (filename) {
+  const anyFilesMatchInstance = sourceFilenames.some(function (filename) {
       return filename.match(APP_INSTANCE);
   });
   if (APP_INSTANCE && !anyFilesMatchInstance) {
@@ -1483,9 +1488,9 @@ util.runStrictnessChecks = function (config) {
   }
 
   function _warnOrThrow (msg) {
-    var beStrict = process.env.NODE_CONFIG_STRICT_MODE;
-    var prefix = beStrict ? 'FATAL: ' : 'WARNING: ';
-    var seeURL = 'See https://github.com/node-config/node-config/wiki/Strict-Mode';
+    const beStrict = process.env.NODE_CONFIG_STRICT_MODE;
+    const prefix = beStrict ? 'FATAL: ' : 'WARNING: ';
+    const seeURL = 'See https://github.com/node-config/node-config/wiki/Strict-Mode';
 
     console.error(prefix+msg);
     console.error(prefix+seeURL);
@@ -1507,14 +1512,14 @@ function _toAbsolutePath (configDir) {
 }
 
 // Instantiate and export the configuration
-var config = module.exports = new Config();
+const config = module.exports = new Config();
 
 // copy methods to util for backwards compatibility
 util.stripComments = Parser.stripComments;
 util.stripYamlComments = Parser.stripYamlComments;
 
 // Produce warnings if the configuration is empty
-var showWarnings = !(util.initParam('SUPPRESS_NO_CONFIG_WARNING'));
+const showWarnings = !(util.initParam('SUPPRESS_NO_CONFIG_WARNING'));
 if (showWarnings && Object.keys(config).length === 0) {
   console.error('WARNING: No configurations found in configuration directory:' +CONFIG_DIR);
   console.error('WARNING: To disable this warning set SUPPRESS_NO_CONFIG_WARNING in the environment.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "config",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "main": "./lib/config.js",
   "description": "Configuration control for production node deployments",
   "author": "Loren West <open_source@lorenwest.com>",

package/parser.js

@@ -61,6 +61,7 @@ Parser.tsParser = function(filename, content) {
   if (!require.extensions['.ts']) {
     require(TS_DEP).register({
       lazy: true,
+      ignore: ['(?:^|/)node_modules/', '.*(?<!\.ts)$'],
       transpileOnly: true,
       compilerOptions: {
         allowJs: true,
@@ -154,20 +155,14 @@ Parser.yamlParser = function(filename, content) {
 };
 
 Parser.jsonParser = function(filename, content) {
-  try {
-    return JSON.parse(content);
-  }
-  catch (e) {
-    // All JS Style comments will begin with /, so all JSON parse errors that
-    // encountered a syntax error will complain about this character.
-    if (e.name !== 'SyntaxError' || e.message.indexOf('Unexpected token /') !== 0) {
-      throw e;
-    }
-    if (!JSON5) {
-      JSON5 = require(JSON5_DEP);
-    }
+  /**
+   * Default JSON parsing to JSON5 parser.
+   * This is due to issues with removing supported comments.
+   * More information can be found here: https://github.com/node-config/node-config/issues/715
+   */
+    JSON5 = require(JSON5_DEP);
+
     return JSON5.parse(content);
-  }
 };
 
 Parser.json5Parser = function(filename, content) {
@@ -197,9 +192,9 @@ Parser.csonParser = function(filename, content) {
   }
   // Allow comments in CSON files
   if (typeof CSON.parseSync === 'function') {
-    return CSON.parseSync(Parser.stripComments(content));
+    return CSON.parseSync(content);
   }
-  return CSON.parse(Parser.stripComments(content));
+  return CSON.parse(content);
 };
 
 Parser.propertiesParser = function(filename, content) {
@@ -226,7 +221,7 @@ Parser.propertiesParser = function(filename, content) {
  * @return {string} The string with comments stripped.
  */
 Parser.stripComments = function(fileStr, stringRegex) {
-  stringRegex = stringRegex || /(['"])(\\\1|.)+?\1/g;
+  stringRegex = stringRegex || /"((?:[^"\\]|\\.)*)"/g;
 
   var uid = '_' + +new Date(),
     primitives = [],