config 1.29.1 → 1.30.0

package/History.md

@@ -1,3 +1,23 @@
+1.30.0 / 2018-02-26
+===================
+
+  * Support for nested raw() in javascript configurations - patrickpilch
+
+1.29.4 / 2018-02-03
+===================
+
+  * Re-publish - last changes didn't make it to npm
+
+1.29.3 / 2018-02-03
+===================
+
+  * Added soft dependencies so transpilers don't include everything - gewentao
+
+1.29.2 / 2018-01-12
+===================
+
+  * Patch, and added a test to ts-node - electroma
+
 1.29.1 / 2018-01-07
 ===================
 

package/README.md

@@ -162,8 +162,8 @@ Contributors
 <td><img src=https://avatars2.githubusercontent.com/u/54934?v=4><a href="https://github.com/wmertens">wmertens</a></td>
 <td><img src=https://avatars3.githubusercontent.com/u/2842176?v=4><a href="https://github.com/XadillaX">XadillaX</a></td>
 <td><img src=https://avatars1.githubusercontent.com/u/4425455?v=4><a href="https://github.com/ncuillery">ncuillery</a></td>
+<td><img src=https://avatars0.githubusercontent.com/u/2015295?v=4><a href="https://github.com/patrickpilch">patrickpilch</a></td>
 <td><img src=https://avatars1.githubusercontent.com/u/618330?v=4><a href="https://github.com/adityabansod">adityabansod</a></td>
-<td><img src=https://avatars3.githubusercontent.com/u/270632?v=4><a href="https://github.com/thetalecrafter">thetalecrafter</a></td>
 </tr></table>
 
 License

package/lib/config.js

@@ -32,6 +32,19 @@ var DEFAULT_CLONE_DEPTH = 20,
     checkMutability = true,      // Check for mutability/immutability on first get
     gitCryptTestRegex = /^.GITCRYPT/; // regular expression to test for gitcrypt files.
 
+// Define soft dependencies so transpilers don't include everything
+var COFFEE_DEP = "coffee-script",
+ICED_DEP = "iced-coffee-script",
+JS_YAML_DEP = "js-yaml",
+YAML_DEP = "yaml",
+JSON5_DEP = "json5",
+HJSON_DEP = "hjson",
+TOML_DEP = "toml",
+CSON_DEP = "cson",
+PPARSER_DEP = "properties",
+XML_DEP = "x2js",
+TS_DEP = "ts-node";
+
 /**
  * <p>Application Configurations</p>
  *
@@ -173,13 +186,6 @@ Config.prototype.get = function(property) {
   if(property === null || property === undefined){
     throw new Error("Calling config.get with null or undefined argument");
   }
-  var t = this,
-      value = getImpl(t, property);
-
-  // Produce an exception if the property doesn't exist
-  if (value === undefined) {
-    throw new Error('Configuration property "' + property + '" is not defined');
-  }
 
   // Make configurations immutable after first get (unless disabled)
   if (checkMutability) {
@@ -188,9 +194,12 @@ Config.prototype.get = function(property) {
     }
     checkMutability = false;
   }
+  var t = this,
+      value = getImpl(t, property);
 
-  if (value instanceof RawConfig) {
-    value = value.resolve();
+  // Produce an exception if the property doesn't exist
+  if (value === undefined) {
+    throw new Error('Configuration property "' + property + '" is not defined');
   }
 
   // Return the value
@@ -539,7 +548,13 @@ util.makeImmutable = function(object, property, value) {
     var propertyName = properties[i],
         value = object[propertyName];
 
-    if (!(value instanceof RawConfig)) {
+    if (value instanceof RawConfig) {
+      Object.defineProperty(object, propertyName, {
+        value: value.resolve(),
+        writable: false,
+        configurable: false
+      });
+    } else {
       Object.defineProperty(object, propertyName, {
         value: value,
         writable : false,
@@ -875,8 +890,8 @@ util.parseFile = function(fullFilename) {
       configObject = require(fullFilename);
     }
     else if (extension === 'ts') {
-      if (!require.extensions['ts']) {
-        require('ts-node').register({
+      if (!require.extensions['.ts']) {
+        require(TS_DEP).register({
           lazy: true,
           compilerOptions: {
             allowJs: true,
@@ -904,7 +919,7 @@ util.parseFile = function(fullFilename) {
         //  Coffee = require("coffee-script");
         //}
 
-        Coffee = require("coffee-script");
+        Coffee = require(COFFEE_DEP);
 
         // coffee-script >= 1.7.0 requires explicit registration for require() to work
         if (Coffee.register) {
@@ -915,7 +930,7 @@ util.parseFile = function(fullFilename) {
       configObject = require(fullFilename);
     }
     else if (extension === 'iced') {
-      Iced = require("iced-coffee-script");
+      Iced = require(ICED_DEP);
 
       // coffee-script >= 1.7.0 requires explicit registration for require() to work
       if (Iced.register) {
@@ -981,12 +996,12 @@ util.parseString = function (content, format) {
       // Lazy loading
       try {
         // Try to load the better js-yaml module
-        Yaml = require('js-yaml');
+        Yaml = require(JS_YAML_DEP);
       }
       catch (e) {
         try {
           // If it doesn't exist, load the fallback visionmedia yaml module.
-          VisionmediaYaml = require('yaml');
+          VisionmediaYaml = require(YAML_DEP);
         }
         catch (e) { }
       }
@@ -1017,7 +1032,7 @@ util.parseString = function (content, format) {
       }
 
       if (!JSON5) {
-        JSON5 = require('json5');
+        JSON5 = require(JSON5_DEP);
       }
 
       configObject = JSON5.parse(content);
@@ -1026,7 +1041,7 @@ util.parseString = function (content, format) {
   else if (format === 'json5') {
 
     if (!JSON5) {
-      JSON5 = require('json5');
+      JSON5 = require(JSON5_DEP);
     }
 
     configObject = JSON5.parse(content);
@@ -1034,7 +1049,7 @@ util.parseString = function (content, format) {
   } else if (format === 'hjson') {
 
     if (!HJSON) {
-      HJSON = require('hjson');
+      HJSON = require(HJSON_DEP);
     }
 
     configObject = HJSON.parse(content);
@@ -1042,14 +1057,14 @@ util.parseString = function (content, format) {
   } else if (format === 'toml') {
 
     if(!TOML) {
-      TOML = require('toml');
+      TOML = require(TOML_DEP);
     }
 
     configObject = TOML.parse(content);
   }
   else if (format === 'cson') {
     if (!CSON) {
-      CSON = require('cson');
+      CSON = require(CSON_DEP);
     }
     // Allow comments in CSON files
     if (typeof CSON.parseSync === 'function') {
@@ -1060,13 +1075,13 @@ util.parseString = function (content, format) {
   }
   else if (format === 'properties') {
     if (!PPARSER) {
-      PPARSER = require('properties');
+      PPARSER = require(PPARSER_DEP);
     }
     configObject = PPARSER.parse(content, { namespaces: true, variables: true, sections: true });
   } else if (format === 'xml') {
 
     if (!XML) {
-      XML = require('x2js');
+      XML = require(XML_DEP);
     }
 
     var x2js = new XML();

package/package.json

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