feat(#131): starts test for $extends with env

launchcodedev · Apr 10, 2021 · 7caed5c · 7caed5c
1 parent 6285b3d
commit 7caed5c
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 15 deletions.
diff --git a/app-config-cli/src/validation.ts b/app-config-cli/src/validation.ts
@@ -35,7 +35,7 @@ export async function validateAllConfigVariants({
 
   await Promise.all(
     appConfigFiles.map(async (filename) => {
-      const parsed = await new FileSource(filename).read();
+      const parsed = await new FileSource(filename).read(undefined, { environmentAliases });
 
       parsed.visitAll((value) => {
         const obj = value.asObject();

diff --git a/app-config-extensions/src/index.test.ts b/app-config-extensions/src/index.test.ts
@@ -843,6 +843,31 @@ describe('$env directive', () => {
     const parsed2 = await source.read([envDirective()]);
     expect(parsed2.toJSON()).toEqual({ sibling: true, testing: false });
   });
+
+  it('overrides env', async () => {
+    await withTempFiles(
+      {
+        'test-file.yml': `
+          foo:
+            $env:
+              default: 44
+              dev: 88
+        `,
+      },
+      async (inDir) => {
+        const source = new LiteralSource({
+          $extends: {
+            path: inDir('test-file.yml'),
+            env: 'development',
+          },
+        });
+
+        const parsed = await source.read([envDirective(), extendsDirective()]);
+
+        expect(parsed.toJSON()).toEqual({ foo: 88 });
+      },
+    );
+  });
 });
 
 /* eslint-disable no-template-curly-in-string */

diff --git a/app-config-extensions/src/index.ts b/app-config-extensions/src/index.ts
@@ -411,26 +411,37 @@ function fileReferenceDirective(keyName: string, meta: ParsedValueMetadata): Par
           SchemaBuilder.emptySchema()
             .addString('path')
             .addBoolean('optional', {}, false)
-            .addString('select', {}, false),
+            .addString('select', {}, false)
+            .addString('env', {}, false),
         );
 
         return SchemaBuilder.oneOf(reference, SchemaBuilder.arraySchema(reference));
       },
-      (value) => async (_, __, context, extensions) => {
-        const retrieveFile = async (filepath: string, subselector?: string, isOptional = false) => {
-          const resolvedPath = resolveFilepath(context, filepath);
+      (value, _, context) => async (_, __, originalSource, extensions) => {
+        const retrieveFile = async (
+          filepath: string,
+          subselector?: string,
+          isOptional = false,
+          env?: string,
+        ) => {
+          const resolvedPath = resolveFilepath(originalSource, filepath);
 
           logger.verbose(`Loading file for ${keyName}: ${resolvedPath}`);
 
           const source = new FileSource(resolvedPath);
 
-          const parsed = await source.read(extensions).catch((error) => {
-            if (error instanceof NotFoundError && isOptional) {
-              return ParsedValue.literal({});
-            }
+          const parsed = await source
+            .read(extensions, {
+              ...context,
+              environmentOverride: env ?? context.environmentOverride,
+            })
+            .catch((error) => {
+              if (error instanceof NotFoundError && isOptional) {
+                return ParsedValue.literal({});
+              }
 
-            throw error;
-          });
+              throw error;
+            });
 
           if (subselector) {
             const found = parsed.property(subselector.split('.'));
@@ -458,15 +469,15 @@ function fileReferenceDirective(keyName: string, meta: ParsedValueMetadata): Par
             if (typeof ext === 'string') {
               parsed = ParsedValue.merge(parsed, await retrieveFile(ext));
             } else {
-              const { path, optional, select } = ext;
+              const { path, optional, select, env } = ext;
 
-              parsed = ParsedValue.merge(parsed, await retrieveFile(path, select, optional));
+              parsed = ParsedValue.merge(parsed, await retrieveFile(path, select, optional, env));
             }
           }
         } else {
-          const { path, optional, select } = value;
+          const { path, optional, select, env } = value;
 
-          parsed = await retrieveFile(path, select, optional);
+          parsed = await retrieveFile(path, select, optional, env);
         }
 
         return parsed.assignMeta(meta);