rolldown-plugin-dts 0.17.0 → 0.17.2

package/dist/index.js

@@ -364,7 +364,7 @@ function createFakeJsPlugin({ sourcemap, cjsDefault }) {
 				bindings.push(binding);
 				decl.id = binding;
 			}
-			const params = "typeParameters" in decl && decl.typeParameters?.type === "TSTypeParameterDeclaration" ? decl.typeParameters.params : [];
+			const params = collectParams(decl);
 			const deps = collectDependencies(decl, namespaceStmts);
 			if (decl !== stmt) decl.leadingComments = stmt.leadingComments;
 			const symbolId = registerSymbol({
@@ -374,7 +374,7 @@ function createFakeJsPlugin({ sourcemap, cjsDefault }) {
 				params
 			});
 			const symbolIdNode = t.numericLiteral(symbolId);
-			const depsNode = t.arrowFunctionExpression(params.map((param) => t.identifier(param.name)), t.arrayExpression(deps));
+			const depsNode = t.arrowFunctionExpression(params.map(({ name }) => t.identifier(name)), t.arrayExpression(deps));
 			const sideEffectNode = sideEffect && t.callExpression(t.identifier("sideEffect"), [bindings[0]]);
 			const runtimeArrayNode = runtimeBindingArrayExpression(sideEffectNode ? [
 				symbolIdNode,
@@ -445,9 +445,9 @@ function createFakeJsPlugin({ sourcemap, cjsDefault }) {
 				overwriteNode(original.bindings[i], transformedBinding);
 			}
 			const transformedParams = depsFn.params;
-			for (let i = 0; i < original.params.length; i++) {
-				const originalParam = original.params[i];
-				originalParam.name = transformedParams[i].name;
+			for (const [i, transformedParam] of transformedParams.entries()) {
+				const transformedName = transformedParam.name;
+				for (const originalTypeParam of original.params[i].typeParams) originalTypeParam.name = transformedName;
 			}
 			const transformedDeps = depsFn.body.elements;
 			for (let i = 0; i < original.deps.length; i++) {
@@ -494,6 +494,29 @@ function createFakeJsPlugin({ sourcemap, cjsDefault }) {
 	function getSymbol(symbolId) {
 		return symbolMap.get(symbolId);
 	}
+	/**
+	* Collects all TSTypeParameter nodes from the given node and groups them by
+	* their name. One name can associate with one or more type parameters. These
+	* names will be used as the parameter name in the generated JavaScript
+	* dependency function.
+	*/
+	function collectParams(node) {
+		const typeParams = [];
+		walk(node, { leave(node$1) {
+			if ("typeParameters" in node$1 && node$1.typeParameters?.type === "TSTypeParameterDeclaration") typeParams.push(...node$1.typeParameters.params);
+		} });
+		const paramMap = /* @__PURE__ */ new Map();
+		for (const typeParam of typeParams) {
+			const name = typeParam.name;
+			const group = paramMap.get(name);
+			if (group) group.push(typeParam);
+			else paramMap.set(name, [typeParam]);
+		}
+		return Array.from(paramMap.entries()).map(([name, typeParams$1]) => ({
+			name,
+			typeParams: typeParams$1
+		}));
+	}
 	function collectDependencies(node, namespaceStmts) {
 		const deps = /* @__PURE__ */ new Set();
 		const seen = /* @__PURE__ */ new Set();
@@ -605,7 +628,7 @@ function isReferenceId(node) {
 	return !!node && (node.type === "Identifier" || node.type === "MemberExpression");
 }
 function isHelperImport(node) {
-	return node.type === "ImportDeclaration" && node.specifiers.length === 1 && node.specifiers.every((spec) => spec.type === "ImportSpecifier" && spec.imported.type === "Identifier" && ["__export", "__reExport"].includes(spec.imported.name));
+	return node.type === "ImportDeclaration" && node.specifiers.length === 1 && node.specifiers.every((spec) => spec.type === "ImportSpecifier" && spec.imported.type === "Identifier" && ["__export", "__reExport"].includes(spec.local.name));
 }
 /**
 * patch `.d.ts` suffix in import source to `.js`
@@ -920,6 +943,24 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 					if (result.error) return this.error(result.error);
 					dtsCode = result.code;
 					map = result.map;
+					if (dtsCode && RE_JSON.test(id)) if (dtsCode.includes("declare const _exports")) {
+						if (dtsCode.includes("declare const _exports: {")) {
+							const exports = collectJsonExports(dtsCode);
+							let i = 0;
+							dtsCode += exports.map((e) => {
+								const valid = `_${e.replaceAll(/[^\w$]/g, "_")}${i++}`;
+								const jsonKey = JSON.stringify(e);
+								return `declare let ${valid}: typeof _exports[${jsonKey}]\nexport { ${valid} as ${jsonKey} }`;
+							}).join("\n");
+						}
+					} else {
+						const exportMap = collectJsonExportMap(dtsCode);
+						dtsCode += `
+declare namespace __json_default_export {
+  export { ${Array.from(exportMap.entries()).map(([exported, local]) => exported === local ? exported : `${local} as ${exported}`).join(", ")} }
+}
+export { __json_default_export as default }`;
+					}
 				}
 				return {
 					code: dtsCode || "",
@@ -965,6 +1006,33 @@ async function runTsgo(root, tsconfig) {
 	], { stdio: "inherit" });
 	return tsgoDist;
 }
+function collectJsonExportMap(code) {
+	const exportMap = /* @__PURE__ */ new Map();
+	const { program } = parse(code, {
+		sourceType: "module",
+		plugins: [["typescript", { dts: true }]]
+	});
+	for (const decl of program.body) if (decl.type === "ExportNamedDeclaration") {
+		if (decl.declaration && decl.declaration.type === "VariableDeclaration") {
+			for (const vdecl of decl.declaration.declarations) if (vdecl.id.type === "Identifier") exportMap.set(vdecl.id.name, vdecl.id.name);
+		} else if (decl.specifiers.length) {
+			for (const spec of decl.specifiers) if (spec.type === "ExportSpecifier" && spec.exported.type === "Identifier") exportMap.set(spec.exported.name, spec.local.type === "Identifier" ? spec.local.name : spec.exported.name);
+		}
+	}
+	return exportMap;
+}
+/** `declare const _exports` mode */
+function collectJsonExports(code) {
+	const exports = [];
+	const { program } = parse(code, {
+		sourceType: "module",
+		plugins: [["typescript", { dts: true }]]
+	});
+	const members = program.body[0].declarations[0].id.typeAnnotation.typeAnnotation.members;
+	for (const member of members) if (member.key.type === "Identifier") exports.push(member.key.name);
+	else if (member.key.type === "StringLiteral") exports.push(member.key.value);
+	return exports;
+}
 
 //#endregion
 //#region src/options.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-dts",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "description": "A Rolldown plugin to generate and bundle dts files.",
   "type": "module",
   "keywords": [
@@ -61,41 +61,41 @@
     }
   },
   "dependencies": {
-    "@babel/generator": "^7.28.3",
-    "@babel/parser": "^7.28.4",
-    "@babel/types": "^7.28.4",
+    "@babel/generator": "^7.28.5",
+    "@babel/parser": "^7.28.5",
+    "@babel/types": "^7.28.5",
     "ast-kit": "^2.1.3",
     "birpc": "^2.6.1",
     "debug": "^4.4.3",
     "dts-resolver": "^2.1.2",
     "get-tsconfig": "^4.13.0",
-    "magic-string": "^0.30.19"
+    "magic-string": "^0.30.21"
   },
   "devDependencies": {
     "@sxzz/eslint-config": "^7.2.7",
     "@sxzz/prettier-config": "^2.2.4",
-    "@sxzz/test-utils": "^0.5.11",
+    "@sxzz/test-utils": "^0.5.12",
     "@types/babel__generator": "^7.27.0",
     "@types/debug": "^4.1.12",
     "@types/node": "^24.9.1",
-    "@typescript/native-preview": "7.0.0-dev.20251022.1",
+    "@typescript/native-preview": "7.0.0-dev.20251027.1",
     "@volar/typescript": "^2.4.23",
-    "@vue/language-core": "^3.1.1",
+    "@vue/language-core": "^3.1.2",
     "arktype": "^2.1.23",
     "bumpp": "^10.3.1",
     "diff": "^8.0.2",
     "eslint": "^9.38.0",
     "estree-walker": "^3.0.3",
     "prettier": "^3.6.2",
-    "rolldown": "^1.0.0-beta.44",
+    "rolldown": "^1.0.0-beta.45",
     "rolldown-plugin-require-cjs": "^0.3.1",
     "rollup-plugin-dts": "^6.2.3",
     "tinyglobby": "^0.2.15",
-    "tsdown": "^0.15.9",
+    "tsdown": "^0.15.11",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.1",
+    "vitest": "^4.0.4",
     "vue": "^3.5.22",
-    "vue-tsc": "^3.1.1"
+    "vue-tsc": "^3.1.2"
   },
   "engines": {
     "node": ">=20.18.0"