rolldown-plugin-dts 0.27.11 → 0.27.12

package/dist/index.mjs

@@ -4,11 +4,9 @@ import { t as requireTS } from "./load-tsc-BKULZsrs.mjs";
 import { createRequire } from "node:module";
 import { createDebug } from "obug";
 import { importerId, include } from "rolldown/filter";
-import { b, is } from "yuku-ast";
-import { isIdentifierName } from "yuku-ast/identifier";
-import { nameOf } from "yuku-ast/utils";
+import { b, is, isIdentifierName, nameOf, walk, walkAsync } from "yuku-ast";
 import { print } from "yuku-codegen";
-import { parse, walk } from "yuku-parser";
+import { parse } from "yuku-parser";
 import { fork, spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { access, mkdtemp, readFile, rm } from "node:fs/promises";
@@ -483,11 +481,11 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 			else if ("id" in decl && decl.id) {
 				let binding = decl.id;
 				if (binding.type === "TSQualifiedName") binding = getIdFromTSEntityName(binding);
-				if (sideEffect) binding = b.identifier(`_${getIdentifierIndex(identifierMap, "")}`);
+				if (sideEffect) binding = b.Identifier({ name: `_${getIdentifierIndex(identifierMap, "")}` });
 				if (binding.type !== "Identifier") throw new Error(`Unexpected ${binding.type} declaration id`);
 				bindings.push(binding);
 			} else {
-				const binding = b.identifier("export_default");
+				const binding = b.Identifier({ name: "export_default" });
 				bindings.push(binding);
 				decl.id = binding;
 			}
@@ -503,32 +501,64 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 				params,
 				children
 			});
-			const declarationIdNode = b.numericLiteral(declarationId);
-			const depsBody = b.arrayExpression(deps);
-			const depsNode = b.arrowFunctionExpression(params.map(({ name }) => b.identifier(name)), depsBody);
-			const childrenNode = b.arrayExpression(children.map((node) => {
-				const placeholder = b.stringLiteral("");
-				placeholder.start = node.start;
-				placeholder.end = node.end;
-				return placeholder;
-			}));
-			const sideEffectNode = sideEffect && b.callExpression(b.identifier("sideEffect"), [bindings[0]]);
+			const declarationIdNode = b.Literal({
+				value: declarationId,
+				raw: String(declarationId)
+			});
+			const depsBody = b.ArrayExpression({ elements: deps });
+			const depsNode = b.ArrowFunctionExpression({
+				id: null,
+				generator: false,
+				async: false,
+				params: params.map(({ name }) => b.Identifier({ name })),
+				body: depsBody,
+				expression: true
+			});
+			const childrenNode = b.ArrayExpression({ elements: children.map((node) => b.Literal({
+				value: "",
+				raw: "\"\"",
+				start: node.start,
+				end: node.end
+			})) });
+			const sideEffectNode = sideEffect && b.CallExpression({
+				callee: b.Identifier({ name: "sideEffect" }),
+				arguments: [bindings[0]],
+				optional: false
+			});
 			const runtimeArrayNode = runtimeBindingArrayExpression([
 				declarationIdNode,
 				depsNode,
 				childrenNode,
 				...sideEffectNode ? [sideEffectNode] : []
 			]);
-			const runtimeAssignment = b.variableDeclaration("var", [b.variableDeclarator(b.arrayPattern(bindings.map((binding) => ({
-				...binding,
-				typeAnnotation: null
-			}))), runtimeArrayNode)]);
+			const runtimeAssignment = b.VariableDeclaration({
+				kind: "var",
+				declarations: [b.VariableDeclarator({
+					id: b.ArrayPattern({ elements: bindings.map((binding) => ({
+						...binding,
+						typeAnnotation: null
+					})) }),
+					init: runtimeArrayNode
+				})]
+			});
 			if (isDefaultExport) {
-				appendStmts.push(b.exportNamedDeclaration(null, [b.exportSpecifier(bindings[0], b.identifier("default"))]));
+				appendStmts.push(b.ExportNamedDeclaration({
+					declaration: null,
+					specifiers: [b.ExportSpecifier({
+						local: bindings[0],
+						exported: b.Identifier({ name: "default" })
+					})],
+					source: null,
+					attributes: []
+				}));
 				setStmt(runtimeAssignment);
 			} else setDecl(runtimeAssignment);
 		}
-		if (sideEffects) appendStmts.push(b.expressionStatement(b.callExpression(b.identifier("sideEffect"), [])));
+		if (sideEffects) appendStmts.push(b.ExpressionStatement({ expression: b.CallExpression({
+			callee: b.Identifier({ name: "sideEffect" }),
+			arguments: [],
+			optional: false
+		}) }));
 		program.body = [
 			...Array.from(namespaceStmts.values()).map(({ stmt }) => stmt),
 			...program.body,
@@ -597,7 +627,7 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 			for (const [i, originalDep] of declaration.deps.entries()) {
 				let transformedDep = transformedDeps[i];
 				if (transformedDep.type === "UnaryExpression" && transformedDep.operator === "void") {
-					const undefinedDep = b.identifier("undefined");
+					const undefinedDep = b.Identifier({ name: "undefined" });
 					undefinedDep.start = transformedDep.start;
 					undefinedDep.end = transformedDep.end;
 					transformedDep = undefinedDep;
@@ -820,27 +850,19 @@ async function collectDependencies(context, node, importer, namespaceStmts, chil
 	const deps = /* @__PURE__ */ new Set();
 	const seen = /* @__PURE__ */ new Set();
 	const preserveImportTypeCache = /* @__PURE__ */ new Map();
-	const importSources = /* @__PURE__ */ new Set();
-	walk(node, { TSImportType(node) {
-		importSources.add(node.source.value);
-	} });
-	if (importSources.size) await Promise.all(Array.from(importSources, async (source) => {
-		const resolved = await context.resolve(source, importer);
-		preserveImportTypeCache.set(source, !resolved || !!resolved.external);
-	}));
 	const inferredStack = [];
 	let currentInferred = /* @__PURE__ */ new Set();
 	function isInferred(node) {
 		return node.type === "Identifier" && currentInferred.has(node.name);
 	}
-	walk(node, {
+	await walkAsync(node, {
 		enter(node) {
 			if (node.type === "TSConditionalType") {
 				const inferred = collectInferredNames(node.extendsType);
 				inferredStack.push(inferred);
 			}
 		},
-		leave(node, path) {
+		async leave(node, path) {
 			const { parent } = path;
 			if (node.type === "TSConditionalType") inferredStack.pop();
 			else if (parent?.type === "TSConditionalType") {
@@ -876,7 +898,12 @@ async function collectDependencies(context, node, importer, namespaceStmts, chil
 				case "TSImportType": {
 					seen.add(node);
 					const { source, qualifier } = node;
-					const dep = importNamespace(node, qualifier, source, namespaceStmts, identifierMap, preserveImportTypeCache);
+					const resolved = await context.resolve(source.value, importer);
+					if (!resolved || !!resolved.external) {
+						preserveImportTypeCache.set(source.value, true);
+						break;
+					}
+					const dep = importNamespace(node, qualifier, source, namespaceStmts, identifierMap);
 					if (dep) addDependency(dep);
 					break;
 				}
@@ -890,25 +917,35 @@ async function collectDependencies(context, node, importer, namespaceStmts, chil
 		deps.add(node);
 	}
 }
-function importNamespace(node, imported, source, namespaceStmts, identifierMap, preserveCache) {
-	if (preserveCache.get(source.value) ?? true) return;
+function importNamespace(node, imported, source, namespaceStmts, identifierMap) {
 	const sourceText = source.value.replaceAll(/\W/g, "_");
 	const localName = `_$${isIdentifierName(source.value) ? source.value : `${sourceText}${getIdentifierIndex(identifierMap, sourceText)}`}`;
-	let local = b.identifier(localName);
+	let local = b.Identifier({ name: localName });
 	if (namespaceStmts.has(source.value)) local = namespaceStmts.get(source.value).local;
 	else namespaceStmts.set(source.value, {
-		stmt: b.importDeclaration([b.importNamespaceSpecifier(local)], source),
+		stmt: b.ImportDeclaration({
+			specifiers: [b.ImportNamespaceSpecifier({ local })],
+			source,
+			phase: null,
+			attributes: []
+		}),
 		local
 	});
 	if (imported) {
 		const importedLeft = getIdFromTSEntityName(imported);
 		if (imported.type === "ThisExpression" || importedLeft.type === "ThisExpression") throw new Error("Cannot import `this` from module.");
-		overwriteNode(importedLeft, b.tsQualifiedName(local, { ...importedLeft }));
+		overwriteNode(importedLeft, b.TSQualifiedName({
+			left: local,
+			right: { ...importedLeft }
+		}));
 		local = imported;
 	}
 	let replacement = node;
 	if (node.typeArguments) {
-		overwriteNode(node, b.tsTypeReference(local, node.typeArguments));
+		overwriteNode(node, b.TSTypeReference({
+			typeName: local,
+			typeArguments: node.typeArguments
+		}));
 		replacement = local;
 	} else overwriteNode(node, local);
 	return {
@@ -961,7 +998,7 @@ function isRuntimeBindingArrayElements(elements) {
 	return is.NumericLiteral(declarationId) && deps?.type === "ArrowFunctionExpression" && children?.type === "ArrayExpression" && (!effect || effect.type === "CallExpression");
 }
 function runtimeBindingArrayExpression(elements) {
-	return b.arrayExpression([...elements]);
+	return b.ArrayExpression({ elements: [...elements] });
 }
 function isThisExpression(node) {
 	return is.Identifier(node, "this") || node.type === "ThisExpression" || node.type === "MemberExpression" && isThisExpression(node.object);
@@ -1017,7 +1054,7 @@ function patchImportExport(node, exportInfo, cjsDefault) {
 		}
 		if (cjsDefault && node.type === "ExportNamedDeclaration" && !node.source && node.specifiers.length === 1 && node.specifiers[0].type === "ExportSpecifier" && nameOf(node.specifiers[0].exported) === "default") {
 			const defaultExport = node.specifiers[0];
-			return b.tsExportAssignment(defaultExport.local);
+			return b.TSExportAssignment({ expression: defaultExport.local });
 		}
 	}
 }
@@ -1037,14 +1074,25 @@ function patchTsNamespace(nodes) {
 		if (!result) continue;
 		const [binding, exports] = result;
 		if (!exports.properties.length) continue;
-		const namespaceExport = b.exportNamedDeclaration(null, exports.properties.filter((property) => property.type === "Property").map((property) => {
-			const local = property.value.body;
-			const exported = property.key;
-			return b.exportSpecifier(local, exported);
-		}));
-		nodes[i] = b.tsModuleDeclaration(binding, b.tsModuleBlock([namespaceExport]), {
+		const namespaceExport = b.ExportNamedDeclaration({
+			declaration: null,
+			specifiers: exports.properties.filter((property) => property.type === "Property").map((property) => {
+				const local = property.value.body;
+				const exported = property.key;
+				return b.ExportSpecifier({
+					local,
+					exported
+				});
+			}),
+			source: null,
+			attributes: []
+		});
+		nodes[i] = b.TSModuleDeclaration({
+			id: binding,
+			body: b.TSModuleBlock({ body: [namespaceExport] }),
 			kind: "namespace",
-			declare: true
+			declare: true,
+			global: false
 		});
 	}
 	return nodes.filter((node) => !removed.has(node));
@@ -1062,7 +1110,18 @@ function patchReExport(nodes) {
 	else if (node.type === "ExpressionStatement" && node.expression.type === "CallExpression" && is.Identifier(node.expression.callee, "__reExport")) {
 		const args = node.expression.arguments;
 		exportsNames.set(args[0].name, args[1].name);
-	} else if (node.type === "VariableDeclaration" && node.declarations.length === 1 && node.declarations[0].init?.type === "MemberExpression" && node.declarations[0].init.object.type === "Identifier" && exportsNames.has(node.declarations[0].init.object.name)) nodes[i] = b.tsTypeAliasDeclaration(b.identifier(node.declarations[0].id.name), b.tsTypeReference(b.tsQualifiedName(b.identifier(exportsNames.get(node.declarations[0].init.object.name)), b.identifier(node.declarations[0].init.property.name))));
+	} else if (node.type === "VariableDeclaration" && node.declarations.length === 1 && node.declarations[0].init?.type === "MemberExpression" && node.declarations[0].init.object.type === "Identifier" && exportsNames.has(node.declarations[0].init.object.name)) nodes[i] = b.TSTypeAliasDeclaration({
+		id: b.Identifier({ name: node.declarations[0].id.name }),
+		typeParameters: null,
+		typeAnnotation: b.TSTypeReference({
+			typeName: b.TSQualifiedName({
+				left: b.Identifier({ name: exportsNames.get(node.declarations[0].init.object.name) }),
+				right: b.Identifier({ name: node.declarations[0].init.property.name })
+			}),
+			typeArguments: null
+		}),
+		declare: false
+	});
 	else if (node.type === "ExportNamedDeclaration" && node.specifiers.length === 1 && node.specifiers[0].type === "ExportSpecifier" && node.specifiers[0].local.type === "Identifier" && exportsNames.has(node.specifiers[0].local.name)) node.specifiers[0].local.name = exportsNames.get(node.specifiers[0].local.name);
 	return nodes;
 }
@@ -1077,13 +1136,34 @@ function rewriteImportExport(node, set) {
 		node.exportKind = "value";
 		return true;
 	} else if (node.type === "TSImportEqualsDeclaration") {
-		if (node.moduleReference.type === "TSExternalModuleReference") set(b.importDeclaration([b.importDefaultSpecifier(node.id)], node.moduleReference.expression));
+		if (node.moduleReference.type === "TSExternalModuleReference") set(b.ImportDeclaration({
+			specifiers: [b.ImportDefaultSpecifier({ local: node.id })],
+			source: node.moduleReference.expression,
+			phase: null,
+			attributes: []
+		}));
 		return true;
 	} else if (node.type === "TSExportAssignment" && node.expression.type === "Identifier") {
-		set(b.exportNamedDeclaration(null, [b.exportSpecifier(node.expression, b.identifier("default"))]));
+		set(b.ExportNamedDeclaration({
+			declaration: null,
+			specifiers: [b.ExportSpecifier({
+				local: node.expression,
+				exported: b.Identifier({ name: "default" })
+			})],
+			source: null,
+			attributes: []
+		}));
 		return true;
 	} else if (node.type === "ExportDefaultDeclaration" && node.declaration.type === "Identifier") {
-		set(b.exportNamedDeclaration(null, [b.exportSpecifier(node.declaration, b.identifier("default"))]));
+		set(b.ExportNamedDeclaration({
+			declaration: null,
+			specifiers: [b.ExportSpecifier({
+				local: node.declaration,
+				exported: b.Identifier({ name: "default" })
+			})],
+			source: null,
+			attributes: []
+		}));
 		return true;
 	}
 	return false;
@@ -1156,7 +1236,7 @@ var VolarContext = class {
 		this.patterns = plugins.flatMap((plugin) => plugin.extensionPatterns);
 	}
 	isVolarFile(id) {
-		return this.plugins.some((plugin) => plugin.extensionPatterns.some((pattern) => pattern.test(id)));
+		return this.patterns.some((pattern) => pattern.test(id));
 	}
 	getExtraFileExtensions() {
 		if (!this.plugins.length) return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rolldown-plugin-dts",
   "type": "module",
-  "version": "0.27.11",
+  "version": "0.27.12",
   "description": "A Rolldown plugin to generate and bundle dts files.",
   "author": "Kevin Deng <sxzz@sxzz.moe>",
   "license": "MIT",
@@ -17,10 +17,13 @@
   "keywords": [
     "rolldown",
     "plugin",
+    "rolldown-plugin",
+    "vite-plugin",
     "dts",
     "typescript",
     "vue",
-    "jsdoc"
+    "jsdoc",
+    "volar"
   ],
   "exports": {
     ".": "./dist/index.mjs",
@@ -64,10 +67,10 @@
   "dependencies": {
     "dts-resolver": "^3.0.0",
     "get-tsconfig": "5.0.0-beta.5",
-    "obug": "^2.1.3",
-    "yuku-ast": "^0.1.7",
-    "yuku-codegen": "^0.6.3",
-    "yuku-parser": "^0.6.3"
+    "obug": "^2.1.4",
+    "yuku-ast": "^0.7.0",
+    "yuku-codegen": "^0.7.0",
+    "yuku-parser": "^0.7.0"
   },
   "devDependencies": {
     "@astrojs/ts-plugin": "^1.10.10",
@@ -89,11 +92,11 @@
     "rolldown": "^1.2.0",
     "rollup-plugin-dts": "^6.4.1",
     "ts-macro": "^0.3.7",
-    "tsdown": "^0.22.8",
+    "tsdown": "^0.22.11",
     "tsnapi": "^1.0.0",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "vue": "^3.5.39",
+    "vue": "^3.5.40",
     "vue-tsc": "^3.3.7",
     "zod": "^4.4.3"
   },