Unverified Commit b0facee6 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: Move PrettyPrintError to turbo_tasks and add tests (#89280)

### What?

Move the error printing logic to turbo_tasks and add test cases for it
parent d77e3d4c
...@@ -9431,6 +9431,7 @@ dependencies = [ ...@@ -9431,6 +9431,7 @@ dependencies = [
"futures", "futures",
"hashbrown 0.14.5", "hashbrown 0.14.5",
"indexmap 2.9.0", "indexmap 2.9.0",
"indoc",
"lmdb-rkv", "lmdb-rkv",
"lzzzz", "lzzzz",
"once_cell", "once_cell",
......
...@@ -36,8 +36,9 @@ use tracing::Instrument; ...@@ -36,8 +36,9 @@ use tracing::Instrument;
use tracing_subscriber::{Registry, layer::SubscriberExt, util::SubscriberInitExt}; use tracing_subscriber::{Registry, layer::SubscriberExt, util::SubscriberInitExt};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
Effects, FxIndexSet, NonLocalValue, OperationValue, OperationVc, ReadRef, ResolvedVc, Effects, FxIndexSet, NonLocalValue, OperationValue, OperationVc, PrettyPrintError, ReadRef,
TaskInput, TransientInstance, TryJoinIterExt, TurboTasksApi, UpdateInfo, Vc, get_effects, ResolvedVc, TaskInput, TransientInstance, TryJoinIterExt, TurboTasksApi, UpdateInfo, Vc,
get_effects,
message_queue::{CompilationEvent, Severity}, message_queue::{CompilationEvent, Severity},
trace::TraceRawVcs, trace::TraceRawVcs,
}; };
...@@ -49,7 +50,6 @@ use turbo_unix_path::{get_relative_path_to, sys_to_unix}; ...@@ -49,7 +50,6 @@ use turbo_unix_path::{get_relative_path_to, sys_to_unix};
use turbopack_core::{ use turbopack_core::{
PROJECT_FILESYSTEM_NAME, SOURCE_URL_PROTOCOL, PROJECT_FILESYSTEM_NAME, SOURCE_URL_PROTOCOL,
diagnostics::PlainDiagnostic, diagnostics::PlainDiagnostic,
error::PrettyPrintError,
issue::{IssueFilter, PlainIssue}, issue::{IssueFilter, PlainIssue},
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
source_map::{SourceMap, Token}, source_map::{SourceMap, Token},
......
...@@ -18,7 +18,7 @@ use owo_colors::OwoColorize; ...@@ -18,7 +18,7 @@ use owo_colors::OwoColorize;
use serde::Serialize; use serde::Serialize;
use terminal_hyperlink::Hyperlink; use terminal_hyperlink::Hyperlink;
use turbo_tasks::{ use turbo_tasks::{
TurboTasks, TurboTasksApi, PrettyPrintError, TurboTasks, TurboTasksApi,
backend::TurboTasksExecutionError, backend::TurboTasksExecutionError,
message_queue::{CompilationEvent, Severity}, message_queue::{CompilationEvent, Severity},
}; };
...@@ -27,7 +27,6 @@ use turbo_tasks_backend::{ ...@@ -27,7 +27,6 @@ use turbo_tasks_backend::{
TurboTasksBackend, db_invalidation::invalidation_reasons, default_backing_storage, TurboTasksBackend, db_invalidation::invalidation_reasons, default_backing_storage,
noop_backing_storage, noop_backing_storage,
}; };
use turbopack_core::error::PrettyPrintError;
pub type NextTurboTasks = pub type NextTurboTasks =
Arc<TurboTasks<TurboTasksBackend<Either<DefaultBackingStorage, NoopBackingStorage>>>>; Arc<TurboTasks<TurboTasksBackend<Either<DefaultBackingStorage, NoopBackingStorage>>>>;
......
...@@ -64,6 +64,7 @@ turbo-tasks = { workspace = true } ...@@ -64,6 +64,7 @@ turbo-tasks = { workspace = true }
[dev-dependencies] [dev-dependencies]
criterion = { workspace = true, features = ["async_tokio"] } criterion = { workspace = true, features = ["async_tokio"] }
futures = { workspace = true } futures = { workspace = true }
indoc = { workspace = true }
regex = { workspace = true } regex = { workspace = true }
tempfile = { workspace = true } tempfile = { workspace = true }
turbo-tasks-malloc = { workspace = true } turbo-tasks-malloc = { workspace = true }
......
This diff is collapsed.
|name, initial| { |name, initial| {
use std::hash::BuildHasher;
let path = std::path::PathBuf::from( let path = std::path::PathBuf::from(
format!("{}/.cache/{}", env!("CARGO_TARGET_TMPDIR"), name)); format!("{}/.cache/{}", env!("CARGO_TARGET_TMPDIR"), rustc_hash::FxBuildHasher.hash_one(name)));
if initial { if initial {
let _ = std::fs::remove_dir_all(&path); let _ = std::fs::remove_dir_all(&path);
} }
......
...@@ -48,6 +48,7 @@ pub mod debug; ...@@ -48,6 +48,7 @@ pub mod debug;
mod display; mod display;
pub mod duration_span; pub mod duration_span;
mod effect; mod effect;
mod error;
pub mod event; pub mod event;
pub mod graph; pub mod graph;
mod id; mod id;
...@@ -103,6 +104,7 @@ pub use crate::{ ...@@ -103,6 +104,7 @@ pub use crate::{
completion::{Completion, Completions}, completion::{Completion, Completions},
display::ValueToString, display::ValueToString,
effect::{ApplyEffectsContext, Effects, apply_effects, effect, get_effects}, effect::{ApplyEffectsContext, Effects, apply_effects, effect, get_effects},
error::PrettyPrintError,
id::{ExecutionId, LocalTaskId, TRANSIENT_TASK_BIT, TaskId, TraitTypeId, ValueTypeId}, id::{ExecutionId, LocalTaskId, TRANSIENT_TASK_BIT, TaskId, TraitTypeId, ValueTypeId},
invalidation::{ invalidation::{
InvalidationReason, InvalidationReasonKind, InvalidationReasonSet, Invalidator, InvalidationReason, InvalidationReasonKind, InvalidationReasonSet, Invalidator,
......
...@@ -2,12 +2,11 @@ use std::fmt::Write; ...@@ -2,12 +2,11 @@ use std::fmt::Write;
use anyhow::Result; use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ReadRef, ResolvedVc, ValueToString, Vc}; use turbo_tasks::{PrettyPrintError, ReadRef, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use super::{Issue, IssueSource, IssueStage, OptionStyledString, StyledString}; use super::{Issue, IssueSource, IssueStage, OptionStyledString, StyledString};
use crate::{ use crate::{
error::PrettyPrintError,
issue::{IssueSeverity, OptionIssueSource}, issue::{IssueSeverity, OptionIssueSource},
resolve::{ resolve::{
options::{ImportMap, ImportMapResult, ResolveOptions}, options::{ImportMap, ImportMapResult, ResolveOptions},
......
...@@ -19,7 +19,6 @@ pub mod data_uri_source; ...@@ -19,7 +19,6 @@ pub mod data_uri_source;
pub mod debug_id; pub mod debug_id;
pub mod diagnostics; pub mod diagnostics;
pub mod environment; pub mod environment;
pub mod error;
pub mod file_source; pub mod file_source;
pub mod ident; pub mod ident;
pub mod introspect; pub mod introspect;
......
...@@ -17,8 +17,8 @@ use tracing::{Instrument, Level}; ...@@ -17,8 +17,8 @@ use tracing::{Instrument, Level};
use turbo_frozenmap::{FrozenMap, FrozenSet}; use turbo_frozenmap::{FrozenMap, FrozenSet};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryFlatJoinIterExt, FxIndexMap, FxIndexSet, NonLocalValue, PrettyPrintError, ReadRef, ResolvedVc, TaskInput,
TryJoinIterExt, ValueToString, Vc, trace::TraceRawVcs, TryFlatJoinIterExt, TryJoinIterExt, ValueToString, Vc, trace::TraceRawVcs,
}; };
use turbo_tasks_fs::{FileSystemEntryType, FileSystemPath}; use turbo_tasks_fs::{FileSystemEntryType, FileSystemPath};
use turbo_unix_path::normalize_request; use turbo_unix_path::normalize_request;
...@@ -65,7 +65,7 @@ pub use alias_map::{ ...@@ -65,7 +65,7 @@ pub use alias_map::{
}; };
pub use remap::{ResolveAliasMap, SubpathValue}; pub use remap::{ResolveAliasMap, SubpathValue};
use crate::{error::PrettyPrintError, issue::IssueSeverity}; use crate::issue::IssueSeverity;
/// Controls how resolve errors are handled. /// Controls how resolve errors are handled.
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
......
...@@ -32,13 +32,10 @@ use socket2::{Domain, Protocol, Socket, Type}; ...@@ -32,13 +32,10 @@ use socket2::{Domain, Protocol, Socket, Type};
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
use tracing::{Instrument, Level, Span, event, info_span}; use tracing::{Instrument, Level, Span, event, info_span};
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, OperationVc, TurboTasksApi, Vc, apply_effects, run_once_with_reason, NonLocalValue, OperationVc, PrettyPrintError, TurboTasksApi, Vc, apply_effects,
trace::TraceRawVcs, util::FormatDuration, run_once_with_reason, trace::TraceRawVcs, util::FormatDuration,
};
use turbopack_core::{
error::PrettyPrintError,
issue::{IssueReporter, IssueSeverity, handle_issues},
}; };
use turbopack_core::issue::{IssueReporter, IssueSeverity, handle_issues};
use self::{source::ContentSource, update::UpdateServer}; use self::{source::ContentSource, update::UpdateServer};
use crate::{ use crate::{
......
...@@ -13,10 +13,11 @@ use tokio::select; ...@@ -13,10 +13,11 @@ use tokio::select;
use tokio_stream::StreamMap; use tokio_stream::StreamMap;
use tracing::{Level, instrument}; use tracing::{Level, instrument};
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, OperationVc, ReadRef, TransientInstance, TurboTasksApi, Vc, trace::TraceRawVcs, NonLocalValue, OperationVc, PrettyPrintError, ReadRef, TransientInstance, TurboTasksApi, Vc,
trace::TraceRawVcs,
}; };
use turbo_tasks_fs::json::parse_json_with_source_context; use turbo_tasks_fs::json::parse_json_with_source_context;
use turbopack_core::{error::PrettyPrintError, issue::IssueReporter, version::Update}; use turbopack_core::{issue::IssueReporter, version::Update};
use turbopack_ecmascript_hmr_protocol::{ use turbopack_ecmascript_hmr_protocol::{
ClientMessage, ClientUpdateInstruction, Issue, ResourceIdentifier, ClientMessage, ClientUpdateInstruction, Issue, ResourceIdentifier,
}; };
......
...@@ -7,12 +7,12 @@ use tokio_stream::wrappers::ReceiverStream; ...@@ -7,12 +7,12 @@ use tokio_stream::wrappers::ReceiverStream;
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
IntoTraitRef, NonLocalValue, OperationVc, ReadRef, ResolvedVc, TransientInstance, Vc, IntoTraitRef, NonLocalValue, OperationVc, PrettyPrintError, ReadRef, ResolvedVc,
TransientInstance, Vc,
trace::{TraceRawVcs, TraceRawVcsContext}, trace::{TraceRawVcs, TraceRawVcsContext},
}; };
use turbo_tasks_fs::{FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileSystem, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
error::PrettyPrintError,
issue::{ issue::{
CollectibleIssuesExt, Issue, IssueFilter, IssueSeverity, IssueStage, OptionStyledString, CollectibleIssuesExt, Issue, IssueFilter, IssueSeverity, IssueStage, OptionStyledString,
PlainIssue, StyledString, PlainIssue, StyledString,
......
...@@ -3492,8 +3492,8 @@ fn is_unresolved_id(i: &Id, unresolved_mark: Mark) -> bool { ...@@ -3492,8 +3492,8 @@ fn is_unresolved_id(i: &Id, unresolved_mark: Mark) -> bool {
pub mod test_utils { pub mod test_utils {
use anyhow::Result; use anyhow::Result;
use turbo_rcstr::rcstr; use turbo_rcstr::rcstr;
use turbo_tasks::{FxIndexMap, Vc}; use turbo_tasks::{FxIndexMap, PrettyPrintError, Vc};
use turbopack_core::{compile_time_info::CompileTimeInfo, error::PrettyPrintError}; use turbopack_core::compile_time_info::CompileTimeInfo;
use super::{ use super::{
ConstantValue, JsValue, JsValueUrlKind, ModuleValue, WellKnownFunctionKind, ConstantValue, JsValue, JsValueUrlKind, ModuleValue, WellKnownFunctionKind,
......
...@@ -5,7 +5,8 @@ use bincode::{Decode, Encode}; ...@@ -5,7 +5,8 @@ use bincode::{Decode, Encode};
use smallvec::SmallVec; use smallvec::SmallVec;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, ResolvedVc, TaskInput, Upcast, ValueToString, Vc, trace::TraceRawVcs, NonLocalValue, PrettyPrintError, ResolvedVc, TaskInput, Upcast, ValueToString, Vc,
trace::TraceRawVcs,
}; };
use turbo_tasks_fs::{FileSystemPath, rope::Rope}; use turbo_tasks_fs::{FileSystemPath, rope::Rope};
use turbopack_core::{ use turbopack_core::{
...@@ -14,7 +15,6 @@ use turbopack_core::{ ...@@ -14,7 +15,6 @@ use turbopack_core::{
ChunkingContextExt, ModuleId, SourceMapSourceType, ChunkingContextExt, ModuleId, SourceMapSourceType,
}, },
code_builder::{Code, CodeBuilder}, code_builder::{Code, CodeBuilder},
error::PrettyPrintError,
issue::{IssueExt, IssueSeverity, StyledString, code_gen::CodeGenerationIssue}, issue::{IssueExt, IssueSeverity, StyledString, code_gen::CodeGenerationIssue},
output::OutputAssetsReference, output::OutputAssetsReference,
source_map::utils::{absolute_fileify_source_map, relative_fileify_source_map}, source_map::utils::{absolute_fileify_source_map, relative_fileify_source_map},
......
...@@ -2,7 +2,7 @@ use anyhow::Result; ...@@ -2,7 +2,7 @@ use anyhow::Result;
use either::Either; use either::Either;
use itertools::Itertools; use itertools::Itertools;
use turbo_rcstr::rcstr; use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc}; use turbo_tasks::{PrettyPrintError, ResolvedVc, TryJoinIterExt, Vc};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
FileJsonContent, FileSystemPath, FileJsonContent, FileSystemPath,
glob::{Glob, GlobOptions}, glob::{Glob, GlobOptions},
...@@ -10,7 +10,6 @@ use turbo_tasks_fs::{ ...@@ -10,7 +10,6 @@ use turbo_tasks_fs::{
use turbopack_core::{ use turbopack_core::{
asset::Asset, asset::Asset,
chunk::ChunkableModule, chunk::ChunkableModule,
error::PrettyPrintError,
file_source::FileSource, file_source::FileSource,
issue::{ issue::{
Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource, Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource,
......
...@@ -31,13 +31,12 @@ use swc_core::{ ...@@ -31,13 +31,12 @@ use swc_core::{
}; };
use tracing::{Instrument, instrument}; use tracing::{Instrument, instrument};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, ValueToString, Vc, util::WrapFuture}; use turbo_tasks::{PrettyPrintError, ResolvedVc, ValueToString, Vc, util::WrapFuture};
use turbo_tasks_fs::{FileContent, FileSystemPath, rope::Rope}; use turbo_tasks_fs::{FileContent, FileSystemPath, rope::Rope};
use turbo_tasks_hash::hash_xxh3_hash64; use turbo_tasks_hash::hash_xxh3_hash64;
use turbopack_core::{ use turbopack_core::{
SOURCE_URL_PROTOCOL, SOURCE_URL_PROTOCOL,
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
error::PrettyPrintError,
issue::{ issue::{
Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource, Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource,
OptionStyledString, StyledString, OptionStyledString, StyledString,
......
...@@ -62,8 +62,8 @@ use tokio::sync::OnceCell; ...@@ -62,8 +62,8 @@ use tokio::sync::OnceCell;
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, Upcast, FxIndexMap, FxIndexSet, NonLocalValue, PrettyPrintError, ReadRef, ResolvedVc, TaskInput,
ValueToString, Vc, trace::TraceRawVcs, TryJoinIterExt, Upcast, ValueToString, Vc, trace::TraceRawVcs,
}; };
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
...@@ -73,7 +73,6 @@ use turbopack_core::{ ...@@ -73,7 +73,6 @@ use turbopack_core::{
InputRelativeConstant, InputRelativeConstant,
}, },
environment::Rendering, environment::Rendering,
error::PrettyPrintError,
issue::{IssueExt, IssueSeverity, IssueSource, StyledString, analyze::AnalyzeIssue}, issue::{IssueExt, IssueSeverity, IssueSource, StyledString, analyze::AnalyzeIssue},
module::{Module, ModuleSideEffects}, module::{Module, ModuleSideEffects},
reference::{ModuleReference, ModuleReferences}, reference::{ModuleReference, ModuleReferences},
......
...@@ -17,10 +17,11 @@ use image::{ ...@@ -17,10 +17,11 @@ use image::{
}; };
use mime::Mime; use mime::Mime;
use turbo_rcstr::rcstr; use turbo_rcstr::rcstr;
use turbo_tasks::{NonLocalValue, ResolvedVc, Vc, debug::ValueDebugFormat, trace::TraceRawVcs}; use turbo_tasks::{
NonLocalValue, PrettyPrintError, ResolvedVc, Vc, debug::ValueDebugFormat, trace::TraceRawVcs,
};
use turbo_tasks_fs::{File, FileContent, FileSystemPath}; use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
error::PrettyPrintError,
issue::{ issue::{
Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource, Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource,
OptionStyledString, StyledString, OptionStyledString, StyledString,
......
...@@ -7,8 +7,9 @@ use serde::{Deserialize, Serialize, de::DeserializeOwned}; ...@@ -7,8 +7,9 @@ use serde::{Deserialize, Serialize, de::DeserializeOwned};
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
Completion, Effects, FxIndexMap, NonLocalValue, OperationVc, ReadRef, ResolvedVc, TaskInput, Completion, Effects, FxIndexMap, NonLocalValue, OperationVc, PrettyPrintError, ReadRef,
TryJoinIterExt, Vc, duration_span, fxindexmap, get_effects, trace::TraceRawVcs, ResolvedVc, TaskInput, TryJoinIterExt, Vc, duration_span, fxindexmap, get_effects,
trace::TraceRawVcs,
}; };
use turbo_tasks_env::{EnvMap, ProcessEnv}; use turbo_tasks_env::{EnvMap, ProcessEnv};
use turbo_tasks_fs::{File, FileContent, FileSystemPath, to_sys_path}; use turbo_tasks_fs::{File, FileContent, FileSystemPath, to_sys_path};
...@@ -17,7 +18,6 @@ use turbopack_core::{ ...@@ -17,7 +18,6 @@ use turbopack_core::{
changed::content_changed, changed::content_changed,
chunk::{ChunkingContext, ChunkingContextExt, EvaluatableAsset, EvaluatableAssets}, chunk::{ChunkingContext, ChunkingContextExt, EvaluatableAsset, EvaluatableAssets},
context::AssetContext, context::AssetContext,
error::PrettyPrintError,
file_source::FileSource, file_source::FileSource,
ident::AssetIdent, ident::AssetIdent,
issue::{ issue::{
......
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