config 3.2.3 → 3.3.0

package/History.md

@@ -1,3 +1,23 @@
+3.3.0 / 2020-02-26
+==================
+
+  * Allow all defined values in `substituteDeep` - @fostyfost
+
+3.2.6 / 2020-02-21
+==================
+
+  * Updated copyright date ranges
+
+3.2.5 / 2020-01-16
+==================
+
+  * Fixed issue with getCustomEnvVars and multiple config dirs #585 - @dekelev
+
+3.2.4 / 2019-10-25
+==================
+
+  * Improved error handling of env variables value parse - @leonardovillela
+
 3.2.3 / 2019-10-03
 ==================
 

package/LICENSE

@@ -1,4 +1,4 @@
-// Copyright 2010-2018, Loren West and other contributors
+// Copyright 2010-2020, Loren West and other contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to

package/README.md

@@ -126,7 +126,7 @@ Articles
 
 Further Information
 ---------------------
-If you still don't see what you are looking for, here more resources to check: 
+If you still don't see what you are looking for, here are some more resources to check: 
 
  * The [wiki may have more pages](https://github.com/lorenwest/node-config/wiki) which are not directly linked from here.
  * Review [questions tagged with node-config](https://stackexchange.com/filters/207096/node-config) on StackExchange. These are monitored by `node-config` contributors.
@@ -147,23 +147,23 @@ Contributors
 <td><img src=https://avatars2.githubusercontent.com/u/1656140?v=4><a href="https://github.com/eheikes">eheikes</a></td>
 <td><img src=https://avatars3.githubusercontent.com/u/138707?v=4><a href="https://github.com/th507">th507</a></td>
 </tr><tr><td><img src=https://avatars2.githubusercontent.com/u/506460?v=4><a href="https://github.com/Osterjour">Osterjour</a></td>
+<td><img src=https://avatars3.githubusercontent.com/u/1751645?v=4><a href="https://github.com/cunneen">cunneen</a></td>
 <td><img src=https://avatars0.githubusercontent.com/u/842998?v=4><a href="https://github.com/nsabovic">nsabovic</a></td>
 <td><img src=https://avatars0.githubusercontent.com/u/5138570?v=4><a href="https://github.com/BadgerBadgerBadgerBadger">BadgerBadgerBadgerBadger</a></td>
 <td><img src=https://avatars2.githubusercontent.com/u/2529835?v=4><a href="https://github.com/simon-scherzinger">simon-scherzinger</a></td>
-<td><img src=https://avatars1.githubusercontent.com/u/175627?v=4><a href="https://github.com/axelhzf">axelhzf</a></td>
+<td><img src=https://avatars3.githubusercontent.com/u/8650543?v=4><a href="https://github.com/leonardovillela">leonardovillela</a></td>
+</tr><tr><td><img src=https://avatars1.githubusercontent.com/u/175627?v=4><a href="https://github.com/axelhzf">axelhzf</a></td>
 <td><img src=https://avatars3.githubusercontent.com/u/7782055?v=4><a href="https://github.com/benkroeger">benkroeger</a></td>
-</tr><tr><td><img src=https://avatars3.githubusercontent.com/u/1872824?v=4><a href="https://github.com/fgheorghe">fgheorghe</a></td>
+<td><img src=https://avatars3.githubusercontent.com/u/1872824?v=4><a href="https://github.com/fgheorghe">fgheorghe</a></td>
 <td><img src=https://avatars3.githubusercontent.com/u/1443067?v=4><a href="https://github.com/IvanVergiliev">IvanVergiliev</a></td>
 <td><img src=https://avatars0.githubusercontent.com/u/1736957?v=4><a href="https://github.com/jpwilliams">jpwilliams</a></td>
 <td><img src=https://avatars2.githubusercontent.com/u/1246875?v=4><a href="https://github.com/jaylynch">jaylynch</a></td>
-<td><img src=https://avatars1.githubusercontent.com/u/145742?v=4><a href="https://github.com/jberrisch">jberrisch</a></td>
+</tr><tr><td><img src=https://avatars1.githubusercontent.com/u/145742?v=4><a href="https://github.com/jberrisch">jberrisch</a></td>
 <td><img src=https://avatars1.githubusercontent.com/u/9355665?v=4><a href="https://github.com/kgoerlitz">kgoerlitz</a></td>
-</tr><tr><td><img src=https://avatars0.githubusercontent.com/u/8525267?v=4><a href="https://github.com/bertho-zero">bertho-zero</a></td>
-<td><img src=https://avatars3.githubusercontent.com/u/8650543?v=4><a href="https://github.com/leonardovillela">leonardovillela</a></td>
+<td><img src=https://avatars0.githubusercontent.com/u/8525267?v=4><a href="https://github.com/bertho-zero">bertho-zero</a></td>
 <td><img src=https://avatars3.githubusercontent.com/u/1918551?v=4><a href="https://github.com/nitzan-shaked">nitzan-shaked</a></td>
 <td><img src=https://avatars3.githubusercontent.com/u/3058150?v=4><a href="https://github.com/robertrossmann">robertrossmann</a></td>
 <td><img src=https://avatars2.githubusercontent.com/u/498929?v=4><a href="https://github.com/roncli">roncli</a></td>
-<td><img src=https://avatars2.githubusercontent.com/u/1355559?v=4><a href="https://github.com/superoven">superoven</a></td>
 </tr></table>
 
 License
@@ -171,6 +171,6 @@ License
 
 May be freely distributed under the [MIT license](https://raw.githubusercontent.com/lorenwest/node-config/master/LICENSE).
 
-Copyright (c) 2010-2018 Loren West 
+Copyright (c) 2010-2020 Loren West 
 [and other contributors](https://github.com/lorenwest/node-config/graphs/contributors)
 

package/lib/config.js

@@ -1,4 +1,4 @@
-// config.js (c) 2010-2015 Loren West and other contributors
+// config.js (c) 2010-2020 Loren West and other contributors
 // May be freely distributed under the MIT license.
 // For further details and documentation:
 // http://lorenwest.github.com/node-config
@@ -1033,13 +1033,18 @@ util.substituteDeep = function (substitutionMap, variables) {
     for (var prop in map) {
       var value = map[prop];
       if (typeof(value) === 'string') { // We found a leaf variable name
-        if (vars[value]) { // if the vars provide a value set the value in the result map
+        if (vars[value] !== undefined) { // 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]) {
-          var parsedValue = util.parseString(vars[value.__name], value.__format);
+        if ('__name' in value && '__format' in value && vars[value.__name] !== undefined) {
+          try {
+            var parsedValue = util.parseString(vars[value.__name], value.__format);
+          } catch(err) {
+            err.message = '__format parser error in ' + value.__name + ': ' + err.message;
+            throw err;
+          }
           util.setPath(result, pathTo.concat(prop), parsedValue);
         } else {
           _substituteVars(value, vars, pathTo.concat(prop));
@@ -1068,8 +1073,13 @@ util.substituteDeep = function (substitutionMap, variables) {
  */
 util.getCustomEnvVars = function (CONFIG_DIR, extNames) {
   var result = {};
+  var resolutionIndex = 1;
+  var allowedFiles = {};
   extNames.forEach(function (extName) {
-    var fullFilename = Path.join(CONFIG_DIR , 'custom-environment-variables' + '.' + extName);
+    allowedFiles['custom-environment-variables' + '.' + extName] = resolutionIndex++;
+  });
+  var locatedFiles = util.locateMatchingFiles(CONFIG_DIR, allowedFiles);
+  locatedFiles.forEach(function (fullFilename) {
     var configObj = util.parseFile(fullFilename);
     if (configObj) {
       var environmentSubstitutions = util.substituteDeep(configObj, process.env);

package/package.json

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