@rspack/test-tools 1.5.5 → 1.5.6

package/dist/case/hot-step.js

@@ -20,7 +20,7 @@ function getCreator(target) {
                     configFiles: ["rspack.config.js", "webpack.config.js"]
                 })
             ],
-            runner: runner_1.HotStepRunnerFactory,
+            runner: runner_1.HotRunnerFactory,
             concurrent: true
         }));
     }

package/dist/case/normal.js

@@ -27,7 +27,7 @@ const createCaseOptions = (hot) => {
                 compilerType: type_1.ECompilerType.Rspack
             })
         ],
-        runner: runner_1.NormalRunnerFactory,
+        runner: runner_1.BasicRunnerFactory,
         concurrent: true
     };
 };

package/dist/case/stats-output.js

@@ -10,6 +10,7 @@ const creator = new creator_1.BasicCaseCreator({
     steps: ({ name }) => [
         new stats_1.StatsProcessor({
             name,
+            snapshotName: "stats.txt",
             writeStatsOuptut: false,
             compilerType: type_1.ECompilerType.Rspack,
             configFiles: ["rspack.config.js", "webpack.config.js"]

package/dist/compare/format-code.d.ts

@@ -11,6 +11,6 @@ export interface IFormatCodeOptions {
 }
 export interface IFormatCodeReplacement {
     from: string | RegExp;
-    to: string;
+    to: string | ((substring: string, ...args: any[]) => string);
 }
 export declare function formatCode(name: string, raw: string, options: IFormatCodeOptions): string;

package/dist/compare/format-code.js

@@ -221,7 +221,12 @@ function formatCode(name, raw, options) {
     }
     if (options.replacements) {
         for (const { from, to } of options.replacements) {
-            result = result.replaceAll(from, to);
+            if (typeof to === "string") {
+                result = result.replaceAll(from, to);
+            }
+            else {
+                result = result.replaceAll(from, to);
+            }
         }
     }
     // result of generate() is not stable with comments sometimes

package/dist/helper/directory.js

@@ -54,7 +54,7 @@ function describeByWalk(testFile, createCase, options = {}) {
                 describeDirectory(caseName, currentLevel - 1);
             }
             else {
-                const name = (0, _1.escapeSep)(node_path_1.default.join(testId, caseName).split(".").shift());
+                const name = (0, _1.escapeSep)(node_path_1.default.join(`${testId}Cases`, caseName).split(".").shift());
                 describeFn(name, () => {
                     const source = node_path_1.default.join(sourceBase, caseName);
                     let dist = "";

package/dist/helper/legacy/checkArrayExpectation.d.ts

@@ -1,2 +1,2 @@
-declare function _exports(testDirectory: any, object: any, kind: any, filename: any, upperCaseKind: any, done: any): Promise<true | undefined>;
+declare function _exports(testDirectory: any, object: any, kind: any, filename: any, upperCaseKind: any, options: any, done: any): Promise<true | undefined>;
 export = _exports;

package/dist/helper/legacy/checkArrayExpectation.js

@@ -59,16 +59,13 @@ ${tooMuch.map(item => `${explain(item)}`).join("\n\n")}`);
     }
     return diff.join("\n\n");
 };
-module.exports = async function checkArrayExpectation(testDirectory, object, kind, filename, upperCaseKind, done) {
-    const usePromise = typeof done === "function";
+module.exports = async function checkArrayExpectation(testDirectory, object, kind, filename, upperCaseKind, options, done) {
     done = typeof done === "function" ? done : error => {
         throw error;
     };
     let array = object[`${kind}s`];
-    if (Array.isArray(array)) {
-        if (kind === "warning") {
-            array = array.filter(item => !/from Terser/.test(item));
-        }
+    if (Array.isArray(array) && kind === "warning") {
+        array = array.filter(item => !/from Terser/.test(item));
     }
     if (fs.existsSync(path.join(testDirectory, `${filename}.js`))) {
         // CHANGE: added file for sorting messages in multi-thread environment
@@ -77,7 +74,10 @@ module.exports = async function checkArrayExpectation(testDirectory, object, kin
             array = sorter(array);
         }
         const expectedFilename = path.join(testDirectory, `${filename}.js`);
-        const expected = require(expectedFilename);
+        let expected = require(expectedFilename);
+        if (typeof expected === "function") {
+            expected = expected(options);
+        }
         const diff = diffItems(array, expected, kind);
         if (expected.length < array.length) {
             done(new Error(`More ${kind}s (${array.length} instead of ${expected.length}) while compiling than expected:\n\n${diff}\n\nCheck expected ${kind}s: ${expectedFilename}`));

package/dist/processor/basic.js

@@ -97,6 +97,7 @@ class BasicProcessor {
         const warnings = [];
         const compiler = this.getCompiler(context);
         const stats = compiler.getStats();
+        const options = compiler.getOptions();
         if (stats) {
             if (testConfig.writeStatsOuptut) {
                 node_fs_1.default.writeFileSync(node_path_1.default.join(context.getDist(), "stats.txt"), stats.toString({
@@ -125,8 +126,8 @@ class BasicProcessor {
                 }
             }
         }
-        await (0, checkArrayExpectation_1.default)(context.getSource(), { errors }, "error", "errors", "Error");
-        await (0, checkArrayExpectation_1.default)(context.getSource(), { warnings }, "warning", "warnings", "Warning");
+        await (0, checkArrayExpectation_1.default)(context.getSource(), { errors }, "error", "errors", "Error", options);
+        await (0, checkArrayExpectation_1.default)(context.getSource(), { warnings }, "warning", "warnings", "Warning", options);
         // clear error if checked
         if (node_fs_1.default.existsSync(context.getSource("errors.js"))) {
             context.clearError(this._options.name);

package/dist/processor/cache.js

@@ -93,7 +93,9 @@ class CacheProcessor extends basic_1.BasicProcessor {
                     bundlerInfo: {
                         force: false
                     }
-                }
+                },
+                inlineConst: true,
+                lazyBarrel: true
             }
         };
         if (this._cacheOptions.compilerType === type_1.ECompilerType.Rspack) {

package/dist/processor/config.js

@@ -58,7 +58,9 @@ class ConfigProcessor extends multi_1.MultiTaskProcessor {
                     bundlerInfo: {
                         force: false
                     }
-                }
+                },
+                inlineConst: true,
+                lazyBarrel: true
             }
         };
     }

package/dist/processor/diagnostic.js

@@ -87,7 +87,9 @@ class DiagnosticProcessor extends basic_1.BasicProcessor {
                     bundlerInfo: {
                         force: false
                     }
-                }
+                },
+                inlineConst: true,
+                lazyBarrel: true
             }
         };
     }

package/dist/processor/hash.js

@@ -45,7 +45,9 @@ class HashProcessor extends multi_1.MultiTaskProcessor {
                     bundlerInfo: {
                         force: false
                     }
-                }
+                },
+                inlineConst: true,
+                lazyBarrel: true
             }
         };
     }

package/dist/processor/hook.js

@@ -189,7 +189,9 @@ class HookTaskProcessor extends snapshot_1.SnapshotProcessor {
                     bundlerInfo: {
                         force: false
                     }
-                }
+                },
+                inlineConst: true,
+                lazyBarrel: true
             }
         };
     }

package/dist/processor/hot.js

@@ -98,7 +98,9 @@ class HotProcessor extends basic_1.BasicProcessor {
                     bundlerInfo: {
                         force: false
                     }
-                }
+                },
+                inlineConst: true,
+                lazyBarrel: true
             }
         };
         if (this._hotOptions.compilerType === type_1.ECompilerType.Rspack) {

package/dist/processor/normal.js

@@ -145,6 +145,8 @@ class NormalProcessor extends basic_1.BasicProcessor {
                 },
                 asyncWebAssembly: true,
                 topLevelAwait: true,
+                inlineConst: true,
+                lazyBarrel: true,
                 // CHANGE: rspack does not support `backCompat` yet.
                 // backCompat: false,
                 // CHANGE: Rspack enables `css` by default.

package/dist/processor/stats.d.ts

@@ -1,12 +1,12 @@
 import type { ECompilerType, ITestContext, ITestEnv, TCompilerOptions } from "../type";
 import { type IMultiTaskProcessorOptions, MultiTaskProcessor } from "./multi";
 export interface IStatsProcessorOptions<T extends ECompilerType> extends Omit<IMultiTaskProcessorOptions<T>, "runable"> {
-    snapshotName?: string;
+    snapshotName: string;
     writeStatsOuptut?: boolean;
 }
 export declare class StatsProcessor<T extends ECompilerType> extends MultiTaskProcessor<T> {
     private stderr;
-    private snapshotName?;
+    private snapshotName;
     private writeStatsOuptut?;
     constructor(_statsOptions: IStatsProcessorOptions<T>);
     before(context: ITestContext): Promise<void>;

package/dist/processor/stats.js

@@ -137,12 +137,10 @@ class StatsProcessor extends multi_1.MultiTaskProcessor {
                 // CHANGE: Replace bundle size, since bundle sizes may differ between platforms
                 .replace(/[0-9]+\.?[0-9]+ KiB/g, "xx KiB");
         }
-        if (this.snapshotName) {
-            env.expect(new RspackStats(actual)).toMatchSnapshot(this.snapshotName);
-        }
-        else {
-            env.expect(new RspackStats(actual)).toMatchSnapshot();
-        }
+        const snapshotPath = node_path_1.default.isAbsolute(this.snapshotName)
+            ? this.snapshotName
+            : node_path_1.default.resolve(context.getSource(), `./__snapshots__/${this.snapshotName}`);
+        env.expect(new RspackStats(actual)).toMatchFileSnapshot(snapshotPath);
         const testConfig = context.getTestConfig();
         if (typeof testConfig?.validate === "function") {
             testConfig.validate(stats, this.stderr.toString());
@@ -178,7 +176,9 @@ class StatsProcessor extends multi_1.MultiTaskProcessor {
                     bundlerInfo: {
                         force: false
                     }
-                }
+                },
+                inlineConst: true,
+                lazyBarrel: true
             }
         };
     }

package/dist/processor/watch.js

@@ -66,6 +66,7 @@ class WatchProcessor extends multi_1.MultiTaskProcessor {
         const warnings = [];
         const compiler = this.getCompiler(context);
         const stats = compiler.getStats();
+        const options = compiler.getOptions();
         const checkStats = testConfig.checkStats || (() => true);
         if (stats) {
             if (testConfig.writeStatsOuptut) {
@@ -125,8 +126,8 @@ class WatchProcessor extends multi_1.MultiTaskProcessor {
                 }
             }
         }
-        await (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), this._watchOptions.stepName), { errors }, "error", "errors", "Error");
-        await (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), this._watchOptions.stepName), { warnings }, "warning", "warnings", "Warning");
+        await (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), this._watchOptions.stepName), { errors }, "error", "errors", "Error", options);
+        await (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), this._watchOptions.stepName), { warnings }, "warning", "warnings", "Warning", options);
         // clear error if checked
         if (node_fs_1.default.existsSync(context.getSource("errors.js"))) {
             context.clearError(this._options.name);

package/dist/runner/basic.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicRunnerFactory = void 0;
 const type_1 = require("../type");
-const esm_1 = require("./runner/esm");
+const node_1 = require("./runner/node");
 const web_1 = require("./runner/web");
 class BasicRunnerFactory {
     constructor(name, context) {
@@ -40,6 +40,8 @@ class BasicRunnerFactory {
     }
     createRunner(file, stats, compilerOptions, env) {
         const runnerOptions = {
+            runInNewContext: false,
+            cachable: true,
             env,
             stats,
             name: this.name,
@@ -53,11 +55,10 @@ class BasicRunnerFactory {
             return new web_1.WebRunner({
                 ...runnerOptions,
                 runInNewContext: true,
-                cachable: true,
                 dom: this.context.getValue(this.name, "documentType") || type_1.EDocumentType.Fake
             });
         }
-        return new esm_1.EsmRunner(runnerOptions);
+        return new node_1.NodeRunner(runnerOptions);
     }
 }
 exports.BasicRunnerFactory = BasicRunnerFactory;

package/dist/runner/cache.js

@@ -52,9 +52,10 @@ class CacheRunnerFactory extends basic_1.BasicRunnerFactory {
             const jsonStats = stats.toJson({
             // errorDetails: true
             });
+            const compilerOptions = compiler.getOptions();
             const updateIndex = updatePlugin.getUpdateIndex();
-            await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${updateIndex}`, "Error");
-            await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${updateIndex}`, "Warning");
+            await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${updateIndex}`, "Error", compilerOptions);
+            await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${updateIndex}`, "Warning", compilerOptions);
             const updatedModules = await m.hot.check(options || true);
             if (!updatedModules) {
                 throw new Error("No update available");
@@ -72,9 +73,10 @@ class CacheRunnerFactory extends basic_1.BasicRunnerFactory {
             const jsonStats = stats.toJson({
             // errorDetails: true
             });
+            const compilerOptions = compiler.getOptions();
             const updateIndex = updatePlugin.getUpdateIndex();
-            await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${updateIndex}`, "Error");
-            await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${updateIndex}`, "Warning");
+            await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${updateIndex}`, "Error", compilerOptions);
+            await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${updateIndex}`, "Warning", compilerOptions);
             env.it(`NEXT_START run with compilerIndex==${compilerIndex + 1}`, async () => {
                 if (compilerIndex > MAX_COMPILER_INDEX) {
                     throw new Error("NEXT_START has been called more than the maximum times");

package/dist/runner/hot.js

@@ -26,8 +26,15 @@ class HotRunnerFactory extends basic_1.BasicRunnerFactory {
                 const jsonStats = stats.toJson({
                 // errorDetails: true
                 });
-                await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error");
-                await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning");
+                const compilerOptions = compiler.getOptions();
+                const checker = this.context.getValue(this.name, jsonStats.errors?.length
+                    ? "hotUpdateStepErrorChecker"
+                    : "hotUpdateStepChecker");
+                if (checker) {
+                    checker(hotUpdateContext, stats, runner.getGlobal("__HMR_UPDATED_RUNTIME__"));
+                }
+                await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error", compilerOptions);
+                await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning", compilerOptions);
                 if (usePromise) {
                     // old callback style hmr cases
                     callback(null, jsonStats);
@@ -54,7 +61,7 @@ class HotRunnerFactory extends basic_1.BasicRunnerFactory {
             }
             return jsonStats;
         };
-        return new web_1.WebRunner({
+        const runner = new web_1.WebRunner({
             dom: this.context.getValue(this.name, "documentType") || type_1.EDocumentType.JSDOM,
             env,
             stats: this.createStatsGetter(),
@@ -78,6 +85,7 @@ class HotRunnerFactory extends basic_1.BasicRunnerFactory {
             dist,
             compilerOptions
         });
+        return runner;
     }
 }
 exports.HotRunnerFactory = HotRunnerFactory;

package/dist/runner/index.d.ts

@@ -1,9 +1,7 @@
 export * from "./basic";
 export * from "./cache";
 export * from "./hot";
-export * from "./hot-step";
 export * from "./multiple";
-export * from "./normal";
-export * from "./runner";
+export * from "./runner/node";
 export * from "./type";
 export * from "./watch";

package/dist/runner/index.js

@@ -17,9 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./basic"), exports);
 __exportStar(require("./cache"), exports);
 __exportStar(require("./hot"), exports);
-__exportStar(require("./hot-step"), exports);
 __exportStar(require("./multiple"), exports);
-__exportStar(require("./normal"), exports);
-__exportStar(require("./runner"), exports);
+__exportStar(require("./runner/node"), exports);
 __exportStar(require("./type"), exports);
 __exportStar(require("./watch"), exports);

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

@@ -1,8 +1,2 @@
-export * from "./basic";
-export * from "./cjs";
-export * from "./esm";
-export * from "./normal";
-export * from "./watch";
+export * from "./node";
 export * from "./web";
-export * from "./web/fake";
-export * from "./web/jsdom";

package/dist/runner/runner/index.js

@@ -14,11 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./basic"), exports);
-__exportStar(require("./cjs"), exports);
-__exportStar(require("./esm"), exports);
-__exportStar(require("./normal"), exports);
-__exportStar(require("./watch"), exports);
+__exportStar(require("./node"), exports);
 __exportStar(require("./web"), exports);
-__exportStar(require("./web/fake"), exports);
-__exportStar(require("./web/jsdom"), exports);

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

@@ -0,0 +1,38 @@
+import type { ECompilerType, ITestEnv, ITestRunner, TCompilerOptions, TCompilerStatsCompilation, TTestConfig } from "../../../type";
+import { type IGlobalContext, type IModuleScope, type TModuleObject, type TRunnerFile, type TRunnerRequirer } from "../../type";
+declare global {
+    var printLogger: boolean;
+}
+export interface INodeRunnerOptions<T extends ECompilerType> {
+    env: ITestEnv;
+    stats?: () => TCompilerStatsCompilation<T>;
+    name: string;
+    runInNewContext?: boolean;
+    testConfig: TTestConfig<T>;
+    source: string;
+    dist: string;
+    compilerOptions: TCompilerOptions<T>;
+    cachable?: boolean;
+}
+export declare class NodeRunner<T extends ECompilerType = ECompilerType.Rspack> implements ITestRunner {
+    protected _options: INodeRunnerOptions<T>;
+    protected requireCache: any;
+    protected globalContext: IGlobalContext | null;
+    protected baseModuleScope: IModuleScope | null;
+    protected requirers: Map<string, TRunnerRequirer>;
+    constructor(_options: INodeRunnerOptions<T>);
+    run(file: string): Promise<unknown>;
+    getRequire(): TRunnerRequirer;
+    getGlobal(name: string): unknown;
+    protected createGlobalContext(): IGlobalContext;
+    protected createBaseModuleScope(): IModuleScope;
+    protected createModuleScope(requireFn: TRunnerRequirer, m: TModuleObject, file: TRunnerFile): IModuleScope;
+    protected getFile(modulePath: string[] | string, currentDirectory: string): TRunnerFile | null;
+    protected preExecute(code: string, file: TRunnerFile): void;
+    protected postExecute(m: Object, file: TRunnerFile): void;
+    protected createRunner(): void;
+    protected createMissRequirer(): TRunnerRequirer;
+    protected createJsonRequirer(): TRunnerRequirer;
+    protected createCjsRequirer(): TRunnerRequirer;
+    protected createEsmRequirer(): TRunnerRequirer;
+}