@rsdoctor/graph 1.5.11 → 2.0.0-alpha.0

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

@@ -4,7 +4,7 @@ export declare class ModuleGraph implements SDK.ModuleGraphInstance {
     static fromData(data: Partial<SDK.ModuleGraphData>): ModuleGraph;
     private _dependenciesIdMap;
     private _connectionsOnlyImports;
-    private _moduleWebpackIdMap;
+    private _moduleIdentifierMap;
     private _moduleIdMap;
     private _moduleGraphModules;
     private _exportIdMap;
@@ -20,7 +20,7 @@ export declare class ModuleGraph implements SDK.ModuleGraphInstance {
     getEntryModules(): SDK.ModuleInstance[];
     getModuleById(id: number): SDK.ModuleInstance | undefined;
     getDependencyById(id: number): SDK.DependencyInstance | undefined;
-    getModuleByWebpackId(id: string): SDK.ModuleInstance | undefined;
+    getModuleByIdentifier(id: string): SDK.ModuleInstance | undefined;
     getModuleByFile(file: string, layer?: string): SDK.ModuleInstance[];
     addModule(...modules: SDK.ModuleInstance[]): void;
     addDependency(...deps: SDK.DependencyInstance[]): void;

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

@@ -4,7 +4,7 @@ export declare class ModuleGraph implements SDK.ModuleGraphInstance {
     static fromData(data: Partial<SDK.ModuleGraphData>): ModuleGraph;
     private _dependenciesIdMap;
     private _connectionsOnlyImports;
-    private _moduleWebpackIdMap;
+    private _moduleIdentifierMap;
     private _moduleIdMap;
     private _moduleGraphModules;
     private _exportIdMap;
@@ -20,7 +20,7 @@ export declare class ModuleGraph implements SDK.ModuleGraphInstance {
     getEntryModules(): SDK.ModuleInstance[];
     getModuleById(id: number): SDK.ModuleInstance | undefined;
     getDependencyById(id: number): SDK.DependencyInstance | undefined;
-    getModuleByWebpackId(id: string): SDK.ModuleInstance | undefined;
+    getModuleByIdentifier(id: string): SDK.ModuleInstance | undefined;
     getModuleByFile(file: string, layer?: string): SDK.ModuleInstance[];
     addModule(...modules: SDK.ModuleInstance[]): void;
     addDependency(...deps: SDK.DependencyInstance[]): void;

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

@@ -14,7 +14,7 @@ export declare class Module implements SDK.ModuleInstance {
     sideEffectLocations: SDK.SideEffectLocationData[];
     /** Side effect code snippets */
     private sideEffectCodes;
-    readonly webpackId: string;
+    readonly identifier: string;
     readonly path: string;
     readonly isEntry: boolean;
     readonly kind: SDK.ModuleKind;
@@ -30,7 +30,7 @@ export declare class Module implements SDK.ModuleInstance {
     private concatenationModules;
     private _isPreferSource?;
     meta: SDK.ModuleBuildMeta;
-    constructor(webpackId: string, path: string, isEntry?: boolean, kind?: SDK.ModuleKind, renderId?: string | undefined, layer?: string);
+    constructor(identifier: string, path: string, isEntry?: boolean, kind?: SDK.ModuleKind, renderId?: string | undefined, layer?: string);
     get rootModule(): SDK.ModuleInstance | undefined;
     get isPreferSource(): boolean;
     addBailoutReason(reason: string): void;

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

@@ -14,7 +14,7 @@ export declare class Module implements SDK.ModuleInstance {
     sideEffectLocations: SDK.SideEffectLocationData[];
     /** Side effect code snippets */
     private sideEffectCodes;
-    readonly webpackId: string;
+    readonly identifier: string;
     readonly path: string;
     readonly isEntry: boolean;
     readonly kind: SDK.ModuleKind;
@@ -30,7 +30,7 @@ export declare class Module implements SDK.ModuleInstance {
     private concatenationModules;
     private _isPreferSource?;
     meta: SDK.ModuleBuildMeta;
-    constructor(webpackId: string, path: string, isEntry?: boolean, kind?: SDK.ModuleKind, renderId?: string | undefined, layer?: string);
+    constructor(identifier: string, path: string, isEntry?: boolean, kind?: SDK.ModuleKind, renderId?: string | undefined, layer?: string);
     get rootModule(): SDK.ModuleInstance | undefined;
     get isPreferSource(): boolean;
     addBailoutReason(reason: string): void;

package/dist/index.cjs

@@ -477,7 +477,7 @@ class Module {
     static init() {
         module_id = 1;
     }
-    constructor(webpackId, path, isEntry = !1, kind = types_namespaceObject.SDK.ModuleKind.Normal, renderId, layer = ''){
+    constructor(identifier, path, isEntry = !1, kind = types_namespaceObject.SDK.ModuleKind.Normal, renderId, layer = ''){
         this.issuerPath = [], this.bailoutReason = [], this.sideEffectLocations = [], this.sideEffectCodes = [], this.source = {
             source: '',
             transformed: '',
@@ -490,7 +490,7 @@ class Module {
         }, this.chunks = [], this.dependencies = [], this.imported = [], this.modules = [], this.concatenationModules = [], this.meta = {
             hasSetEsModuleStatement: !1,
             strictHarmonyModule: !1
-        }, this.id = module_id++, this.webpackId = webpackId, this.path = path, this.isEntry = isEntry, this.kind = kind, this.renderId = renderId, this.layer = layer;
+        }, this.id = module_id++, this.identifier = identifier, this.path = path, this.isEntry = isEntry, this.kind = kind, this.renderId = renderId, this.layer = layer;
     }
     get rootModule() {
         return this.modules.find((item)=>item.path === this.path);
@@ -667,10 +667,10 @@ class Module {
         return this.concatenationModules.slice();
     }
     toData(contextPath, isBrief) {
-        let { isPreferSource } = this, moduleName = getModuleName(this.webpackId), data = {
+        let { isPreferSource } = this, moduleName = getModuleName(this.identifier), data = {
             id: this.id,
             renderId: this.renderId,
-            webpackId: contextPath && moduleName.indexOf('.') > 0 ? external_path_default().relative(contextPath, moduleName) : this.webpackId,
+            identifier: contextPath && moduleName.indexOf('.') > 0 ? external_path_default().relative(contextPath, moduleName) : this.identifier,
             path: this.path,
             isPreferSource,
             dependencies: this.dependencies.map((item)=>item.id),
@@ -969,7 +969,7 @@ class ModuleGraph {
         return ModuleGraph.init(), moduleGraph;
     }
     clear() {
-        this._dependenciesIdMap = new Map(), this._moduleWebpackIdMap = new Map(), this._moduleIdMap = new Map(), this._moduleGraphModules = new Map(), this._exportIdMap = new Map(), this._sideEffectIdMap = new Map(), this._varIdMap = new Map(), this._layers = new Map();
+        this._dependenciesIdMap = new Map(), this._moduleIdentifierMap = new Map(), this._moduleIdMap = new Map(), this._moduleGraphModules = new Map(), this._exportIdMap = new Map(), this._sideEffectIdMap = new Map(), this._varIdMap = new Map(), this._layers = new Map();
     }
     size() {
         return this._moduleIdMap.size;
@@ -986,7 +986,7 @@ class ModuleGraph {
         return result;
     }
     getModules() {
-        return Array.from(this._moduleWebpackIdMap.values());
+        return Array.from(this._moduleIdentifierMap.values());
     }
     getDependencies() {
         return Array.from(this._dependenciesIdMap.values());
@@ -1000,20 +1000,20 @@ class ModuleGraph {
     getDependencyById(id) {
         return this._dependenciesIdMap.get(id);
     }
-    getModuleByWebpackId(id) {
-        return this._moduleWebpackIdMap.get(id);
+    getModuleByIdentifier(id) {
+        return this._moduleIdentifierMap.get(id);
     }
     getModuleByFile(file, layer) {
         return this.getModules().filter((item)=>item.path === file && (void 0 === layer || item.layer === layer));
     }
     addModule(...modules) {
-        for (let module of modules)!this._moduleIdMap.has(module.id) && (this._moduleWebpackIdMap.set(module.webpackId, module), this._moduleIdMap.set(module.id, module), module.layer && this.addLayer(module.layer));
+        for (let module of modules)!this._moduleIdMap.has(module.id) && (this._moduleIdentifierMap.set(module.identifier, module), this._moduleIdMap.set(module.id, module), module.layer && this.addLayer(module.layer));
     }
     addDependency(...deps) {
         for (let dep of deps)this._dependenciesIdMap.has(dep.id) || (this._dependenciesIdMap.set(dep.id, dep), this.addModule(dep.module), this.addModule(dep.dependency));
     }
     removeModule(module) {
-        for (let dep of (this._moduleIdMap.delete(module.id), this._moduleWebpackIdMap.delete(module.webpackId), module.getDependencies()))this.removeDependency(dep), this._dependenciesIdMap.delete(dep.id);
+        for (let dep of (this._moduleIdMap.delete(module.id), this._moduleIdentifierMap.delete(module.identifier), module.getDependencies()))this.removeDependency(dep), this._dependenciesIdMap.delete(dep.id);
         for (let imported of module.getImported())imported.removeDependencyByModule(imported);
     }
     removeDependency(dep) {
@@ -1075,8 +1075,8 @@ class ModuleGraph {
         this._moduleIdMap = new Map(modules.map((m)=>[
                 m.id,
                 m
-            ])), this._moduleWebpackIdMap = new Map(modules.map((m)=>[
-                m.webpackId,
+            ])), this._moduleIdentifierMap = new Map(modules.map((m)=>[
+                m.identifier,
                 m
             ])), this._layers = new Map(modules.filter((m)=>m.layer).map((m)=>[
                 m.layer,
@@ -1096,7 +1096,7 @@ class ModuleGraph {
         return this._connectionsOnlyImports;
     }
     constructor(){
-        this._dependenciesIdMap = new Map(), this._connectionsOnlyImports = [], this._moduleWebpackIdMap = new Map(), this._moduleIdMap = new Map(), this._moduleGraphModules = new Map(), this._exportIdMap = new Map(), this._sideEffectIdMap = new Map(), this._varIdMap = new Map(), this._layers = new Map();
+        this._dependenciesIdMap = new Map(), this._connectionsOnlyImports = [], this._moduleIdentifierMap = new Map(), this._moduleIdMap = new Map(), this._moduleGraphModules = new Map(), this._exportIdMap = new Map(), this._sideEffectIdMap = new Map(), this._varIdMap = new Map(), this._layers = new Map();
     }
 }
 let package_graph_dependency_id = 1;
@@ -1338,7 +1338,7 @@ async function getAssetsModulesData(moduleGraph, chunkGraph, bundleDir, opts, so
 }
 function transformAssetsModulesData(parsedModulesData, moduleGraph) {
     moduleGraph && Object.entries(parsedModulesData).forEach(([moduleId, parsedData])=>{
-        let gzipSize, module = moduleGraph.getModuleByWebpackId(moduleId ?? '');
+        let gzipSize, module = moduleGraph.getModuleByIdentifier(moduleId ?? '');
         try {
             parsedData?.content && 'string' == typeof parsedData.content && parsedData.content.length > 0 && (gzipSize = (0, external_node_zlib_namespaceObject.gzipSync)(parsedData.content, {
                 level: 9
@@ -1464,7 +1464,7 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
     ModuleGraph.init();
     let moduleGraph = new ModuleGraph(), allModules = [], collectedModules = [];
     for (let data of (getModulesFromArray(modules ?? [], collectedModules), getModulesFromChunks(chunks ?? [], collectedModules), collectedModules ?? [])){
-        if (getCanSkip(data) || moduleGraph.getModuleByWebpackId(data.identifier)) continue;
+        if (getCanSkip(data) || moduleGraph.getModuleByIdentifier(data.identifier)) continue;
         allModules.push(data);
         let isConcatenated = !!(data.modules && data.modules.length > 0), concatenatedModule = new Module(data.identifier ?? data.moduleIdentifier, getGetModuleName(root, data), 0 === data.depth, isConcatenated ? types_namespaceObject.SDK.ModuleKind.Concatenation : types_namespaceObject.SDK.ModuleKind.Normal, data.id ? String(data.id) : void 0, data.layer);
         if (data.optimizationBailout && data.optimizationBailout.forEach((reason)=>concatenatedModule.addBailoutReason(reason)), data.issuerPath && concatenatedModule.addIssuerPath(data.issuerPath), data.chunks?.forEach((_chunkId)=>{
@@ -1487,8 +1487,8 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
             let normalModule;
             if (getCanSkip(normal)) continue;
             allModules.push(normal);
-            let webpackId = normal.identifier, registeredModule = moduleGraph.getModuleByWebpackId(webpackId);
-            if (normalModule = registeredModule || (moduleGraph.getModuleByWebpackId(webpackId) ?? new Module(webpackId, getGetModuleName(root, normal), 0 === normal.depth, types_namespaceObject.SDK.ModuleKind.Normal, normal.id ? String(normal.id) : void 0, normal.layer)), normal.optimizationBailout && normal.optimizationBailout.filter((reason)=>!reason.includes('ModuleConcatenation bailout')).forEach((reason)=>normalModule.addBailoutReason(reason)), normal.issuerPath && normalModule.addIssuerPath(normal.issuerPath), normal.chunks?.length ? normal.chunks?.forEach((_chunkId)=>{
+            let identifier = normal.identifier, registeredModule = moduleGraph.getModuleByIdentifier(identifier);
+            if (normalModule = registeredModule || (moduleGraph.getModuleByIdentifier(identifier) ?? new Module(identifier, getGetModuleName(root, normal), 0 === normal.depth, types_namespaceObject.SDK.ModuleKind.Normal, normal.id ? String(normal.id) : void 0, normal.layer)), normal.optimizationBailout && normal.optimizationBailout.filter((reason)=>!reason.includes('ModuleConcatenation bailout')).forEach((reason)=>normalModule.addBailoutReason(reason)), normal.issuerPath && normalModule.addIssuerPath(normal.issuerPath), normal.chunks?.length ? normal.chunks?.forEach((_chunkId)=>{
                 let chunk = chunkGraph.getChunkById(String(_chunkId));
                 chunk && normalModule.addChunk(chunk);
             }) : data.chunks?.forEach((_chunkId)=>{
@@ -1511,7 +1511,7 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
         }
     }
     for (let module of allModules){
-        let currentModule = moduleGraph.getModuleByWebpackId(module.identifier ?? '');
+        let currentModule = moduleGraph.getModuleByIdentifier(module.identifier ?? '');
         if (!currentModule) continue;
         let dependencies = (module.reasons ?? []).filter(isImportDependency).filter((item)=>!!(item.moduleIdentifier && item.userRequest));
         for (let dep of ((module.reasons ?? []).filter((item)=>'from origin' === item.type).forEach((dep)=>dep?.children?.forEach((_d)=>dependencies.push({
@@ -1519,7 +1519,7 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
                     ..._d,
                     children: void 0
                 }))), dependencies)){
-            let rawRequest = dep.userRequest, requestModule = moduleGraph.getModuleByWebpackId(dep.moduleIdentifier);
+            let rawRequest = dep.userRequest, requestModule = moduleGraph.getModuleByIdentifier(dep.moduleIdentifier);
             if (!requestModule) continue;
             if (!requestModule.getDependencyByRequest(rawRequest)) {
                 let data = requestModule.addDependency(rawRequest, currentModule, getImportKind(dep));
@@ -1538,7 +1538,7 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
     return moduleGraph.getModules().forEach((module)=>{
         module.issuerPath && module.issuerPath.forEach((issuer)=>{
             let moduleInstance = moduleCache.get(issuer.identifier);
-            !moduleInstance && (moduleInstance = moduleGraph.getModuleByWebpackId(issuer.identifier)) && moduleCache.set(issuer.identifier, moduleInstance), moduleInstance && (issuer.moduleId = moduleInstance.id);
+            !moduleInstance && (moduleInstance = moduleGraph.getModuleByIdentifier(issuer.identifier)) && moduleCache.set(issuer.identifier, moduleInstance), moduleInstance && (issuer.moduleId = moduleInstance.id);
         });
     }), moduleGraph;
 }
@@ -1604,7 +1604,7 @@ function getExportStatement(info, normalModule, graph) {
     if (!webpackDependency) return;
     let modulePath = getWebpackModulePath(normalModule), request = getWebpackDependencyRequest(webpackDependency), sdkDependency = graph.getDependencies().find((item)=>item.module.path === modulePath && item.request === request);
     if (sdkDependency && 1 === sdkDependency.statements.length) return sdkDependency.statements[0];
-    let sdkModule = graph.getModuleByWebpackId(getWebpackModuleId(normalModule));
+    let sdkModule = graph.getModuleByIdentifier(getWebpackModuleId(normalModule));
     if (sdkModule) return getDependencyPosition(webpackDependency, sdkModule);
 }
 function getLastExportInfo(info, webpackGraph) {

package/dist/index.js

@@ -445,7 +445,7 @@ class Module {
     static init() {
         module_id = 1;
     }
-    constructor(webpackId, path, isEntry = !1, kind = SDK.ModuleKind.Normal, renderId, layer = ''){
+    constructor(identifier, path, isEntry = !1, kind = SDK.ModuleKind.Normal, renderId, layer = ''){
         this.issuerPath = [], this.bailoutReason = [], this.sideEffectLocations = [], this.sideEffectCodes = [], this.source = {
             source: '',
             transformed: '',
@@ -458,7 +458,7 @@ class Module {
         }, this.chunks = [], this.dependencies = [], this.imported = [], this.modules = [], this.concatenationModules = [], this.meta = {
             hasSetEsModuleStatement: !1,
             strictHarmonyModule: !1
-        }, this.id = module_id++, this.webpackId = webpackId, this.path = path, this.isEntry = isEntry, this.kind = kind, this.renderId = renderId, this.layer = layer;
+        }, this.id = module_id++, this.identifier = identifier, this.path = path, this.isEntry = isEntry, this.kind = kind, this.renderId = renderId, this.layer = layer;
     }
     get rootModule() {
         return this.modules.find((item)=>item.path === this.path);
@@ -635,10 +635,10 @@ class Module {
         return this.concatenationModules.slice();
     }
     toData(contextPath, isBrief) {
-        let { isPreferSource } = this, moduleName = getModuleName(this.webpackId), data = {
+        let { isPreferSource } = this, moduleName = getModuleName(this.identifier), data = {
             id: this.id,
             renderId: this.renderId,
-            webpackId: contextPath && moduleName.indexOf('.') > 0 ? path_0.relative(contextPath, moduleName) : this.webpackId,
+            identifier: contextPath && moduleName.indexOf('.') > 0 ? path_0.relative(contextPath, moduleName) : this.identifier,
             path: this.path,
             isPreferSource,
             dependencies: this.dependencies.map((item)=>item.id),
@@ -937,7 +937,7 @@ class ModuleGraph {
         return ModuleGraph.init(), moduleGraph;
     }
     clear() {
-        this._dependenciesIdMap = new Map(), this._moduleWebpackIdMap = new Map(), this._moduleIdMap = new Map(), this._moduleGraphModules = new Map(), this._exportIdMap = new Map(), this._sideEffectIdMap = new Map(), this._varIdMap = new Map(), this._layers = new Map();
+        this._dependenciesIdMap = new Map(), this._moduleIdentifierMap = new Map(), this._moduleIdMap = new Map(), this._moduleGraphModules = new Map(), this._exportIdMap = new Map(), this._sideEffectIdMap = new Map(), this._varIdMap = new Map(), this._layers = new Map();
     }
     size() {
         return this._moduleIdMap.size;
@@ -954,7 +954,7 @@ class ModuleGraph {
         return result;
     }
     getModules() {
-        return Array.from(this._moduleWebpackIdMap.values());
+        return Array.from(this._moduleIdentifierMap.values());
     }
     getDependencies() {
         return Array.from(this._dependenciesIdMap.values());
@@ -968,20 +968,20 @@ class ModuleGraph {
     getDependencyById(id) {
         return this._dependenciesIdMap.get(id);
     }
-    getModuleByWebpackId(id) {
-        return this._moduleWebpackIdMap.get(id);
+    getModuleByIdentifier(id) {
+        return this._moduleIdentifierMap.get(id);
     }
     getModuleByFile(file, layer) {
         return this.getModules().filter((item)=>item.path === file && (void 0 === layer || item.layer === layer));
     }
     addModule(...modules) {
-        for (let module of modules)!this._moduleIdMap.has(module.id) && (this._moduleWebpackIdMap.set(module.webpackId, module), this._moduleIdMap.set(module.id, module), module.layer && this.addLayer(module.layer));
+        for (let module of modules)!this._moduleIdMap.has(module.id) && (this._moduleIdentifierMap.set(module.identifier, module), this._moduleIdMap.set(module.id, module), module.layer && this.addLayer(module.layer));
     }
     addDependency(...deps) {
         for (let dep of deps)this._dependenciesIdMap.has(dep.id) || (this._dependenciesIdMap.set(dep.id, dep), this.addModule(dep.module), this.addModule(dep.dependency));
     }
     removeModule(module) {
-        for (let dep of (this._moduleIdMap.delete(module.id), this._moduleWebpackIdMap.delete(module.webpackId), module.getDependencies()))this.removeDependency(dep), this._dependenciesIdMap.delete(dep.id);
+        for (let dep of (this._moduleIdMap.delete(module.id), this._moduleIdentifierMap.delete(module.identifier), module.getDependencies()))this.removeDependency(dep), this._dependenciesIdMap.delete(dep.id);
         for (let imported of module.getImported())imported.removeDependencyByModule(imported);
     }
     removeDependency(dep) {
@@ -1043,8 +1043,8 @@ class ModuleGraph {
         this._moduleIdMap = new Map(modules.map((m)=>[
                 m.id,
                 m
-            ])), this._moduleWebpackIdMap = new Map(modules.map((m)=>[
-                m.webpackId,
+            ])), this._moduleIdentifierMap = new Map(modules.map((m)=>[
+                m.identifier,
                 m
             ])), this._layers = new Map(modules.filter((m)=>m.layer).map((m)=>[
                 m.layer,
@@ -1064,7 +1064,7 @@ class ModuleGraph {
         return this._connectionsOnlyImports;
     }
     constructor(){
-        this._dependenciesIdMap = new Map(), this._connectionsOnlyImports = [], this._moduleWebpackIdMap = new Map(), this._moduleIdMap = new Map(), this._moduleGraphModules = new Map(), this._exportIdMap = new Map(), this._sideEffectIdMap = new Map(), this._varIdMap = new Map(), this._layers = new Map();
+        this._dependenciesIdMap = new Map(), this._connectionsOnlyImports = [], this._moduleIdentifierMap = new Map(), this._moduleIdMap = new Map(), this._moduleGraphModules = new Map(), this._exportIdMap = new Map(), this._sideEffectIdMap = new Map(), this._varIdMap = new Map(), this._layers = new Map();
     }
 }
 let package_graph_dependency_id = 1;
@@ -1301,7 +1301,7 @@ async function getAssetsModulesData(moduleGraph, chunkGraph, bundleDir, opts, so
 }
 function transformAssetsModulesData(parsedModulesData, moduleGraph) {
     moduleGraph && Object.entries(parsedModulesData).forEach(([moduleId, parsedData])=>{
-        let gzipSize, module = moduleGraph.getModuleByWebpackId(moduleId ?? '');
+        let gzipSize, module = moduleGraph.getModuleByIdentifier(moduleId ?? '');
         try {
             parsedData?.content && 'string' == typeof parsedData.content && parsedData.content.length > 0 && (gzipSize = gzipSync(parsedData.content, {
                 level: 9
@@ -1420,7 +1420,7 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
                 name: module.name ?? module.moduleName
             })));
     }), collectedModules ?? [])){
-        if (getCanSkip(data) || moduleGraph.getModuleByWebpackId(data.identifier)) continue;
+        if (getCanSkip(data) || moduleGraph.getModuleByIdentifier(data.identifier)) continue;
         allModules.push(data);
         let isConcatenated = !!(data.modules && data.modules.length > 0), concatenatedModule = new Module(data.identifier ?? data.moduleIdentifier, getGetModuleName(root, data), 0 === data.depth, isConcatenated ? SDK.ModuleKind.Concatenation : SDK.ModuleKind.Normal, data.id ? String(data.id) : void 0, data.layer);
         if (data.optimizationBailout && data.optimizationBailout.forEach((reason)=>concatenatedModule.addBailoutReason(reason)), data.issuerPath && concatenatedModule.addIssuerPath(data.issuerPath), data.chunks?.forEach((_chunkId)=>{
@@ -1443,8 +1443,8 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
             let normalModule;
             if (getCanSkip(normal)) continue;
             allModules.push(normal);
-            let webpackId = normal.identifier, registeredModule = moduleGraph.getModuleByWebpackId(webpackId);
-            if (normalModule = registeredModule || (moduleGraph.getModuleByWebpackId(webpackId) ?? new Module(webpackId, getGetModuleName(root, normal), 0 === normal.depth, SDK.ModuleKind.Normal, normal.id ? String(normal.id) : void 0, normal.layer)), normal.optimizationBailout && normal.optimizationBailout.filter((reason)=>!reason.includes('ModuleConcatenation bailout')).forEach((reason)=>normalModule.addBailoutReason(reason)), normal.issuerPath && normalModule.addIssuerPath(normal.issuerPath), normal.chunks?.length ? normal.chunks?.forEach((_chunkId)=>{
+            let identifier = normal.identifier, registeredModule = moduleGraph.getModuleByIdentifier(identifier);
+            if (normalModule = registeredModule || (moduleGraph.getModuleByIdentifier(identifier) ?? new Module(identifier, getGetModuleName(root, normal), 0 === normal.depth, SDK.ModuleKind.Normal, normal.id ? String(normal.id) : void 0, normal.layer)), normal.optimizationBailout && normal.optimizationBailout.filter((reason)=>!reason.includes('ModuleConcatenation bailout')).forEach((reason)=>normalModule.addBailoutReason(reason)), normal.issuerPath && normalModule.addIssuerPath(normal.issuerPath), normal.chunks?.length ? normal.chunks?.forEach((_chunkId)=>{
                 let chunk = chunkGraph.getChunkById(String(_chunkId));
                 chunk && normalModule.addChunk(chunk);
             }) : data.chunks?.forEach((_chunkId)=>{
@@ -1467,7 +1467,7 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
         }
     }
     for (let module of allModules){
-        let currentModule = moduleGraph.getModuleByWebpackId(module.identifier ?? '');
+        let currentModule = moduleGraph.getModuleByIdentifier(module.identifier ?? '');
         if (!currentModule) continue;
         let dependencies = (module.reasons ?? []).filter(isImportDependency).filter((item)=>!!(item.moduleIdentifier && item.userRequest));
         for (let dep of ((module.reasons ?? []).filter((item)=>'from origin' === item.type).forEach((dep)=>dep?.children?.forEach((_d)=>dependencies.push({
@@ -1475,7 +1475,7 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
                     ..._d,
                     children: void 0
                 }))), dependencies)){
-            let rawRequest = dep.userRequest, requestModule = moduleGraph.getModuleByWebpackId(dep.moduleIdentifier);
+            let rawRequest = dep.userRequest, requestModule = moduleGraph.getModuleByIdentifier(dep.moduleIdentifier);
             if (!requestModule) continue;
             if (!requestModule.getDependencyByRequest(rawRequest)) {
                 let data = requestModule.addDependency(rawRequest, currentModule, getImportKind(dep));
@@ -1494,7 +1494,7 @@ function getModuleGraphByStats({ modules, chunks }, root, chunkGraph) {
     return moduleGraph.getModules().forEach((module)=>{
         module.issuerPath && module.issuerPath.forEach((issuer)=>{
             let moduleInstance = moduleCache.get(issuer.identifier);
-            !moduleInstance && (moduleInstance = moduleGraph.getModuleByWebpackId(issuer.identifier)) && moduleCache.set(issuer.identifier, moduleInstance), moduleInstance && (issuer.moduleId = moduleInstance.id);
+            !moduleInstance && (moduleInstance = moduleGraph.getModuleByIdentifier(issuer.identifier)) && moduleCache.set(issuer.identifier, moduleInstance), moduleInstance && (issuer.moduleId = moduleInstance.id);
         });
     }), moduleGraph;
 }
@@ -1560,7 +1560,7 @@ function getExportStatement(info, normalModule, graph) {
     if (!webpackDependency) return;
     let modulePath = getWebpackModulePath(normalModule), request = getWebpackDependencyRequest(webpackDependency), sdkDependency = graph.getDependencies().find((item)=>item.module.path === modulePath && item.request === request);
     if (sdkDependency && 1 === sdkDependency.statements.length) return sdkDependency.statements[0];
-    let sdkModule = graph.getModuleByWebpackId(getWebpackModuleId(normalModule));
+    let sdkModule = graph.getModuleByIdentifier(getWebpackModuleId(normalModule));
     if (sdkModule) return getDependencyPosition(webpackDependency, sdkModule);
 }
 function getLastExportInfo(info, webpackGraph) {

package/dist/types/transform.d.cts

@@ -1,5 +1,5 @@
 import { SDK } from '@rsdoctor/types';
-export type ParseBundle = (assetFile: string, modules: Pick<SDK.ModuleInstance, 'renderId' | 'webpackId'>[]) => {
+export type ParseBundle = (assetFile: string, modules: Pick<SDK.ModuleInstance, 'renderId' | 'identifier'>[]) => {
     modules?: Record<string, any>;
     src?: string;
     runtimeSrc?: string;

package/dist/types/transform.d.ts

@@ -1,5 +1,5 @@
 import { SDK } from '@rsdoctor/types';
-export type ParseBundle = (assetFile: string, modules: Pick<SDK.ModuleInstance, 'renderId' | 'webpackId'>[]) => {
+export type ParseBundle = (assetFile: string, modules: Pick<SDK.ModuleInstance, 'renderId' | 'identifier'>[]) => {
     modules?: Record<string, any>;
     src?: string;
     runtimeSrc?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/graph",
-  "version": "1.5.11",
+  "version": "2.0.0-alpha.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -30,17 +30,17 @@
     "es-toolkit": "^1.45.1",
     "path-browserify": "1.0.1",
     "source-map": "^0.7.6",
-    "@rsdoctor/types": "1.5.11",
-    "@rsdoctor/utils": "1.5.11"
+    "@rsdoctor/types": "2.0.0-alpha.0",
+    "@rsdoctor/utils": "2.0.0-alpha.0"
   },
   "devDependencies": {
     "@types/body-parser": "1.19.6",
     "@types/estree": "1.0.5",
     "@types/path-browserify": "1.0.3",
-    "@types/node": "^22.8.1",
+    "@types/node": "^24.12.3",
     "fs-extra": "^11.1.1",
     "tslib": "2.8.1",
-    "typescript": "^5.9.2",
+    "typescript": "^6.0.3",
     "webpack": "^5.105.4"
   },
   "publishConfig": {