rolldown-plugin-dts 0.8.1 → 0.8.3

package/dist/index.js

@@ -1,6 +1,6 @@
+import path from "node:path";
 import { MagicStringAST } from "magic-string-ast";
 import { parseSync } from "oxc-parser";
-import path from "node:path";
 import process from "node:process";
 import { createResolver } from "dts-resolver";
 import { getTsconfig, parseTsconfig } from "get-tsconfig";
@@ -8,7 +8,58 @@ import { isolatedDeclaration } from "oxc-transform";
 import { createRequire } from "node:module";
 import Debug from "debug";
 
+//#region src/utils/filename.ts
+const RE_JS = /\.([cm]?)jsx?$/;
+const RE_TS = /\.([cm]?)tsx?$/;
+const RE_DTS = /\.d\.([cm]?)ts$/;
+const RE_NODE_MODULES = /[\\/]node_modules[\\/]/;
+function filename_js_to_dts(id) {
+	return id.replace(RE_JS, ".d.$1ts");
+}
+function filename_ts_to_dts(id) {
+	return id.replace(RE_TS, ".d.$1ts");
+}
+function filename_dts_to(id, ext) {
+	return id.replace(RE_DTS, `.$1${ext}`);
+}
+function isRelative(id) {
+	return path.isAbsolute(id) || id[0] === ".";
+}
+
+//#endregion
+//#region src/dts-input.ts
+function createDtsInputPlugin() {
+	return {
+		name: "rolldown-plugin-dts:dts-input",
+		outputOptions(options) {
+			return {
+				...options,
+				entryFileNames: "[name].ts"
+			};
+		},
+		resolveId: {
+			order: "pre",
+			handler(id, importer, options) {
+				if (options.isEntry) return;
+				if (RE_NODE_MODULES.test(id) || !isRelative(id)) return {
+					id,
+					external: true
+				};
+			}
+		}
+	};
+}
+
+//#endregion
 //#region node_modules/.pnpm/estree-walker@3.0.3/node_modules/estree-walker/src/walker.js
+/**
+* @typedef { import('estree').Node} Node
+* @typedef {{
+*   skip: () => void;
+*   remove: () => void;
+*   replace: (node: Node) => void;
+* }} WalkerContext
+*/
 var WalkerBase = class {
 	constructor() {
 		/** @type {boolean} */
@@ -52,6 +103,17 @@ var WalkerBase = class {
 
 //#endregion
 //#region node_modules/.pnpm/estree-walker@3.0.3/node_modules/estree-walker/src/sync.js
+/**
+* @typedef { import('estree').Node} Node
+* @typedef { import('./walker.js').WalkerContext} WalkerContext
+* @typedef {(
+*    this: WalkerContext,
+*    node: Node,
+*    parent: Node | null,
+*    key: string | number | symbol | null | undefined,
+*    index: number | null | undefined
+* ) => void} SyncHandler
+*/
 var SyncWalker = class extends WalkerBase {
 	/**
 	*
@@ -157,6 +219,19 @@ function isNode(value) {
 
 //#endregion
 //#region node_modules/.pnpm/estree-walker@3.0.3/node_modules/estree-walker/src/index.js
+/**
+* @typedef {import('estree').Node} Node
+* @typedef {import('./sync.js').SyncHandler} SyncHandler
+* @typedef {import('./async.js').AsyncHandler} AsyncHandler
+*/
+/**
+* @param {Node} ast
+* @param {{
+*   enter?: SyncHandler
+*   leave?: SyncHandler
+* }} walker
+* @returns {Node | null}
+*/
 function walk(ast, { enter, leave }) {
 	const instance = new SyncWalker(enter, leave);
 	return instance.visit(ast, null);
@@ -169,25 +244,6 @@ function getIdentifierRange(node, offset = 0) {
 	return [node.start + offset, node.end + offset];
 }
 
-//#endregion
-//#region src/utils/filename.ts
-const RE_JS = /\.([cm]?)jsx?$/;
-const RE_TS = /\.([cm]?)tsx?$/;
-const RE_DTS = /\.d\.([cm]?)ts$/;
-const RE_NODE_MODULES = /[\\/]node_modules[\\/]/;
-function filename_js_to_dts(id) {
-	return id.replace(RE_JS, ".d.$1ts");
-}
-function filename_ts_to_dts(id) {
-	return id.replace(RE_TS, ".d.$1ts");
-}
-function filename_dts_to(id, ext) {
-	return id.replace(RE_DTS, `.$1${ext}`);
-}
-function isRelative(id) {
-	return path.isAbsolute(id) || id[0] === ".";
-}
-
 //#endregion
 //#region src/utils/magic-string.ts
 function overwriteOrAppend(s, range, replacement, suffix) {
@@ -267,7 +323,6 @@ function createFakeJsPlugin({ dtsInput }) {
 					if (node.type === "TSDeclareFunction" || node.type.endsWith("Declaration")) {
 						const binding = node.type === "VariableDeclaration" ? node.declarations[0].id : node.id;
 						const code$1 = s.sliceNode(node);
-						const jsdoc = comments.find((c) => c.type === "Block" && c.value[0] === "*" && c.start < node.start && stmt.start - c.end <= 1);
 						const offset = node.start;
 						let bindingRange;
 						if (sideEffect) bindingRange = [0, 0];
@@ -289,7 +344,6 @@ function createFakeJsPlugin({ dtsInput }) {
 							binding: bindingRange,
 							deps: depsSymbols,
 							needDeclare,
-							jsdoc: jsdoc ? s.sliceNode(jsdoc) : void 0,
 							preserveName: sideEffect
 						});
 						const runtime = `[${symbolId}, ${depsString}${depsString && sideEffect ? ", " : ""}${sideEffect ? "sideEffect()" : ""}]`;
@@ -332,7 +386,7 @@ function createFakeJsPlugin({ dtsInput }) {
 					continue;
 				}
 				const symbolId = symbolIdNode.value;
-				const { code: code$1, binding, deps, needDeclare, jsdoc, preserveName } = retrieve(symbolId);
+				const { code: code$1, binding, deps, needDeclare, preserveName } = retrieve(symbolId);
 				const depsRaw = depsNodes.filter((node$1) => node$1?.type === "ArrowFunctionExpression").map((dep) => s.sliceNode(dep.body));
 				const ss = new MagicStringAST(code$1);
 				if (!preserveName) overwriteOrAppend(ss, binding, s.sliceNode(decl.id));
@@ -341,7 +395,6 @@ function createFakeJsPlugin({ dtsInput }) {
 					overwriteOrAppend(ss, [start, end], depsRaw.shift(), suffix);
 				}
 				if (needDeclare) ss.prepend("declare ");
-				if (jsdoc) ss.prepend(`${jsdoc}\n`);
 				s.overwriteNode(node, ss.toString());
 			}
 			const str = s.toString();
@@ -756,7 +809,8 @@ function createGeneratePlugin({ tsconfig, compilerOptions, isolatedDeclarations,
 //#region src/index.ts
 function dts(options = {}) {
 	const plugins = [];
-	if (!options.dtsInput) plugins.push(createGeneratePlugin(options));
+	if (options.dtsInput) plugins.push(createDtsInputPlugin());
+	else plugins.push(createGeneratePlugin(options));
 	plugins.push(createFakeJsPlugin(options));
 	return plugins;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-dts",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "A Rolldown plugin to bundle dts files",
   "type": "module",
   "license": "MIT",
@@ -41,11 +41,11 @@
     "dts-resolver": "^1.0.0",
     "get-tsconfig": "^4.10.0",
     "magic-string-ast": "^0.9.1",
-    "oxc-parser": "^0.64.0",
-    "oxc-transform": "^0.64.0"
+    "oxc-parser": "^0.65.0",
+    "oxc-transform": "^0.65.0"
   },
   "devDependencies": {
-    "@sxzz/eslint-config": "^6.1.1",
+    "@sxzz/eslint-config": "^6.1.2",
     "@sxzz/prettier-config": "^2.2.1",
     "@sxzz/test-utils": "^0.5.5",
     "@types/debug": "^4.1.12",
@@ -53,19 +53,22 @@
     "@types/node": "^22.14.1",
     "bumpp": "^10.1.0",
     "diff": "^7.0.0",
-    "eslint": "^9.25.0",
+    "eslint": "^9.25.1",
     "estree-walker": "^3.0.3",
     "prettier": "^3.5.3",
-    "rolldown": "^1.0.0-beta.7",
+    "rolldown": "1.0.0-beta.7-commit.c2596d3",
     "rollup-plugin-dts": "^6.2.1",
-    "tsdown": "^0.8.1",
+    "tsdown": "^0.9.2",
     "tsx": "^4.19.3",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.1"
+    "vitest": "^3.1.2"
   },
   "engines": {
     "node": ">=20.18.0"
   },
+  "resolutions": {
+    "rolldown-plugin-dts": "workspace:*"
+  },
   "prettier": "@sxzz/prettier-config",
   "scripts": {
     "lint": "eslint --cache .",