feat: more tests for $extends with env override

Author: joelgallant

app-config-extensions/src/env-var-directive.ts

@@ -18,11 +18,6 @@ export function envVarDirective(
   return named(
     '$envVar',
     forKey('$envVar', (value, key, parentKeys, context) => async (parse) => {
-      const environment = currentEnvFromContext(
-        context,
-        asEnvOptions(environmentOverride, aliases, environmentSourceNames),
-      );
-
       let name: string;
       let parseInt = false;
       let parseFloat = false;
@@ -98,7 +93,12 @@ export function envVarDirective(
 
       let resolvedValue = process.env[name];
 
-      if (!resolvedValue && name === 'APP_CONFIG_ENV') {
+      if (name === 'APP_CONFIG_ENV') {
+        const environment = currentEnvFromContext(
+          context,
+          asEnvOptions(environmentOverride, aliases, environmentSourceNames),
+        );
+
         resolvedValue = environment;
       }
 

app-config-extensions/src/extends-directive.test.ts

@@ -2,7 +2,7 @@ import { withTempFiles } from '@app-config/test-utils';
 import { LiteralSource, NotFoundError } from '@app-config/core';
 import { FileSource } from '@app-config/node';
 import { extendsDirective, extendsSelfDirective, overrideDirective } from './extends-directive';
-import { envDirective } from './env-directive';
+import { envDirective, envVarDirective, substituteDirective } from './index';
 
 describe('$extends directive', () => {
   it('fails if file is missing', async () => {
@@ -417,14 +417,20 @@ describe('$override directive', () => {
     await withTempFiles(
       {
         'test-file.yml': `
-          foo:
+          bar:
             $env:
               default: 44
               dev: 88
         `,
       },
       async (inDir) => {
         const source = new LiteralSource({
+          foo: {
+            $env: {
+              default: 44,
+              dev: 88,
+            },
+          },
           $extends: {
             path: inDir('test-file.yml'),
             env: 'development',
@@ -433,7 +439,61 @@ describe('$override directive', () => {
 
         const parsed = await source.read([envDirective(), extendsDirective()]);
 
-        expect(parsed.toJSON()).toEqual({ foo: 88 });
+        expect(parsed.toJSON()).toEqual({ foo: 44, bar: 88 });
+      },
+    );
+  });
+
+  it('overrides env and $envVar', async () => {
+    await withTempFiles(
+      {
+        'test-file.yml': `
+          bar:
+            $envVar: APP_CONFIG_ENV
+        `,
+      },
+      async (inDir) => {
+        process.env.APP_CONFIG_ENV = 'test';
+        const source = new LiteralSource({
+          foo: {
+            $envVar: 'APP_CONFIG_ENV',
+          },
+          $extends: {
+            path: inDir('test-file.yml'),
+            env: 'development',
+          },
+        });
+
+        const parsed = await source.read([extendsDirective(), envVarDirective()]);
+
+        expect(parsed.toJSON()).toEqual({ foo: 'test', bar: 'development' });
+      },
+    );
+  });
+
+  it('overrides env and $substitute', async () => {
+    await withTempFiles(
+      {
+        'test-file.yml': `
+          bar:
+            $substitute: '$APP_CONFIG_ENV'
+        `,
+      },
+      async (inDir) => {
+        process.env.APP_CONFIG_ENV = 'test';
+        const source = new LiteralSource({
+          foo: {
+            $substitute: '$APP_CONFIG_ENV',
+          },
+          $extends: {
+            path: inDir('test-file.yml'),
+            env: 'development',
+          },
+        });
+
+        const parsed = await source.read([extendsDirective(), substituteDirective()]);
+
+        expect(parsed.toJSON()).toEqual({ foo: 'test', bar: 'development' });
       },
     );
   });

app-config-extensions/src/substitute-directive.ts

@@ -102,7 +102,7 @@ export function substituteDirective(
 
       let resolvedValue = process.env[name];
 
-      if (!resolvedValue && name === 'APP_CONFIG_ENV') {
+      if (name === 'APP_CONFIG_ENV') {
         resolvedValue = environment;
       }
 
@@ -165,18 +165,18 @@ function performAllSubstitutions(text: string, envType?: string): string {
     if (varName) {
       const env = process.env[varName];
 
-      if (env !== undefined) {
-        output = output.replace(fullMatch, env);
-      } else if (fallback !== undefined) {
-        // we'll recurse again, so that ${FOO:-${FALLBACK}} -> ${FALLBACK} -> value
-        output = performAllSubstitutions(output.replace(fullMatch, fallback), envType);
-      } else if (varName === 'APP_CONFIG_ENV') {
+      if (varName === 'APP_CONFIG_ENV') {
         if (!envType) {
           throw new AppConfigError(`Could not find environment variable ${varName}`);
         }
 
         // there's a special case for APP_CONFIG_ENV, which is always the envType
         output = output.replace(fullMatch, envType);
+      } else if (env !== undefined) {
+        output = output.replace(fullMatch, env);
+      } else if (fallback !== undefined) {
+        // we'll recurse again, so that ${FOO:-${FALLBACK}} -> ${FALLBACK} -> value
+        output = performAllSubstitutions(output.replace(fullMatch, fallback), envType);
       } else {
         throw new AppConfigError(`Could not find environment variable ${varName}`);
       }