rolldown-plugin-dts 0.2.0 → 0.3.0

package/README.md

@@ -51,14 +51,8 @@ interface Options {
    */
   inputAlias?: Record<string, string>
 
-  /**
-   * Determines whether the module imported by `.d.ts` files should be treated as external or not.
-   */
-  external?: (
-    id: string,
-    importer: string,
-    extraOptions: ResolveIdExtraOptions,
-  ) => boolean | void
+  /** Resolve external types used in dts files from `node_modules` */
+  resolve?: boolean | (string | RegExp)[]
 }
 ````
 

package/dist/index.d.ts

@@ -1,16 +1,15 @@
 import { IsolatedDeclarationsOptions } from "oxc-transform";
-import { FunctionPluginHooks, Plugin } from "rolldown";
+import { Plugin } from "rolldown";
 
 //#region src/fake-js.d.ts
 declare function createFakeJsPlugin({ dtsInput }: Pick<Options, "dtsInput">): Plugin;
 
 //#endregion
 //#region src/generate.d.ts
-declare function createGeneratePlugin({ isolatedDeclaration, inputAlias, external }: Pick<Options, "external" | "isolatedDeclaration" | "inputAlias">): Plugin;
+declare function createGeneratePlugin({ isolatedDeclaration, inputAlias, resolve }: Pick<Options, "isolatedDeclaration" | "inputAlias" | "resolve">): Plugin;
 
 //#endregion
 //#region src/index.d.ts
-type ResolveIdExtraOptions = Parameters<FunctionPluginHooks["resolveId"]>[2];
 interface Options {
 	/**
 	* When entries are `.d.ts` files (instead of `.ts` files), this option should be set to `true`.
@@ -29,10 +28,8 @@ interface Options {
 	* }
 	*/
 	inputAlias?: Record<string, string>;
-	/**
-	* Determines whether the module imported by `.d.ts` files should be treated as external or not.
-	*/
-	external?: (id: string, importer: string, extraOptions: ResolveIdExtraOptions) => boolean | void;
+	/** Resolve external types used in dts files from `node_modules` */
+	resolve?: boolean | (string | RegExp)[];
 }
 declare function dts(options?: Options): Plugin[];
 

package/dist/index.js

@@ -1,6 +1,7 @@
 import { MagicStringAST } from "magic-string-ast";
 import { parseAsync } from "oxc-parser";
 import path, { basename } from "node:path";
+import { createResolver } from "dts-resolver";
 import { isolatedDeclaration } from "oxc-transform";
 
 //#region node_modules/.pnpm/estree-walker@3.0.3/node_modules/estree-walker/src/walker.js
@@ -234,6 +235,7 @@ function createFakeJsPlugin({ dtsInput }) {
 			};
 		} : void 0,
 		outputOptions(options) {
+			if (options.format === "cjs" || options.format === "commonjs") throw new Error("[rolldown-plugin-dts] Cannot bundle dts files with `cjs` format.");
 			return {
 				...options,
 				entryFileNames: options.entryFileNames ?? (dtsInput ? "[name].ts" : void 0),
@@ -245,10 +247,7 @@ function createFakeJsPlugin({ dtsInput }) {
 			};
 		},
 		transform: {
-			filter: { id: {
-				include: [RE_DTS],
-				exclude: [RE_NODE_MODULES]
-			} },
+			filter: { id: RE_DTS },
 			async handler(code, id) {
 				const { program, comments } = await parseAsync(id, code);
 				const preserved = collectReferenceDirectives(comments);
@@ -436,10 +435,17 @@ function importNamespace(s, source, imported, getIdentifierIndex) {
 
 //#endregion
 //#region src/generate.ts
-function createGeneratePlugin({ isolatedDeclaration: isolatedDeclaration$1, inputAlias, external }) {
+const meta = { dtsFile: true };
+function createGeneratePlugin({ isolatedDeclaration: isolatedDeclaration$1, inputAlias = {}, resolve = false }) {
 	const dtsMap = new Map();
+	const inputAliasMap = new Map(Object.entries(inputAlias));
+	const resolver = createResolver();
+	let inputOption;
 	return {
 		name: "rolldown-plugin-dts:generate",
+		options({ input }) {
+			if (isPlainObject(input)) inputOption = { ...input };
+		},
 		transform: {
 			order: "pre",
 			filter: { id: {
@@ -454,7 +460,8 @@ function createGeneratePlugin({ isolatedDeclaration: isolatedDeclaration$1, inpu
 				const mod = this.getModuleInfo(id);
 				if (mod?.isEntry) {
 					let fileName = basename(dtsId);
-					if (inputAlias?.[fileName]) fileName = inputAlias[fileName];
+					if (inputAliasMap.has(fileName)) fileName = inputAliasMap.get(fileName);
+					else if (inputAliasMap.has(dtsId)) fileName = inputAliasMap.get(dtsId);
 					this.emitFile({
 						type: "chunk",
 						id: dtsId,
@@ -466,26 +473,47 @@ function createGeneratePlugin({ isolatedDeclaration: isolatedDeclaration$1, inpu
 		async resolveId(id, importer, extraOptions) {
 			if (dtsMap.has(id)) return {
 				id,
-				meta: { dtsFile: true }
+				meta
 			};
-			const importerMod = importer ? this.getModuleInfo(importer) : null;
-			if (importerMod?.meta.dtsFile) {
-				if (!isRelative(id) || external?.(id, importer, extraOptions) === true) return {
-					id,
-					external: true
-				};
+			if (importer && this.getModuleInfo(importer)?.meta.dtsFile) {
+				if (!isRelative(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
+					};
+				}
 				const resolution = await this.resolve(id, filename_dts_to(importer, "ts"));
 				if (!resolution || resolution.external) return;
 				const dtsId = filename_ts_to_dts(resolution.id);
 				if (dtsMap.has(dtsId)) return {
 					id: dtsId,
-					meta: { dtsFile: true }
+					meta
 				};
 				await this.load(resolution);
 				if (dtsMap.has(dtsId)) return {
 					id: dtsId,
-					meta: { dtsFile: true }
+					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: {
@@ -502,6 +530,11 @@ function createGeneratePlugin({ isolatedDeclaration: isolatedDeclaration$1, inpu
 		}
 	};
 }
+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.2.0",
+  "version": "0.3.0",
   "description": "A Rolldown plugin to bundle dts files",
   "type": "module",
   "license": "MIT",
@@ -27,7 +27,11 @@
   "publishConfig": {
     "access": "public"
   },
+  "peerDependencies": {
+    "rolldown": "^1.0.0-beta.7"
+  },
   "dependencies": {
+    "dts-resolver": "^0.1.0",
     "magic-string-ast": "^0.9.1",
     "oxc-parser": "^0.62.0",
     "oxc-transform": "^0.62.0"
@@ -43,7 +47,7 @@
     "eslint": "^9.24.0",
     "estree-walker": "^3.0.3",
     "prettier": "^3.5.3",
-    "rolldown": "1.0.0-beta.7",
+    "rolldown": "^1.0.0-beta.7",
     "rollup-plugin-dts": "^6.2.1",
     "tsdown": "^0.8.0-beta.1",
     "tsx": "^4.19.3",