rsbuild-plugin-dts 0.5.0-alpha.0 → 0.5.1

package/README.md

@@ -228,8 +228,8 @@ Whether to automatically redirect the file extension to import paths based on th
 import { foo } from './foo'; // source code of './src/bar.ts' ↓
 import { foo } from './foo.mjs'; // expected output of './dist/bar.d.mts'
 
-import { foo } from './foo.ts'; // source code of './src/utils/index.ts' ↓
-import { foo } from './foo.mjs'; // expected output './dist/utils/index.d.mts'
+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).

package/dist/index.js

@@ -32,10 +32,13 @@ const pluginDts = (options = {})=>({
                 }
                 const tsConfigResult = (0, __WEBPACK_EXTERNAL_MODULE__utils_js_d88b7fe1__.loadTsconfig)(tsconfigPath);
                 const { options: rawCompilerOptions } = tsConfigResult;
-                const dtsEmitPath = options.distPath ?? rawCompilerOptions.declarationDir ?? config.output?.distPath?.root;
+                const { declarationDir, outDir, composite, incremental } = rawCompilerOptions;
+                const dtsEmitPath = options.distPath ?? declarationDir ?? outDir ?? config.output?.distPath?.root;
+                (0, __WEBPACK_EXTERNAL_MODULE__utils_js_d88b7fe1__.warnIfOutside)(cwd, declarationDir, 'declarationDir');
+                (0, __WEBPACK_EXTERNAL_MODULE__utils_js_d88b7fe1__.warnIfOutside)(cwd, outDir, 'outDir');
                 if (false !== config.output.cleanDistPath) await (0, __WEBPACK_EXTERNAL_MODULE__utils_js_d88b7fe1__.cleanDtsFiles)(dtsEmitPath);
                 if (options.bundle) await (0, __WEBPACK_EXTERNAL_MODULE__utils_js_d88b7fe1__.clearTempDeclarationDir)(cwd);
-                if (rawCompilerOptions.composite || rawCompilerOptions.incremental || options.build) await (0, __WEBPACK_EXTERNAL_MODULE__utils_js_d88b7fe1__.cleanTsBuildInfoFile)(tsconfigPath, rawCompilerOptions);
+                if (composite || incremental || options.build) await (0, __WEBPACK_EXTERNAL_MODULE__utils_js_d88b7fe1__.cleanTsBuildInfoFile)(tsconfigPath, rawCompilerOptions);
                 const jsExtension = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.extname)(src_rslib_entry_filename);
                 const childProcess = (0, __WEBPACK_EXTERNAL_MODULE_node_child_process_27f17141__.fork)((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(src_rslib_entry_dirname, `./dts${jsExtension}`), [], {
                     stdio: 'inherit'

package/dist/utils.d.ts

@@ -8,6 +8,7 @@ export declare const TEMP_FOLDER = ".rslib";
 export declare const TEMP_DTS_DIR: string;
 export declare function ensureTempDeclarationDir(cwd: string, name: string): string;
 export declare function pathExists(path: string): Promise<boolean>;
+export declare function isDirectory(filePath: string): Promise<boolean>;
 export declare function emptyDir(dir: string): Promise<void>;
 export declare function clearTempDeclarationDir(cwd: string): Promise<void>;
 export declare function getFileLoc(diagnostic: ts.Diagnostic, configPath: string): string;
@@ -20,3 +21,4 @@ export declare function processSourceEntry(bundle: boolean, entryConfig: NonNull
 export declare function calcLongestCommonPath(absPaths: string[]): Promise<string | null>;
 export declare function cleanDtsFiles(dir: string): Promise<void>;
 export declare function cleanTsBuildInfoFile(tsconfigPath: string, compilerOptions: ts.CompilerOptions): Promise<void>;
+export declare function warnIfOutside(cwd: string, dir: string | undefined, label: string): void;

package/dist/utils.js

@@ -44,6 +44,14 @@ function ensureTempDeclarationDir(cwd, name) {
 async function pathExists(path) {
     return __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__["default"].promises.access(path).then(()=>true).catch(()=>false);
 }
+async function isDirectory(filePath) {
+    try {
+        const stat = await __WEBPACK_EXTERNAL_MODULE_node_fs_promises_153e37e0__["default"].stat(filePath);
+        return stat.isDirectory();
+    } catch  {
+        return false;
+    }
+}
 async function emptyDir(dir) {
     if (!await pathExists(dir)) return;
     try {
@@ -92,6 +100,12 @@ async function addBannerAndFooter(dtsFile, banner, footer) {
     if (footer && !content.trimEnd().endsWith(footer.trim())) code.append(`\n${footer}\n`);
     if (code.hasChanged()) await __WEBPACK_EXTERNAL_MODULE_node_fs_promises_153e37e0__["default"].writeFile(dtsFile, code.toString());
 }
+async function addExtension(redirect, dtsFile, path, extension) {
+    if (!redirect.extension) return path;
+    let redirectPath = path;
+    if (await isDirectory((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.dirname)(dtsFile), redirectPath))) redirectPath = `${redirectPath}/index`;
+    return `${redirectPath}${extension}`;
+}
 async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, outDir, rootDir) {
     const content = await __WEBPACK_EXTERNAL_MODULE_node_fs_promises_153e37e0__["default"].readFile(dtsFile, 'utf-8');
     const code = new __WEBPACK_EXTERNAL_MODULE_magic_string_758c1a52__["default"](content);
@@ -137,7 +151,7 @@ async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, ou
             s: matchNode.range().start.index,
             e: matchNode.range().end.index
         }));
-    const extensions = dtsExtension.replace(/\.d\.ts$/, '.js').replace(/\.d\.cts$/, '.cjs').replace(/\.d\.mts$/, '.mjs');
+    const extension = 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 {
@@ -167,15 +181,11 @@ async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, ou
             const ext = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.extname)(redirectImportPath);
             if (ext) {
                 if (JS_EXTENSIONS_PATTERN.test(redirectImportPath)) {
-                    if (redirect.extension) redirectImportPath = redirectImportPath.replace(/\.[^.]+$/, extensions);
+                    if (redirect.extension) redirectImportPath = redirectImportPath.replace(/\.[^.]+$/, extension);
                 }
             } else {
-                if (absoluteImportPath && (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(absoluteImportPath).startsWith((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(rootDir))) {
-                    if (redirect.extension) redirectImportPath = `${redirectImportPath}${extensions}`;
-                }
-                if (!absoluteImportPath && importPath.startsWith('.')) {
-                    if (redirect.extension) redirectImportPath = `${redirectImportPath}${extensions}`;
-                }
+                if (absoluteImportPath && (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(absoluteImportPath).startsWith((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(rootDir))) redirectImportPath = await addExtension(redirect, dtsFile, redirectImportPath, extension);
+                if (!absoluteImportPath && importPath.startsWith('.')) redirectImportPath = await addExtension(redirect, dtsFile, redirectImportPath, extension);
             }
             const normalizedRedirectImportPath = redirectImportPath.split(__WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].sep).join('/');
             code.overwrite(start, end, normalizedRedirectImportPath);
@@ -260,4 +270,12 @@ async function cleanTsBuildInfoFile(tsconfigPath, compilerOptions) {
         force: true
     });
 }
-export { JS_EXTENSIONS_PATTERN, TEMP_DTS_DIR, TEMP_FOLDER, addBannerAndFooter, calcLongestCommonPath, cleanDtsFiles, cleanTsBuildInfoFile, clearTempDeclarationDir, emptyDir, ensureTempDeclarationDir, getFileLoc, getTimeCost, loadTsconfig, pathExists, prettyTime, processDtsFiles, processSourceEntry, redirectDtsImports };
+function warnIfOutside(cwd, dir, label) {
+    if (dir) {
+        const normalizedCwd = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(cwd);
+        const normalizedDir = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(dir);
+        const relDir = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.relative)(normalizedCwd, normalizedDir);
+        if (relDir.startsWith('..')) __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.logger.warn(`The resolved ${label} ${__WEBPACK_EXTERNAL_MODULE_picocolors__["default"].cyan(normalizedDir)} is outside the project root ${__WEBPACK_EXTERNAL_MODULE_picocolors__["default"].cyan(normalizedCwd)}, please check your tsconfig file.`);
+    }
+}
+export { JS_EXTENSIONS_PATTERN, TEMP_DTS_DIR, TEMP_FOLDER, addBannerAndFooter, calcLongestCommonPath, cleanDtsFiles, cleanTsBuildInfoFile, clearTempDeclarationDir, emptyDir, ensureTempDeclarationDir, getFileLoc, getTimeCost, isDirectory, loadTsconfig, pathExists, prettyTime, processDtsFiles, processSourceEntry, redirectDtsImports, warnIfOutside };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsbuild-plugin-dts",
-  "version": "0.5.0-alpha.0",
+  "version": "0.5.1",
   "description": "Rsbuild plugin that supports emitting declaration files for TypeScript.",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {
@@ -28,14 +28,14 @@
     "@ast-grep/napi": "^0.35.0",
     "magic-string": "^0.30.17",
     "picocolors": "1.1.1",
-    "tinyglobby": "^0.2.10",
+    "tinyglobby": "^0.2.12",
     "tsconfig-paths": "^4.2.0"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.50.0",
-    "@rsbuild/core": "~1.2.8",
+    "@rsbuild/core": "~1.2.10",
     "rsbuild-plugin-publint": "^0.3.0",
-    "rslib": "npm:@rslib/core@0.4.1",
+    "rslib": "npm:@rslib/core@0.5.0",
     "typescript": "^5.7.3",
     "@rslib/tsconfig": "0.0.1"
   },