rolldown-plugin-dts 0.19.2 → 0.21.0

package/README.md

@@ -81,16 +81,6 @@ See: [TypeScript compilerOptions documentation](https://www.typescriptlang.org/t
 
 If `true`, the plugin will generate declaration maps (`.d.ts.map`) for `.d.ts` files.
 
-#### `resolve`
-
-Controls whether type definitions from `node_modules` are bundled into your final `.d.ts` file or kept as external `import` statements.
-
-By default, dependencies are external, resulting in `import { Type } from 'some-package'`. When bundled, this `import` is removed, and the type definitions from `some-package` are copied directly into your file.
-
-- `true`: Bundles all dependencies.
-- `false`: (Default) Keeps all dependencies external.
-- `(string | RegExp)[]`: Bundles only dependencies matching the provided strings or regular expressions (e.g. `['pkg-a', /^@scope\//]`).
-
 #### `resolver`
 
 Specifies a resolver to resolve type definitions, especially for `node_modules`.

package/dist/filename-Cqnsj8Gp.mjs

@@ -0,0 +1,27 @@
+//#region src/filename.ts
+const RE_JS = /\.([cm]?)jsx?$/;
+const RE_TS = /\.([cm]?)tsx?$/;
+const RE_DTS = /\.d\.([cm]?)ts$/;
+const RE_DTS_MAP = /\.d\.([cm]?)ts\.map$/;
+const RE_NODE_MODULES = /[\\/]node_modules[\\/]/;
+const RE_CSS = /\.css$/;
+const RE_VUE = /\.vue$/;
+const RE_JSON = /\.json$/;
+function filename_js_to_dts(id) {
+	return id.replace(RE_JS, ".d.$1ts");
+}
+function filename_to_dts(id) {
+	return id.replace(RE_VUE, ".vue.ts").replace(RE_TS, ".d.$1ts").replace(RE_JS, ".d.$1ts").replace(RE_JSON, ".d.ts");
+}
+function filename_dts_to(id, ext) {
+	return id.replace(RE_DTS, `.$1${ext}`);
+}
+function resolveTemplateFn(fn, chunk) {
+	return typeof fn === "function" ? fn(chunk) : fn;
+}
+function replaceTemplateName(template, name) {
+	return template.replaceAll("[name]", name);
+}
+
+//#endregion
+export { RE_JSON as a, RE_VUE as c, filename_to_dts as d, replaceTemplateName as f, RE_JS as i, filename_dts_to as l, RE_DTS as n, RE_NODE_MODULES as o, resolveTemplateFn as p, RE_DTS_MAP as r, RE_TS as s, RE_CSS as t, filename_js_to_dts as u };

package/dist/filename.mjs

@@ -1,27 +1,3 @@
-//#region src/filename.ts
-const RE_JS = /\.([cm]?)jsx?$/;
-const RE_TS = /\.([cm]?)tsx?$/;
-const RE_DTS = /\.d\.([cm]?)ts$/;
-const RE_DTS_MAP = /\.d\.([cm]?)ts\.map$/;
-const RE_NODE_MODULES = /[\\/]node_modules[\\/]/;
-const RE_CSS = /\.css$/;
-const RE_VUE = /\.vue$/;
-const RE_JSON = /\.json$/;
-function filename_js_to_dts(id) {
-	return id.replace(RE_JS, ".d.$1ts");
-}
-function filename_to_dts(id) {
-	return id.replace(RE_VUE, ".vue.ts").replace(RE_TS, ".d.$1ts").replace(RE_JS, ".d.$1ts").replace(RE_JSON, ".d.ts");
-}
-function filename_dts_to(id, ext) {
-	return id.replace(RE_DTS, `.$1${ext}`);
-}
-function resolveTemplateFn(fn, chunk) {
-	return typeof fn === "function" ? fn(chunk) : fn;
-}
-function replaceTemplateName(template, name) {
-	return template.replaceAll("[name]", name);
-}
+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";
 
-//#endregion
 export { RE_CSS, RE_DTS, RE_DTS_MAP, RE_JS, RE_JSON, RE_NODE_MODULES, RE_TS, RE_VUE, filename_dts_to, filename_js_to_dts, filename_to_dts, replaceTemplateName, resolveTemplateFn };

package/dist/{index-DWPGYc3m.d.mts → index-C8o_kIRC.d.mts}

@@ -1,4 +1,4 @@
-import { r as TscContext } from "./context-Dt8gPoCq.mjs";
+import { r as TscContext } from "./context-CCPZT79j.mjs";
 import { TsConfigJson } from "get-tsconfig";
 import ts from "typescript";
 import { SourceMapInput } from "rolldown";

package/dist/index.d.mts

@@ -1,4 +1,3 @@
-import { RE_CSS, RE_DTS, RE_DTS_MAP, RE_JS, RE_JSON, RE_NODE_MODULES, RE_TS, RE_VUE } from "./filename.mjs";
 import { IsolatedDeclarationsOptions } from "rolldown/experimental";
 import { TsConfigJson } from "get-tsconfig";
 import { Plugin } from "rolldown";
@@ -47,16 +46,6 @@ interface GeneralOptions {
   */
   sourcemap?: boolean;
   /**
-  * Controls whether type definitions from `node_modules` are bundled into your final `.d.ts` file or kept as external `import` statements.
-  * 
-  * By default, dependencies are external, resulting in `import { Type } from 'some-package'`. When bundled, this `import` is removed, and the type definitions from `some-package` are copied directly into your file.
-  
-  * - `true`: Bundles all dependencies.
-  * - `false`: (Default) Keeps all dependencies external.
-  * - `(string | RegExp)[]`: Bundles only dependencies matching the provided strings or regular expressions (e.g. `['pkg-a', /^@scope\//]`).
-  */
-  resolve?: boolean | (string | RegExp)[];
-  /**
   * Specifies a resolver to resolve type definitions, especially for `node_modules`.
   *
   * - `'oxc'`: Uses Oxc's module resolution, which is faster and more efficient.
@@ -194,7 +183,6 @@ declare function resolveOptions({
   tsconfigRaw: overriddenTsconfigRaw,
   compilerOptions,
   sourcemap,
-  resolve,
   resolver,
   cjsDefault,
   sideEffects,
@@ -239,4 +227,4 @@ declare function createGeneratePlugin({
 //#region src/index.d.ts
 declare function dts(options?: Options): Plugin[];
 //#endregion
-export { type Options, RE_CSS, RE_DTS, RE_DTS_MAP, RE_JS, RE_JSON, RE_NODE_MODULES, RE_TS, RE_VUE, createFakeJsPlugin, createGeneratePlugin, dts, resolveOptions };
+export { type Options, createFakeJsPlugin, createGeneratePlugin, dts, resolveOptions };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 const __cjs_require = globalThis.process.getBuiltinModule("module").createRequire(import.meta.url);
-import { RE_CSS, RE_DTS, RE_DTS_MAP, RE_JS, RE_JSON, RE_NODE_MODULES, RE_TS, RE_VUE, filename_dts_to, filename_js_to_dts, filename_to_dts, replaceTemplateName, resolveTemplateFn } from "./filename.mjs";
-import { n as globalContext, r as invalidateContextFile, t as createContext } from "./context-9CkpILzL.mjs";
+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
@@ -30,6 +30,7 @@ import { ResolverFactory, isolatedDeclarationSync } from "rolldown/experimental"
 const process = globalThis.process;
 import { getTsconfig, parseTsconfig } from "get-tsconfig";
 import { createResolver } from "dts-resolver";
+import { importerId, include } from "rolldown/filter";
 
 //#region src/dts-input.ts
 function createDtsInputPlugin({ sideEffects }) {
@@ -438,7 +439,7 @@ function isReferenceId(node) {
 	return isTypeOf(node, ["Identifier", "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.local.name));
+	return node.type === "ImportDeclaration" && node.specifiers.length === 1 && node.specifiers.every((spec) => spec.type === "ImportSpecifier" && spec.imported.type === "Identifier" && ["__exportAll", "__reExport"].includes(spec.local.name));
 }
 /**
 * patch `.d.ts` suffix in import source to `.js`
@@ -466,7 +467,7 @@ function patchImportExport(node, typeOnlyIds, cjsDefault) {
 	}
 }
 /**
-* Handle `__export` call
+* Handle `__exportAll` call
 */
 function patchTsNamespace(nodes) {
 	const removed = /* @__PURE__ */ new Set();
@@ -496,7 +497,7 @@ function patchTsNamespace(nodes) {
 	}
 	return nodes.filter((node) => !removed.has(node));
 	function handleExport(node) {
-		if (node.type !== "VariableDeclaration" || node.declarations.length !== 1 || node.declarations[0].id.type !== "Identifier" || node.declarations[0].init?.type !== "CallExpression" || node.declarations[0].init.callee.type !== "Identifier" || node.declarations[0].init.callee.name !== "__export" || node.declarations[0].init.arguments.length !== 1 || node.declarations[0].init.arguments[0].type !== "ObjectExpression") return false;
+		if (node.type !== "VariableDeclaration" || node.declarations.length !== 1 || node.declarations[0].id.type !== "Identifier" || node.declarations[0].init?.type !== "CallExpression" || node.declarations[0].init.callee.type !== "Identifier" || node.declarations[0].init.callee.name !== "__exportAll" || node.declarations[0].init.arguments.length !== 1 || node.declarations[0].init.arguments[0].type !== "ObjectExpression") return false;
 		return [node.declarations[0].id, node.declarations[0].init.arguments[0]];
 	}
 }
@@ -851,7 +852,7 @@ function collectJsonExports(code) {
 //#endregion
 //#region src/options.ts
 let warnedTsgo = false;
-function resolveOptions({ cwd = process.cwd(), dtsInput = false, emitDtsOnly = false, tsconfig, tsconfigRaw: overriddenTsconfigRaw = {}, compilerOptions = {}, sourcemap, resolve = false, resolver = "oxc", cjsDefault = false, sideEffects = false, build = false, incremental = false, vue = false, tsMacro = false, parallel = false, eager = false, newContext = false, emitJs, oxc, tsgo = 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 }) {
 	let resolvedTsconfig;
 	if (tsconfig === true || tsconfig == null) {
 		const { config, path: path$1 } = getTsconfig(cwd) || {};
@@ -898,7 +899,6 @@ function resolveOptions({ cwd = process.cwd(), dtsInput = false, emitDtsOnly = f
 		tsconfig,
 		tsconfigRaw,
 		sourcemap,
-		resolve,
 		resolver,
 		cjsDefault,
 		sideEffects,
@@ -921,10 +921,10 @@ const debug$1 = createDebug("rolldown-plugin-dts:resolver");
 function isSourceFile(id) {
 	return RE_TS.test(id) || RE_VUE.test(id) || RE_JSON.test(id);
 }
-function createDtsResolvePlugin({ cwd, tsconfig, tsconfigRaw, resolve, resolver, sideEffects }) {
+function createDtsResolvePlugin({ cwd, tsconfig, tsconfigRaw, resolver, sideEffects }) {
 	const baseDtsResolver = createResolver({
 		tsconfig,
-		resolveNodeModules: !!resolve,
+		resolveNodeModules: true,
 		ResolverFactory
 	});
 	const moduleSideEffects = sideEffects ? true : null;
@@ -932,8 +932,9 @@ function createDtsResolvePlugin({ cwd, tsconfig, tsconfigRaw, resolve, resolver,
 		name: "rolldown-plugin-dts:resolver",
 		resolveId: {
 			order: "pre",
+			filter: [include(importerId(RE_DTS))],
 			async handler(id, importer, options) {
-				if (!importer || !RE_DTS.test(importer)) return;
+				if (!importer) return;
 				const external = {
 					id,
 					external: true,
@@ -945,16 +946,16 @@ function createDtsResolvePlugin({ cwd, tsconfig, tsconfigRaw, resolve, resolver,
 				}
 				const rolldownResolution = await this.resolve(id, importer, options);
 				debug$1("Rolldown resolution for dts import %O from %O: %O", id, importer, rolldownResolution);
+				if (rolldownResolution?.external) {
+					debug$1("Rolldown marked dts import as external:", id);
+					return external;
+				}
 				const dtsResolution = await resolveDtsPath(id, importer, rolldownResolution);
 				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 {
@@ -973,14 +974,10 @@ function createDtsResolvePlugin({ cwd, tsconfig, tsconfigRaw, resolve, resolver,
 			}
 		}
 	};
-	function shouldBundleNodeModule(id) {
-		if (typeof resolve === "boolean") return resolve;
-		return resolve.some((pattern) => typeof pattern === "string" ? id === pattern : pattern.test(id));
-	}
 	async function resolveDtsPath(id, importer, rolldownResolution) {
 		let dtsPath;
 		if (resolver === "tsc") {
-			const { tscResolve } = await import("./resolver-CyVXxlZv.mjs");
+			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);
@@ -1011,4 +1008,4 @@ function dts(options = {}) {
 }
 
 //#endregion
-export { RE_CSS, RE_DTS, RE_DTS_MAP, RE_JS, RE_JSON, RE_NODE_MODULES, RE_TS, RE_VUE, createFakeJsPlugin, createGeneratePlugin, dts, resolveOptions };
+export { createFakeJsPlugin, createGeneratePlugin, dts, resolveOptions };

package/dist/{tsc-CG1xgNuJ.mjs → tsc-C0UrtIA5.mjs}

@@ -1,5 +1,6 @@
 const __cjs_require = globalThis.process.getBuiltinModule("module").createRequire(import.meta.url);
-import { n as globalContext } from "./context-9CkpILzL.mjs";
+import { n as RE_DTS, r as RE_DTS_MAP } from "./filename-Cqnsj8Gp.mjs";
+import { n as globalContext } from "./context-EuY-ImLj.mjs";
 const {
   createRequire
 } = globalThis.process.getBuiltinModule("node:module");
@@ -108,7 +109,7 @@ function tscEmitBuild(tscOptions) {
 	let code;
 	let map;
 	for (const outputFile of outputFiles) {
-		if (outputFile.endsWith(".d.ts")) {
+		if (RE_DTS.test(outputFile)) {
 			if (!fsSystem.fileExists(outputFile)) {
 				console.warn(`[rolldown-plugin-dts] Unable to read file ${outputFile}`);
 				continue;
@@ -116,7 +117,7 @@ function tscEmitBuild(tscOptions) {
 			code = fsSystem.readFile(outputFile);
 			continue;
 		}
-		if (outputFile.endsWith(".d.ts.map")) {
+		if (RE_DTS_MAP.test(outputFile)) {
 			if (!fsSystem.fileExists(outputFile)) continue;
 			const text = fsSystem.readFile(outputFile);
 			if (!text) {

package/dist/tsc-context.d.mts

@@ -1,2 +1,2 @@
-import { a as globalContext, i as createContext, n as SourceFileToProjectMap, o as invalidateContextFile, r as TscContext, t as ParsedProject } from "./context-Dt8gPoCq.mjs";
+import { a as globalContext, i as createContext, n as SourceFileToProjectMap, o as invalidateContextFile, r as TscContext, t as ParsedProject } from "./context-CCPZT79j.mjs";
 export { ParsedProject, SourceFileToProjectMap, TscContext, createContext, globalContext, invalidateContextFile };

package/dist/tsc-context.mjs

@@ -1,3 +1,3 @@
-import { n as globalContext, r as invalidateContextFile, t as createContext } from "./context-9CkpILzL.mjs";
+import { n as globalContext, r as invalidateContextFile, t as createContext } from "./context-EuY-ImLj.mjs";
 
 export { createContext, globalContext, invalidateContextFile };

package/dist/tsc-worker.d.mts

@@ -1,5 +1,4 @@
-import "./context-Dt8gPoCq.mjs";
-import { t as tscEmit } from "./index-DWPGYc3m.mjs";
+import { t as tscEmit } from "./index-C8o_kIRC.mjs";
 
 //#region src/tsc/worker.d.ts
 declare const functions: {

package/dist/tsc-worker.mjs

@@ -1,5 +1,4 @@
-import { t as tscEmit } from "./tsc-CG1xgNuJ.mjs";
-import "./context-9CkpILzL.mjs";
+import { t as tscEmit } from "./tsc-C0UrtIA5.mjs";
 const process = globalThis.process;
 import { createBirpc } from "birpc";
 

package/dist/tsc.d.mts

@@ -1,3 +1,2 @@
-import "./context-Dt8gPoCq.mjs";
-import { i as TscResult, n as TscModule, r as TscOptions, t as tscEmit } from "./index-DWPGYc3m.mjs";
+import { i as TscResult, n as TscModule, r as TscOptions, t as tscEmit } from "./index-C8o_kIRC.mjs";
 export { TscModule, TscOptions, TscResult, tscEmit };

package/dist/tsc.mjs

@@ -1,4 +1,3 @@
-import { t as tscEmit } from "./tsc-CG1xgNuJ.mjs";
-import "./context-9CkpILzL.mjs";
+import { t as tscEmit } from "./tsc-C0UrtIA5.mjs";
 
 export { tscEmit };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rolldown-plugin-dts",
   "type": "module",
-  "version": "0.19.2",
+  "version": "0.21.0",
   "description": "A Rolldown plugin to generate and bundle dts files.",
   "author": "Kevin Deng <sxzz@sxzz.moe>",
   "license": "MIT",
@@ -45,7 +45,7 @@
   "peerDependencies": {
     "@ts-macro/tsc": "^0.3.6",
     "@typescript/native-preview": ">=7.0.0-dev.20250601.1",
-    "rolldown": "^1.0.0-beta.55",
+    "rolldown": "^1.0.0-beta.57",
     "typescript": "^5.0.0",
     "vue-tsc": "~3.2.0"
   },
@@ -74,28 +74,32 @@
     "obug": "^2.1.1"
   },
   "devDependencies": {
-    "@sxzz/eslint-config": "^7.4.3",
+    "@sxzz/eslint-config": "^7.4.4",
     "@sxzz/prettier-config": "^2.2.6",
     "@sxzz/test-utils": "^0.5.15",
     "@types/babel__generator": "^7.27.0",
     "@types/node": "^25.0.3",
-    "@typescript/native-preview": "7.0.0-dev.20251221.1",
+    "@typescript/native-preview": "7.0.0-dev.20251228.1",
     "@volar/typescript": "^2.4.27",
-    "@vue/language-core": "^3.2.0",
+    "@vue/language-core": "^3.2.1",
     "arktype": "^2.1.29",
     "bumpp": "^10.3.2",
     "diff": "^8.0.2",
     "eslint": "^9.39.2",
     "prettier": "^3.7.4",
-    "rolldown": "^1.0.0-beta.55",
+    "rolldown": "^1.0.0-beta.57",
+    "rolldown-plugin-dts-snapshot": "^0.3.2",
     "rolldown-plugin-require-cjs": "^0.3.3",
     "rollup-plugin-dts": "^6.3.0",
     "tinyglobby": "^0.2.15",
-    "tsdown": "^0.18.2",
+    "tsdown": "^0.18.3",
     "typescript": "^5.9.3",
     "vitest": "^4.0.16",
     "vue": "^3.5.26",
-    "vue-tsc": "^3.2.0"
+    "vue-tsc": "^3.2.1"
+  },
+  "resolutions": {
+    "rolldown": "^1.0.0-beta.57"
   },
   "prettier": "@sxzz/prettier-config",
   "scripts": {