@rspack-debug/test-tools 1.6.6 → 1.7.0-beta.0

package/dist/case/builtin.js

@@ -123,6 +123,7 @@ function defaultOptions(context) {
             chunkIds: "named",
             sideEffects: false,
             mangleExports: false,
+            inlineExports: false,
             usedExports: false,
             concatenateModules: false,
             nodeEnv: false

package/dist/case/cache.js

@@ -13,7 +13,6 @@ const runner_1 = require("../runner");
 const creator_1 = require("../test/creator");
 const common_1 = require("./common");
 const runner_2 = require("./runner");
-const MAX_COMPILER_INDEX = 100;
 function createCacheProcessor(name, src, temp, target) {
     const updatePlugin = new hot_update_1.HotUpdatePlugin(src, temp);
     return {
@@ -23,9 +22,7 @@ function createCacheProcessor(name, src, temp, target) {
         },
         config: async (context) => {
             const compiler = context.getCompiler();
-            let options = defaultOptions(context, temp, target);
-            options = await (0, common_1.config)(context, name, ["rspack.config.js", "webpack.config.js"].map(i => node_path_1.default.resolve(temp, i)), options);
-            overrideOptions(options, temp, target, updatePlugin);
+            const options = await generateOptions(context, temp, target, updatePlugin);
             compiler.setOptions(options);
         },
         compiler: async (context) => {
@@ -75,8 +72,8 @@ function createCacheCase(name, src, dist, target, temp) {
     creator.create(name, src, dist, temp);
 }
 const creators = new Map();
-function defaultOptions(context, temp, target) {
-    const options = {
+async function generateOptions(context, temp, target, updatePlugin) {
+    let options = {
         context: temp,
         mode: "production",
         cache: true,
@@ -99,15 +96,13 @@ function defaultOptions(context, temp, target) {
                 bundlerInfo: {
                     force: false
                 }
-            },
-            inlineConst: true
+            }
         }
     };
     options.plugins ??= [];
     options.plugins.push(new core_1.default.HotModuleReplacementPlugin());
-    return options;
-}
-function overrideOptions(options, temp, target, updatePlugin) {
+    options = await (0, common_1.config)(context, "cacheCase", ["rspack.config.js", "webpack.config.js"].map(i => node_path_1.default.resolve(temp, i)), options);
+    // overwrite
     if (!options.entry) {
         options.entry = "./index.js";
     }
@@ -127,6 +122,7 @@ function overrideOptions(options, temp, target, updatePlugin) {
             level: "error"
         };
     }
+    return options;
 }
 function findBundle(name, target, context) {
     const files = [];
@@ -181,6 +177,7 @@ function createRunner(context, name, file, env) {
                     moduleScope.COMPILER_INDEX = compilerIndex;
                     moduleScope.NEXT_HMR = nextHmr;
                     moduleScope.NEXT_START = nextStart;
+                    moduleScope.NEXT_MOVE_DIR_START = nextMoveDirStart;
                     return moduleScope;
                 }
             },
@@ -189,19 +186,19 @@ function createRunner(context, name, file, env) {
             compilerOptions: options
         });
     };
+    const checkStats = async (stats) => {
+        const compilerOptions = compiler.getOptions();
+        const updateIndex = updatePlugin.getUpdateIndex();
+        await (0, checkArrayExpectation_1.default)(source, stats, "error", `errors${updateIndex}`, "Error", compilerOptions);
+        await (0, checkArrayExpectation_1.default)(source, stats, "warning", `warnings${updateIndex}`, "Warning", compilerOptions);
+    };
     const nextHmr = async (m, options) => {
         await updatePlugin.goNext();
         const stats = await compiler.build();
-        if (!stats) {
-            throw new Error("Should generate stats during build");
-        }
         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", compilerOptions);
-        await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${updateIndex}`, "Warning", compilerOptions);
+        await checkStats(jsonStats);
         const updatedModules = await m.hot.check(options || true);
         if (!updatedModules) {
             throw new Error("No update available");
@@ -210,24 +207,33 @@ function createRunner(context, name, file, env) {
     };
     const nextStart = async () => {
         await compiler.close();
+        await updatePlugin.goNext();
+        compilerIndex++;
         compiler.createCompiler();
+        const stats = await compiler.build();
+        const jsonStats = stats.toJson({
+        // errorDetails: true
+        });
+        await checkStats(jsonStats);
+        env.it(`NEXT_START run with compilerIndex==${compilerIndex}`, async () => {
+            return getWebRunner().run(file);
+        });
+        return jsonStats;
+    };
+    const nextMoveDirStart = async () => {
+        await compiler.close();
+        const tempDir = await updatePlugin.moveTempDir();
+        const options = await generateOptions(context, tempDir, compiler.getOptions().target, updatePlugin);
+        compiler.setOptions(options);
         await updatePlugin.goNext();
+        compilerIndex++;
+        compiler.createCompiler();
         const stats = await compiler.build();
-        if (!stats) {
-            throw new Error("Should generate stats during build");
-        }
         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", 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");
-            }
-            compilerIndex++;
+        await checkStats(jsonStats);
+        env.it(`NEXT_MOVE_DIR_START run with compilerIndex==${compilerIndex}`, async () => {
             return getWebRunner().run(file);
         });
         return jsonStats;

package/dist/case/config.js

@@ -79,8 +79,7 @@ function defaultOptions(index, context) {
                 bundlerInfo: {
                     force: false
                 }
-            },
-            inlineConst: true
+            }
         }
     };
 }

package/dist/case/diagnostic.js

@@ -82,8 +82,7 @@ function defaultOptions(context) {
                 bundlerInfo: {
                     force: false
                 }
-            },
-            inlineConst: true
+            }
         }
     };
 }

package/dist/case/hash.js

@@ -52,8 +52,7 @@ function defaultOptions(index, context) {
                 bundlerInfo: {
                     force: false
                 }
-            },
-            inlineConst: true
+            }
         }
     };
 }

package/dist/case/hook.js

@@ -213,8 +213,7 @@ function defaultOptions(context, custom) {
                 bundlerInfo: {
                     force: false
                 }
-            },
-            inlineConst: true
+            }
         }
     };
     if (custom) {

package/dist/case/hot.js

@@ -110,8 +110,7 @@ function defaultOptions(context, target) {
                 bundlerInfo: {
                     force: false
                 }
-            },
-            inlineConst: true
+            }
         }
     };
     options.plugins ??= [];

package/dist/case/normal.js

@@ -111,6 +111,7 @@ function defaultOptions(context, compilerOptions, mode) {
                 providedExports: true,
                 usedExports: true,
                 mangleExports: true,
+                inlineExports: true,
                 // CHANGE: rspack does not support `emitOnErrors` yet.
                 emitOnErrors: true,
                 concatenateModules: !!testConfig?.optimization?.concatenateModules,
@@ -195,7 +196,6 @@ function defaultOptions(context, compilerOptions, mode) {
             },
             asyncWebAssembly: true,
             topLevelAwait: true,
-            inlineConst: true,
             // CHANGE: rspack does not support `backCompat` yet.
             // backCompat: false,
             // CHANGE: Rspack enables `css` by default.

package/dist/case/stats-output.js

@@ -83,8 +83,7 @@ function defaultOptions(index, context) {
                 bundlerInfo: {
                     force: false
                 }
-            },
-            inlineConst: true
+            }
         }
     };
 }
@@ -174,9 +173,14 @@ async function check(env, context, name, writeStatsOuptut, snapshot, stderr) {
             // CHANGE: The time unit display in Rspack is second
             .replace(/[.0-9]+(\s?s)/g, "X$1")
             // CHANGE: Replace bundle size, since bundle sizes may differ between platforms
-            .replace(/[0-9]+\.?[0-9]+ KiB/g, "xx KiB")
-            .replace(/[0-9]+ ms/g, "xx ms");
+            .replace(/[0-9]+(\.[0-9]+)? KiB/g, "xx KiB")
+            .replace(/[0-9]+(\.[0-9]+)? bytes/g, "xx bytes")
+            .replace(/[0-9]+(\.[0-9]+)? ms/g, "xx ms");
     }
+    actual = actual
+        .split("\n")
+        .filter(line => !line.includes("@rstest/core/dist"))
+        .join("\n");
     const snapshotPath = node_path_1.default.isAbsolute(snapshot)
         ? snapshot
         : node_path_1.default.resolve(context.getSource(), `./__snapshots__/${snapshot}`);

package/dist/case/watch.js

@@ -8,8 +8,8 @@ exports.createWatchStepProcessor = createWatchStepProcessor;
 exports.createWatchCase = createWatchCase;
 exports.getWatchRunnerKey = getWatchRunnerKey;
 exports.createWatchRunner = createWatchRunner;
-const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const webpack_merge_1 = __importDefault(require("webpack-merge"));
 const compiler_1 = require("../compiler");
 const helper_1 = require("../helper");
@@ -58,8 +58,14 @@ function createWatchInitialProcessor(name, tempDir, step, watchState, { incremen
         },
         build: async (context) => {
             const compiler = context.getCompiler();
-            node_fs_1.default.mkdirSync(watchContext.tempDir, { recursive: true });
+            fs_extra_1.default.mkdirSync(watchContext.tempDir, { recursive: true });
             (0, copyDiff_1.default)(node_path_1.default.join(context.getSource(), watchContext.step), watchContext.tempDir, true);
+            const pkgJsonFile = node_path_1.default.join(watchContext.tempDir, "package.json");
+            if (!fs_extra_1.default.existsSync(pkgJsonFile)) {
+                fs_extra_1.default.writeJsonSync(pkgJsonFile, { name, version: "0.0.1" });
+                const longTimeAgo = Date.now() - 1000 * 60 * 60 * 24;
+                fs_extra_1.default.utimesSync(pkgJsonFile, Date.now() - longTimeAgo, Date.now() - longTimeAgo);
+            }
             const task = new Promise((resolve, reject) => {
                 compiler.getEmitter().once(compiler_1.ECompilerEvent.Build, (e, stats) => {
                     if (e)
@@ -88,7 +94,7 @@ function createWatchInitialProcessor(name, tempDir, step, watchState, { incremen
             const checkStats = testConfig.checkStats || (() => true);
             if (stats) {
                 if (testConfig.writeStatsOuptut) {
-                    node_fs_1.default.writeFileSync(node_path_1.default.join(context.getDist(), "stats.txt"), stats.toString({
+                    fs_extra_1.default.writeFileSync(node_path_1.default.join(context.getDist(), "stats.txt"), stats.toString({
                         preset: "verbose",
                         colors: false
                     }), "utf-8");
@@ -127,10 +133,10 @@ function createWatchInitialProcessor(name, tempDir, step, watchState, { incremen
                     }
                 }
                 if (testConfig.writeStatsJson) {
-                    node_fs_1.default.writeFileSync(node_path_1.default.join(context.getDist(), "stats.json"), JSON.stringify(getJsonStats(), null, 2), "utf-8");
+                    fs_extra_1.default.writeFileSync(node_path_1.default.join(context.getDist(), "stats.json"), JSON.stringify(getJsonStats(), null, 2), "utf-8");
                 }
-                if (node_fs_1.default.existsSync(context.getSource(`${watchContext.step}/errors.js`)) ||
-                    node_fs_1.default.existsSync(context.getSource(`${watchContext.step}/warnings.js`)) ||
+                if (fs_extra_1.default.existsSync(context.getSource(`${watchContext.step}/errors.js`)) ||
+                    fs_extra_1.default.existsSync(context.getSource(`${watchContext.step}/warnings.js`)) ||
                     stats.hasErrors() ||
                     stats.hasWarnings()) {
                     const statsJson = stats.toJson({
@@ -147,15 +153,15 @@ function createWatchInitialProcessor(name, tempDir, step, watchState, { incremen
             await (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), watchContext.step), { errors }, "error", "errors", "Error", options);
             await (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), watchContext.step), { warnings }, "warning", "warnings", "Warning", options);
             // clear error if checked
-            if (node_fs_1.default.existsSync(context.getSource("errors.js"))) {
+            if (fs_extra_1.default.existsSync(context.getSource("errors.js"))) {
                 context.clearError();
             }
             // check hash
             if (testConfig.writeStatsOuptut) {
-                node_fs_1.default.renameSync(node_path_1.default.join(context.getDist(), "stats.txt"), node_path_1.default.join(context.getDist(), `stats.${watchContext.step}.txt`));
+                fs_extra_1.default.renameSync(node_path_1.default.join(context.getDist(), "stats.txt"), node_path_1.default.join(context.getDist(), `stats.${watchContext.step}.txt`));
             }
             if (testConfig.writeStatsJson) {
-                node_fs_1.default.renameSync(node_path_1.default.join(context.getDist(), "stats.json"), node_path_1.default.join(context.getDist(), `stats.${watchContext.step}.json`));
+                fs_extra_1.default.renameSync(node_path_1.default.join(context.getDist(), "stats.json"), node_path_1.default.join(context.getDist(), `stats.${watchContext.step}.json`));
             }
         },
         after: async (context) => {
@@ -206,10 +212,10 @@ const creator = new creator_1.BasicCaseCreator({
     describe: false,
     steps: ({ name, src, temp }) => {
         const watchState = {};
-        const runs = node_fs_1.default
+        const runs = fs_extra_1.default
             .readdirSync(src)
             .sort()
-            .filter(name => node_fs_1.default.statSync(node_path_1.default.join(src, name)).isDirectory())
+            .filter(name => fs_extra_1.default.statSync(node_path_1.default.join(src, name)).isDirectory())
             .map(name => ({ name }));
         return runs.map((run, index) => index === 0
             ? createWatchInitialProcessor(name, temp, run.name, watchState)

package/dist/helper/directory.js

@@ -18,7 +18,7 @@ function describeByWalk(testFile, createCase, options = {}) {
     const describeFn = options.describe || describe;
     const testBasename = node_path_1.default
         .basename(testFile)
-        .replace(/\.(diff|hot)?test\.(j|t)s/, "");
+        .replace(/(\.part\d+)?\.(diff|hot)?test\.(j|t)s/, "");
     const testId = testBasename.charAt(0).toLowerCase() + testBasename.slice(1);
     const sourceBase = options.source || node_path_1.default.join(node_path_1.default.dirname(testFile), `${testId}Cases`);
     const testSourceId = node_path_1.default.basename(sourceBase);

package/dist/helper/hot-update/plugin.d.ts

@@ -13,5 +13,6 @@ export declare class HotUpdatePlugin {
     getUpdateIndex(): number;
     getTotalUpdates(): number;
     goNext(): Promise<void>;
+    moveTempDir(): Promise<string>;
     apply(compiler: Compiler): void;
 }

package/dist/helper/hot-update/plugin.js

@@ -22,6 +22,7 @@ async function loopFile(dir, callback) {
     }));
 }
 const PLUGIN_NAME = "HotUpdatePlugin";
+const MAX_UPDATE_INDEX = 100;
 class HotUpdatePlugin {
     constructor(projectDir, tempDir) {
         this.projectDir = projectDir;
@@ -91,10 +92,31 @@ class HotUpdatePlugin {
         }, 1);
     }
     async goNext() {
+        if (this.updateIndex > MAX_UPDATE_INDEX) {
+            throw new Error("NEXT_* has been called more than the maximum times");
+        }
         this.updateIndex++;
         await this.updateFiles();
     }
+    async moveTempDir() {
+        // generate next temp dir path.
+        const nextTempDir = this.tempDir.replace(/(___[0-9]+)?[/\\]*$/, "") +
+            "___" +
+            this.updateIndex;
+        // update this.files.
+        for (const key of Object.keys(this.files)) {
+            const nextKey = key.replace(this.tempDir, nextTempDir);
+            this.files[nextKey] = this.files[key];
+            delete this.files[key];
+        }
+        // move files.
+        (0, rimraf_1.rimrafSync)(nextTempDir);
+        fs_extra_1.default.renameSync(this.tempDir, nextTempDir);
+        this.tempDir = nextTempDir;
+        return this.tempDir;
+    }
     apply(compiler) {
+        const RuntimeGlobals = compiler.rspack.RuntimeGlobals;
         const options = compiler.options;
         options.context = this.tempDir;
         options.module.rules ??= [];
@@ -113,14 +135,14 @@ class HotUpdatePlugin {
         });
         compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
             compilation.hooks.additionalTreeRuntimeRequirements.tap(PLUGIN_NAME, (_chunk, set) => {
-                set.add(compiler.webpack.RuntimeGlobals.moduleCache);
+                set.add(compiler.rspack.RuntimeGlobals.moduleCache);
             });
             compilation.hooks.runtimeModule.tap(PLUGIN_NAME, (module, _set) => {
                 if (module.constructorName === "DefinePropertyGettersRuntimeModule") {
                     module.source.source = Buffer.from(`
-										__webpack_require__.d = function (exports, definition) {
+										${RuntimeGlobals.definePropertyGetters} = function (exports, definition) {
 												for (var key in definition) {
-														if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+														if (${RuntimeGlobals.hasOwnProperty}(definition, key) && !${RuntimeGlobals.hasOwnProperty}(exports, key)) {
 																Object.defineProperty(exports, key, { configurable: true, enumerable: true, get: definition[key] });
 														}
 												}

package/dist/helper/legacy/checkArrayExpectation.js

@@ -87,20 +87,50 @@ module.exports = async function checkArrayExpectation(testDirectory, object, kin
             done(new Error(`Less ${kind}s (${array.length} instead of ${expected.length}) while compiling than expected:\n\n${diff}\n\nCheck expected ${kind}s: ${expectedFilename}`));
             return true;
         }
+        const usedExpected = new Array(expected.length).fill(false);
         for (let i = 0; i < array.length; i++) {
-            if (Array.isArray(expected[i])) {
-                for (let j = 0; j < expected[i].length; j++) {
-                    if (!check(expected[i][j], array[i])) {
-                        done(new Error(`${upperCaseKind} ${i}: ${explain(array[i])} doesn't match ${explain(expected[i][j])}`));
-                        return true;
+            let found = false;
+            for (let j = 0; j < expected.length; j++) {
+                if (usedExpected[j])
+                    continue;
+                if (Array.isArray(expected[j])) {
+                    for (let k = 0; k < expected[j].length; k++) {
+                        if (check(expected[j][k], array[i])) {
+                            usedExpected[j] = true;
+                            found = true;
+                            break;
+                        }
                     }
                 }
+                else {
+                    if (check(expected[j], array[i])) {
+                        usedExpected[j] = true;
+                        found = true;
+                        break;
+                    }
+                }
+                if (found)
+                    break;
             }
-            else if (!check(expected[i], array[i])) {
-                done(new Error(`${upperCaseKind} ${i}: ${explain(array[i])} doesn't match ${explain(expected[i])}`));
+            if (!found) {
+                done(new Error(`${upperCaseKind} ${i}: ${explain(array[i])} doesn't match any expected value`));
                 return true;
             }
         }
+        const unused = [];
+        for (let j = 0; j < expected.length; j++) {
+            if (!usedExpected[j]) {
+                unused.push(Array.isArray(expected[j])
+                    ? expected[j].map(explain).join(' | ')
+                    : explain(expected[j]));
+            }
+        }
+        if (unused.length > 0) {
+            done(new Error(`The following expected ${kind}s were not matched:\n${unused
+                .map(u => `  ${u}`)
+                .join('\n')}`));
+            return true;
+        }
     }
     else if (array.length > 0) {
         done(new Error(`${upperCaseKind}s while compiling:\n\n${array

package/dist/helper/legacy/createFakeWorker.js

@@ -36,6 +36,22 @@ self.importScripts = url => {
             : "require(urlToPath(url))"};
 };
 self.fetch = async url => {
+	if (typeof url === "string" ? url.endsWith(".wasm") : url.toString().endsWith(".wasm")) {
+		return new Promise((resolve, reject) => {
+			fs.readFile(require("node:url").fileURLToPath(url), (err, data) => {
+				if (err) {
+					reject(err);
+					return;
+				}
+				return resolve(
+					new Response(data, {
+						headers: { "Content-Type": "application/wasm" }
+					})
+				);
+			});
+		});
+	}
+
 	try {
 		const buffer = await new Promise((resolve, reject) =>
 			fs.readFile(urlToPath(url), (err, b) =>
@@ -43,7 +59,9 @@ self.fetch = async url => {
 			)
 		);
 		return {
-		  headers: { get(name) { } },
+		  headers: { get(name) {
+				if (name.toLowerCase() === "content-type") {}
+			} },
 			status: 200,
 			ok: true,
 			arrayBuffer() { return buffer; },

package/dist/plugin/lazy-compilation-test-plugin.js

@@ -29,7 +29,7 @@ class LazyCompilationTestPlugin {
                 else if (compiler.options.lazyCompilation) {
                     compiler.options.lazyCompilation.serverUrl = urlBase;
                 }
-                middleware = core_1.experiments.lazyCompilationMiddleware(compiler);
+                middleware = (0, core_1.lazyCompilationMiddleware)(compiler);
                 resolve(null);
             });
             server.on("request", (req, res) => {

package/dist/runner/node/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack-debug/test-tools",
-  "version": "1.6.6",
+  "version": "1.7.0-beta.0",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -47,7 +47,7 @@
     "jest-diff": "^29.7.0",
     "jest-snapshot": "29.7.0",
     "jsdom": "^26.1.0",
-    "memfs": "4.48.1",
+    "memfs": "4.51.1",
     "path-serializer": "0.5.1",
     "pretty-format": "29.7.0",
     "rimraf": "^5.0.10",
@@ -65,7 +65,7 @@
     "@types/jsdom": "^21.1.7",
     "typescript": "^5.9.3",
     "wast-loader": "^1.14.1",
-    "@rspack/core": "npm:@rspack-debug/core@1.6.6"
+    "@rspack/core": "npm:@rspack-debug/core@1.7.0-beta.0"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"