config 3.2.5 → 3.3.2

package/History.md

@@ -1,3 +1,24 @@
+3.3.2 / 2020-09-24
+==================
+
+* Fixed issue with Buffers in config throwing error in util.makeImmutable (#608) - Michal Wadas
+* Added boolean and numeric types to custom environment variables - Ankur Narkhede @ankurnarkhede
+
+3.3.1 / 2020-03-25
+==================
+
+  * Fix security vulnerability in json5 dependency - @twkel
+
+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
 ==================
 

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

@@ -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://avatars3.githubusercontent.com/u/8650543?v=4><a href="https://github.com/leonardovillela">leonardovillela</a></td>
-<td><img src=https://avatars1.githubusercontent.com/u/175627?v=4><a href="https://github.com/axelhzf">axelhzf</a></td>
-</tr><tr><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://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>
 <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/9355665?v=4><a href="https://github.com/kgoerlitz">kgoerlitz</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>
 <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
@@ -369,6 +369,9 @@ util.makeHidden = function(object, property, value) {
  * @return object {object} - The original object is returned - for chaining.
  */
 util.makeImmutable = function(object, property, value) {
+  if (Buffer.isBuffer(object)) {
+    return object;
+  }
   var properties = null;
 
   // Backwards compatibility mode where property/value can be specified
@@ -1033,12 +1036,12 @@ 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]) {
+        if ('__name' in value && '__format' in value && vars[value.__name] !== undefined) {
           try {
             var parsedValue = util.parseString(vars[value.__name], value.__format);
           } catch(err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "config",
-  "version": "3.2.5",
+  "version": "3.3.2",
   "main": "./lib/config.js",
   "description": "Configuration control for production node deployments",
   "author": "Loren West <open_source@lorenwest.com>",
@@ -19,7 +19,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "json5": "^1.0.1"
+    "json5": "^2.1.1"
   },
   "devDependencies": {
     "@types/node": "^7.0.8",

package/parser.js

@@ -281,7 +281,31 @@ Parser.stripYamlComments = function(fileStr) {
   return fileStr.replace(/^\s*#.*/mg,'').replace(/^\s*[\n|\r]+/mg,'');
 };
 
-var order = ['js', 'ts', 'json', 'json5', 'hjson', 'toml', 'coffee', 'iced', 'yaml', 'yml', 'cson', 'properties', 'xml'];
+/**
+ * Parses the environment variable to the boolean equivalent.
+ * Defaults to false
+ *
+ * @param {String} content - Environment variable value
+ * @return {boolean} - Boolean value fo the passed variable value
+ */
+Parser.booleanParser = function(filename, content) {
+  return content === 'true';
+};
+
+/**
+ * Parses the environment variable to the number equivalent.
+ * Defaults to undefined
+ *
+ * @param {String} content - Environment variable value
+ * @return {Number} - Number value fo the passed variable value
+ */
+Parser.numberParser = function(filename, content) {
+  const numberValue = Number(content);
+  return Number.isNaN(numberValue) ? undefined : numberValue;
+};
+
+var order = ['js', 'ts', 'json', 'json5', 'hjson', 'toml', 'coffee', 'iced', 'yaml', 'yml', 'cson', 'properties', 'xml',
+  'boolean', 'number'];
 var definitions = {
   coffee: Parser.coffeeParser,
   cson: Parser.csonParser,
@@ -296,6 +320,8 @@ var definitions = {
   xml: Parser.xmlParser,
   yaml: Parser.yamlParser,
   yml: Parser.yamlParser,
+  boolean: Parser.booleanParser,
+  number: Parser.numberParser
 };
 
 Parser.getParser = function(name) {