@dotenvx/dotenvx 1.24.1 → 1.24.3

package/CHANGELOG.md

@@ -2,9 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.24.1...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.24.3...main)
 
-## 1.24.1
+## [1.24.3](https://github.com/dotenvx/dotenvx/compare/v1.24.2...1.24.3)
+
+### Changed
+
+* 🐞 fix command substitution for more complex commands ([#455](https://github.com/dotenvx/dotenvx/pull/455))
+
+## [1.24.2](https://github.com/dotenvx/dotenvx/compare/v1.24.1...1.24.2)
+
+### Changed
+
+* treat pre-existing expandable values as literal in `process.env` ([#450](https://github.com/dotenvx/dotenvx/pull/450))
+
+## [1.24.1](https://github.com/dotenvx/dotenvx/compare/v1.24.0...1.24.1)
 
 ### Changed
 

package/package.json

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

package/src/lib/helpers/parse.js

@@ -49,7 +49,7 @@ class Parse {
       }
 
       // expand empty, double, or backticks
-      if (quote !== "'") {
+      if (quote !== "'" && !this.processEnv[key]) {
         this.parsed[key] = resolveEscapeSequences(this.expand(this.parsed[key]))
       }
 
@@ -122,12 +122,13 @@ class Parse {
   }
 
   eval (value) {
-    const matches = value.match(/\$\([^()]+\)/) || []
+    // Match everything between the outermost $() using a regex with non-capturing groups
+    const matches = value.match(/\$\(([^)]+(?:\)[^(]*)*)\)/g) || []
 
     return matches.reduce(function (newValue, match) {
-      const command = match.substring(2, match.length - 1) // get command
-      const value = chomp(execSync(command).toString()) // execute command
-      return newValue.replace(match, value) // replace with command value
+      const command = match.slice(2, -1) // Extract command by removing $() wrapper
+      const result = chomp(execSync(command).toString()) // execute command
+      return newValue.replace(match, result) // Replace match with result
     }, value)
   }
 
@@ -141,11 +142,8 @@ class Parse {
 
     let result = value
     let match
-    const seen = new Set() // self-referential checker
 
     while ((match = regex.exec(result)) !== null) {
-      seen.add(result)
-
       const [template, bracedExpression, unbracedExpression] = match
       const expression = bracedExpression || unbracedExpression
 
@@ -162,12 +160,6 @@ class Parse {
 
       const key = r.shift()
 
-      // short-circuit if exact value already in process.env already
-      // const inProcessEnv = Object.prototype.hasOwnProperty.call(this.processEnv, key)
-      // if (!this.overload && !!this.processEnv[key] && (env[key] === this.processEnv[key])) {
-      //   return this.processEnv[key]
-      // }
-
       if ([':+', '+'].includes(splitter)) {
         defaultValue = env[key] ? r.join(splitter) : ''
         value = null
@@ -177,16 +169,16 @@ class Parse {
       }
 
       if (value) {
-        // self-referential check
-        if (seen.has(value)) {
-          result = result.replace(template, defaultValue)
-        } else {
-          result = result.replace(template, value)
-        }
+        result = result.replace(template, value)
       } else {
         result = result.replace(template, defaultValue)
       }
 
+      // if the result equaled what was in env then stop expanding - handle self-referential check as well
+      if (result === env[key]) {
+        break
+      }
+
       regex.lastIndex = 0 // reset regex search position to re-evaluate after each replacement
     }