@bunup/dts 0.14.47 → 0.14.49

package/dist/index.js

@@ -273,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) {
@@ -282,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);
@@ -323,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);
     }
@@ -348,7 +358,7 @@ function jsifyImportExport(text) {
   });
   return result;
 }
-function tokenizeText(text, referencedNames) {
+function tokenizeText(text, referencedNames, staticImportedVars) {
   const tokens = [];
   const extras = [];
   let match;
@@ -360,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 {
@@ -378,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
@@ -387,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;
@@ -402,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 {
@@ -852,7 +865,7 @@ 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" ? getOriginalEntrypointFromOutputPath(result.metafile, output.path, cwd) : undefined;
+      const entrypoint = output.kind === "entry-point" ? cleanPath(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);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bunup/dts",
-	"version": "0.14.47",
+	"version": "0.14.49",
 	"description": "An extremely fast TypeScript declaration bundler built on Bun's native bundler.",
 	"homepage": "https://github.com/bunup/dts#readme",
 	"bugs": {