rolldown-plugin-dts 0.9.1 → 0.9.3

package/dist/index.d.ts

@@ -6,17 +6,15 @@ import { Plugin } from "rolldown";
 declare function createFakeJsPlugin({
   dtsInput,
   sourcemap
-}: OptionsResolved): Plugin;
+}: Pick<OptionsResolved, "dtsInput" | "sourcemap">): Plugin;
 
 //#endregion
 //#region src/generate.d.ts
 declare function createGeneratePlugin({
-  tsconfig,
   compilerOptions,
   isolatedDeclarations,
-  resolve,
   emitDtsOnly
-}: OptionsResolved): Plugin;
+}: Pick<OptionsResolved, "compilerOptions" | "isolatedDeclarations" | "emitDtsOnly">): Plugin;
 
 //#endregion
 //#region src/index.d.ts

package/dist/index.js

@@ -1,35 +1,15 @@
 import path from "node:path";
 import process from "node:process";
+import Debug from "debug";
 import { getTsconfig, parseTsconfig } from "get-tsconfig";
 import _generate from "@babel/generator";
 import { parse } from "@babel/parser";
 import * as t from "@babel/types";
 import { isDeclarationType, isTypeOf } from "ast-kit";
-import { createResolver } from "dts-resolver";
 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_DTS_MAP = /\.d\.([cm]?)ts\.map$/;
-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] === ".";
-}
+import { createResolver } from "dts-resolver";
 
-//#endregion
 //#region src/dts-input.ts
 function createDtsInputPlugin() {
 	return {
@@ -51,16 +31,6 @@ function createDtsInputPlugin() {
 					return "[name].d.ts";
 				}
 			};
-		},
-		resolveId: {
-			order: "pre",
-			handler(id, importer, options) {
-				if (options.isEntry) return;
-				if (RE_NODE_MODULES.test(id) || !isRelative(id)) return {
-					id,
-					external: true
-				};
-			}
 		}
 	};
 }
@@ -252,6 +222,26 @@ function walk(ast, { enter, leave }) {
 	return instance.visit(ast, null);
 }
 
+//#endregion
+//#region src/utils/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[\\/]/;
+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/fake-js.ts
 const generate = _generate.default || _generate;
@@ -641,11 +631,11 @@ function overwriteNode(node, newNode) {
 
 //#endregion
 //#region src/utils/tsc.ts
-const debug = Debug("rolldown-plugin-dts:tsc");
+const debug$2 = Debug("rolldown-plugin-dts:tsc");
 let ts;
 let formatHost;
 function initTs() {
-	debug("loading typescript");
+	debug$2("loading typescript");
 	const require = createRequire(import.meta.url);
 	ts = require("typescript");
 	formatHost = {
@@ -653,7 +643,7 @@ function initTs() {
 		getNewLine: () => ts.sys.newLine,
 		getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? (f) => f : (f) => f.toLowerCase()
 	};
-	debug(`loaded typescript: ${ts.version}`);
+	debug$2(`loaded typescript: ${ts.version}`);
 }
 const defaultCompilerOptions = {
 	declaration: true,
@@ -679,9 +669,9 @@ function createOrGetTsModule(programs, compilerOptions, id, isEntry, dtsMap) {
 			file: sourceFile
 		};
 	}
-	debug(`create program for module: ${id}`);
+	debug$2(`create program for module: ${id}`);
 	const module = createTsProgram(compilerOptions, dtsMap, id);
-	debug(`created program for module: ${id}`);
+	debug$2(`created program for module: ${id}`);
 	programs.push(module.program);
 	return module;
 }
@@ -696,13 +686,13 @@ function createTsProgram(compilerOptions, dtsMap, id) {
 	host.fileExists = (fileName) => {
 		const module = getTsModule(dtsMap, fileName);
 		if (module) return true;
-		if (debug.enabled && !RE_NODE_MODULES.test(fileName)) debug(`file exists from fs: ${fileName}`);
+		if (debug$2.enabled && !RE_NODE_MODULES.test(fileName)) debug$2(`file exists from fs: ${fileName}`);
 		return _fileExists(fileName);
 	};
 	host.readFile = (fileName) => {
 		const module = getTsModule(dtsMap, fileName);
 		if (module) return module.code;
-		if (debug.enabled && !RE_NODE_MODULES.test(fileName)) debug(`read file from fs: ${fileName}`);
+		if (debug$2.enabled && !RE_NODE_MODULES.test(fileName)) debug$2(`read file from fs: ${fileName}`);
 		return _readFile(fileName);
 	};
 	const entries = Array.from(dtsMap.values()).filter((v) => v.isEntry).map((v) => v.id);
@@ -722,10 +712,10 @@ function tscEmit(module) {
 		file,
 		(fileName, code) => {
 			if (fileName.endsWith(".map")) {
-				debug(`emit dts sourcemap: ${fileName}`);
+				debug$2(`emit dts sourcemap: ${fileName}`);
 				map = JSON.parse(code);
 			} else {
-				debug(`emit dts: ${fileName}`);
+				debug$2(`emit dts: ${fileName}`);
 				dtsCode = code;
 			}
 		},
@@ -749,8 +739,8 @@ function getTsModule(dtsMap, tsId) {
 
 //#endregion
 //#region src/generate.ts
-const meta = { dtsFile: true };
-function createGeneratePlugin({ tsconfig, compilerOptions = {}, isolatedDeclarations, resolve = false, emitDtsOnly = false }) {
+const debug$1 = Debug("rolldown-plugin-dts:generate");
+function createGeneratePlugin({ compilerOptions = {}, isolatedDeclarations, emitDtsOnly = false }) {
 	const dtsMap = new Map();
 	/**
 	* A map of input id to output file name
@@ -763,15 +753,17 @@ function createGeneratePlugin({ tsconfig, compilerOptions = {}, isolatedDeclarat
 	*/
 	const inputAliasMap = new Map();
 	let programs = [];
-	const resolver = createResolver({ tsconfig: tsconfig ? tsconfig : void 0 });
 	if (!isolatedDeclarations) initTs();
 	return {
 		name: "rolldown-plugin-dts:generate",
 		async buildStart(options) {
 			if (!Array.isArray(options.input)) for (const [name, id] of Object.entries(options.input)) {
-				let resolved = await this.resolve(id, void 0, { skipSelf: true });
-				resolved ||= await this.resolve(`./${id}`, void 0, { skipSelf: true });
-				inputAliasMap.set(resolved?.id || id, name);
+				debug$1("resolving input alias %s -> %s", name, id);
+				let resolved = await this.resolve(id);
+				if (!id.startsWith("./")) resolved ||= await this.resolve(`./${id}`);
+				const resolvedId = resolved?.id || id;
+				debug$1("resolved input alias %s -> %s", id, resolvedId);
+				inputAliasMap.set(resolvedId, name);
 			}
 		},
 		outputOptions(options) {
@@ -784,6 +776,9 @@ function createGeneratePlugin({ tsconfig, compilerOptions = {}, isolatedDeclarat
 				}
 			};
 		},
+		resolveId(id) {
+			if (dtsMap.has(id)) return { id };
+		},
 		transform: {
 			order: "pre",
 			filter: { id: {
@@ -810,68 +805,6 @@ function createGeneratePlugin({ tsconfig, compilerOptions = {}, isolatedDeclarat
 				if (emitDtsOnly) return "export { }";
 			}
 		},
-		resolveId: {
-			order: "pre",
-			async handler(id, importer, options) {
-				if (dtsMap.has(id)) return {
-					id,
-					meta
-				};
-				if (!importer || !this.getModuleInfo(importer)?.meta.dtsFile) return;
-				if (RE_DTS.test(id)) {
-					const resolution$1 = await this.resolve(id, importer, options);
-					if (!resolution$1) return;
-					return {
-						...resolution$1,
-						meta
-					};
-				}
-				if (RE_NODE_MODULES.test(importer)) {
-					const resolution$1 = resolver(id, importer);
-					if (resolution$1) return {
-						id: resolution$1,
-						meta
-					};
-				}
-				const tsImporter = filename_dts_to(importer, "ts");
-				let resolution = await this.resolve(id, tsImporter);
-				if (!resolution && !id.endsWith(".d")) resolution = await this.resolve(`${id}.d`, tsImporter);
-				if (RE_NODE_MODULES.test(resolution?.id || id) || !isRelative(resolution?.id || id)) {
-					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$1 = resolver(id, importer);
-						if (resolution$1) return {
-							id: resolution$1,
-							meta
-						};
-					} else return {
-						id,
-						external: true,
-						meta
-					};
-				}
-				if (!resolution || resolution.external) return resolution;
-				let dtsId;
-				if (RE_JS.test(resolution.id)) {
-					resolution = await this.resolve(filename_js_to_dts(resolution.id), importer, { skipSelf: false });
-					if (!resolution) return;
-					dtsId = resolution.id;
-				} else {
-					dtsId = RE_DTS.test(resolution.id) ? resolution.id : filename_ts_to_dts(resolution.id);
-					if (dtsMap.has(dtsId)) return {
-						id: dtsId,
-						meta
-					};
-				}
-				await this.load(resolution);
-				if (RE_DTS.test(resolution.id) || dtsMap.has(dtsId)) return {
-					id: dtsId,
-					meta
-				};
-			}
-		},
 		load: {
 			filter: { id: {
 				include: [RE_DTS],
@@ -917,14 +850,70 @@ function createGeneratePlugin({ tsconfig, compilerOptions = {}, isolatedDeclarat
 	};
 }
 
+//#endregion
+//#region src/resolve.ts
+const meta = { dtsFile: true };
+function createDtsResolvePlugin({ tsconfig, resolve }) {
+	const resolver = createResolver({ tsconfig: tsconfig ? tsconfig : void 0 });
+	return {
+		name: "rolldown-plugin-dts:resolve",
+		resolveId: {
+			order: "pre",
+			async handler(id, importer, options) {
+				if (!importer || !RE_DTS.test(importer) && !this.getModuleInfo(importer)?.meta.dtsFile) return;
+				if (RE_NODE_MODULES.test(importer)) {
+					const resolution$1 = resolver(id, importer);
+					if (resolution$1) return {
+						id: resolution$1,
+						meta
+					};
+				}
+				let resolution = await this.resolve(id, importer, options);
+				if (!resolution && !id.endsWith(".d")) resolution = await this.resolve(`${id}.d`, importer, options);
+				if (RE_NODE_MODULES.test(resolution?.id || id) || !isRelative(resolution?.id || id)) {
+					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$1 = resolver(id, importer);
+						if (resolution$1) return {
+							id: resolution$1,
+							meta
+						};
+					} else return {
+						id,
+						external: true,
+						meta
+					};
+				}
+				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)) {
+					if (!this.getModuleInfo(resolution.id)) await this.load(resolution);
+					resolution.id = filename_ts_to_dts(resolution.id);
+				}
+				if (RE_DTS.test(resolution.id)) return {
+					...resolution,
+					meta
+				};
+			}
+		}
+	};
+}
+
 //#endregion
 //#region src/index.ts
+const debug = Debug("rolldown-plugin-dts:options");
 function dts(options = {}) {
+	debug("resolving dts options");
 	const resolved = resolveOptions(options);
+	debug("resolved dts options %o", resolved);
 	const plugins = [];
 	if (options.dtsInput) plugins.push(createDtsInputPlugin());
 	else plugins.push(createGeneratePlugin(resolved));
-	plugins.push(createFakeJsPlugin(resolved));
+	plugins.push(createDtsResolvePlugin(resolved), createFakeJsPlugin(resolved));
 	return plugins;
 }
 function resolveOptions({ cwd = process.cwd(), tsconfig, compilerOptions = {}, isolatedDeclarations, sourcemap, dtsInput = false, emitDtsOnly = false, resolve = false }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-dts",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "A Rolldown plugin to bundle dts files",
   "type": "module",
   "license": "MIT",