rolldown-plugin-dts 0.7.7 → 0.7.9

package/dist/index.js

@@ -1,5 +1,6 @@
 import { MagicStringAST } from "magic-string-ast";
 import { parseSync } from "oxc-parser";
+import path from "node:path";
 import { createResolver } from "dts-resolver";
 import { getTsconfig, parseTsconfig } from "get-tsconfig";
 import { isolatedDeclaration } from "oxc-transform";
@@ -182,6 +183,9 @@ 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/utils/magic-string.ts
@@ -490,26 +494,25 @@ const defaultCompilerOptions = {
 	target: 99,
 	resolveJsonModule: true
 };
-function createOrGetTsModule(programs, compilerOptions, id, code, isEntry) {
-	const tsProgram = programs.find(({ program }) => {
-		if (isEntry) return program.getRootFileNames().includes(id);
-		return program.getSourceFile(id);
+function createOrGetTsModule(programs, compilerOptions, id, isEntry, dtsMap) {
+	const program = programs.find((program$1) => {
+		if (isEntry) return program$1.getRootFileNames().includes(id);
+		return program$1.getSourceFile(id);
 	});
-	if (tsProgram) {
-		const sourceFile = tsProgram.program.getSourceFile(id);
+	if (program) {
+		const sourceFile = program.getSourceFile(id);
 		if (sourceFile) return {
-			program: tsProgram,
+			program,
 			file: sourceFile
 		};
 	}
 	debug(`create program for module: ${id}`);
-	const module = createTsProgram(compilerOptions, id, code);
+	const module = createTsProgram(compilerOptions, dtsMap, id);
 	debug(`created program for module: ${id}`);
 	programs.push(module.program);
 	return module;
 }
-function createTsProgram(compilerOptions, id, code) {
-	const files = new Map([[id, code]]);
+function createTsProgram(compilerOptions, dtsMap, id) {
 	const overrideCompilerOptions = ts.convertCompilerOptionsFromJson(compilerOptions, ".").options;
 	const options = {
 		...defaultCompilerOptions,
@@ -518,26 +521,26 @@ function createTsProgram(compilerOptions, id, code) {
 	const host = ts.createCompilerHost(options, true);
 	const { readFile: _readFile, fileExists: _fileExists } = host;
 	host.fileExists = (fileName) => {
-		if (files.has(fileName)) return true;
+		const module = getTsModule(dtsMap, fileName);
+		if (module) return true;
 		return _fileExists(fileName);
 	};
 	host.readFile = (fileName) => {
-		if (files.has(fileName)) return files.get(fileName);
+		const module = getTsModule(dtsMap, fileName);
+		if (module) return module.code;
 		return _readFile(fileName);
 	};
-	const program = ts.createProgram([id], options, host);
+	const entries = Array.from(dtsMap.values()).filter((v) => v.isEntry).map((v) => v.id);
+	const program = ts.createProgram(Array.from(new Set([id, ...entries])), options, host);
 	const sourceFile = program.getSourceFile(id);
 	if (!sourceFile) throw new Error(`Source file not found: ${id}`);
 	return {
-		program: {
-			program,
-			files
-		},
+		program,
 		file: sourceFile
 	};
 }
 function tscEmit(module) {
-	const { program: { program }, file } = module;
+	const { program, file } = module;
 	let dtsCode;
 	const { emitSkipped, diagnostics } = program.emit(
 		file,
@@ -554,6 +557,11 @@ function tscEmit(module) {
 	if (emitSkipped && diagnostics.length) return { error: ts.formatDiagnostics(diagnostics, formatHost) };
 	return { code: dtsCode };
 }
+function getTsModule(dtsMap, tsId) {
+	const module = Array.from(dtsMap.values()).find((dts$1) => dts$1.id === tsId);
+	if (!module) return;
+	return module;
+}
 
 //#endregion
 //#region src/generate.ts
@@ -562,8 +570,8 @@ function createGeneratePlugin({ tsconfig, compilerOptions, isolatedDeclaration:
 	const dtsMap = new Map();
 	function resolveOptions(cwd) {
 		if (tsconfig === true || tsconfig == null) {
-			const { config, path } = getTsconfig(cwd) || {};
-			tsconfig = path;
+			const { config, path: path$1 } = getTsconfig(cwd) || {};
+			tsconfig = path$1;
 			compilerOptions = {
 				...config?.compilerOptions,
 				...compilerOptions
@@ -620,30 +628,13 @@ function createGeneratePlugin({ tsconfig, compilerOptions, isolatedDeclaration:
 				exclude: [RE_DTS, RE_NODE_MODULES]
 			} },
 			handler(code, id) {
-				let dtsCode;
 				const mod = this.getModuleInfo(id);
-				const isEntry = mod?.isEntry;
-				if (isolatedDeclaration$1) {
-					const result = isolatedDeclaration(id, code, isolatedDeclaration$1 === true ? {} : isolatedDeclaration$1);
-					if (result.errors.length) {
-						const [error] = result.errors;
-						return this.error({
-							message: error.message,
-							frame: error.codeframe
-						});
-					}
-					dtsCode = result.code;
-				} else {
-					const module = createOrGetTsModule(programs, compilerOptions, id, code, isEntry);
-					const result = tscEmit(module);
-					if (result.error) return this.error(result.error);
-					dtsCode = result.code;
-				}
-				if (!dtsCode) return this.error(new Error(`Failed to generate dts for ${id}`));
+				const isEntry = !!mod?.isEntry;
 				const dtsId = filename_ts_to_dts(id);
 				dtsMap.set(dtsId, {
-					code: dtsCode,
-					src: id
+					code,
+					id,
+					isEntry
 				});
 				if (isEntry) {
 					const name = inputAliasMap.get(id);
@@ -671,8 +662,8 @@ function createGeneratePlugin({ tsconfig, compilerOptions, isolatedDeclaration:
 				};
 			}
 			let resolution = await this.resolve(id, filename_dts_to(importer, "ts"));
-			if (!resolution || resolution.external) return resolution;
-			if (RE_NODE_MODULES.test(resolution.id)) {
+			if (!resolution) return;
+			if (RE_NODE_MODULES.test(resolution.id) || !isRelative(resolution.id)) {
 				let shouldResolve;
 				if (typeof resolve === "boolean") shouldResolve = resolve;
 				else shouldResolve = resolve.some((pattern) => typeof pattern === "string" ? id === pattern : pattern.test(id));
@@ -687,7 +678,7 @@ function createGeneratePlugin({ tsconfig, compilerOptions, isolatedDeclaration:
 					external: true,
 					meta
 				};
-			}
+			} else if (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 });
@@ -711,9 +702,29 @@ function createGeneratePlugin({ tsconfig, compilerOptions, isolatedDeclaration:
 				include: [RE_DTS],
 				exclude: [RE_NODE_MODULES]
 			} },
-			handler(id) {
-				if (dtsMap.has(id)) return {
-					code: dtsMap.get(id).code,
+			handler(dtsId) {
+				if (!dtsMap.has(dtsId)) return;
+				const { code, id, isEntry } = dtsMap.get(dtsId);
+				let dtsCode;
+				if (isolatedDeclaration$1) {
+					const result = isolatedDeclaration(id, code, isolatedDeclaration$1 === true ? {} : isolatedDeclaration$1);
+					if (result.errors.length) {
+						const [error] = result.errors;
+						return this.error({
+							message: error.message,
+							frame: error.codeframe
+						});
+					}
+					dtsCode = result.code;
+				} else {
+					const module = createOrGetTsModule(programs, compilerOptions, id, isEntry, dtsMap);
+					const result = tscEmit(module);
+					if (result.error) return this.error(result.error);
+					dtsCode = result.code;
+				}
+				if (!dtsCode) return this.error(new Error(`Failed to generate dts for ${id}`));
+				return {
+					code: dtsCode,
 					moduleSideEffects: false
 				};
 			}

package/package.json

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