rsbuild-plugin-dts 0.6.5 → 0.6.7

package/dist/utils.d.ts

@@ -19,7 +19,7 @@ export declare function redirectDtsImports(dtsFile: string, dtsExtension: string
 export declare function processDtsFiles(bundle: boolean, dir: string, dtsExtension: string, redirect: DtsRedirect, tsconfigPath: string, rootDir: string, banner?: string, footer?: string): Promise<void>;
 export declare function processSourceEntry(bundle: boolean, entryConfig: NonNullable<RsbuildConfig['source']>['entry']): DtsEntry[];
 export declare function calcLongestCommonPath(absPaths: string[]): Promise<string | null>;
-export declare const globDtsFiles: (dir: string) => Promise<string[]>;
+export declare const globDtsFiles: (dir: string, patterns: string[]) => Promise<string[]>;
 export declare function cleanDtsFiles(dir: string): Promise<void>;
 export declare function cleanTsBuildInfoFile(tsconfigPath: string, compilerOptions: ts.CompilerOptions): Promise<void>;
 export declare function getDtsEmitPath(pathFromPlugin: string | undefined, declarationDir: string | undefined, distPath: string): string;

package/dist/utils.js

@@ -103,7 +103,8 @@ async function addBannerAndFooter(dtsFile, banner, footer) {
 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`;
+    if (!(0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.isAbsolute)(redirectPath) && !redirectPath.startsWith('.')) return redirectPath;
+    if (await isDirectory((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.dirname)(dtsFile), redirectPath))) redirectPath = `${redirectPath.replace(/\/+$/, '')}/index`;
     return `${redirectPath}${extension}`;
 }
 async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, outDir, rootDir) {
@@ -123,6 +124,19 @@ async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, ou
                         }
                     }
                 },
+                {
+                    kind: 'import_statement',
+                    has: {
+                        kind: 'import_require_clause',
+                        has: {
+                            field: 'source',
+                            has: {
+                                pattern: '$IMP',
+                                kind: 'string_fragment'
+                            }
+                        }
+                    }
+                },
                 {
                     kind: 'export_statement',
                     has: {
@@ -179,7 +193,8 @@ async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, ou
             ]);
             let redirectImportPath = importPath;
             if (absoluteImportPath && redirect.path) {
-                const isOutsideRootdir = !(0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(absoluteImportPath).startsWith((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(rootDir) + __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].sep);
+                const relativeRootDir = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].relative((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(rootDir), (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.normalize)(absoluteImportPath));
+                const isOutsideRootdir = relativeRootDir.startsWith('..') || __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].isAbsolute(relativeRootDir);
                 if (isOutsideRootdir) {
                     const relativePath = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.relative)((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.dirname)(dtsFile), absoluteImportPath);
                     redirectImportPath = relativePath.startsWith('..') ? relativePath : `./${relativePath}`;
@@ -216,7 +231,9 @@ async function processDtsFiles(bundle, dir, dtsExtension, redirect, tsconfigPath
         const { absoluteBaseUrl, paths, mainFields, addMatchAll } = result;
         matchPath = (0, __WEBPACK_EXTERNAL_MODULE_tsconfig_paths_df62e9eb__.createMatchPath)(absoluteBaseUrl, paths, mainFields, addMatchAll);
     }
-    const dtsFiles = await globDtsFiles(dir);
+    const dtsFiles = await globDtsFiles(dir, [
+        `/**/*${dtsExtension}`
+    ]);
     await Promise.all(dtsFiles.map(async (file)=>{
         try {
             if (banner || footer) await addBannerAndFooter(file, banner, footer);
@@ -255,19 +272,19 @@ async function calcLongestCommonPath(absPaths) {
     if (stats?.isFile()) lca = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__["default"].dirname(lca);
     return lca;
 }
-const globDtsFiles = async (dir)=>{
-    const patterns = [
-        '/**/*.d.ts',
-        '/**/*.d.cts',
-        '/**/*.d.mts'
-    ];
+const globDtsFiles = async (dir, patterns)=>{
     const dtsFiles = await Promise.all(patterns.map((pattern)=>(0, __WEBPACK_EXTERNAL_MODULE_tinyglobby__.glob)(convertPath((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(dir, pattern)), {
             absolute: true
         })));
     return dtsFiles.flat();
 };
 async function cleanDtsFiles(dir) {
-    const allFiles = await globDtsFiles(dir);
+    const patterns = [
+        '/**/*.d.ts',
+        '/**/*.d.cts',
+        '/**/*.d.mts'
+    ];
+    const allFiles = await globDtsFiles(dir, patterns);
     await Promise.all(allFiles.map((file)=>__WEBPACK_EXTERNAL_MODULE_node_fs_promises_153e37e0__["default"].rm(file, {
             force: true
         })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsbuild-plugin-dts",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "Rsbuild plugin that supports emitting declaration files for TypeScript.",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {
@@ -28,14 +28,14 @@
     "@ast-grep/napi": "^0.37.0",
     "magic-string": "^0.30.17",
     "picocolors": "1.1.1",
-    "tinyglobby": "^0.2.12",
+    "tinyglobby": "^0.2.13",
     "tsconfig-paths": "^4.2.0"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.52.4",
-    "@rsbuild/core": "1.3.8",
+    "@microsoft/api-extractor": "^7.52.5",
+    "@rsbuild/core": "1.3.9",
     "rsbuild-plugin-publint": "^0.3.0",
-    "rslib": "npm:@rslib/core@0.6.4",
+    "rslib": "npm:@rslib/core@0.6.5",
     "typescript": "^5.8.3",
     "@rslib/tsconfig": "0.0.1"
   },