@rsdoctor/graph 1.5.3 → 1.5.5

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

@@ -6,6 +6,7 @@ export declare class Dependency implements SDK.DependencyInstance {
     readonly request: string;
     readonly module: SDK.ModuleInstance;
     readonly kind: SDK.DependencyKind;
+    typeString?: string;
     readonly statements: SDK.StatementInstance[];
     private _originDependency;
     meta: SDK.DependencyBuildMeta;

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

@@ -3,6 +3,7 @@ export declare class ModuleGraph implements SDK.ModuleGraphInstance {
     static init(): void;
     static fromData(data: Partial<SDK.ModuleGraphData>): ModuleGraph;
     private _dependenciesIdMap;
+    private _connectionsOnlyImports;
     private _moduleWebpackIdMap;
     private _moduleIdMap;
     private _moduleGraphModules;
@@ -12,7 +13,7 @@ export declare class ModuleGraph implements SDK.ModuleGraphInstance {
     private _layers;
     clear(): void;
     size(): number;
-    fromInstance(data: ModuleGraph): void;
+    fromInstance(data: SDK.ModuleGraphInstance): void;
     getSubGraphByModule(module: SDK.ModuleInstance): SDK.ModuleInstance[];
     getModules(): SDK.ModuleInstance[];
     getDependencies(): SDK.DependencyInstance[];
@@ -38,4 +39,6 @@ export declare class ModuleGraph implements SDK.ModuleGraphInstance {
     toCodeData(type?: SDK.ToDataType): SDK.ModuleCodeData;
     setModules(modules: SDK.ModuleInstance[]): void;
     setDependencies(dependencies: SDK.DependencyInstance[]): void;
+    setConnectionsOnlyImports(items: SDK.ConnectionsOnlyImportData[]): void;
+    getConnectionsOnlyImports(): SDK.ConnectionsOnlyImportData[];
 }

package/dist/index.cjs

@@ -338,6 +338,9 @@ class Dependency {
             request: this.request,
             resolvedRequest: this.resolvedRequest,
             kind: this.kind,
+            ...void 0 !== this.typeString && {
+                typeString: this.typeString
+            },
             module: this.module.id,
             dependency: this.dependency.id,
             originDependency: this.originDependency.id,
@@ -972,7 +975,7 @@ class ModuleGraph {
         return this._moduleIdMap.size;
     }
     fromInstance(data) {
-        this._dependenciesIdMap = new Map(data._dependenciesIdMap), this._moduleWebpackIdMap = new Map(data._moduleWebpackIdMap), this._moduleIdMap = new Map(data._moduleIdMap), this._moduleGraphModules = new Map(data._moduleGraphModules), this._exportIdMap = new Map(data._exportIdMap), this._sideEffectIdMap = new Map(data._sideEffectIdMap), this._varIdMap = new Map(data._varIdMap), this._layers = new Map(data._layers);
+        this.setModules(data.getModules()), this.setDependencies(data.getDependencies()), this.setConnectionsOnlyImports(data.getConnectionsOnlyImports()), data instanceof ModuleGraph && (this._moduleGraphModules = new Map(data._moduleGraphModules), this._exportIdMap = new Map(data._exportIdMap), this._sideEffectIdMap = new Map(data._sideEffectIdMap), this._varIdMap = new Map(data._varIdMap), this._layers = new Map(data._layers));
     }
     getSubGraphByModule(module) {
         let map = new Set(), result = [
@@ -1086,8 +1089,14 @@ class ModuleGraph {
                 d
             ]));
     }
+    setConnectionsOnlyImports(items) {
+        this._connectionsOnlyImports = items;
+    }
+    getConnectionsOnlyImports() {
+        return this._connectionsOnlyImports;
+    }
     constructor(){
-        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._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();
     }
 }
 let package_graph_dependency_id = 1;
@@ -1389,7 +1398,7 @@ function isImportDependency({ type }) {
 }
 function getImportKind(dep) {
     let { type } = dep;
-    return type ? type.includes('harmony') ? types_namespaceObject.SDK.DependencyKind.ImportStatement : type.includes('cjs') ? types_namespaceObject.SDK.DependencyKind.RequireCall : type.includes('import()') ? types_namespaceObject.SDK.DependencyKind.DynamicImport : type.includes('amd') ? types_namespaceObject.SDK.DependencyKind.AMDRequire : types_namespaceObject.SDK.DependencyKind.Unknown : types_namespaceObject.SDK.DependencyKind.Unknown;
+    return type ? type.includes('harmony') || 'esm import' === type ? types_namespaceObject.SDK.DependencyKind.ImportStatement : type.includes('cjs') ? types_namespaceObject.SDK.DependencyKind.RequireCall : type.includes('import()') ? types_namespaceObject.SDK.DependencyKind.DynamicImport : type.includes('amd') ? types_namespaceObject.SDK.DependencyKind.AMDRequire : types_namespaceObject.SDK.DependencyKind.Unknown : types_namespaceObject.SDK.DependencyKind.Unknown;
 }
 function removeNoImportStyle(graph) {
     graph.getModules().filter((module)=>common_namespaceObject.File.isStyleExt(module.path)).filter((item)=>0 === item.getImported().length).forEach((item)=>graph.removeModule(item));

package/dist/index.js

@@ -1,3 +1,4 @@
+import { __webpack_require__ } from "./rslib-runtime.js";
 import { SDK } from "@rsdoctor/types";
 import { gzipSync } from "node:zlib";
 import path_0, { dirname, join, relative, resolve } from "path";
@@ -5,19 +6,6 @@ import { File, Lodash, Package } from "@rsdoctor/utils/common";
 import { unionBy } from "es-toolkit/compat";
 import { logger, time, timeEnd } from "@rsdoctor/utils/logger";
 import path_browserify from "path-browserify";
-var __webpack_require__ = {};
-__webpack_require__.d = (exports, definition)=>{
-    for(var key in definition)__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key) && Object.defineProperty(exports, key, {
-        enumerable: !0,
-        get: definition[key]
-    });
-}, __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop), __webpack_require__.r = (exports)=>{
-    "u" > typeof Symbol && Symbol.toStringTag && Object.defineProperty(exports, Symbol.toStringTag, {
-        value: 'Module'
-    }), Object.defineProperty(exports, '__esModule', {
-        value: !0
-    });
-};
 var chunks_namespaceObject = {};
 __webpack_require__.r(chunks_namespaceObject), __webpack_require__.d(chunks_namespaceObject, {
     assetsContents: ()=>assetsContents,
@@ -309,6 +297,9 @@ class Dependency {
             request: this.request,
             resolvedRequest: this.resolvedRequest,
             kind: this.kind,
+            ...void 0 !== this.typeString && {
+                typeString: this.typeString
+            },
             module: this.module.id,
             dependency: this.dependency.id,
             originDependency: this.originDependency.id,
@@ -940,7 +931,7 @@ class ModuleGraph {
         return this._moduleIdMap.size;
     }
     fromInstance(data) {
-        this._dependenciesIdMap = new Map(data._dependenciesIdMap), this._moduleWebpackIdMap = new Map(data._moduleWebpackIdMap), this._moduleIdMap = new Map(data._moduleIdMap), this._moduleGraphModules = new Map(data._moduleGraphModules), this._exportIdMap = new Map(data._exportIdMap), this._sideEffectIdMap = new Map(data._sideEffectIdMap), this._varIdMap = new Map(data._varIdMap), this._layers = new Map(data._layers);
+        this.setModules(data.getModules()), this.setDependencies(data.getDependencies()), this.setConnectionsOnlyImports(data.getConnectionsOnlyImports()), data instanceof ModuleGraph && (this._moduleGraphModules = new Map(data._moduleGraphModules), this._exportIdMap = new Map(data._exportIdMap), this._sideEffectIdMap = new Map(data._sideEffectIdMap), this._varIdMap = new Map(data._varIdMap), this._layers = new Map(data._layers));
     }
     getSubGraphByModule(module) {
         let map = new Set(), result = [
@@ -1054,8 +1045,14 @@ class ModuleGraph {
                 d
             ]));
     }
+    setConnectionsOnlyImports(items) {
+        this._connectionsOnlyImports = items;
+    }
+    getConnectionsOnlyImports() {
+        return this._connectionsOnlyImports;
+    }
     constructor(){
-        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._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();
     }
 }
 let package_graph_dependency_id = 1;
@@ -1350,7 +1347,7 @@ function isImportDependency({ type }) {
 }
 function getImportKind(dep) {
     let { type } = dep;
-    return type ? type.includes('harmony') ? SDK.DependencyKind.ImportStatement : type.includes('cjs') ? SDK.DependencyKind.RequireCall : type.includes('import()') ? SDK.DependencyKind.DynamicImport : type.includes('amd') ? SDK.DependencyKind.AMDRequire : SDK.DependencyKind.Unknown : SDK.DependencyKind.Unknown;
+    return type ? type.includes('harmony') || 'esm import' === type ? SDK.DependencyKind.ImportStatement : type.includes('cjs') ? SDK.DependencyKind.RequireCall : type.includes('import()') ? SDK.DependencyKind.DynamicImport : type.includes('amd') ? SDK.DependencyKind.AMDRequire : SDK.DependencyKind.Unknown : SDK.DependencyKind.Unknown;
 }
 function removeNoImportStyle(graph) {
     graph.getModules().filter((module)=>File.isStyleExt(module.path)).filter((item)=>0 === item.getImported().length).forEach((item)=>graph.removeModule(item));
@@ -1563,4 +1560,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, extractCodeFromLocation, getModuleName, isSamePosition, isSameRange, parseLocation, readPackageJson };
+export { Asset, Chunk, ChunkGraph, Dependency, EntryPoint, ExportInfo, Module, ModuleGraph, ModuleGraphModule, PackageDependency, PackageGraph, SideEffect, Statement, Variable, chunks_namespaceObject as Chunks, extractCodeFromLocation, getModuleName, isSamePosition, isSameRange, package_Package as Package, parseLocation, readPackageJson, trans_utils_namespaceObject as TransUtils, transform_module_graph_namespaceObject as ModuleGraphTrans, webpack_compatible_namespaceObject as Webpack };

package/dist/rslib-runtime.js

@@ -0,0 +1,24 @@
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    return __webpack_modules__[moduleId](module, module.exports, __webpack_require__), module.exports;
+}
+__webpack_require__.d = (exports, definition)=>{
+    for(var key in definition)__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key) && Object.defineProperty(exports, key, {
+        enumerable: !0,
+        get: definition[key]
+    });
+}, __webpack_require__.add = function(modules) {
+    Object.assign(__webpack_require__.m, modules);
+}, __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop), __webpack_require__.r = (exports)=>{
+    "u" > typeof Symbol && Symbol.toStringTag && Object.defineProperty(exports, Symbol.toStringTag, {
+        value: 'Module'
+    }), Object.defineProperty(exports, '__esModule', {
+        value: !0
+    });
+};
+export { __webpack_require__ };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/graph",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -22,11 +22,11 @@
   },
   "type": "module",
   "dependencies": {
-    "es-toolkit": "^1.44.0",
+    "es-toolkit": "^1.45.1",
     "path-browserify": "1.0.1",
     "source-map": "^0.7.6",
-    "@rsdoctor/types": "1.5.3",
-    "@rsdoctor/utils": "1.5.3"
+    "@rsdoctor/types": "1.5.5",
+    "@rsdoctor/utils": "1.5.5"
   },
   "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.105.3"
+    "webpack": "^5.105.4"
   },
   "publishConfig": {
     "access": "public",