merged fixed source map asset into source map asset

Author: sokra

turbopack/crates/turbopack-core/src/source_map/fixed_source_map_asset.rs

@@ -18,11 +18,9 @@ use crate::{
     source_pos::SourcePos, virtual_source::VirtualSource, SOURCE_URL_PROTOCOL,
 };
 
-pub(crate) mod fixed_source_map_asset;
 pub(crate) mod source_map_asset;
 pub mod utils;
 
-pub use fixed_source_map_asset::FixedSourceMapAsset;
 pub use source_map_asset::SourceMapAsset;
 
 /// Represents an empty value in a u32 variable in the sourcemap crate.

turbopack/crates/turbopack-core/src/source_map/mod.rs

@@ -1,6 +1,10 @@
 use anyhow::Result;
+use serde::{Deserialize, Serialize};
 use turbo_rcstr::RcStr;
-use turbo_tasks::{FxIndexSet, ResolvedVc, ValueToString, Vc};
+use turbo_tasks::{
+    debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexSet, NonLocalValue, ResolvedVc,
+    ValueToString, Vc,
+};
 use turbo_tasks_fs::{File, FileSystemPath};
 
 use crate::{
@@ -12,11 +16,21 @@ use crate::{
     source_map::{GenerateSourceMap, SourceMap},
 };
 
+#[derive(PartialEq, Eq, Serialize, Deserialize, NonLocalValue, TraceRawVcs, ValueDebugFormat)]
+enum PathType {
+    Fixed {
+        path: ResolvedVc<FileSystemPath>,
+    },
+    FromIdent {
+        chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
+        ident_for_path: ResolvedVc<AssetIdent>,
+    },
+}
+
 /// Represents the source map of an ecmascript asset.
 #[turbo_tasks::value]
 pub struct SourceMapAsset {
-    chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
-    ident_for_path: ResolvedVc<AssetIdent>,
+    path_ty: PathType,
     generate_source_map: ResolvedVc<Box<dyn GenerateSourceMap>>,
 }
 
@@ -29,8 +43,22 @@ impl SourceMapAsset {
         generate_source_map: ResolvedVc<Box<dyn GenerateSourceMap>>,
     ) -> Vc<Self> {
         SourceMapAsset {
-            chunking_context,
-            ident_for_path,
+            path_ty: PathType::FromIdent {
+                chunking_context,
+                ident_for_path,
+            },
+            generate_source_map,
+        }
+        .cell()
+    }
+
+    #[turbo_tasks::function]
+    pub fn new_fixed(
+        path: ResolvedVc<FileSystemPath>,
+        generate_source_map: ResolvedVc<Box<dyn GenerateSourceMap>>,
+    ) -> Vc<Self> {
+        SourceMapAsset {
+            path_ty: PathType::Fixed { path },
             generate_source_map,
         }
         .cell()
@@ -44,10 +72,15 @@ impl OutputAsset for SourceMapAsset {
         // NOTE(alexkirsz) We used to include the asset's version id in the path,
         // but this caused `all_assets_map` to be recomputed on every change.
         let this = self.await?;
-        Ok(this
-            .chunking_context
-            .chunk_path(*this.ident_for_path, ".js".into())
-            .append(".map".into()))
+        Ok(match this.path_ty {
+            PathType::FromIdent {
+                chunking_context,
+                ident_for_path,
+            } => chunking_context
+                .chunk_path(*ident_for_path, ".js".into())
+                .append(".map".into()),
+            PathType::Fixed { path } => path.append(".map".into()),
+        })
     }
 }
 

turbopack/crates/turbopack-core/src/source_map/source_map_asset.rs

@@ -11,7 +11,7 @@ use turbopack_core::{
     code_builder::{Code, CodeBuilder},
     module_graph::ModuleGraph,
     output::{OutputAsset, OutputAssets},
-    source_map::{FixedSourceMapAsset, GenerateSourceMap, OptionStringifiedSourceMap},
+    source_map::{GenerateSourceMap, OptionStringifiedSourceMap, SourceMapAsset},
 };
 use turbopack_ecmascript::{chunk::EcmascriptChunkPlaceable, utils::StringifyJs};
 
@@ -150,9 +150,9 @@ impl EcmascriptBuildNodeEntryChunk {
     }
 
     #[turbo_tasks::function]
-    async fn source_map(self: Vc<Self>) -> Result<Vc<FixedSourceMapAsset>> {
+    async fn source_map(self: Vc<Self>) -> Result<Vc<SourceMapAsset>> {
         let this = self.await?;
-        Ok(FixedSourceMapAsset::new(*this.path, Vc::upcast(self)))
+        Ok(SourceMapAsset::new_fixed(*this.path, Vc::upcast(self)))
     }
 }