npm - @rspack-canary/test-tools - Versions diffs - 1.6.0-canary-beafb11e-20251019174144 → 1.6.0-canary-0eb13821-20251021173640 - Mend

@rspack-canary/test-tools 1.6.0-canary-beafb11e-20251019174144 → 1.6.0-canary-0eb13821-20251021173640

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

package/dist/case/cache.js +3 -0
package/dist/case/common.d.ts +1 -0
package/dist/case/common.js +15 -12
package/dist/case/config.js +4 -1
package/dist/case/esm-output.js +28 -2
package/dist/case/hot.d.ts +1 -1
package/dist/case/hot.js +4 -3
package/dist/case/incremental.d.ts +1 -1
package/dist/case/incremental.js +1 -20
package/dist/case/normal.js +3 -0
package/dist/case/runner.d.ts +1 -1
package/dist/case/runner.js +4 -3
package/dist/case/watch.d.ts +3 -1
package/dist/case/watch.js +5 -4
package/dist/helper/hot-update/plugin.js +1 -1
package/dist/helper/legacy/asModule.js +0 -2
package/dist/helper/legacy/createLazyTestEnv.d.ts +1 -0
package/dist/helper/legacy/createLazyTestEnv.js +3 -1
package/dist/helper/legacy/supportsTextDecoder.d.ts +2 -0
package/dist/helper/legacy/supportsTextDecoder.js +9 -0
package/dist/helper/setup-env.js +15 -0
package/dist/runner/node/index.js +7 -3
package/dist/runner/web/index.d.ts +20 -7
package/dist/runner/web/index.js +293 -18
package/dist/test/creator.js +13 -7
package/dist/test/tester.d.ts +1 -0
package/dist/test/tester.js +5 -0
package/dist/type.d.ts +5 -5
package/dist/type.js +1 -6
package/jest.d.ts +2 -0
package/package.json +3 -3
package/dist/helper/legacy/FakeDocument.d.ts +0 -54
package/dist/helper/legacy/FakeDocument.js +0 -280
package/dist/helper/legacy/walkCssTokens.d.ts +0 -40
package/dist/helper/legacy/walkCssTokens.js +0 -761
package/dist/runner/web/fake.d.ts +0 -15
package/dist/runner/web/fake.js +0 -215
package/dist/runner/web/jsdom.d.ts +0 -24
package/dist/runner/web/jsdom.js +0 -241

package/dist/runner/web/index.js CHANGED Viewed

@@ -1,32 +1,307 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebRunner = void 0;
-const type_1 = require("../../type");
-const fake_1 = require("./fake");
-const jsdom_1 = require("./jsdom");
-class WebRunner {
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_url_1 = require("node:url");
+const node_vm_1 = require("node:vm");
+const jsdom_1 = require("jsdom");
+const helper_1 = require("../../helper");
+const EventSourceForNode_1 = __importDefault(require("../../helper/legacy/EventSourceForNode"));
+const urlToRelativePath_1 = __importDefault(require("../../helper/legacy/urlToRelativePath"));
+const node_1 = require("../node");
+const EVAL_LOCATION_REGEX = /<anonymous>:(\d+)/;
+// Compatibility code to suppress iconv-lite warnings
+require("iconv-lite").skipDecodeWarning = true;
+const FAKE_HOSTS = [
+    "https://example.com/public/path",
+    "https://example.com",
+    "https://test.cases/path/",
+    "https://test.cases/server/",
+    "https://test.cases"
+];
+const FAKE_TEST_ROOT_HOST = "https://test.cases/root/";
+class WebRunner extends node_1.NodeRunner {
     constructor(_webOptions) {
+        super(_webOptions);
         this._webOptions = _webOptions;
-        this.originMethods = {};
-        const { dom } = _webOptions;
-        if (dom === type_1.EDocumentType.Fake) {
-            this.implement = new fake_1.FakeDocumentWebRunner(_webOptions);
+        const virtualConsole = new jsdom_1.VirtualConsole({});
+        virtualConsole.sendTo(console, {
+            omitJSDOMErrors: true
+        });
+        this.dom = new jsdom_1.JSDOM(`
+      <!doctype html>
+      <html>
+      <head></head>
+      <body></body>
+      </html>
+    `, {
+            url: this._webOptions.location,
+            resources: this.createResourceLoader(),
+            runScripts: "dangerously",
+            virtualConsole
+        });
+        this.dom.window.console = console;
+        // compat with FakeDocument
+        this.dom.window.eval(`
+      Object.defineProperty(document.head, "_children", {
+        get: function() {
+          return Array.from(document.head.children).map(function(ele) {
+            var type = ele.tagName.toLowerCase();
+            return new Proxy(ele, {
+              get(target, prop, receiver) {
+                if (prop === "_type") {
+                  return target.tagName.toLowerCase();
+                }
+                if (prop === "_href") {
+                  return Reflect.get(target, "href", receiver);
+                }
+                return Reflect.get(target, prop, receiver);
+              },
+            });
+          });
         }
-        else if (dom === type_1.EDocumentType.JSDOM) {
-            this.implement = new jsdom_1.JSDOMWebRunner(_webOptions);
-        }
-        else {
-            throw new Error(`Dom type "${dom}" of web runner is not support yet`);
+      });
+    `);
+        if (this._options.compilerOptions.node !== false) {
+            const vmContext = this.dom.getInternalVMContext();
+            vmContext.global = {};
         }
     }
     run(file) {
-        return this.implement.run(file);
-    }
-    getRequire() {
-        return this.implement.getRequire();
+        if (!file.endsWith(".js") && !file.endsWith(".mjs")) {
+            const cssElement = this.dom.window.document.createElement("link");
+            cssElement.href = file;
+            cssElement.rel = "stylesheet";
+            this.dom.window.document.head.appendChild(cssElement);
+            return Promise.resolve();
+        }
+        return super.run(file);
     }
     getGlobal(name) {
-        return this.implement.getGlobal(name);
+        return this.globalContext[name];
+    }
+    createResourceLoader() {
+        const that = this;
+        class CustomResourceLoader extends jsdom_1.ResourceLoader {
+            fetch(url, _) {
+                const filePath = that.urlToPath(url);
+                let finalCode;
+                if (node_path_1.default.extname(filePath) === ".js") {
+                    const currentDirectory = node_path_1.default.dirname(filePath);
+                    const file = that.getFile(filePath, currentDirectory);
+                    if (!file) {
+                        throw new Error(`File not found: ${filePath}`);
+                    }
+                    const [_m, code] = that.getModuleContent(file);
+                    finalCode = code;
+                }
+                else {
+                    finalCode = node_fs_1.default.readFileSync(filePath);
+                }
+                try {
+                    that.dom.window["__LINK_SHEET__"] ??= {};
+                    that.dom.window["__LINK_SHEET__"][url] = finalCode.toString();
+                    return Promise.resolve(finalCode);
+                }
+                catch (err) {
+                    console.error(err);
+                    if (err.code === "ENOENT") {
+                        return null;
+                    }
+                    throw err;
+                }
+            }
+        }
+        return new CustomResourceLoader();
+    }
+    urlToPath(url) {
+        if (url.startsWith("file://")) {
+            return (0, node_url_1.fileURLToPath)(url);
+        }
+        if (url.startsWith(FAKE_TEST_ROOT_HOST)) {
+            return node_path_1.default.resolve(__TEST_PATH__, `./${url.slice(FAKE_TEST_ROOT_HOST.length)}`);
+        }
+        let dist = url;
+        for (const host of FAKE_HOSTS) {
+            if (url.startsWith(host)) {
+                dist = url.slice(host.length);
+                break;
+            }
+        }
+        return node_path_1.default.resolve(this._webOptions.dist, `./${dist}`).split("?")[0];
+    }
+    createBaseModuleScope() {
+        const moduleScope = super.createBaseModuleScope();
+        moduleScope.EventSource = EventSourceForNode_1.default;
+        moduleScope.fetch = async (url) => {
+            try {
+                const buffer = await new Promise((resolve, reject) => node_fs_1.default.readFile(this.urlToPath(url), (err, b) => err ? reject(err) : resolve(b)));
+                return {
+                    status: 200,
+                    ok: true,
+                    json: async () => JSON.parse(buffer.toString("utf-8"))
+                };
+            }
+            catch (err) {
+                if (err.code === "ENOENT") {
+                    return {
+                        status: 404,
+                        ok: false
+                    };
+                }
+                throw err;
+            }
+        };
+        moduleScope.URL = URL;
+        moduleScope.importScripts = (url) => {
+            this._options.env.expect(url).toMatch(/^https:\/\/test\.cases\/path\//);
+            this.requirers.get("entry")(this._options.dist, (0, urlToRelativePath_1.default)(url));
+        };
+        moduleScope.getComputedStyle = (element) => {
+            const computedStyle = this.dom.window.getComputedStyle(element);
+            const getPropertyValue = computedStyle.getPropertyValue.bind(computedStyle);
+            return {
+                ...computedStyle,
+                getPropertyValue(v) {
+                    return getPropertyValue(v);
+                }
+            };
+        };
+        moduleScope.window = this.dom.window;
+        moduleScope.document = this.dom.window.document;
+        moduleScope.getLinkSheet = (link) => {
+            return this.dom.window["__LINK_SHEET__"][link.href];
+        };
+        return moduleScope;
+    }
+    getModuleContent(file) {
+        const m = {
+            exports: {}
+        };
+        const currentModuleScope = this.createModuleScope(this.getRequire(), m, file);
+        if (this._options.testConfig.moduleScope) {
+            this._options.testConfig.moduleScope(currentModuleScope, this._options.stats, this._options.compilerOptions);
+        }
+        if (file.content.includes("__STATS__")) {
+            currentModuleScope.__STATS__ = this._options.stats?.();
+        }
+        if (file.content.includes("__STATS_I__")) {
+            const statsIndex = this._options.stats?.()?.__index__;
+            if (typeof statsIndex === "number") {
+                currentModuleScope.__STATS_I__ = statsIndex;
+            }
+        }
+        const createLocatedError = (e, file) => {
+            const match = (e.stack || e.message).match(EVAL_LOCATION_REGEX);
+            if (match) {
+                const [, line] = match;
+                const realLine = Number(line) - 34;
+                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;
+                return finalError;
+            }
+            else {
+                return e;
+            }
+        };
+        const originIt = currentModuleScope.it;
+        currentModuleScope.it = (description, fn) => {
+            originIt(description, async () => {
+                try {
+                    await fn();
+                }
+                catch (err) {
+                    throw createLocatedError(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
+            .map(arg => `window["${scopeKey}"]["${arg}"]`)
+            .join(", ");
+        this.dom.window[scopeKey] = currentModuleScope;
+        this.dom.window["__GLOBAL_SHARED__"] = this.globalContext;
+        this.dom.window["__FILE__"] = file;
+        this.dom.window["__CREATE_LOCATED_ERROR__"] = createLocatedError;
+        return [
+            m,
+            `// hijack document.currentScript for auto public path
+			var $$g$$ = new Proxy(window, {
+				get(target, prop, receiver) {
+					if (prop === "document") {
+						return new Proxy(window.document, {
+							get(target, prop, receiver) {
+								if (prop === "currentScript") {
+									var script = target.createElement("script");
+									script.src = "https://test.cases/path/${(0, helper_1.escapeSep)(file.subPath)}index.js";
+									return script;
+								}
+								return Reflect.get(target, prop, receiver);
+							}
+						});
+					}
+					return Reflect.get(target, prop, receiver);
+				},
+			});
+			var $$self$$ = new Proxy(window, {
+				get(target, prop, receiver) {
+				  if (prop === "__HMR_UPDATED_RUNTIME__") {
+					  return window["__GLOBAL_SHARED__"]["__HMR_UPDATED_RUNTIME__"];
+					}
+					return Reflect.get(target, prop, receiver);
+				},
+				set(target, prop, value, receiver) {
+					if (prop === "__HMR_UPDATED_RUNTIME__") {
+						window["__GLOBAL_SHARED__"]["__HMR_UPDATED_RUNTIME__"] = value;
+					}
+					return Reflect.set(target, prop, value, receiver);
+				}
+			});
+			(function(window, self, globalThis, console, ${args.join(", ")}) {
+				try {
+				  ${file.content}
+				} catch (err) {
+					throw __CREATE_LOCATED_ERROR__(err, __FILE__);
+				}
+			})($$g$$, $$self$$, $$g$$, window["console"], ${argValues});`
+        ];
+    }
+    createJSDOMRequirer() {
+        return (currentDirectory, modulePath, context = {}) => {
+            const file = context.file || this.getFile(modulePath, currentDirectory);
+            if (!file) {
+                return this.requirers.get("miss")(currentDirectory, modulePath);
+            }
+            if (file.path in this.requireCache) {
+                return this.requireCache[file.path].exports;
+            }
+            const [m, code] = this.getModuleContent(file);
+            this.preExecute(code, file);
+            const script = new node_vm_1.Script(code);
+            const vmContext = this.dom.getInternalVMContext();
+            script.runInContext(vmContext);
+            this.postExecute(m, file);
+            this.requireCache[file.path] = m;
+            return m.exports;
+        };
+    }
+    createRunner() {
+        super.createRunner();
+        this.requirers.set("cjs", this.createJSDOMRequirer());
     }
 }
 exports.WebRunner = WebRunner;

package/dist/test/creator.js CHANGED Viewed

@@ -97,10 +97,11 @@ class BasicCaseCreator {
                 : index
                     ? `step [${index}] should pass`
                     : "should pass";
-            it(description, cb => {
-                stepSignal.then((e) => {
-                    cb(e);
-                });
+            it(description, async () => {
+                const e = await stepSignal;
+                if (e) {
+                    throw e;
+                }
             }, options.timeout || 300000);
             chain = chain.then(async () => {
                 try {
@@ -108,6 +109,7 @@ class BasicCaseCreator {
                     await tester.compile();
                     await tester.check(env);
                     await env.run();
+                    await tester.after();
                     const context = tester.getContext();
                     if (!tester.next() && context.hasError()) {
                         const errors = context
@@ -215,8 +217,11 @@ class BasicCaseCreator {
                     try {
                         await runFn(fn);
                     }
-                    catch (e) {
-                        throw new Error(`Error: ${description} failed\n${e.stack}`);
+                    catch (err) {
+                        const e = err;
+                        const message = `Error: ${description} failed:\n${e.message}`;
+                        e.message = message;
+                        throw e;
                     }
                     for (const after of afterTasks) {
                         await runFn(after);
@@ -237,7 +242,8 @@ class BasicCaseCreator {
                 expect(typeof fn === "function");
                 afterTasks.push(fn);
             },
-            jest
+            jest: global.jest || global.rstest,
+            rstest: global.rstest
         };
     }
     createEnv(testConfig, options) {

package/dist/test/tester.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export declare class Tester implements ITester {
     prepare(): Promise<void>;
     compile(): Promise<void>;
     check(env: ITestEnv): Promise<void>;
+    after(): Promise<void>;
     next(): boolean;
     resume(): Promise<void>;
     private runStepMethods;

package/dist/test/tester.js CHANGED Viewed

@@ -55,6 +55,11 @@ class Tester {
         if (!currentStep)
             return;
         await this.runCheckStepMethods(currentStep, env, this.context.hasError() ? ["check"] : ["run", "check"]);
+    }
+    async after() {
+        const currentStep = this.steps[this.step];
+        if (!currentStep)
+            return;
         await this.runStepMethods(currentStep, ["after"], true);
     }
     next() {

package/dist/type.d.ts CHANGED Viewed

@@ -63,6 +63,7 @@ export interface ITester {
     prepare(): Promise<void>;
     compile(): Promise<void>;
     check(env: ITestEnv): Promise<void>;
+    after(): Promise<void>;
     next(): boolean;
     resume(): Promise<void>;
 }
@@ -129,12 +130,8 @@ export interface ITestEnv {
     afterEach: (...args: any[]) => void;
     [key: string]: unknown;
 }
-export declare enum EDocumentType {
-    Fake = "fake",
-    JSDOM = "jsdom"
-}
 export type TTestConfig<T extends ECompilerType> = {
-    documentType?: EDocumentType;
+    location?: string;
     validate?: (stats: TCompilerStats<T> | TCompilerMultiStats<T>, stderr?: string) => void;
     noTests?: boolean;
     writeStatsOuptut?: boolean;
@@ -152,6 +149,9 @@ export type TTestConfig<T extends ECompilerType> = {
     snapshotContent?(content: string): string;
     checkSteps?: boolean;
     ignoreNotFriendlyForIncrementalWarnings?: boolean;
+    esmLibPluginOptions?: {
+        preserveModules?: string;
+    };
 };
 export type TTestFilter<T extends ECompilerType> = (creatorConfig: Record<string, unknown>, testConfig: TTestConfig<T>) => boolean | string;
 export interface ITestRunner {

package/dist/type.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 /// <reference types="../jest.d.ts" />
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EEsmMode = exports.EDocumentType = exports.ECompareResultType = exports.ECompilerType = void 0;
+exports.EEsmMode = exports.ECompareResultType = exports.ECompilerType = void 0;
 var ECompilerType;
 (function (ECompilerType) {
     ECompilerType["Rspack"] = "rspack";
@@ -15,11 +15,6 @@ var ECompareResultType;
     ECompareResultType["OnlySource"] = "only-source";
     ECompareResultType["Different"] = "different";
 })(ECompareResultType || (exports.ECompareResultType = ECompareResultType = {}));
-var EDocumentType;
-(function (EDocumentType) {
-    EDocumentType["Fake"] = "fake";
-    EDocumentType["JSDOM"] = "jsdom";
-})(EDocumentType || (exports.EDocumentType = EDocumentType = {}));
 var EEsmMode;
 (function (EEsmMode) {
     EEsmMode[EEsmMode["Unknown"] = 0] = "Unknown";

package/jest.d.ts CHANGED Viewed

@@ -22,4 +22,6 @@ declare global {
 			) => void;
 		}
 	}
+	var rstest = jest;
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rspack-canary/test-tools",
-  "version": "1.6.0-canary-beafb11e-20251019174144",
+  "version": "1.6.0-canary-0eb13821-20251021173640",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -58,7 +58,7 @@
     "rimraf": "^5.0.10",
     "source-map": "^0.7.6",
     "terser-webpack-plugin": "^5.3.14",
-    "webpack": "5.99.9",
+    "webpack": "5.102.1",
     "webpack-merge": "6.0.1",
     "webpack-sources": "3.3.3"
   },
@@ -72,7 +72,7 @@
     "terser": "5.43.1",
     "typescript": "^5.9.3",
     "wast-loader": "^1.14.1",
-    "@rspack/core": "npm:@rspack-canary/core@1.6.0-canary-beafb11e-20251019174144"
+    "@rspack/core": "npm:@rspack-canary/core@1.6.0-canary-0eb13821-20251021173640"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"

package/dist/helper/legacy/FakeDocument.d.ts DELETED Viewed

@@ -1,54 +0,0 @@
-export default class FakeDocument {
-    constructor(basePath: any, options?: {});
-    head: FakeElement;
-    body: FakeElement;
-    baseURI: string;
-    _elementsByTagName: Map<string, FakeElement[]>;
-    _basePath: any;
-    currentScript: any;
-    _options: {};
-    createElement(type: any): FakeElement;
-    _onElementAttached(element: any): void;
-    _onElementRemoved(element: any): void;
-    getElementsByTagName(name: any): FakeElement[];
-    querySelectorAll(name: any): FakeElement[];
-    getComputedStyle(element: any): {
-        getPropertyValue: (property: any) => any;
-    };
-}
-export class FakeElement {
-    constructor(document: any, type: any, basePath: any);
-    _document: any;
-    _type: any;
-    _basePath: any;
-    _children: any[];
-    _attributes: any;
-    _src: any;
-    _href: any;
-    rel: any;
-    parentNode: any;
-    sheet: FakeSheet | undefined;
-    cloneNode(): FakeElement;
-    addEventListener(): void;
-    insertBefore(node: any, before: any): void;
-    appendChild(node: any): void;
-    removeChild(node: any): void;
-    setAttribute(name: any, value: any): void;
-    removeAttribute(name: any): void;
-    getAttribute(name: any): any;
-    _toRealUrl(value: any): any;
-    set src(value: any);
-    get src(): any;
-    get children(): any[];
-    set href(value: any);
-    get href(): any;
-}
-export class FakeSheet {
-    constructor(element: any, basePath: any);
-    _element: any;
-    _basePath: any;
-    cachedCss: string | undefined;
-    cachedCssRules: any[] | undefined;
-    get css(): string;
-    get cssRules(): any[];
-}