rolldown-plugin-dts 0.11.1 → 0.11.2

package/dist/index.js

@@ -248,17 +248,6 @@ function createFakeJsPlugin({ dtsInput, sourcemap }) {
 	let identifierIdx = 0;
 	const symbolMap = new Map();
 	const commentsMap = new Map();
-	function getIdentifierIndex() {
-		return identifierIdx++;
-	}
-	function registerSymbol(info) {
-		const symbolId = symbolIdx++;
-		symbolMap.set(symbolId, info);
-		return symbolId;
-	}
-	function getSymbol(symbolId) {
-		return symbolMap.get(symbolId);
-	}
 	return {
 		name: "rolldown-plugin-dts:fake-js",
 		outputOptions(options) {
@@ -276,144 +265,9 @@ function createFakeJsPlugin({ dtsInput, sourcemap }) {
 		},
 		transform: {
 			filter: { id: RE_DTS },
-			handler(code, id) {
-				const file = parse(code, {
-					plugins: [["typescript", { dts: true }]],
-					sourceType: "module"
-				});
-				const { program, comments } = file;
-				if (comments) {
-					const directives = collectReferenceDirectives(comments);
-					commentsMap.set(id, directives);
-				}
-				const prependStmts = [];
-				const appendStmts = [];
-				const prepend = (stmt) => prependStmts.push(stmt);
-				for (const [i, stmt] of program.body.entries()) {
-					const setStmt = (node) => program.body[i] = node;
-					if (rewriteImportExport(stmt, setStmt)) continue;
-					const sideEffect = stmt.type === "TSModuleDeclaration" && stmt.kind !== "namespace";
-					const isDefaultExport = stmt.type === "ExportDefaultDeclaration";
-					const isDecl = isTypeOf(stmt, ["ExportNamedDeclaration", "ExportDefaultDeclaration"]) && stmt.declaration;
-					const decl = isDecl ? stmt.declaration : stmt;
-					const setDecl = isDecl ? (node) => stmt.declaration = node : setStmt;
-					if (decl.type === "VariableDeclaration" && decl.declarations.length !== 1) throw new Error("Only one declaration is supported");
-					if (decl.type !== "TSDeclareFunction" && !isDeclarationType(decl)) continue;
-					if (isTypeOf(decl, [
-						"TSEnumDeclaration",
-						"ClassDeclaration",
-						"FunctionDeclaration",
-						"TSDeclareFunction",
-						"TSModuleDeclaration",
-						"VariableDeclaration"
-					])) decl.declare = true;
-					let binding = decl.type === "VariableDeclaration" ? decl.declarations[0].id : "id" in decl ? decl.id : null;
-					if (!binding) {
-						binding = t.identifier("export_default");
-						decl.id = binding;
-					}
-					binding = sideEffect ? t.identifier(`_${identifierIdx++}`) : binding;
-					const deps = collectDependencies(decl, getIdentifierIndex, prepend);
-					const elements = [
-						t.numericLiteral(0),
-						...deps.map((dep) => t.arrowFunctionExpression([], dep)),
-						...sideEffect ? [t.callExpression(t.identifier("sideEffect"), [])] : []
-					];
-					const runtime = t.arrayExpression(elements);
-					if (decl !== stmt) {
-						decl.innerComments = stmt.innerComments;
-						decl.leadingComments = stmt.leadingComments;
-						decl.trailingComments = stmt.trailingComments;
-					}
-					const symbolId = registerSymbol({
-						decl,
-						deps,
-						binding
-					});
-					elements[0] = t.numericLiteral(symbolId);
-					const runtimeAssignment = {
-						type: "VariableDeclaration",
-						kind: "var",
-						declarations: [{
-							type: "VariableDeclarator",
-							id: {
-								...binding,
-								typeAnnotation: null
-							},
-							init: runtime
-						}]
-					};
-					if (isDefaultExport) {
-						appendStmts.push(t.exportNamedDeclaration(null, [t.exportSpecifier(binding, t.identifier("default"))]));
-						setStmt(runtimeAssignment);
-					} else setDecl(runtimeAssignment);
-				}
-				program.body = [
-					...prependStmts,
-					...program.body,
-					...appendStmts
-				];
-				const result = generate(file, {
-					comments: true,
-					sourceMaps: sourcemap,
-					sourceFileName: id
-				});
-				return result;
-			}
-		},
-		renderChunk(code, chunk) {
-			if (!RE_DTS.test(chunk.fileName)) return;
-			const file = parse(code, { sourceType: "module" });
-			const { program } = file;
-			program.body = patchTsNamespace(program.body);
-			program.body = program.body.map((node) => {
-				if (patchImportSource(node)) return node;
-				if (node.type !== "VariableDeclaration" || node.declarations.length !== 1) return node;
-				const [decl] = node.declarations;
-				if (decl.init?.type !== "ArrayExpression" || !decl.init.elements[0]) return null;
-				const [symbolIdNode, ...depsFns] = decl.init.elements;
-				if (symbolIdNode?.type !== "NumericLiteral") return null;
-				const symbolId = symbolIdNode.value;
-				const original = getSymbol(symbolId);
-				const transformedBinding = {
-					...decl.id,
-					typeAnnotation: original.binding.typeAnnotation
-				};
-				overwriteNode(original.binding, transformedBinding);
-				const transformedDeps = depsFns.filter((node$1) => node$1?.type === "ArrowFunctionExpression").map((node$1) => node$1.body);
-				if (original.deps.length) for (let i = 0; i < original.deps.length; i++) {
-					const originalDep = original.deps[i];
-					if (originalDep.replace) originalDep.replace(transformedDeps[i]);
-					else Object.assign(originalDep, transformedDeps[i]);
-				}
-				return inheritNodeComments(node, original.decl);
-			}).filter((node) => !!node);
-			if (program.body.length === 0) return "export { };";
-			const comments = new Set();
-			const commentsValue = new Set();
-			for (const id of chunk.moduleIds) {
-				const preserveComments = commentsMap.get(id);
-				if (preserveComments) {
-					preserveComments.forEach((c) => {
-						const id$1 = c.type + c.value;
-						if (commentsValue.has(id$1)) return;
-						commentsValue.add(id$1);
-						comments.add(c);
-					});
-					commentsMap.delete(id);
-				}
-			}
-			if (comments.size) {
-				program.body[0].leadingComments ||= [];
-				program.body[0].leadingComments.unshift(...comments);
-			}
-			const result = generate(file, {
-				comments: true,
-				sourceMaps: sourcemap,
-				sourceFileName: chunk.fileName
-			});
-			return result;
+			handler: transform
 		},
+		renderChunk,
 		generateBundle(options, bundle) {
 			for (const chunk of Object.values(bundle)) {
 				if (chunk.type !== "asset" || !RE_DTS_MAP.test(chunk.fileName) || typeof chunk.source !== "string") continue;
@@ -425,48 +279,221 @@ function createFakeJsPlugin({ dtsInput, sourcemap }) {
 			}
 		}
 	};
+	function transform(code, id) {
+		const file = parse(code, {
+			plugins: [["typescript", { dts: true }]],
+			sourceType: "module"
+		});
+		const { program, comments } = file;
+		if (comments) {
+			const directives = collectReferenceDirectives(comments);
+			commentsMap.set(id, directives);
+		}
+		const appendStmts = [];
+		const namespaceStmts = new Map();
+		for (const [i, stmt] of program.body.entries()) {
+			const setStmt = (node) => program.body[i] = node;
+			if (rewriteImportExport(stmt, setStmt)) continue;
+			const sideEffect = stmt.type === "TSModuleDeclaration" && stmt.kind !== "namespace";
+			const isDefaultExport = stmt.type === "ExportDefaultDeclaration";
+			const isDecl = isTypeOf(stmt, ["ExportNamedDeclaration", "ExportDefaultDeclaration"]) && stmt.declaration;
+			const decl = isDecl ? stmt.declaration : stmt;
+			const setDecl = isDecl ? (node) => stmt.declaration = node : setStmt;
+			if (decl.type === "VariableDeclaration" && decl.declarations.length !== 1) throw new Error("Only one declaration is supported");
+			if (decl.type !== "TSDeclareFunction" && !isDeclarationType(decl)) continue;
+			if (isTypeOf(decl, [
+				"TSEnumDeclaration",
+				"ClassDeclaration",
+				"FunctionDeclaration",
+				"TSDeclareFunction",
+				"TSModuleDeclaration",
+				"VariableDeclaration"
+			])) decl.declare = true;
+			let binding = decl.type === "VariableDeclaration" ? decl.declarations[0].id : "id" in decl ? decl.id : null;
+			if (!binding) {
+				binding = t.identifier("export_default");
+				decl.id = binding;
+			}
+			binding = sideEffect ? t.identifier(`_${identifierIdx++}`) : binding;
+			const deps = collectDependencies(decl, namespaceStmts);
+			const elements = [
+				t.numericLiteral(0),
+				...deps.map((dep) => t.arrowFunctionExpression([], dep)),
+				...sideEffect ? [t.callExpression(t.identifier("sideEffect"), [])] : []
+			];
+			const runtime = t.arrayExpression(elements);
+			if (decl !== stmt) {
+				decl.innerComments = stmt.innerComments;
+				decl.leadingComments = stmt.leadingComments;
+				decl.trailingComments = stmt.trailingComments;
+			}
+			const symbolId = registerSymbol({
+				decl,
+				deps,
+				binding
+			});
+			elements[0] = t.numericLiteral(symbolId);
+			const runtimeAssignment = {
+				type: "VariableDeclaration",
+				kind: "var",
+				declarations: [{
+					type: "VariableDeclarator",
+					id: {
+						...binding,
+						typeAnnotation: null
+					},
+					init: runtime
+				}]
+			};
+			if (isDefaultExport) {
+				appendStmts.push(t.exportNamedDeclaration(null, [t.exportSpecifier(binding, t.identifier("default"))]));
+				setStmt(runtimeAssignment);
+			} else setDecl(runtimeAssignment);
+		}
+		program.body = [
+			...Array.from(namespaceStmts.values()).map(({ stmt }) => stmt),
+			...program.body,
+			...appendStmts
+		];
+		const result = generate(file, {
+			comments: true,
+			sourceMaps: sourcemap,
+			sourceFileName: id
+		});
+		return result;
+	}
+	function renderChunk(code, chunk) {
+		if (!RE_DTS.test(chunk.fileName)) return;
+		const file = parse(code, { sourceType: "module" });
+		const { program } = file;
+		program.body = patchTsNamespace(program.body);
+		program.body = program.body.map((node) => {
+			if (patchImportSource(node)) return node;
+			if (node.type !== "VariableDeclaration" || node.declarations.length !== 1) return node;
+			const [decl] = node.declarations;
+			if (decl.init?.type !== "ArrayExpression" || !decl.init.elements[0]) return null;
+			const [symbolIdNode, ...depsFns] = decl.init.elements;
+			if (symbolIdNode?.type !== "NumericLiteral") return null;
+			const symbolId = symbolIdNode.value;
+			const original = getSymbol(symbolId);
+			const transformedBinding = {
+				...decl.id,
+				typeAnnotation: original.binding.typeAnnotation
+			};
+			overwriteNode(original.binding, transformedBinding);
+			const transformedDeps = depsFns.filter((node$1) => node$1?.type === "ArrowFunctionExpression").map((node$1) => node$1.body);
+			if (original.deps.length) for (let i = 0; i < original.deps.length; i++) {
+				const originalDep = original.deps[i];
+				if (originalDep.replace) originalDep.replace(transformedDeps[i]);
+				else Object.assign(originalDep, transformedDeps[i]);
+			}
+			return inheritNodeComments(node, original.decl);
+		}).filter((node) => !!node);
+		if (program.body.length === 0) return "export { };";
+		const comments = new Set();
+		const commentsValue = new Set();
+		for (const id of chunk.moduleIds) {
+			const preserveComments = commentsMap.get(id);
+			if (preserveComments) {
+				preserveComments.forEach((c) => {
+					const id$1 = c.type + c.value;
+					if (commentsValue.has(id$1)) return;
+					commentsValue.add(id$1);
+					comments.add(c);
+				});
+				commentsMap.delete(id);
+			}
+		}
+		if (comments.size) {
+			program.body[0].leadingComments ||= [];
+			program.body[0].leadingComments.unshift(...comments);
+		}
+		const result = generate(file, {
+			comments: true,
+			sourceMaps: sourcemap,
+			sourceFileName: chunk.fileName
+		});
+		return result;
+	}
+	function getIdentifierIndex() {
+		return identifierIdx++;
+	}
+	function registerSymbol(info) {
+		const symbolId = symbolIdx++;
+		symbolMap.set(symbolId, info);
+		return symbolId;
+	}
+	function getSymbol(symbolId) {
+		return symbolMap.get(symbolId);
+	}
+	function collectDependencies(node, namespaceStmts) {
+		const deps = new Set();
+		const seen = new Set();
+		walk(node, { leave(node$1) {
+			if (node$1.type === "ExportNamedDeclaration") {
+				for (const specifier of node$1.specifiers) if (specifier.type === "ExportSpecifier") addDependency(specifier.local);
+			} else if (node$1.type === "TSInterfaceDeclaration" && node$1.extends) for (const heritage of node$1.extends || []) addDependency(TSEntityNameToRuntime(heritage.expression));
+			else if (node$1.type === "ClassDeclaration") {
+				if (node$1.superClass) addDependency(node$1.superClass);
+				if (node$1.implements) for (const implement of node$1.implements) addDependency(TSEntityNameToRuntime(implement.expression));
+			} else if (isTypeOf(node$1, [
+				"ObjectMethod",
+				"ObjectProperty",
+				"ClassProperty",
+				"TSPropertySignature",
+				"TSDeclareMethod"
+			])) {
+				if (node$1.computed && isReferenceId(node$1.key)) addDependency(node$1.key);
+				if ("value" in node$1 && isReferenceId(node$1.value)) addDependency(node$1.value);
+			} else if (node$1.type === "TSTypeReference") addDependency(TSEntityNameToRuntime(node$1.typeName));
+			else if (node$1.type === "TSTypeQuery") {
+				if (seen.has(node$1.exprName)) return;
+				if (node$1.exprName.type !== "TSImportType") addDependency(TSEntityNameToRuntime(node$1.exprName));
+			} else if (node$1.type === "TSImportType") {
+				seen.add(node$1);
+				const source = node$1.argument;
+				const imported = node$1.qualifier;
+				const dep = importNamespace(node$1, imported, source, namespaceStmts);
+				addDependency(dep);
+			}
+		} });
+		return Array.from(deps);
+		function addDependency(node$1) {
+			if (node$1.type === "Identifier" && node$1.name === "this") return;
+			deps.add(node$1);
+		}
+	}
+	function importNamespace(node, imported, source, namespaceStmts) {
+		const sourceText = source.value.replaceAll(/\W/g, "_");
+		let local = t.identifier(`${sourceText}${getIdentifierIndex()}`);
+		if (namespaceStmts.has(source.value)) local = namespaceStmts.get(source.value).local;
+		else namespaceStmts.set(source.value, {
+			stmt: t.importDeclaration([t.importNamespaceSpecifier(local)], source),
+			local
+		});
+		if (imported) {
+			const importedLeft = getIdFromTSEntityName(imported);
+			overwriteNode(importedLeft, t.tsQualifiedName(local, { ...importedLeft }));
+			local = imported;
+		}
+		let replacement = node;
+		if (node.typeParameters) {
+			overwriteNode(node, t.tsTypeReference(local, node.typeParameters));
+			replacement = local;
+		} else overwriteNode(node, local);
+		const dep = {
+			...TSEntityNameToRuntime(local),
+			replace(newNode) {
+				overwriteNode(replacement, newNode);
+			}
+		};
+		return dep;
+	}
 }
 const REFERENCE_RE = /\/\s*<reference\s+(?:path|types)=/;
 function collectReferenceDirectives(comment, negative = false) {
 	return comment.filter((c) => REFERENCE_RE.test(c.value) !== negative);
 }
-function collectDependencies(node, getIdentifierIndex, prepend) {
-	const deps = new Set();
-	const seen = new Set();
-	walk(node, { leave(node$1) {
-		if (node$1.type === "ExportNamedDeclaration") {
-			for (const specifier of node$1.specifiers) if (specifier.type === "ExportSpecifier") addDependency(specifier.local);
-		} else if (node$1.type === "TSInterfaceDeclaration" && node$1.extends) for (const heritage of node$1.extends || []) addDependency(TSEntityNameToRuntime(heritage.expression));
-		else if (node$1.type === "ClassDeclaration") {
-			if (node$1.superClass) addDependency(node$1.superClass);
-			if (node$1.implements) for (const implement of node$1.implements) addDependency(TSEntityNameToRuntime(implement.expression));
-		} else if (isTypeOf(node$1, [
-			"ObjectMethod",
-			"ObjectProperty",
-			"ClassProperty",
-			"TSPropertySignature",
-			"TSDeclareMethod"
-		])) {
-			if (node$1.computed && isReferenceId(node$1.key)) addDependency(node$1.key);
-			if ("value" in node$1 && isReferenceId(node$1.value)) addDependency(node$1.value);
-		} else if (node$1.type === "TSTypeReference") addDependency(TSEntityNameToRuntime(node$1.typeName));
-		else if (node$1.type === "TSTypeQuery") {
-			if (seen.has(node$1.exprName)) return;
-			if (node$1.exprName.type !== "TSImportType") addDependency(TSEntityNameToRuntime(node$1.exprName));
-		} else if (node$1.type === "TSImportType") {
-			seen.add(node$1);
-			const source = node$1.argument;
-			const imported = node$1.qualifier;
-			const dep = importNamespace(node$1, imported, source, getIdentifierIndex, prepend);
-			addDependency(dep);
-		}
-	} });
-	return Array.from(deps);
-	function addDependency(node$1) {
-		if (node$1.type === "Identifier" && node$1.name === "this") return;
-		deps.add(node$1);
-	}
-}
 function TSEntityNameToRuntime(node) {
 	if (node.type === "Identifier") return node;
 	const left = TSEntityNameToRuntime(node.left);
@@ -571,28 +598,6 @@ function rewriteImportExport(node, set) {
 	}
 	return false;
 }
-function importNamespace(node, imported, source, getIdentifierIndex, prepend) {
-	const sourceText = source.value.replaceAll(/\W/g, "_");
-	let local = t.identifier(`${sourceText}${getIdentifierIndex()}`);
-	prepend(t.importDeclaration([t.importNamespaceSpecifier(local)], source));
-	if (imported) {
-		const importedLeft = getIdFromTSEntityName(imported);
-		overwriteNode(importedLeft, t.tsQualifiedName(local, { ...importedLeft }));
-		local = imported;
-	}
-	let replacement = node;
-	if (node.typeParameters) {
-		overwriteNode(node, t.tsTypeReference(local, node.typeParameters));
-		replacement = local;
-	} else overwriteNode(node, local);
-	const dep = {
-		...TSEntityNameToRuntime(local),
-		replace(newNode) {
-			overwriteNode(replacement, newNode);
-		}
-	};
-	return dep;
-}
 function overwriteNode(node, newNode) {
 	for (const key of Object.keys(node)) delete node[key];
 	Object.assign(node, newNode);
@@ -761,7 +766,10 @@ function createGeneratePlugin({ compilerOptions = {}, isolatedDeclarations, emit
 			};
 		},
 		resolveId(id) {
-			if (dtsMap.has(id)) return { id };
+			if (dtsMap.has(id)) {
+				debug$1("resolve dts id %s", id);
+				return { id };
+			}
 		},
 		transform: {
 			order: "pre",
@@ -778,6 +786,7 @@ function createGeneratePlugin({ compilerOptions = {}, isolatedDeclarations, emit
 					id,
 					isEntry
 				});
+				debug$1("register dts source: %s", id);
 				if (isEntry) {
 					const name = inputAliasMap.get(id);
 					this.emitFile({
@@ -799,6 +808,7 @@ function createGeneratePlugin({ compilerOptions = {}, isolatedDeclarations, emit
 				const { code, id, isEntry } = dtsMap.get(dtsId);
 				let dtsCode;
 				let map;
+				debug$1("generate dts %s from %s", dtsId, id);
 				if (isolatedDeclarations) {
 					const result = isolatedDeclaration(id, code, isolatedDeclarations);
 					if (result.errors.length) {
@@ -860,6 +870,7 @@ function createDtsResolvePlugin({ tsconfig, resolve }) {
 					moduleSideEffects: false
 				};
 				let resolution = resolver(id, importer);
+				resolution &&= path.normalize(resolution);
 				if (!resolution || !RE_TS.test(resolution)) {
 					const result = await this.resolve(id, importer, options);
 					if (!result || !RE_TS.test(result.id)) return external;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-dts",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "A Rolldown plugin to bundle dts files",
   "type": "module",
   "license": "MIT",
@@ -38,39 +38,39 @@
   },
   "dependencies": {
     "@babel/generator": "^7.27.1",
-    "@babel/parser": "^7.27.1",
+    "@babel/parser": "^7.27.2",
     "@babel/types": "^7.27.1",
     "ast-kit": "^1.4.3",
     "debug": "^4.4.0",
-    "dts-resolver": "^1.1.0",
+    "dts-resolver": "^1.1.2",
     "get-tsconfig": "^4.10.0"
   },
   "devDependencies": {
-    "@sxzz/eslint-config": "^6.2.0",
+    "@sxzz/eslint-config": "^7.0.0",
     "@sxzz/prettier-config": "^2.2.1",
     "@sxzz/test-utils": "^0.5.6",
     "@types/babel__generator": "^7.27.0",
     "@types/debug": "^4.1.12",
     "@types/diff": "^7.0.2",
-    "@types/node": "^22.15.3",
+    "@types/node": "^22.15.17",
     "bumpp": "^10.1.0",
     "diff": "^7.0.0",
-    "eslint": "^9.25.1",
+    "eslint": "^9.26.0",
     "estree-walker": "^3.0.3",
     "prettier": "^3.5.3",
-    "rolldown": "^1.0.0-beta.8-commit.534fde3",
+    "rolldown": "nightly",
     "rollup-plugin-dts": "^6.2.1",
     "tinyglobby": "^0.2.13",
-    "tsdown": "^0.10.2",
+    "tsdown": "^0.11.1",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.2"
+    "vitest": "^3.1.3"
   },
   "engines": {
     "node": ">=20.18.0"
   },
   "resolutions": {
-    "rolldown": "^1.0.0-beta.8-commit.534fde3",
+    "rolldown": "nightly",
     "rolldown-plugin-dts": "workspace:*"
   },
   "prettier": "@sxzz/prettier-config",