refactor: wip

Author: BioPhoton

packages/utils/mocks/fixtures/helper-module.ts

@@ -0,0 +1,2 @@
+export const helperValue = 'helper-module-value';
+export default helperValue;

packages/utils/mocks/fixtures/tsconfig-paths-test.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "@test/helper": ["./helper-module.ts"]
+    }
+  }
+}

packages/utils/mocks/fixtures/uses-path-alias.ts

@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/no-unresolved
+import helperValue from '@test/helper';
+
+const config = {
+  value: helperValue,
+};
+
+export default config;

packages/utils/src/lib/import-module.int.test.ts

@@ -47,7 +47,7 @@ describe('importModule', () => {
   it('should throw if the file does not exist', async () => {
     await expect(
       importModule({ filepath: 'path/to/non-existent-export.mjs' }),
-    ).rejects.toThrow("File 'path/to/non-existent-export.mjs' does not exist");
+    ).rejects.toThrow(/path\/to\/non-existent-export\.mjs' does not exist$/);
   });
 
   it('should throw if path is a directory', async () => {
@@ -59,8 +59,17 @@ describe('importModule', () => {
   it('should throw if file is not valid JS', async () => {
     await expect(
       importModule({ filepath: path.join(mockDir, 'invalid-js-file.json') }),
-    ).rejects.toThrow(
-      `${path.join(mockDir, 'invalid-js-file.json')} is not a valid JS file`,
-    );
+    ).rejects.toThrow(/invalid-js-file\.json/);
+  });
+
+  it('should load a TS module using tsconfig paths', async () => {
+    await expect(
+      importModule({
+        filepath: path.join(mockDir, 'uses-path-alias.ts'),
+        tsconfig: path.join(mockDir, 'tsconfig-paths-test.json'),
+      }),
+    ).resolves.toEqual({
+      value: 'helper-module-value',
+    });
   });
 });

packages/utils/src/lib/import-module.ts

@@ -183,20 +183,25 @@ export async function createTsJiti(
     ? await jitiOptionsFromTsConfig(validPath)
     : {};
 
+  const mergedAlias = {
+    ...jitiOptions.alias,
+    ...tsDerivedJitiOptions.alias,
+  };
+
   return createJiti(id, {
     ...jitiOptions,
     ...tsDerivedJitiOptions,
-    alias: {
-      ...jitiOptions.alias,
-      ...tsDerivedJitiOptions.alias,
-    },
+    alias: mergedAlias,
     nativeModules: [
       ...new Set([
         ...JITI_NATIVE_MODULES,
         ...(jitiOptions.nativeModules ?? []),
       ]),
     ],
-    tryNative: true,
+    // Don't use native imports when we have aliases to resolve
+    // When tryNative is true, jiti attempts to use native Node.js imports first,
+    // which don't understand path aliases and will fail with ERR_MODULE_NOT_FOUND
+    tryNative: Object.keys(mergedAlias).length === 0,
   });
 }
 

packages/utils/src/lib/import-module.unit.test.ts

@@ -109,6 +109,23 @@ describe('parseTsConfigToJitiConfig', () => {
       jsx: true,
     });
   });
+
+  it('handles path alias without wildcards and no baseUrl', () => {
+    const compilerOptions: CompilerOptions = {
+      paths: {
+        '@test/helper': ['./helper-module.ts'],
+      },
+    };
+
+    const tsconfigDir = '/Users/test/project/mocks';
+    const result = parseTsConfigToJitiConfig(compilerOptions, tsconfigDir);
+
+    expect(result).toStrictEqual({
+      alias: {
+        '@test/helper': expect.pathToEndWith('mocks/helper-module.ts'),
+      },
+    });
+  });
 });
 
 describe('toFileUrl', () => {