fix: autoAddExts usage with type imports

unplugin · Nov 21, 2024 · 95ccd8f · 95ccd8f
1 parent d5fb870
commit 95ccd8f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -150,7 +150,8 @@ export const IsolatedDecl: UnpluginInstance<Options | undefined, false> =
           const resolved = await resolve(context, i.source.value, id)
           if (!resolved || resolved.external) continue
           if (resolved.id.endsWith('.ts') || resolved.id.endsWith('.tsx')) {
-            i.source.value = `${i.source.value}.js`
+            i.source.value = `${((i.source as any).originalValue =
+              i.source.value)}.js`
             s.overwrite(i.source.start + 1, i.source.end - 1, i.source.value)
           }
         }
@@ -194,7 +195,13 @@ export const IsolatedDecl: UnpluginInstance<Options | undefined, false> =
       )
       for (const i of typeImports) {
         if (!i.source) continue
-        const resolved = (await resolve(context, i.source.value, id))?.id
+        const resolved = (
+          await resolve(
+            context,
+            (i.source as any).originalValue || i.source.value,
+            id,
+          )
+        )?.id
         if (resolved && filter(resolved) && !outputFiles[stripExt(resolved)]) {
           let source: string
           try {

diff --git a/tests/__snapshots__/rolldown.test.ts.snap b/tests/__snapshots__/rolldown.test.ts.snap
@@ -23,14 +23,14 @@ export { c, hello, num };
 export declare function Component(): React.JSX.Element;
 
 // temp/main.d.ts
-import { type Num } from "./types";
+import { type Num } from "./types.js";
 export type Str = string;
 export declare function hello(s: Str): Str;
 export declare let c: React.JSX.Element;
 export declare let num: Num;
 
 // temp/types.d.ts
-import type { Num2 } from "./types2";
+import type { Num2 } from "./types2.js";
 export type Num = Num2;
 
 // temp/types2.d.ts

diff --git a/tests/__snapshots__/rollup.test.ts.snap b/tests/__snapshots__/rollup.test.ts.snap
@@ -18,14 +18,14 @@ export { c, hello, num };
 export declare function Component(): React.JSX.Element;
 
 // temp/main.d.ts
-import { type Num } from './types';
+import { type Num } from './types.js';
 export type Str = string;
 export declare function hello(s: Str): Str;
 export declare let c: React.JSX.Element;
 export declare let num: Num;
 
 // temp/types.d.ts
-import type { Num2 } from './types2';
+import type { Num2 } from './types2.js';
 export type Num = Num2;
 
 // temp/types2.d.ts

diff --git a/tests/rolldown.test.ts b/tests/rolldown.test.ts
@@ -14,6 +14,7 @@ test('rolldown', async () => {
       UnpluginIsolatedDecl({
         extraOutdir: 'temp',
         transformer: 'oxc',
+        autoAddExts: true,
       }),
     ],
     logLevel: 'silent',

diff --git a/tests/rollup.test.ts b/tests/rollup.test.ts
@@ -41,6 +41,7 @@ describe('rollup', () => {
       plugins: [
         UnpluginIsolatedDecl({
           extraOutdir: 'temp',
+          autoAddExts: true,
         }),
         esbuild(),
       ],