rolldown-plugin-dts 0.21.2 → 0.21.3

package/README.md

@@ -8,7 +8,7 @@ A Rolldown plugin to generate and bundle dts files.
 
 ## Install
 
-Requires **`rolldown@1.0.0-beta.51`** or later.
+Requires **`rolldown@1.0.0-beta.57`** or later.
 
 ```bash
 npm i -D rolldown-plugin-dts

package/dist/index.d.mts

@@ -162,18 +162,36 @@ interface Options extends GeneralOptions, TscOptions {
   /**
   	* **[Experimental]** Enables DTS generation using `tsgo`.
   	*
-  	* To use this option, make sure `@typescript/native-preview` is installed as a dependency.
+  	* To use this option, make sure `@typescript/native-preview` is installed as a dependency,
+  	* or provide a custom path to the `tsgo` binary using the `path` option.
   	*
   	* **Note:** This option is not yet recommended for production environments.
   	* `tsconfigRaw` and `isolatedDeclarations` options will be ignored when this option is enabled.
+  	*
+  	*
+  	* ```ts
+  	* // Use tsgo from `@typescript/native-preview` dependency
+  	* tsgo: true
+  	*
+  	* // Use custom tsgo path (e.g., managed by Nix)
+  	* tsgo: { path: '/path/to/tsgo' }
+  	* ```
+  	*/
+  tsgo?: boolean | TsgoOptions;
+}
+interface TsgoOptions {
+  enabled?: boolean;
+  /**
+  	* Custom path to the `tsgo` binary.
   	*/
-  tsgo?: boolean;
+  path?: string;
 }
 type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U;
 type OptionsResolved = Overwrite<Required<Omit<Options, "compilerOptions">>, {
   tsconfig?: string;
   oxc: IsolatedDeclarationsOptions | false;
   tsconfigRaw: TsConfigJson;
+  tsgo: Omit<TsgoOptions, "enabled"> | false;
 }>;
 declare function resolveOptions({
   cwd,

package/dist/index.mjs

@@ -1,14 +1,9 @@
-const __cjs_require = globalThis.process.getBuiltinModule("module").createRequire(import.meta.url);
 import { a as RE_JSON, c as RE_VUE, d as filename_to_dts, f as replaceTemplateName, i as RE_JS, l as filename_dts_to, n as RE_DTS, o as RE_NODE_MODULES, p as resolveTemplateFn, r as RE_DTS_MAP, s as RE_TS, t as RE_CSS, u as filename_js_to_dts } from "./filename-Cqnsj8Gp.mjs";
 import { n as globalContext, r as invalidateContextFile, t as createContext } from "./context-EuY-ImLj.mjs";
 import { createDebug } from "obug";
-const {
-  generate
-} = __cjs_require("@babel/generator");
-const {
-  parse
-} = __cjs_require("@babel/parser");
-const t = __cjs_require("@babel/types");
+import { generate } from "@babel/generator";
+import { parse } from "@babel/parser";
+import * as t from "@babel/types";
 import { isDeclarationType, isIdentifierOf, isTypeOf, resolveString, walkAST } from "ast-kit";
 const {
   fork,
@@ -69,9 +64,9 @@ function createDtsInputPlugin({ sideEffects }) {
 //#endregion
 //#region src/fake-js.ts
 function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
-	let symbolIdx = 0;
+	let declarationIdx = 0;
 	const identifierMap = Object.create(null);
-	const symbolMap = /* @__PURE__ */ new Map();
+	const declarationMap = /* @__PURE__ */ new Map();
 	const commentsMap = /* @__PURE__ */ new Map();
 	const typeOnlyMap = /* @__PURE__ */ new Map();
 	return {
@@ -131,9 +126,9 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 			const sideEffect = stmt.type === "TSModuleDeclaration" && stmt.kind !== "namespace";
 			if (sideEffect && id.endsWith(".vue.d.ts") && code.slice(stmt.start, stmt.end).includes("__VLS_")) continue;
 			const isDefaultExport = stmt.type === "ExportDefaultDeclaration";
-			const isDecl = isTypeOf(stmt, ["ExportNamedDeclaration", "ExportDefaultDeclaration"]) && stmt.declaration;
-			const decl = isDecl ? stmt.declaration : stmt;
-			const setDecl = isDecl ? (decl$1) => stmt.declaration = decl$1 : setStmt;
+			const isExportDecl = isTypeOf(stmt, ["ExportNamedDeclaration", "ExportDefaultDeclaration"]) && !!stmt.declaration;
+			const decl = isExportDecl ? stmt.declaration : stmt;
+			const setDecl = isExportDecl ? (decl$1) => stmt.declaration = decl$1 : setStmt;
 			if (decl.type !== "TSDeclareFunction" && !isDeclarationType(decl)) continue;
 			if (isTypeOf(decl, [
 				"TSEnumDeclaration",
@@ -155,22 +150,33 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 				decl.id = binding;
 			}
 			const params = collectParams(decl);
-			const deps = collectDependencies(decl, namespaceStmts);
+			const childrenSet = /* @__PURE__ */ new Set();
+			const deps = collectDependencies(decl, namespaceStmts, childrenSet);
+			const children = Array.from(childrenSet).filter((child) => bindings.every((b) => child !== b));
 			if (decl !== stmt) decl.leadingComments = stmt.leadingComments;
-			const symbolId = registerSymbol({
+			const declarationId = registerDeclaration({
 				decl,
 				deps,
 				bindings,
-				params
+				params,
+				children
 			});
-			const symbolIdNode = t.numericLiteral(symbolId);
+			const declarationIdNode = t.numericLiteral(declarationId);
 			const depsNode = t.arrowFunctionExpression(params.map(({ name }) => t.identifier(name)), t.arrayExpression(deps));
+			const childrenNode = t.arrayExpression(children.map((node) => ({
+				type: "StringLiteral",
+				value: "",
+				start: node.start,
+				end: node.end,
+				loc: node.loc
+			})));
 			const sideEffectNode = sideEffect && t.callExpression(t.identifier("sideEffect"), [bindings[0]]);
-			const runtimeArrayNode = runtimeBindingArrayExpression(sideEffectNode ? [
-				symbolIdNode,
+			const runtimeArrayNode = runtimeBindingArrayExpression([
+				declarationIdNode,
 				depsNode,
-				sideEffectNode
-			] : [symbolIdNode, depsNode]);
+				childrenNode,
+				...sideEffectNode ? [sideEffectNode] : []
+			]);
 			const runtimeAssignment = {
 				type: "VariableDeclaration",
 				kind: "var",
@@ -201,11 +207,15 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 			...appendStmts
 		];
 		typeOnlyMap.set(id, typeOnlyIds);
-		return generate(file, {
+		const result = generate(file, {
 			comments: false,
 			sourceMaps: sourcemap,
 			sourceFileName: id
 		});
+		return {
+			code: result.code,
+			map: result.map
+		};
 	}
 	function renderChunk(code, chunk) {
 		if (!RE_DTS.test(chunk.fileName)) return;
@@ -225,31 +235,29 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 			if (newNode || newNode === false) return newNode;
 			if (node.type !== "VariableDeclaration") return node;
 			if (!isRuntimeBindingVariableDeclaration(node)) return null;
-			const [symbolIdNode, depsFn] = node.declarations[0].init.elements;
-			const symbolId = symbolIdNode.value;
-			const original = getSymbol(symbolId);
-			walkAST(original.decl, { enter(node$1) {
+			const [declarationIdNode, depsFn, children] = node.declarations[0].init.elements;
+			const declarationId = declarationIdNode.value;
+			const declaration = getDeclaration(declarationId);
+			walkAST(declaration.decl, { enter(node$1) {
 				delete node$1.loc;
 			} });
 			for (const [i, decl] of node.declarations.entries()) {
 				const transformedBinding = {
 					...decl.id,
-					typeAnnotation: original.bindings[i].typeAnnotation
+					typeAnnotation: declaration.bindings[i].typeAnnotation
 				};
-				overwriteNode(original.bindings[i], transformedBinding);
+				overwriteNode(declaration.bindings[i], transformedBinding);
 			}
+			for (const [i, child] of children.elements.entries()) Object.assign(declaration.children[i], { loc: child.loc });
 			const transformedParams = depsFn.params;
 			for (const [i, transformedParam] of transformedParams.entries()) {
 				const transformedName = transformedParam.name;
-				for (const originalTypeParam of original.params[i].typeParams) originalTypeParam.name = transformedName;
+				for (const originalTypeParam of declaration.params[i].typeParams) originalTypeParam.name = transformedName;
 			}
 			const transformedDeps = depsFn.body.elements;
-			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);
+			for (const [i, originalDep] of declaration.deps.entries()) if (originalDep.replace) originalDep.replace(transformedDeps[i]);
+			else Object.assign(originalDep, transformedDeps[i]);
+			return inheritNodeComments(node, declaration.decl);
 		}).filter((node) => !!node);
 		if (program.body.length === 0) return "export { };";
 		const comments = /* @__PURE__ */ new Set();
@@ -270,23 +278,27 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 			program.body[0].leadingComments ||= [];
 			program.body[0].leadingComments.unshift(...comments);
 		}
-		return generate(file, {
+		const result = generate(file, {
 			comments: true,
 			sourceMaps: sourcemap,
 			sourceFileName: chunk.fileName
 		});
+		return {
+			code: result.code,
+			map: result.map
+		};
 	}
 	function getIdentifierIndex(name) {
 		if (name in identifierMap) return identifierMap[name]++;
 		return identifierMap[name] = 0;
 	}
-	function registerSymbol(info) {
-		const symbolId = symbolIdx++;
-		symbolMap.set(symbolId, info);
-		return symbolId;
+	function registerDeclaration(info) {
+		const declarationId = declarationIdx++;
+		declarationMap.set(declarationId, info);
+		return declarationId;
 	}
-	function getSymbol(symbolId) {
-		return symbolMap.get(symbolId);
+	function getDeclaration(declarationId) {
+		return declarationMap.get(declarationId);
 	}
 	/**
 	* Collects all TSTypeParameter nodes from the given node and groups them by
@@ -297,7 +309,7 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 	function collectParams(node) {
 		const typeParams = [];
 		walkAST(node, { leave(node$1) {
-			if ("typeParameters" in node$1 && node$1.typeParameters?.type === "TSTypeParameterDeclaration") typeParams.push(...node$1.typeParameters.params);
+			if ("typeParameters" in node$1 && node$1.typeParameters?.type === "TSTypeParameterDeclaration") typeParams.push(...node$1.typeParameters.params.map((param) => param.name));
 		} });
 		const paramMap = /* @__PURE__ */ new Map();
 		for (const typeParam of typeParams) {
@@ -311,7 +323,7 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 			typeParams: typeParams$1
 		}));
 	}
-	function collectDependencies(node, namespaceStmts) {
+	function collectDependencies(node, namespaceStmts, children) {
 		const deps = /* @__PURE__ */ new Set();
 		const seen = /* @__PURE__ */ new Set();
 		const inferredStack = [];
@@ -334,10 +346,13 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 				} 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 === "TSInterfaceDeclaration" && node$1.extends) for (const heritage of node$1.extends || []) addDependency(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));
+					if (node$1.implements) for (const implement of node$1.implements) {
+						if (implement.type === "ClassImplements") throw new Error("Unexpected Flow syntax");
+						addDependency(implement.expression);
+					}
 				} else if (isTypeOf(node$1, [
 					"ObjectMethod",
 					"ObjectProperty",
@@ -358,12 +373,12 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 						break;
 					case "TSImportType": {
 						seen.add(node$1);
-						const source = node$1.argument;
-						const imported = node$1.qualifier;
-						addDependency(importNamespace(node$1, imported, source, namespaceStmts));
+						const { source, qualifier } = node$1;
+						addDependency(importNamespace(node$1, qualifier, source, namespaceStmts));
 						break;
 					}
 				}
+				if (parent && !deps.has(node$1) && isChildSymbol(node$1, parent)) children.add(node$1);
 			}
 		});
 		return Array.from(deps);
@@ -382,12 +397,13 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 		});
 		if (imported) {
 			const importedLeft = getIdFromTSEntityName(imported);
+			if (imported.type === "ThisExpression" || importedLeft.type === "ThisExpression") throw new Error("Cannot import `this` from module.");
 			overwriteNode(importedLeft, t.tsQualifiedName(local, { ...importedLeft }));
 			local = imported;
 		}
 		let replacement = node;
-		if (node.typeParameters) {
-			overwriteNode(node, t.tsTypeReference(local, node.typeParameters));
+		if (node.typeArguments) {
+			overwriteNode(node, t.tsTypeReference(local, node.typeArguments));
 			replacement = local;
 		} else overwriteNode(node, local);
 		return {
@@ -398,10 +414,15 @@ function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }) {
 		};
 	}
 }
+function isChildSymbol(node, parent) {
+	if (node.type === "Identifier") return true;
+	if (isTypeOf(parent, ["TSPropertySignature", "TSMethodSignature"]) && parent.key === node) return true;
+	return false;
+}
 function collectInferredNames(node) {
 	const inferred = [];
 	walkAST(node, { enter(node$1) {
-		if (node$1.type === "TSInferType" && node$1.typeParameter) inferred.push(node$1.typeParameter.name);
+		if (node$1.type === "TSInferType" && node$1.typeParameter) inferred.push(node$1.typeParameter.name.name);
 	} });
 	return inferred;
 }
@@ -413,34 +434,34 @@ function collectReferenceDirectives(comment, negative = false) {
 * Check if the given node is a {@link RuntimeBindingVariableDeclration}
 */
 function isRuntimeBindingVariableDeclaration(node) {
-	return t.isVariableDeclaration(node) && node.declarations.length > 0 && t.isVariableDeclarator(node.declarations[0]) && isRuntimeBindingArrayExpression(node.declarations[0].init);
+	return node?.type === "VariableDeclaration" && node.declarations.length > 0 && node.declarations[0].type === "VariableDeclarator" && isRuntimeBindingArrayExpression(node.declarations[0].init);
 }
 /**
 * Check if the given node is a {@link RuntimeBindingArrayExpression}
 */
 function isRuntimeBindingArrayExpression(node) {
-	return t.isArrayExpression(node) && isRuntimeBindingArrayElements(node.elements);
-}
-function runtimeBindingArrayExpression(elements) {
-	return t.arrayExpression(elements);
+	return node?.type === "ArrayExpression" && isRuntimeBindingArrayElements(node.elements);
 }
 /**
 * Check if the given array is a {@link RuntimeBindingArrayElements}
 */
 function isRuntimeBindingArrayElements(elements) {
-	const [symbolId, deps, effect] = elements;
-	return t.isNumericLiteral(symbolId) && t.isArrowFunctionExpression(deps) && (!effect || t.isCallExpression(effect));
+	const [declarationId, deps, children, effect] = elements;
+	return declarationId?.type === "NumericLiteral" && deps?.type === "ArrowFunctionExpression" && children?.type === "ArrayExpression" && (!effect || effect.type === "CallExpression");
+}
+function runtimeBindingArrayExpression(elements) {
+	return t.arrayExpression(elements);
 }
 function isThisExpression(node) {
-	return isIdentifierOf(node, "this") || node.type === "MemberExpression" && isThisExpression(node.object);
+	return isIdentifierOf(node, "this") || node.type === "ThisExpression" || node.type === "MemberExpression" && isThisExpression(node.object);
 }
 function TSEntityNameToRuntime(node) {
-	if (node.type === "Identifier") return node;
+	if (node.type === "Identifier" || node.type === "ThisExpression") return node;
 	const left = TSEntityNameToRuntime(node.left);
 	return Object.assign(node, t.memberExpression(left, node.right));
 }
 function getIdFromTSEntityName(node) {
-	if (node.type === "Identifier") return node;
+	if (node.type === "Identifier" || node.type === "ThisExpression") return node;
 	return getIdFromTSEntityName(node.left);
 }
 function isReferenceId(node) {
@@ -612,11 +633,21 @@ const spawnAsync = (...args) => new Promise((resolve, reject) => {
 	child.on("close", () => resolve());
 	child.on("error", (error) => reject(error));
 });
-async function runTsgo(rootDir, tsconfig, sourcemap) {
-	debug$3("[tsgo] rootDir", rootDir);
+async function getTsgoPathFromNodeModules() {
 	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();
+	return getExePath();
+}
+async function runTsgo(rootDir, tsconfig, sourcemap, tsgoPath) {
+	debug$3("[tsgo] rootDir", rootDir);
+	let tsgo;
+	if (tsgoPath) {
+		tsgo = tsgoPath;
+		debug$3("[tsgo] using custom path", tsgo);
+	} else {
+		tsgo = await getTsgoPathFromNodeModules();
+		debug$3("[tsgo] using tsgo from node_modules", tsgo);
+	}
 	const tsgoDist = await mkdtemp(path.join(tmpdir(), "rolldown-plugin-dts-"));
 	debug$3("[tsgo] tsgoDist", tsgoDist);
 	const args = [
@@ -662,7 +693,7 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 	return {
 		name: "rolldown-plugin-dts:generate",
 		async buildStart(options) {
-			if (tsgo) tsgoDist = await runTsgo(rootDir, tsconfig, sourcemap);
+			if (tsgo) tsgoDist = await runTsgo(rootDir, tsconfig, sourcemap, tsgo.path);
 			else if (!oxc) if (parallel) {
 				childProcess = fork(new URL(WORKER_URL, import.meta.url), { stdio: "inherit" });
 				rpc = (await import("birpc")).createBirpc({}, {
@@ -800,7 +831,7 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 					dtsCode = result.code;
 					map = result.map;
 					if (dtsCode && RE_JSON.test(id)) if (dtsCode.includes("declare const _exports")) {
-						if (dtsCode.includes("declare const _exports: {")) {
+						if (dtsCode.includes("declare const _exports: {") && !dtsCode.includes("\n}[];")) {
 							const exports = collectJsonExports(dtsCode);
 							let i = 0;
 							dtsCode += exports.map((e) => {
@@ -876,6 +907,8 @@ function collectJsonExports(code) {
 //#region src/options.ts
 let warnedTsgo = false;
 function resolveOptions({ cwd = process.cwd(), dtsInput = false, emitDtsOnly = false, tsconfig, tsconfigRaw: overriddenTsconfigRaw = {}, compilerOptions = {}, sourcemap, resolver = "oxc", cjsDefault = false, sideEffects = false, build = false, incremental = false, vue = false, tsMacro = false, parallel = false, eager = false, newContext = false, emitJs, oxc, tsgo = false }) {
+	if (tsgo === true) tsgo = {};
+	else if (typeof tsgo === "object" && tsgo.enabled === false) tsgo = false;
 	let resolvedTsconfig;
 	if (tsconfig === true || tsconfig == null) {
 		const { config, path: path$1 } = getTsconfig(cwd) || {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rolldown-plugin-dts",
   "type": "module",
-  "version": "0.21.2",
+  "version": "0.21.3",
   "description": "A Rolldown plugin to generate and bundle dts files.",
   "author": "Kevin Deng <sxzz@sxzz.moe>",
   "license": "MIT",
@@ -62,22 +62,22 @@
     }
   },
   "dependencies": {
-    "@babel/generator": "^7.28.6",
-    "@babel/parser": "^7.28.6",
-    "@babel/types": "^7.28.6",
-    "ast-kit": "^2.2.0",
+    "@babel/generator": "8.0.0-beta.4",
+    "@babel/parser": "8.0.0-beta.4",
+    "@babel/types": "8.0.0-beta.4",
+    "ast-kit": "^3.0.0-beta.1",
     "birpc": "^4.0.0",
     "dts-resolver": "^2.1.3",
     "get-tsconfig": "^4.13.0",
     "obug": "^2.1.1"
   },
   "devDependencies": {
+    "@jridgewell/source-map": "^0.3.11",
     "@sxzz/eslint-config": "^7.4.5",
     "@sxzz/prettier-config": "^2.2.6",
     "@sxzz/test-utils": "^0.5.15",
-    "@types/babel__generator": "^7.27.0",
-    "@types/node": "^25.0.8",
-    "@typescript/native-preview": "7.0.0-dev.20260115.1",
+    "@types/node": "^25.0.9",
+    "@typescript/native-preview": "7.0.0-dev.20260118.1",
     "@volar/typescript": "^2.4.27",
     "@vue/language-core": "^3.2.2",
     "arktype": "^2.1.29",