@rsdoctor/graph 1.3.14 → 1.3.16

package/dist/index.cjs

@@ -1200,13 +1200,32 @@ class PackageGraph {
     }
 }
 const logger_namespaceObject = require("@rsdoctor/utils/logger");
-async function getAssetsModulesData(moduleGraph, chunkGraph, bundleDir, opts, sourceMapSets = new Map()) {
-    if (opts.parseBundle && sourceMapSets.size < 1) {
+async function getAssetsModulesData(moduleGraph, chunkGraph, bundleDir, opts, sourceMapSets = new Map(), assetsWithoutSourceMap) {
+    if (sourceMapSets.size > 0) {
+        for (let [modulePath, codes] of ((0, logger_namespaceObject.time)("Start Parse bundle by sourcemap."), sourceMapSets.entries())){
+            let gzipSize, modules = moduleGraph.getModuleByFile(modulePath);
+            try {
+                codes && 'string' == typeof codes && codes.length > 0 && (gzipSize = (0, external_node_zlib_namespaceObject.gzipSync)(codes, {
+                    level: 9
+                }).length);
+            } catch  {}
+            for (let module of modules)module?.setSize({
+                parsedSize: codes.length,
+                gzipSize
+            }), module?.setSource({
+                parsedSource: codes
+            });
+        }
+        (0, logger_namespaceObject.timeEnd)("Start Parse bundle by sourcemap.");
+    }
+    if (opts.parseBundle && (assetsWithoutSourceMap && assetsWithoutSourceMap.size > 0 || sourceMapSets.size < 1)) {
         (0, logger_namespaceObject.time)("Start Parse bundle by AST.");
         let { parseBundle = ()=>({}) } = opts || {}, assets = chunkGraph.getAssets(), modules = moduleGraph.getModules(), bundlesSources = null, parsedModules = null;
         if (bundleDir && assets.length) {
             for (let asset of (bundlesSources = {}, parsedModules = {}, assets)){
-                let bundleInfo, assetFile = external_path_default().join(bundleDir, asset.path);
+                let bundleInfo;
+                if (assetsWithoutSourceMap && assetsWithoutSourceMap.size > 0 && !assetsWithoutSourceMap.has(asset.path)) continue;
+                let assetFile = external_path_default().join(bundleDir, asset.path);
                 try {
                     bundleInfo = parseBundle(assetFile, modules);
                 } catch (err) {
@@ -1222,25 +1241,6 @@ async function getAssetsModulesData(moduleGraph, chunkGraph, bundleDir, opts, so
             common_namespaceObject.Lodash.isEmpty(bundlesSources) && (bundlesSources = null, parsedModules = null, process.env.DEVTOOLS_DEV && logger_namespaceObject.logger.warn('\nNo bundles were parsed. Analyzer will show only original module sizes from stats file.\n')), parsedModules && transformAssetsModulesData(parsedModules, moduleGraph);
         }
         (0, logger_namespaceObject.timeEnd)("Start Parse bundle by AST.");
-    } else {
-        for (let [modulePath, codes] of ((0, logger_namespaceObject.time)("Start Parse bundle by sourcemap."), sourceMapSets.entries())){
-            let gzipSize, modules = moduleGraph.getModuleByFile(modulePath);
-            try {
-                if (codes && 'string' == typeof codes && codes.length > 0) {
-                    let { gzipSync } = await import("node:zlib");
-                    gzipSize = gzipSync(codes, {
-                        level: 9
-                    }).length;
-                }
-            } catch  {}
-            for (let module of modules)module?.setSize({
-                parsedSize: codes.length,
-                gzipSize
-            }), module?.setSource({
-                parsedSource: codes
-            });
-        }
-        (0, logger_namespaceObject.timeEnd)("Start Parse bundle by sourcemap.");
     }
 }
 function transformAssetsModulesData(parsedModulesData, moduleGraph) {

package/dist/index.js

@@ -1,5 +1,5 @@
 import { SDK } from "@rsdoctor/types";
-import { gzipSync as external_node_zlib_gzipSync } from "node:zlib";
+import { gzipSync } from "node:zlib";
 import path_0, { dirname, join, relative, resolve } from "path";
 import { File, Lodash, Package } from "@rsdoctor/utils/common";
 import { unionBy } from "es-toolkit/compat";
@@ -222,7 +222,7 @@ class Asset {
         this.id = id;
     }
     setGzipSize(content) {
-        this.gzipSize = external_node_zlib_gzipSync(content, {
+        this.gzipSize = gzipSync(content, {
             level: 9
         }).length;
     }
@@ -486,7 +486,7 @@ class Module {
         else {
             let code = this.source.parsedSource || this.source.source;
             if (code && 'string' == typeof code && code.length > 0) try {
-                size.gzipSize = external_node_zlib_gzipSync(code, {
+                size.gzipSize = gzipSync(code, {
                     level: 9
                 }).length;
             } catch (e) {
@@ -1165,13 +1165,32 @@ class PackageGraph {
         };
     }
 }
-async function getAssetsModulesData(moduleGraph, chunkGraph, bundleDir, opts, sourceMapSets = new Map()) {
-    if (opts.parseBundle && sourceMapSets.size < 1) {
+async function getAssetsModulesData(moduleGraph, chunkGraph, bundleDir, opts, sourceMapSets = new Map(), assetsWithoutSourceMap) {
+    if (sourceMapSets.size > 0) {
+        for (let [modulePath, codes] of (time("Start Parse bundle by sourcemap."), sourceMapSets.entries())){
+            let gzipSize, modules = moduleGraph.getModuleByFile(modulePath);
+            try {
+                codes && 'string' == typeof codes && codes.length > 0 && (gzipSize = gzipSync(codes, {
+                    level: 9
+                }).length);
+            } catch  {}
+            for (let module of modules)module?.setSize({
+                parsedSize: codes.length,
+                gzipSize
+            }), module?.setSource({
+                parsedSource: codes
+            });
+        }
+        timeEnd("Start Parse bundle by sourcemap.");
+    }
+    if (opts.parseBundle && (assetsWithoutSourceMap && assetsWithoutSourceMap.size > 0 || sourceMapSets.size < 1)) {
         time("Start Parse bundle by AST.");
         let { parseBundle = ()=>({}) } = opts || {}, assets = chunkGraph.getAssets(), modules = moduleGraph.getModules(), bundlesSources = null, parsedModules = null;
         if (bundleDir && assets.length) {
             for (let asset of (bundlesSources = {}, parsedModules = {}, assets)){
-                let bundleInfo, assetFile = path_0.join(bundleDir, asset.path);
+                let bundleInfo;
+                if (assetsWithoutSourceMap && assetsWithoutSourceMap.size > 0 && !assetsWithoutSourceMap.has(asset.path)) continue;
+                let assetFile = path_0.join(bundleDir, asset.path);
                 try {
                     bundleInfo = parseBundle(assetFile, modules);
                 } catch (err) {
@@ -1187,32 +1206,13 @@ async function getAssetsModulesData(moduleGraph, chunkGraph, bundleDir, opts, so
             Lodash.isEmpty(bundlesSources) && (bundlesSources = null, parsedModules = null, process.env.DEVTOOLS_DEV && logger.warn('\nNo bundles were parsed. Analyzer will show only original module sizes from stats file.\n')), parsedModules && transformAssetsModulesData(parsedModules, moduleGraph);
         }
         timeEnd("Start Parse bundle by AST.");
-    } else {
-        for (let [modulePath, codes] of (time("Start Parse bundle by sourcemap."), sourceMapSets.entries())){
-            let gzipSize, modules = moduleGraph.getModuleByFile(modulePath);
-            try {
-                if (codes && 'string' == typeof codes && codes.length > 0) {
-                    let { gzipSync } = await import("node:zlib");
-                    gzipSize = gzipSync(codes, {
-                        level: 9
-                    }).length;
-                }
-            } catch  {}
-            for (let module of modules)module?.setSize({
-                parsedSize: codes.length,
-                gzipSize
-            }), module?.setSource({
-                parsedSource: codes
-            });
-        }
-        timeEnd("Start Parse bundle by sourcemap.");
     }
 }
 function transformAssetsModulesData(parsedModulesData, moduleGraph) {
     moduleGraph && Object.entries(parsedModulesData).forEach(([moduleId, parsedData])=>{
         let gzipSize, module = moduleGraph.getModuleByWebpackId(moduleId ?? '');
         try {
-            parsedData?.content && 'string' == typeof parsedData.content && parsedData.content.length > 0 && (gzipSize = external_node_zlib_gzipSync(parsedData.content, {
+            parsedData?.content && 'string' == typeof parsedData.content && parsedData.content.length > 0 && (gzipSize = gzipSync(parsedData.content, {
                 level: 9
             }).length);
         } catch  {}

package/dist/transform/chunks/assetsModules.d.ts

@@ -18,5 +18,5 @@ export type ParsedModuleSizeData = {
  */
 export declare function getAssetsModulesData(moduleGraph: SDK.ModuleGraphInstance, chunkGraph: SDK.ChunkGraphInstance, bundleDir: string, opts: {
     parseBundle?: ParseBundle;
-}, sourceMapSets?: Map<string, string>): Promise<void>;
+}, sourceMapSets?: Map<string, string>, assetsWithoutSourceMap?: Set<string>): Promise<void>;
 export declare function transformAssetsModulesData(parsedModulesData: ParsedModuleSizeData, moduleGraph: SDK.ModuleGraphInstance): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/graph",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -25,8 +25,8 @@
     "es-toolkit": "^1.41.0",
     "path-browserify": "1.0.1",
     "source-map": "^0.7.6",
-    "@rsdoctor/types": "1.3.14",
-    "@rsdoctor/utils": "1.3.14"
+    "@rsdoctor/types": "1.3.16",
+    "@rsdoctor/utils": "1.3.16"
   },
   "devDependencies": {
     "@types/body-parser": "1.19.6",