configorama 0.4.8 → 0.4.9

package/lib/main.js

@@ -438,6 +438,10 @@ class Configorama {
     })
   }
   runFunction(variableString) {
+    /* If json object value return it */
+    if (variableString.match(/^\s*{/) && variableString.match(/}\s*$/)) {
+      return variableString
+    }
     // console.log('runFunction', variableString)
     var hasFunc = funcRegex.exec(variableString)
     // TODO finish Function handling. Need to move this down below resolver to resolve inner refs first

package/lib/parsers/yaml.js

@@ -105,6 +105,11 @@ function matchOutermostBraces(text) {
     return results;
 }
 
+// https://regex101.com/r/XIltbc/1
+const KEY_OBJECT = /^[ \t]*[^":\s]*:\s+\{/gm
+
+const INNER_ARRAY = /\[(?:[^\[\]])*\]/g
+
 function preProcess(ymlStr = '') {
   /*
   return ymlStr
@@ -115,7 +120,7 @@ function preProcess(ymlStr = '') {
   // out -> y: !Not [!Equals [!Join ['', "${param:xyz}"]]]
   const arrayBracketMatches = ymlStr && ymlStr.match(
     // /\[(?:[^\[\]]+|)*\]/gm
-    /\[(?:[^\[\]])*\]/g
+    INNER_ARRAY
   )
   if (arrayBracketMatches) {
     // console.log('arrayBracketMatches', arrayBracketMatches)
@@ -146,7 +151,7 @@ function preProcess(ymlStr = '') {
   }
 
   /* If have yaml object and vars not wrapped in quotes, wrap them */
-  if (ymlStr.match(/^[ \t]*[^:\n]*:\s*\{/gm)) {
+  if (ymlStr.match(KEY_OBJECT)) {
     const hasObjects = matchOutermostBraces(ymlStr)
     // console.log('hasObjects', hasObjects)
     if (hasObjects && hasObjects.length) {
@@ -171,9 +176,7 @@ function preProcess(ymlStr = '') {
       })
     }
   }
-
   // console.log('ymlStr', ymlStr)
-
   return ymlStr
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configorama",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "Variable support for configuration files",
   "main": "lib/index.js",
   "files": [