@bunup/dts 0.14.30 → 0.14.32

package/dist/index.js

@@ -7,7 +7,7 @@ import { resolveTsImportPath } from "ts-import-resolver";
 // src/constants.ts
 var EMPTY_EXPORT = "export {};";
 
-// src/fake-js.ts
+// src/fake/dts-to-fake-js.ts
 import { parse } from "@babel/parser";
 
 // src/re.ts
@@ -53,6 +53,35 @@ function hasDefaultExportModifier(node, text) {
 function isDefaultReExport(node) {
   return node.type === "ExportDefaultDeclaration" && node.declaration?.type === "Identifier";
 }
+function isUnnamedDefaultExport(node) {
+  if (node.type !== "ExportDefaultDeclaration") {
+    return false;
+  }
+  const declaration = node.declaration;
+  if (!declaration) {
+    return false;
+  }
+  if ((declaration.type === "FunctionDeclaration" || declaration.type === "TSDeclareFunction") && !declaration.id) {
+    return true;
+  }
+  if (declaration.type === "ClassDeclaration" && !declaration.id) {
+    return true;
+  }
+  return false;
+}
+function assignNameToUnnamedDefaultExport(text, varName) {
+  const functionPattern = /export\s+default\s+function\s*([(<])/;
+  const functionMatch = text.match(functionPattern);
+  if (functionMatch) {
+    return text.replace(functionPattern, `export default function ${varName}$1`);
+  }
+  const classPattern = /export\s+default\s+class\s*([{]|extends|implements)/;
+  const classMatch = text.match(classPattern);
+  if (classMatch) {
+    return text.replace(classPattern, `export default class ${varName} $1`);
+  }
+  return text;
+}
 function getName(node, source) {
   if (!node)
     return null;
@@ -165,6 +194,11 @@ function getShortFilePath(filePath, maxLength = 3) {
   const shortPath = fileParts.slice(-maxLength).join("/");
   return shortPath;
 }
+function generateVarName(index) {
+  const letter = String.fromCharCode(97 + index % 26);
+  const suffix = Math.floor(index / 26);
+  return suffix === 0 ? letter : `${letter}${suffix - 1}`;
+}
 function generateRandomString(length = 10) {
   return Array.from({ length }, () => String.fromCharCode(97 + Math.floor(Math.random() * 26))).join("");
 }
@@ -222,7 +256,20 @@ function minifyDts(dts) {
   }).code;
 }
 
-// src/fake-js.ts
+// src/fake/utils.ts
+var MARKERS = {
+  NEWLINE: "_NL_",
+  TAB: "_TB_"
+};
+function escapeNewlinesAndTabs(text) {
+  return text.replace(/\n/g, MARKERS.NEWLINE).replace(/\t/g, MARKERS.TAB);
+}
+function unescapeNewlinesAndTabs(text) {
+  return text.replace(new RegExp(MARKERS.NEWLINE, "g"), `
+`).replace(new RegExp(MARKERS.TAB, "g"), "\t");
+}
+
+// src/fake/dts-to-fake-js.ts
 async function dtsToFakeJs(dtsContent) {
   const parsed = parse(dtsContent, {
     sourceType: "module",
@@ -234,19 +281,23 @@ async function dtsToFakeJs(dtsContent) {
   for (const name of getAllImportNames(parsed.program.body)) {
     referencedNames.add(name);
   }
-  for (const statement of parsed.program.body) {
+  for (const [index, statement] of parsed.program.body.entries()) {
     if (isNullOrUndefined(statement.start) || isNullOrUndefined(statement.end)) {
       continue;
     }
-    const statementText = dtsContent.substring(statement.start, statement.end);
+    let statementText = dtsContent.substring(statement.start, statement.end);
     const name = getName(statement, dtsContent);
+    const jsVarName = name || generateVarName(index);
     if (name) {
       referencedNames.add(name);
     }
     const isDefaultExport = hasDefaultExportModifier(statement, statementText);
-    const varName = name || generateRandomString();
+    if (isDefaultExport && isUnnamedDefaultExport(statement)) {
+      statementText = assignNameToUnnamedDefaultExport(statementText, jsVarName);
+      referencedNames.add(jsVarName);
+    }
     if (isDefaultExport) {
-      result.push(`export { ${varName} as default };`);
+      result.push(`export { ${jsVarName} as default }`);
       if (isDefaultReExport(statement)) {
         continue;
       }
@@ -261,24 +312,55 @@ async function dtsToFakeJs(dtsContent) {
     }
     let leadingComment = null;
     leadingComment = getCommentText(statement.leadingComments);
-    let statementTextWithCommentsAttatched = `${leadingComment ? `${leadingComment}
+    let statementTextWithCommentsAttached = `${leadingComment ? `${leadingComment}
 ` : ""}${statementText}`;
     const isExported = hasExportModifier(statement, statementText);
     if (isExported) {
-      statementTextWithCommentsAttatched = removeExportSyntaxes(statementTextWithCommentsAttatched);
+      statementTextWithCommentsAttached = removeExportSyntaxes(statementTextWithCommentsAttached);
     }
-    const tokens = tokenizeText(statementTextWithCommentsAttatched, referencedNames);
-    result.push(`var ${varName} = [${tokens.join(", ")}];`);
-    if (isExported && !isDefaultExport && !exportedNames.has(varName)) {
-      result.push(`export { ${varName} };`);
-      exportedNames.add(varName);
+    const tokens = tokenizeText(statementTextWithCommentsAttached, referencedNames);
+    result.push(`var ${jsVarName} = [${tokens.join(", ")}];`);
+    if (isExported && !isDefaultExport && !exportedNames.has(jsVarName)) {
+      if (isDefaultExport) {
+        result.push(`export { ${jsVarName} as default };`);
+      } else {
+        result.push(`export { ${jsVarName} };`);
+      }
+      exportedNames.add(jsVarName);
     }
   }
   return result.join(`
 `);
 }
+function jsifyImportExport(text) {
+  let result = text.replace(IMPORT_TYPE_RE, "import ").replace(EXPORT_TYPE_RE, "export ").replace(IMPORT_EXPORT_NAMES_RE, (_, keyword, names) => `${keyword} {${names.replace(TYPE_WORD_RE, "")}}`);
+  result = result.replace(IMPORT_EXPORT_WITH_DEFAULT_RE, (_, keyword, defaultPart = "", names = "") => {
+    const cleanedNames = names.replace(TYPE_WORD_RE, "");
+    return `${keyword}${defaultPart}{${cleanedNames}}`;
+  });
+  return result;
+}
+function tokenizeText(text, referencedNames) {
+  const tokens = [];
+  let match;
+  TOKENIZE_RE.lastIndex = 0;
+  while (true) {
+    match = TOKENIZE_RE.exec(text);
+    if (match === null)
+      break;
+    const token = match[0];
+    if (isLikelyVariableOrTypeName(token) || referencedNames.has(token)) {
+      tokens.push(token);
+    } else {
+      tokens.push(JSON.stringify(escapeNewlinesAndTabs(token)));
+    }
+  }
+  return tokens;
+}
+// src/fake/fake-js-to-dts.ts
+import { parse as parse2 } from "@babel/parser";
 async function fakeJsToDts(fakeJsContent) {
-  const parseResult = parse(fakeJsContent, {
+  const parseResult = parse2(fakeJsContent, {
     sourceType: "module",
     attachComment: false
   });
@@ -318,31 +400,6 @@ async function fakeJsToDts(fakeJsContent) {
   return resultParts.join(`
 `);
 }
-function jsifyImportExport(text) {
-  let result = text.replace(IMPORT_TYPE_RE, "import ").replace(EXPORT_TYPE_RE, "export ").replace(IMPORT_EXPORT_NAMES_RE, (_, keyword, names) => `${keyword} {${names.replace(TYPE_WORD_RE, "")}}`);
-  result = result.replace(IMPORT_EXPORT_WITH_DEFAULT_RE, (_, keyword, defaultPart = "", names = "") => {
-    const cleanedNames = names.replace(TYPE_WORD_RE, "");
-    return `${keyword}${defaultPart}{${cleanedNames}}`;
-  });
-  return result;
-}
-function tokenizeText(text, referencedNames) {
-  const tokens = [];
-  let match;
-  TOKENIZE_RE.lastIndex = 0;
-  while (true) {
-    match = TOKENIZE_RE.exec(text);
-    if (match === null)
-      break;
-    const token = match[0];
-    if (isLikelyVariableOrTypeName(token) || referencedNames.has(token)) {
-      tokens.push(token);
-    } else {
-      tokens.push(JSON.stringify(escapeNewlinesAndTabs(token)));
-    }
-  }
-  return tokens;
-}
 function processTokenArray(arrayLiteral) {
   if (arrayLiteral.type !== "ArrayExpression") {
     return null;
@@ -379,13 +436,6 @@ function processTokenElement(element) {
   }
   return null;
 }
-function escapeNewlinesAndTabs(text) {
-  return text.replace(/\n/g, "__bunup_dts_intermediate_new__line__").replace(/\t/g, "__bunup_dts_intermediate__tab__");
-}
-function unescapeNewlinesAndTabs(text) {
-  return text.replace(/__bunup_dts_intermediate_new__line__/g, `
-`).replace(/__bunup_dts_intermediate__tab__/g, "\t");
-}
 function handleNamespace(stmt) {
   const expr = stmt.expression;
   if (!expr || expr.type !== "CallExpression" || expr.callee?.type !== "Identifier" || expr.arguments?.length !== 2 || expr.arguments[0]?.type !== "Identifier" || expr.arguments[1]?.type !== "ObjectExpression") {
@@ -407,7 +457,6 @@ function handleNamespace(stmt) {
   export { ${properties.join(", ")} };
 }`;
 }
-
 // src/resolver.ts
 import { dirname } from "node:path";
 import process2 from "node:process";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bunup/dts",
-	"version": "0.14.30",
+	"version": "0.14.32",
 	"description": "An extremely fast TypeScript declaration bundler built on Bun's native bundler.",
 	"homepage": "https://github.com/bunup/dts#readme",
 	"bugs": {
@@ -31,6 +31,7 @@
 		"lint": "biome check .",
 		"lint:fix": "biome check --write .",
 		"release": "bumpp --commit --push --tag",
+		"play": "bun run playground/play.ts",
 		"test": "bun test",
 		"test:coverage": "bun test --coverage",
 		"test:watch": "bun test --watch",