rsbuild-plugin-dts 0.18.2 → 0.18.3

package/README.md

@@ -233,7 +233,7 @@ const defaultRedirect = {
 };
 ```
 
-Controls the redirect of the import paths of output TypeScript declaration files.
+Controls the redirect of the import paths of TypeScript declaration output files.
 
 ```js
 pluginDts({
@@ -269,9 +269,9 @@ import { foo } from '../foo'; // expected output './dist/utils/index.d.ts'
 - **Type:** `boolean`
 - **Default:** `false`
 
-Whether to automatically redirect the file extension to import paths based on the TypeScript declaration output files.
+Whether to automatically redirect the file extension of import paths based on the TypeScript declaration output files.
 
-- When set to `true`, the import paths in declaration files will be redirected to the corresponding JavaScript extension which can be resolved to corresponding declaration file. The extension of the declaration output file is related to the `dtsExtension` configuration.
+- When set to `true`, the file extension of the import path in the declaration file will be automatically completed or replaced with the corresponding JavaScript file extension that can be resolved to the corresponding declaration file. The extension of the declaration output file is related to the `dtsExtension` configuration.
 
 ```ts
 // `dtsExtension` is set to `.d.mts`
@@ -282,7 +282,7 @@ import { foo } from './foo.ts'; // source code of './src/bar.ts' ↓
 import { foo } from './foo.mjs'; // expected output of './dist/bar.d.mts'
 ```
 
-- When set to `false`, the file extension will remain unchanged from the original import path in the rewritten import path of the output file (regardless of whether it is specified or specified as any value).
+- When set to `false`, import paths will retain their original file extensions.
 
 ### tsgo
 

package/dist/utils.js

@@ -127,12 +127,14 @@ async function addBannerAndFooter(dtsFile, banner, footer) {
     if (footer && !content.trimEnd().endsWith(footer.trim())) code.append(`\n${footer}\n`);
     if (code.hasChanged()) await promises.writeFile(dtsFile, code.toString());
 }
-async function addExtension(redirect, dtsFile, path, extension) {
+async function addExtension(redirect, dtsFile, path, jsExtension, dtsExtension) {
     if (!redirect.extension) return path;
-    let redirectPath = path;
-    if (!isAbsolute(redirectPath) && !redirectPath.startsWith('.')) return redirectPath;
-    if (await isDirectory(join(dirname(dtsFile), redirectPath))) redirectPath = `${redirectPath.replace(/\/+$/, '')}/index`;
-    return `${redirectPath}${extension}`;
+    if (!isAbsolute(path) && !path.startsWith('.')) return path;
+    const candidatePaths = [];
+    if (await isDirectory(join(dirname(dtsFile), path))) candidatePaths.push(`${path.replace(/\/+$/, '')}/index`);
+    candidatePaths.push(path);
+    for (const candidatePath of candidatePaths)if (await pathExists(join(dirname(dtsFile), `${candidatePath}${dtsExtension}`))) return `${candidatePath}${jsExtension}`;
+    return path;
 }
 async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, outDir, rootDir) {
     const content = await promises.readFile(dtsFile, 'utf-8');
@@ -204,7 +206,7 @@ async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, ou
             e: matchNode.range().end.index
         };
     });
-    const extension = dtsExtension.replace(/\.d\.ts$/, '.js').replace(/\.d\.cts$/, '.cjs').replace(/\.d\.mts$/, '.mjs');
+    const jsExtension = dtsExtension.replace(/\.d\.ts$/, '.js').replace(/\.d\.cts$/, '.cjs').replace(/\.d\.mts$/, '.mjs');
     for (const imp of matchModule){
         const { n: importPath, s: start, e: end } = imp;
         if (importPath) try {
@@ -235,14 +237,11 @@ async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, ou
             }
             const ext = extname(redirectImportPath);
             if (ext) if (JS_EXTENSIONS_PATTERN.test(redirectImportPath)) {
-                if (redirect.extension) redirectImportPath = redirectImportPath.replace(/\.[^.]+$/, extension);
-            } else {
-                const candidatePath = await addExtension(redirect, dtsFile, redirectImportPath, extension);
-                if (await pathExists(node_path.join(dirname(dtsFile), candidatePath.replace(/\.[^.]+$/, dtsExtension)))) redirectImportPath = candidatePath;
-            }
+                if (redirect.extension) redirectImportPath = redirectImportPath.replace(/\.[^.]+$/, jsExtension);
+            } else redirectImportPath = await addExtension(redirect, dtsFile, redirectImportPath, jsExtension, dtsExtension);
             else {
-                if (absoluteImportPath && normalize(absoluteImportPath).startsWith(normalize(rootDir))) redirectImportPath = await addExtension(redirect, dtsFile, redirectImportPath, extension);
-                if (!absoluteImportPath && importPath.startsWith('.')) redirectImportPath = await addExtension(redirect, dtsFile, redirectImportPath, extension);
+                if (absoluteImportPath && normalize(absoluteImportPath).startsWith(normalize(rootDir))) redirectImportPath = await addExtension(redirect, dtsFile, redirectImportPath, jsExtension, dtsExtension);
+                if (!absoluteImportPath && importPath.startsWith('.')) redirectImportPath = await addExtension(redirect, dtsFile, redirectImportPath, jsExtension, dtsExtension);
             }
             const normalizedRedirectImportPath = redirectImportPath.split(node_path.sep).join('/');
             code.overwrite(start, end, normalizedRedirectImportPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsbuild-plugin-dts",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "description": "Rsbuild plugin that supports emitting declaration files for TypeScript.",
   "homepage": "https://rslib.rs",
   "bugs": {
@@ -30,13 +30,13 @@
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.55.1",
-    "@rsbuild/core": "~1.6.9",
-    "@typescript/native-preview": "7.0.0-dev.20251123.1",
+    "@rsbuild/core": "~1.6.12",
+    "@typescript/native-preview": "7.0.0-dev.20251130.1",
     "magic-string": "^0.30.21",
     "picocolors": "1.1.1",
     "prebundle": "1.6.0",
     "rsbuild-plugin-publint": "^0.3.3",
-    "rslib": "npm:@rslib/core@0.18.0",
+    "rslib": "npm:@rslib/core@0.18.2",
     "tinyglobby": "0.2.14",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.9.3",