rsbuild-plugin-dts 0.6.2 → 0.6.4

package/dist/apiExtractor.js

@@ -1,10 +1,16 @@
 import * as __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__ from "node:path";
-import * as __WEBPACK_EXTERNAL_MODULE__microsoft_api_extractor_99b102c2__ from "@microsoft/api-extractor";
 import * as __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__ from "@rsbuild/core";
 import * as __WEBPACK_EXTERNAL_MODULE_picocolors__ from "picocolors";
 import * as __WEBPACK_EXTERNAL_MODULE__utils_js_d88b7fe1__ from "./utils.js";
 const logPrefixApiExtractor = __WEBPACK_EXTERNAL_MODULE_picocolors__["default"].dim('[api-extractor]');
 async function bundleDts(options) {
+    let apiExtractor;
+    try {
+        apiExtractor = await import("@microsoft/api-extractor");
+    } catch  {
+        throw new Error(`${__WEBPACK_EXTERNAL_MODULE_picocolors__["default"].cyan('@microsoft/api-extractor')} is required when ${__WEBPACK_EXTERNAL_MODULE_picocolors__["default"].cyan('dts.bundle')} is set to ${__WEBPACK_EXTERNAL_MODULE_picocolors__["default"].cyan('true')}, please make sure it is installed. You could check https://lib.rsbuild.dev/guide/advanced/dts#how-to-generate-declaration-files-in-rslib for more details.`);
+    }
+    const { Extractor, ExtractorConfig, ExtractorLogLevel } = apiExtractor;
     const { name, cwd, distPath, dtsExtension, banner, footer, dtsEntry, tsconfigPath = 'tsconfig.json', bundledPackages = [] } = options;
     try {
         await Promise.all(dtsEntry.map(async (entry)=>{
@@ -23,15 +29,15 @@ async function bundleDts(options) {
                 },
                 projectFolder: cwd
             };
-            const extractorConfig = __WEBPACK_EXTERNAL_MODULE__microsoft_api_extractor_99b102c2__.ExtractorConfig.prepare({
+            const extractorConfig = ExtractorConfig.prepare({
                 configObject: internalConfig,
                 configObjectFullPath: void 0,
                 packageJsonFullPath: (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(cwd, 'package.json')
             });
-            const extractorResult = __WEBPACK_EXTERNAL_MODULE__microsoft_api_extractor_99b102c2__.Extractor.invoke(extractorConfig, {
+            const extractorResult = Extractor.invoke(extractorConfig, {
                 localBuild: true,
                 messageCallback (message) {
-                    if ('console-compiler-version-notice' === message.messageId || 'console-preamble' === message.messageId) message.logLevel = __WEBPACK_EXTERNAL_MODULE__microsoft_api_extractor_99b102c2__.ExtractorLogLevel.None;
+                    if ('console-compiler-version-notice' === message.messageId || 'console-preamble' === message.messageId) message.logLevel = ExtractorLogLevel.None;
                 }
             });
             if (!extractorResult.succeeded) throw new Error(`API Extractor error. ${__WEBPACK_EXTERNAL_MODULE_picocolors__["default"].gray(`(${name})`)}`);

package/dist/index.js

@@ -5,8 +5,8 @@ import * as __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__ from "@rsbuild/co
 import * as __WEBPACK_EXTERNAL_MODULE_picocolors__ from "picocolors";
 import * as __WEBPACK_EXTERNAL_MODULE_typescript__ from "typescript";
 import * as __WEBPACK_EXTERNAL_MODULE__utils_js_d88b7fe1__ from "./utils.js";
-const src_rslib_entry_filename = (0, __WEBPACK_EXTERNAL_MODULE_node_url_e96de089__.fileURLToPath)(import.meta.url);
-const src_rslib_entry_dirname = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.dirname)(src_rslib_entry_filename);
+const src_filename = (0, __WEBPACK_EXTERNAL_MODULE_node_url_e96de089__.fileURLToPath)(import.meta.url);
+const src_dirname = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.dirname)(src_filename);
 const PLUGIN_DTS_NAME = 'rsbuild:dts';
 const pluginDts = (options = {})=>({
         name: PLUGIN_DTS_NAME,
@@ -39,8 +39,8 @@ const pluginDts = (options = {})=>({
                 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 (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}`), [], {
+                const jsExtension = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.extname)(src_filename);
+                const childProcess = (0, __WEBPACK_EXTERNAL_MODULE_node_child_process_27f17141__.fork)((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(src_dirname, `./dts${jsExtension}`), [], {
                     stdio: 'inherit'
                 });
                 childProcesses.push(childProcess);

package/dist/utils.js

@@ -112,33 +112,42 @@ async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, ou
     const sgNode = (await (0, __WEBPACK_EXTERNAL_MODULE__ast_grep_napi_5dd5d9b1__.parseAsync)("typescript", content)).root();
     const matcher = {
         rule: {
-            kind: 'string_fragment',
             any: [
                 {
-                    inside: {
-                        stopBy: 'end',
-                        kind: 'import_statement',
-                        field: 'source'
+                    kind: 'import_statement',
+                    has: {
+                        field: 'source',
+                        has: {
+                            pattern: '$IMP',
+                            kind: 'string_fragment'
+                        }
                     }
                 },
                 {
-                    inside: {
-                        stopBy: 'end',
-                        kind: 'export_statement',
-                        field: 'source'
+                    kind: 'export_statement',
+                    has: {
+                        field: 'source',
+                        has: {
+                            pattern: '$IMP',
+                            kind: 'string_fragment'
+                        }
                     }
                 },
                 {
-                    inside: {
-                        kind: 'string',
-                        inside: {
-                            kind: 'arguments',
-                            inside: {
-                                kind: 'call_expression',
-                                has: {
-                                    field: 'function',
-                                    regex: '^(import|require)$'
-                                }
+                    any: [
+                        {
+                            pattern: 'require($A)'
+                        },
+                        {
+                            pattern: 'import($A)'
+                        }
+                    ],
+                    has: {
+                        field: 'arguments',
+                        has: {
+                            has: {
+                                pattern: '$IMP',
+                                kind: 'string_fragment'
                             }
                         }
                     }
@@ -146,11 +155,14 @@ async function redirectDtsImports(dtsFile, dtsExtension, redirect, matchPath, ou
             ]
         }
     };
-    const matchModule = sgNode.findAll(matcher).map((matchNode)=>({
+    const matchModule = sgNode.findAll(matcher).map((match)=>{
+        const matchNode = match.getMatch('IMP');
+        return {
             n: matchNode.text(),
             s: matchNode.range().start.index,
             e: matchNode.range().end.index
-        }));
+        };
+    });
     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;
@@ -200,24 +212,23 @@ async function processDtsFiles(bundle, dir, dtsExtension, redirect, tsconfigPath
     let matchPath;
     if (redirect.path || redirect.extension) {
         const result = (0, __WEBPACK_EXTERNAL_MODULE_tsconfig_paths_df62e9eb__.loadConfig)(tsconfigPath);
-        if ('failed' === result.resultType) {
-            __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.logger.error(result.message);
-            return;
-        }
+        if ('failed' === result.resultType) return void __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.logger.error(result.message);
         const { absoluteBaseUrl, paths, mainFields, addMatchAll } = result;
         matchPath = (0, __WEBPACK_EXTERNAL_MODULE_tsconfig_paths_df62e9eb__.createMatchPath)(absoluteBaseUrl, paths, mainFields, addMatchAll);
     }
     const dtsFiles = await (0, __WEBPACK_EXTERNAL_MODULE_tinyglobby__.glob)(convertPath((0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(dir, '/**/*.d.ts')), {
         absolute: true
     });
-    for (const file of dtsFiles)try {
-        if (banner || footer) await addBannerAndFooter(file, banner, footer);
-        if ((redirect.path || redirect.extension) && matchPath) await redirectDtsImports(file, dtsExtension, redirect, matchPath, dir, rootDir);
-        const newFile = file.replace('.d.ts', dtsExtension);
-        __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__["default"].renameSync(file, newFile);
-    } catch (error) {
-        __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.logger.error(`Failed to rename declaration file ${file}: ${error}`);
-    }
+    await Promise.all(dtsFiles.map(async (file)=>{
+        try {
+            if (banner || footer) await addBannerAndFooter(file, banner, footer);
+            if ((redirect.path || redirect.extension) && matchPath) await redirectDtsImports(file, dtsExtension, redirect, matchPath, dir, rootDir);
+            const newFile = file.replace('.d.ts', dtsExtension);
+            await __WEBPACK_EXTERNAL_MODULE_node_fs_promises_153e37e0__["default"].rename(file, newFile);
+        } catch (error) {
+            __WEBPACK_EXTERNAL_MODULE__rsbuild_core_1b356efc__.logger.error(`Failed to rename declaration file ${file}: ${error}`);
+        }
+    }));
 }
 function processSourceEntry(bundle, entryConfig) {
     if (!bundle) return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsbuild-plugin-dts",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Rsbuild plugin that supports emitting declaration files for TypeScript.",
   "homepage": "https://lib.rsbuild.dev",
   "bugs": {
@@ -25,17 +25,17 @@
     "dist"
   ],
   "dependencies": {
-    "@ast-grep/napi": "^0.36.2",
+    "@ast-grep/napi": "^0.37.0",
     "magic-string": "^0.30.17",
     "picocolors": "1.1.1",
     "tinyglobby": "^0.2.12",
     "tsconfig-paths": "^4.2.0"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.52.3",
-    "@rsbuild/core": "1.3.5",
+    "@microsoft/api-extractor": "^7.52.4",
+    "@rsbuild/core": "1.3.8",
     "rsbuild-plugin-publint": "^0.3.0",
-    "rslib": "npm:@rslib/core@0.6.1",
+    "rslib": "npm:@rslib/core@0.6.3",
     "typescript": "^5.8.3",
     "@rslib/tsconfig": "0.0.1"
   },