fix(recursive): cleaned up after rebase

Author: toddbluhm

CHANGELOG.md

@@ -1,9 +1,10 @@
 # Changelog
 
-## 10.1.1 - In Development
+## Landed in master
 
-- **Upgrade**: Upgraded dependency `commander` to `5.x`
-- **Upgrade**: Upgraded devDependencies `ts-standard`, `sinon`
+- **Upgrade**: Upgraded dependency `commander` to `13.x`
+- **Upgrade**: Upgraded dependency `cross-spawn` to `7.x`
+- **Upgrade**: Upgraded all devDependencies `ts-standard`, `sinon`
 - **Feature**: support both `$var` and `${var}` when expanding vars
 - **Feature**: Added support for nested env variables with the `--recursive` flag
 

dist/env-cmd.js

@@ -31,7 +31,9 @@ export async function EnvCmd({ command, commandArgs, envFile, rc, options = {},
     }
     if (options.recursive === true) {
         for (const key of Object.keys(env)) {
-            env[key] = expand_envs_1.expandEnvs(env[key], env);
+            if (env[key] !== undefined) {
+                env[key] = expandEnvs(env[key], env);
+            }
         }
     }
     if (options.expandEnvs === true) {

dist/expand-envs.d.ts

@@ -1,6 +1,6 @@
 import type { Environment } from './types.ts';
 /**
- * expandEnvs Replaces $var in args and command with environment variables
- * if the environment variable doesn't exist, it leaves it as is.
+ * expandEnvs Replaces $var and ${var} in args and command with environment variables
+ * the environment variable doesn't exist, it leaves it as is.
 */
 export declare function expandEnvs(str: string, envs: Environment): string;

dist/expand-envs.js

@@ -1,11 +1,10 @@
 /**
- * expandEnvs Replaces $var in args and command with environment variables
- * if the environment variable doesn't exist, it leaves it as is.
+ * expandEnvs Replaces $var and ${var} in args and command with environment variables
+ * the environment variable doesn't exist, it leaves it as is.
 */
 export function expandEnvs(str, envs) {
-    return str.replace(/(?<!\\)\$[a-zA-Z0-9_]+/g, (varName) => {
-        const varValue = envs[varName.slice(1)];
-        // const test = 42;
+    return str.replace(/(?<!\\)\$\{?[a-zA-Z0-9_]+\}?/g, (varName) => {
+        const varValue = envs[varName.startsWith('${') ? varName.slice(2, varName.length - 1) : varName.slice(1)];
         return varValue === undefined ? varName : varValue.toString();
     });
 }

dist/parse-args.js

@@ -29,7 +29,7 @@ export function parseArgs(args) {
         expandEnvs = true;
     }
     let recursive = false;
-    if (program.recursive === true) {
+    if (parsedCmdOptions.recursive === true) {
         recursive = true;
     }
     let verbose = false;
@@ -90,16 +90,12 @@ export function parseArgsUsingCommander(args) {
         .option('-f, --file [path]', 'Custom env file path (default path: ./.env)')
         .option('-r, --rc-file [path]', 'Custom rc file path (default path: ./.env-cmdrc.(js|cjs|mjs|json)')
         .option('-x, --expand-envs', 'Replace $var in args and command with environment variables')
+        .option('--recursive', 'Replace $var and $\\{var\\} in env file with the referenced environment variable')
         .option('--fallback', 'Fallback to default env file path, if custom env file path not found')
         .option('--no-override', 'Do not override existing environment variables')
         .option('--silent', 'Ignore any env-cmd errors and only fail on executed program failure.')
         .option('--use-shell', 'Execute the command in a new shell with the given environment')
         .option('--verbose', 'Print helpful debugging information')
-<<<<<<< HEAD
-=======
-        .option('-x, --expand-envs', 'Replace $var and $\\{var\\} in args and command with environment variables')
-        .option('--recursive', 'Replace $var and $\\{var\\} in env file with the referenced environment variable')
->>>>>>> 65d2198 (feat: recursive embedding of env vars in env vars)
         .allowUnknownOption(true)
         .allowExcessArguments(true)
         .parse(['_', '_', ...args], { from: 'node' });

dist/types.d.ts

@@ -4,6 +4,7 @@ export type RCEnvironment = Partial<Record<string, Environment>>;
 export type CommanderOptions = Command<[], {
     environments?: true | string[];
     expandEnvs?: boolean;
+    recursive?: boolean;
     fallback?: boolean;
     file?: true | string;
     override?: boolean;

src/env-cmd.ts

@@ -42,7 +42,9 @@ export async function EnvCmd(
 
   if (options.recursive === true) {
     for (const key of Object.keys(env)) {
-      env[key] = expandEnvs(env[key], env)
+      if (env[key] !== undefined) {
+        env[key] = expandEnvs(env[key], env)
+      }
     }
   }
 

src/parse-args.ts

@@ -34,7 +34,7 @@ export function parseArgs(args: string[]): EnvCmdOptions {
     expandEnvs = true
   }
   let recursive = false
-  if (program.recursive === true) {
+  if (parsedCmdOptions.recursive === true) {
     recursive = true
   }
   let verbose = false

src/types.ts

@@ -8,6 +8,7 @@ export type RCEnvironment = Partial<Record<string, Environment>>
 export type CommanderOptions = Command<[], {
   environments?: true | string[]
   expandEnvs?: boolean // Default: false
+  recursive?: boolean // Default: false
   fallback?: boolean // Default false
   file?: true | string
   override?: boolean // Default: false

test/env-cmd.spec.ts

@@ -171,7 +171,7 @@ describe('EnvCmd', (): void => {
 
   it('should spawn process with args expanded if recursive option is true',
     async (): Promise<void> => {
-      getEnvVarsStub.returns({ PING: 'PONG', recursive: 'PING ${PING}' }) /* eslint-disable-line */
+      getEnvVarsStub.returns({ PING: 'PONG', recursive: 'PING ${PING}' })
       await envCmdLib.EnvCmd({
         command: 'node',
         commandArgs: [],