rolldown-plugin-dts 0.9.4 → 0.9.6

package/dist/index.d.ts

@@ -63,6 +63,12 @@ interface Options {
   sourcemap?: boolean;
   /** Resolve external types used in dts files from `node_modules` */
   resolve?: boolean | (string | RegExp)[];
+  /**
+  * When `true`, the plugin will resolve `paths` in `tsconfig.json`.
+  *
+  * This option is enabled when `paths` is set in `compilerOptions`.
+  */
+  resolvePaths?: boolean;
 }
 type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U;
 type OptionsResolved = Overwrite<Required<Options>, {
@@ -78,7 +84,8 @@ declare function resolveOptions({
   sourcemap,
   dtsInput,
   emitDtsOnly,
-  resolve
+  resolve,
+  resolvePaths
 }: Options): OptionsResolved;
 
 //#endregion

package/dist/index.js

@@ -587,7 +587,8 @@ function rewriteImportExport(node, set) {
 	return false;
 }
 function importNamespace(node, imported, source, getIdentifierIndex, prepend) {
-	let local = t.identifier(`_${getIdentifierIndex()}`);
+	const sourceText = source.value.replaceAll(/\W/g, "_");
+	let local = t.identifier(`${sourceText}${getIdentifierIndex()}`);
 	prepend(t.importDeclaration([t.importNamespaceSpecifier(local)], source));
 	if (imported) {
 		const importedLeft = getIdFromTSEntityName(imported);
@@ -853,8 +854,24 @@ function createGeneratePlugin({ compilerOptions = {}, isolatedDeclarations, emit
 //#endregion
 //#region src/resolve.ts
 const meta = { dtsFile: true };
-function createDtsResolvePlugin({ tsconfig, resolve }) {
+function createDtsResolvePlugin({ tsconfig, resolve, resolvePaths }) {
 	const resolver = createResolver({ tsconfig: tsconfig ? tsconfig : void 0 });
+	function resolveDependency(id, importer) {
+		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 = resolver(id, importer);
+			if (resolution) return {
+				id: resolution,
+				meta
+			};
+		} else return {
+			id,
+			external: true,
+			meta
+		};
+	}
 	return {
 		name: "rolldown-plugin-dts:resolve",
 		resolveId: {
@@ -868,28 +885,14 @@ function createDtsResolvePlugin({ tsconfig, resolve }) {
 						meta
 					};
 				}
+				if (!resolvePaths && (RE_NODE_MODULES.test(id) || !isRelative(id))) return resolveDependency(id, importer);
 				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;
-					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
-					};
-				}
+				if (resolvePaths && (RE_NODE_MODULES.test(resolution?.id || id) || !isRelative(resolution?.id || id))) return resolveDependency(id, importer);
 				if (!resolution || resolution.external) return resolution;
 				if (RE_JS.test(resolution.id)) {
 					resolution = await this.resolve(filename_js_to_dts(resolution.id), importer, options);
@@ -920,7 +923,7 @@ function dts(options = {}) {
 	plugins.push(createDtsResolvePlugin(resolved), createFakeJsPlugin(resolved));
 	return plugins;
 }
-function resolveOptions({ cwd = process.cwd(), tsconfig, compilerOptions = {}, isolatedDeclarations, sourcemap, dtsInput = false, emitDtsOnly = false, resolve = false }) {
+function resolveOptions({ cwd = process.cwd(), tsconfig, compilerOptions = {}, isolatedDeclarations, sourcemap, dtsInput = false, emitDtsOnly = false, resolve = false, resolvePaths }) {
 	if (tsconfig === true || tsconfig == null) {
 		const { config, path: path$1 } = getTsconfig(cwd) || {};
 		tsconfig = path$1;
@@ -952,7 +955,8 @@ function resolveOptions({ cwd = process.cwd(), tsconfig, compilerOptions = {}, i
 		sourcemap,
 		dtsInput,
 		emitDtsOnly,
-		resolve
+		resolve,
+		resolvePaths: resolvePaths ?? !!compilerOptions?.paths
 	};
 }
 

package/package.json

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