@rspack-canary/core 1.6.0-canary-bf68c45d-20251028142310 → 1.6.0-canary-34fbd33e-20251029061020

package/dist/index.js

@@ -1218,22 +1218,22 @@ for(var __webpack_i__ in (()=>{
         };
     }
     var index_js_ = __webpack_require__("webpack-sources");
-    class JsSource extends index_js_.Source {
-        static __from_binding(source) {
-            return Buffer.isBuffer(source.source) || !source.map ? new index_js_.RawSource(source.source) : new index_js_.SourceMapSource(source.source, "inmemory://from rust", source.map);
-        }
-        static __to_binding(source) {
-            if (source instanceof index_js_.RawSource) return source.isBuffer() ? {
-                source: source.buffer()
-            } : {
-                source: source.source()
+    class SourceAdapter {
+        static fromBinding(source) {
+            return source.map ? new index_js_.SourceMapSource(source.source, "inmemory://from rust", source.map) : new index_js_.RawSource(source.source);
+        }
+        static toBinding(source) {
+            let content = source.source();
+            if (Buffer.isBuffer(content)) return {
+                source: content,
+                map: void 0
             };
-            let map = JSON.stringify(source.map?.({
+            let map = source.map?.({
                 columns: !0
-            })), code = source.source();
+            });
             return {
-                source: "string" == typeof code ? code : Buffer.from(code).toString("utf-8"),
-                map
+                source: content,
+                map: map ? JSON.stringify(map) : void 0
             };
         }
     }
@@ -1375,7 +1375,7 @@ for(var __webpack_i__ in (()=>{
         configurable: !0,
         value (sourceType) {
             let originalSource = this._get(sourceType);
-            return originalSource ? JsSource.__from_binding(originalSource) : null;
+            return originalSource ? SourceAdapter.fromBinding(originalSource) : null;
         }
     });
     let $proxy = Symbol.for("proxy");
@@ -1671,11 +1671,11 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
         updateAsset(filename, newSourceOrFunction, assetInfoUpdateOrFunction) {
             let compatNewSourceOrFunction;
             compatNewSourceOrFunction = "function" == typeof newSourceOrFunction ? function(source) {
-                return JsSource.__to_binding(newSourceOrFunction(JsSource.__from_binding(source)));
-            } : JsSource.__to_binding(newSourceOrFunction), this.#inner.updateAsset(filename, compatNewSourceOrFunction, assetInfoUpdateOrFunction);
+                return SourceAdapter.toBinding(newSourceOrFunction(SourceAdapter.fromBinding(source)));
+            } : SourceAdapter.toBinding(newSourceOrFunction), this.#inner.updateAsset(filename, compatNewSourceOrFunction, assetInfoUpdateOrFunction);
         }
         emitAsset(filename, source, assetInfo) {
-            this.#inner.emitAsset(filename, JsSource.__to_binding(source), assetInfo);
+            this.#inner.emitAsset(filename, SourceAdapter.toBinding(source), assetInfo);
         }
         deleteAsset(filename) {
             this.#inner.deleteAsset(filename);
@@ -1848,10 +1848,10 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
         }
         __internal__getAssetSource(filename) {
             let rawSource = this.#inner.getAssetSource(filename);
-            if (rawSource) return JsSource.__from_binding(rawSource);
+            if (rawSource) return SourceAdapter.fromBinding(rawSource);
         }
         __internal__setAssetSource(filename, source) {
-            this.#inner.setAssetSource(filename, JsSource.__to_binding(source));
+            this.#inner.setAssetSource(filename, SourceAdapter.toBinding(source));
         }
         __internal__deleteAssetSource(filename) {
             this.#inner.deleteAssetSource(filename);
@@ -2566,13 +2566,13 @@ Plugins which provide custom chunk loading types must call EnableChunkLoadingPlu
         configurable: !0,
         value () {
             let originalSource = this._originalSource();
-            return originalSource ? JsSource.__from_binding(originalSource) : null;
+            return originalSource ? SourceAdapter.fromBinding(originalSource) : null;
         }
     }), Object.defineProperty(binding_default().NormalModule.prototype, "emitFile", {
         enumerable: !0,
         configurable: !0,
         value (filename, source, assetInfo) {
-            return this._emitFile(filename, JsSource.__to_binding(source), assetInfo);
+            return this._emitFile(filename, SourceAdapter.toBinding(source), assetInfo);
         }
     });
     let deprecateAllProperties = (obj, message, code)=>{
@@ -5745,7 +5745,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
     }, applyExperimentsDefaults = (experiments, { development })=>{
         F(experiments, "cache", ()=>development), D(experiments, "futureDefaults", !1), D(experiments, "lazyCompilation", !1), D(experiments, "asyncWebAssembly", experiments.futureDefaults), D(experiments, "css", !!experiments.futureDefaults || void 0), D(experiments, "topLevelAwait", !0), D(experiments, "deferImport", !1), D(experiments, "buildHttp", void 0), experiments.buildHttp && "object" == typeof experiments.buildHttp && D(experiments.buildHttp, "upgrade", !1), D(experiments, "incremental", {}), "object" == typeof experiments.incremental && (D(experiments.incremental, "silent", !0), D(experiments.incremental, "make", !0), D(experiments.incremental, "inferAsyncModules", !0), D(experiments.incremental, "providedExports", !0), D(experiments.incremental, "dependenciesDiagnostics", !0), D(experiments.incremental, "sideEffects", !0), D(experiments.incremental, "buildChunkGraph", !1), D(experiments.incremental, "moduleIds", !0), D(experiments.incremental, "chunkIds", !0), D(experiments.incremental, "modulesHashes", !0), D(experiments.incremental, "modulesCodegen", !0), D(experiments.incremental, "modulesRuntimeRequirements", !0), D(experiments.incremental, "chunksRuntimeRequirements", !0), D(experiments.incremental, "chunksHashes", !0), D(experiments.incremental, "chunksRender", !0), D(experiments.incremental, "emitAssets", !0)), D(experiments, "rspackFuture", {}), D(experiments, "parallelCodeSplitting", !1), D(experiments, "parallelLoader", !1), D(experiments, "useInputFileSystem", !1), D(experiments, "inlineConst", !1), D(experiments, "inlineEnum", !1), D(experiments, "typeReexportsPresence", !1), D(experiments, "lazyBarrel", !0);
     }, applybundlerInfoDefaults = (rspackFuture, library)=>{
-        "object" == typeof rspackFuture && (D(rspackFuture, "bundlerInfo", {}), "object" == typeof rspackFuture.bundlerInfo && (D(rspackFuture.bundlerInfo, "version", "1.6.0-canary-bf68c45d-20251028142310"), D(rspackFuture.bundlerInfo, "bundler", "rspack"), D(rspackFuture.bundlerInfo, "force", !library)));
+        "object" == typeof rspackFuture && (D(rspackFuture, "bundlerInfo", {}), "object" == typeof rspackFuture.bundlerInfo && (D(rspackFuture.bundlerInfo, "version", "1.6.0-canary-34fbd33e-20251029061020"), D(rspackFuture.bundlerInfo, "bundler", "rspack"), D(rspackFuture.bundlerInfo, "force", !library)));
     }, applySnapshotDefaults = (_snapshot, _env)=>{}, applyModuleDefaults = (module1, { cache, asyncWebAssembly, css, targetProperties, mode, uniqueName, usedExports, inlineConst, deferImport })=>{
         if (assertNotNill(module1.parser), assertNotNill(module1.generator), cache ? D(module1, "unsafeCache", /[\\/]node_modules[\\/]/) : D(module1, "unsafeCache", !1), F(module1.parser, "asset", ()=>({})), assertNotNill(module1.parser.asset), F(module1.parser.asset, "dataUrlCondition", ()=>({})), "object" == typeof module1.parser.asset.dataUrlCondition && D(module1.parser.asset.dataUrlCondition, "maxSize", 8096), F(module1.parser, "javascript", ()=>({})), assertNotNill(module1.parser.javascript), ((parserOptions, { usedExports, inlineConst, deferImport })=>{
             D(parserOptions, "dynamicImportMode", "lazy"), D(parserOptions, "dynamicImportPrefetch", !1), D(parserOptions, "dynamicImportPreload", !1), D(parserOptions, "url", !0), D(parserOptions, "exprContextCritical", !0), D(parserOptions, "unknownContextCritical", !0), D(parserOptions, "wrappedContextCritical", !1), D(parserOptions, "wrappedContextRegExp", /.*/), D(parserOptions, "strictExportPresence", !1), D(parserOptions, "requireAsExpression", !0), D(parserOptions, "requireDynamic", !0), D(parserOptions, "requireResolve", !0), D(parserOptions, "commonjs", !0), D(parserOptions, "importDynamic", !0), D(parserOptions, "worker", [
@@ -7251,13 +7251,13 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
         configurable: !0,
         value () {
             let originalSource = this._originalSource();
-            return originalSource ? JsSource.__from_binding(originalSource) : null;
+            return originalSource ? SourceAdapter.fromBinding(originalSource) : null;
         }
     }), Object.defineProperty(binding_default().Module.prototype, "emitFile", {
         enumerable: !0,
         configurable: !0,
         value (filename, source, assetInfo) {
-            return this._emitFile(filename, JsSource.__to_binding(source), assetInfo);
+            return this._emitFile(filename, SourceAdapter.toBinding(source), assetInfo);
         }
     });
     let traceHookPlugin_PLUGIN_NAME = "TraceHookPlugin", PLUGIN_PROCESS_NAME = "Plugin Analysis", makeInterceptorFor = (compilerName, tracer)=>(hookName)=>({
@@ -7391,7 +7391,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
             });
         }
     }
-    let CORE_VERSION = "1.6.0-canary-bf68c45d-20251028142310", bindingVersionCheck_errorMessage = (coreVersion, expectedCoreVersion)=>process.env.RSPACK_BINDING ? `Unmatched version @rspack/core@${coreVersion} and binding version.
+    let CORE_VERSION = "1.6.0-canary-34fbd33e-20251029061020", bindingVersionCheck_errorMessage = (coreVersion, expectedCoreVersion)=>process.env.RSPACK_BINDING ? `Unmatched version @rspack/core@${coreVersion} and binding version.
 
 Help:
 	Looks like you are using a custom binding (via environment variable 'RSPACK_BINDING=${process.env.RSPACK_BINDING}').
@@ -8682,7 +8682,7 @@ Help:
             obj.children = this.stats.map((stat, idx)=>{
                 let obj = stat.toJson(childOptions.children[idx]), compilationName = stat.compilation.name;
                 return obj.name = compilationName && makePathsRelative(childOptions.context, compilationName, stat.compilation.compiler.root), obj;
-            }), childOptions.version && (obj.rspackVersion = "1.6.0-canary-bf68c45d-20251028142310", obj.version = "5.75.0"), childOptions.hash && (obj.hash = obj.children.map((j)=>j.hash).join(""));
+            }), childOptions.version && (obj.rspackVersion = "1.6.0-canary-34fbd33e-20251029061020", obj.version = "5.75.0"), childOptions.hash && (obj.hash = obj.children.map((j)=>j.hash).join(""));
             let mapError = (j, obj)=>({
                     ...obj,
                     compilerPath: obj.compilerPath ? `${j.name}.${obj.compilerPath}` : j.name
@@ -9581,7 +9581,7 @@ Help:
                 object.hash = context.getStatsCompilation(compilation).hash;
             },
             version: (object)=>{
-                object.version = "5.75.0", object.rspackVersion = "1.6.0-canary-bf68c45d-20251028142310";
+                object.version = "5.75.0", object.rspackVersion = "1.6.0-canary-34fbd33e-20251029061020";
             },
             env: (object, _compilation, _context, { _env })=>{
                 object.env = _env;
@@ -10980,13 +10980,13 @@ Help:
         configurable: !0,
         value () {
             let originalSource = this._originalSource();
-            return originalSource ? JsSource.__from_binding(originalSource) : null;
+            return originalSource ? SourceAdapter.fromBinding(originalSource) : null;
         }
     }), Object.defineProperty(binding_default().ConcatenatedModule.prototype, "emitFile", {
         enumerable: !0,
         configurable: !0,
         value (filename, source, assetInfo) {
-            return this._emitFile(filename, JsSource.__to_binding(source), assetInfo);
+            return this._emitFile(filename, SourceAdapter.toBinding(source), assetInfo);
         }
     }), Object.defineProperty(binding_default().ContextModule.prototype, "identifier", {
         enumerable: !0,
@@ -10999,13 +10999,13 @@ Help:
         configurable: !0,
         value () {
             let originalSource = this._originalSource();
-            return originalSource ? JsSource.__from_binding(originalSource) : null;
+            return originalSource ? SourceAdapter.fromBinding(originalSource) : null;
         }
     }), Object.defineProperty(binding_default().ContextModule.prototype, "emitFile", {
         enumerable: !0,
         configurable: !0,
         value (filename, source, assetInfo) {
-            return this._emitFile(filename, JsSource.__to_binding(source), assetInfo);
+            return this._emitFile(filename, SourceAdapter.toBinding(source), assetInfo);
         }
     }), Object.defineProperty(binding_default().ExternalModule.prototype, "identifier", {
         enumerable: !0,
@@ -11018,13 +11018,13 @@ Help:
         configurable: !0,
         value () {
             let originalSource = this._originalSource();
-            return originalSource ? JsSource.__from_binding(originalSource) : null;
+            return originalSource ? SourceAdapter.fromBinding(originalSource) : null;
         }
     }), Object.defineProperty(binding_default().ExternalModule.prototype, "emitFile", {
         enumerable: !0,
         configurable: !0,
         value (filename, source, assetInfo) {
-            return this._emitFile(filename, JsSource.__to_binding(source), assetInfo);
+            return this._emitFile(filename, SourceAdapter.toBinding(source), assetInfo);
         }
     });
     let asRegExp = (test)=>"string" == typeof test ? RegExp(`^${test.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&")}`) : test, matchPart = (str, test)=>!test || (Array.isArray(test) ? test.map(asRegExp).some((regExp)=>regExp.test(str)) : asRegExp(test).test(str)), matchObject = (obj, str)=>!(obj.test && !matchPart(str, obj.test) || obj.include && !matchPart(str, obj.include) || obj.exclude && matchPart(str, obj.exclude)), FlagAllModulesAsUsedPlugin = base_create(binding_.BuiltinPluginName.FlagAllModulesAsUsedPlugin, (explanation)=>({
@@ -11685,7 +11685,7 @@ Help:
         let _options = JSON.stringify(options || {});
         return binding_default().transform(source, _options);
     }
-    let exports_rspackVersion = "1.6.0-canary-bf68c45d-20251028142310", exports_version = "5.75.0", exports_WebpackError = Error, sources = __webpack_require__("webpack-sources"), exports_config = {
+    let exports_rspackVersion = "1.6.0-canary-34fbd33e-20251029061020", exports_version = "5.75.0", exports_WebpackError = Error, sources = __webpack_require__("webpack-sources"), exports_config = {
         getNormalizedRspackOptions: getNormalizedRspackOptions,
         applyRspackOptionsDefaults: applyRspackOptionsDefaults,
         getNormalizedWebpackOptions: getNormalizedRspackOptions,

package/dist/util/source.d.ts

@@ -1,7 +1,6 @@
-import type { JsCompatSourceOwned } from "@rspack/binding";
-import { Source } from "../../compiled/webpack-sources";
-declare class JsSource extends Source {
-    static __from_binding(source: JsCompatSourceOwned): Source;
-    static __to_binding(source: Source): JsCompatSourceOwned;
+import type { JsSource } from "@rspack/binding";
+import { type Source } from "../../compiled/webpack-sources";
+export declare class SourceAdapter {
+    static fromBinding(source: JsSource): Source;
+    static toBinding(source: Source): JsSource;
 }
-export { JsSource };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack-canary/core",
-  "version": "1.6.0-canary-bf68c45d-20251028142310",
+  "version": "1.6.0-canary-34fbd33e-20251029061020",
   "webpackVersion": "5.75.0",
   "license": "MIT",
   "description": "The fast Rust-based web bundler with webpack-compatible API",
@@ -37,12 +37,12 @@
     "directory": "packages/rspack"
   },
   "devDependencies": {
-    "@ast-grep/napi": "^0.39.6",
+    "@ast-grep/napi": "^0.39.7",
     "@napi-rs/wasm-runtime": "1.0.7",
     "@rsbuild/plugin-node-polyfill": "^1.4.2",
     "@rslib/core": "0.16.1",
     "@swc/types": "0.1.25",
-    "@types/node": "^20.19.23",
+    "@types/node": "^20.19.24",
     "@types/watchpack": "^2.4.4",
     "browserslist-load-config": "^1.0.1",
     "enhanced-resolve": "5.18.3",
@@ -56,9 +56,9 @@
     "webpack-sources": "3.3.3"
   },
   "dependencies": {
-    "@module-federation/runtime-tools": "0.21.1",
+    "@module-federation/runtime-tools": "0.21.2",
     "@rspack/lite-tapable": "1.0.1",
-    "@rspack/binding": "npm:@rspack-canary/binding@1.6.0-canary-bf68c45d-20251028142310"
+    "@rspack/binding": "npm:@rspack-canary/binding@1.6.0-canary-34fbd33e-20251029061020"
   },
   "peerDependencies": {
     "@swc/helpers": ">=0.5.1"