fix: parses 'fallback' in $envVar

Author: joelgallant

app-config-extensions/src/index.test.ts

@@ -1495,6 +1495,14 @@ describe('$envVar directive', () => {
 
     expect(parsed.toJSON()).toEqual({ foo: 'qa' });
   });
+
+  it('parses boolean from fallback', async () => {
+    const source = new LiteralSource({
+      $envVar: { name: 'FOO', parseBool: true, fallback: 'true' },
+    });
+
+    expect(await source.readToJSON([envVarDirective()])).toEqual(true);
+  });
 });
 
 describe('$timestamp directive', () => {

app-config-extensions/src/index.ts

@@ -281,40 +281,44 @@ export function envVarDirective(
       name = resolved;
     }
 
-    let resolvedValue = process.env[name];
-
-    if (!resolvedValue && name === 'APP_CONFIG_ENV') {
-      resolvedValue = envType;
-    }
-
-    if (resolvedValue) {
+    const parseValue = (value: string) => {
       if (parseInt) {
-        const parsed = Number.parseInt(resolvedValue, 10);
+        const parsed = Number.parseInt(value, 10);
 
         if (Number.isNaN(parsed)) {
-          throw new AppConfigError(`Failed to parseInt(${resolvedValue})`);
+          throw new AppConfigError(`Failed to parseInt(${value})`);
         }
 
         return parse(parsed, { shouldFlatten: true });
       }
 
       if (parseFloat) {
-        const parsed = Number.parseFloat(resolvedValue);
+        const parsed = Number.parseFloat(value);
 
         if (Number.isNaN(parsed)) {
-          throw new AppConfigError(`Failed to parseFloat(${resolvedValue})`);
+          throw new AppConfigError(`Failed to parseFloat(${value})`);
         }
 
         return parse(parsed, { shouldFlatten: true });
       }
 
       if (parseBool) {
-        const parsed = resolvedValue.toLowerCase() !== 'false' && resolvedValue !== '0';
+        const parsed = value.toLowerCase() !== 'false' && value !== '0';
 
         return parse(parsed, { shouldFlatten: true });
       }
 
-      return parse(resolvedValue, { shouldFlatten: true });
+      return parse(value, { shouldFlatten: true });
+    };
+
+    let resolvedValue = process.env[name];
+
+    if (!resolvedValue && name === 'APP_CONFIG_ENV') {
+      resolvedValue = envType;
+    }
+
+    if (resolvedValue) {
+      return parseValue(resolvedValue);
     }
 
     if (typeof value === 'object' && value.fallback !== undefined) {
@@ -327,7 +331,7 @@ export function envVarDirective(
         validateString(fallback, [...ctx, key, [InObject, 'fallback']]);
       }
 
-      return parse(fallback, { shouldFlatten: true });
+      return parseValue(fallback);
     }
 
     throw new AppConfigError(`$envVar could not find ${name} environment variable`);