@rsdoctor/core 1.3.11 → 1.3.12

package/dist/build-utils/build/module-graph/webpack/transform.cjs

@@ -70,7 +70,8 @@ function appendDependency(webpackDep, module, webpackGraph, graph) {
     const resolveRequest = graph_namespaceObject.Webpack.getWebpackModulePath(resolvedWebpackModule);
     const request = rawRequest ?? resolveRequest;
     if (!module.getDependencyByRequest(request)) {
-        const depModule = graph.getModuleByFile(resolveRequest)[0];
+        const depLayer = resolvedWebpackModule.layer || void 0;
+        const depModule = graph.getModuleByFile(resolveRequest, depLayer)[0];
         if (depModule) {
             const dep = module.addDependency(request, depModule, graph_namespaceObject.ModuleGraphTrans.getImportKind(webpackDep));
             if (dep) graph.addDependency(dep);

package/dist/build-utils/build/module-graph/webpack/transform.js

@@ -33,7 +33,8 @@ function appendDependency(webpackDep, module, webpackGraph, graph) {
     const resolveRequest = Webpack.getWebpackModulePath(resolvedWebpackModule);
     const request = rawRequest ?? resolveRequest;
     if (!module.getDependencyByRequest(request)) {
-        const depModule = graph.getModuleByFile(resolveRequest)[0];
+        const depLayer = resolvedWebpackModule.layer || void 0;
+        const depModule = graph.getModuleByFile(resolveRequest, depLayer)[0];
         if (depModule) {
             const dep = module.addDependency(request, depModule, ModuleGraphTrans.getImportKind(webpackDep));
             if (dep) graph.addDependency(dep);

package/dist/inner-plugins/plugins/ensureModulesChunkGraph.cjs

@@ -78,7 +78,11 @@ async function doneHandler(_stats, _this, context, compiler) {
                 ids: true,
                 hash: true,
                 errors: true,
-                warnings: true
+                warnings: true,
+                nestedModules: true,
+                cachedModules: true,
+                orphanModules: true,
+                runtimeModules: true
             });
             return cached;
         };

package/dist/inner-plugins/plugins/ensureModulesChunkGraph.js

@@ -50,7 +50,11 @@ async function doneHandler(_stats, _this, context, compiler) {
                 ids: true,
                 hash: true,
                 errors: true,
-                warnings: true
+                warnings: true,
+                nestedModules: true,
+                cachedModules: true,
+                orphanModules: true,
+                runtimeModules: true
             });
             return cached;
         };

package/dist/inner-plugins/plugins/index.cjs

@@ -24,6 +24,9 @@ var __webpack_modules__ = {
     "./progress": function(module) {
         module.exports = require("./progress.cjs");
     },
+    "./resolver": function(module) {
+        module.exports = require("./resolver.cjs");
+    },
     "./rules?b94c": function(module) {
         module.exports = require("./rules.cjs");
     },
@@ -134,6 +137,12 @@ var __webpack_exports__ = {};
         return _bundleTagPlugin__WEBPACK_IMPORTED_MODULE_9__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _resolver__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("./resolver");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _resolver__WEBPACK_IMPORTED_MODULE_10__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _resolver__WEBPACK_IMPORTED_MODULE_10__[key];
+    }).bind(0, __WEBPACK_IMPORT_KEY__);
+    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 })();
 for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {

package/dist/inner-plugins/plugins/index.d.ts

@@ -8,3 +8,4 @@ export * from './bundle.js';
 export * from './ensureModulesChunkGraph.js';
 export * from './rules.js';
 export * from './bundleTagPlugin.js';
+export * from './resolver.js';

package/dist/inner-plugins/plugins/index.js

@@ -10,3 +10,4 @@ export * from "./bundle.js";
 export * from "./ensureModulesChunkGraph.js";
 export * from "./rules.js";
 export * from "./bundleTagPlugin.js";
+export * from "./resolver.js";

package/dist/inner-plugins/plugins/resolver.cjs

@@ -0,0 +1,90 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    InternalResolverPlugin: ()=>InternalResolverPlugin
+});
+const types_namespaceObject = require("@rsdoctor/types");
+const common_namespaceObject = require("@rsdoctor/utils/common");
+const external_base_cjs_namespaceObject = require("./base.cjs");
+class InternalResolverPlugin extends external_base_cjs_namespaceObject.InternalBasePlugin {
+    apply(compiler) {
+        this.scheduler.ensureModulesChunksGraphApplied(compiler);
+        compiler.hooks.normalModuleFactory.tap(this.tapPostOptions, this.handleNormalModuleFactory);
+        this.sdk.addClientRoutes([
+            types_namespaceObject.Manifest.RsdoctorManifestClientRoutes.ModuleResolve
+        ]);
+    }
+    constructor(...args){
+        super(...args), this.name = 'resolver', this.resolveDataMap = new Map(), this.handleNormalModuleFactory = (normalModuleFactory)=>{
+            normalModuleFactory.hooks.beforeResolve.tap(this.tapPostOptions, (resolveData)=>{
+                if (!resolveData) return;
+                const issuer = resolveData.contextInfo?.issuer || resolveData.context || '';
+                const request = resolveData.request;
+                if (issuer && request) {
+                    const key = `${issuer}::${request}`;
+                    this.resolveDataMap.set(key, {
+                        startAt: Date.now(),
+                        startHRTime: process.hrtime(),
+                        request
+                    });
+                }
+            });
+            normalModuleFactory.hooks.afterResolve.tap(this.tapPostOptions, (resolveData)=>{
+                if (!resolveData) return;
+                const issuer = resolveData.contextInfo?.issuer || resolveData.context || '';
+                const request = resolveData.request;
+                const result = resolveData.createData?.resource || resolveData.resourceResolveData?.path;
+                if (issuer && request) {
+                    const key = `${issuer}::${request}`;
+                    const startData = this.resolveDataMap.get(key);
+                    if (startData) {
+                        const data = {
+                            isEntry: Boolean(issuer),
+                            issuerPath: issuer,
+                            request: startData.request,
+                            startAt: startData.startAt,
+                            endAt: common_namespaceObject.Time.getCurrentTimestamp(startData.startAt, startData.startHRTime),
+                            result: result || '',
+                            pid: process.pid,
+                            ppid: process.ppid
+                        };
+                        this.sdk.reportResolver([
+                            data
+                        ]);
+                        this.resolveDataMap.delete(key);
+                    }
+                }
+            });
+        };
+    }
+}
+exports.InternalResolverPlugin = __webpack_exports__.InternalResolverPlugin;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "InternalResolverPlugin"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/inner-plugins/plugins/resolver.d.ts

@@ -0,0 +1,13 @@
+import { Plugin } from '@rsdoctor/types';
+import { InternalBasePlugin } from './base.js';
+import type { Compiler as WebpackCompiler } from 'webpack';
+export declare class InternalResolverPlugin<T extends Plugin.BaseCompiler> extends InternalBasePlugin<T> {
+    readonly name = "resolver";
+    protected resolveDataMap: Map<string, {
+        startAt: number;
+        startHRTime: [number, number];
+        request: string;
+    }>;
+    apply(compiler: T): void;
+    protected handleNormalModuleFactory: (normalModuleFactory: Plugin.RspackNormalModuleFactory | ReturnType<WebpackCompiler["createNormalModuleFactory"]>) => void;
+}

package/dist/inner-plugins/plugins/resolver.js

@@ -0,0 +1,58 @@
+import 'module';
+/*#__PURE__*/ import.meta.url;
+import { Manifest } from "@rsdoctor/types";
+import { Time } from "@rsdoctor/utils/common";
+import { InternalBasePlugin } from "./base.js";
+class InternalResolverPlugin extends InternalBasePlugin {
+    apply(compiler) {
+        this.scheduler.ensureModulesChunksGraphApplied(compiler);
+        compiler.hooks.normalModuleFactory.tap(this.tapPostOptions, this.handleNormalModuleFactory);
+        this.sdk.addClientRoutes([
+            Manifest.RsdoctorManifestClientRoutes.ModuleResolve
+        ]);
+    }
+    constructor(...args){
+        super(...args), this.name = 'resolver', this.resolveDataMap = new Map(), this.handleNormalModuleFactory = (normalModuleFactory)=>{
+            normalModuleFactory.hooks.beforeResolve.tap(this.tapPostOptions, (resolveData)=>{
+                if (!resolveData) return;
+                const issuer = resolveData.contextInfo?.issuer || resolveData.context || '';
+                const request = resolveData.request;
+                if (issuer && request) {
+                    const key = `${issuer}::${request}`;
+                    this.resolveDataMap.set(key, {
+                        startAt: Date.now(),
+                        startHRTime: process.hrtime(),
+                        request
+                    });
+                }
+            });
+            normalModuleFactory.hooks.afterResolve.tap(this.tapPostOptions, (resolveData)=>{
+                if (!resolveData) return;
+                const issuer = resolveData.contextInfo?.issuer || resolveData.context || '';
+                const request = resolveData.request;
+                const result = resolveData.createData?.resource || resolveData.resourceResolveData?.path;
+                if (issuer && request) {
+                    const key = `${issuer}::${request}`;
+                    const startData = this.resolveDataMap.get(key);
+                    if (startData) {
+                        const data = {
+                            isEntry: Boolean(issuer),
+                            issuerPath: issuer,
+                            request: startData.request,
+                            startAt: startData.startAt,
+                            endAt: Time.getCurrentTimestamp(startData.startAt, startData.startHRTime),
+                            result: result || '',
+                            pid: process.pid,
+                            ppid: process.ppid
+                        };
+                        this.sdk.reportResolver([
+                            data
+                        ]);
+                        this.resolveDataMap.delete(key);
+                    }
+                }
+            });
+        };
+    }
+}
+export { InternalResolverPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/core",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -69,14 +69,14 @@
     "fs-extra": "^11.1.1",
     "semver": "^7.7.3",
     "source-map": "^0.7.6",
-    "@rsdoctor/graph": "1.3.11",
-    "@rsdoctor/types": "1.3.11",
-    "@rsdoctor/utils": "1.3.11",
-    "@rsdoctor/sdk": "1.3.11"
+    "@rsdoctor/graph": "1.3.12",
+    "@rsdoctor/sdk": "1.3.12",
+    "@rsdoctor/types": "1.3.12",
+    "@rsdoctor/utils": "1.3.12"
   },
   "devDependencies": {
     "axios": "^1.12.2",
-    "@rspack/core": "1.6.3",
+    "@rspack/core": "1.6.5",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^22.8.1",
     "@types/node-fetch": "^2.6.13",