From e1e0935929cedc82bc646d2ab9aee09d6a9a7b8e Mon Sep 17 00:00:00 2001
From: Yasuhiro SHIMIZU <the.phantom.bane@gmail.com>
Date: Wed, 5 Jun 2024 05:49:21 +0900
Subject: [PATCH] fix: generate stub types of with explicit extension import if
 pkg type is `module` (#371)

---
 src/builder/rollup.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/builder/rollup.ts b/src/builder/rollup.ts
index 47894bc8..dde6d5ee 100644
--- a/src/builder/rollup.ts
+++ b/src/builder/rollup.ts
@@ -62,6 +62,7 @@ export async function rollupBuild(ctx: BuildContext) {
         entry.name!,
       );
 
+      const isESM = ctx.pkg.type === "module";
       const resolvedEntry = normalize(
         tryResolve(entry.input, ctx.options.rootDir) || entry.input,
       );
@@ -69,6 +70,9 @@ export async function rollupBuild(ctx: BuildContext) {
         0,
         Math.max(0, resolvedEntry.length - extname(resolvedEntry).length),
       );
+      const resolvedEntryForTypeImport = isESM
+        ? `${resolvedEntry.replace(/(\.m?)(ts)$/, "$1js")}`
+        : resolvedEntryWithoutExt;
       const code = await fsp.readFile(resolvedEntry, "utf8");
       const shebang = getShebang(code);
 
@@ -85,7 +89,7 @@ export async function rollupBuild(ctx: BuildContext) {
               `const _jiti = jiti(null, ${serializedJitiOptions})`,
               "",
               `/** @type {import(${JSON.stringify(
-                resolvedEntryWithoutExt,
+                resolvedEntryForTypeImport,
               )})} */`,
               `module.exports = _jiti(${JSON.stringify(resolvedEntry)})`,
             ].join("\n"),
@@ -114,7 +118,7 @@ export async function rollupBuild(ctx: BuildContext) {
             "",
             `const _jiti = jiti(null, ${serializedJitiOptions})`,
             "",
-            `/** @type {import(${JSON.stringify(resolvedEntryWithoutExt)})} */`,
+            `/** @type {import(${JSON.stringify(resolvedEntryForTypeImport)})} */`,
             `const _module = await _jiti.import(${JSON.stringify(
               resolvedEntry,
             )});`,
@@ -129,10 +133,10 @@ export async function rollupBuild(ctx: BuildContext) {
       await writeFile(
         output + ".d.ts",
         [
-          `export * from ${JSON.stringify(resolvedEntryWithoutExt)};`,
+          `export * from ${JSON.stringify(resolvedEntryForTypeImport)};`,
           hasDefaultExport
             ? `export { default } from ${JSON.stringify(
-                resolvedEntryWithoutExt,
+                resolvedEntryForTypeImport,
               )};`
             : "",
         ].join("\n"),