rolldown-plugin-dts 0.9.2 → 0.9.4

package/dist/index.js

@@ -631,11 +631,11 @@ function overwriteNode(node, newNode) {
 
 //#endregion
 //#region src/utils/tsc.ts
-const debug$1 = Debug("rolldown-plugin-dts:tsc");
+const debug$2 = Debug("rolldown-plugin-dts:tsc");
 let ts;
 let formatHost;
 function initTs() {
-	debug$1("loading typescript");
+	debug$2("loading typescript");
 	const require = createRequire(import.meta.url);
 	ts = require("typescript");
 	formatHost = {
@@ -643,7 +643,7 @@ function initTs() {
 		getNewLine: () => ts.sys.newLine,
 		getCanonicalFileName: ts.sys.useCaseSensitiveFileNames ? (f) => f : (f) => f.toLowerCase()
 	};
-	debug$1(`loaded typescript: ${ts.version}`);
+	debug$2(`loaded typescript: ${ts.version}`);
 }
 const defaultCompilerOptions = {
 	declaration: true,
@@ -669,9 +669,9 @@ function createOrGetTsModule(programs, compilerOptions, id, isEntry, dtsMap) {
 			file: sourceFile
 		};
 	}
-	debug$1(`create program for module: ${id}`);
+	debug$2(`create program for module: ${id}`);
 	const module = createTsProgram(compilerOptions, dtsMap, id);
-	debug$1(`created program for module: ${id}`);
+	debug$2(`created program for module: ${id}`);
 	programs.push(module.program);
 	return module;
 }
@@ -686,13 +686,13 @@ function createTsProgram(compilerOptions, dtsMap, id) {
 	host.fileExists = (fileName) => {
 		const module = getTsModule(dtsMap, fileName);
 		if (module) return true;
-		if (debug$1.enabled && !RE_NODE_MODULES.test(fileName)) debug$1(`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$1.enabled && !RE_NODE_MODULES.test(fileName)) debug$1(`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);
@@ -712,10 +712,10 @@ function tscEmit(module) {
 		file,
 		(fileName, code) => {
 			if (fileName.endsWith(".map")) {
-				debug$1(`emit dts sourcemap: ${fileName}`);
+				debug$2(`emit dts sourcemap: ${fileName}`);
 				map = JSON.parse(code);
 			} else {
-				debug$1(`emit dts: ${fileName}`);
+				debug$2(`emit dts: ${fileName}`);
 				dtsCode = code;
 			}
 		},
@@ -739,6 +739,7 @@ function getTsModule(dtsMap, tsId) {
 
 //#endregion
 //#region src/generate.ts
+const debug$1 = Debug("rolldown-plugin-dts:generate");
 function createGeneratePlugin({ compilerOptions = {}, isolatedDeclarations, emitDtsOnly = false }) {
 	const dtsMap = new Map();
 	/**
@@ -757,9 +758,12 @@ function createGeneratePlugin({ compilerOptions = {}, isolatedDeclarations, emit
 		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) {
@@ -864,9 +868,12 @@ function createDtsResolvePlugin({ tsconfig, resolve }) {
 						meta
 					};
 				}
-				const tsImporter = filename_dts_to(importer, "ts");
-				let resolution = await this.resolve(id, tsImporter, options);
-				if (!resolution && !id.endsWith(".d")) resolution = await this.resolve(`${id}.d`, tsImporter, options);
+				let resolution = await this.resolve(id, importer, options);
+				if (!resolution && !id.endsWith(".d")) resolution = await this.resolve(`${id}.d`, importer, options);
+				if (resolution?.id.startsWith("\0")) return {
+					...resolution,
+					meta
+				};
 				if (RE_NODE_MODULES.test(resolution?.id || id) || !isRelative(resolution?.id || id)) {
 					let shouldResolve;
 					if (typeof resolve === "boolean") shouldResolve = resolve;
@@ -888,7 +895,7 @@ function createDtsResolvePlugin({ tsconfig, resolve }) {
 					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 this.load(resolution);
+					await Promise.any([this.load(resolution), new Promise((resolve$1) => setTimeout(resolve$1, 200))]);
 					resolution.id = filename_ts_to_dts(resolution.id);
 				}
 				if (RE_DTS.test(resolution.id)) return {

package/package.json

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