@rspack-canary/test-tools 1.6.1-canary-a0be7ea2-20251104174026 → 1.6.1-canary-61cb132a-20251105091940

package/dist/runner/node/index.js

@@ -178,6 +178,7 @@ class NodeRunner {
             Buffer,
             setImmediate,
             self: this.globalContext,
+            __TEST_PATH__: __TEST_PATH__,
             __MODE__: this._options.compilerOptions.mode,
             __SNAPSHOT__: node_path_1.default.join(this._options.source, "__snapshot__"),
             Worker: (0, createFakeWorker_1.default)(this._options.env, {

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

@@ -11,7 +11,7 @@ export declare class WebRunner extends NodeRunner {
     getGlobal(name: string): unknown;
     protected log(message: string): void;
     protected createResourceLoader(): {
-        fetch(url: string, _: {
+        fetch(url: string, options: {
             element: HTMLScriptElement;
         }): any;
     };
@@ -27,3 +27,4 @@ export declare class WebRunner extends NodeRunner {
     protected createJSDOMRequirer(): TRunnerRequirer;
     protected createRunner(): void;
 }
+export declare const createLocatedError: (collectedErrors: Error[], offset: number) => (e: Error, file: TRunnerFile) => Error;

package/dist/runner/web/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebRunner = void 0;
+exports.createLocatedError = exports.WebRunner = 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");
@@ -90,7 +90,18 @@ class WebRunner extends node_1.NodeRunner {
     createResourceLoader() {
         const that = this;
         class CustomResourceLoader extends jsdom_1.ResourceLoader {
-            fetch(url, _) {
+            fetch(url, options) {
+                if (that._options.testConfig.resourceLoader) {
+                    that.log(`resource custom loader: start ${url}`);
+                    const content = that._options.testConfig.resourceLoader(url, options.element);
+                    if (content !== undefined) {
+                        that.log(`resource custom loader: accepted`);
+                        return Promise.resolve(content);
+                    }
+                    else {
+                        that.log(`resource custom loader: not found`);
+                    }
+                }
                 const filePath = that.urlToPath(url);
                 that.log(`resource loader: ${url} -> ${filePath}`);
                 let finalCode;
@@ -234,6 +245,19 @@ class WebRunner extends node_1.NodeRunner {
 					return Reflect.set(target, prop, value, receiver);
 				}
 			});`;
+        const proxyLines = proxyCode.split("\n");
+        const locatedError = (0, exports.createLocatedError)(this._options.errors || [], proxyLines.length + 1);
+        const originIt = currentModuleScope.it;
+        currentModuleScope.it = (description, fn) => {
+            return originIt(description, async (...args) => {
+                try {
+                    return await fn(...args);
+                }
+                catch (e) {
+                    throw locatedError(e, 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
@@ -241,13 +265,17 @@ class WebRunner extends node_1.NodeRunner {
             .join(", ");
         this.dom.window[scopeKey] = currentModuleScope;
         this.dom.window["__GLOBAL_SHARED__"] = this.globalContext;
+        this.dom.window["__LOCATED_ERROR__"] = locatedError;
+        this.dom.window["__FILE__"] = file;
         return [
             m,
             `${proxyCode}
-			(function(window, self, globalThis, console, ${args.join(", ")}) {
+			(function(window, self, globalThis, console, ${args.join(", ")}) { try {
 				${file.content}
-			})($$g$$, $$self$$, $$g$$, window["console"], ${argValues});`,
-            proxyCode.split("\n").length + 1
+			} catch (e) {
+				throw __LOCATED_ERROR__(e, window["__FILE__"]);
+			}})($$g$$, $$self$$, $$g$$, window["console"], ${argValues});`,
+            proxyLines.length + 1
         ];
     }
     createJSDOMRequirer() {
@@ -271,7 +299,8 @@ class WebRunner extends node_1.NodeRunner {
                 });
             }
             catch (e) {
-                const error = new Error(`Parse script '${file.path}' failed: ${e.message}`);
+                const error = new Error(`Parse script '${file.path}' failed:\n${e.message}`);
+                error.stack = `${error.message}\n${e.stack}`;
                 this._options.errors?.push(error);
                 throw error;
             }
@@ -286,3 +315,29 @@ class WebRunner extends node_1.NodeRunner {
     }
 }
 exports.WebRunner = WebRunner;
+const createLocatedError = (collectedErrors, offset) => {
+    return (e, file) => {
+        const match = (e.stack || e.message).match(/<anonymous>:(\d+)/);
+        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 = `${message}\n${e.stack}`;
+            collectedErrors.push(finalError);
+            return finalError;
+        }
+        else {
+            return e;
+        }
+    };
+};
+exports.createLocatedError = createLocatedError;

package/dist/type.d.ts

@@ -139,6 +139,7 @@ export type TTestConfig = {
     esmLibPluginOptions?: {
         preserveModules?: string;
     };
+    resourceLoader?: (url: string, element: HTMLScriptElement) => Buffer | null;
 };
 export type TTestFilter = (creatorConfig: Record<string, unknown>, testConfig: TTestConfig) => boolean | string;
 export interface ITestRunner {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack-canary/test-tools",
-  "version": "1.6.1-canary-a0be7ea2-20251104174026",
+  "version": "1.6.1-canary-61cb132a-20251105091940",
   "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-a0be7ea2-20251104174026"
+    "@rspack/core": "npm:@rspack-canary/core@1.6.1-canary-61cb132a-20251105091940"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"