rolldown-plugin-dts 0.9.10 → 0.10.0

package/dist/index.d.ts

@@ -63,12 +63,6 @@ interface Options {
   sourcemap?: boolean;
   /** Resolve external types used in dts files from `node_modules` */
   resolve?: boolean | (string | RegExp)[];
-  /**
-  * When `true`, the plugin will resolve `paths` in `tsconfig.json`.
-  *
-  * This option is enabled when `paths` is set in `compilerOptions`.
-  */
-  resolvePaths?: boolean;
 }
 type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U;
 type OptionsResolved = Overwrite<Required<Options>, {
@@ -84,8 +78,7 @@ declare function resolveOptions({
   sourcemap,
   dtsInput,
   emitDtsOnly,
-  resolve,
-  resolvePaths
+  resolve
 }: Options): OptionsResolved;
 
 //#endregion

package/dist/index.js

@@ -239,9 +239,6 @@ function filename_ts_to_dts(id) {
 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/fake-js.ts
@@ -290,7 +287,7 @@ function createFakeJsPlugin({ dtsInput, sourcemap }) {
 				entryFileNames: options.entryFileNames ?? (dtsInput ? "[name].ts" : void 0),
 				chunkFileNames(chunk) {
 					const original = (typeof options.chunkFileNames === "function" ? options.chunkFileNames(chunk) : options.chunkFileNames) || "[name]-[hash].js";
-					if (!original.includes(".d") && chunk.name.endsWith(".d")) return original.replace(RE_JS, ".$1ts");
+					if (!original.includes(".d") && chunk.name.endsWith(".d")) return filename_js_to_dts(original).replace("[name]", chunk.name.slice(0, -2));
 					return original;
 				}
 			};
@@ -858,68 +855,47 @@ function createGeneratePlugin({ compilerOptions = {}, isolatedDeclarations, emit
 //#endregion
 //#region src/resolve.ts
 const meta = { dtsFile: true };
-function createDtsResolvePlugin({ tsconfig, resolve, resolvePaths }) {
-	const resolver = createResolver({ tsconfig: tsconfig ? tsconfig : void 0 });
-	function resolveDependency(id, importer) {
-		let shouldResolve;
-		if (typeof resolve === "boolean") shouldResolve = resolve;
-		else shouldResolve = resolve.some((pattern) => typeof pattern === "string" ? id === pattern : pattern.test(id));
-		if (shouldResolve) {
-			const resolution = resolver(id, importer);
-			if (resolution) return {
-				id: resolution,
-				meta
-			};
-		} else return {
-			id,
-			external: true,
-			meta
-		};
-	}
+function createDtsResolvePlugin({ tsconfig, resolve }) {
+	const resolver = createResolver({
+		tsconfig,
+		resolveNodeModules: !!resolve
+	});
 	return {
 		name: "rolldown-plugin-dts:resolve",
 		resolveId: {
 			order: "pre",
 			async handler(id, importer, options) {
+				const external = {
+					id,
+					external: true,
+					moduleSideEffects: false
+				};
 				if (!importer || !RE_DTS.test(importer) && !this.getModuleInfo(importer)?.meta.dtsFile) return;
 				if (RE_CSS.test(id)) return {
 					id,
 					external: true,
 					moduleSideEffects: false
 				};
-				if (RE_NODE_MODULES.test(importer)) {
-					const resolution$1 = resolver(id, importer);
-					if (resolution$1) return {
-						id: resolution$1,
-						meta
-					};
+				let resolution = resolver(id, importer);
+				if (!resolution || !RE_TS.test(resolution)) {
+					const result = await this.resolve(id, importer, options);
+					if (!result || !RE_TS.test(result.id)) return external;
+					resolution = result.id;
 				}
-				if (!resolvePaths && (RE_NODE_MODULES.test(id) || !isRelative(id))) return resolveDependency(id, importer);
-				let resolution = await this.resolve(id, importer, options);
-				if (!resolution && !id.endsWith(".d")) resolution = await this.resolve(`${id}.d`, importer, options);
-				if (resolution?.id) {
-					if (RE_CSS.test(resolution.id)) return {
-						id,
-						external: true,
-						moduleSideEffects: false
-					};
-					if (resolution.id.startsWith("\0")) return {
-						...resolution,
-						meta
-					};
+				if (!RE_NODE_MODULES.test(importer) && RE_NODE_MODULES.test(resolution)) {
+					let shouldResolve;
+					if (typeof resolve === "boolean") shouldResolve = resolve;
+					else shouldResolve = resolve.some((pattern) => typeof pattern === "string" ? id === pattern : pattern.test(id));
+					if (!shouldResolve) return external;
 				}
-				if (resolvePaths && (RE_NODE_MODULES.test(resolution?.id || id) || !isRelative(resolution?.id || id))) return resolveDependency(id, importer);
-				if (!resolution || resolution.external) return resolution;
-				if (RE_JS.test(resolution.id)) {
-					resolution = await this.resolve(filename_js_to_dts(resolution.id), importer, options);
-					if (!resolution) return;
-				} else if (RE_TS.test(resolution.id) && !RE_DTS.test(resolution.id)) {
-					await Promise.any([this.load(resolution), new Promise((resolve$1) => setTimeout(resolve$1, 200))]);
-					resolution.id = filename_ts_to_dts(resolution.id);
+				if (RE_TS.test(resolution) && !RE_DTS.test(resolution)) {
+					await Promise.any([this.load({ id: resolution }), new Promise((resolve$1) => setTimeout(resolve$1, 200))]);
+					resolution = filename_ts_to_dts(resolution);
 				}
-				if (RE_DTS.test(resolution.id)) return {
-					...resolution,
-					meta
+				if (RE_DTS.test(resolution)) return {
+					id: resolution,
+					meta,
+					moduleSideEffects: false
 				};
 			}
 		}
@@ -939,7 +915,7 @@ function dts(options = {}) {
 	plugins.push(createDtsResolvePlugin(resolved), createFakeJsPlugin(resolved));
 	return plugins;
 }
-function resolveOptions({ cwd = process.cwd(), tsconfig, compilerOptions = {}, isolatedDeclarations, sourcemap, dtsInput = false, emitDtsOnly = false, resolve = false, resolvePaths }) {
+function resolveOptions({ cwd = process.cwd(), tsconfig, compilerOptions = {}, isolatedDeclarations, sourcemap, dtsInput = false, emitDtsOnly = false, resolve = false }) {
 	if (tsconfig === true || tsconfig == null) {
 		const { config, path: path$1 } = getTsconfig(cwd) || {};
 		tsconfig = path$1;
@@ -971,8 +947,7 @@ function resolveOptions({ cwd = process.cwd(), tsconfig, compilerOptions = {}, i
 		sourcemap,
 		dtsInput,
 		emitDtsOnly,
-		resolve,
-		resolvePaths: resolvePaths ?? !!compilerOptions?.paths
+		resolve
 	};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-dts",
-  "version": "0.9.10",
+  "version": "0.10.0",
   "description": "A Rolldown plugin to bundle dts files",
   "type": "module",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "@babel/types": "^7.27.1",
     "ast-kit": "^1.4.3",
     "debug": "^4.4.0",
-    "dts-resolver": "^1.0.1",
+    "dts-resolver": "^1.1.0",
     "get-tsconfig": "^4.10.0",
     "oxc-transform": "^0.67.0"
   },