Merge pull request #126 from stvvt/expand-self-with-default

Fix self-expanding undefined variable with default value.
motdotla · Nov 13, 2024 · 54bcda0 · 54bcda0
2 parents ff7e2ef + b680e4a
commit 54bcda0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -32,9 +32,7 @@ function interpolate (value, processEnv, parsed) {
 
       if (parsed[key]) {
         // avoid recursion from EXPAND_SELF=$EXPAND_SELF
-        if (parsed[key] === value) {
-          return parsed[key]
-        } else {
+        if (parsed[key] !== value) {
           return interpolate(parsed[key], processEnv, parsed)
         }
       }

diff --git a/tests/main.js b/tests/main.js
@@ -42,7 +42,20 @@ t.test('expands self without a recursive call stack error', ct => {
   }
   const parsed = dotenvExpand.expand(dotenv).parsed
 
-  ct.equal(parsed.EXPAND_SELF, '$EXPAND_SELF') // because it ends up accessing parsed[key].
+  ct.equal(parsed.EXPAND_SELF, '') // because it ends up accessing parsed[key].
+
+  ct.end()
+})
+
+t.test('expands self with undefined variable and default value', ct => {
+  const dotenv = {
+    parsed: {
+      EXPAND_SELF: '${EXPAND_SELF:-default}'
+    }
+  }
+  const parsed = dotenvExpand.expand(dotenv).parsed
+
+  ct.equal(parsed.EXPAND_SELF, 'default')
 
   ct.end()
 })
@@ -466,7 +479,7 @@ t.test('expands self without a recursive call stack error (process.env)', ct =>
   const dotenv = require('dotenv').config({ path: 'tests/.env.test', processEnv: {} })
   const parsed = dotenvExpand.expand(dotenv).parsed
 
-  ct.equal(parsed.EXPAND_SELF, '$EXPAND_SELF') // because it ends up accessing parsed[key].
+  ct.equal(parsed.EXPAND_SELF, '') // because it ends up accessing parsed[key].
 
   ct.end()
 })