configorama 0.4.6 → 0.4.8

package/lib/main.js

@@ -77,6 +77,18 @@ class Configorama {
       allowUndefinedValues: false,
     }, options)
 
+    
+    const defaultSyntax = '\\${((?!AWS)[ ~:a-zA-Z0-9=+!@#%*<>?._\'",|\\-\\/\\(\\)\\\\]+?)}'
+    const variableSyntax = options.syntax || defaultSyntax
+    let varRegex
+    if (typeof variableSyntax === 'string') {
+      varRegex = RegExp(variableSyntax, 'g')
+      // this.variableSyntax = /\${((?!AWS)([ ~:a-zA-Z0-9=+!@#%*<>?._'",|\-\/\(\)\\]+?|(\w+)\s*\(((?:[^()]+)*)?\s*\)\s*))}/
+    } else if (variableSyntax instanceof RegExp) {
+      varRegex = variableSyntax
+    }
+    this.variableSyntax = varRegex
+
     // Set initial config object to populate
     if (typeof fileOrObject === 'object') {
       // set config objects
@@ -94,11 +106,14 @@ class Configorama {
       let configObject
       if (fileType.match(/\.(yml|yaml)/)) {
         try {
-          configObject = YAML.parse(fileContents)
+          const ymlText = YAML.preProcess(fileContents, varRegex)
+          // console.log('ymlText', ymlText)
+          configObject = YAML.parse(ymlText)
         } catch (err) {
           // Attempt to fix cloudformation refs
           if (err.message.match(/YAMLException/)) {
-            const result = YAML.load(fileContents, {
+            const ymlText = YAML.preProcess(fileContents, varRegex)
+            const result = YAML.load(ymlText, {
               filename: fileOrObject,
               schema: cloudFormationSchema.schema
             })
@@ -140,16 +155,6 @@ class Configorama {
     // Track promise resolution
     this.tracker = new PromiseTracker()
 
-    const defaultSyntax = '\\${((?!AWS)[ ~:a-zA-Z0-9=+!@#%*<>?._\'",|\\-\\/\\(\\)\\\\]+?)}'
-    const variableSyntax = options.syntax || defaultSyntax
-
-    if (typeof variableSyntax === 'string') {
-      this.variableSyntax = RegExp(variableSyntax, 'g')
-      // this.variableSyntax = /\${((?!AWS)([ ~:a-zA-Z0-9=+!@#%*<>?._'",|\-\/\(\)\\]+?|(\w+)\s*\(((?:[^()]+)*)?\s*\)\s*))}/
-    } else if (variableSyntax instanceof RegExp) {
-      this.variableSyntax = variableSyntax
-    }
-
     // Variable Sources
     this.variableTypes = [
       /**
@@ -1671,7 +1676,7 @@ Please use ":" to reference sub properties`
 
 function findNestedVariable(split, originalSource) {
   return split.find((thing) => {
-    if (originalSource) {
+    if (originalSource && typeof originalSource === 'string') {
       return originalSource.indexOf(`\${${thing}}`) > -1
     }
     return false

package/lib/parsers/yaml.js

@@ -57,7 +57,128 @@ function toJson(ymlContents) {
   return json
 }
 
+// TODO only works for default var syntax ${}. Maybe fix?
+function findOutermostVariables(text) {
+  let matches = [];
+  let depth = 0;
+  let startIndex = -1;
+
+  for (let i = 0; i < text.length; i++) {
+    if (text[i] === '$' && text[i + 1] === '{') {
+      if (depth === 0) {
+          startIndex = i;
+      }
+      depth++;
+      i++; // Skip '{'
+    } else if (text[i] === '}') {
+      depth--;
+      if (depth === 0 && startIndex !== -1) {
+        matches.push(text.substring(startIndex, i + 1));
+        startIndex = -1;
+      }
+    }
+  }
+  return matches;
+}
+
+
+function matchOutermostBraces(text) {
+    let depth = 0;
+    let startIndex = -1;
+    let results = [];
+
+    for (let i = 0; i < text.length; i++) {
+        if (text[i] === '{') {
+            if (depth === 0) {
+                startIndex = i;
+            }
+            depth++;
+        } else if (text[i] === '}') {
+            depth--;
+            if (depth === 0 && startIndex !== -1) {
+                results.push(text.substring(startIndex, i + 1));
+                startIndex = -1;
+            }
+        }
+    }
+
+    return results;
+}
+
+function preProcess(ymlStr = '') {
+  /*
+  return ymlStr
+  /** */
+
+  // Fix nested variables in array brackets
+  // in  -> y: !Not [!Equals [!Join ['', ${param:xyz}]]]
+  // out -> y: !Not [!Equals [!Join ['', "${param:xyz}"]]]
+  const arrayBracketMatches = ymlStr && ymlStr.match(
+    // /\[(?:[^\[\]]+|)*\]/gm
+    /\[(?:[^\[\]])*\]/g
+  )
+  if (arrayBracketMatches) {
+    // console.log('arrayBracketMatches', arrayBracketMatches)
+    arrayBracketMatches.forEach((txt) => {
+      // console.log('txt', txt)
+      const hasNestedVars = txt && findOutermostVariables(txt)
+      /*
+      console.log(varRegex)
+      console.log('findOutermostVariables(txt)', findOutermostVariables(txt))
+      console.log('hasNested', hasNested)
+      /** */
+      if (hasNestedVars && hasNestedVars.length) {
+        let fixedText = txt
+        hasNestedVars.forEach((nested) => {
+          // console.log('nested', nested)
+          if (txt.indexOf(`"${nested}"`) > -1) {
+            return
+          }
+          if (txt.indexOf(`'${nested}'`) > -1) {
+            return
+          }
+          /* Replace variable wrapped in quotes */
+          fixedText = fixedText.replace(nested, `"${nested}"`)
+        })
+        ymlStr = ymlStr.replace(txt, fixedText)
+      }
+    })
+  }
+
+  /* If have yaml object and vars not wrapped in quotes, wrap them */
+  if (ymlStr.match(/^[ \t]*[^:\n]*:\s*\{/gm)) {
+    const hasObjects = matchOutermostBraces(ymlStr)
+    // console.log('hasObjects', hasObjects)
+    if (hasObjects && hasObjects.length) {
+      hasObjects.forEach((txt) => {
+        // console.log('obj text', txt)
+        const hasNestedVars = txt && findOutermostVariables(txt)
+        if (hasNestedVars && hasNestedVars.length) {
+          let fixedText = txt
+          hasNestedVars.forEach((nested) => {
+            // console.log('nested', nested)
+            if (txt.indexOf(`"${nested}"`) > -1) {
+              return
+            }
+            if (txt.indexOf(`'${nested}'`) > -1) {
+              return
+            }
+            /* Replace variable wrapped in quotes */
+            fixedText = fixedText.replace(nested, `"${nested}"`)
+          })
+          ymlStr = ymlStr.replace(txt, fixedText)
+        }
+      })
+    }
+  }
+
+  // console.log('ymlStr', ymlStr)
+
+  return ymlStr
+}
+
 module.exports = {
+  preProcess: preProcess,
   parse: parse,
   load: load,
   dump: dump,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configorama",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Variable support for configuration files",
   "main": "lib/index.js",
   "files": [
@@ -31,18 +31,18 @@
     "dot-prop": "^5.3.0",
     "find-up": "^3.0.0",
     "git-url-parse": "^14.0.0",
-    "js-yaml": "^3.14.0",
-    "json5": "^2.1.3",
-    "lodash": "^4.17.20",
-    "promise.prototype.finally": "^3.1.2",
+    "js-yaml": "^3.14.1",
+    "json5": "^2.2.3",
+    "lodash": "^4.17.21",
+    "promise.prototype.finally": "^3.1.8",
     "replaceall": "^0.1.6",
     "sync-rpc": "^1.3.6",
-    "traverse": "^0.6.6"
+    "traverse": "^0.6.8"
   },
   "devDependencies": {
-    "ava": "^2.3.0",
-    "markdown-magic": "^1.0.0",
-    "minimist": "^1.2.5"
+    "ava": "^2.4.0",
+    "markdown-magic": "^2.6.1",
+    "minimist": "^1.2.8"
   },
   "ava": {
     "files": [