@rsdoctor/core 1.2.0-beta.1 → 1.2.0-beta.2

package/dist/inner-plugins/plugins/ensureModulesChunkGraph.d.ts

@@ -25,4 +25,13 @@ export declare const ensureModulesChunksGraphFn: (compiler: Plugin.BaseCompiler,
  * @returns true if source maps are enabled and supported, false otherwise.
  */
 export declare const ensureDevtools: (compiler: Plugin.BaseCompiler) => boolean;
+/**
+ * Calculates namespace and source map filename regex for source map resolution.
+ * @param compiler - The Webpack or Rspack compiler instance.
+ * @returns An object containing namespace and sourceMapFilenameRegex.
+ */
+export declare function calculateNamespaceAndRegex(compiler: Plugin.BaseCompiler): {
+    namespace: string;
+    sourceMapFilenameRegex: RegExp;
+};
 //# sourceMappingURL=ensureModulesChunkGraph.d.ts.map

package/dist/inner-plugins/plugins/ensureModulesChunkGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensureModulesChunkGraph.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/ensureModulesChunkGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAiB,MAAM,iBAAiB,CAAC;AAehE;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAID;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,aAC3B,MAAM,CAAC,YAAY,SACtB,sBAAsB,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,SA4D5E,CAAC;AAmHF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,aAAc,MAAM,CAAC,YAAY,YA0B3D,CAAC"}
+{"version":3,"file":"ensureModulesChunkGraph.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/ensureModulesChunkGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAiB,MAAM,iBAAiB,CAAC;AAehE;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAID;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,aAC3B,MAAM,CAAC,YAAY,SACtB,sBAAsB,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,SAmE5E,CAAC;AAmHF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,aAAc,MAAM,CAAC,YAAY,YA0B3D,CAAC;AAyCF;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY;eAoB5C,MAAM;;EAGjC"}

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

@@ -24,8 +24,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    ensureModulesChunksGraphFn: ()=>ensureModulesChunksGraphFn,
-    ensureDevtools: ()=>ensureDevtools
+    calculateNamespaceAndRegex: ()=>calculateNamespaceAndRegex,
+    ensureDevtools: ()=>ensureDevtools,
+    ensureModulesChunksGraphFn: ()=>ensureModulesChunksGraphFn
 });
 const types_namespaceObject = require("@rsdoctor/types");
 const build_namespaceObject = require("@rsdoctor/utils/build");
@@ -55,7 +56,8 @@ const ensureModulesChunksGraphFn = (compiler, _this)=>{
         stage: external_constants_js_namespaceObject.pluginTapPostOptions.stage + 100
     }, async (compilation)=>{
         if (!ensureDevtools(compiler)) return;
-        await (0, external_sourcemapTool_js_namespaceObject.handleAfterEmitAssets)(compilation, _this);
+        const { namespace, sourceMapFilenameRegex } = calculateNamespaceAndRegex(compiler);
+        await (0, external_sourcemapTool_js_namespaceObject.handleAfterEmitAssets)(compilation, _this, sourceMapFilenameRegex, namespace);
     });
     compiler.hooks.emit.tapAsync({
         ...external_constants_js_namespaceObject.pluginTapPostOptions,
@@ -118,25 +120,34 @@ async function getModulesInfos(compiler, moduleGraph, chunkGraph, parseBundle, s
 function escapeRegExp(str) {
     return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
-async function emitHandler(_this, compiler, compilation, callback) {
+function calculateNamespaceAndRegex(compiler) {
     var _compiler_options_output_library;
-    if (!ensureDevtools(compiler)) return void callback();
     let namespace = compiler.options.output.devtoolNamespace || (null == (_compiler_options_output_library = compiler.options.output.library) ? void 0 : _compiler_options_output_library.name) || '[^/]+/';
     if (Array.isArray(namespace)) namespace = namespace[0];
     else if ('object' == typeof namespace && 'name' in namespace) namespace = namespace.name;
     const safeNamespace = escapeRegExp(namespace);
     const sourceMapFilenameRegex = new RegExp(`(?:webpack://)?(?:${safeNamespace})?([^?]*)`);
+    return {
+        namespace: namespace,
+        sourceMapFilenameRegex
+    };
+}
+async function emitHandler(_this, compiler, compilation, callback) {
+    if (!ensureDevtools(compiler)) return void callback();
+    const { namespace, sourceMapFilenameRegex } = calculateNamespaceAndRegex(compiler);
     await (0, external_sourcemapTool_js_namespaceObject.handleEmitAssets)({
         compilation,
         pluginInstance: _this,
         sourceMapFilenameRegex,
-        namespace: namespace
+        namespace
     });
     callback();
 }
+exports.calculateNamespaceAndRegex = __webpack_exports__.calculateNamespaceAndRegex;
 exports.ensureDevtools = __webpack_exports__.ensureDevtools;
 exports.ensureModulesChunksGraphFn = __webpack_exports__.ensureModulesChunksGraphFn;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "calculateNamespaceAndRegex",
     "ensureDevtools",
     "ensureModulesChunksGraphFn"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];

package/dist/inner-plugins/plugins/sourcemapTool.d.ts

@@ -40,7 +40,7 @@ export declare function collectSourceMaps(map: any, assetLinesCodeList: string[]
  * @param _this - The Rsdoctor plugin instance.
  * @param sourceMapFilenameRegex - Regex to extract file paths from source map sources.
  */
-export declare function handleAfterEmitAssets(compilation: Plugin.BaseCompilation, _this: RsdoctorPluginInstance<Plugin.BaseCompiler, Linter.ExtendRuleData<any, string>[]>, sourceMapFilenameRegex?: RegExp): Promise<void>;
+export declare function handleAfterEmitAssets(compilation: Plugin.BaseCompilation, _this: RsdoctorPluginInstance<Plugin.BaseCompiler, Linter.ExtendRuleData<any, string>[]>, sourceMapFilenameRegex?: RegExp, namespace?: string): Promise<void>;
 /**
  * Handles source map collection for Webpack assets (non-Rspack).
  * Iterates over all assets, parses them, and collects source maps.

package/dist/inner-plugins/plugins/sourcemapTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sourcemapTool.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/sourcemapTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAOjD,eAAO,MAAM,UAAU,iBAAiB,CAAC;AAEzC;;;;;;GAMG;AACH,UAAU,qBAAqB;IAC7B,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC;IACpC,cAAc,EAAE,sBAAsB,CACpC,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CACrC,CAAC;IACF,sBAAsB,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,YAGX,MAAM,0BAA0B,MAAM,KAAG,MAAM,CAqBhE;AAED;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,kBAAkB,EAAE,MAAM,EAAE,EAC5B,YAAY,EAAE,MAAM,CAAC,eAAe,EACpC,KAAK,EAAE,sBAAsB,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,EAC3E,sBAAsB,CAAC,EAAE,MAAM,EAC/B,SAAS,CAAC,EAAE,MAAM,iBAqDnB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,CAAC,eAAe,EACnC,KAAK,EAAE,sBAAsB,CAC3B,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CACrC,EACD,sBAAsB,CAAC,EAAE,MAAM,iBAuBhC;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,iBA+BpE"}
+{"version":3,"file":"sourcemapTool.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/sourcemapTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAQjD,eAAO,MAAM,UAAU,iBAAiB,CAAC;AAEzC;;;;;;GAMG;AACH,UAAU,qBAAqB;IAC7B,WAAW,EAAE,MAAM,CAAC,eAAe,CAAC;IACpC,cAAc,EAAE,sBAAsB,CACpC,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CACrC,CAAC;IACF,sBAAsB,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,YAGX,MAAM,0BAA0B,MAAM,KAAG,MAAM,CAuBhE;AAED;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,kBAAkB,EAAE,MAAM,EAAE,EAC5B,YAAY,EAAE,MAAM,CAAC,eAAe,EACpC,KAAK,EAAE,sBAAsB,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,EAC3E,sBAAsB,CAAC,EAAE,MAAM,EAC/B,SAAS,CAAC,EAAE,MAAM,iBAyDnB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,CAAC,eAAe,EACnC,KAAK,EAAE,sBAAsB,CAC3B,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CACrC,EACD,sBAAsB,CAAC,EAAE,MAAM,EAC/B,SAAS,CAAC,EAAE,MAAM,iBAkEnB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,iBA+BpE"}

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

@@ -30,6 +30,7 @@ __webpack_require__.d(__webpack_exports__, {
     handleAfterEmitAssets: ()=>handleAfterEmitAssets,
     handleEmitAssets: ()=>handleEmitAssets
 });
+const common_namespaceObject = require("@rsdoctor/utils/common");
 const logger_namespaceObject = require("@rsdoctor/utils/logger");
 const external_path_namespaceObject = require("path");
 const external_source_map_namespaceObject = require("source-map");
@@ -39,10 +40,11 @@ function bindContextCache(context, namespace, cache) {
     return (source, sourceMapFilenameRegex)=>{
         if (cache.has(source)) return cache.get(source);
         let resolved = UNASSIGNED;
-        if (source.startsWith('webpack://')) {
+        if (source.startsWith('file://')) resolved = (0, external_path_namespaceObject.resolve)(context, source.replace(/^file:\/\//, ''));
+        else if (source.startsWith('webpack://')) {
             const match = source.match(sourceMapFilenameRegex);
             const filePath = null == match ? void 0 : match[1];
-            const hasNamespace = namespace && source.startsWith(`webpack://${namespace}`);
+            const hasNamespace = namespace && source.startsWith(`webpack://${namespace}`) || namespace && source.startsWith(`file://${namespace}`);
             const baseDir = hasNamespace ? process.cwd() : context;
             resolved = filePath ? (0, external_path_namespaceObject.resolve)(baseDir, `./${filePath}`) : UNASSIGNED;
         } else resolved = (0, external_path_namespaceObject.resolve)(context, source);
@@ -68,7 +70,7 @@ async function collectSourceMaps(map, assetLinesCodeList, _compilation, _this, s
                 const m = mappings[i];
                 if (!m.source) continue;
                 let realSource = m.source.split('!').pop();
-                if ((null == realSource ? void 0 : realSource.startsWith('webpack://')) && sourceMapFilenameRegex) realSource = getRealSourcePath(realSource, sourceMapFilenameRegex);
+                if (((null == realSource ? void 0 : realSource.startsWith('webpack://')) || (null == realSource ? void 0 : realSource.startsWith('file://'))) && sourceMapFilenameRegex) realSource = getRealSourcePath(realSource, sourceMapFilenameRegex);
                 if (!realSource) continue;
                 const next = mappings[i + 1];
                 const start = m.generatedColumn;
@@ -80,7 +82,7 @@ async function collectSourceMaps(map, assetLinesCodeList, _compilation, _this, s
         }
     }
 }
-async function handleAfterEmitAssets(compilation, _this, sourceMapFilenameRegex) {
+async function handleAfterEmitAssets(compilation, _this, sourceMapFilenameRegex, namespace) {
     if ('rspack' in compilation.compiler) {
         _this.sourceMapSets = new Map();
         (0, logger_namespaceObject.time)('ensureModulesChunkGraph.afterEmit.start');
@@ -88,9 +90,27 @@ async function handleAfterEmitAssets(compilation, _this, sourceMapFilenameRegex)
             ...compilation.getAssets()
         ];
         for (const asset of assets){
-            const { assetLinesCodeList, map } = parseAsset(asset, assets, 'js/css');
-            if (map) try {
-                await collectSourceMaps(map, assetLinesCodeList, compilation, _this, sourceMapFilenameRegex);
+            const { assetLinesCodeList, map: mapFromAsset } = parseAsset(asset, assets, 'js/css');
+            let map = mapFromAsset;
+            if (!map) {
+                var _asset_info_related;
+                let sourceMapFile = null == (_asset_info_related = asset.info.related) ? void 0 : _asset_info_related.sourceMap;
+                sourceMapFile = null == sourceMapFile ? void 0 : sourceMapFile.replace(/(\.[^.]+)(\.[^.]+)?$/, '$1');
+                if (!sourceMapFile) continue;
+                {
+                    let sourceMapAsset = assets.find((asset)=>asset.name === sourceMapFile);
+                    if (!sourceMapAsset) {
+                        const baseNameWithoutHash = common_namespaceObject.Graph.formatAssetName(sourceMapFile, 'string' == typeof compilation.options.output.filename ? compilation.options.output.filename : void 0);
+                        sourceMapAsset = assets.find((asset)=>{
+                            const assetBaseName = common_namespaceObject.Graph.formatAssetName(asset.name, 'string' == typeof compilation.options.output.filename ? compilation.options.output.filename : void 0);
+                            return assetBaseName.includes(baseNameWithoutHash) && asset.name.endsWith('.map');
+                        });
+                    }
+                    if (sourceMapAsset) map = JSON.parse(sourceMapAsset.source.source().toString());
+                }
+            }
+            try {
+                await collectSourceMaps(map, assetLinesCodeList, compilation, _this, sourceMapFilenameRegex, namespace);
             } catch (e) {
                 logger_namespaceObject.logger.error(e);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/core",
-  "version": "1.2.0-beta.1",
+  "version": "1.2.0-beta.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -73,14 +73,14 @@
     "semver": "^7.7.2",
     "source-map": "^0.7.4",
     "source-map-js": "^1.2.1",
-    "@rsdoctor/graph": "1.2.0-beta.1",
-    "@rsdoctor/sdk": "1.2.0-beta.1",
-    "@rsdoctor/types": "1.2.0-beta.1",
-    "@rsdoctor/utils": "1.2.0-beta.1"
+    "@rsdoctor/graph": "1.2.0-beta.2",
+    "@rsdoctor/sdk": "1.2.0-beta.2",
+    "@rsdoctor/types": "1.2.0-beta.2",
+    "@rsdoctor/utils": "1.2.0-beta.2"
   },
   "devDependencies": {
     "@rslib/core": "^0.11.0",
-    "@rspack/core": "1.4.8",
+    "@rspack/core": "1.4.11",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.20",
     "@types/node": "^22.8.1",
@@ -98,7 +98,6 @@
   },
   "publishConfig": {
     "access": "public",
-    "provenance": true,
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {