@rspack/core 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/stats/DefaultStatsPrinterPlugin.js

@@ -206,7 +206,7 @@ const SIMPLE_PRINTERS = {
     "module.codeGenerated": (codeGenerated, { formatFlag, yellow }) => codeGenerated ? yellow(formatFlag("code generated")) : undefined,
     "module.buildTimeExecuted": (buildTimeExecuted, { formatFlag, green }) => buildTimeExecuted ? green(formatFlag("build time executed")) : undefined,
     "module.cached": (cached, { formatFlag, green }) => cached ? green(formatFlag("cached")) : undefined,
-    "module.assets": (assets, { formatFlag, magenta }) => assets && assets.length
+    "module.assets": (assets, { formatFlag, magenta }) => assets?.length
         ? magenta(formatFlag(`${assets.length} ${plural(assets.length, "asset", "assets")}`))
         : undefined,
     "module.warnings": (warnings, { formatFlag, yellow }) => warnings === true
@@ -700,7 +700,7 @@ const joinInBrackets = (items) => {
     return res.join("");
 };
 const indent = (str, prefix, noPrefixInFirstLine) => {
-    const rem = str.replace(/\n([^\n])/g, "\n" + prefix + "$1");
+    const rem = str.replace(/\n([^\n])/g, `\n${prefix}$1`);
     if (noPrefixInFirstLine)
         return rem;
     const ind = str[0] === "\n" ? "" : prefix;
@@ -722,7 +722,7 @@ const joinExplicitNewLine = (items, indenter) => {
         first = false;
         const noJoiner = firstInLine || content.startsWith("\n");
         firstInLine = content.endsWith("\n");
-        return noJoiner ? content : " " + content;
+        return noJoiner ? content : ` ${content}`;
     })
         .filter(Boolean)
         .join("")
@@ -803,20 +803,19 @@ const SIMPLE_ELEMENT_JOINERS = {
     },
     chunk: items => {
         let hasEntry = false;
-        return ("chunk " +
-            joinExplicitNewLine(items.filter(item => {
-                switch (item.element) {
-                    case "entry":
-                        if (item.content)
-                            hasEntry = true;
-                        break;
-                    case "initial":
-                        if (hasEntry)
-                            return false;
-                        break;
-                }
-                return true;
-            }), "  "));
+        return `chunk ${joinExplicitNewLine(items.filter(item => {
+            switch (item.element) {
+                case "entry":
+                    if (item.content)
+                        hasEntry = true;
+                    break;
+                case "initial":
+                    if (hasEntry)
+                        return false;
+                    break;
+            }
+            return true;
+        }), "  ")}`;
     },
     "chunk.childrenByOrder[]": items => `(${joinOneLine(items)})`,
     chunkGroup: items => joinExplicitNewLine(items, "  "),
@@ -856,11 +855,11 @@ const SIMPLE_ELEMENT_JOINERS = {
     },
     "module.profile": joinInBrackets,
     moduleIssuer: joinOneLine,
-    chunkOrigin: items => "> " + joinOneLine(items),
+    chunkOrigin: items => `> ${joinOneLine(items)}`,
     "errors[].error": joinError(true),
     "warnings[].error": joinError(false),
     loggingGroup: items => joinExplicitNewLine(items, "").trimEnd(),
-    moduleTraceItem: items => " @ " + joinOneLine(items),
+    moduleTraceItem: items => ` @ ${joinOneLine(items)}`,
     moduleTraceDependency: joinOneLine
 };
 const AVAILABLE_COLORS = {

package/dist/stats/StatsFactory.d.ts

@@ -7,7 +7,7 @@
  * Copyright (c) JS Foundation and other contributors
  * https://github.com/webpack/webpack/blob/main/LICENSE
  */
-import type { JsStats, JsStatsError, JsStatsWarning } from "@rspack/binding";
+import type { JsStats, JsStatsCompilation, JsStatsError, JsStatsWarning } from "@rspack/binding";
 import { HookMap, SyncBailHook, SyncWaterfallHook } from "@rspack/lite-tapable";
 import type { Compilation } from "../Compilation";
 import { type GroupConfig } from "../util/smartGrouping";
@@ -17,6 +17,7 @@ export type KnownStatsFactoryContext = {
     compilation?: Compilation | undefined;
     cachedGetErrors?: ((arg0: Compilation) => JsStatsError[]) | undefined;
     cachedGetWarnings?: ((arg0: Compilation) => JsStatsWarning[]) | undefined;
+    getStatsCompilation: (compilation: Compilation) => JsStatsCompilation;
     getInner: (compilation: Compilation) => JsStats;
 };
 export type StatsFactoryContext = KnownStatsFactoryContext & Record<string, any>;

package/dist/stats/StatsFactory.js

@@ -121,9 +121,7 @@ class StatsFactory {
             const comparators = [];
             this._forEachLevel(this.hooks.sort, this._caches.sort, type, h => h.call(comparators, context));
             if (comparators.length > 0) {
-                items.sort(
-                // @ts-expect-error number of arguments is correct
-                (0, comparators_1.concatComparators)(...comparators));
+                items.sort((0, comparators_1.concatComparators)(...comparators));
             }
             // run filter on sorted items
             const items2 = this._forEachLevelFilter(this.hooks.filterSorted, this._caches.filterSorted, type, items, (h, r, idx, i) => h.call(r, context, idx, i), false);
@@ -147,9 +145,7 @@ class StatsFactory {
             const comparators2 = [];
             this._forEachLevel(this.hooks.sortResults, this._caches.sortResults, type, h => h.call(comparators2, context));
             if (comparators2.length > 0) {
-                resultItems.sort(
-                // @ts-expect-error number of arguments is correct
-                (0, comparators_1.concatComparators)(...comparators2));
+                resultItems.sort((0, comparators_1.concatComparators)(...comparators2));
             }
             // group result items
             const groupConfigs = [];

package/dist/stats/statsFactoryUtils.d.ts

@@ -1,27 +1,58 @@
+/// <reference types="node" />
 import type * as binding from "@rspack/binding";
 import type { Compilation, NormalizedStatsOptions } from "../Compilation";
 import { type Comparator } from "../util/comparators";
 import type { StatsFactory, StatsFactoryContext } from "./StatsFactory";
-type Writable<T> = {
-    -readonly [K in keyof T]: T[K];
-};
 export type KnownStatsChunkGroup = binding.JsStatsChunkGroup;
-export type KnownStatsChunk = Omit<Writable<binding.JsStatsChunk>, "sizes"> & {
+export type KnownStatsChunk = Omit<binding.JsStatsChunk, "sizes" | "origins"> & {
     sizes: Record<string, number>;
+    origins: StatsChunkOrigin[];
 };
 export type KnownStatsAssetInfo = Omit<binding.JsStatsAssetInfo, "related">;
 export type StatsChunkGroup = binding.JsStatsChunkGroup & Record<string, any>;
 export type KnownStatsAsset = Omit<binding.JsStatsAsset, "info">;
 export type StatsAsset = KnownStatsAsset & Record<string, any>;
 export type StatsChunk = KnownStatsChunk & Record<string, any>;
-export type KnownStatsModule = Omit<Writable<binding.JsStatsModule>, "usedExports" | "providedExports" | "optimizationBailout" | "sizes"> & {
-    profile?: StatsProfile;
-    usedExports?: null | string[] | boolean;
-    providedExports?: null | string[];
-    optimizationBailout?: null | string[];
-    sizes: Record<string, number>;
+export type KnownStatsModule = {
+    type: string;
+    moduleType: string;
+    layer?: string;
+    identifier?: string;
+    name?: string;
+    nameForCondition?: string;
     index?: number;
     index2?: number;
+    preOrderIndex?: number;
+    postOrderIndex?: number;
+    size: number;
+    sizes: Record<string, number>;
+    cacheable?: boolean;
+    built: boolean;
+    codeGenerated: boolean;
+    buildTimeExecuted: boolean;
+    cached: boolean;
+    optional?: boolean;
+    orphan?: boolean;
+    id?: string;
+    issuerId?: string;
+    chunks?: string[];
+    assets?: string[];
+    dependent?: boolean;
+    issuer?: string;
+    issuerName?: string;
+    issuerPath?: StatsModuleIssuer[];
+    failed?: boolean;
+    errors?: number;
+    warnings?: number;
+    profile?: StatsProfile;
+    reasons?: StatsModuleReason[];
+    usedExports?: boolean | string[] | null;
+    providedExports?: string[] | null;
+    optimizationBailout?: string[] | null;
+    depth?: number;
+    modules?: StatsModule[];
+    filteredModules?: number;
+    source?: string | Buffer;
 };
 export type StatsProfile = KnownStatsProfile & Record<string, any>;
 export type KnownStatsProfile = {
@@ -30,9 +61,15 @@ export type KnownStatsProfile = {
     building: number;
 };
 export type StatsModule = KnownStatsModule & Record<string, any>;
-export type StatsModuleIssuer = binding.JsStatsModuleIssuer & Record<string, any>;
-export type StatsError = binding.JsStatsError & Record<string, any>;
-export type StatsWarnings = binding.JsStatsWarning & Record<string, any>;
+export type StatsModuleIssuer = Omit<binding.JsStatsModuleIssuer, "identifier"> & {
+    identifier?: string;
+} & Record<string, any>;
+export type StatsError = Omit<binding.JsStatsError, "moduleIdentifier"> & {
+    moduleIdentifier?: string;
+} & Record<string, any>;
+export type StatsWarnings = Omit<binding.JsStatsWarning, "moduleIdentifier"> & {
+    moduleIdentifier?: string;
+} & Record<string, any>;
 export type StatsModuleTraceItem = {
     originIdentifier?: string;
     originName?: string;
@@ -41,7 +78,18 @@ export type StatsModuleTraceItem = {
     originId?: string;
     moduleId?: string;
 };
-export type StatsModuleReason = Writable<binding.JsStatsModuleReason> & Record<string, any>;
+export type StatsModuleReason = Omit<binding.JsStatsModuleReason, "moduleIdentifier"> & {
+    moduleIdentifier?: string;
+} & Record<string, any>;
+export type KnownStatsChunkOrigin = {
+    module: string;
+    moduleIdentifier: string;
+    moduleName: string;
+    loc: string;
+    request: string;
+    moduleId?: string;
+};
+export type StatsChunkOrigin = KnownStatsChunkOrigin & Record<string, any>;
 export type KnownStatsCompilation = {
     /**
      * webpack version.
@@ -86,14 +134,6 @@ export type KnownStatsLoggingEntry = {
     args?: any[] | undefined;
     time?: number | undefined;
 };
-export type KnownStatsChunkOrigin = {
-    module?: string | undefined;
-    moduleIdentifier?: string | undefined;
-    moduleName?: string | undefined;
-    loc?: string | undefined;
-    request?: string | undefined;
-    moduleId?: (string | number) | undefined;
-};
 type ExtractorsByOption<T, O> = {
     [x: string]: (object: O, data: T, context: StatsFactoryContext, options: any, factory: StatsFactory) => void;
 };
@@ -117,7 +157,7 @@ export type SimpleExtractors = {
     moduleReason: ExtractorsByOption<binding.JsStatsModuleReason, StatsModuleReason>;
     chunk: ExtractorsByOption<binding.JsStatsChunk, KnownStatsChunk>;
     error: ExtractorsByOption<binding.JsStatsError, StatsError>;
-    warning: ExtractorsByOption<binding.JsStatsWarning, StatsError>;
+    warning: ExtractorsByOption<binding.JsStatsWarning, StatsWarnings>;
     moduleTraceItem: ExtractorsByOption<binding.JsStatsModuleTrace, StatsModuleTraceItem>;
 };
 export declare const uniqueArray: <T, I>(items: Iterable<T>, selector: (arg: T) => Iterable<I>) => I[];

package/dist/util/SizeFormatHelpers.js

@@ -19,6 +19,6 @@ const formatSize = (size) => {
     }
     const abbreviations = ["bytes", "KiB", "MiB", "GiB"];
     const index = Math.floor(Math.log(size) / Math.log(1024));
-    return `${+(size / Math.pow(1024, index)).toPrecision(3)} ${abbreviations[index]}`;
+    return `${+(size / 1024 ** index).toPrecision(3)} ${abbreviations[index]}`;
 };
 exports.formatSize = formatSize;

package/dist/util/bindingVersionCheck.js

@@ -64,12 +64,12 @@ const getAddonPlatformArchAbi = () => {
     const abi = NodePlatformArchToAbi[platform][arch];
     if (abi === undefined)
         return new Error(`unsupported cpu arch: ${arch}`);
-    binding += "-" + arch;
+    binding += `-${arch}`;
     if (typeof abi === "string") {
-        binding += abi.length ? "-" + abi : "";
+        binding += abi.length ? `-${abi}` : "";
     }
     else if (typeof abi === "object") {
-        binding += "-" + abi[isMusl() ? "musl" : "gnu"];
+        binding += `-${abi[isMusl() ? "musl" : "gnu"]}`;
     }
     else {
         return new Error(`unsupported abi: ${abi}`);

package/dist/util/cleverMerge.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveByProperty = exports.removeOperations = exports.cleverMerge = exports.cachedSetProperty = exports.cachedCleverMerge = exports.DELETE = void 0;
+const DYNAMIC_INFO = Symbol("cleverMerge dynamic info");
 const mergeCache = new WeakMap();
 const setPropertyCache = new WeakMap();
 exports.DELETE = Symbol("DELETE");
-const DYNAMIC_INFO = Symbol("cleverMerge dynamic info");
 /**
  * Merges two given objects and caches the result to avoid computation if same objects passed as arguments again.
  * @example
@@ -299,7 +299,7 @@ const mergeEntries = (firstEntry, secondEntry, internalCaching) => {
             // second value override everything
             // = second.base + second.byProperty
             return secondEntry;
-        case VALUE_TYPE_UNDEFINED:
+        case VALUE_TYPE_UNDEFINED: {
             if (!firstEntry.byProperty) {
                 // = first.base + second.byProperty
                 return {
@@ -323,6 +323,7 @@ const mergeEntries = (firstEntry, secondEntry, internalCaching) => {
                 byProperty: firstEntry.byProperty,
                 byValues: newByValues
             };
+        }
         default: {
             if (!firstEntry.byProperty) {
                 // The simple case

package/dist/util/comparators.d.ts

@@ -11,10 +11,10 @@ import type { JsStatsChunk as Chunk } from "@rspack/binding";
 import type { ChunkGroup } from "../ChunkGroup";
 export type Comparator = <T>(arg0: T, arg1: T) => -1 | 0 | 1;
 type Selector<A, B> = (input: A) => B;
-export declare const concatComparators: (c1: Comparator, c2: Comparator, ...cRest: Comparator[]) => Comparator;
+export declare const concatComparators: (...comps: Array<Comparator>) => Comparator;
 export declare const compareIds: (a: string | number, b: string | number) => -1 | 0 | 1;
 export declare const compareChunksById: (a: Chunk, b: Chunk) => -1 | 0 | 1;
 export declare const compareChunkGroupsByIndex: (a: ChunkGroup, b: ChunkGroup) => -1 | 0 | 1;
 export declare const compareSelect: <T, R>(getter: Selector<T, R>, comparator: Comparator) => Comparator;
-export declare const compareNumbers: (a: number, b: number) => 0 | 1 | -1;
+export declare const compareNumbers: (a: number, b: number) => 1 | 0 | -1;
 export {};

package/dist/util/comparators.js

@@ -31,14 +31,15 @@ class TwoKeyWeakMap {
     }
 }
 const concatComparatorsCache = new TwoKeyWeakMap();
-const concatComparators = (c1, c2, ...cRest) => {
+const concatComparators = (...comps) => {
+    const [c1, c2, ...cRest] = comps;
+    if (c2 === undefined) {
+        return c1;
+    }
     if (cRest.length > 0) {
         const [c3, ...cRest2] = cRest;
         return (0, exports.concatComparators)(c1, (0, exports.concatComparators)(c2, c3, ...cRest2));
     }
-    if (c2 === undefined) {
-        return c1;
-    }
     const cacheEntry = concatComparatorsCache.get(c1, c2);
     if (cacheEntry !== undefined)
         return cacheEntry;

package/dist/util/createHash.js

@@ -127,7 +127,7 @@ class DebugHash extends hash_1.default {
      * @returns digest
      */
     digest(encoding) {
-        return ("debug-digest-" + Buffer.from(this.string).toString(encoding || "hex"));
+        return `debug-digest-${Buffer.from(this.string).toString(encoding || "hex")}`;
     }
 }
 /**

package/dist/util/fs.js

@@ -56,7 +56,7 @@ function rmrf(fs, p, callback) {
 }
 exports.rmrf = rmrf;
 const join = (fs, rootPath, filename) => {
-    if (fs && fs.join) {
+    if (fs?.join) {
         return fs.join(rootPath, filename);
     }
     if (node_path_1.default.posix.isAbsolute(rootPath)) {
@@ -68,7 +68,7 @@ const join = (fs, rootPath, filename) => {
     throw new Error(`${rootPath} is neither a posix nor a windows path, and there is no 'join' method defined in the file system`);
 };
 const dirname = (fs, absPath) => {
-    if (fs && fs.dirname) {
+    if (fs?.dirname) {
         return fs.dirname(absPath);
     }
     if (node_path_1.default.posix.isAbsolute(absPath)) {

package/dist/util/identifier.js

@@ -312,8 +312,8 @@ const 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/util/index.js

@@ -73,7 +73,7 @@ function concatErrorMsgAndStack(err) {
 }
 exports.concatErrorMsgAndStack = concatErrorMsgAndStack;
 function indent(str, prefix) {
-    const rem = str.replace(/\n([^\n])/g, "\n" + prefix + "$1");
+    const rem = str.replace(/\n([^\n])/g, `\n${prefix}$1`);
     return prefix + rem;
 }
 exports.indent = indent;

package/dist/util/memoize.js

@@ -3,18 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.memoizeValue = exports.memoizeFn = exports.memoize = void 0;
 const memoize = (fn) => {
     let cache = false;
-    // @ts-expect-error
-    let result = undefined;
+    let result;
     return () => {
         if (cache) {
-            // @ts-expect-error
             return result;
         }
         result = fn();
         cache = true;
         // Allow to clean up memory for fn
         // and all dependent resources
-        // @ts-expect-error
         fn = undefined;
         return result;
     };

package/dist/util/smartGrouping.js

@@ -78,13 +78,11 @@ const smartGrouping = (items, groupConfigs) => {
                 if (options === undefined) {
                     const groupConfig = group.config;
                     state.options = options =
-                        (groupConfig.getOptions &&
-                            groupConfig.getOptions(group.name, Array.from(items, ({ item }) => item))) ||
-                            false;
+                        groupConfig.getOptions?.(group.name, Array.from(items, ({ item }) => item)) || false;
                 }
-                const force = options && options.force;
+                const force = options !== false && options.force;
                 if (!force) {
-                    if (bestGroupOptions && bestGroupOptions.force)
+                    if (bestGroupOptions !== false && bestGroupOptions?.force)
                         continue;
                     if (used)
                         continue;
@@ -92,7 +90,7 @@ const smartGrouping = (items, groupConfigs) => {
                         continue;
                     }
                 }
-                const targetGroupCount = (options && options.targetGroupCount) || 4;
+                const targetGroupCount = (options !== false && options.targetGroupCount) || 4;
                 const sizeValue = force
                     ? items.size
                     : Math.min(items.size, (totalSize * 2) / targetGroupCount +

package/dist/util/webpack.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    readonly createHash: any;
+    readonly createHash: (algorithm: (string & {}) | "debug" | "xxhash64" | "md4" | "native-md4" | (new () => import("./hash").default)) => import("./hash").default;
 };
 export default _default;

package/dist/util/webpack.js

@@ -4,9 +4,10 @@
 // const { NormalModuleReplacementPlugin, WebpackError, util } = compiler.webpack;
 // ```
 Object.defineProperty(exports, "__esModule", { value: true });
+const createHash_1 = require("./createHash");
 exports.default = {
     get createHash() {
-        return require("./createHash");
+        return createHash_1.createHash;
     }
     // get comparators() {
     // 	return require("./comparators");

package/module.d.ts

@@ -109,7 +109,7 @@ declare namespace Rspack {
 		onErrored?: (event: ErroredEvent) => void;
 	}
 
-	const enum HotUpdateStatus {
+	enum HotUpdateStatus {
 		idle = "idle",
 		check = "check",
 		prepare = "prepare",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/core",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.2",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "The fast Rust-based web bundler with webpack-compatible API",
@@ -59,8 +59,8 @@
   "dependencies": {
     "@module-federation/runtime-tools": "0.2.3",
     "caniuse-lite": "^1.0.30001616",
-    "@rspack/binding": "1.0.0-beta.0",
-    "@rspack/lite-tapable": "1.0.0-beta.0"
+    "@rspack/lite-tapable": "1.0.0-beta.2",
+    "@rspack/binding": "1.0.0-beta.2"
   },
   "peerDependencies": {
     "@swc/helpers": ">=0.5.1"