revert: "perf: napi source map serialize and deserialize (#10989)" (#11002)

Revert "perf: napi source map serialize and deserialize (#10989)"

This reverts commit 9101e5d.

Author: SyMind

crates/node_binding/binding.d.ts

@@ -919,7 +919,7 @@ export interface JsLoaderContext {
   content: null | Buffer
   additionalData?: any
   __internal__parseMeta: Record<string, string>
-  sourceMap?: SourceMap
+  sourceMap?: Buffer
   cacheable: boolean
   fileDependencies: Array<string>
   contextDependencies: Array<string>
@@ -2723,16 +2723,6 @@ export interface RegisterJsTaps {
   registerRsdoctorPluginAssetsTaps: (stages: Array<number>) => Array<{ function: ((arg: JsRsdoctorAssetPatch) => Promise<boolean | undefined>); stage: number; }>
 }
 
-export interface SourceMap {
-  file?: string
-  sources?: Array<string | undefined | null>
-  sourceRoot?: string
-  sourcesContent?: Array<string | undefined | null>
-  names?: Array<string | undefined | null>
-  mappings?: string
-  debugId?: string
-}
-
 export interface SourceMapDevToolPluginOptions {
   append?: (false | null) | string | Function
   columns?: boolean

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

@@ -3,10 +3,11 @@ use std::{collections::HashMap, ptr::NonNull, sync::Arc};
 use napi::bindgen_prelude::*;
 use napi_derive::napi;
 use rspack_core::{LoaderContext, Module, RunnerContext};
+use rspack_error::ToStringResultToRspackResultExt;
 use rspack_loader_runner::State as LoaderState;
 use rspack_napi::threadsafe_js_value_ref::ThreadsafeJsValueRef;
 
-use crate::{ModuleObject, RspackError, SourceMap};
+use crate::{ModuleObject, RspackError};
 
 #[napi(object)]
 #[derive(Hash)]
@@ -99,7 +100,7 @@ pub struct JsLoaderContext {
   pub additional_data: Option<ThreadsafeJsValueRef<Unknown<'static>>>,
   #[napi(js_name = "__internal__parseMeta")]
   pub parse_meta: HashMap<String, String>,
-  pub source_map: Option<SourceMap>,
+  pub source_map: Option<Buffer>,
   pub cacheable: bool,
   pub file_dependencies: Vec<String>,
   pub context_dependencies: Vec<String>,
@@ -144,7 +145,13 @@ impl TryFrom<&mut LoaderContext<RunnerContext>> for JsLoaderContext {
         .additional_data()
         .and_then(|data| data.get::<ThreadsafeJsValueRef<Unknown>>())
         .cloned(),
-      source_map: cx.source_map().map(Into::into),
+      source_map: cx
+        .source_map()
+        .cloned()
+        .map(|v| v.to_json())
+        .transpose()
+        .to_rspack_result()?
+        .map(|v| v.into_bytes().into()),
       cacheable: cx.cacheable,
       file_dependencies: cx
         .file_dependencies

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

@@ -3,7 +3,7 @@ use rspack_core::{
   diagnostics::CapturedLoaderError, AdditionalData, LoaderContext, NormalModuleLoaderShouldYield,
   NormalModuleLoaderStartYielding, RunnerContext, BUILTIN_LOADER_PREFIX,
 };
-use rspack_error::{miette::IntoDiagnostic, Result};
+use rspack_error::{miette::IntoDiagnostic, Result, ToStringResultToRspackResultExt};
 use rspack_hook::plugin_hook;
 use rspack_loader_runner::State as LoaderState;
 
@@ -143,7 +143,17 @@ pub(crate) fn merge_loader_context(
       Some(content)
     }
   };
-  let source_map = from.source_map.map(Into::into);
+  let source_map = from
+    .source_map
+    .as_ref()
+    .map(|s| {
+      rspack_core::rspack_sources::SourceMap::from_json(
+        // SAFETY: `sourceMap` is serialized by JavaScript from a JSON object. This is an invariant should be followed on the JavaScript side.
+        unsafe { str::from_utf8_unchecked(s) },
+      )
+    })
+    .transpose()
+    .to_rspack_result()?;
   let additional_data = from.additional_data.take().map(|data| {
     let mut additional = AdditionalData::default();
     additional.insert(data);

crates/rspack_binding_api/src/source.rs

@@ -3,7 +3,8 @@ use std::{hash::Hash, sync::Arc};
 use napi_derive::napi;
 use rspack_core::rspack_sources::{
   BoxSource, CachedSource, ConcatSource, MapOptions, OriginalSource, RawBufferSource, RawSource,
-  RawStringSource, ReplaceSource, Source, SourceExt, SourceMapSource, WithoutOriginalOptions,
+  RawStringSource, ReplaceSource, Source, SourceExt, SourceMap, SourceMapSource,
+  WithoutOriginalOptions,
 };
 use rspack_napi::napi::bindgen_prelude::*;
 
@@ -25,7 +26,7 @@ impl<'s> From<JsCompatSource<'s>> for BoxSource {
     match value.source {
       Either::A(string) => {
         if let Some(map) = value.map {
-          match rspack_core::rspack_sources::SourceMap::from_slice(map.as_ref()).ok() {
+          match SourceMap::from_slice(map.as_ref()).ok() {
             Some(source_map) => SourceMapSource::new(WithoutOriginalOptions {
               value: string,
               name: "inmemory://from js",
@@ -54,7 +55,7 @@ impl From<JsCompatSourceOwned> for BoxSource {
     match value.source {
       Either::A(string) => {
         if let Some(map) = value.map {
-          match rspack_core::rspack_sources::SourceMap::from_slice(map.as_ref()).ok() {
+          match SourceMap::from_slice(map.as_ref()).ok() {
             Some(source_map) => SourceMapSource::new(WithoutOriginalOptions {
               value: string,
               name: "inmemory://from js",
@@ -323,77 +324,3 @@ fn to_webpack_map(source: &dyn Source) -> Result<Option<String>> {
 
   map.map(|m| m.to_json()).transpose().to_napi_result()
 }
-
-#[napi(object)]
-pub struct SourceMap {
-  pub file: Option<String>,
-  pub sources: Option<Vec<Option<String>>>,
-  pub source_root: Option<String>,
-  pub sources_content: Option<Vec<Option<String>>>,
-  pub names: Option<Vec<Option<String>>>,
-  pub mappings: Option<String>,
-  pub debug_id: Option<String>,
-}
-
-impl From<&rspack_core::rspack_sources::SourceMap> for SourceMap {
-  fn from(value: &rspack_core::rspack_sources::SourceMap) -> Self {
-    SourceMap {
-      file: value.file().map(|file| file.to_string()),
-      sources: Some(
-        value
-          .sources()
-          .iter()
-          .map(|source| Some(source.to_string()))
-          .collect::<Vec<_>>(),
-      ),
-      source_root: value
-        .source_root()
-        .map(|source_root| source_root.to_string()),
-      sources_content: Some(
-        value
-          .sources_content()
-          .iter()
-          .map(|content| Some(content.to_string()))
-          .collect::<Vec<_>>(),
-      ),
-      names: Some(
-        value
-          .names()
-          .iter()
-          .map(|name| Some(name.to_string()))
-          .collect::<Vec<_>>(),
-      ),
-      mappings: Some(value.mappings().to_string()),
-      debug_id: value.get_debug_id().map(|id| id.to_string()),
-    }
-  }
-}
-
-impl From<SourceMap> for rspack_core::rspack_sources::SourceMap {
-  fn from(value: SourceMap) -> Self {
-    let mappings = value.mappings.unwrap_or_default();
-    let sources = value
-      .sources
-      .unwrap_or_default()
-      .into_iter()
-      .map(|source| source.unwrap_or_default())
-      .collect::<Vec<_>>();
-    let sources_content = value
-      .sources_content
-      .unwrap_or_default()
-      .into_iter()
-      .map(|source| source.unwrap_or_default())
-      .collect::<Vec<_>>();
-    let names = value
-      .names
-      .unwrap_or_default()
-      .into_iter()
-      .map(|name| name.unwrap_or_default())
-      .collect::<Vec<_>>();
-    let mut map =
-      rspack_core::rspack_sources::SourceMap::new(mappings, sources, sources_content, names);
-    map.set_source_root(value.source_root);
-    map.set_debug_id(value.debug_id);
-    map
-  }
-}

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

@@ -38,7 +38,13 @@ import {
 	isUseSourceMap
 } from "../config/adapterRuleUse";
 import { JavaScriptTracer } from "../trace";
-import { isNil, stringifyLoaderObject, toBuffer } from "../util";
+import {
+	isNil,
+	serializeObject,
+	stringifyLoaderObject,
+	toBuffer,
+	toObject
+} from "../util";
 import { createHash } from "../util/createHash";
 import {
 	absolutify,
@@ -214,6 +220,16 @@ export class LoaderObject {
 	}
 }
 
+class JsSourceMap {
+	static __from_binding(map?: Buffer) {
+		return isNil(map) ? undefined : toObject(map);
+	}
+
+	static __to_binding(map?: object) {
+		return serializeObject(map);
+	}
+}
+
 function dirname(path: string) {
 	if (path === "/") return "/";
 	const i = path.lastIndexOf("/");
@@ -1029,7 +1045,7 @@ export async function runLoaders(
 					if (hasArg) {
 						const [content, sourceMap, additionalData] = args;
 						context.content = isNil(content) ? null : toBuffer(content);
-						context.sourceMap = sourceMap || undefined;
+						context.sourceMap = serializeObject(sourceMap);
 						context.additionalData = additionalData || undefined;
 						break;
 					}
@@ -1039,7 +1055,7 @@ export async function runLoaders(
 			}
 			case JsLoaderState.Normal: {
 				let content = context.content;
-				let sourceMap = context.sourceMap;
+				let sourceMap = JsSourceMap.__from_binding(context.sourceMap);
 				let additionalData = context.additionalData;
 
 				while (loaderContext.loaderIndex >= 0) {
@@ -1069,7 +1085,7 @@ export async function runLoaders(
 				}
 
 				context.content = isNil(content) ? null : toBuffer(content);
-				context.sourceMap = sourceMap || undefined;
+				context.sourceMap = JsSourceMap.__to_binding(sourceMap);
 				context.additionalData = additionalData || undefined;
 				context.__internal__utf8Hint = typeof content === "string";