@rspack-canary/test-tools 1.6.1-canary-d808219f-20251101173657 → 1.6.1-canary-46a54daf-20251103113814

package/dist/case/esm-output.js

@@ -35,7 +35,7 @@ const creator = new creator_1.BasicCaseCreator({
                                 target = plugin;
                             }
                             return !isTarget;
-                        });
+                        }) ?? [];
                         options.plugins = [
                             ...otherPlugins,
                             new core_1.default.experiments.EsmLibraryPlugin({

package/dist/runner/node/index.d.ts

@@ -39,4 +39,3 @@ export declare class NodeRunner implements ITestRunner {
     protected createCjsRequirer(): TRunnerRequirer;
     protected createEsmRequirer(): TRunnerRequirer;
 }
-export declare const createLocatedError: (collectedErrors: Error[], offset: number) => (e: Error, file: TRunnerFile) => Error;

package/dist/runner/node/index.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLocatedError = exports.NodeRunner = void 0;
+exports.NodeRunner = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_url_1 = require("node:url");
@@ -45,7 +45,6 @@ const asModule_1 = __importDefault(require("../../helper/legacy/asModule"));
 const createFakeWorker_1 = __importDefault(require("../../helper/legacy/createFakeWorker"));
 const urlToRelativePath_1 = __importDefault(require("../../helper/legacy/urlToRelativePath"));
 const type_1 = require("../../type");
-const EVAL_LOCATION_REGEX = /<anonymous>:(\d+)/;
 const isRelativePath = (p) => /^\.\.?\//.test(p);
 const getSubPath = (p) => {
     const lastSlash = p.lastIndexOf("/");
@@ -347,37 +346,31 @@ class NodeRunner {
                     currentModuleScope.__STATS_I__ = statsIndex;
                 }
             }
-            const createNodeLocatedError = (0, exports.createLocatedError)(this._options.errors || [], 2);
-            const originIt = currentModuleScope.it;
-            currentModuleScope.it = (description, fn) => {
-                originIt(description, async () => {
-                    try {
-                        await fn();
-                    }
-                    catch (err) {
-                        throw createNodeLocatedError(err, file);
-                    }
-                });
-            };
-            currentModuleScope.__CREATE_LOCATED_ERROR__ = createNodeLocatedError;
-            currentModuleScope.__FILE__ = file;
             const args = Object.keys(currentModuleScope);
             const argValues = args.map(arg => currentModuleScope[arg]);
             const code = `(function(${args.join(", ")}) {
-				try {
-					${file.content}
-				} catch(err) {
-					throw __CREATE_LOCATED_ERROR__(err, __FILE__);
-				}
+				${file.content}
       })`;
             this.preExecute(code, file);
             this.log(`run mode: ${this._options.runInNewContext ? "new context" : "this context"}`);
-            const fn = this._options.runInNewContext
-                ? node_vm_1.default.runInNewContext(code, this.globalContext)
-                : node_vm_1.default.runInThisContext(code);
-            fn.call(this._options.testConfig.nonEsmThis
-                ? this._options.testConfig.nonEsmThis(modulePath)
-                : m.exports, ...argValues);
+            try {
+                const fn = this._options.runInNewContext
+                    ? node_vm_1.default.runInNewContext(code, this.globalContext, {
+                        filename: file.path,
+                        lineOffset: -1
+                    })
+                    : node_vm_1.default.runInThisContext(code, {
+                        filename: file.path,
+                        lineOffset: -1
+                    });
+                fn.call(this._options.testConfig.nonEsmThis
+                    ? this._options.testConfig.nonEsmThis(modulePath)
+                    : m.exports, ...argValues);
+            }
+            catch (e) {
+                this._options.errors?.push(e);
+                throw e;
+            }
             this.postExecute(m, file);
             this.log(`end cjs: ${modulePath}`);
             return m.exports;
@@ -454,29 +447,3 @@ class NodeRunner {
     }
 }
 exports.NodeRunner = NodeRunner;
-const createLocatedError = (collectedErrors, offset) => {
-    return (e, file) => {
-        const match = (e.stack || e.message).match(EVAL_LOCATION_REGEX);
-        if (match) {
-            const [, line] = match;
-            const realLine = Number(line) - offset;
-            const codeLines = file.content.split("\n");
-            const lineContents = [
-                ...codeLines
-                    .slice(Math.max(0, realLine - 3), Math.max(0, realLine - 1))
-                    .map(line => `│  ${line}`),
-                `│> ${codeLines[realLine - 1]}`,
-                ...codeLines.slice(realLine, realLine + 2).map(line => `│  ${line}`)
-            ];
-            const message = `Error in JSDOM when running file '${file.path}' at line ${realLine}: ${e.message}\n${lineContents.join("\n")}`;
-            const finalError = new Error(message);
-            finalError.stack = undefined;
-            collectedErrors.push(finalError);
-            return finalError;
-        }
-        else {
-            return e;
-        }
-    };
-};
-exports.createLocatedError = createLocatedError;

package/dist/runner/web/index.d.ts

@@ -21,7 +21,8 @@ export declare class WebRunner extends NodeRunner {
         {
             exports: Record<string, unknown>;
         },
-        string
+        string,
+        number
     ];
     protected createJSDOMRequirer(): TRunnerRequirer;
     protected createRunner(): void;

package/dist/runner/web/index.js

@@ -234,18 +234,6 @@ class WebRunner extends node_1.NodeRunner {
 					return Reflect.set(target, prop, value, receiver);
 				}
 			});`;
-        const createJSDOMLocatedError = (0, node_1.createLocatedError)(this._options.errors || [], proxyCode.split("\n").length + 2);
-        const originIt = currentModuleScope.it;
-        currentModuleScope.it = (description, fn) => {
-            originIt(description, async () => {
-                try {
-                    await fn();
-                }
-                catch (err) {
-                    throw createJSDOMLocatedError(err, file);
-                }
-            });
-        };
         const scopeKey = (0, helper_1.escapeSep)(file.path);
         const args = Object.keys(currentModuleScope).filter(arg => !["window", "self", "globalThis", "console"].includes(arg));
         const argValues = args
@@ -253,18 +241,13 @@ class WebRunner extends node_1.NodeRunner {
             .join(", ");
         this.dom.window[scopeKey] = currentModuleScope;
         this.dom.window["__GLOBAL_SHARED__"] = this.globalContext;
-        this.dom.window["__FILE__"] = file;
-        this.dom.window["__CREATE_LOCATED_ERROR__"] = createJSDOMLocatedError;
         return [
             m,
             `${proxyCode}
 			(function(window, self, globalThis, console, ${args.join(", ")}) {
-				try {
-				  ${file.content}
-				} catch (err) {
-					throw __CREATE_LOCATED_ERROR__(err, __FILE__);
-				}
-			})($$g$$, $$self$$, $$g$$, window["console"], ${argValues});`
+				${file.content}
+			})($$g$$, $$self$$, $$g$$, window["console"], ${argValues});`,
+            proxyCode.split("\n").length + 1
         ];
     }
     createJSDOMRequirer() {
@@ -277,15 +260,20 @@ class WebRunner extends node_1.NodeRunner {
             if (file.path in this.requireCache) {
                 return this.requireCache[file.path].exports;
             }
-            const [m, code] = this.getModuleContent(file);
+            const [m, code, lineOffset] = this.getModuleContent(file);
             this.preExecute(code, file);
             try {
                 const script = new node_vm_1.Script(code);
                 const vmContext = this.dom.getInternalVMContext();
-                script.runInContext(vmContext);
+                script.runInContext(vmContext, {
+                    filename: file.path,
+                    lineOffset: -lineOffset
+                });
             }
             catch (e) {
-                throw new Error(`Parse script '${file.path}' failed: ${e.message}`);
+                const error = new Error(`Parse script '${file.path}' failed: ${e.message}`);
+                this._options.errors?.push(error);
+                throw error;
             }
             this.postExecute(m, file);
             this.requireCache[file.path] = m;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack-canary/test-tools",
-  "version": "1.6.1-canary-d808219f-20251101173657",
+  "version": "1.6.1-canary-46a54daf-20251103113814",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -68,7 +68,7 @@
     "@types/jsdom": "^21.1.7",
     "typescript": "^5.9.3",
     "wast-loader": "^1.14.1",
-    "@rspack/core": "npm:@rspack-canary/core@1.6.1-canary-d808219f-20251101173657"
+    "@rspack/core": "npm:@rspack-canary/core@1.6.1-canary-46a54daf-20251103113814"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"