@rspack/test-tools 0.4.2 → 0.4.3

package/dist/compare/compare.js

@@ -69,9 +69,9 @@ function compareModules(modules, sourceModules, distModules, formatOptions) {
     for (let name of modules) {
         const renamed = (0, replace_runtime_module_name_1.replaceRuntimeModuleName)(name);
         const sourceContent = sourceModules.has(renamed) &&
-            (0, format_code_1.formatCode)(sourceModules.get(renamed), formatOptions);
+            (0, format_code_1.formatCode)(name, sourceModules.get(renamed), formatOptions);
         const distContent = distModules.has(renamed) &&
-            (0, format_code_1.formatCode)(distModules.get(renamed), formatOptions);
+            (0, format_code_1.formatCode)(name, distModules.get(renamed), formatOptions);
         compareResults.push({
             ...compareContent(sourceContent, distContent),
             name
@@ -90,9 +90,9 @@ function compareContent(sourceContent, distContent) {
                     source: sourceContent,
                     dist: distContent,
                     lines: {
-                        source: lines,
+                        source: 0,
                         common: lines,
-                        dist: lines
+                        dist: 0
                     }
                 };
             }

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

@@ -3,5 +3,9 @@ export interface IFormatCodeOptions {
     ignorePropertyQuotationMark: boolean;
     ignoreModuleId: boolean;
     ignoreModuleArguments: boolean;
+    ignoreBlockOnlyStatement: boolean;
+    ignoreSwcHelpersPath: boolean;
+    ignoreObjectPropertySequence: boolean;
+    ignoreCssFilePath: boolean;
 }
-export declare function formatCode(raw: string, options: IFormatCodeOptions): string;
+export declare function formatCode(name: string, raw: string, options: IFormatCodeOptions): string;

package/dist/compare/format-code.js

@@ -32,7 +32,10 @@ const generator_1 = __importDefault(require("@babel/generator"));
 const traverse_1 = __importDefault(require("@babel/traverse"));
 const T = __importStar(require("@babel/types"));
 const replace_module_argument_1 = require("./replace-module-argument");
-function formatCode(raw, options) {
+const SWC_HELPER_PATH_REG = /^_swc_helpers_[a-zA-Z\d_-]+__WEBPACK_IMPORTED_MODULE_xxx__$/;
+const CSS_FILE_EXT_REG = /(le|sa|c|sc)ss$/;
+const INVALID_PATH_REG = /[<>:"/\\|?*.]/g;
+function formatCode(name, raw, options) {
     const ast = (0, parser_1.parse)(raw, {
         sourceType: "unambiguous"
     });
@@ -44,17 +47,91 @@ function formatCode(raw, options) {
                     keyPath.replaceWith(T.stringLiteral(keyPath.node.name));
                 }
             }
+            if (options.ignoreCssFilePath && CSS_FILE_EXT_REG.test(name)) {
+                const valuePath = path.get("value");
+                if (valuePath.isStringLiteral()) {
+                    valuePath.node.value = valuePath.node.value.replace(INVALID_PATH_REG, "-");
+                }
+            }
         },
         Identifier(path) {
             if (options.ignoreModuleId) {
                 path.node.name = path.node.name.replace(/__WEBPACK_IMPORTED_MODULE_\d+__/g, "__WEBPACK_IMPORTED_MODULE_xxx__");
             }
+            if (options.ignoreSwcHelpersPath) {
+                if (SWC_HELPER_PATH_REG.test(path.node.name)) {
+                    path.node.name = `$$SWC_HELPERS$$`;
+                }
+            }
+        },
+        IfStatement(path) {
+            if (options.ignoreBlockOnlyStatement) {
+                const consequent = path.get("consequent");
+                if (consequent.isBlockStatement() &&
+                    consequent.node.body.length === 1) {
+                    consequent.node.body[0].leadingComments =
+                        consequent.node.leadingComments;
+                    consequent.replaceWith(T.cloneNode(consequent.node.body[0], true, false));
+                }
+                const alternate = path.get("alternate");
+                if (alternate.isBlockStatement() && alternate.node.body.length === 1) {
+                    alternate.node.body[0].leadingComments =
+                        alternate.node.leadingComments;
+                    alternate.replaceWith(T.cloneNode(alternate.node.body[0], true, false));
+                }
+            }
+        },
+        For(path) {
+            if (options.ignoreBlockOnlyStatement) {
+                const body = path.get("body");
+                if (body.isBlockStatement() && body.node.body.length === 1) {
+                    body.node.body[0].leadingComments = body.node.leadingComments;
+                    body.replaceWith(T.cloneNode(body.node.body[0], true, false));
+                }
+            }
+        },
+        ObjectExpression(path) {
+            if (options.ignoreObjectPropertySequence) {
+                let result = [];
+                let safe = [];
+                while (path.node.properties.length || safe.length) {
+                    const cur = path.node.properties.shift();
+                    if (cur && T.isObjectProperty(cur)) {
+                        if (T.isIdentifier(cur.key)) {
+                            safe.push({
+                                name: cur.key.name,
+                                node: cur
+                            });
+                            continue;
+                        }
+                        if (T.isStringLiteral(cur.key)) {
+                            safe.push({
+                                name: cur.key.value,
+                                node: cur
+                            });
+                            continue;
+                        }
+                    }
+                    if (safe.length) {
+                        safe.sort((a, b) => (a.name > b.name ? 1 : -1));
+                        result.push(...safe.map(n => n.node));
+                        safe = [];
+                    }
+                    if (cur) {
+                        result.push(cur);
+                    }
+                }
+                path.node.properties = result;
+            }
         }
     });
     let result = (0, generator_1.default)(ast, {
         comments: false,
         compact: false,
-        concise: false
+        concise: false,
+        jsescOption: {
+            quotes: "double"
+        }
     }).code;
     if (options.ignoreModuleArguments) {
         result = (0, replace_module_argument_1.replaceModuleArgument)(result);

package/dist/compare/replace-module-argument.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceModuleArgument = void 0;
 function replaceModuleArgument(raw) {
-    return raw.trim().replace(/^\(function \([\w_,\s]+\) {/, "(function () {");
+    return raw
+        .trim()
+        .replace(/^\(function\s?\([\w_,\s]+\)\s?{/, "(function () {");
 }
 exports.replaceModuleArgument = replaceModuleArgument;

package/dist/processor/diff.js

@@ -96,6 +96,10 @@ class DiffProcessor {
                     },
                     path: dist
                 },
+                optimization: {
+                    mangleExports: false,
+                    concatenateModules: false
+                },
                 plugins: [(0, module_placeholder_plugin_1.createModulePlaceholderPlugin)(this.options.webpackPath)]
             }, {
                 arrayMerge: (a, b) => [...a, ...b]
@@ -106,6 +110,9 @@ class DiffProcessor {
                 output: {
                     path: dist
                 },
+                optimization: {
+                    mangleExports: false
+                },
                 experiments: {
                     rspackFuture: {
                         disableTransformByDefault: true
@@ -120,6 +127,10 @@ class DiffProcessor {
             ignoreModuleArguments: this.options.ignoreModuleArguments,
             ignoreModuleId: this.options.ignoreModuleId,
             ignorePropertyQuotationMark: this.options.ignorePropertyQuotationMark,
+            ignoreBlockOnlyStatement: this.options.ignoreBlockOnlyStatement,
+            ignoreSwcHelpersPath: this.options.ignoreSwcHelpersPath,
+            ignoreObjectPropertySequence: this.options.ignoreObjectPropertySequence,
+            ignoreCssFilePath: this.options.ignoreCssFilePath,
             replacements: this.options.replacements || {}
         };
         for (let hash of this.hashes) {

package/dist/reporter/diff-html.js

@@ -52,11 +52,12 @@ class DiffHtmlReporter {
                         root: id,
                         data: items
                     };
-                    const content = template.replace(DIFF_STATS_PLACEHOLDER, JSON.stringify(data));
                     const casename = path_1.default.basename(id);
                     const extname = path_1.default.extname(viewerFile);
                     const filename = path_1.default.basename(viewerFile, extname);
+                    const content = template.replace(`<script id="${DIFF_STATS_PLACEHOLDER}"></script>`, `<script src="${filename}_${casename}.js"></script>`);
                     fs_extra_1.default.writeFileSync(path_1.default.join(this.options.dist, `${filename}_${casename}${extname}`), content, "utf-8");
+                    fs_extra_1.default.writeFileSync(path_1.default.join(this.options.dist, `${filename}_${casename}.js`), `window.$$diff_detail$$ = ${JSON.stringify(data)}`, "utf-8");
                 }
             }
             else {

package/dist/reporter/diff-stats.js

@@ -35,8 +35,8 @@ class DiffStatsReporter {
             if (item.type === type_1.ECompareResultType.Missing)
                 continue;
             const moduleType = item.name.startsWith("webpack/runtime")
-                ? "normal"
-                : "runtime";
+                ? "runtime"
+                : "normal";
             // handle modules
             if (item.type === type_1.ECompareResultType.OnlySource) {
                 current[`${type_1.ECompilerType.Rspack}|${moduleType}|${"modules"}`]++;

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

@@ -27,7 +27,8 @@ function createRenderRuntimeModulesFn(Template) {
                 runtimeSource = codeGenResult.sources.get("runtime");
             }
             if (runtimeSource) {
-                source.add(Template.toNormalComment(`start::${module.identifier()}`) + "\n");
+                let identifier = module.identifier();
+                source.add(Template.toNormalComment(`start::${identifier}`) + "\n");
                 if (!module.shouldIsolate()) {
                     source.add(runtimeSource);
                     source.add("\n\n");
@@ -42,7 +43,7 @@ function createRenderRuntimeModulesFn(Template) {
                     source.add(new PrefixSource("\t", runtimeSource));
                     source.add("\n}();\n\n");
                 }
-                source.add(Template.toNormalComment(`end::${module.identifier()}`) + "\n");
+                source.add(Template.toNormalComment(`end::${identifier}`) + "\n");
             }
         }
         return source;
@@ -90,7 +91,11 @@ function createModulePlaceholderPlugin(webpackPath) {
                     let footer = cacheEntry.footer;
                     if (header === undefined) {
                         const req = module.readableIdentifier(requestShortener);
-                        const reqStr = req.replace(/\*\//g, "*_/");
+                        let reqStr = req.replace(/\*\//g, "*_/");
+                        // handle css module identifier
+                        if (reqStr.startsWith("css ")) {
+                            reqStr = reqStr.replace(/^css[\s]+/, "").trim();
+                        }
                         header = new RawSource(`\n/* start::${reqStr} */\n`);
                         footer = new RawSource(`\n/* end::${reqStr} */\n`);
                         cacheEntry.header = header;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/test-tools",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "fs-extra": "^11.1.1",
     "jest-diff": "^29.7.0",
     "webpack-sources": "3.2.3",
-    "@rspack/core": "0.4.2"
+    "@rspack/core": "0.4.3"
   },
   "devDependencies": {
     "@arco-design/web-react": "^2.56.1",
@@ -56,7 +56,7 @@
     "react-refresh": "0.13.0",
     "typescript": "5.1.6",
     "webpack": "5.89.0",
-    "@rspack/cli": "0.4.2"
+    "@rspack/cli": "0.4.3"
   },
   "peerDependenciesMeta": {},
   "jest": {