@rsdoctor/core 1.5.8 → 1.5.9

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

@@ -155,7 +155,7 @@ async function appendModuleGraphByCompilation(compilation, graph, features, cont
         await Promise.all(allModules.map((module)=>appendModuleData(module, webpackGraph, graph, fileSystemInfo, features, context)));
         graph_namespaceObject.ModuleGraphTrans.removeNoImportStyle(graph);
         return graph;
-    } catch (e) {
+    } catch  {
         return graph;
     }
 }

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

@@ -117,7 +117,7 @@ async function appendModuleGraphByCompilation(compilation, graph, features, cont
         await Promise.all(allModules.map((module)=>appendModuleData(module, webpackGraph, graph, fileSystemInfo, features, context)));
         ModuleGraphTrans.removeNoImportStyle(graph);
         return graph;
-    } catch (e) {
+    } catch  {
         return graph;
     }
 }

package/dist/build-utils/build/utils/loader.cjs

@@ -168,7 +168,7 @@ var __webpack_exports__ = {};
         });
     }
     function isESMLoader(r) {
-        let _loaderName = 'object' == typeof r && 'string' == typeof r?.loader ? r.loader : 'string' == typeof r ? r : '';
+        const _loaderName = 'object' == typeof r && 'string' == typeof r?.loader ? r.loader : 'string' == typeof r ? r : '';
         if (!_loaderName) return false;
         const isPath = external_node_path_default().isAbsolute(_loaderName) || _loaderName.startsWith('./') || _loaderName.startsWith('../');
         if (isPath) {
@@ -302,8 +302,7 @@ var __webpack_exports__ = {};
                                 common_namespaceObject.Loader.LoaderInternalPropertyName
                             ]) : Reflect.get(target, key, receiver);
                     default:
-                        const _target = target;
-                        return _target[key];
+                        return target[key];
                 }
             },
             set (target, key, value, receiver) {

package/dist/build-utils/build/utils/loader.js

@@ -113,7 +113,7 @@ function mapEachRules(rules, callback) {
     });
 }
 function isESMLoader(r) {
-    let _loaderName = 'object' == typeof r && 'string' == typeof r?.loader ? r.loader : 'string' == typeof r ? r : '';
+    const _loaderName = 'object' == typeof r && 'string' == typeof r?.loader ? r.loader : 'string' == typeof r ? r : '';
     if (!_loaderName) return false;
     const isPath = node_path.isAbsolute(_loaderName) || _loaderName.startsWith('./') || _loaderName.startsWith('../');
     if (isPath) {
@@ -247,8 +247,7 @@ function createLoaderContextTrap(final) {
                             Loader.LoaderInternalPropertyName
                         ]) : Reflect.get(target, key, receiver);
                 default:
-                    const _target = target;
-                    return _target[key];
+                    return target[key];
             }
         },
         set (target, key, value, receiver) {

package/dist/inner-plugins/loaders/proxy.cjs

@@ -36,8 +36,11 @@ const loaderModule = function(...args) {
     const mod = (0, external_utils_index_cjs_namespaceObject.getOriginLoaderModule)(this);
     if (mod.default) {
         if (false === mod.raw && Buffer.isBuffer(args[0])) args[0] = args[0].toString();
-        let start;
-        let startHRTime;
+        let start = 0;
+        let startHRTime = [
+            0,
+            0
+        ];
         const trap = index_cjs_namespaceObject.Utils.createLoaderContextTrap.call(this, (err, res, sourceMap)=>{
             (0, external_utils_index_cjs_namespaceObject.reportLoader)(this, start, startHRTime, false, false, args[0].toString(), err, res, sourceMap);
         });
@@ -61,8 +64,11 @@ const pitch = function() {
     this.cacheable(false);
     const mod = (0, external_utils_index_cjs_namespaceObject.getOriginLoaderModule)(this);
     if (mod.pitch && 'function' == typeof mod.pitch) {
-        let start;
-        let startHRTime;
+        let start = 0;
+        let startHRTime = [
+            0,
+            0
+        ];
         const trap = index_cjs_namespaceObject.Utils.createLoaderContextTrap.call(this, (err, res)=>{
             (0, external_utils_index_cjs_namespaceObject.reportLoader)(this, start, startHRTime, true, false, err ? 'Loader Pitch Async Error' : '', err, res);
         });

package/dist/inner-plugins/loaders/proxy.js

@@ -7,8 +7,11 @@ const loaderModule = function(...args) {
     const mod = getOriginLoaderModule(this);
     if (mod.default) {
         if (false === mod.raw && Buffer.isBuffer(args[0])) args[0] = args[0].toString();
-        let start;
-        let startHRTime;
+        let start = 0;
+        let startHRTime = [
+            0,
+            0
+        ];
         const trap = Utils.createLoaderContextTrap.call(this, (err, res, sourceMap)=>{
             reportLoader(this, start, startHRTime, false, false, args[0].toString(), err, res, sourceMap);
         });
@@ -32,8 +35,11 @@ const pitch = function() {
     this.cacheable(false);
     const mod = getOriginLoaderModule(this);
     if (mod.pitch && 'function' == typeof mod.pitch) {
-        let start;
-        let startHRTime;
+        let start = 0;
+        let startHRTime = [
+            0,
+            0
+        ];
         const trap = Utils.createLoaderContextTrap.call(this, (err, res)=>{
             reportLoader(this, start, startHRTime, true, false, err ? 'Loader Pitch Async Error' : '', err, res);
         });

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

@@ -52,13 +52,13 @@ class InternalBundleTagPlugin extends external_base_cjs_namespaceObject.Internal
                         if (true === terserDropConsole || true === swcDropConsole) logger_namespaceObject.logger.warn(logger_namespaceObject.chalk.yellow('Warning: BannerPlugin detected in project. Please disable drop_console option in TerserPlugin or SwcJsMinimizerRspackPlugin to enable Rsdoctor analysis for BannerPlugin.'));
                     }
                     const chunks = compilation.chunks;
-                    for (let chunk of chunks)for (const file of chunk.files){
+                    for (const chunk of chunks)for (const file of chunk.files){
                         if (!file || '.js' !== (0, external_path_namespaceObject.extname)(file)) continue;
                         const { ConcatSource } = compiler.webpack.sources;
                         compilation.updateAsset(file, (old)=>{
                             const concatSource = new ConcatSource();
-                            let header = "\n console.log('RSDOCTOR_START::');\n";
-                            let footer = "\n console.log('RSDOCTOR_END::');\n";
+                            const header = "\n console.log('RSDOCTOR_START::');\n";
+                            const footer = "\n console.log('RSDOCTOR_END::');\n";
                             concatSource.add(header);
                             concatSource.add(old);
                             concatSource.add(footer);

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

@@ -25,13 +25,13 @@ class InternalBundleTagPlugin extends InternalBasePlugin {
                         if (true === terserDropConsole || true === swcDropConsole) logger.warn(chalk.yellow('Warning: BannerPlugin detected in project. Please disable drop_console option in TerserPlugin or SwcJsMinimizerRspackPlugin to enable Rsdoctor analysis for BannerPlugin.'));
                     }
                     const chunks = compilation.chunks;
-                    for (let chunk of chunks)for (const file of chunk.files){
+                    for (const chunk of chunks)for (const file of chunk.files){
                         if (!file || '.js' !== extname(file)) continue;
                         const { ConcatSource } = compiler.webpack.sources;
                         compilation.updateAsset(file, (old)=>{
                             const concatSource = new ConcatSource();
-                            let header = "\n console.log('RSDOCTOR_START::');\n";
-                            let footer = "\n console.log('RSDOCTOR_END::');\n";
+                            const header = "\n console.log('RSDOCTOR_START::');\n";
+                            const footer = "\n console.log('RSDOCTOR_END::');\n";
                             concatSource.add(header);
                             concatSource.add(old);
                             concatSource.add(footer);

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

@@ -138,7 +138,7 @@ async function getModulesInfos(compiler, moduleGraph, chunkGraph, parseBundle, s
     if (!moduleGraph) return;
     try {
         await index_cjs_namespaceObject.Chunks.getAssetsModulesData(moduleGraph, chunkGraph, compiler.outputPath, sourceMapSets, parseBundle, assetsWithoutSourceMap);
-    } catch (e) {}
+    } catch  {}
 }
 function escapeRegExp(str) {
     return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');

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

@@ -109,7 +109,7 @@ async function getModulesInfos(compiler, moduleGraph, chunkGraph, parseBundle, s
     if (!moduleGraph) return;
     try {
         await Chunks.getAssetsModulesData(moduleGraph, chunkGraph, compiler.outputPath, sourceMapSets, parseBundle, assetsWithoutSourceMap);
-    } catch (e) {}
+    } catch  {}
 }
 function escapeRegExp(str) {
     return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');

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

@@ -137,8 +137,8 @@ async function handleAfterEmitAssets(compilation, _this, sourceMapFilenameRegex,
                     sourceMapPath = (0, external_path_namespaceObject.resolve)(outputPath, mapFileName);
                 }
             } else {
-                let sourceMapFile = asset.info.related?.sourceMap;
-                let sourceMapFileAssetName = sourceMapFile?.replace(/(\.[^.]+)(\.[^.]+)?$/, '$1');
+                const sourceMapFile = asset.info.related?.sourceMap;
+                const sourceMapFileAssetName = sourceMapFile?.replace(/(\.[^.]+)(\.[^.]+)?$/, '$1');
                 if (sourceMapFile) {
                     let sourceMapAsset = assets.find((asset)=>asset.name === sourceMapFile);
                     if (!sourceMapAsset && sourceMapFileAssetName) {

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

@@ -106,8 +106,8 @@ async function handleAfterEmitAssets(compilation, _this, sourceMapFilenameRegex,
                     sourceMapPath = resolve(outputPath, mapFileName);
                 }
             } else {
-                let sourceMapFile = asset.info.related?.sourceMap;
-                let sourceMapFileAssetName = sourceMapFile?.replace(/(\.[^.]+)(\.[^.]+)?$/, '$1');
+                const sourceMapFile = asset.info.related?.sourceMap;
+                const sourceMapFileAssetName = sourceMapFile?.replace(/(\.[^.]+)(\.[^.]+)?$/, '$1');
                 if (sourceMapFile) {
                     let sourceMapAsset = assets.find((asset)=>asset.name === sourceMapFile);
                     if (!sourceMapAsset && sourceMapFileAssetName) {

package/dist/inner-plugins/utils/plugin.cjs

@@ -57,10 +57,10 @@ function interceptPluginHook(sdk, name, hook) {
     hook.intercept({
         register (tap) {
             const o = tap.fn;
-            if ('sync' === tap.type) tap.fn = function() {
+            if ('sync' === tap.type) tap.fn = function(...args) {
                 const start = Date.now();
                 try {
-                    const res = o.apply(this, arguments);
+                    const res = o.apply(this, args);
                     reportPluginData(sdk, name, tap.name, start, tap.type, res);
                     return res;
                 } catch (error) {
@@ -68,10 +68,10 @@ function interceptPluginHook(sdk, name, hook) {
                     throw error;
                 }
             };
-            else if ('async' === tap.type) tap.fn = async function() {
+            else if ('async' === tap.type) tap.fn = async function(...args) {
                 const start = Date.now();
                 try {
-                    const res = await o.apply(this, arguments);
+                    const res = await o.apply(this, args);
                     reportPluginData(sdk, name, tap.name, start, tap.type, res);
                     return res;
                 } catch (error) {
@@ -79,10 +79,10 @@ function interceptPluginHook(sdk, name, hook) {
                     throw error;
                 }
             };
-            else if ('promise' === tap.type) tap.fn = function() {
+            else if ('promise' === tap.type) tap.fn = function(...args) {
                 const start = Date.now();
-                const isChild = arguments?.[0]?.compiler?.isChild();
-                return o.apply(this, arguments).then((res)=>{
+                const isChild = args?.[0]?.compiler?.isChild();
+                return o.apply(this, args).then((res)=>{
                     if (isChild) return res;
                     reportPluginData(sdk, name, tap.name, start, tap.type, res);
                     return res;

package/dist/inner-plugins/utils/plugin.js

@@ -29,10 +29,10 @@ function interceptPluginHook(sdk, name, hook) {
     hook.intercept({
         register (tap) {
             const o = tap.fn;
-            if ('sync' === tap.type) tap.fn = function() {
+            if ('sync' === tap.type) tap.fn = function(...args) {
                 const start = Date.now();
                 try {
-                    const res = o.apply(this, arguments);
+                    const res = o.apply(this, args);
                     reportPluginData(sdk, name, tap.name, start, tap.type, res);
                     return res;
                 } catch (error) {
@@ -40,10 +40,10 @@ function interceptPluginHook(sdk, name, hook) {
                     throw error;
                 }
             };
-            else if ('async' === tap.type) tap.fn = async function() {
+            else if ('async' === tap.type) tap.fn = async function(...args) {
                 const start = Date.now();
                 try {
-                    const res = await o.apply(this, arguments);
+                    const res = await o.apply(this, args);
                     reportPluginData(sdk, name, tap.name, start, tap.type, res);
                     return res;
                 } catch (error) {
@@ -51,10 +51,10 @@ function interceptPluginHook(sdk, name, hook) {
                     throw error;
                 }
             };
-            else if ('promise' === tap.type) tap.fn = function() {
+            else if ('promise' === tap.type) tap.fn = function(...args) {
                 const start = Date.now();
-                const isChild = arguments?.[0]?.compiler?.isChild();
-                return o.apply(this, arguments).then((res)=>{
+                const isChild = args?.[0]?.compiler?.isChild();
+                return o.apply(this, args).then((res)=>{
                     if (isChild) return res;
                     reportPluginData(sdk, name, tap.name, start, tap.type, res);
                     return res;

package/dist/rules/rule.cjs

@@ -84,7 +84,7 @@ class Rule {
         const replace = [];
         const report = (data, remove)=>{
             if (remove) replace.push(remove);
-            let severity = data.severity ? (0, external_utils_cjs_namespaceObject.toSeverity)(data.severity, this.severity) : this.severity;
+            const severity = data.severity ? (0, external_utils_cjs_namespaceObject.toSeverity)(data.severity, this.severity) : this.severity;
             const error = {
                 ...data,
                 code: this.code,

package/dist/rules/rule.js

@@ -56,7 +56,7 @@ class rule_Rule {
         const replace = [];
         const report = (data, remove)=>{
             if (remove) replace.push(remove);
-            let severity = data.severity ? toSeverity(data.severity, this.severity) : this.severity;
+            const severity = data.severity ? toSeverity(data.severity, this.severity) : this.severity;
             const error = {
                 ...data,
                 code: this.code,

package/dist/rules/rules/esm-resolved-to-cjs/index.cjs

@@ -42,6 +42,16 @@ var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_na
 const types_namespaceObject = require("@rsdoctor/types");
 const external_rule_cjs_namespaceObject = require("../../rule.cjs");
 const title = 'esm-resolved-to-cjs';
+function normalizePathForCompare(filePath) {
+    const queryIndex = filePath.indexOf('?');
+    const hashIndex = filePath.indexOf('#');
+    const splitIndex = [
+        queryIndex,
+        hashIndex
+    ].filter((index)=>index >= 0).reduce((min, index)=>Math.min(min, index), 1 / 0);
+    const cleanPath = splitIndex === 1 / 0 ? filePath : filePath.slice(0, splitIndex);
+    return external_path_default().normalize(cleanPath);
+}
 function extractEsmEntry(pkgJson, pkgRoot) {
     const { exports: exportsField, module: moduleField } = pkgJson;
     if (null !== exportsField && 'object' == typeof exportsField) {
@@ -78,6 +88,7 @@ const rule = (0, external_rule_cjs_namespaceObject.defineRule)(()=>({
         },
         check ({ moduleGraph, packageGraph, report, ruleConfig }) {
             const pkgJsonCache = new Map();
+            const realPathCache = new Map();
             const readPkgJson = (pkgRoot)=>{
                 if (pkgJsonCache.has(pkgRoot)) return pkgJsonCache.get(pkgRoot);
                 try {
@@ -90,14 +101,31 @@ const rule = (0, external_rule_cjs_namespaceObject.defineRule)(()=>({
                     return null;
                 }
             };
+            const toRealPath = (filePath)=>{
+                const normalized = normalizePathForCompare(filePath);
+                if (realPathCache.has(normalized)) return realPathCache.get(normalized);
+                try {
+                    const realPath = 'function' == typeof external_fs_default().realpathSync.native ? external_fs_default().realpathSync.native(normalized) : external_fs_default().realpathSync(normalized);
+                    const normalizedRealPath = external_path_default().normalize(realPath);
+                    realPathCache.set(normalized, normalizedRealPath);
+                    return normalizedRealPath;
+                } catch  {
+                    realPathCache.set(normalized, normalized);
+                    return normalized;
+                }
+            };
             const groups = new Map();
             const inNodeModules = /[/\\]node_modules[/\\]/;
             for (const dep of moduleGraph.getDependencies()){
                 if (dep.kind !== types_namespaceObject.SDK.DependencyKind.ImportStatement || inNodeModules.test(dep.module.path) || !inNodeModules.test(dep.dependency.path) || dep.dependency.meta.strictHarmonyModule || ruleConfig.ignore.some((p)=>dep.request.includes(p))) continue;
                 const pkg = packageGraph.getPackageByModule(dep.dependency);
-                const esmEntry = pkg?.root && !ruleConfig.ignore.some((p)=>pkg.name.includes(p)) && readPkgJson(pkg.root) && extractEsmEntry(readPkgJson(pkg.root), pkg.root);
+                if (!pkg?.root) continue;
+                const pkgJson = readPkgJson(pkg.root);
+                const esmEntry = !ruleConfig.ignore.some((p)=>pkg.name.includes(p)) && pkgJson && extractEsmEntry(pkgJson, pkg.root);
                 if (!esmEntry) continue;
-                const groupKey = `${pkg.name}::${dep.dependency.path}`;
+                const resolvedModuleRealPath = toRealPath(dep.dependency.path);
+                if (resolvedModuleRealPath === toRealPath(esmEntry)) continue;
+                const groupKey = `${pkg.name}::${resolvedModuleRealPath}`;
                 const issuer = {
                     id: dep.module.id,
                     path: dep.module.path,

package/dist/rules/rules/esm-resolved-to-cjs/index.js

@@ -4,6 +4,16 @@ import path from "path";
 import { Linter, SDK } from "@rsdoctor/types";
 import { defineRule } from "../../rule.js";
 const title = 'esm-resolved-to-cjs';
+function normalizePathForCompare(filePath) {
+    const queryIndex = filePath.indexOf('?');
+    const hashIndex = filePath.indexOf('#');
+    const splitIndex = [
+        queryIndex,
+        hashIndex
+    ].filter((index)=>index >= 0).reduce((min, index)=>Math.min(min, index), 1 / 0);
+    const cleanPath = splitIndex === 1 / 0 ? filePath : filePath.slice(0, splitIndex);
+    return path.normalize(cleanPath);
+}
 function extractEsmEntry(pkgJson, pkgRoot) {
     const { exports: exportsField, module: moduleField } = pkgJson;
     if (null !== exportsField && 'object' == typeof exportsField) {
@@ -40,6 +50,7 @@ const rule = defineRule(()=>({
         },
         check ({ moduleGraph, packageGraph, report, ruleConfig }) {
             const pkgJsonCache = new Map();
+            const realPathCache = new Map();
             const readPkgJson = (pkgRoot)=>{
                 if (pkgJsonCache.has(pkgRoot)) return pkgJsonCache.get(pkgRoot);
                 try {
@@ -52,14 +63,31 @@ const rule = defineRule(()=>({
                     return null;
                 }
             };
+            const toRealPath = (filePath)=>{
+                const normalized = normalizePathForCompare(filePath);
+                if (realPathCache.has(normalized)) return realPathCache.get(normalized);
+                try {
+                    const realPath = 'function' == typeof fs.realpathSync.native ? fs.realpathSync.native(normalized) : fs.realpathSync(normalized);
+                    const normalizedRealPath = path.normalize(realPath);
+                    realPathCache.set(normalized, normalizedRealPath);
+                    return normalizedRealPath;
+                } catch  {
+                    realPathCache.set(normalized, normalized);
+                    return normalized;
+                }
+            };
             const groups = new Map();
             const inNodeModules = /[/\\]node_modules[/\\]/;
             for (const dep of moduleGraph.getDependencies()){
                 if (dep.kind !== SDK.DependencyKind.ImportStatement || inNodeModules.test(dep.module.path) || !inNodeModules.test(dep.dependency.path) || dep.dependency.meta.strictHarmonyModule || ruleConfig.ignore.some((p)=>dep.request.includes(p))) continue;
                 const pkg = packageGraph.getPackageByModule(dep.dependency);
-                const esmEntry = pkg?.root && !ruleConfig.ignore.some((p)=>pkg.name.includes(p)) && readPkgJson(pkg.root) && extractEsmEntry(readPkgJson(pkg.root), pkg.root);
+                if (!pkg?.root) continue;
+                const pkgJson = readPkgJson(pkg.root);
+                const esmEntry = !ruleConfig.ignore.some((p)=>pkg.name.includes(p)) && pkgJson && extractEsmEntry(pkgJson, pkg.root);
                 if (!esmEntry) continue;
-                const groupKey = `${pkg.name}::${dep.dependency.path}`;
+                const resolvedModuleRealPath = toRealPath(dep.dependency.path);
+                if (resolvedModuleRealPath === toRealPath(esmEntry)) continue;
+                const groupKey = `${pkg.name}::${resolvedModuleRealPath}`;
                 const issuer = {
                     id: dep.module.id,
                     path: dep.module.path,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/core",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -69,10 +69,10 @@
     "fs-extra": "^11.1.1",
     "semver": "^7.7.4",
     "source-map": "^0.7.6",
-    "@rsdoctor/graph": "1.5.8",
-    "@rsdoctor/sdk": "1.5.8",
-    "@rsdoctor/utils": "1.5.8",
-    "@rsdoctor/types": "1.5.8"
+    "@rsdoctor/graph": "1.5.9",
+    "@rsdoctor/sdk": "1.5.9",
+    "@rsdoctor/types": "1.5.9",
+    "@rsdoctor/utils": "1.5.9"
   },
   "devDependencies": {
     "@rspack/core": "2.0.0-rc.1",