@rsdoctor/graph 1.5.2 → 1.5.3

package/dist/graph/module-graph/graph.d.ts

@@ -34,6 +34,7 @@ export declare class ModuleGraph implements SDK.ModuleGraphInstance {
     addLayer(layer: string): void;
     getLayers(): Map<string, number>;
     toData(configs?: SDK.ModuleGraphToDataArgs): SDK.ModuleGraphData;
+    toTreeShakingData(): SDK.TreeShakingData;
     toCodeData(type?: SDK.ToDataType): SDK.ModuleCodeData;
     setModules(modules: SDK.ModuleInstance[]): void;
     setDependencies(dependencies: SDK.DependencyInstance[]): void;

package/dist/graph/module-graph/index.d.ts

@@ -4,3 +4,4 @@ export * from './graph.js';
 export * from './statement.js';
 export * from './tree-shaking/index.js';
 export * from './types.js';
+export * from './utils.js';

package/dist/graph/module-graph/module.d.ts

@@ -10,6 +10,10 @@ export declare class Module implements SDK.ModuleInstance {
     id: number;
     renderId: string | undefined;
     bailoutReason: string[];
+    /** Side effect location data from the bundler */
+    sideEffectLocations: SDK.SideEffectLocationData[];
+    /** Side effect code snippets */
+    private sideEffectCodes;
     readonly webpackId: string;
     readonly path: string;
     readonly isEntry: boolean;
@@ -31,6 +35,10 @@ export declare class Module implements SDK.ModuleInstance {
     get isPreferSource(): boolean;
     addBailoutReason(reason: string): void;
     getBailoutReason(): string[];
+    addSideEffectLocation(location: SDK.SideEffectLocationData): void;
+    getSideEffectLocations(): SDK.SideEffectLocationData[];
+    addSideEffectCode(codeData: SDK.SideEffectCodeData): void;
+    getSideEffectCodes(): SDK.SideEffectCodeData[];
     getChunks(): SDK.ChunkInstance[];
     addChunk(chunk: SDK.ChunkInstance): void;
     removeChunk(chunk: SDK.ChunkInstance): void;

package/dist/graph/module-graph/utils.d.ts

@@ -2,3 +2,25 @@ import type { SDK } from '@rsdoctor/types';
 export declare function isSamePosition(po1: SDK.SourcePosition, po2: SDK.SourcePosition): boolean;
 export declare function isSameRange(po1: SDK.SourceRange, po2: SDK.SourceRange): boolean;
 export declare function getModuleName(name?: string): string;
+/**
+ * Parse location string from Rspack side effect location
+ * Supports formats:
+ * - "line:column" -> { startLine, startColumn }
+ * - "startLine:startColumn-endLine:endColumn" -> full range (e.g. 3:1-7:2)
+ * - "line:startColumn-endColumn" -> single-line range (e.g. 11:72-285)
+ * - "startLine-endLine:endColumn" -> start column omitted (e.g. 1-7:2)
+ * - "startLine-endLine" -> line range only
+ */
+export declare function parseLocation(location: string): {
+    startLine: number;
+    startColumn: number;
+    endLine?: number;
+    endColumn?: number;
+} | null;
+/**
+ * Extract code snippet from source based on location
+ * @param source The source code string
+ * @param location Parsed location object
+ * @returns Extracted code snippet
+ */
+export declare function extractCodeFromLocation(source: string, location: ReturnType<typeof parseLocation>): string;

package/dist/index.cjs

@@ -20,11 +20,14 @@ __webpack_require__.n = (module)=>{
 };
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__), __webpack_require__.d(__webpack_exports__, {
+    isSamePosition: ()=>isSamePosition,
     Dependency: ()=>Dependency,
     ModuleGraphTrans: ()=>transform_module_graph_namespaceObject,
     Asset: ()=>Asset,
+    isSameRange: ()=>isSameRange,
     ExportInfo: ()=>ExportInfo,
     ModuleGraphModule: ()=>ModuleGraphModule,
+    getModuleName: ()=>getModuleName,
     readPackageJson: ()=>readPackageJson,
     PackageDependency: ()=>PackageDependency,
     Statement: ()=>Statement,
@@ -36,6 +39,8 @@ __webpack_require__.r(__webpack_exports__), __webpack_require__.d(__webpack_expo
     TransUtils: ()=>trans_utils_namespaceObject,
     Webpack: ()=>webpack_compatible_namespaceObject,
     Chunks: ()=>chunks_namespaceObject,
+    parseLocation: ()=>parseLocation,
+    extractCodeFromLocation: ()=>extractCodeFromLocation,
     Variable: ()=>Variable,
     PackageGraph: ()=>PackageGraph,
     Chunk: ()=>Chunk,
@@ -361,6 +366,60 @@ function getModuleName(name) {
     }
     return NAME_WITH_MODULES.test(name) ? name.replace(NAME_WITH_MODULES, '') : INVALID_CSS_PREFIX.test(name) ? name.replace(INVALID_CSS_PREFIX, '') : name;
 }
+function parseLocation(location) {
+    if (!location || 'string' != typeof location) return null;
+    let s = location.trim();
+    if (!s) return null;
+    let fullRange = s.match(/^(\d+):(\d+)-(\d+):(\d+)$/);
+    if (fullRange) return {
+        startLine: parseInt(fullRange[1], 10),
+        startColumn: parseInt(fullRange[2], 10),
+        endLine: parseInt(fullRange[3], 10),
+        endColumn: parseInt(fullRange[4], 10)
+    };
+    let singleLineRange = s.match(/^(\d+):(\d+)-(\d+)$/);
+    if (singleLineRange) {
+        let startLine = parseInt(singleLineRange[1], 10);
+        return {
+            startLine,
+            startColumn: parseInt(singleLineRange[2], 10),
+            endLine: startLine,
+            endColumn: parseInt(singleLineRange[3], 10)
+        };
+    }
+    let endColOnly = s.match(/^(\d+)-(\d+):(\d+)$/);
+    if (endColOnly) return {
+        startLine: parseInt(endColOnly[1], 10),
+        startColumn: 0,
+        endLine: parseInt(endColOnly[2], 10),
+        endColumn: parseInt(endColOnly[3], 10)
+    };
+    let lineRange = s.match(/^(\d+)-(\d+)$/);
+    if (lineRange) return {
+        startLine: parseInt(lineRange[1], 10),
+        startColumn: 0,
+        endLine: parseInt(lineRange[2], 10)
+    };
+    let point = s.match(/^(\d+):(\d+)$/);
+    return point ? {
+        startLine: parseInt(point[1], 10),
+        startColumn: parseInt(point[2], 10)
+    } : null;
+}
+function extractCodeFromLocation(source, location) {
+    if (!source || !location) return '';
+    let lines = source.split('\n'), { startLine, startColumn: OriginalStartColumn, endLine, endColumn } = location, startColumn = OriginalStartColumn;
+    if (OriginalStartColumn && (startColumn = OriginalStartColumn - 1), !endLine || startLine === endLine) {
+        let line = lines[startLine - 1];
+        return line ? void 0 !== endColumn ? line.substring(startColumn, endColumn) : line.substring(startColumn) : '';
+    }
+    let result = [];
+    for(let i = startLine - 1; i < Math.min(endLine, lines.length); i++){
+        let line = lines[i];
+        i === startLine - 1 ? result.push(line.substring(startColumn)) : i === endLine - 1 ? result.push(void 0 !== endColumn ? line.substring(0, endColumn) : line) : result.push(line);
+    }
+    return result.join('\n');
+}
 class Statement {
     static getDefaultStatement(module) {
         let defaultPosition = {
@@ -416,7 +475,7 @@ class Module {
         module_id = 1;
     }
     constructor(webpackId, path, isEntry = !1, kind = types_namespaceObject.SDK.ModuleKind.Normal, renderId, layer = ''){
-        this.issuerPath = [], this.bailoutReason = [], this.source = {
+        this.issuerPath = [], this.bailoutReason = [], this.sideEffectLocations = [], this.sideEffectCodes = [], this.source = {
             source: '',
             transformed: '',
             parsedSource: ''
@@ -444,6 +503,18 @@ class Module {
     getBailoutReason() {
         return this.bailoutReason;
     }
+    addSideEffectLocation(location) {
+        this.sideEffectLocations.push(location);
+    }
+    getSideEffectLocations() {
+        return this.sideEffectLocations.slice();
+    }
+    addSideEffectCode(codeData) {
+        this.sideEffectCodes.push(codeData);
+    }
+    getSideEffectCodes() {
+        return this.sideEffectCodes.slice();
+    }
     getChunks() {
         return this.chunks.slice();
     }
@@ -608,7 +679,10 @@ class Module {
                 layer: this.layer
             } : {},
             issuerPath: isBrief ? void 0 : this.issuerPath?.filter((issuer)=>issuer.moduleId).map((issuer)=>issuer.moduleId) || [],
-            bailoutReason: this.bailoutReason
+            bailoutReason: this.bailoutReason,
+            ...this.sideEffectLocations.length > 0 ? {
+                sideEffectLocations: this.sideEffectLocations
+            } : {}
         };
         return (this.meta.hasSetEsModuleStatement || this.meta.strictHarmonyModule) && (data.meta = {}, this.meta.hasSetEsModuleStatement && (data.meta.hasSetEsModuleStatement = !0), this.meta.strictHarmonyModule && (data.meta.strictHarmonyModule = !0)), this.isEntry && (data.isEntry = this.isEntry), this.modules.length > 0 && (data.modules = this.modules.map((item)=>item.id)), this.rootModule && (data.rootModule = this.rootModule.id), this.concatenationModules.length > 0 && (data.concatenationModules = this.concatenationModules.map((data)=>data.id)), data;
     }
@@ -978,6 +1052,16 @@ class ModuleGraph {
             layers: Array.from(this._layers.keys())
         };
     }
+    toTreeShakingData() {
+        let sideEffectCodes = {};
+        for (let module of this.getModules()){
+            let codes = module.getSideEffectCodes();
+            codes.length > 0 && (sideEffectCodes[codes[0].moduleId] = codes);
+        }
+        return {
+            sideEffectCodes
+        };
+    }
     toCodeData(type = types_namespaceObject.SDK.ToDataType.Normal) {
         let codeMap = {};
         return this.getModules().forEach((item)=>{
@@ -1523,7 +1607,7 @@ function getAllModules(compilation) {
     for (let mod of compilation.modules)modules.push(...mod.modules ?? []), modules.push(mod);
     return (0, compat_namespaceObject.unionBy)(modules.filter((mod)=>!getWebpackModuleId(mod).startsWith('webpack/runtime')), (mod)=>getWebpackModuleId(mod));
 }
-for(var __rspack_i in exports.Asset = __webpack_exports__.Asset, exports.Chunk = __webpack_exports__.Chunk, exports.ChunkGraph = __webpack_exports__.ChunkGraph, exports.Chunks = __webpack_exports__.Chunks, exports.Dependency = __webpack_exports__.Dependency, exports.EntryPoint = __webpack_exports__.EntryPoint, exports.ExportInfo = __webpack_exports__.ExportInfo, exports.Module = __webpack_exports__.Module, exports.ModuleGraph = __webpack_exports__.ModuleGraph, exports.ModuleGraphModule = __webpack_exports__.ModuleGraphModule, exports.ModuleGraphTrans = __webpack_exports__.ModuleGraphTrans, exports.Package = __webpack_exports__.Package, exports.PackageDependency = __webpack_exports__.PackageDependency, exports.PackageGraph = __webpack_exports__.PackageGraph, exports.SideEffect = __webpack_exports__.SideEffect, exports.Statement = __webpack_exports__.Statement, exports.TransUtils = __webpack_exports__.TransUtils, exports.Variable = __webpack_exports__.Variable, exports.Webpack = __webpack_exports__.Webpack, exports.readPackageJson = __webpack_exports__.readPackageJson, __webpack_exports__)-1 === [
+for(var __rspack_i in exports.Asset = __webpack_exports__.Asset, exports.Chunk = __webpack_exports__.Chunk, exports.ChunkGraph = __webpack_exports__.ChunkGraph, exports.Chunks = __webpack_exports__.Chunks, exports.Dependency = __webpack_exports__.Dependency, exports.EntryPoint = __webpack_exports__.EntryPoint, exports.ExportInfo = __webpack_exports__.ExportInfo, exports.Module = __webpack_exports__.Module, exports.ModuleGraph = __webpack_exports__.ModuleGraph, exports.ModuleGraphModule = __webpack_exports__.ModuleGraphModule, exports.ModuleGraphTrans = __webpack_exports__.ModuleGraphTrans, exports.Package = __webpack_exports__.Package, exports.PackageDependency = __webpack_exports__.PackageDependency, exports.PackageGraph = __webpack_exports__.PackageGraph, exports.SideEffect = __webpack_exports__.SideEffect, exports.Statement = __webpack_exports__.Statement, exports.TransUtils = __webpack_exports__.TransUtils, exports.Variable = __webpack_exports__.Variable, exports.Webpack = __webpack_exports__.Webpack, exports.extractCodeFromLocation = __webpack_exports__.extractCodeFromLocation, exports.getModuleName = __webpack_exports__.getModuleName, exports.isSamePosition = __webpack_exports__.isSamePosition, exports.isSameRange = __webpack_exports__.isSameRange, exports.parseLocation = __webpack_exports__.parseLocation, exports.readPackageJson = __webpack_exports__.readPackageJson, __webpack_exports__)-1 === [
     "Asset",
     "Chunk",
     "ChunkGraph",
@@ -1543,6 +1627,11 @@ for(var __rspack_i in exports.Asset = __webpack_exports__.Asset, exports.Chunk =
     "TransUtils",
     "Variable",
     "Webpack",
+    "extractCodeFromLocation",
+    "getModuleName",
+    "isSamePosition",
+    "isSameRange",
+    "parseLocation",
     "readPackageJson"
 ].indexOf(__rspack_i) && (exports[__rspack_i] = __webpack_exports__[__rspack_i]);
 Object.defineProperty(exports, '__esModule', {

package/dist/index.js

@@ -322,7 +322,72 @@ class Dependency {
 function isSamePosition(po1, po2) {
     return po1.line === po2.line && po1.column === po2.column;
 }
+function isSameRange(po1, po2) {
+    return !!isSamePosition(po1.start, po2.start) && (Lodash.isNil(po1.end) || Lodash.isNil(po2.end) ? Lodash.isUndefined(po1.end) && Lodash.isUndefined(po2.end) : isSamePosition(po1.end, po2.end));
+}
 let NAME_WITH_LOADERS = /!/, NAME_WITH_MODULES = /\s\+\s\d*\smodules$/, INVALID_CSS_PREFIX = /^css\s.*node_modules(?!\/)/;
+function getModuleName(name) {
+    if (!name) return '';
+    if (NAME_WITH_LOADERS.test(name)) {
+        let normalizedName = Lodash.last(name.split(NAME_WITH_LOADERS));
+        if (normalizedName?.trim()) return normalizedName;
+    }
+    return NAME_WITH_MODULES.test(name) ? name.replace(NAME_WITH_MODULES, '') : INVALID_CSS_PREFIX.test(name) ? name.replace(INVALID_CSS_PREFIX, '') : name;
+}
+function parseLocation(location) {
+    if (!location || 'string' != typeof location) return null;
+    let s = location.trim();
+    if (!s) return null;
+    let fullRange = s.match(/^(\d+):(\d+)-(\d+):(\d+)$/);
+    if (fullRange) return {
+        startLine: parseInt(fullRange[1], 10),
+        startColumn: parseInt(fullRange[2], 10),
+        endLine: parseInt(fullRange[3], 10),
+        endColumn: parseInt(fullRange[4], 10)
+    };
+    let singleLineRange = s.match(/^(\d+):(\d+)-(\d+)$/);
+    if (singleLineRange) {
+        let startLine = parseInt(singleLineRange[1], 10);
+        return {
+            startLine,
+            startColumn: parseInt(singleLineRange[2], 10),
+            endLine: startLine,
+            endColumn: parseInt(singleLineRange[3], 10)
+        };
+    }
+    let endColOnly = s.match(/^(\d+)-(\d+):(\d+)$/);
+    if (endColOnly) return {
+        startLine: parseInt(endColOnly[1], 10),
+        startColumn: 0,
+        endLine: parseInt(endColOnly[2], 10),
+        endColumn: parseInt(endColOnly[3], 10)
+    };
+    let lineRange = s.match(/^(\d+)-(\d+)$/);
+    if (lineRange) return {
+        startLine: parseInt(lineRange[1], 10),
+        startColumn: 0,
+        endLine: parseInt(lineRange[2], 10)
+    };
+    let point = s.match(/^(\d+):(\d+)$/);
+    return point ? {
+        startLine: parseInt(point[1], 10),
+        startColumn: parseInt(point[2], 10)
+    } : null;
+}
+function extractCodeFromLocation(source, location) {
+    if (!source || !location) return '';
+    let lines = source.split('\n'), { startLine, startColumn: OriginalStartColumn, endLine, endColumn } = location, startColumn = OriginalStartColumn;
+    if (OriginalStartColumn && (startColumn = OriginalStartColumn - 1), !endLine || startLine === endLine) {
+        let line = lines[startLine - 1];
+        return line ? void 0 !== endColumn ? line.substring(startColumn, endColumn) : line.substring(startColumn) : '';
+    }
+    let result = [];
+    for(let i = startLine - 1; i < Math.min(endLine, lines.length); i++){
+        let line = lines[i];
+        i === startLine - 1 ? result.push(line.substring(startColumn)) : i === endLine - 1 ? result.push(void 0 !== endColumn ? line.substring(0, endColumn) : line) : result.push(line);
+    }
+    return result.join('\n');
+}
 class Statement {
     static getDefaultStatement(module) {
         let defaultPosition = {
@@ -349,8 +414,7 @@ class Statement {
         this.module = module, this.position = position;
     }
     isSame(statement) {
-        var po1, po2;
-        return this.module.id === statement.module.id && (po1 = this.position.transformed, po2 = statement.position.transformed, !!isSamePosition(po1.start, po2.start) && (Lodash.isNil(po1.end) || Lodash.isNil(po2.end) ? Lodash.isUndefined(po1.end) && Lodash.isUndefined(po2.end) : isSamePosition(po1.end, po2.end)));
+        return this.module.id === statement.module.id && isSameRange(this.position.transformed, statement.position.transformed);
     }
     getSourcePosition() {
         let { module, position } = this;
@@ -379,7 +443,7 @@ class Module {
         module_id = 1;
     }
     constructor(webpackId, path, isEntry = !1, kind = SDK.ModuleKind.Normal, renderId, layer = ''){
-        this.issuerPath = [], this.bailoutReason = [], this.source = {
+        this.issuerPath = [], this.bailoutReason = [], this.sideEffectLocations = [], this.sideEffectCodes = [], this.source = {
             source: '',
             transformed: '',
             parsedSource: ''
@@ -407,6 +471,18 @@ class Module {
     getBailoutReason() {
         return this.bailoutReason;
     }
+    addSideEffectLocation(location) {
+        this.sideEffectLocations.push(location);
+    }
+    getSideEffectLocations() {
+        return this.sideEffectLocations.slice();
+    }
+    addSideEffectCode(codeData) {
+        this.sideEffectCodes.push(codeData);
+    }
+    getSideEffectCodes() {
+        return this.sideEffectCodes.slice();
+    }
     getChunks() {
         return this.chunks.slice();
     }
@@ -556,14 +632,7 @@ class Module {
         return this.concatenationModules.slice();
     }
     toData(contextPath, isBrief) {
-        let { isPreferSource } = this, moduleName = function(name) {
-            if (!name) return '';
-            if (NAME_WITH_LOADERS.test(name)) {
-                let normalizedName = Lodash.last(name.split(NAME_WITH_LOADERS));
-                if (normalizedName?.trim()) return normalizedName;
-            }
-            return NAME_WITH_MODULES.test(name) ? name.replace(NAME_WITH_MODULES, '') : INVALID_CSS_PREFIX.test(name) ? name.replace(INVALID_CSS_PREFIX, '') : name;
-        }(this.webpackId), data = {
+        let { isPreferSource } = this, moduleName = getModuleName(this.webpackId), data = {
             id: this.id,
             renderId: this.renderId,
             webpackId: contextPath && moduleName.indexOf('.') > 0 ? path_0.relative(contextPath, moduleName) : this.webpackId,
@@ -578,7 +647,10 @@ class Module {
                 layer: this.layer
             } : {},
             issuerPath: isBrief ? void 0 : this.issuerPath?.filter((issuer)=>issuer.moduleId).map((issuer)=>issuer.moduleId) || [],
-            bailoutReason: this.bailoutReason
+            bailoutReason: this.bailoutReason,
+            ...this.sideEffectLocations.length > 0 ? {
+                sideEffectLocations: this.sideEffectLocations
+            } : {}
         };
         return (this.meta.hasSetEsModuleStatement || this.meta.strictHarmonyModule) && (data.meta = {}, this.meta.hasSetEsModuleStatement && (data.meta.hasSetEsModuleStatement = !0), this.meta.strictHarmonyModule && (data.meta.strictHarmonyModule = !0)), this.isEntry && (data.isEntry = this.isEntry), this.modules.length > 0 && (data.modules = this.modules.map((item)=>item.id)), this.rootModule && (data.rootModule = this.rootModule.id), this.concatenationModules.length > 0 && (data.concatenationModules = this.concatenationModules.map((data)=>data.id)), data;
     }
@@ -948,6 +1020,16 @@ class ModuleGraph {
             layers: Array.from(this._layers.keys())
         };
     }
+    toTreeShakingData() {
+        let sideEffectCodes = {};
+        for (let module of this.getModules()){
+            let codes = module.getSideEffectCodes();
+            codes.length > 0 && (sideEffectCodes[codes[0].moduleId] = codes);
+        }
+        return {
+            sideEffectCodes
+        };
+    }
     toCodeData(type = SDK.ToDataType.Normal) {
         let codeMap = {};
         return this.getModules().forEach((item)=>{
@@ -1481,4 +1563,4 @@ function getAllModules(compilation) {
     for (let mod of compilation.modules)modules.push(...mod.modules ?? []), modules.push(mod);
     return unionBy(modules.filter((mod)=>!getWebpackModuleId(mod).startsWith('webpack/runtime')), (mod)=>getWebpackModuleId(mod));
 }
-export { Asset, Chunk, ChunkGraph, chunks_namespaceObject as Chunks, Dependency, EntryPoint, ExportInfo, Module, ModuleGraph, ModuleGraphModule, transform_module_graph_namespaceObject as ModuleGraphTrans, package_Package as Package, PackageDependency, PackageGraph, SideEffect, Statement, trans_utils_namespaceObject as TransUtils, Variable, webpack_compatible_namespaceObject as Webpack, readPackageJson };
+export { Asset, Chunk, ChunkGraph, chunks_namespaceObject as Chunks, Dependency, EntryPoint, ExportInfo, Module, ModuleGraph, ModuleGraphModule, transform_module_graph_namespaceObject as ModuleGraphTrans, package_Package as Package, PackageDependency, PackageGraph, SideEffect, Statement, trans_utils_namespaceObject as TransUtils, Variable, webpack_compatible_namespaceObject as Webpack, extractCodeFromLocation, getModuleName, isSamePosition, isSameRange, parseLocation, readPackageJson };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/graph",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -22,11 +22,11 @@
   },
   "type": "module",
   "dependencies": {
-    "es-toolkit": "^1.43.0",
+    "es-toolkit": "^1.44.0",
     "path-browserify": "1.0.1",
     "source-map": "^0.7.6",
-    "@rsdoctor/types": "1.5.2",
-    "@rsdoctor/utils": "1.5.2"
+    "@rsdoctor/types": "1.5.3",
+    "@rsdoctor/utils": "1.5.3"
   },
   "devDependencies": {
     "@types/body-parser": "1.19.6",
@@ -36,7 +36,7 @@
     "fs-extra": "^11.1.1",
     "tslib": "2.8.1",
     "typescript": "^5.9.2",
-    "webpack": "^5.97.1"
+    "webpack": "^5.105.3"
   },
   "publishConfig": {
     "access": "public",