@rspack/test-tools 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/helper/setup-env.js

@@ -34,7 +34,7 @@ if (process.env.DEBUG_INFO) {
                     process.stdout.write(`START1 ${name}\n`);
                     try {
                         const promise = fn();
-                        if (promise && promise.then) {
+                        if (promise?.then) {
                             return promise.then(r => {
                                 process.stdout.write(`DONE OK ${name}\n`);
                                 return r;

package/dist/helper/util/checkSourceMap.js

@@ -63,7 +63,7 @@ async function checkSourceMap(out, outCodeMap, toSearch, _checkColumn = true //
             column: checkColumn ? inColumn : 0
         });
         const observed = JSON.stringify({ source, line, column });
-        recordCheck(expected === observed, `expected original position: ${expected}, observed original position: ${observed}, out: ${outLine + "," + outColumn + "," + outIndex + ":" + outId}, ${checkColumn ? "" : "(column ignored)"}`);
+        recordCheck(expected === observed, `expected original position: ${expected}, observed original position: ${observed}, out: ${`${outLine},${outColumn},${outIndex}:${outId}`}, ${checkColumn ? "" : "(column ignored)"}`);
         // Also check the reverse mapping
         const positions = map.allGeneratedPositionsFor({
             source,

package/dist/helper/util/identifier.js

@@ -1,8 +1,8 @@
+"use strict";
 // @ts-nocheck
 /*
-    MIT License http://www.opensource.org/licenses/mit-license.php
-*/
-"use strict";
+ * MIT License http://www.opensource.org/licenses/mit-license.php
+ */
 const path = require("node:path");
 const WINDOWS_ABS_PATH_REGEXP = /^[a-zA-Z]:[\\/]/;
 const SEGMENTS_SPLIT_REGEXP = /([|!])/;
@@ -322,8 +322,8 @@ exports.getUndoPath = (filename, outputPath, enforceRelative) => {
                 const j = outputPath.lastIndexOf("\\");
                 const pos = i < 0 ? j : j < 0 ? i : Math.max(i, j);
                 if (pos < 0)
-                    return outputPath + "/";
-                append = outputPath.slice(pos + 1) + "/" + append;
+                    return `${outputPath}/`;
+                append = `${outputPath.slice(pos + 1)}/${append}`;
                 outputPath = outputPath.slice(0, pos);
             }
         }

package/dist/plugin/webpack-module-placeholder-plugin.d.ts

@@ -1,4 +1,3 @@
 export declare class WebpackModulePlaceholderPlugin {
-    constructor();
     apply(compiler: any): void;
 }

package/dist/plugin/webpack-module-placeholder-plugin.js

@@ -28,7 +28,7 @@ function createRenderRuntimeModulesFn(Template) {
             }
             if (runtimeSource) {
                 const identifier = module.identifier();
-                source.add(Template.toNormalComment(`start::${identifier}`) + "\n");
+                source.add(`${Template.toNormalComment(`start::${identifier}`)}\n`);
                 if (!module.shouldIsolate()) {
                     source.add(runtimeSource);
                     source.add("\n\n");
@@ -43,7 +43,7 @@ function createRenderRuntimeModulesFn(Template) {
                     source.add(new PrefixSource("\t", runtimeSource));
                     source.add("\n}();\n\n");
                 }
-                source.add(Template.toNormalComment(`end::${identifier}`) + "\n");
+                source.add(`${Template.toNormalComment(`end::${identifier}`)}\n`);
             }
         }
         return source;
@@ -51,7 +51,6 @@ function createRenderRuntimeModulesFn(Template) {
 }
 const caches = new WeakMap();
 class WebpackModulePlaceholderPlugin {
-    constructor() { }
     apply(compiler) {
         const { webpack } = compiler;
         const { Template, javascript: { JavascriptModulesPlugin } } = webpack;

package/dist/processor/config.d.ts

@@ -5,7 +5,7 @@ export interface IConfigProcessorOptions<T extends ECompilerType> extends IMulti
 export declare class ConfigProcessor<T extends ECompilerType> extends MultiTaskProcessor<T> {
     protected _configOptions: IConfigProcessorOptions<T>;
     constructor(_configOptions: IConfigProcessorOptions<T>);
-    static findBundle<T extends ECompilerType>(index: number, context: ITestContext, options: TCompilerOptions<T>): string | string[] | undefined;
+    static findBundle<T extends ECompilerType>(index: number, context: ITestContext, options: TCompilerOptions<T>): string | string[];
     static defaultOptions<T extends ECompilerType>(index: number, context: ITestContext): TCompilerOptions<T>;
     static overrideOptions<T extends ECompilerType>(index: number, context: ITestContext, options: TCompilerOptions<T>): void;
 }

package/dist/processor/config.js

@@ -24,10 +24,20 @@ class ConfigProcessor extends multi_1.MultiTaskProcessor {
             return testConfig.findBundle(index, options);
         }
         const ext = node_path_1.default.extname((0, parseResource_1.parseResource)(options.output?.filename).path);
+        const bundlePath = [];
         if (options.output?.path &&
-            node_fs_1.default.existsSync(node_path_1.default.join(options.output.path, "bundle" + index + ext))) {
-            return "./bundle" + index + ext;
+            node_fs_1.default.existsSync(node_path_1.default.join(options.output.path, `bundle${index}${ext}`))) {
+            if (options.experiments?.css) {
+                const cssOutputPath = node_path_1.default.join(options.output.path, (typeof options.output?.cssFilename === "string" &&
+                    options.output?.cssFilename) ||
+                    `bundle${index}.css`);
+                if (node_fs_1.default.existsSync(cssOutputPath)) {
+                    bundlePath.push(`./bundle${index}.css`);
+                }
+            }
+            bundlePath.push(`./bundle${index}${ext}`);
         }
+        return bundlePath;
     }
     static defaultOptions(index, context) {
         return {

package/dist/processor/hook.js

@@ -132,8 +132,8 @@ class HookCasesContext extends context_1.TestContext {
         const snapshots = this.snapshotsList.reduce((acc, group, index) => {
             const block = this.snapshots[group || index].reduce((acc, [content, name]) => {
                 name = `## ${name || `test: ${index}`}\n\n`;
-                const block = "```javascript\n" + content + "\n```\n";
-                return (acc += name + block + "\n");
+                const block = `\`\`\`javascript\n${content}\n\`\`\`\n`;
+                return (acc += `${name + block}\n`);
             }, "");
             group = Number.isInteger(group) ? `Group: ${index}` : group;
             group = `# ${group}\n\n`;

package/dist/processor/hot.js

@@ -100,6 +100,12 @@ class HotProcessor extends basic_1.BasicProcessor {
             options.entry = "./index.js";
         }
         options.module ??= {};
+        for (const cssModuleType of ["css/auto", "css/module", "css"]) {
+            options.module.generator ??= {};
+            options.module.generator[cssModuleType] ??= {};
+            options.module.generator[cssModuleType].exportsOnly ??=
+                this._hotOptions.target === "async-node";
+        }
         options.module.rules ??= [];
         options.module.rules.push({
             test: /\.(js|css|json)/,

package/dist/processor/normal.js

@@ -32,7 +32,7 @@ class NormalProcessor extends basic_1.BasicProcessor {
         const { root, compilerOptions } = this._normalOptions;
         return {
             context: root,
-            entry: "./" + node_path_1.default.relative(root, context.getSource()) + "/",
+            entry: `./${node_path_1.default.relative(root, context.getSource())}/`,
             target: compilerOptions?.target || "async-node",
             devtool: compilerOptions?.devtool,
             mode: compilerOptions?.mode || "none",

package/dist/processor/stats.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable no-control-regex */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -38,8 +37,7 @@ class StatsProcessor extends multi_1.MultiTaskProcessor {
         for (const compiler of compilers) {
             const ifs = compiler.inputFileSystem;
             compiler.inputFileSystem = Object.create(ifs);
-            compiler.inputFileSystem.readFile = () => {
-                const args = Array.prototype.slice.call(arguments);
+            compiler.inputFileSystem.readFile = (...args) => {
                 const callback = args.pop();
                 ifs.readFile.apply(ifs, args.concat([
                     (err, result) => {
@@ -145,10 +143,10 @@ class StatsProcessor extends multi_1.MultiTaskProcessor {
         actual = actual
             .replace(/\r\n?/g, "\n")
             // CHANGE: Remove potential line break and "|" caused by long text
-            .replace(/((ERROR|WARNING)([\s\S](?!╭|├))*?)(\n  │ )/g, "$1")
+            .replace(/((ERROR|WARNING)([\s\S](?!╭|├))*?)(\n {2}│ )/g, "$1")
             // CHANGE: Update the regular expression to replace the 'Rspack' version string
             .replace(/Rspack [^ )]+(\)?) compiled/g, "Rspack x.x.x$1 compiled")
-            .replace(new RegExp(quoteMeta(testPath), "g"), "Xdir/" + node_path_1.default.basename(this._options.name))
+            .replace(new RegExp(quoteMeta(testPath), "g"), `Xdir/${node_path_1.default.basename(this._options.name)}`)
             .replace(/(\w)\\(\w)/g, "$1/$2")
             .replace(/, additional resolving: X ms/g, "")
             .replace(/Unexpected identifier '.+?'/g, "Unexpected identifier");

package/dist/processor/watch.js

@@ -8,6 +8,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const compiler_1 = require("../compiler");
 const copyDiff_1 = __importDefault(require("../helper/legacy/copyDiff"));
+const config_1 = require("./config");
 const multi_1 = require("./multi");
 // This file is used to port step number to rspack.config.js/webpack.config.js
 const currentWatchStepModulePath = node_path_1.default.resolve(__dirname, "../helper/util/currentWatchStep");
@@ -15,7 +16,7 @@ class WatchProcessor extends multi_1.MultiTaskProcessor {
     constructor(_watchOptions) {
         super({
             overrideOptions: WatchProcessor.overrideOptions(_watchOptions),
-            findBundle: () => "bundle.js",
+            findBundle: (config_1.ConfigProcessor.findBundle),
             ..._watchOptions
         });
         this._watchOptions = _watchOptions;

package/dist/reporter/diff-stats.js

@@ -7,7 +7,7 @@ exports.DiffStatsReporter = void 0;
 const csv_to_markdown_table_1 = __importDefault(require("csv-to-markdown-table"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const type_1 = require("../type");
-const toPercent = (d) => (d * 100).toFixed(2) + "%";
+const toPercent = (d) => `${(d * 100).toFixed(2)}%`;
 const toFirstLetterUpperCase = (s) => (s.charAt(0).toUpperCase() + s.slice(1)).split("-").join(" ");
 const GITHUB_RUN_ID = process.env.GITHUB_RUN_ID;
 class DiffStatsReporter {

package/dist/runner/basic.js

@@ -41,8 +41,7 @@ class BasicRunnerFactory {
             return new web_1.WebRunner({
                 ...runnerOptions,
                 runInNewContext: true,
-                dom: this.context.getValue(this.name, "documentType") ||
-                    type_1.EDocumentType.JSDOM
+                dom: this.context.getValue(this.name, "documentType") || type_1.EDocumentType.Fake
             });
         }
         return new esm_1.EsmRunner(runnerOptions);

package/dist/runner/hot-step.js

@@ -35,10 +35,10 @@ class HotStepRunnerFactory extends hot_1.HotRunnerFactory {
                         ? "hotUpdateStepErrorChecker"
                         : "hotUpdateStepChecker");
                     checker(hotUpdateContext, stats, runner.getGlobal("__HMR_UPDATED_RUNTIME__"));
-                    if ((0, checkArrayExpectation_1.default)(source, jsonStats, "error", "errors" + hotUpdateContext.updateIndex, "Error", callback)) {
+                    if ((0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error", callback)) {
                         return;
                     }
-                    if ((0, checkArrayExpectation_1.default)(source, jsonStats, "warning", "warnings" + hotUpdateContext.updateIndex, "Warning", callback)) {
+                    if ((0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning", callback)) {
                         return;
                     }
                     callback(null, jsonStats);
@@ -57,9 +57,9 @@ class HotStepRunnerFactory extends hot_1.HotRunnerFactory {
             runInNewContext: false,
             testConfig: {
                 ...testConfig,
-                moduleScope(ms) {
+                moduleScope(ms, stats) {
                     if (typeof testConfig.moduleScope === "function") {
-                        ms = testConfig.moduleScope(ms);
+                        ms = testConfig.moduleScope(ms, stats);
                     }
                     ms.NEXT = next;
                     return ms;

package/dist/runner/hot.js

@@ -30,10 +30,10 @@ class HotRunnerFactory extends basic_1.BasicRunnerFactory {
                 });
                 hotUpdateContext.totalUpdates = Math.max(hotUpdateContext.totalUpdates, ...changedFiles.values());
                 hotUpdateContext.changedFiles = [...changedFiles.keys()];
-                if ((0, checkArrayExpectation_1.default)(source, jsonStats, "error", "errors" + hotUpdateContext.updateIndex, "Error", callback)) {
+                if ((0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error", callback)) {
                     return;
                 }
-                if ((0, checkArrayExpectation_1.default)(source, jsonStats, "warning", "warnings" + hotUpdateContext.updateIndex, "Warning", callback)) {
+                if ((0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning", callback)) {
                     return;
                 }
                 callback(null, jsonStats);
@@ -48,9 +48,9 @@ class HotRunnerFactory extends basic_1.BasicRunnerFactory {
             runInNewContext: false,
             testConfig: {
                 ...testConfig,
-                moduleScope(ms) {
+                moduleScope(ms, stats) {
                     if (typeof testConfig.moduleScope === "function") {
-                        ms = testConfig.moduleScope(ms);
+                        ms = testConfig.moduleScope(ms, stats);
                     }
                     ms.NEXT = next;
                     return ms;

package/dist/runner/runner/basic.js

@@ -37,7 +37,7 @@ class BasicRunner {
         }
         this.baseModuleScope = this.createBaseModuleScope();
         if (typeof this._options.testConfig.moduleScope === "function") {
-            this._options.testConfig.moduleScope(this.baseModuleScope);
+            this._options.testConfig.moduleScope(this.baseModuleScope, this._options.stats);
         }
         this.createRunner();
         const res = this.getRequire()(this._options.dist, file.startsWith("./") ? file : `./${file}`);

package/dist/runner/runner/cjs.js

@@ -87,7 +87,7 @@ class CommonJsRunner extends basic_1.BasicRunner {
             requireCache[file.path] = m;
             const currentModuleScope = this.createModuleScope(this.getRequire(), m, file);
             if (this._options.testConfig.moduleScope) {
-                this._options.testConfig.moduleScope(currentModuleScope);
+                this._options.testConfig.moduleScope(currentModuleScope, this._options.stats);
             }
             if (!this._options.runInNewContext) {
                 file.content = `Object.assign(global, _globalAssign);\n ${file.content}`;

package/dist/runner/runner/esm.js

@@ -74,9 +74,9 @@ class EsmRunner extends cjs_1.CommonJsRunner {
             let esm = esmCache.get(file.path);
             if (!esm) {
                 esm = new node_vm_1.SourceTextModule(file.content, {
-                    identifier: esmIdentifier + "-" + file.path,
+                    identifier: `${esmIdentifier}-${file.path}`,
                     // no attribute
-                    url: (0, node_url_1.pathToFileURL)(file.path).href + "?" + esmIdentifier,
+                    url: `${(0, node_url_1.pathToFileURL)(file.path).href}?${esmIdentifier}`,
                     context: esmContext,
                     initializeImportMeta: (meta, _) => {
                         meta.url = (0, node_url_1.pathToFileURL)(file.path).href;

package/dist/runner/runner/watch.d.ts

@@ -1,16 +1,16 @@
 import type { ECompilerType } from "../../type";
 import type { IBasicModuleScope, TBasicRunnerFile, TRunnerRequirer } from "../type";
 import type { IBasicRunnerOptions } from "./basic";
-import { CommonJsRunner } from "./cjs";
+import { FakeDocumentWebRunner } from "./web/fake";
 interface IWatchRunnerOptions<T extends ECompilerType = ECompilerType.Rspack> extends IBasicRunnerOptions<T> {
     stepName: string;
+    isWeb: boolean;
 }
-export declare class WatchRunner<T extends ECompilerType = ECompilerType.Rspack> extends CommonJsRunner<T> {
+export declare class WatchRunner<T extends ECompilerType = ECompilerType.Rspack> extends FakeDocumentWebRunner<T> {
     protected _watchOptions: IWatchRunnerOptions<T>;
-    private document;
     private state;
     constructor(_watchOptions: IWatchRunnerOptions<T>);
-    protected createGlobalContext(): import("../type").IBasicGlobalContext;
     protected createModuleScope(requireFn: TRunnerRequirer, m: any, file: TBasicRunnerFile): IBasicModuleScope;
+    run(file: string): Promise<unknown>;
 }
 export {};

package/dist/runner/runner/watch.js

@@ -5,19 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WatchRunner = void 0;
 const node_path_1 = __importDefault(require("node:path"));
-const FakeDocument_1 = __importDefault(require("../../helper/legacy/FakeDocument"));
-const cjs_1 = require("./cjs");
-class WatchRunner extends cjs_1.CommonJsRunner {
+const fake_1 = require("./web/fake");
+class WatchRunner extends fake_1.FakeDocumentWebRunner {
     constructor(_watchOptions) {
         super(_watchOptions);
         this._watchOptions = _watchOptions;
         this.state = {};
-        this.document = new FakeDocument_1.default(_watchOptions.dist);
-    }
-    createGlobalContext() {
-        const globalContext = super.createGlobalContext();
-        globalContext.document = this.document;
-        return globalContext;
     }
     createModuleScope(requireFn, m, file) {
         const moduleScope = super.createModuleScope(requireFn, m, file);
@@ -27,5 +20,8 @@ class WatchRunner extends cjs_1.CommonJsRunner {
         moduleScope.WATCH_STEP = this._watchOptions.stepName;
         return moduleScope;
     }
+    run(file) {
+        return super.run(file);
+    }
 }
 exports.WatchRunner = WatchRunner;

package/dist/runner/runner/web/fake.js

@@ -93,6 +93,7 @@ class FakeDocumentWebRunner extends cjs_1.CommonJsRunner {
         moduleScope.self = this.globalContext;
         moduleScope.globalThis = this.globalContext;
         moduleScope.document = this.globalContext.document;
+        moduleScope.getComputedStyle = this.globalContext.getComputedStyle.bind(this.globalContext);
         moduleScope.fetch = this.globalContext.fetch;
         moduleScope.importScripts = this.globalContext.importScripts;
         moduleScope.Worker = this.globalContext.Worker;

package/dist/runner/runner/web/jsdom.js

@@ -125,6 +125,16 @@ class JSDOMWebRunner extends cjs_1.CommonJsRunner {
             this._options.env.expect(url).toMatch(/^https:\/\/test\.cases\/path\//);
             this.requirers.get("entry")(this._options.dist, (0, urlToRelativePath_1.default)(url));
         };
+        moduleScope.getComputedStyle = function () {
+            const computedStyle = this.dom.window.getComputedStyle(this.dom.window);
+            const getPropertyValue = computedStyle.getPropertyValue.bind(computedStyle);
+            return {
+                ...computedStyle,
+                getPropertyValue(v) {
+                    return getPropertyValue(v);
+                }
+            };
+        };
         moduleScope.STATS = moduleScope.__STATS__;
         return moduleScope;
     }

package/dist/runner/watch.js

@@ -14,13 +14,19 @@ class WatchRunnerFactory extends basic_1.BasicRunnerFactory {
         if (!stepName) {
             throw new Error("Can not get watch step name from context");
         }
+        const isWeb = Array.isArray(compilerOptions)
+            ? compilerOptions.some(option => {
+                return option.target === "web" || option.target === "webworker";
+            })
+            : compilerOptions.target === "web" ||
+                compilerOptions.target === "webworker";
         return new watch_1.WatchRunner({
             env,
             stats,
             name: this.name,
             stepName,
-            runInNewContext: compilerOptions.target === "web" ||
-                compilerOptions.target === "webworker",
+            runInNewContext: isWeb,
+            isWeb,
             testConfig: this.context.getTestConfig(),
             source: this.context.getSource(),
             dist: this.context.getDist(),

package/dist/test/creator.d.ts

@@ -10,6 +10,7 @@ export interface IBasicCaseCreatorOptions<T extends ECompilerType> {
         dist: string;
         temp: string | void;
     }) => ITestProcessor[];
+    testConfig?: (testConfig: TTestConfig<T>) => void;
     description?: (name: string, step: number) => string;
     runner?: new (name: string, context: ITestContext) => TRunnerFactory<ECompilerType>;
     [key: string]: unknown;

package/dist/test/creator.js

@@ -15,6 +15,9 @@ class BasicCaseCreator {
     }
     create(name, src, dist, temp) {
         const testConfig = this.readTestConfig(src);
+        if (typeof this._options.testConfig === "function") {
+            this._options.testConfig(testConfig);
+        }
         const skipped = this.checkSkipped(src, testConfig);
         if (skipped) {
             this.skip(name, skipped);

package/dist/type.d.ts

@@ -130,7 +130,7 @@ export interface ITestEnv {
     afterEach: (...args: any[]) => void;
     [key: string]: unknown;
 }
-export declare const enum EDocumentType {
+export declare enum EDocumentType {
     Fake = "fake",
     JSDOM = "jsdom"
 }
@@ -140,7 +140,7 @@ export type TTestConfig<T extends ECompilerType> = {
     noTest?: boolean;
     beforeExecute?: () => void;
     afterExecute?: () => void;
-    moduleScope?: (ms: IBasicModuleScope) => IBasicModuleScope;
+    moduleScope?: (ms: IBasicModuleScope, stats?: TCompilerStatsCompilation<T>) => IBasicModuleScope;
     findBundle?: (index: number, options: TCompilerOptions<T>) => string | string[];
     bundlePath?: string[];
     nonEsmThis?: (p: string | string[]) => Object;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/test-tools",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.2",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -99,8 +99,8 @@
     "terser": "5.27.2",
     "typescript": "5.0.2",
     "wast-loader": "^1.12.1",
-    "@rspack/core": "1.0.0-beta.0",
-    "@rspack/cli": "1.0.0-beta.0"
+    "@rspack/core": "1.0.0-beta.2",
+    "@rspack/cli": "1.0.0-beta.2"
   },
   "peerDependencies": {
     "@rspack/core": ">=0.7.0"