rolldown-plugin-dts 0.7.2 → 0.7.3

package/dist/index.js

@@ -170,7 +170,7 @@ function getIdentifierRange(node, offset = 0) {
 
 //#endregion
 //#region src/utils/filename.ts
-const RE_JS = /\.([cm]?)js$/;
+const RE_JS = /\.([cm]?)jsx?$/;
 const RE_TS = /\.([cm]?)tsx?$/;
 const RE_DTS = /\.d\.([cm]?)ts$/;
 const RE_NODE_MODULES = /node_modules/;
@@ -646,41 +646,55 @@ function createGeneratePlugin({ compilerOptions, isolatedDeclaration: isolatedDe
 				}
 			}
 		},
-		async resolveId(id, importer) {
+		async resolveId(id, importer, options) {
 			if (dtsMap.has(id)) return {
 				id,
 				meta
 			};
-			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,
+			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 (!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
 					};
-				}
-				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,
+				} else return {
+					id,
+					external: true,
 					meta
 				};
-				await this.load(resolution);
+			}
+			let resolution = await this.resolve(id, filename_dts_to(importer, "ts"));
+			if (!resolution || resolution.external) return;
+			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 = 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: {

package/package.json

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