fix(dts): handle dir + file of same name (#245)

unjs · Sep 10, 2024 · f85db94 · f85db94
1 parent 580b67c
commit f85db94
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/src/utils/dts.ts b/src/utils/dts.ts
@@ -45,6 +45,8 @@ export async function getDeclarations(
   return extractDeclarations(vfs, inputFiles, opts);
 }
 
+const EXT_RE = /\.(m|c)?(ts|js)$/;
+
 export function extractDeclarations(
   vfs: Map<string, string>,
   inputFiles: string[],
@@ -56,8 +58,7 @@ export function extractDeclarations(
     const dtsFilename = filename.replace(/\.(m|c)?(ts|js)x?$/, ".d.$1ts");
     let contents = vfs.get(dtsFilename) || "";
     if (opts?.addRelativeDeclarationExtensions) {
-      const ext =
-        filename.match(/\.(m|c)?(ts|js)$/)?.[0].replace(/ts$/, "js") || ".js";
+      const ext = filename.match(EXT_RE)?.[0].replace(/ts$/, "js") || ".js";
       const imports = findStaticImports(contents);
       const exports = findExports(contents);
       const typeExports = findTypeExports(contents);
@@ -67,9 +68,16 @@ export function extractDeclarations(
         }
         let isDir = false;
         try {
-          isDir = statSync(
-            resolve(filename, "..", spec.specifier),
-          ).isDirectory();
+          const declaration = resolve(
+            filename,
+            "..",
+            spec.specifier + ext.replace(EXT_RE, ".d.$1ts"),
+          );
+          if (!vfs.get(declaration)) {
+            isDir = statSync(
+              resolve(filename, "..", spec.specifier),
+            ).isDirectory();
+          }
         } catch {
           // file does not exist
         }

diff --git a/test/fixture/src/bar.ts b/test/fixture/src/bar.ts
@@ -0,0 +1 @@
+export default "bar";
diff --git a/test/fixture/src/dir-export.ts b/test/fixture/src/dir-export.ts
@@ -1 +1,2 @@
+export { default as bar } from "./bar";
 export * from "./star";
diff --git a/test/index.test.ts b/test/index.test.ts
@@ -24,6 +24,7 @@ describe("mkdist", () => {
     expect(writtenFiles.sort()).toEqual(
       [
         "dist/README.md",
+        "dist/bar.mjs",
         "dist/demo.css",
         "dist/dir-export.mjs",
         "dist/foo.mjs",
@@ -101,6 +102,8 @@ describe("mkdist", () => {
     expect(writtenFiles.sort()).toEqual(
       [
         "dist/README.md",
+        "dist/bar.d.ts",
+        "dist/bar.mjs",
         "dist/demo.css",
         "dist/dir-export.d.ts",
         "dist/dir-export.mjs",
@@ -150,7 +153,8 @@ describe("mkdist", () => {
       `);
     expect(await readFile(resolve(rootDir, "dist/dir-export.d.ts"), "utf8"))
       .toMatchInlineSnapshot(`
-        "export * from "./star/index.js";
+        "export { default as bar } from "./bar.js";
+        export * from "./star/index.js";
         "
       `);
     expect(
@@ -207,6 +211,7 @@ describe("mkdist", () => {
     expect(writtenFiles.sort()).toEqual(
       [
         "dist/README.md",
+        "dist/bar.mjs",
         "dist/demo.scss",
         "dist/_base.scss",
         "dist/dir-export.mjs",
@@ -449,6 +454,8 @@ describe("mkdist with vue-tsc v1", () => {
     expect(writtenFiles.sort()).toEqual(
       [
         "dist/README.md",
+        "dist/bar.d.ts",
+        "dist/bar.mjs",
         "dist/demo.css",
         "dist/dir-export.d.ts",
         "dist/dir-export.mjs",
@@ -564,6 +571,8 @@ describe("mkdist with vue-tsc ~v2.0.21", () => {
     expect(writtenFiles.sort()).toEqual(
       [
         "dist/README.md",
+        "dist/bar.d.ts",
+        "dist/bar.mjs",
         "dist/demo.css",
         "dist/dir-export.d.ts",
         "dist/dir-export.mjs",