feat: uses resolveFilepath for $jsModule to resolve relative files

Author: joelgallant

app-config-js/package.json

@@ -31,7 +31,8 @@
   },
   "dependencies": {
     "@app-config/core": "^2.2.0",
-    "@app-config/extension-utils": "^2.2.0"
+    "@app-config/extension-utils": "^2.2.0",
+    "@app-config/node": "^2.2.0"
   },
   "devDependencies": {
     "@app-config/test-utils": "^2.2.0"

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

@@ -1,4 +1,5 @@
 import { LiteralSource } from '@app-config/core';
+import { FileSource } from '@app-config/node';
 import { withTempFiles } from '@app-config/test-utils';
 import jsModuleDirective from './index';
 
@@ -65,6 +66,24 @@ describe('$jsModule directive', () => {
           $jsModule: inDir('foo.js'),
         });
 
+        expect(await source.readToJSON([jsModuleDirective()])).toEqual('bar');
+      },
+    ));
+
+  it('loads file relative to app-config', () =>
+    withTempFiles(
+      {
+        'config.yml': `
+          $jsModule: ./foo.js
+        `,
+        'foo.js': `
+          module.exports.__esModule = true;
+          module.exports.default = 'bar';
+        `,
+      },
+      async (inDir) => {
+        const source = new FileSource(inDir('config.yml'));
+
         expect(await source.readToJSON([jsModuleDirective()])).toEqual('bar');
       },
     ));

app-config-js/src/index.ts

@@ -1,5 +1,6 @@
 import { ParsingExtension } from '@app-config/core';
 import { forKey, validateOptions } from '@app-config/extension-utils';
+import { resolveFilepath } from '@app-config/node';
 
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
@@ -10,8 +11,10 @@ export default function jsModuleDirective(): ParsingExtension {
     '$jsModule',
     validateOptions(
       (SchemaBuilder) => SchemaBuilder.stringSchema(),
-      (value) => async (parse) => {
-        let loaded: any = await import(value);
+      (value) => async (parse, _, context) => {
+        const resolvedPath = resolveFilepath(context, value);
+
+        let loaded: any = await import(resolvedPath);
 
         if (!loaded) {
           return parse(loaded, { shouldFlatten: true });

app-config-js/tsconfig.json

@@ -9,6 +9,7 @@
   "references": [
     { "path": "../app-config-test-utils" },
     { "path": "../app-config-core" },
+    { "path": "../app-config-node" },
     { "path": "../app-config-extension-utils" }
   ]
 }