configorama 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configorama",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Variable support for configuration files",
   "main": "src/index.js",
   "types": "index.d.ts",

package/src/main.js

@@ -49,6 +49,20 @@ function isNestedFilterArgument(property, matchedString) {
   const closeParenIdx = property.indexOf(')', matchIdx)
   return pipeIdx !== -1 && matchIdx > pipeIdx && openParenIdx > pipeIdx && closeParenIdx > matchIdx
 }
+
+function resolveConfigFilePath(filePath) {
+  const absolutePath = path.resolve(filePath)
+  try {
+    return fs.realpathSync(absolutePath)
+  } catch (err) {
+    return absolutePath
+  }
+}
+
+function getConfigFileDirectory(filePath) {
+  return path.dirname(resolveConfigFilePath(filePath))
+}
+
 const dotProp = require('dot-prop')
 
 function resolveStaticFilterArg(arg, config) {
@@ -212,7 +226,7 @@ class Configorama {
     }
 
     this.safetyPolicy = normalizeSafetyPolicy(this.settings, {
-      configDir: options.configDir || (typeof fileOrObject === 'string' ? path.dirname(path.resolve(fileOrObject)) : process.cwd())
+      configDir: options.configDir || (typeof fileOrObject === 'string' ? getConfigFileDirectory(fileOrObject) : process.cwd())
     })
 
     assertCustomResolversAllowed(options.variableSources, this.safetyPolicy)
@@ -317,7 +331,7 @@ class Configorama {
       assertSafeConfigInput(fileOrObject, this.safetyPolicy)
       // read and parse file
       const fileContents = fs.readFileSync(fileOrObject, 'utf-8')
-      const fileDirectory = path.dirname(path.resolve(fileOrObject))
+      const fileDirectory = getConfigFileDirectory(fileOrObject)
       const fileType = path.extname(fileOrObject)
 
       this.configFilePath = fileOrObject

package/src/resolvers/valueFromFile.js

@@ -85,7 +85,7 @@ function parseFileContents(content, filePath) {
   if (ext === 'toml' || ext === 'tml') {
     return TOML.parse(content)
   }
-  if (ext === 'ini') {
+  if (isIniLikeExtension(ext)) {
     return INI.parse(content)
   }
 
@@ -93,6 +93,10 @@ function parseFileContents(content, filePath) {
   return content
 }
 
+function isIniLikeExtension(ext) {
+  return ext === 'ini' || ext === 'env'
+}
+
 /**
  * Resolves a value from a file reference
  * @param {object} ctx - Context object with instance properties
@@ -407,7 +411,7 @@ ${JSON.stringify(options.context, null, 2)}`,
       if (fileExtension === 'toml' || fileExtension === 'tml') {
         valueToPopulate = JSON.stringify(TOML.parse(valueToPopulate))
       }
-      if (fileExtension === 'ini') {
+      if (isIniLikeExtension(fileExtension)) {
         valueToPopulate = INI.toJson(valueToPopulate)
       }
       if (fileExtension === 'tf' || fileExtension === 'hcl') {
@@ -447,7 +451,7 @@ Please use ":" or "." to reference sub properties. ${deepPropertiesStr}`
       return Promise.resolve(valueToPopulate)
     }
 
-    if (fileExtension === 'ini') {
+    if (isIniLikeExtension(fileExtension)) {
       valueToPopulate = INI.parse(valueToPopulate)
       return Promise.resolve(valueToPopulate)
     }