config 1.29.4 → 1.30.0

package/History.md

@@ -1,3 +1,8 @@
+1.30.0 / 2018-02-26
+===================
+
+  * Support for nested raw() in javascript configurations - patrickpilch
+
 1.29.4 / 2018-02-03
 ===================
 

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

@@ -186,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) {
@@ -201,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
@@ -552,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,

package/package.json

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