rolldown-plugin-dts 0.6.0 → 0.7.1

package/README.md

@@ -29,7 +29,7 @@ You can find a real demo in [here](./rolldown.config.ts).
 
 ## Options
 
-````ts
+```ts
 interface Options {
   /**
    * When entries are `.d.ts` files (instead of `.ts` files), this option should be set to `true`.
@@ -47,32 +47,23 @@ interface Options {
 
   /**
    * The `compilerOptions` for the TypeScript compiler.
+   * The default value will be inferred from the `tsconfig.json` file.
    *
    * @see https://www.typescriptlang.org/docs/handbook/compiler-options.html
    */
-  compilerOptions?: CompilerOptions
+  compilerOptions?: TsConfigJson.CompilerOptions
   /**
    * When `true`, the plugin will generate `.d.ts` files using `oxc-transform`,
    * which is blazingly faster than `typescript` compiler.
    *
-   * This option is enabled when `isolatedDeclaration` in `tsconfig.json` is set to `true`.
+   * This option is enabled when `isolatedDeclarations` in `compilerOptions` is set to `true`.
    */
   isolatedDeclaration?: boolean | Omit<IsolatedDeclarationsOptions, 'sourcemap'>
-  /**
-   * dts file name alias `{ [filename]: path }`
-   *
-   * @example
-   * ```ts
-   * inputAlias: {
-   *   'foo.d.ts': 'foo/index.d.ts',
-   * }
-   */
-  inputAlias?: Record<string, string>
 
   /** Resolve external types used in dts files from `node_modules` */
   resolve?: boolean | (string | RegExp)[]
 }
-````
+```
 
 ## Differences from `rollup-plugin-dts`
 

package/dist/index.d.ts

@@ -1,13 +1,13 @@
+import { TsConfigJson } from "get-tsconfig";
 import { IsolatedDeclarationsOptions } from "oxc-transform";
 import { Plugin } from "rolldown";
-import { CompilerOptions } from "typescript";
 
 //#region src/fake-js.d.ts
 declare function createFakeJsPlugin({ dtsInput }: Pick<Options, "dtsInput">): Plugin;
 
 //#endregion
 //#region src/generate.d.ts
-declare function createGeneratePlugin({ compilerOptions, isolatedDeclaration, inputAlias, resolve, emitDtsOnly }: Pick<Options, "isolatedDeclaration" | "inputAlias" | "resolve" | "emitDtsOnly" | "compilerOptions">): Plugin;
+declare function createGeneratePlugin({ compilerOptions, isolatedDeclaration, resolve, emitDtsOnly }: Pick<Options, "isolatedDeclaration" | "resolve" | "emitDtsOnly" | "compilerOptions">): Plugin;
 
 //#endregion
 //#region src/index.d.ts
@@ -26,27 +26,18 @@ interface Options {
 	emitDtsOnly?: boolean;
 	/**
 	* The `compilerOptions` for the TypeScript compiler.
+	* The default value will be inferred from the `tsconfig.json` file.
 	*
 	* @see https://www.typescriptlang.org/docs/handbook/compiler-options.html
 	*/
-	compilerOptions?: CompilerOptions;
+	compilerOptions?: TsConfigJson.CompilerOptions;
 	/**
 	* When `true`, the plugin will generate `.d.ts` files using `oxc-transform`,
 	* which is blazingly faster than `typescript` compiler.
 	*
-	* This option is enabled when `isolatedDeclaration` in `tsconfig.json` is set to `true`.
+	* This option is enabled when `isolatedDeclarations` in `compilerOptions` is set to `true`.
 	*/
 	isolatedDeclaration?: boolean | Omit<IsolatedDeclarationsOptions, "sourcemap">;
-	/**
-	* dts file name alias `{ [filename]: path }`
-	*
-	* @example
-	* ```ts
-	* inputAlias: {
-	*   'foo.d.ts': 'foo/index.d.ts',
-	* }
-	*/
-	inputAlias?: Record<string, string>;
 	/** Resolve external types used in dts files from `node_modules` */
 	resolve?: boolean | (string | RegExp)[];
 }

package/dist/index.js

@@ -1,6 +1,7 @@
 import { MagicStringAST } from "magic-string-ast";
 import { parseSync } from "oxc-parser";
-import path, { basename, extname } from "node:path";
+import path from "node:path";
+import process from "node:process";
 import { createResolver } from "dts-resolver";
 import { getTsconfig } from "get-tsconfig";
 import { isolatedDeclaration } from "oxc-transform";
@@ -171,7 +172,7 @@ function getIdentifierRange(node, offset = 0) {
 //#endregion
 //#region src/utils/filename.ts
 const RE_JS = /\.([cm]?)js$/;
-const RE_TS = /\.([cm]?)ts$/;
+const RE_TS = /\.([cm]?)tsx?$/;
 const RE_DTS = /\.d\.([cm]?)ts$/;
 const RE_NODE_MODULES = /node_modules/;
 function filename_js_to_dts(id) {
@@ -373,17 +374,18 @@ function collectDependencies(s, node, getIdentifierIndex) {
 			if (node$1.computed && isReferenceId(node$1.key)) addDependency(node$1.key);
 			if ("value" in node$1 && isReferenceId(node$1.value)) addDependency(node$1.value);
 		} else if (node$1.type === "TSTypeReference") addDependency(node$1.typeName);
-		else if (node$1.type === "TSTypeQuery") addDependency(node$1.exprName);
-		else if (node$1.type === "TSImportType") {
+		else if (node$1.type === "TSTypeQuery") {
+			if (node$1.exprName.type !== "TSImportType") addDependency(node$1.exprName);
+		} else if (node$1.type === "TSImportType") {
 			if (node$1.argument.type !== "TSLiteralType" || node$1.argument.literal.type !== "Literal" || typeof node$1.argument.literal.value !== "string") return;
 			const source = node$1.argument.literal.value;
-			const imported = node$1.qualifier && s.sliceNode(node$1.qualifier);
-			const local = importNamespace(s, source, imported, getIdentifierIndex);
+			const imported = node$1.qualifier && resolveTSTypeName(node$1.qualifier);
+			const local = importNamespace(s, source, imported && s.sliceNode(imported), getIdentifierIndex);
 			addDependency({
 				type: "Identifier",
 				name: local,
-				start: node$1.start + (node$1.isTypeOf ? 7 : 0),
-				end: node$1.qualifier ? node$1.qualifier.end : node$1.end
+				start: node$1.start,
+				end: imported ? imported.end : node$1.end
 			});
 		}
 	} });
@@ -393,6 +395,10 @@ function collectDependencies(s, node, getIdentifierIndex) {
 		deps.add(node$1);
 	}
 }
+function resolveTSTypeName(node) {
+	if (node.type === "Identifier") return node;
+	return resolveTSTypeName(node.left);
+}
 function isReferenceId(node) {
 	return !!node && (node.type === "Identifier" || node.type === "MemberExpression");
 }
@@ -509,10 +515,10 @@ function createOrGetTsModule(programs, compilerOptions, id, code, isEntry) {
 }
 function createTsProgram(compilerOptions, id, code) {
 	const files = new Map([[id, code]]);
+	const overrideCompilerOptions = ts.convertCompilerOptionsFromJson(compilerOptions, ".").options;
 	const options = {
 		...defaultCompilerOptions,
-		...loadTsconfig(id),
-		...compilerOptions
+		...overrideCompilerOptions
 	};
 	const host = ts.createCompilerHost(options, true);
 	const { readFile: _readFile, fileExists: _fileExists } = host;
@@ -524,14 +530,7 @@ function createTsProgram(compilerOptions, id, code) {
 		if (files.has(fileName)) return files.get(fileName);
 		return _readFile(fileName);
 	};
-	const program = ts.createProgram([id], {
-		...compilerOptions,
-		moduleResolution: ts.ModuleResolutionKind.Node10,
-		declaration: true,
-		emitDeclarationOnly: true,
-		outDir: void 0,
-		declarationDir: void 0
-	}, host);
+	const program = ts.createProgram([id], options, host);
 	const sourceFile = program.getSourceFile(id);
 	if (!sourceFile) throw new Error(`Source file not found: ${id}`);
 	return {
@@ -560,39 +559,42 @@ function tscEmit(module) {
 	if (emitSkipped && diagnostics.length) return { error: ts.formatDiagnostics(diagnostics, formatHost) };
 	return { code: dtsCode };
 }
-const tsconfigCache = new Map();
-function loadTsconfig(id) {
-	const configPath = ts.findConfigFile(path.dirname(id), ts.sys.fileExists);
-	if (!configPath) return {};
-	if (tsconfigCache.has(configPath)) return tsconfigCache.get(configPath);
-	const { config, error } = ts.readConfigFile(configPath, ts.sys.readFile);
-	if (error) throw ts.formatDiagnostic(error, formatHost);
-	const configContents = ts.parseJsonConfigFileContent(config, ts.sys, path.dirname(configPath));
-	if (configContents.errors.length) throw ts.formatDiagnostics(configContents.errors, formatHost);
-	tsconfigCache.set(configPath, configContents.options);
-	return configContents.options;
-}
 
 //#endregion
 //#region src/generate.ts
 const meta = { dtsFile: true };
-function createGeneratePlugin({ compilerOptions, isolatedDeclaration: isolatedDeclaration$1, inputAlias, resolve = false, emitDtsOnly = false }) {
+function createGeneratePlugin({ compilerOptions, isolatedDeclaration: isolatedDeclaration$1, resolve = false, emitDtsOnly = false }) {
 	const dtsMap = new Map();
-	const inputAliasMap = new Map(inputAlias && Object.entries(inputAlias));
+	/**
+	* A map of input id to output file name
+	*
+	* @example
+	*
+	* inputAlias = new Map([
+	*   ['/absolute/path/to/src/source_file.ts', 'dist/foo/index'],
+	* ])
+	*/
+	const inputAliasMap = new Map();
 	const resolver = createResolver();
 	let programs = [];
-	let inputOption;
 	return {
 		name: "rolldown-plugin-dts:generate",
 		buildStart(options) {
-			if (isolatedDeclaration$1 == null) {
+			if (!compilerOptions) {
 				const { config } = getTsconfig(options.cwd) || {};
-				if (config?.compilerOptions?.isolatedDeclarations) isolatedDeclaration$1 = { stripInternal: !!config?.compilerOptions.stripInternal };
+				compilerOptions = config?.compilerOptions;
 			}
+			if (isolatedDeclaration$1 == null) isolatedDeclaration$1 = !!compilerOptions?.isolatedDeclarations;
+			if (isolatedDeclaration$1 === true) isolatedDeclaration$1 = {};
+			if (isolatedDeclaration$1 && isolatedDeclaration$1.stripInternal == null) isolatedDeclaration$1.stripInternal = !!compilerOptions?.stripInternal;
 			if (!isolatedDeclaration$1) initTs();
-		},
-		options({ input }) {
-			if (isPlainObject(input)) inputOption = { ...input };
+			if (!Array.isArray(options.input)) {
+				const cwd = options.cwd || process.cwd();
+				for (const [fileName, inputFilePath] of Object.entries(options.input)) {
+					const id = path.resolve(cwd, inputFilePath);
+					inputAliasMap.set(id, fileName);
+				}
+			}
 		},
 		outputOptions(options) {
 			return {
@@ -637,19 +639,17 @@ function createGeneratePlugin({ compilerOptions, isolatedDeclaration: isolatedDe
 					src: id
 				});
 				if (isEntry) {
-					let name = basename(dtsId, extname(dtsId));
-					if (inputAliasMap.has(name)) name = inputAliasMap.get(name);
-					else if (inputAliasMap.has(dtsId)) name = inputAliasMap.get(dtsId);
+					const name = inputAliasMap.get(id);
 					this.emitFile({
 						type: "chunk",
 						id: dtsId,
-						name
+						name: name ? `${name}.d` : void 0
 					});
 					if (emitDtsOnly) return "//";
 				}
 			}
 		},
-		async resolveId(id, importer, extraOptions) {
+		async resolveId(id, importer) {
 			if (dtsMap.has(id)) return {
 				id,
 				meta
@@ -683,16 +683,6 @@ function createGeneratePlugin({ compilerOptions, isolatedDeclaration: isolatedDe
 					id: dtsId,
 					meta
 				};
-			} else if (extraOptions.isEntry && inputOption) {
-				const resolution = await this.resolve(id, importer, extraOptions);
-				if (!resolution) return;
-				const dtsId = filename_ts_to_dts(resolution.id);
-				if (inputAliasMap.has(dtsId)) return resolution;
-				for (const [name, entry] of Object.entries(inputOption)) if (entry === id) {
-					inputAliasMap.set(dtsId, `${name}.d.ts`);
-					break;
-				}
-				return resolution;
 			}
 		},
 		load: {
@@ -715,11 +705,6 @@ function createGeneratePlugin({ compilerOptions, isolatedDeclaration: isolatedDe
 		}
 	};
 }
-function isPlainObject(data) {
-	if (typeof data !== "object" || data === null) return false;
-	const proto = Object.getPrototypeOf(data);
-	return proto === null || proto === Object.prototype;
-}
 
 //#endregion
 //#region src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-dts",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "A Rolldown plugin to bundle dts files",
   "type": "module",
   "license": "MIT",
@@ -38,19 +38,19 @@
   },
   "dependencies": {
     "debug": "^4.4.0",
-    "dts-resolver": "^0.1.0",
+    "dts-resolver": "^0.1.1",
     "get-tsconfig": "^4.10.0",
     "magic-string-ast": "^0.9.1",
-    "oxc-parser": "^0.62.0",
-    "oxc-transform": "^0.62.0"
+    "oxc-parser": "^0.64.0",
+    "oxc-transform": "^0.64.0"
   },
   "devDependencies": {
     "@sxzz/eslint-config": "^6.1.1",
     "@sxzz/prettier-config": "^2.2.1",
-    "@sxzz/test-utils": "^0.5.4",
+    "@sxzz/test-utils": "^0.5.5",
     "@types/debug": "^4.1.12",
     "@types/diff": "^7.0.2",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.14.1",
     "bumpp": "^10.1.0",
     "diff": "^7.0.0",
     "eslint": "^9.24.0",
@@ -58,7 +58,7 @@
     "prettier": "^3.5.3",
     "rolldown": "^1.0.0-beta.7",
     "rollup-plugin-dts": "^6.2.1",
-    "tsdown": "^0.8.0-beta.1",
+    "tsdown": "^0.8.0",
     "tsx": "^4.19.3",
     "typescript": "^5.8.3",
     "vitest": "^3.1.1"