@shuvi/error-overlay 2.0.0-dev.19 → 2.0.0-dev.21

package/lib/middleware/helper/createOriginalStackFrame.js

@@ -16,19 +16,32 @@ const getModuleById_1 = require("./getModuleById");
 const findOriginalSourcePositionAndContent_1 = require("./findOriginalSourcePositionAndContent");
 function createOriginalStackFrame(_a) {
     return __awaiter(this, arguments, void 0, function* ({ line, column, source, modulePath, frame, errorMessage, compilation }) {
-        var _b, _c, _d, _e, _f, _g, _h;
+        var _b, _c, _d, _e, _f, _g;
         const match = errorMessage === null || errorMessage === void 0 ? void 0 : errorMessage.match(/'([^']+)' module/);
         const moduleNotFound = match && match[1];
         /**
-         * @unsupported Rspack does not support buildInfo.importLocByPath API in the same way as Webpack.
-         * TODO: Use Rspack's equivalent API when available or implement alternative import location lookup.
+         * Handle module not found errors by attempting to get import location.
+         * Falls back to normal source mapping if buildInfo API is not available or if no module error.
          */
-        const result = moduleNotFound && compilation
-            ? (_e = (_d = (_c = (_b = (0, getModuleById_1.getModuleById)(modulePath, compilation)) === null || _b === void 0 ? void 0 : _b.buildInfo) === null || _c === void 0 ? void 0 : _c.importLocByPath) === null || _d === void 0 ? void 0 : _d.get(moduleNotFound)) !== null && _e !== void 0 ? _e : null
-            : yield (0, findOriginalSourcePositionAndContent_1.findOriginalSourcePositionAndContent)(source, {
+        let result = null;
+        if (moduleNotFound && compilation) {
+            try {
+                // Try to use buildInfo.importLocByPath if available (Webpack compatibility)
+                const module = (0, getModuleById_1.getModuleById)(modulePath, compilation);
+                result = (_d = (_c = (_b = module === null || module === void 0 ? void 0 : module.buildInfo) === null || _b === void 0 ? void 0 : _b.importLocByPath) === null || _c === void 0 ? void 0 : _c.get(moduleNotFound)) !== null && _d !== void 0 ? _d : null;
+            }
+            catch (e) {
+                // Rspack may not support this API, fall back to source mapping
+                result = null;
+            }
+        }
+        // If no module error or buildInfo lookup failed, use source mapping
+        if (!result) {
+            result = yield (0, findOriginalSourcePositionAndContent_1.findOriginalSourcePositionAndContent)(source, {
                 line,
                 column
             });
+        }
         if (result === null) {
             return null;
         }
@@ -44,13 +57,13 @@ function createOriginalStackFrame(_a) {
             methodName: frame.methodName,
             arguments: []
         };
-        const originalCodeFrame = !((_g = (_f = originalFrame.file) === null || _f === void 0 ? void 0 : _f.includes('node_modules')) !== null && _g !== void 0 ? _g : true) &&
+        const originalCodeFrame = !((_f = (_e = originalFrame.file) === null || _e === void 0 ? void 0 : _e.includes('node_modules')) !== null && _f !== void 0 ? _f : true) &&
             sourceContent &&
             sourcePosition.line
             ? (0, code_frame_1.codeFrameColumns)(sourceContent, {
                 start: {
                     line: sourcePosition.line,
-                    column: (_h = sourcePosition.column) !== null && _h !== void 0 ? _h : 0
+                    column: (_g = sourcePosition.column) !== null && _g !== void 0 ? _g : 0
                 }
             }, { forceColor: true })
             : null;

package/lib/middleware/helper/getModuleById.js

@@ -3,12 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModuleById = getModuleById;
 function getModuleById(id, compilation) {
     /**
-     * @unsupported Rspack does not support ChunkGraph API in the same way as Webpack.
-     * TODO: Use Rspack's equivalent API when available or implement alternative module lookup.
+     * Find module by ID using ChunkGraph API.
+     * Both Webpack and Rspack support this API pattern.
      */
-    // return [...compilation.modules].find(
-    //   searchModule => compilation.chunkGraph.getModuleId(searchModule) === id
-    // );
-    // Fallback implementation for Rspack
     return [...compilation.modules].find(searchModule => compilation.chunkGraph.getModuleId(searchModule) === id);
 }

package/lib/middleware/helper/getOriginalStackFrame.js

@@ -15,8 +15,8 @@ function getOriginalStackFrame(frame, cache, resolveBuildFile, buildDir, errorMe
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         /**
-         * @unsupported Rspack may use different internal URL patterns than webpack-internal:.
-         * TODO: Update URL pattern detection to match Rspack's internal URL format when available.
+         * Handle internal module URLs from both Webpack and Rspack.
+         * Rspack uses 'rspack-internal:' prefix, while Webpack uses 'webpack-internal:'.
          */
         if (!(((_a = frame.file) === null || _a === void 0 ? void 0 : _a.startsWith('webpack-internal:')) ||
             ((_b = frame.file) === null || _b === void 0 ? void 0 : _b.startsWith('rspack-internal:')) ||
@@ -48,8 +48,8 @@ function getOriginalStackFrame(frame, cache, resolveBuildFile, buildDir, errorMe
             frameColumn = null;
         }
         /**
-         * @unsupported Rspack may use different internal URL patterns than webpack-internal:.
-         * TODO: Update URL pattern replacement to match Rspack's internal URL format when available.
+         * Strip internal URL prefixes to get the actual module path.
+         * Both Webpack and Rspack internal URLs are handled uniformly.
          */
         const originalStackFrameResponse = yield (0, createOriginalStackFrame_1.createOriginalStackFrame)({
             line: frameLine,

package/lib/middleware/helper/getSourceById.js

@@ -43,8 +43,7 @@ const getModuleById_1 = require("./getModuleById");
 const readFileWrapper = (url, compiler) => {
     return new Promise(resolve => {
         /**
-         * @unsupported Rspack may have different outputFileSystem API.
-         * TODO: Verify Rspack's outputFileSystem implementation and update accordingly.
+         * Both Webpack and Rspack use the same outputFileSystem API pattern.
          */
         if (!compiler.outputFileSystem) {
             resolve(null);
@@ -104,7 +103,7 @@ function getRawSourceMap(fileUrl, compiler) {
 }
 function getSourceById(isFile, id, compiler, resolveBuildFile, buildDir, compilation) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (isFile) {
             const pathName = path.isAbsolute(id)
                 ? id
@@ -125,12 +124,31 @@ function getSourceById(isFile, id, compiler, resolveBuildFile, buildDir, compila
             }
             const module = (0, getModuleById_1.getModuleById)(id, compilation);
             /**
-             * @unsupported Rspack does not support codeGenerationResults API in the same way as Webpack.
-             * TODO: Use Rspack's equivalent API when available or implement alternative source extraction.
+             * Try to get source from codeGenerationResults API.
+             * Handle potential differences between Webpack and Rspack gracefully.
              */
-            return ((_b = (module &&
-                ((_a = compilation.codeGenerationResults
-                    .get(module)) === null || _a === void 0 ? void 0 : _a.sources.get('javascript')))) !== null && _b !== void 0 ? _b : null);
+            if (module) {
+                try {
+                    // Try the standard codeGenerationResults API
+                    const codeGenResults = compilation.codeGenerationResults;
+                    if (codeGenResults) {
+                        const moduleResults = codeGenResults.get(module);
+                        const source = (_a = moduleResults === null || moduleResults === void 0 ? void 0 : moduleResults.sources) === null || _a === void 0 ? void 0 : _a.get('javascript');
+                        if (source) {
+                            return source;
+                        }
+                    }
+                    // Fallback: try alternative source extraction methods
+                    // This handles cases where Rspack might use different internal structures
+                    if (module._source) {
+                        return module._source;
+                    }
+                }
+                catch (e) {
+                    console.warn('Failed to extract source using codeGenerationResults, trying fallback methods');
+                }
+            }
+            return null;
         }
         catch (err) {
             console.error(`Failed to lookup module by ID ("${id}"):`, err);

package/lib/middleware/stackFrameMiddleware.js

@@ -33,8 +33,8 @@ function stackFrameMiddleware(originalStackFrameEndpoint, bundler, resolveBuildF
         yield Promise.all(files.map((fileName) => __awaiter(this, void 0, void 0, function* () {
             try {
                 /**
-                 * @unsupported Rspack may use different module resolution patterns than webpack-internal:///.
-                 * TODO: Update module resolution pattern after confirming Rspack's internal module format.
+                 * Strip internal URL prefixes to get module ID.
+                 * Handles both Webpack (webpack-internal://) and Rspack (rspack-internal://) URL patterns.
                  */
                 const moduleId = fileName.replace(/^(webpack-internal:\/\/\/|file:\/\/|rspack-internal:\/\/\/)/, '');
                 const source = yield (0, getSourceById_1.getSourceById)(fileName.startsWith('file:'), moduleId, compiler, resolveBuildFile, buildDir, compilation);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/error-overlay",
-  "version": "2.0.0-dev.19",
+  "version": "2.0.0-dev.21",
   "main": "umd/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "@babel/code-frame": "7.14.5",
-    "@shuvi/shared": "2.0.0-dev.19",
-    "@shuvi/toolpack": "2.0.0-dev.19",
+    "@shuvi/shared": "2.0.0-dev.21",
+    "@shuvi/toolpack": "2.0.0-dev.21",
     "anser": "1.4.9",
     "data-uri-to-buffer": "3.0.1",
     "html-entities": "2.3.2",