refactor(loader): reuse loader item data

Author: intellild

crates/node_binding/napi-binding.d.ts

@@ -1011,7 +1011,6 @@ export interface JsLoaderItem {
   parallel: boolean
   optionsHandle?: number
   ident?: string
-  serializedData?: string
   data: any
   normalExecuted: boolean
   pitchExecuted: boolean

crates/rspack_binding_api/src/plugins/js_loader/context.rs

@@ -22,7 +22,6 @@ pub struct JsLoaderItem {
   pub parallel: bool,
   pub options_handle: Option<u32>,
   pub ident: Option<String>,
-  pub serialized_data: Option<String>,
 
   // data
   pub data: serde_json::Value,
@@ -43,7 +42,6 @@ impl From<&rspack_loader_runner::LoaderItem<RunnerContext>> for JsLoaderItem {
       parallel: value.parallel(),
       options_handle: value.js_options_handle(),
       ident: value.ident().map(ToOwned::to_owned),
-      serialized_data: value.js_data().map(ToOwned::to_owned),
 
       data: value.data().clone(),
       normal_executed: value.normal_executed(),
@@ -70,7 +68,6 @@ where
         parallel: false,
         options_handle: None,
         ident: None,
-        serialized_data: None,
         pitch_executed: false,
         normal_executed: false,
         no_pitch: false,
@@ -84,7 +81,6 @@ where
       parallel: false,
       options_handle: None,
       ident: None,
-      serialized_data: None,
       pitch_executed: false,
       normal_executed: false,
       no_pitch: false,

crates/rspack_binding_api/src/plugins/js_loader/scheduler.rs

@@ -167,7 +167,6 @@ fn merge_loader_hook_context(to: &mut LoaderContext<RunnerContext>, mut from: Js
     .collect();
   for (to, from) in to.loader_items.iter_mut().zip(from.loader_items.drain(..)) {
     to.set_data(from.data);
-    to.set_js_data(from.serialized_data);
   }
   to.parse_meta.extend(
     from
@@ -246,7 +245,6 @@ pub(crate) fn merge_loader_context(
         to.set_pitch_executed()
       }
       to.set_data(from.data);
-      to.set_js_data(from.serialized_data);
       // JS loader should always be considered as finished
       to.set_finish_called();
       to

crates/rspack_loader_runner/src/loader.rs

@@ -37,10 +37,6 @@ pub struct LoaderItem<Context: Send> {
   fragment: Option<String>,
   /// Data shared between pitching and normal
   data: serde_json::Value,
-  /// Native-owned V8 serialization of JavaScript loader data. This keeps values such as Buffer,
-  /// Map and function handles intact when execution changes isolates. Native loaders continue to
-  /// use `data`; JavaScript loaders prefer this representation once it exists.
-  js_data: Option<String>,
   r#type: String,
   cache_options: Option<Box<LoaderRunnerOptions>>,
   parallel: bool,
@@ -143,17 +139,6 @@ impl<C: Send> LoaderItem<C> {
     self.data = data;
   }
 
-  #[inline]
-  pub fn js_data(&self) -> Option<&str> {
-    self.js_data.as_deref()
-  }
-
-  #[inline]
-  #[doc(hidden)]
-  pub fn set_js_data(&mut self, data: Option<String>) {
-    self.js_data = data;
-  }
-
   #[inline]
   #[doc(hidden)]
   pub fn pitch_executed(&self) -> bool {
@@ -298,7 +283,6 @@ impl<C: Send> LoaderItem<C> {
         query,
         fragment,
         data: serde_json::Value::Null,
-        js_data: None,
         r#type: ty,
         cache_options,
         parallel,
@@ -322,7 +306,6 @@ impl<C: Send> LoaderItem<C> {
       query,
       fragment,
       data: serde_json::Value::Null,
-      js_data: None,
       r#type: String::default(),
       cache_options,
       parallel,

packages/rspack/src/loader-runner/index.ts

@@ -157,9 +157,7 @@ export class LoaderObject {
     this.parallel = loaderItem.parallel;
     this.cache = loaderItem.cache;
     this.loaderItem = loaderItem;
-    this.loaderItem.data = loaderItem.serializedData
-      ? deserializeLoaderOptions(loaderItem.serializedData)
-      : (this.loaderItem.data ?? {});
+    this.loaderItem.data = this.loaderItem.data ?? {};
   }
 
   get pitchExecuted() {
@@ -204,16 +202,7 @@ export class LoaderObject {
     return new this(loaderItem, compiler);
   }
 
-  static __to_binding(
-    loader: LoaderObject,
-    serializeData = false,
-  ): JsLoaderItem {
-    if (serializeData || loader.loaderItem.serializedData) {
-      loader.loaderItem.serializedData = serializeLoaderOptions(
-        loader.loaderItem.data,
-      );
-      loader.loaderItem.data = null;
-    }
+  static __to_binding(loader: LoaderObject): JsLoaderItem {
     return loader.loaderItem;
   }
 }
@@ -772,7 +761,7 @@ function runLoadersInternal(
     }
     context.__internal__hookExtensions = serializeLoaderOptions(hookExtensions);
     context.loaderItems = loaderContext.loaders.map((item) =>
-      LoaderObject.__to_binding(item, true),
+      LoaderObject.__to_binding(item),
     );
     return Promise.resolve(context);
   }
@@ -988,7 +977,7 @@ function runLoadersInternal(
 
       // update loader state
       context.loaderItems = loaderContext.loaders.map((item) =>
-        LoaderObject.__to_binding(item, worker),
+        LoaderObject.__to_binding(item),
       );
     } catch (e) {
       if (typeof e !== 'object' || e === null) {

task.md

@@ -90,7 +90,7 @@ parallel task 从 Rust loader runner 直接进入 Rust queue，不经过 JS 主
 - [x] queue payload 保存完整 Rust LoaderContext。
 - [x] main 和 worker 都在各自 N-API 边界组装同一个 `JsLoaderContext` DTO。
 - [x] 删除 bulk `JsLoaderContextState`、整套 native field accessor 和重复的 parallel DTO。
-- [x] `additionalData` 和 loader `data` 使用 V8 序列化字符串跨 isolate，避免 JSON 丢失 Buffer、Map 或函数 handle。
+- [x] loader `data` 沿用 main 的 `serde_json::Value`；`additionalData` 保留单独的跨 isolate 表示。
 - [x] `_module` 使用 canonical pointer，不复制 NormalModule。
 
 ### 5. 清理 options/cache 的无关改动