rolldown-plugin-dts 0.18.2 → 0.18.4

package/dist/index.mjs

@@ -336,43 +336,61 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 	function collectDependencies(node, namespaceStmts) {
 		const deps = /* @__PURE__ */ new Set();
 		const seen = /* @__PURE__ */ new Set();
-		walkAST(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 switch (node$1.type) {
-				case "TSTypeReference":
-					addDependency(TSEntityNameToRuntime(node$1.typeName));
-					break;
-				case "TSTypeQuery":
-					if (seen.has(node$1.exprName)) return;
-					if (node$1.exprName.type === "TSImportType") break;
-					addDependency(TSEntityNameToRuntime(node$1.exprName));
-					break;
-				case "TSImportType": {
-					seen.add(node$1);
-					const source = node$1.argument;
-					const imported = node$1.qualifier;
-					addDependency(importNamespace(node$1, imported, source, namespaceStmts));
-					break;
+		const inferredStack = [];
+		let currentInferred = /* @__PURE__ */ new Set();
+		function isInferred(node$1) {
+			return node$1.type === "Identifier" && currentInferred.has(node$1.name);
+		}
+		walkAST(node, {
+			enter(node$1) {
+				if (node$1.type === "TSConditionalType") {
+					const inferred = collectInferredNames(node$1.extendsType);
+					inferredStack.push(inferred);
+				}
+			},
+			leave(node$1, parent) {
+				if (node$1.type === "TSConditionalType") inferredStack.pop();
+				else if (parent?.type === "TSConditionalType") {
+					const trueBranch = parent.trueType === node$1;
+					currentInferred = new Set((trueBranch ? inferredStack : inferredStack.slice(0, -1)).flat());
+				} else currentInferred = /* @__PURE__ */ new Set();
+				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 switch (node$1.type) {
+					case "TSTypeReference":
+						addDependency(TSEntityNameToRuntime(node$1.typeName));
+						break;
+					case "TSTypeQuery":
+						if (seen.has(node$1.exprName)) return;
+						if (node$1.exprName.type === "TSImportType") break;
+						addDependency(TSEntityNameToRuntime(node$1.exprName));
+						break;
+					case "TSImportType": {
+						seen.add(node$1);
+						const source = node$1.argument;
+						const imported = node$1.qualifier;
+						addDependency(importNamespace(node$1, imported, source, namespaceStmts));
+						break;
+					}
 				}
 			}
-		} });
+		});
 		return Array.from(deps);
 		function addDependency(node$1) {
-			if (isThisExpression(node$1)) return;
+			if (isThisExpression(node$1) || isInferred(node$1)) return;
 			deps.add(node$1);
 		}
 	}
@@ -402,6 +420,13 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 		};
 	}
 }
+function collectInferredNames(node) {
+	const inferred = [];
+	walkAST(node, { enter(node$1) {
+		if (node$1.type === "TSInferType" && node$1.typeParameter) inferred.push(node$1.typeParameter.name);
+	} });
+	return inferred;
+}
 const REFERENCE_RE = /\/\s*<reference\s+(?:path|types)=/;
 function collectReferenceDirectives(comment, negative = false) {
 	return comment.filter((c) => REFERENCE_RE.test(c.value) !== negative);
@@ -603,7 +628,7 @@ function inheritNodeComments(oldNode, newNode) {
 
 //#endregion
 //#region src/generate.ts
-const debug$1 = createDebug("rolldown-plugin-dts:generate");
+const debug$2 = createDebug("rolldown-plugin-dts:generate");
 const WORKER_URL = "./tsc-worker.mjs";
 const spawnAsync = (...args) => new Promise((resolve, reject) => {
 	const child = spawn(...args);
@@ -627,10 +652,11 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 	let tscModule;
 	let tscContext;
 	let tsgoDist;
+	const rootDir = tsconfig ? path.dirname(tsconfig) : cwd;
 	return {
 		name: "rolldown-plugin-dts:generate",
 		async buildStart(options) {
-			if (tsgo) tsgoDist = await runTsgo(cwd, tsconfig);
+			if (tsgo) tsgoDist = await runTsgo(rootDir, tsconfig);
 			else if (!oxc) if (parallel) {
 				childProcess = fork(new URL(WORKER_URL, import.meta.url), { stdio: "inherit" });
 				rpc = (await import("birpc")).createBirpc({}, {
@@ -642,11 +668,11 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 				if (newContext) tscContext = createContext();
 			}
 			if (!Array.isArray(options.input)) for (const [name, id] of Object.entries(options.input)) {
-				debug$1("resolving input alias %s -> %s", name, id);
+				debug$2("resolving input alias %s -> %s", name, id);
 				let resolved = await this.resolve(id);
 				if (!id.startsWith("./")) resolved ||= await this.resolve(`./${id}`);
 				const resolvedId = resolved?.id || id;
-				debug$1("resolved input alias %s -> %s", id, resolvedId);
+				debug$2("resolved input alias %s -> %s", id, resolvedId);
 				inputAliasMap.set(resolvedId, name);
 			}
 		},
@@ -666,7 +692,7 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 		},
 		resolveId(id) {
 			if (dtsMap.has(id)) {
-				debug$1("resolve dts id %s", id);
+				debug$2("resolve dts id %s", id);
 				return { id };
 			}
 		},
@@ -690,7 +716,7 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 						id,
 						isEntry
 					});
-					debug$1("register dts source: %s", id);
+					debug$2("register dts source: %s", id);
 					if (isEntry) {
 						const name = inputAliasMap.get(id);
 						this.emitFile({
@@ -716,13 +742,13 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 				const { code, id } = dtsMap.get(dtsId);
 				let dtsCode;
 				let map;
-				debug$1("generate dts %s from %s", dtsId, id);
+				debug$2("generate dts %s from %s", dtsId, id);
 				if (tsgo) {
 					if (RE_VUE.test(id)) throw new Error("tsgo does not support Vue files.");
-					const dtsPath = path.resolve(tsgoDist, path.relative(path.resolve(cwd), filename_to_dts(id)));
+					const dtsPath = path.resolve(tsgoDist, path.relative(path.resolve(rootDir), filename_to_dts(id)));
 					if (existsSync(dtsPath)) dtsCode = await readFile(dtsPath, "utf8");
 					else {
-						debug$1("[tsgo]", dtsPath, "is missing");
+						debug$2("[tsgo]", dtsPath, "is missing");
 						throw new Error(`tsgo did not generate dts file for ${id}, please check your tsconfig.`);
 					}
 				} else if (oxc && !RE_VUE.test(id)) {
@@ -731,7 +757,7 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 						const [error] = result.errors;
 						return this.error({
 							message: error.message,
-							frame: error.codeframe
+							frame: error.codeframe || void 0
 						});
 					}
 					dtsCode = result.code;
@@ -789,7 +815,7 @@ export { __json_default_export as default }`;
 		} : void 0,
 		async buildEnd() {
 			childProcess?.kill();
-			if (!debug$1.enabled && tsgoDist) await rm(tsgoDist, {
+			if (!debug$2.enabled && tsgoDist) await rm(tsgoDist, {
 				recursive: true,
 				force: true
 			}).catch(() => {});
@@ -801,12 +827,13 @@ export { __json_default_export as default }`;
 		}
 	};
 }
-async function runTsgo(root, tsconfig) {
+async function runTsgo(rootDir, tsconfig) {
 	const tsgoPkg = import.meta.resolve("@typescript/native-preview/package.json");
 	const { default: getExePath } = await import(new URL("lib/getExePath.js", tsgoPkg).href);
 	const tsgo = getExePath();
 	const tsgoDist = await mkdtemp(path.join(tmpdir(), "rolldown-plugin-dts-"));
-	debug$1("[tsgo] tsgoDist", tsgoDist);
+	debug$2("[tsgo] tsgoDist", tsgoDist);
+	debug$2("[tsgo] rootDir", rootDir);
 	await spawnAsync(tsgo, [
 		"--noEmit",
 		"false",
@@ -816,7 +843,7 @@ async function runTsgo(root, tsconfig) {
 		"--outDir",
 		tsgoDist,
 		"--rootDir",
-		root,
+		rootDir,
 		"--noCheck"
 	], { stdio: "inherit" });
 	return tsgoDist;
@@ -923,6 +950,7 @@ function resolveOptions({ cwd = process.cwd(), dtsInput = false, emitDtsOnly = f
 
 //#endregion
 //#region src/resolver.ts
+const debug$1 = createDebug("rolldown-plugin-dts:resolver");
 function isSourceFile(id) {
 	return RE_TS.test(id) || RE_VUE.test(id) || RE_JSON.test(id);
 }
@@ -944,16 +972,31 @@ function createDtsResolvePlugin({ cwd, tsconfig, tsconfigRaw, resolve, resolver,
 					external: true,
 					moduleSideEffects: sideEffects
 				};
-				if (RE_CSS.test(id)) return external;
+				if (RE_CSS.test(id)) {
+					debug$1("Externalizing css import:", id);
+					return external;
+				}
 				const rolldownResolution = await this.resolve(id, importer, options);
+				debug$1("Rolldown resolution for dts import %O from %O: %O", id, importer, rolldownResolution);
 				const dtsResolution = await resolveDtsPath(id, importer, rolldownResolution);
-				if (!dtsResolution) return isFilePath(id) ? null : external;
-				if (RE_NODE_MODULES.test(dtsResolution) && !shouldBundleNodeModule(id) && (!RE_NODE_MODULES.test(importer) || rolldownResolution?.external)) return external;
-				if (RE_DTS.test(dtsResolution)) return {
-					id: dtsResolution,
-					moduleSideEffects
-				};
+				debug$1("Dts resolution for dts import %O from %O: %O", id, importer, dtsResolution);
+				if (!dtsResolution) {
+					debug$1("Unresolvable dts import:", id, "from", importer);
+					return isFilePath(id) ? null : external;
+				}
+				if (RE_NODE_MODULES.test(dtsResolution) && !shouldBundleNodeModule(id) && (!RE_NODE_MODULES.test(importer) || rolldownResolution?.external)) {
+					debug$1("Externalizing node_modules dts import:", id);
+					return external;
+				}
+				if (RE_DTS.test(dtsResolution)) {
+					debug$1("Resolving dts import to declaration file:", id);
+					return {
+						id: dtsResolution,
+						moduleSideEffects
+					};
+				}
 				if (isSourceFile(dtsResolution)) {
+					debug$1("Resolving dts import to source file:", id);
 					await this.load({ id: dtsResolution });
 					return {
 						id: filename_to_dts(dtsResolution),
@@ -973,6 +1016,7 @@ function createDtsResolvePlugin({ cwd, tsconfig, tsconfigRaw, resolve, resolver,
 			const { tscResolve } = await import("./resolver-DksQRwY1.mjs");
 			dtsPath = tscResolve(id, importer, cwd, tsconfig, tsconfigRaw);
 		} else dtsPath = baseDtsResolver(id, importer);
+		debug$1("Using %s for dts import: %O -> %O", resolver, id, dtsPath);
 		if (dtsPath) dtsPath = path.normalize(dtsPath);
 		if (!dtsPath || !isSourceFile(dtsPath)) {
 			if (rolldownResolution && isFilePath(rolldownResolution.id) && isSourceFile(rolldownResolution.id) && !rolldownResolution.external) return rolldownResolution.id;

package/dist/{tsc-BW5Mr7EL.mjs → tsc-Cn0kGE1h.mjs}

@@ -341,7 +341,7 @@ function createTsProgram({ entries, id, tsconfig, tsconfigRaw, vue, tsMacro, cwd
 	const fsSystem = createFsSystem(context.files);
 	const baseDir = tsconfig ? path.dirname(tsconfig) : cwd;
 	const parsedConfig = ts.parseJsonConfigFileContent(tsconfigRaw, fsSystem, baseDir);
-	debug$1(`Creating program for root project: ${baseDir}`);
+	debug$1(`creating program for root project: ${baseDir}`);
 	return createTsProgramFromParsedConfig({
 		parsedConfig,
 		fsSystem,
@@ -404,9 +404,12 @@ function tscEmitCompiler(tscOptions) {
 		}
 	}, void 0, true, customTransformers, true);
 	if (emitSkipped && diagnostics.length) return { error: ts.formatDiagnostics(diagnostics, formatHost) };
-	if (!dtsCode && file.isDeclarationFile) {
-		debug$1("nothing was emitted. fallback to sourceFile text.");
-		dtsCode = file.getFullText();
+	if (!dtsCode) {
+		debug$1("nothing was emitted.");
+		if (file.isDeclarationFile) {
+			debug$1("source file is a declaration file.");
+			dtsCode = file.getFullText();
+		} else console.warn("[rolldown-plugin-dts] Warning: Failed to emit declaration file. Please try to enable `eager` option (`dts.eager` for tsdown).");
 	}
 	return {
 		code: dtsCode,

package/dist/tsc-worker.mjs

@@ -1,4 +1,4 @@
-import { t as tscEmit } from "./tsc-BW5Mr7EL.mjs";
+import { t as tscEmit } from "./tsc-Cn0kGE1h.mjs";
 import "./context-EuY-ImLj.mjs";
 const process = globalThis.process;
 import { createBirpc } from "birpc";

package/dist/tsc.mjs

@@ -1,4 +1,4 @@
-import { t as tscEmit } from "./tsc-BW5Mr7EL.mjs";
+import { t as tscEmit } from "./tsc-Cn0kGE1h.mjs";
 import "./context-EuY-ImLj.mjs";
 
 export { tscEmit };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rolldown-plugin-dts",
   "type": "module",
-  "version": "0.18.2",
+  "version": "0.18.4",
   "description": "A Rolldown plugin to generate and bundle dts files.",
   "author": "Kevin Deng <sxzz@sxzz.moe>",
   "license": "MIT",
@@ -68,35 +68,35 @@
     "@babel/parser": "^7.28.5",
     "@babel/types": "^7.28.5",
     "ast-kit": "^2.2.0",
-    "birpc": "^3.0.0",
+    "birpc": "^4.0.0",
     "dts-resolver": "^2.1.3",
     "get-tsconfig": "^4.13.0",
     "magic-string": "^0.30.21",
     "obug": "^2.1.1"
   },
   "devDependencies": {
-    "@sxzz/eslint-config": "^7.4.1",
+    "@sxzz/eslint-config": "^7.4.3",
     "@sxzz/prettier-config": "^2.2.6",
-    "@sxzz/test-utils": "^0.5.13",
+    "@sxzz/test-utils": "^0.5.14",
     "@types/babel__generator": "^7.27.0",
-    "@types/node": "^24.10.1",
-    "@typescript/native-preview": "7.0.0-dev.20251203.1",
-    "@volar/typescript": "^2.4.26",
-    "@vue/language-core": "^3.1.5",
-    "arktype": "^2.1.28",
+    "@types/node": "^25.0.2",
+    "@typescript/native-preview": "7.0.0-dev.20251216.1",
+    "@volar/typescript": "^2.4.27",
+    "@vue/language-core": "^3.1.8",
+    "arktype": "^2.1.29",
     "bumpp": "^10.3.2",
     "diff": "^8.0.2",
-    "eslint": "^9.39.1",
+    "eslint": "^9.39.2",
     "prettier": "^3.7.4",
-    "rolldown": "^1.0.0-beta.53",
-    "rolldown-plugin-require-cjs": "^0.3.2",
+    "rolldown": "^1.0.0-beta.54",
+    "rolldown-plugin-require-cjs": "^0.3.3",
     "rollup-plugin-dts": "^6.3.0",
     "tinyglobby": "^0.2.15",
-    "tsdown": "^0.17.0-beta.6",
+    "tsdown": "^0.18.0",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.15",
+    "vitest": "^4.0.16",
     "vue": "^3.5.25",
-    "vue-tsc": "^3.1.5"
+    "vue-tsc": "^3.1.8"
   },
   "prettier": "@sxzz/prettier-config",
   "scripts": {