configorama 0.4.0 → 0.4.2

package/lib/main.js

@@ -29,6 +29,7 @@ const PromiseTracker = require('./utils/PromiseTracker')
 const handleSignalEvents = require('./utils/handleSignalEvents')
 const formatFunctionArgs = require('./utils/formatFunctionArgs')
 const cloudFormationSchema = require('./utils/cloudformationSchema')
+const trimSurroundingQuotes = require('./utils/trimSurroundingQuotes')
 /**
  * Maintainer's notes:
  *
@@ -70,7 +71,7 @@ class Configorama {
     // Set opts to pass into JS file calls
     this.opts = Object.assign({}, {
       // Allow for unknown variable syntax to pass through without throwing errors
-      passThroughUnknown: false,
+      allowUnknownVars: false,
       // Allow undefined to be an end result.
       allowUndefinedValues: false,
     }, options)
@@ -859,7 +860,7 @@ class Configorama {
 
       if (nestedVar) {
         const fallbackStr = getFallbackString(splitVars, nestedVar)
-        if (!this.opts.passThroughUnknown) {
+        if (!this.opts.allowUnknownVars) {
           verifyVariable(nestedVar, valueObject, this.variableTypes, this.config)
         }
 
@@ -1193,7 +1194,7 @@ Like so: \${${variableString}, "fallbackValue"\}.`)
       const nestedVar = findNestedVariable(split, valueObject.originalSource)
 
       if (nestedVar) {
-        if (!this.opts.passThroughUnknown) {
+        if (!this.opts.allowUnknownVars) {
           verifyVariable(nestedVar, valueObject, this.variableTypes, this.config)
         }
         const fallbackStr = getFallbackString(split, nestedVar)
@@ -1247,19 +1248,19 @@ Like so: \${${variableString}, "fallbackValue"\}.`)
     }
 
     /* Pass through unknown variables */
-    if (this.opts.passThroughUnknown) {
-      // console.log('passThroughUnknown propertyString', propertyString)
+    if (this.opts.allowUnknownVars) {
+      // console.log('allowUnknownVars propertyString', propertyString)
       const varMatches = propertyString.match(this.variableSyntax)
-      let passThroughUnknown = propertyString
+      let allowUnknownVars = propertyString
       /* If variables found, encode them for passthrough */
       if (varMatches && varMatches.length) {
         varMatches.forEach((m) => {
-          passThroughUnknown = passThroughUnknown.replace(m, encodeUnknown(m))
+          allowUnknownVars = allowUnknownVars.replace(m, encodeUnknown(m))
         })
       }
-      // console.log('passThroughUnknown propertyString:', propertyString)
-      // console.log('passThroughUnknown:', passThroughUnknown)
-      return Promise.resolve(passThroughUnknown)
+      // console.log('allowUnknownVars propertyString:', propertyString)
+      // console.log('allowUnknownVars:', allowUnknownVars)
+      return Promise.resolve(allowUnknownVars)
     }
 
     const message = errorMessage.join('\n')
@@ -1299,7 +1300,7 @@ Like so: \${${variableString}, "fallbackValue"\}.`)
   }
 
   getValueFromFile(variableString) {
-    // console.log('From file', variableString)
+    // console.log('From file', `"${variableString}"`)
     let matchedFileString = variableString.match(fileRefSyntax)[0]
     // console.log('matchedFileString', matchedFileString)
 
@@ -1325,12 +1326,15 @@ Like so: \${${variableString}, "fallbackValue"\}.`)
     }
     // console.log('argsToPass', argsToPass)
 
-    const relativePath = matchedFileString
+    const relativePath = trimSurroundingQuotes(matchedFileString
       .replace(fileRefSyntax, (match, varName) => varName.trim())
-      .replace('~', os.homedir())
+      .replace('~', os.homedir()))
+      
 
     let fullFilePath = (path.isAbsolute(relativePath) ? relativePath : path.join(this.configPath, relativePath))
 
+    // console.log('fullFilePath', fullFilePath)
+
     if (fs.existsSync(fullFilePath)) {
       // Get real path to handle potential symlinks (but don't fatal error)
       fullFilePath = fs.realpathSync(fullFilePath)

package/lib/utils/trimSurroundingQuotes.js

@@ -0,0 +1,5 @@
+module.exports = function trimQuotes(str = '') {
+  return str
+    .replace(/^(")([^"\n]*?)(\1)$/, "$2")
+    .replace(/^(')([^'\n]*?)(\1)$/, "$2")
+}

package/package.json

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