@rspack/core 1.0.5 → 1.0.6

package/dist/stats/DefaultStatsFactoryPlugin.js

@@ -66,7 +66,7 @@ const MERGER = {
     "compilation.namedChunkGroups": statsFactoryUtils_1.mergeToObject
 };
 const ASSETS_GROUPERS = {
-    _: (groupConfigs, context, options) => {
+    _: (groupConfigs, _context, options) => {
         const groupByFlag = (name, exclude) => {
             groupConfigs.push({
                 getKeys: (asset) => {
@@ -78,7 +78,6 @@ const ASSETS_GROUPERS = {
                         force: exclude
                     };
                 },
-                // @ts-expect-error
                 createGroup: (key, children, assets) => {
                     return exclude
                         ? {
@@ -130,7 +129,6 @@ const ASSETS_GROUPERS = {
                     }
                     return keys;
                 },
-                // @ts-expect-error
                 createGroup: (key, children) => {
                     return {
                         type: groupAssetsByPath ? "assets by path" : "assets by extension",
@@ -148,7 +146,6 @@ const ASSETS_GROUPERS = {
                 getKeys: asset => {
                     return asset.info?.[name] ? ["1"] : undefined;
                 },
-                // @ts-expect-error
                 createGroup: (key, children) => {
                     return {
                         type: "assets by info",
@@ -171,7 +168,6 @@ const ASSETS_GROUPERS = {
                 getKeys: asset => {
                     return asset[name];
                 },
-                // @ts-expect-error
                 createGroup: (key, children) => {
                     return {
                         type: "assets by chunk",
@@ -187,7 +183,7 @@ const ASSETS_GROUPERS = {
         groupByNames("chunkIdHints");
         groupByNames("auxiliaryChunkIdHints");
     },
-    excludeAssets: (groupConfigs, context, { excludeAssets }) => {
+    excludeAssets: (groupConfigs, _context, { excludeAssets }) => {
         groupConfigs.push({
             getKeys: asset => {
                 const ident = asset.name;
@@ -199,8 +195,7 @@ const ASSETS_GROUPERS = {
                 groupChildren: false,
                 force: true
             }),
-            // @ts-expect-error
-            createGroup: (key, children, assets) => ({
+            createGroup: (_key, children, assets) => ({
                 type: "hidden assets",
                 filteredChildren: assets.length,
                 ...(0, statsFactoryUtils_1.assetGroup)(children)
@@ -209,7 +204,7 @@ const ASSETS_GROUPERS = {
     }
 };
 const MODULES_GROUPERS = (type) => ({
-    _: (groupConfigs, context, options) => {
+    _: (groupConfigs, _context, options) => {
         const groupByFlag = (name, type, exclude) => {
             groupConfigs.push({
                 getKeys: module => {
@@ -221,7 +216,6 @@ const MODULES_GROUPERS = (type) => ({
                         force: exclude
                     };
                 },
-                // @ts-expect-error
                 createGroup: (key, children, modules) => {
                     return {
                         type,
@@ -273,7 +267,6 @@ const MODULES_GROUPERS = (type) => ({
                         force: exclude
                     };
                 },
-                // @ts-expect-error
                 createGroup: (key, children, modules) => {
                     const exclude = key === "runtime" && !options.runtimeModules;
                     return {
@@ -316,8 +309,7 @@ const MODULES_GROUPERS = (type) => ({
                     }
                     return keys;
                 },
-                // @ts-expect-error
-                createGroup: (key, children, modules) => {
+                createGroup: (key, children, _modules) => {
                     const isDataUrl = key.startsWith("data:");
                     return {
                         type: isDataUrl
@@ -333,7 +325,7 @@ const MODULES_GROUPERS = (type) => ({
             });
         }
     },
-    excludeModules: (groupConfigs, context, { excludeModules }) => {
+    excludeModules: (groupConfigs, _context, { excludeModules }) => {
         groupConfigs.push({
             getKeys: module => {
                 const name = module.name;
@@ -347,8 +339,7 @@ const MODULES_GROUPERS = (type) => ({
                 groupChildren: false,
                 force: true
             }),
-            // @ts-expect-error
-            createGroup: (key, children, modules) => ({
+            createGroup: (_key, children, _modules) => ({
                 type: "hidden modules",
                 filteredChildren: children.length,
                 ...(0, statsFactoryUtils_1.moduleGroup)(children)
@@ -374,22 +365,22 @@ const ASSET_SORTERS = {
 };
 const RESULT_SORTERS = {
     "compilation.chunks": {
-        chunksSort: (comparators, context, { chunksSort }) => {
+        chunksSort: (comparators, _context, { chunksSort }) => {
             comparators.push((0, statsFactoryUtils_1.sortByField)(chunksSort));
         }
     },
     "compilation.modules": {
-        modulesSort: (comparators, context, { modulesSort }) => {
+        modulesSort: (comparators, _context, { modulesSort }) => {
             comparators.push((0, statsFactoryUtils_1.sortByField)(modulesSort));
         }
     },
     "chunk.modules": {
-        chunkModulesSort: (comparators, context, { chunkModulesSort }) => {
+        chunkModulesSort: (comparators, _context, { chunkModulesSort }) => {
             comparators.push((0, statsFactoryUtils_1.sortByField)(chunkModulesSort));
         }
     },
     "module.modules": {
-        nestedModulesSort: (comparators, context, { nestedModulesSort }) => {
+        nestedModulesSort: (comparators, _context, { nestedModulesSort }) => {
             comparators.push((0, statsFactoryUtils_1.sortByField)(nestedModulesSort));
         }
     },
@@ -840,7 +831,7 @@ const SIMPLE_EXTRACTORS = {
             object.auxiliaryChunkIdHints =
                 asset.auxiliaryChunkIdHints.filter(Boolean);
         },
-        relatedAssets: (object, asset, context, options, factory) => {
+        relatedAssets: (object, asset, context, _options, factory) => {
             const { type } = context;
             object.related = factory.create(`${type.slice(0, -8)}.related`, asset.related, context);
             object.filteredRelated = asset.related
@@ -900,7 +891,7 @@ const SIMPLE_EXTRACTORS = {
         }
     },
     module$visible: {
-        _: (object, module, context, options, factory) => {
+        _: (object, module, context, _options, factory) => {
             const { type } = context;
             const { commonAttributes } = module;
             if (commonAttributes.moduleDescriptor) {
@@ -1008,7 +999,7 @@ const SIMPLE_EXTRACTORS = {
         }
     },
     moduleIssuer: {
-        _: (object, module, context, options, factory) => {
+        _: (object, module, _context, _options, _factory) => {
             if (module.moduleDescriptor) {
                 object.identifier = module.moduleDescriptor.identifier;
                 object.name = module.moduleDescriptor.name;
@@ -1077,13 +1068,13 @@ const SIMPLE_EXTRACTORS = {
             object.modules = limited.children;
             object.filteredModules = limited.filteredChildren;
         },
-        chunkOrigins: (object, chunk, context, options, factory) => {
+        chunkOrigins: (object, chunk, context, _options, factory) => {
             const { type } = context;
             object.origins = factory.create(`${type}.origins`, chunk.origins, context);
         }
     },
     chunkOrigin: {
-        _: (object, origin, context) => {
+        _: (object, origin, _context) => {
             const { moduleDescriptor, loc, request } = origin;
             const statsChunkOrigin = {
                 module: moduleDescriptor ? moduleDescriptor.identifier : "",
@@ -1101,7 +1092,7 @@ const SIMPLE_EXTRACTORS = {
     error: EXTRACT_ERROR,
     warning: EXTRACT_ERROR,
     moduleTraceItem: {
-        _: (object, { origin, module }, context, { requestShortener }, factory) => {
+        _: (object, { origin, module }, _context, { requestShortener }, _factory) => {
             if (origin.moduleDescriptor) {
                 object.originIdentifier = origin.moduleDescriptor.identifier;
                 object.originName = origin.moduleDescriptor.name;
@@ -1134,9 +1125,7 @@ const FILTER_RESULTS = {
 class DefaultStatsFactoryPlugin {
     apply(compiler) {
         compiler.hooks.compilation.tap("DefaultStatsFactoryPlugin", compilation => {
-            compilation.hooks.statsFactory.tap("DefaultStatsFactoryPlugin", 
-            // @ts-expect-error
-            (stats, options, context) => {
+            compilation.hooks.statsFactory.tap("DefaultStatsFactoryPlugin", (stats, options) => {
                 (0, statsFactoryUtils_1.iterateConfig)(SIMPLE_EXTRACTORS, options, (hookFor, fn) => {
                     stats.hooks.extract
                         .for(hookFor)

package/dist/stats/DefaultStatsPrinterPlugin.js

@@ -1002,8 +1002,8 @@ class DefaultStatsPrinterPlugin {
                                 start = options.colors[color];
                             }
                             else {
-                                // @ts-expect-error
-                                start = AVAILABLE_COLORS[color];
+                                start =
+                                    AVAILABLE_COLORS[color];
                             }
                         }
                         if (start) {
@@ -1026,9 +1026,7 @@ class DefaultStatsPrinterPlugin {
                 for (const key of Object.keys(SIMPLE_PRINTERS)) {
                     stats.hooks.print
                         .for(key)
-                        .tap("DefaultStatsPrinterPlugin", (obj, ctx) => 
-                    // @ts-expect-error
-                    SIMPLE_PRINTERS[key](obj, ctx, stats));
+                        .tap("DefaultStatsPrinterPlugin", (obj, ctx) => SIMPLE_PRINTERS[key](obj, ctx, stats));
                 }
                 for (const key of Object.keys(PREFERRED_ORDERS)) {
                     const preferredOrder = PREFERRED_ORDERS[key];

package/dist/stats/StatsFactory.d.ts

@@ -25,7 +25,7 @@ type Hooks = Readonly<{
     extract: HookMap<SyncBailHook<[Object, any, StatsFactoryContext], undefined>>;
     filter: HookMap<SyncBailHook<[any, StatsFactoryContext, number, number], undefined>>;
     filterSorted: HookMap<SyncBailHook<[any, StatsFactoryContext, number, number], undefined>>;
-    groupResults: HookMap<SyncBailHook<[GroupConfig[], StatsFactoryContext], undefined>>;
+    groupResults: HookMap<SyncBailHook<[GroupConfig<any>[], StatsFactoryContext], undefined>>;
     filterResults: HookMap<SyncBailHook<[any, StatsFactoryContext, number, number], undefined>>;
     sort: HookMap<SyncBailHook<[
         ((arg1: any, arg2: any) => number)[],

package/dist/stats/StatsFactory.js

@@ -15,10 +15,7 @@ class StatsFactory {
             filter: new lite_tapable_1.HookMap(() => new lite_tapable_1.SyncBailHook(["item", "context", "index", "unfilteredIndex"])),
             sort: new lite_tapable_1.HookMap(() => new lite_tapable_1.SyncBailHook(["comparators", "context"])),
             filterSorted: new lite_tapable_1.HookMap(() => new lite_tapable_1.SyncBailHook(["item", "context", "index", "unfilteredIndex"])),
-            groupResults: new lite_tapable_1.HookMap(() => new lite_tapable_1.SyncBailHook([
-                "groupConfigs",
-                "context"
-            ])),
+            groupResults: new lite_tapable_1.HookMap(() => new lite_tapable_1.SyncBailHook(["groupConfigs", "context"])),
             sortResults: new lite_tapable_1.HookMap(() => new lite_tapable_1.SyncBailHook(["comparators", "context"])),
             filterResults: new lite_tapable_1.HookMap(() => new lite_tapable_1.SyncBailHook(["item", "context", "index", "unfilteredIndex"])),
             merge: new lite_tapable_1.HookMap(() => new lite_tapable_1.SyncBailHook([

package/dist/stats/statsFactoryUtils.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 import type * as binding from "@rspack/binding";
 import type { JsOriginRecord } from "@rspack/binding";
-import type { Compilation, NormalizedStatsOptions } from "../Compilation";
+import type { Compilation } from "../Compilation";
+import type { StatsOptions } from "../config";
 import { type Comparator } from "../util/comparators";
 import type { StatsFactory, StatsFactoryContext } from "./StatsFactory";
 export type KnownStatsChunkGroup = {
@@ -258,7 +259,7 @@ export type SimpleExtractors = {
 };
 export declare const uniqueArray: <T, I>(items: Iterable<T>, selector: (arg: T) => Iterable<I>) => I[];
 export declare const uniqueOrderedArray: <T, I>(items: Iterable<T>, selector: (arg: T) => Iterable<I>, comparator: Comparator) => I[];
-export declare const iterateConfig: (config: Record<string, Record<string, Function>>, options: NormalizedStatsOptions, fn: (a1: string, a2: Function) => void) => void;
+export declare const iterateConfig: (config: Record<string, Record<string, Function>>, options: StatsOptions, fn: (a1: string, a2: Function) => void) => void;
 type Child = {
     children?: ItemChildren;
     filteredChildren?: number;
@@ -275,7 +276,10 @@ export declare const sortByField: (field: string) => (a1: Object, a2: Object) =>
 export declare const assetGroup: (children: StatsAsset[]) => {
     size: number;
 };
-export declare const moduleGroup: (children: KnownStatsModule[]) => {
+export declare const moduleGroup: (children: {
+    size: number;
+    sizes: Record<string, number>;
+}[]) => {
     size: number;
     sizes: Record<string, number>;
 };

package/dist/stats/statsFactoryUtils.js

@@ -22,7 +22,9 @@ const iterateConfig = (config, options, fn) => {
         for (const option of Object.keys(subConfig)) {
             if (option !== "_") {
                 if (option.startsWith("!")) {
-                    if (options[option.slice(1)])
+                    if (
+                    // string cannot be used as key, so use "as"
+                    options[option.slice(1)])
                         continue;
                 }
                 else {
@@ -157,7 +159,6 @@ const spaceLimited = (itemsAndGroups, max, filteredChildrenLineReserved = false)
                 }
                 for (let i = 0; i < groups.length; i++) {
                     if (groupSizes[i] === maxGroupSize) {
-                        // @ts-expect-error
                         const group = groups[i];
                         // run this algorithm recursively and limit the size of the children to
                         // current size - oversize / number of groups
@@ -226,13 +227,11 @@ const sortOrderRegular = (field) => {
 };
 const sortByField = (field) => {
     if (!field) {
-        const noSort = (a, b) => 0;
+        const noSort = (_a, _b) => 0;
         return noSort;
     }
     const fieldKey = normalizeFieldKey(field);
-    let sortFn = (0, comparators_1.compareSelect)((m) => m[fieldKey], 
-    // @ts-expect-error
-    comparators_1.compareIds);
+    let sortFn = (0, comparators_1.compareSelect)((m) => m[fieldKey], comparators_1.compareIds);
     // if a field is prefixed with a "!" the sort is reversed!
     const sortIsRegular = sortOrderRegular(field);
     if (!sortIsRegular) {

package/dist/util/comparators.d.ts

@@ -12,9 +12,9 @@ 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: (...comps: Array<Comparator>) => Comparator;
-export declare const compareIds: (a: string | number, b: string | number) => -1 | 0 | 1;
+export declare const compareIds: <T = string | number>(a: T, b: T) => -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) => 1 | 0 | -1;
+export declare const compareNumbers: (a: number, b: number) => 0 | 1 | -1;
 export {};

package/dist/util/smartGrouping.d.ts

@@ -12,10 +12,10 @@ type GroupOptions = {
     force?: boolean | undefined;
     targetGroupCount?: number | undefined;
 };
-export type GroupConfig = {
+export type GroupConfig<T, R = T> = {
     getKeys: (arg0: any) => string[] | undefined;
-    createGroup: <T, R>(arg0: string, arg1: (T | R)[], arg2: T[]) => R;
-    getOptions?: (<T>(arg0: string, arg1: T[]) => GroupOptions) | undefined;
+    createGroup: (key: string, arg1: (T | R)[], arg2: T[]) => R;
+    getOptions?: ((key: string, arg1: T[]) => GroupOptions) | undefined;
 };
-export declare const smartGrouping: <T, R>(items: T[], groupConfigs: GroupConfig[]) => (T | R)[];
+export declare const smartGrouping: <T, R>(items: T[], groupConfigs: GroupConfig<T, R>[]) => (T | R)[];
 export {};

package/dist/util/source.d.ts

@@ -1,18 +1,7 @@
-/// <reference types="node" />
 import type { JsCompatSource } from "@rspack/binding";
 import { Source } from "../../compiled/webpack-sources";
 declare class JsSource extends Source {
     static __from_binding(source: JsCompatSource): Source;
-    static __to_binding(source: Source): {
-        source: Buffer;
-        isRaw: boolean;
-        isBuffer: boolean;
-        map?: undefined;
-    } | {
-        source: Buffer;
-        map: Buffer;
-        isRaw: boolean;
-        isBuffer: boolean;
-    };
+    static __to_binding(source: Source): JsCompatSource;
 }
 export { JsSource };

package/dist/util/source.js

@@ -2,65 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsSource = void 0;
 const webpack_sources_1 = require("../../compiled/webpack-sources");
-const index_1 = require("./index");
 class JsSource extends webpack_sources_1.Source {
     static __from_binding(source) {
-        if (source.isRaw) {
-            return new webpack_sources_1.RawSource(
-            // @ts-expect-error: webpack-sources can accept buffer as source, see: https://github.com/webpack/webpack-sources/blob/9f98066311d53a153fdc7c633422a1d086528027/lib/RawSource.js#L12
-            source.isBuffer ? source.source : source.source.toString("utf-8"));
+        if (source.source instanceof Buffer) {
+            // @ts-expect-error: webpack-sources can accept buffer as source,
+            // see: https://github.com/webpack/webpack-sources/blob/9f98066311d53a153fdc7c633422a1d086528027/lib/RawSource.js#L12
+            return new webpack_sources_1.RawSource(source.source);
         }
         if (!source.map) {
-            return new webpack_sources_1.RawSource(source.source.toString("utf-8"));
+            return new webpack_sources_1.RawSource(source.source);
         }
-        return new webpack_sources_1.CompatSource({
-            source() {
-                return source.source.toString("utf-8");
-            },
-            buffer() {
-                return source.source;
-            },
-            map(_) {
-                if (source.map) {
-                    return JSON.parse(source.map.toString("utf-8"));
-                }
-                return null;
-            }
-        });
+        return new webpack_sources_1.SourceMapSource(source.source, "inmemory://from rust", 
+        // @ts-expect-error: SourceMapSource can accept string as source map,
+        // see: https://github.com/webpack/webpack-sources/blob/9f98066311d53a153fdc7c633422a1d086528027/lib/SourceMapSource.js#L30
+        source.map);
     }
     static __to_binding(source) {
-        const sourceSource = source.source();
-        const isBuffer = Buffer.isBuffer(sourceSource);
         if (source instanceof webpack_sources_1.RawSource) {
+            // @ts-expect-error: The 'isBuffer' method exists on 'RawSource' in 'webpack-sources',
+            if (source.isBuffer()) {
+                return {
+                    source: source.buffer()
+                };
+            }
             return {
-                source: source.buffer(),
-                isRaw: true,
-                isBuffer
+                source: source.source()
             };
         }
-        const buffer = source.buffer?.() ??
-            (isBuffer
-                ? sourceSource
-                : sourceSource instanceof ArrayBuffer
-                    ? arrayBufferToBuffer(sourceSource)
-                    : Buffer.from(sourceSource));
         const map = JSON.stringify(source.map?.({
             columns: true
         }));
+        const code = source.source();
         return {
-            source: buffer,
-            map: (0, index_1.isNil)(map) ? map : Buffer.from(map),
-            isRaw: false,
-            isBuffer
+            source: typeof code === "string" ? code : Buffer.from(code).toString("utf-8"),
+            map
         };
     }
 }
 exports.JsSource = JsSource;
-function arrayBufferToBuffer(ab) {
-    const buf = Buffer.alloc(ab.byteLength);
-    const view = new Uint8Array(ab);
-    for (let i = 0; i < buf.length; ++i) {
-        buf[i] = view[i];
-    }
-    return buf;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/core",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "The fast Rust-based web bundler with webpack-compatible API",
@@ -60,7 +60,7 @@
     "@module-federation/runtime-tools": "0.5.1",
     "@rspack/lite-tapable": "1.0.0",
     "caniuse-lite": "^1.0.30001616",
-    "@rspack/binding": "1.0.5"
+    "@rspack/binding": "1.0.6"
   },
   "peerDependencies": {
     "@swc/helpers": ">=0.5.1"