@dotenvx/dotenvx 0.23.0 → 0.24.0

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.23.0",
+  "version": "0.24.0",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",

package/src/lib/helpers/dotenvEval.js

@@ -0,0 +1,54 @@
+const { execSync } = require('child_process')
+
+function _chomp (value) {
+  return value.replace(/\r?\n|\r/, '')
+}
+
+function interpolate (value, processEnv, parsed) {
+  const matches = value.match(/\$\([^()]+\)/) || []
+
+  return matches.reduce(function (newValue, match) {
+    // get command
+    const command = match.substring(2, match.length - 1)
+    // execute command
+    const value = _chomp(execSync(command).toString())
+    // replace with command value
+    return newValue.replace(match, value)
+  }, value)
+}
+
+function evaluate (options) {
+  let processEnv = process.env
+  if (options && options.processEnv != null) {
+    processEnv = options.processEnv
+  }
+
+  for (const key in options.parsed) {
+    let value = options.parsed[key]
+
+    const inProcessEnv = Object.prototype.hasOwnProperty.call(processEnv, key)
+
+    if (inProcessEnv) {
+      if (processEnv[key] === options.parsed[key]) {
+        // assume was set to processEnv from the .env file if the values match and therefore interpolate
+        value = interpolate(value, processEnv, options.parsed)
+      } else {
+        // do not interpolate - assume processEnv had the intended value even if containing a $.
+        value = processEnv[key]
+      }
+    } else {
+      // not inProcessEnv so assume interpolation for this .env key
+      value = interpolate(value, processEnv, options.parsed)
+    }
+
+    options.parsed[key] = value
+  }
+
+  for (const processKey in options.parsed) {
+    processEnv[processKey] = options.parsed[processKey]
+  }
+
+  return options
+}
+
+module.exports.eval = evaluate

package/src/lib/helpers/{parseExpand.js → parseExpandAndEval.js}

@@ -1,7 +1,8 @@
 const dotenv = require('dotenv')
 const dotenvExpand = require('dotenv-expand')
+const dotenvEval = require('./dotenvEval')
 
-function parseExpand (src, overload) {
+function parseExpandAndEval (src, overload) {
   const parsed = dotenv.parse(src)
 
   // consider moving this logic straight into dotenv-expand
@@ -18,13 +19,26 @@ function parseExpand (src, overload) {
   }
   const expanded = dotenvExpand.expand(expandPlease).parsed
 
+  let inputExpanded = {}
+  if (overload) {
+    inputExpanded = { ...process.env, ...expanded }
+  } else {
+    inputExpanded = { ...expanded, ...process.env }
+  }
+
+  const evaluatePlease = {
+    processEnv: {},
+    parsed: inputExpanded
+  }
+  const evaluated = dotenvEval.eval(evaluatePlease).parsed
+
   // but then for logging only log the original keys existing in parsed. this feels unnecessarily complex - like dotenv-expand should support the ability to inject additional `process.env` or objects as it sees fit to the object it wants to expand
   const result = {}
   for (const key in parsed) {
-    result[key] = expanded[key]
+    result[key] = evaluated[key]
   }
 
   return result
 }
 
-module.exports = parseExpand
+module.exports = parseExpandAndEval

package/src/lib/main.js

@@ -8,6 +8,9 @@ const Ls = require('./services/ls')
 const Get = require('./services/get')
 const Genexample = require('./services/genexample')
 
+// helpers
+const dotenvEval = require('./helpers/dotenvEval')
+
 // proxies to dotenv
 const config = function (options) {
   const env = dotenv.config(options)
@@ -18,7 +21,13 @@ const config = function (options) {
   }
   const expanded = dotenvExpand.expand(env)
 
-  return expanded
+  // if processEnv passed also pass to eval
+  if (options && options.processEnv) {
+    expanded.processEnv = options.processEnv
+  }
+  const evaluated = dotenvEval.eval(expanded)
+
+  return evaluated
 }
 
 const configDotenv = function (options) {

package/src/lib/services/runDefault.js

@@ -4,7 +4,7 @@ const path = require('path')
 const ENCODING = 'utf8'
 
 const inject = require('./../helpers/inject')
-const parseExpand = require('./../helpers/parseExpand')
+const parseExpandAndEval = require('./../helpers/parseExpandAndEval')
 
 class RunDefault {
   constructor (envFile = '.env', env = [], overload = false) {
@@ -25,7 +25,7 @@ class RunDefault {
       row.string = env
 
       try {
-        const parsed = parseExpand(env, this.overload)
+        const parsed = parseExpandAndEval(env, this.overload)
         row.parsed = parsed
 
         const { injected, preExisted } = inject(process.env, parsed, this.overload)
@@ -52,7 +52,7 @@ class RunDefault {
         const src = fs.readFileSync(filepath, { encoding: ENCODING })
         readableFilepaths.add(envFilepath)
 
-        const parsed = parseExpand(src, this.overload)
+        const parsed = parseExpandAndEval(src, this.overload)
         row.parsed = parsed
 
         const { injected, preExisted } = inject(process.env, parsed, this.overload)

package/src/lib/services/runVault.js

@@ -4,7 +4,7 @@ const dotenv = require('dotenv')
 
 const inject = require('./../helpers/inject')
 const decrypt = require('./../helpers/decrypt')
-const parseExpand = require('./../helpers/parseExpand')
+const parseExpandAndEval = require('./../helpers/parseExpandAndEval')
 const parseEnvironmentFromDotenvKey = require('./../helpers/parseEnvironmentFromDotenvKey')
 
 const ENCODING = 'utf8'
@@ -43,7 +43,7 @@ class RunVault {
       const row = {}
       row.string = env
 
-      const parsed = parseExpand(env, this.overload)
+      const parsed = parseExpandAndEval(env, this.overload)
       row.parsed = parsed
 
       const { injected, preExisted } = inject(process.env, parsed, this.overload)
@@ -77,7 +77,7 @@ class RunVault {
     }
 
     // parse this. it's the equivalent of the .env file
-    const parsed = parseExpand(decrypted, this.overload)
+    const parsed = parseExpandAndEval(decrypted, this.overload)
     const { injected, preExisted } = inject(process.env, parsed, this.overload)
 
     for (const key of Object.keys(injected)) {