Unverified Commit 112e70ed authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: remove OptionStringifiedSourceMap (#86547)

- `OptionStringifiedSourceMap` was always a strange type
- We can now use the `FileContent` to not clone the Rope in the `SourceMapAsset::content`, which would end up duplicating sourcemaps in the cache.
parent 1754f90c
......@@ -51,7 +51,7 @@ use turbopack_core::{
error::PrettyPrintError,
issue::PlainIssue,
output::{OutputAsset, OutputAssets},
source_map::{OptionStringifiedSourceMap, SourceMap, Token},
source_map::{SourceMap, Token},
version::{PartialUpdate, TotalUpdate, Update, VersionState},
};
use turbopack_ecmascript_hmr_protocol::{ClientUpdateInstruction, Issue, ResourceIdentifier};
......@@ -1550,7 +1550,7 @@ pub struct OptionStackFrame(Option<StackFrame>);
pub async fn get_source_map_rope(
container: Vc<ProjectContainer>,
source_url: RcStr,
) -> Result<Vc<OptionStringifiedSourceMap>> {
) -> Result<Vc<FileContent>> {
let (file_path_sys, module) = match Url::parse(&source_url) {
Ok(url) => match url.scheme() {
"file" => {
......@@ -1579,7 +1579,7 @@ pub async fn get_source_map_rope(
Some(relative_path) => sys_to_unix(relative_path),
None => {
// File doesn't exist within the dist dir
return Ok(OptionStringifiedSourceMap::none());
return Ok(FileContent::NotFound.cell());
}
};
......@@ -1597,13 +1597,13 @@ pub async fn get_source_map_rope(
let mut map = container.get_source_map(server_path, module.clone());
if map.await?.is_none() {
if !map.await?.is_content() {
// If the chunk doesn't exist as a server chunk, try a client chunk.
// TODO: Properly tag all server chunks and use the `isServer` query param.
// Currently, this is inaccurate as it does not cover RSC server
// chunks.
map = container.get_source_map(client_path, module);
if map.await?.is_none() {
if !map.await?.is_content() {
bail!("chunk/module '{}' is missing a sourcemap", source_url);
}
}
......@@ -1615,7 +1615,7 @@ pub async fn get_source_map_rope(
pub fn get_source_map_rope_operation(
container: ResolvedVc<ProjectContainer>,
file_path: RcStr,
) -> Vc<OptionStringifiedSourceMap> {
) -> Vc<FileContent> {
get_source_map_rope(*container, file_path)
}
......@@ -1782,13 +1782,13 @@ pub async fn project_get_source_map(
let ctx = &project.turbopack_ctx;
ctx.turbo_tasks()
.run(async move {
let Some(map) = &*get_source_map_rope_operation(container, file_path)
let source_map = get_source_map_rope_operation(container, file_path)
.read_strongly_consistent()
.await?
else {
.await?;
let Some(map) = source_map.as_content() else {
return Ok(None);
};
Ok(Some(map.to_str()?.to_string()))
Ok(Some(map.content().to_str()?.to_string()))
})
// HACK: Don't use `TurbopackInternalError`, this function is race-condition prone (the
// source files may have changed or been deleted), so these probably aren't internal errors?
......
......@@ -33,7 +33,9 @@ use turbo_tasks::{
debug::ValueDebugFormat, fxindexmap, mark_root, trace::TraceRawVcs,
};
use turbo_tasks_env::{EnvMap, ProcessEnv};
use turbo_tasks_fs::{DiskFileSystem, FileSystem, FileSystemPath, VirtualFileSystem, invalidation};
use turbo_tasks_fs::{
DiskFileSystem, FileContent, FileSystem, FileSystemPath, VirtualFileSystem, invalidation,
};
use turbo_unix_path::{join_path, unix_to_sys};
use turbopack::{
ModuleAssetContext, evaluate_context::node_build_environment,
......@@ -70,7 +72,6 @@ use turbopack_core::{
},
reference::all_assets_from_entries,
resolve::{FindContextFileResult, find_context_file},
source_map::OptionStringifiedSourceMap,
version::{
NotFoundVersion, OptionVersionedContent, Update, Version, VersionState, VersionedContent,
},
......@@ -552,17 +553,17 @@ impl ProjectContainer {
}
/// Gets a source map for a particular `file_path`. If `dev` mode is disabled, this will always
/// return [`OptionStringifiedSourceMap::none`].
/// return [`FileContent::NotFound`].
#[turbo_tasks::function]
pub fn get_source_map(
&self,
file_path: FileSystemPath,
section: Option<RcStr>,
) -> Vc<OptionStringifiedSourceMap> {
) -> Vc<FileContent> {
if let Some(map) = self.versioned_content_map {
map.get_source_map(file_path, section)
} else {
OptionStringifiedSourceMap::none()
FileContent::NotFound.cell()
}
}
}
......
......@@ -7,11 +7,11 @@ use turbo_tasks::{
FxIndexSet, NonLocalValue, OperationValue, OperationVc, ResolvedVc, State, TryFlatJoinIterExt,
TryJoinIterExt, ValueDefault, Vc, debug::ValueDebugFormat, trace::TraceRawVcs,
};
use turbo_tasks_fs::FileSystemPath;
use turbo_tasks_fs::{FileContent, FileSystemPath};
use turbopack_core::{
asset::Asset,
output::{ExpandedOutputAssets, OptionOutputAsset, OutputAsset},
source_map::{GenerateSourceMap, OptionStringifiedSourceMap},
source_map::GenerateSourceMap,
version::OptionVersionedContent,
};
......@@ -180,9 +180,9 @@ impl VersionedContentMap {
self: Vc<Self>,
path: FileSystemPath,
section: Option<RcStr>,
) -> Result<Vc<OptionStringifiedSourceMap>> {
) -> Result<Vc<FileContent>> {
let Some(asset) = &*self.get_asset(path.clone()).await? else {
return Ok(Vc::cell(None));
return Ok(FileContent::NotFound.cell());
};
if let Some(generate_source_map) =
......
......@@ -272,7 +272,8 @@ impl EcmascriptChunkItem for RawEcmascriptChunkItem {
)
.await?
{
source_map.generate_source_map().owned().await?
let source_map = source_map.generate_source_map().await?;
source_map.as_content().map(|f| f.content().clone())
} else {
None
};
......
......@@ -1766,6 +1766,7 @@ impl From<File> for FileContent {
}
}
// TODO remove this, it hides cell creation
impl From<File> for Vc<FileContent> {
fn from(file: File) -> Self {
FileContent::Content(file).cell()
......
......@@ -47,10 +47,11 @@ pub async fn split_output_asset_into_parts(
else {
return self_mapped(asset, content).await;
};
let Some(source_map) = &*generate_source_map.generate_source_map().await? else {
let source_map = generate_source_map.generate_source_map().await?;
let Some(source_map) = source_map.as_content() else {
return self_mapped(asset, content).await;
};
let Some(source_map) = SourceMap::new_from_rope(source_map)? else {
let Some(source_map) = SourceMap::new_from_rope(source_map.content())? else {
return unaccounted(asset, content).await;
};
......
......@@ -6,14 +6,16 @@ use anyhow::Result;
use serde_json::json;
use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{File, FileSystem, FileSystemPath, VirtualFileSystem, rope::Rope};
use turbo_tasks_fs::{
File, FileContent, FileSystem, FileSystemPath, VirtualFileSystem, rope::Rope,
};
use turbo_tasks_testing::{Registration, register, run_once};
use turbopack_analyze::split_chunk::{ChunkPart, ChunkPartRange, split_output_asset_into_parts};
use turbopack_core::{
asset::{Asset, AssetContent},
code_builder::{Code, CodeBuilder},
output::{OutputAsset, OutputAssetsReference},
source_map::{GenerateSourceMap, OptionStringifiedSourceMap},
source_map::GenerateSourceMap,
};
static REGISTRATION: Registration = register!(turbo_tasks_fetch::register);
......@@ -130,7 +132,7 @@ impl Asset for TestAsset {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for TestAsset {
#[turbo_tasks::function]
pub fn generate_source_map(&self) -> Vc<OptionStringifiedSourceMap> {
pub fn generate_source_map(&self) -> Vc<FileContent> {
self.code.generate_source_map()
}
}
use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{FxIndexSet, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbo_tasks_fs::{FileContent, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{Chunk, ChunkingContext, OutputChunk, OutputChunkRuntimeInfo},
ident::AssetIdent,
introspect::{Introspectable, IntrospectableChildren},
output::{OutputAsset, OutputAssetsReference, OutputAssetsWithReferenced},
source_map::{GenerateSourceMap, OptionStringifiedSourceMap, SourceMapAsset},
source_map::{GenerateSourceMap, SourceMapAsset},
version::VersionedContent,
};
use turbopack_ecmascript::chunk::EcmascriptChunk;
......@@ -157,12 +157,12 @@ impl Asset for EcmascriptBrowserChunk {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for EcmascriptBrowserChunk {
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap> {
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent> {
self.own_content().generate_source_map()
}
#[turbo_tasks::function]
fn by_section(self: Vc<Self>, section: RcStr) -> Vc<OptionStringifiedSourceMap> {
fn by_section(self: Vc<Self>, section: RcStr) -> Vc<FileContent> {
self.own_content().by_section(section)
}
}
......
......@@ -4,13 +4,13 @@ use anyhow::{Result, bail};
use either::Either;
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::File;
use turbo_tasks_fs::{File, FileContent};
use turbopack_core::{
asset::AssetContent,
chunk::{ChunkingContext, MinifyType, ModuleId},
code_builder::{Code, CodeBuilder},
output::OutputAsset,
source_map::{GenerateSourceMap, OptionStringifiedSourceMap, SourceMapAsset},
source_map::{GenerateSourceMap, SourceMapAsset},
version::{MergeableVersionedContent, Version, VersionedContent, VersionedContentMerger},
};
use turbopack_ecmascript::{chunk::EcmascriptChunkContent, minify::minify, utils::StringifyJs};
......@@ -166,12 +166,12 @@ impl MergeableVersionedContent for EcmascriptBrowserChunkContent {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for EcmascriptBrowserChunkContent {
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap> {
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent> {
self.code().generate_source_map()
}
#[turbo_tasks::function]
async fn by_section(self: Vc<Self>, section: RcStr) -> Result<Vc<OptionStringifiedSourceMap>> {
async fn by_section(self: Vc<Self>, section: RcStr) -> Result<Vc<FileContent>> {
// Weirdly, the ContentSource will have already URL decoded the ModuleId, and we
// can't reparse that via serde.
if let Ok(id) = ModuleId::parse(&section) {
......@@ -184,6 +184,6 @@ impl GenerateSourceMap for EcmascriptBrowserChunkContent {
}
}
Ok(Vc::cell(None))
Ok(FileContent::NotFound.cell())
}
}
......@@ -6,7 +6,7 @@ use indoc::writedoc;
use serde::Serialize;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ReadRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::{File, FileSystemPath};
use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
......@@ -18,7 +18,7 @@ use turbopack_core::{
module::Module,
module_graph::ModuleGraph,
output::{OutputAsset, OutputAssets, OutputAssetsReference, OutputAssetsWithReferenced},
source_map::{GenerateSourceMap, OptionStringifiedSourceMap, SourceMapAsset},
source_map::{GenerateSourceMap, SourceMapAsset},
};
use turbopack_ecmascript::{
chunk::{EcmascriptChunkData, EcmascriptChunkPlaceable},
......@@ -299,7 +299,7 @@ impl Asset for EcmascriptBrowserEvaluateChunk {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for EcmascriptBrowserEvaluateChunk {
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap> {
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent> {
self.code().generate_source_map()
}
}
......
......@@ -84,10 +84,8 @@ struct EcmascriptModuleEntry {
impl EcmascriptModuleEntry {
async fn from_code(id: &ModuleId, code: Vc<Code>, chunk_path: &str) -> Result<Self> {
let map = &*code.generate_source_map().await?;
Ok(Self::new(id, code.await?, map.clone(), chunk_path))
}
let map = map.as_content().map(|f| f.content().clone());
fn new(id: &ModuleId, code: ReadRef<Code>, map: Option<Rope>, chunk_path: &str) -> Self {
/// serde_qs can't serialize a lone enum when it's [serde::untagged].
#[derive(Serialize)]
struct Id<'a> {
......@@ -95,12 +93,12 @@ impl EcmascriptModuleEntry {
}
let id = serde_qs::to_string(&Id { id }).unwrap();
EcmascriptModuleEntry {
Ok(EcmascriptModuleEntry {
// Cloning a rope is cheap.
code: code.source_code().clone(),
code: code.await?.source_code().clone(),
url: format!("{}?{}", chunk_path, &id),
map,
}
})
}
}
......
......@@ -8,13 +8,16 @@ use anyhow::Result;
use tracing::instrument;
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::rope::{Rope, RopeBuilder};
use turbo_tasks_fs::{
File, FileContent,
rope::{Rope, RopeBuilder},
};
use turbo_tasks_hash::hash_xxh3_hash64;
use crate::{
debug_id::generate_debug_id,
output::OutputAsset,
source_map::{GenerateSourceMap, OptionStringifiedSourceMap, SourceMap, SourceMapAsset},
source_map::{GenerateSourceMap, SourceMap, SourceMapAsset},
source_pos::SourcePos,
};
......@@ -255,13 +258,9 @@ impl GenerateSourceMap for Code {
/// far the simplest way to concatenate the source maps of the multiple
/// chunk items into a single map file.
#[turbo_tasks::function]
pub async fn generate_source_map(
self: ResolvedVc<Self>,
) -> Result<Vc<OptionStringifiedSourceMap>> {
pub async fn generate_source_map(self: ResolvedVc<Self>) -> Result<Vc<FileContent>> {
let debug_id = self.debug_id().owned().await?;
Ok(Vc::cell(Some(
self.await?.generate_source_map_ref(debug_id),
)))
Ok(File::from(self.await?.generate_source_map_ref(debug_id)).into())
}
}
......
use anyhow::Result;
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{FileSystemEntryType, FileSystemPath};
use turbo_tasks_fs::{File, FileContent, FileSystemEntryType, FileSystemPath};
use super::ModuleReference;
use crate::{
file_source::FileSource,
raw_module::RawModule,
resolve::ModuleResolveResult,
source_map::{
GenerateSourceMap, OptionStringifiedSourceMap, utils::resolve_source_map_sources,
},
source_map::{GenerateSourceMap, utils::resolve_source_map_sources},
};
#[turbo_tasks::value]
......@@ -57,15 +55,18 @@ impl ModuleReference for SourceMapReference {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for SourceMapReference {
#[turbo_tasks::function]
async fn generate_source_map(&self) -> Result<Vc<OptionStringifiedSourceMap>> {
async fn generate_source_map(&self) -> Result<Vc<FileContent>> {
let Some(file) = self.get_file().await else {
return Ok(Vc::cell(None));
return Ok(FileContent::NotFound.cell());
};
let content = file.read().await?;
let content = content.as_content().map(|file| file.content());
let source_map = resolve_source_map_sources(content, &self.from).await?;
Ok(Vc::cell(source_map))
if let Some(source_map) = resolve_source_map_sources(content, &self.from).await? {
Ok(File::from(source_map).into())
} else {
Ok(FileContent::NotFound.cell())
}
}
}
......
......@@ -29,28 +29,17 @@ pub use source_map_asset::SourceMapAsset;
/// Represents an empty value in a u32 variable in the sourcemap crate.
static SOURCEMAP_CRATE_NONE_U32: u32 = !0;
#[turbo_tasks::value(transparent)]
pub struct OptionStringifiedSourceMap(Option<Rope>);
#[turbo_tasks::value_impl]
impl OptionStringifiedSourceMap {
#[turbo_tasks::function]
pub fn none() -> Vc<Self> {
Vc::cell(None)
}
}
/// Allows callers to generate source maps.
#[turbo_tasks::value_trait]
pub trait GenerateSourceMap {
/// Generates a usable source map, capable of both tracing and stringifying.
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap>;
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent>;
/// Returns an individual section of the larger source map, if found.
#[turbo_tasks::function]
fn by_section(self: Vc<Self>, _section: RcStr) -> Vc<OptionStringifiedSourceMap> {
Vc::cell(None)
fn by_section(self: Vc<Self>, _section: RcStr) -> Vc<FileContent> {
FileContent::NotFound.cell()
}
}
......@@ -260,13 +249,12 @@ impl SourceMap {
/// This function should be used sparingly to reduce memory usage, only in cold code paths
/// (issue resolving, etc).
#[turbo_tasks::function]
pub async fn new_from_rope_cached(
content: Vc<OptionStringifiedSourceMap>,
) -> Result<Vc<OptionSourceMap>> {
let Some(content) = &*content.await? else {
pub async fn new_from_rope_cached(content: Vc<FileContent>) -> Result<Vc<OptionSourceMap>> {
let content = content.await?;
let Some(content) = content.as_content() else {
return Ok(OptionSourceMap::none());
};
Ok(Vc::cell(SourceMap::new_from_rope(content)?))
Ok(Vc::cell(SourceMap::new_from_rope(content.content())?))
}
}
......@@ -637,8 +625,8 @@ impl SourceMap {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for SourceMap {
#[turbo_tasks::function]
fn generate_source_map(&self) -> Result<Vc<OptionStringifiedSourceMap>> {
Ok(Vc::cell(Some(self.to_rope()?)))
fn generate_source_map(&self) -> Result<Vc<FileContent>> {
Ok(File::from(self.to_rope()?).into())
}
}
......
......@@ -98,8 +98,9 @@ impl OutputAsset for SourceMapAsset {
impl Asset for SourceMapAsset {
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<AssetContent>> {
if let Some(sm) = &*self.generate_source_map.generate_source_map().await? {
Ok(AssetContent::file(File::from(sm.clone()).into()))
let content = self.generate_source_map.generate_source_map();
if content.await?.is_content() {
Ok(AssetContent::file(content))
} else {
Ok(AssetContent::file(
File::from(SourceMap::empty_rope()).into(),
......
use anyhow::Result;
use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbo_tasks_fs::{FileContent, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, MinifyType},
......@@ -110,7 +110,7 @@ impl ProcessCss for CssModuleAsset {
let origin_source_map =
match ResolvedVc::try_sidecast::<Box<dyn GenerateSourceMap>>(this.source) {
Some(gsm) => gsm.generate_source_map(),
None => Vc::cell(None),
None => FileContent::NotFound.cell(),
};
Ok(finalize_css(
process_result,
......@@ -346,7 +346,7 @@ impl CssChunkItem for CssModuleChunkItem {
inner_code: output_code.to_owned().into(),
imports,
import_context: self.module.await?.import_context,
source_map: source_map.owned().await?,
source_map: *source_map,
}
.cell())
} else {
......@@ -358,7 +358,7 @@ impl CssChunkItem for CssModuleChunkItem {
.into(),
imports: vec![],
import_context: None,
source_map: None,
source_map: FileContent::NotFound.resolved_cell(),
}
.cell())
}
......
......@@ -7,7 +7,7 @@ use anyhow::{Result, bail};
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{FxIndexSet, ResolvedVc, TryJoinIterExt, ValueDefault, ValueToString, Vc};
use turbo_tasks_fs::{
File, FileSystem, FileSystemPath,
File, FileContent, FileSystem, FileSystemPath,
rope::{Rope, RopeBuilder},
};
use turbopack_core::{
......@@ -30,7 +30,7 @@ use turbopack_core::{
reference_type::ImportContext,
server_fs::ServerFileSystem,
source_map::{
GenerateSourceMap, OptionStringifiedSourceMap,
GenerateSourceMap,
utils::{absolute_fileify_source_map, relative_fileify_source_map},
},
};
......@@ -97,17 +97,19 @@ impl CssChunk {
let close = write_import_context(&mut body, content.import_context).await?;
let chunking_context = self.chunking_context();
let source_map = content.source_map.await?;
let source_map = source_map.as_content().map(|f| f.content());
let source_map = match *chunking_context.source_map_source_type().await? {
SourceMapSourceType::AbsoluteFileUri => {
absolute_fileify_source_map(
content.source_map.as_ref(),
source_map,
chunking_context.root_path().owned().await?,
)
.await?
}
SourceMapSourceType::RelativeUri => {
relative_fileify_source_map(
content.source_map.as_ref(),
source_map,
chunking_context.root_path().owned().await?,
chunking_context
.relative_path_from_chunk_root_to_project_root()
......@@ -116,7 +118,7 @@ impl CssChunk {
)
.await?
}
SourceMapSourceType::TurbopackUri => content.source_map.clone(),
SourceMapSourceType::TurbopackUri => source_map.cloned(),
};
body.push_source(&content.inner_code, source_map);
......@@ -430,7 +432,7 @@ impl Asset for CssChunk {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for CssChunk {
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap> {
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent> {
self.code().generate_source_map()
}
}
......@@ -456,7 +458,7 @@ pub struct CssChunkItemContent {
pub import_context: Option<ResolvedVc<ImportContext>>,
pub imports: Vec<CssImport>,
pub inner_code: Rope,
pub source_map: Option<Rope>,
pub source_map: ResolvedVc<FileContent>,
}
#[turbo_tasks::value_trait]
......
......@@ -3,7 +3,7 @@ use std::fmt::Write;
use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{File, FileSystemPath, rope::RopeBuilder};
use turbo_tasks_fs::{File, FileContent, FileSystemPath, rope::RopeBuilder};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{Chunk, ChunkItem, ChunkingContext, MinifyType},
......@@ -11,7 +11,7 @@ use turbopack_core::{
ident::AssetIdent,
introspect::Introspectable,
output::{OutputAsset, OutputAssetsReference, OutputAssetsWithReferenced},
source_map::{GenerateSourceMap, OptionStringifiedSourceMap},
source_map::GenerateSourceMap,
};
use super::source_map::SingleItemCssChunkSourceMapAsset;
......@@ -66,7 +66,14 @@ impl SingleItemCssChunk {
let content = this.item.content().await?;
let close = write_import_context(&mut code, content.import_context).await?;
code.push_source(&content.inner_code, content.source_map.clone());
code.push_source(
&content.inner_code,
content
.source_map
.await?
.as_content()
.map(|f| f.content().clone()),
);
write!(code, "{close}")?;
let c = code.build().cell();
......@@ -160,7 +167,7 @@ impl Asset for SingleItemCssChunk {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for SingleItemCssChunk {
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap> {
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent> {
self.code().generate_source_map()
}
}
......
......@@ -53,8 +53,9 @@ impl OutputAsset for SingleItemCssChunkSourceMapAsset {
impl Asset for SingleItemCssChunkSourceMapAsset {
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<AssetContent>> {
if let Some(sm) = &*self.chunk.generate_source_map().await? {
Ok(AssetContent::file(File::from(sm.clone()).into()))
let content = self.chunk.generate_source_map();
if content.await?.is_content() {
Ok(AssetContent::file(content))
} else {
Ok(AssetContent::file(
File::from(SourceMap::empty_rope()).into(),
......
......@@ -49,8 +49,9 @@ impl OutputAsset for CssChunkSourceMapAsset {
impl Asset for CssChunkSourceMapAsset {
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<AssetContent>> {
if let Some(sm) = &*self.chunk.generate_source_map().await? {
Ok(AssetContent::file(File::from(sm.clone()).into()))
let content = self.chunk.generate_source_map();
if content.await?.is_content() {
Ok(AssetContent::file(content))
} else {
Ok(AssetContent::file(
File::from(SourceMap::empty_rope()).into(),
......
......@@ -16,7 +16,7 @@ use swc_core::base::sourcemap::SourceMapBuilder;
use tracing::Instrument;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{FxIndexMap, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{FileContent, FileSystemPath, rope::Rope};
use turbo_tasks_fs::{File, FileContent, FileSystemPath, rope::Rope};
use turbopack_core::{
SOURCE_URL_PROTOCOL,
asset::{Asset, AssetContent},
......@@ -30,7 +30,7 @@ use turbopack_core::{
reference_type::ImportContext,
resolve::origin::ResolveOrigin,
source::Source,
source_map::{OptionStringifiedSourceMap, utils::add_default_ignore_list},
source_map::utils::add_default_ignore_list,
source_pos::SourcePos,
};
......@@ -179,7 +179,7 @@ pub enum FinalCssResult {
#[turbo_tasks(trace_ignore)]
output_code: String,
source_map: ResolvedVc<OptionStringifiedSourceMap>,
source_map: ResolvedVc<FileContent>,
},
Unparsable,
NotFound,
......@@ -246,7 +246,7 @@ pub async fn finalize_css(
result: Vc<CssWithPlaceholderResult>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
minify_type: MinifyType,
origin_source_map: Vc<OptionStringifiedSourceMap>,
origin_source_map: Vc<FileContent>,
environment: Option<ResolvedVc<Environment>>,
) -> Result<Vc<FinalCssResult>> {
let result = result.await?;
......@@ -286,8 +286,11 @@ pub async fn finalize_css(
_ => bail!("this case should be filtered out while parsing"),
};
let origin_source_map = if let Some(rope) = &*origin_source_map.await? {
Some(parcel_sourcemap::SourceMap::from_json("", &rope.to_str()?)?)
let origin_source_map = if let Some(rope) = origin_source_map.await?.as_content() {
Some(parcel_sourcemap::SourceMap::from_json(
"",
&rope.content().to_str()?,
)?)
} else {
None
};
......@@ -305,7 +308,11 @@ pub async fn finalize_css(
Ok(FinalCssResult::Ok {
output_code: result.code,
source_map: ResolvedVc::cell(srcmap),
source_map: if let Some(srcmap) = srcmap {
FileContent::Content(File::from(srcmap)).resolved_cell()
} else {
FileContent::NotFound.resolved_cell()
},
}
.cell())
}
......
......@@ -86,7 +86,7 @@ pub use transform::{
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{
FxDashMap, FxIndexMap, IntoTraitRef, NonLocalValue, ReadRef, ResolvedVc, TaskInput,
TryFlatJoinIterExt, TryJoinIterExt, Upcast, ValueToString, Vc, trace::TraceRawVcs,
TryJoinIterExt, Upcast, ValueToString, Vc, trace::TraceRawVcs,
};
use turbo_tasks_fs::{FileJsonContent, FileSystemPath, glob::Glob, rope::Rope};
use turbopack_core::{
......@@ -2135,14 +2135,21 @@ async fn emit_content(
}
let source_map = if generate_source_map {
let original_source_maps = original_source_map
.iter()
.map(|map| map.generate_source_map())
.try_join()
.await?;
let original_source_maps = original_source_maps
.iter()
.filter_map(|map| map.as_content())
.map(|map| map.content())
.collect::<Vec<_>>();
Some(generate_js_source_map(
&*source_map,
mappings,
original_source_map
.iter()
.map(|map| map.generate_source_map())
.try_flat_join()
.await?,
original_source_maps,
matches!(
original_source_map,
CodeGenResultOriginalSourceMap::Single(_)
......
......@@ -4,12 +4,12 @@ use anyhow::Result;
use swc_core::common::{BytePos, FileName, LineCol, SourceMap};
use tokio::io::AsyncReadExt;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{FileContent, FileSystemPath, rope::Rope};
use turbo_tasks_fs::{File, FileContent, FileSystemPath, rope::Rope};
use turbopack_core::{
asset::{Asset, AssetContent},
output::{OutputAsset, OutputAssetsReference},
source::Source,
source_map::{GenerateSourceMap, OptionStringifiedSourceMap},
source_map::GenerateSourceMap,
};
use crate::parse::generate_js_source_map;
......@@ -62,9 +62,9 @@ impl SingleFileEcmascriptOutput {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for SingleFileEcmascriptOutput {
#[turbo_tasks::function]
pub async fn generate_source_map(&self) -> Result<Vc<OptionStringifiedSourceMap>> {
pub async fn generate_source_map(&self) -> Result<Vc<FileContent>> {
let FileContent::Content(file) = &*self.source.content().file_content().await? else {
return Ok(Vc::cell(None));
return Ok(FileContent::NotFound.cell());
};
let file_source = {
......@@ -94,6 +94,6 @@ impl GenerateSourceMap for SingleFileEcmascriptOutput {
);
let map = generate_js_source_map(&*sm, mappings, None::<&Rope>, true, true)?;
Ok(Vc::cell(Some(map)))
Ok(File::from(map).into())
}
}
......@@ -5,13 +5,11 @@ use either::Either;
use regex::Regex;
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{FileSystemPath, rope::Rope};
use turbo_tasks_fs::{File, FileContent, FileSystemPath, rope::Rope};
use turbopack_core::{
reference::{ModuleReference, SourceMapReference},
source::Source,
source_map::{
GenerateSourceMap, OptionStringifiedSourceMap, utils::resolve_source_map_sources,
},
source_map::{GenerateSourceMap, utils::resolve_source_map_sources},
};
use crate::swc_comments::ImmutableComments;
......@@ -28,10 +26,15 @@ pub struct InlineSourceMap {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for InlineSourceMap {
#[turbo_tasks::function]
pub async fn generate_source_map(&self) -> Result<Vc<OptionStringifiedSourceMap>> {
pub async fn generate_source_map(&self) -> Result<Vc<FileContent>> {
let source_map = maybe_decode_data_url(&self.source_map);
let source_map = resolve_source_map_sources(source_map.as_ref(), &self.origin_path).await?;
Ok(Vc::cell(source_map))
if let Some(source_map) =
resolve_source_map_sources(source_map.as_ref(), &self.origin_path).await?
{
Ok(File::from(source_map).into())
} else {
Ok(FileContent::NotFound.cell())
}
}
}
......
......@@ -19,7 +19,7 @@ use turbopack_core::{
reference_type::{EntryReferenceSubType, InnerAssets, ReferenceType},
resolve::{FindContextFileResult, find_context_file_or_package_key, options::ImportMapping},
source::Source,
source_map::{GenerateSourceMap, OptionStringifiedSourceMap},
source_map::GenerateSourceMap,
source_transform::SourceTransform,
virtual_source::VirtualSource,
};
......@@ -424,11 +424,11 @@ async fn find_config_in_location(
#[turbo_tasks::value_impl]
impl GenerateSourceMap for PostCssTransformedAsset {
#[turbo_tasks::function]
async fn generate_source_map(&self) -> Result<Vc<OptionStringifiedSourceMap>> {
async fn generate_source_map(&self) -> Result<Vc<FileContent>> {
let source = Vc::try_resolve_sidecast::<Box<dyn GenerateSourceMap>>(*self.source).await?;
match source {
Some(source) => Ok(source.generate_source_map()),
None => Ok(Vc::cell(None)),
None => Ok(FileContent::NotFound.cell()),
}
}
}
......
......@@ -38,9 +38,7 @@ use turbopack_core::{
resolve,
},
source::Source,
source_map::{
GenerateSourceMap, OptionStringifiedSourceMap, utils::resolve_source_map_sources,
},
source_map::{GenerateSourceMap, utils::resolve_source_map_sources},
source_transform::SourceTransform,
virtual_source::VirtualSource,
};
......@@ -176,7 +174,7 @@ impl Asset for WebpackLoadersProcessedAsset {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for WebpackLoadersProcessedAsset {
#[turbo_tasks::function]
async fn generate_source_map(self: Vc<Self>) -> Result<Vc<OptionStringifiedSourceMap>> {
async fn generate_source_map(self: Vc<Self>) -> Result<Vc<FileContent>> {
Ok(*self.process().await?.source_map)
}
}
......@@ -184,7 +182,7 @@ impl GenerateSourceMap for WebpackLoadersProcessedAsset {
#[turbo_tasks::value]
struct ProcessWebpackLoadersResult {
content: ResolvedVc<AssetContent>,
source_map: ResolvedVc<OptionStringifiedSourceMap>,
source_map: ResolvedVc<FileContent>,
assets: Vec<ResolvedVc<VirtualSource>>,
}
......@@ -222,7 +220,7 @@ impl WebpackLoadersProcessedAsset {
return Ok(ProcessWebpackLoadersResult {
content: AssetContent::File(FileContent::NotFound.resolved_cell()).resolved_cell(),
assets: Vec::new(),
source_map: ResolvedVc::cell(None),
source_map: FileContent::NotFound.resolved_cell(),
}
.cell());
};
......@@ -284,7 +282,7 @@ impl WebpackLoadersProcessedAsset {
return Ok(ProcessWebpackLoadersResult {
content: AssetContent::File(FileContent::NotFound.resolved_cell()).resolved_cell(),
assets: Vec::new(),
source_map: ResolvedVc::cell(None),
source_map: FileContent::NotFound.resolved_cell(),
}
.cell());
};
......@@ -312,7 +310,11 @@ impl WebpackLoadersProcessedAsset {
Ok(ProcessWebpackLoadersResult {
content,
assets,
source_map: ResolvedVc::cell(source_map),
source_map: if let Some(source_map) = source_map {
FileContent::Content(File::from(source_map)).resolved_cell()
} else {
FileContent::NotFound.resolved_cell()
},
}
.cell())
}
......
use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{FxIndexSet, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbo_tasks_fs::{FileContent, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{Chunk, ChunkingContext},
introspect::{Introspectable, IntrospectableChildren},
output::{OutputAsset, OutputAssetsReference, OutputAssetsWithReferenced},
source_map::{GenerateSourceMap, OptionStringifiedSourceMap, SourceMapAsset},
source_map::{GenerateSourceMap, SourceMapAsset},
version::VersionedContent,
};
use turbopack_ecmascript::chunk::EcmascriptChunk;
......@@ -131,7 +131,7 @@ impl Asset for EcmascriptBuildNodeChunk {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for EcmascriptBuildNodeChunk {
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap> {
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent> {
self.own_content().generate_source_map()
}
}
......
use anyhow::Result;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::File;
use turbo_tasks_fs::{File, FileContent};
use turbopack_core::{
asset::AssetContent,
chunk::{ChunkingContext, MinifyType},
code_builder::{Code, CodeBuilder},
output::OutputAsset,
source_map::{GenerateSourceMap, OptionStringifiedSourceMap, SourceMapAsset},
source_map::{GenerateSourceMap, SourceMapAsset},
version::{Version, VersionedContent},
};
use turbopack_ecmascript::{chunk::EcmascriptChunkContent, minify::minify, utils::StringifyJs};
......@@ -91,7 +91,7 @@ impl EcmascriptBuildNodeChunkContent {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for EcmascriptBuildNodeChunkContent {
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap> {
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent> {
self.code().generate_source_map()
}
}
......
......@@ -4,7 +4,7 @@ use anyhow::{Result, bail};
use indoc::writedoc;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{File, FileSystemPath};
use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkingContext, EvaluatableAssets, ModuleChunkItemIdExt},
......@@ -14,7 +14,7 @@ use turbopack_core::{
OutputAsset, OutputAssets, OutputAssetsReference, OutputAssetsReferences,
OutputAssetsWithReferenced,
},
source_map::{GenerateSourceMap, OptionStringifiedSourceMap, SourceMapAsset},
source_map::{GenerateSourceMap, SourceMapAsset},
};
use turbopack_ecmascript::{chunk::EcmascriptChunkPlaceable, utils::StringifyJs};
......@@ -221,7 +221,7 @@ impl Asset for EcmascriptBuildNodeEntryChunk {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for EcmascriptBuildNodeEntryChunk {
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap> {
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent> {
self.code().generate_source_map()
}
}
......@@ -4,14 +4,14 @@ use anyhow::{Result, bail};
use indoc::writedoc;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{File, FileSystem, FileSystemPath};
use turbo_tasks_fs::{File, FileContent, FileSystem, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::ChunkingContext,
code_builder::{Code, CodeBuilder},
ident::AssetIdent,
output::{OutputAsset, OutputAssetsReference, OutputAssetsWithReferenced},
source_map::{GenerateSourceMap, OptionStringifiedSourceMap, SourceMapAsset},
source_map::{GenerateSourceMap, SourceMapAsset},
};
use turbopack_ecmascript::utils::StringifyJs;
use turbopack_ecmascript_runtime::RuntimeType;
......@@ -171,7 +171,7 @@ impl Asset for EcmascriptBuildNodeRuntimeChunk {
#[turbo_tasks::value_impl]
impl GenerateSourceMap for EcmascriptBuildNodeRuntimeChunk {
#[turbo_tasks::function]
fn generate_source_map(self: Vc<Self>) -> Vc<OptionStringifiedSourceMap> {
fn generate_source_map(self: Vc<Self>) -> Vc<FileContent> {
self.code().generate_source_map()
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment