@bunup/dts 0.14.46 → 0.14.48

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/generate.ts
 import { rm } from "node:fs/promises";
-import path2 from "node:path";
+import path3 from "node:path";
 import { isolatedDeclaration } from "oxc-transform";
 import { resolveTsImportPath } from "ts-import-resolver";
 
@@ -155,13 +155,14 @@ import { normalize } from "node:path";
 import { loadConfig } from "coffi";
 import { minify } from "oxc-minify";
 import { isCI, isDevelopment } from "std-env";
-function isTypeScriptFile(path) {
-  if (!path)
+import path from "node:path";
+function isTypeScriptFile(path2) {
+  if (!path2)
     return false;
-  return TS_RE.test(path);
+  return TS_RE.test(path2);
 }
-function returnPathIfExists(path) {
-  return existsSync(path) ? path : null;
+function returnPathIfExists(path2) {
+  return existsSync(path2) ? path2 : null;
 }
 function getExtension(filename) {
   const match = filename.match(EXTENSION_REGEX);
@@ -208,8 +209,8 @@ function isDev() {
 function isNullOrUndefined(value) {
   return value === undefined || value === null;
 }
-function cleanPath(path) {
-  let cleaned = normalize(path).replace(/\\/g, "/");
+function cleanPath(path2) {
+  let cleaned = normalize(path2).replace(/\\/g, "/");
   cleaned = cleaned.replace(/^[a-zA-Z]:\//, "");
   cleaned = cleaned.replace(/^\/+/, "");
   cleaned = cleaned.replace(/\/+/g, "/");
@@ -255,6 +256,10 @@ function minifyDts(dts) {
     sourcemap: false
   }).code;
 }
+function getOriginalEntrypointFromOutputPath(metafile, outputPath, rootDir) {
+  const entryPoint = metafile?.outputs[outputPath]?.entryPoint;
+  return path.relative(rootDir, entryPoint);
+}
 
 // src/fake/utils.ts
 var MARKERS = {
@@ -268,6 +273,15 @@ function unescapeNewlinesAndTabs(text) {
   return text.replace(new RegExp(MARKERS.NEWLINE, "g"), `
 `).replace(new RegExp(MARKERS.TAB, "g"), "\t");
 }
+function generateFixedStringFromString(str) {
+  let hash = 0;
+  for (let i = 0;i < str.length; i++) {
+    const char = str.charCodeAt(i);
+    hash = (hash << 5) - hash + char;
+    hash = hash & hash;
+  }
+  return Math.abs(hash).toString(36);
+}
 
 // src/fake/dts-to-fake-js.ts
 async function dtsToFakeJs(dtsContent) {
@@ -277,6 +291,7 @@ async function dtsToFakeJs(dtsContent) {
   });
   const referencedNames = new Set;
   const exportedNames = new Set;
+  const staticImportedVars = new Set;
   const result = [];
   for (const name of getAllImportNames(parsed.program.body)) {
     referencedNames.add(name);
@@ -318,7 +333,7 @@ async function dtsToFakeJs(dtsContent) {
     if (isExported) {
       statementTextWithCommentsAttached = removeExportSyntaxes(statementTextWithCommentsAttached);
     }
-    const { tokens, extras } = tokenizeText(statementTextWithCommentsAttached, referencedNames);
+    const { tokens, extras } = tokenizeText(statementTextWithCommentsAttached, referencedNames, staticImportedVars);
     for (const extra of extras) {
       result.push(extra);
     }
@@ -343,7 +358,7 @@ function jsifyImportExport(text) {
   });
   return result;
 }
-function tokenizeText(text, referencedNames) {
+function tokenizeText(text, referencedNames, staticImportedVars) {
   const tokens = [];
   const extras = [];
   let match;
@@ -355,8 +370,11 @@ function tokenizeText(text, referencedNames) {
     const token = match[0];
     if (token.startsWith("import(")) {
       const staticImport = convertDynamicImportToStatic(token);
-      extras.push(staticImport.declarations);
       tokens.push(staticImport.variableName);
+      if (!staticImportedVars.has(staticImport.variableName)) {
+        extras.push(staticImport.declarations);
+        staticImportedVars.add(staticImport.variableName);
+      }
     } else if (isLikelyVariableOrTypeName(token) || referencedNames.has(token)) {
       tokens.push(token);
     } else {
@@ -373,7 +391,7 @@ function convertDynamicImportToStatic(dynamicImport) {
   const modulePath = importMatch[2];
   const propertyAccess = importMatch[3] || "";
   if (!propertyAccess) {
-    const importIdentifier = `import_${generateRandomString()}`;
+    const importIdentifier = `import_${generateFixedStringFromString(modulePath ?? "import")}`;
     return {
       declarations: `import * as ${importIdentifier} from '${modulePath}';`,
       variableName: importIdentifier
@@ -382,12 +400,12 @@ function convertDynamicImportToStatic(dynamicImport) {
   const firstProperty = extractFirstProperty(propertyAccess);
   const remainingAccess = propertyAccess.slice(firstProperty.accessLength);
   if (firstProperty.isValidIdentifier) {
-    const uniqueName = `${createValidIdentifier(firstProperty.name)}_${generateRandomString()}`;
+    const uniqueName = `${createValidIdentifier(firstProperty.name)}_${generateFixedStringFromString(firstProperty.name)}`;
     let declarations = `import { ${firstProperty.name} as ${uniqueName} } from '${modulePath}';`;
     let finalVariable = uniqueName;
     if (remainingAccess) {
       const lastProperty = extractLastProperty(remainingAccess);
-      const varName = `${createValidIdentifier(lastProperty)}_${generateRandomString()}`;
+      const varName = `${createValidIdentifier(lastProperty)}_${generateFixedStringFromString(lastProperty)}`;
       declarations += `
 var ${varName} = ${uniqueName}${remainingAccess};`;
       finalVariable = varName;
@@ -397,9 +415,9 @@ var ${varName} = ${uniqueName}${remainingAccess};`;
       variableName: finalVariable
     };
   } else {
-    const importIdentifier = `import_${generateRandomString()}`;
+    const importIdentifier = `import_${generateFixedStringFromString(modulePath ?? "import")}`;
     const lastProperty = extractLastProperty(propertyAccess);
-    const varName = `${createValidIdentifier(lastProperty)}_${generateRandomString()}`;
+    const varName = `${createValidIdentifier(lastProperty)}_${generateFixedStringFromString(lastProperty)}`;
     const declarations = `import * as ${importIdentifier} from '${modulePath}';
 var ${varName} = ${importIdentifier}${propertyAccess};`;
     return {
@@ -654,7 +672,7 @@ function createResolver({
 // src/typescript-compiler.ts
 import { mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import path from "node:path";
+import path2 from "node:path";
 async function runTypescriptCompiler(root, tsgo, tsconfig) {
   let executable = "tsc";
   if (tsgo) {
@@ -662,7 +680,7 @@ async function runTypescriptCompiler(root, tsgo, tsconfig) {
     const { default: getExePath } = await import(new URL("lib/getExePath.js", tsgoPackage).href);
     executable = getExePath();
   }
-  const dist = await mkdtemp(path.join(tmpdir(), "bunup-dts-"));
+  const dist = await mkdtemp(path2.join(tmpdir(), "bunup-dts-"));
   const proc = Bun.spawn([
     executable,
     "--noEmit",
@@ -691,7 +709,7 @@ async function runTypescriptCompiler(root, tsgo, tsconfig) {
 // src/generate.ts
 async function generateDts(entrypoints, options = {}) {
   const { resolve, preferredTsconfig, naming } = options;
-  const cwd = options.cwd ? path2.resolve(options.cwd) : process.cwd();
+  const cwd = options.cwd ? path3.resolve(options.cwd) : process.cwd();
   const tsconfig = await loadTsConfig(cwd, preferredTsconfig);
   if (options.inferTypes && !tsconfig.filepath) {
     throw new Error(`The "inferTypes" option requires a tsconfig.json file. Please create a tsconfig.json file in your project root with at least a basic configuration:
@@ -707,14 +725,14 @@ async function generateDts(entrypoints, options = {}) {
 
 ` + 'Alternatively, you can specify a custom path using the "preferredTsconfig" option.');
   }
-  const nonAbsoluteEntrypoints = entrypoints.filter((entrypoint) => !path2.isAbsolute(entrypoint));
+  const nonAbsoluteEntrypoints = entrypoints.filter((entrypoint) => !path3.isAbsolute(entrypoint));
   const resolvedEntrypoints = await getFilesFromGlobs(nonAbsoluteEntrypoints, cwd);
-  const absoluteEntrypoints = entrypoints.filter((entrypoint) => path2.isAbsolute(entrypoint));
+  const absoluteEntrypoints = entrypoints.filter((entrypoint) => path3.isAbsolute(entrypoint));
   if (!filterTypescriptFiles([...resolvedEntrypoints, ...absoluteEntrypoints]).length) {
     throw new Error("One or more of the entrypoints you provided do not exist. Please check that each entrypoint points to a valid file.");
   }
   const finalEntryPoints = [
-    ...filterTypescriptFiles(resolvedEntrypoints).map((entry) => path2.resolve(path2.join(cwd, entry))),
+    ...filterTypescriptFiles(resolvedEntrypoints).map((entry) => path3.resolve(path3.join(cwd, entry))),
     ...filterTypescriptFiles(absoluteEntrypoints)
   ];
   const collectedErrors = [];
@@ -760,8 +778,8 @@ async function generateDts(entrypoints, options = {}) {
             declaration = sourceText;
           } else {
             if (options.inferTypes && tsCompiledDist) {
-              const relativePath = path2.relative(cwd, args.path);
-              const declarationPath = replaceExtension(path2.join(tsCompiledDist, relativePath), ".d.ts");
+              const relativePath = path3.relative(cwd, args.path);
+              const declarationPath = replaceExtension(path3.join(tsCompiledDist, relativePath), ".d.ts");
               declaration = await Bun.file(declarationPath).text();
             } else {
               const isolatedDeclarationResult = isolatedDeclaration(args.path, sourceText);
@@ -804,7 +822,8 @@ async function generateDts(entrypoints, options = {}) {
       minify: options.minify,
       root: options.root,
       throw: false,
-      tsconfig: options.preferredTsconfig ? path2.resolve(cwd, options.preferredTsconfig) : undefined
+      tsconfig: options.preferredTsconfig ? path3.resolve(cwd, options.preferredTsconfig) : undefined,
+      metafile: true
     });
     if (!result.success) {
       const logsStr = `${result.logs}`;
@@ -813,7 +832,7 @@ async function generateDts(entrypoints, options = {}) {
 
 `;
         if (tsconfig.filepath) {
-          errorMsg += `Using: ${path2.relative(cwd, tsconfig.filepath)}
+          errorMsg += `Using: ${path3.relative(cwd, tsconfig.filepath)}
 
 `;
         }
@@ -846,13 +865,18 @@ Ensure all your entrypoints match these patterns, or add them explicitly.
     for (const output of outputs) {
       const bundledFakeJsContent = await output.text();
       const dtsContent = await fakeJsToDts(bundledFakeJsContent);
-      const entrypoint = output.kind === "entry-point" ? entrypoints[bundledFiles.length] : undefined;
-      const chunkFileName = output.kind === "chunk" ? replaceExtension(path2.basename(output.path), getDeclarationExtensionFromJsExtension(getExtension(output.path))) : undefined;
+      const entrypoint = output.kind === "entry-point" ? getOriginalEntrypointFromOutputPath(result.metafile, output.path, cwd) : undefined;
+      const chunkFileName = output.kind === "chunk" ? replaceExtension(path3.basename(output.path), getDeclarationExtensionFromJsExtension(getExtension(output.path))) : undefined;
       const outputPath = cleanPath(replaceExtension(cleanPath(output.path), getDeclarationExtensionFromJsExtension(getExtension(output.path))));
       const treeshakedDts = isolatedDeclaration(`${generateRandomString()}.d.ts`, dtsContent);
       if (!treeshakedDts.code.length && !treeshakedDts.errors.length) {
         continue;
       }
+      if (treeshakedDts.errors.length && !treeshakedDts.code) {
+        throw new Error(`DTS treeshaking failed for ${entrypoint || outputPath}
+
+${JSON.stringify(treeshakedDts.errors, null, 2)}`);
+      }
       bundledFiles.push({
         kind: output.kind === "entry-point" ? "entry-point" : "chunk",
         entrypoint,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bunup/dts",
-	"version": "0.14.46",
+	"version": "0.14.48",
 	"description": "An extremely fast TypeScript declaration bundler built on Bun's native bundler.",
 	"homepage": "https://github.com/bunup/dts#readme",
 	"bugs": {
@@ -15,13 +15,13 @@
 		"url": "git+https://github.com/bunup/dts.git"
 	},
 	"dependencies": {
-		"@babel/parser": "^7.28.4",
+		"@babel/parser": "^7.28.6",
 		"coffi": "^0.1.37",
 		"oxc-minify": "^0.93.0",
-		"oxc-resolver": "^11.9.0",
+		"oxc-resolver": "^11.16.2",
 		"oxc-transform": "^0.93.0",
 		"picocolors": "^1.1.1",
-		"std-env": "^3.9.0",
+		"std-env": "^3.10.0",
 		"ts-import-resolver": "^0.1.23"
 	},
 	"scripts": {
@@ -37,11 +37,11 @@
 		"type-check": "tsc --noEmit"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.2.6",
-		"@types/bun": "^1.3.0",
-		"@typescript/native-preview": "^7.0.0-dev.20251019.1",
-		"bumpp": "^10.3.1",
-		"bunup": "^0.15.4",
+		"@biomejs/biome": "^2.3.11",
+		"@types/bun": "^1.3.6",
+		"@typescript/native-preview": "^7.0.0-dev.20260114.1",
+		"bumpp": "^10.4.0",
+		"bunup": "^0.16.17",
 		"simple-git-hooks": "^2.13.1",
 		"typescript": "^5.9.3"
 	},