@bunup/dts 0.14.50 → 0.14.52

package/dist/index.js

@@ -282,6 +282,91 @@ function generateFixedStringFromString(str) {
   }
   return Math.abs(hash).toString(36);
 }
+function convertDynamicImportToStatic(dynamicImport) {
+  const importMatch = dynamicImport.match(/^import\s*\(\s*(['"`])(.+?)\1\s*\)((?:\.[a-zA-Z_$][a-zA-Z0-9_$]*|\[(['"`]).+?\4\])*)$/);
+  if (!importMatch) {
+    throw new Error("Invalid dynamic import format");
+  }
+  const modulePath = importMatch[2];
+  const propertyAccess = importMatch[3] || "";
+  if (!propertyAccess) {
+    const importIdentifier = `import_${generateFixedStringFromString(modulePath ?? "import")}`;
+    return {
+      declarations: `import * as ${importIdentifier} from '${modulePath}';`,
+      variableName: importIdentifier
+    };
+  }
+  const firstProperty = extractFirstProperty(propertyAccess);
+  const remainingAccess = propertyAccess.slice(firstProperty.accessLength);
+  if (firstProperty.isValidIdentifier) {
+    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)}_${generateFixedStringFromString(lastProperty)}`;
+      declarations += `
+var ${varName} = ${uniqueName}${remainingAccess};`;
+      finalVariable = varName;
+    }
+    return {
+      declarations,
+      variableName: finalVariable
+    };
+  } else {
+    const importIdentifier = `import_${generateFixedStringFromString(modulePath ?? "import")}`;
+    const lastProperty = extractLastProperty(propertyAccess);
+    const varName = `${createValidIdentifier(lastProperty)}_${generateFixedStringFromString(lastProperty)}`;
+    const declarations = `import * as ${importIdentifier} from '${modulePath}';
+var ${varName} = ${importIdentifier}${propertyAccess};`;
+    return {
+      declarations,
+      variableName: varName
+    };
+  }
+}
+function extractFirstProperty(propertyAccess) {
+  const dotMatch = propertyAccess.match(/^\.([a-zA-Z_$][a-zA-Z0-9_$]*)/);
+  if (dotMatch) {
+    return {
+      name: dotMatch[1],
+      accessLength: dotMatch[0].length,
+      isValidIdentifier: true
+    };
+  }
+  const bracketMatch = propertyAccess.match(/^\[(['"`])(.+?)\1\]/);
+  if (bracketMatch) {
+    const propName = bracketMatch[2];
+    const isValid = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(propName);
+    return {
+      name: propName,
+      accessLength: bracketMatch[0].length,
+      isValidIdentifier: isValid
+    };
+  }
+  throw new Error("Invalid property access");
+}
+function extractLastProperty(propertyAccess) {
+  const bracketMatch = propertyAccess.match(/\[(['"`])(.+?)\1\]$/);
+  if (bracketMatch) {
+    return bracketMatch[2];
+  }
+  const dotMatch = propertyAccess.match(/\.([a-zA-Z_$][a-zA-Z0-9_$]*)$/);
+  if (dotMatch) {
+    return dotMatch[1];
+  }
+  return "value";
+}
+function createValidIdentifier(name) {
+  let identifier = name.replace(/[^a-zA-Z0-9_$]/g, "_");
+  if (/^\d/.test(identifier)) {
+    identifier = `_${identifier}`;
+  }
+  if (!identifier) {
+    identifier = "_value";
+  }
+  return identifier;
+}
 
 // src/fake/dts-to-fake-js.ts
 async function dtsToFakeJs(dtsContent) {
@@ -292,7 +377,14 @@ async function dtsToFakeJs(dtsContent) {
   const referencedNames = new Set;
   const exportedNames = new Set;
   const staticImportedVars = new Set;
+  const namespaceMembers = new Map;
   const result = [];
+  const exportAssignmentNames = new Set;
+  for (const stmt of parsed.program.body) {
+    if (stmt.type === "TSExportAssignment" && stmt.expression.type === "Identifier") {
+      exportAssignmentNames.add(stmt.expression.name);
+    }
+  }
   for (const name of getAllImportNames(parsed.program.body)) {
     referencedNames.add(name);
   }
@@ -325,6 +417,57 @@ async function dtsToFakeJs(dtsContent) {
       result.push(jsImportExport);
       continue;
     }
+    if (statement.type === "TSExportAssignment") {
+      if (statement.expression.type === "Identifier") {
+        result.push(`export { ${statement.expression.name} as default }`);
+        const members = namespaceMembers.get(statement.expression.name);
+        if (members) {
+          for (const member of members) {
+            if (!exportedNames.has(member)) {
+              result.push(`export { ${member} };`);
+              exportedNames.add(member);
+            }
+          }
+        }
+      } else if (statement.expression.start && statement.expression.end) {
+        result.push(`export default ${dtsContent.substring(statement.expression.start, statement.expression.end)}`);
+      }
+      continue;
+    }
+    if (statement.type === "TSModuleDeclaration" && statement.body?.type === "TSModuleBlock" && statement.id?.type === "Identifier") {
+      const memberNames = [];
+      const shouldExportMembers = hasExportModifier(statement, statementText) || exportAssignmentNames.has(name ?? "");
+      for (const member of statement.body.body) {
+        if (isNullOrUndefined(member.start) || isNullOrUndefined(member.end)) {
+          continue;
+        }
+        const memberText = dtsContent.substring(member.start, member.end);
+        const memberName = getName(member, dtsContent);
+        if (!memberName)
+          continue;
+        memberNames.push(memberName);
+        referencedNames.add(memberName);
+        const leadingComment2 = getCommentText(member.leadingComments);
+        let memberTextWithComments = `${leadingComment2 ? `${leadingComment2}
+` : ""}${memberText}`;
+        if (hasExportModifier(member, memberText)) {
+          memberTextWithComments = removeExportSyntaxes(memberTextWithComments);
+        }
+        const { tokens: tokens2, extras: extras2 } = tokenizeText(memberTextWithComments, referencedNames, staticImportedVars);
+        for (const extra of extras2) {
+          result.push(extra);
+        }
+        result.push(`var ${memberName} = [${tokens2.join(", ")}];`);
+        if (shouldExportMembers && !exportedNames.has(memberName)) {
+          result.push(`export { ${memberName} };`);
+          exportedNames.add(memberName);
+        }
+      }
+      if (name) {
+        namespaceMembers.set(name, memberNames);
+      }
+      continue;
+    }
     let leadingComment = null;
     leadingComment = getCommentText(statement.leadingComments);
     let statementTextWithCommentsAttached = `${leadingComment ? `${leadingComment}
@@ -383,91 +526,6 @@ function tokenizeText(text, referencedNames, staticImportedVars) {
   }
   return { tokens, extras };
 }
-function convertDynamicImportToStatic(dynamicImport) {
-  const importMatch = dynamicImport.match(/^import\s*\(\s*(['"`])(.+?)\1\s*\)((?:\.[a-zA-Z_$][a-zA-Z0-9_$]*|\[(['"`]).+?\4\])*)$/);
-  if (!importMatch) {
-    throw new Error("Invalid dynamic import format");
-  }
-  const modulePath = importMatch[2];
-  const propertyAccess = importMatch[3] || "";
-  if (!propertyAccess) {
-    const importIdentifier = `import_${generateFixedStringFromString(modulePath ?? "import")}`;
-    return {
-      declarations: `import * as ${importIdentifier} from '${modulePath}';`,
-      variableName: importIdentifier
-    };
-  }
-  const firstProperty = extractFirstProperty(propertyAccess);
-  const remainingAccess = propertyAccess.slice(firstProperty.accessLength);
-  if (firstProperty.isValidIdentifier) {
-    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)}_${generateFixedStringFromString(lastProperty)}`;
-      declarations += `
-var ${varName} = ${uniqueName}${remainingAccess};`;
-      finalVariable = varName;
-    }
-    return {
-      declarations,
-      variableName: finalVariable
-    };
-  } else {
-    const importIdentifier = `import_${generateFixedStringFromString(modulePath ?? "import")}`;
-    const lastProperty = extractLastProperty(propertyAccess);
-    const varName = `${createValidIdentifier(lastProperty)}_${generateFixedStringFromString(lastProperty)}`;
-    const declarations = `import * as ${importIdentifier} from '${modulePath}';
-var ${varName} = ${importIdentifier}${propertyAccess};`;
-    return {
-      declarations,
-      variableName: varName
-    };
-  }
-}
-function extractFirstProperty(propertyAccess) {
-  const dotMatch = propertyAccess.match(/^\.([a-zA-Z_$][a-zA-Z0-9_$]*)/);
-  if (dotMatch) {
-    return {
-      name: dotMatch[1],
-      accessLength: dotMatch[0].length,
-      isValidIdentifier: true
-    };
-  }
-  const bracketMatch = propertyAccess.match(/^\[(['"`])(.+?)\1\]/);
-  if (bracketMatch) {
-    const propName = bracketMatch[2];
-    const isValid = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(propName);
-    return {
-      name: propName,
-      accessLength: bracketMatch[0].length,
-      isValidIdentifier: isValid
-    };
-  }
-  throw new Error("Invalid property access");
-}
-function extractLastProperty(propertyAccess) {
-  const bracketMatch = propertyAccess.match(/\[(['"`])(.+?)\1\]$/);
-  if (bracketMatch) {
-    return bracketMatch[2];
-  }
-  const dotMatch = propertyAccess.match(/\.([a-zA-Z_$][a-zA-Z0-9_$]*)$/);
-  if (dotMatch) {
-    return dotMatch[1];
-  }
-  return "value";
-}
-function createValidIdentifier(name) {
-  let identifier = name.replace(/[^a-zA-Z0-9_$]/g, "_");
-  if (/^\d/.test(identifier)) {
-    identifier = `_${identifier}`;
-  }
-  if (!identifier) {
-    identifier = "_value";
-  }
-  return identifier;
-}
 // src/fake/fake-js-to-dts.ts
 import { parse as parse2 } from "@babel/parser";
 async function fakeJsToDts(fakeJsContent) {

package/package.json

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