Unverified Commit 18e16185 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: Refactor resolver to accept bool instead of severity (#71254)

I pulled out the core change from
https://github.com/vercel/next.js/pull/71155

- Refactor resolve functions to accept a `is_optional` boolean instead
of an explicit severity
- Add `ResolveOptions::loose_errors` to only emit warnings instead of
errors

Not sure if `loose_errors` is the best name. `warn_instead_of_errors`,
`emit_warnings_only` ?
parent 157f51e2
......@@ -57,7 +57,6 @@ use turbopack_core::{
},
file_source::FileSource,
ident::AssetIdent,
issue::IssueSeverity,
module::{Module, Modules},
output::{OutputAsset, OutputAssets},
raw_output::RawOutput,
......@@ -604,7 +603,7 @@ impl AppProject {
"next/dist/client/app-next-turbopack.js".into(),
))),
None,
IssueSeverity::Error.cell(),
false,
)
.resolve()
.await?
......
......@@ -20,7 +20,6 @@ use turbopack_core::{
EvaluatableAsset,
},
context::AssetContext,
issue::IssueSeverity,
module::Module,
output::OutputAssets,
reference::primary_referenced_modules,
......@@ -318,7 +317,7 @@ async fn build_dynamic_imports_map_for_module(
)),
Request::parse(Value::new(Pattern::Constant(import.clone()))),
Value::new(EcmaScriptModulesReferenceSubType::DynamicImport),
IssueSeverity::Error.cell(),
false,
None,
)
.first_module()
......
......@@ -47,7 +47,6 @@ use turbopack_core::{
context::AssetContext,
file_source::FileSource,
ident::AssetIdent,
issue::IssueSeverity,
module::{Module, Modules},
output::{OutputAsset, OutputAssets},
reference_type::{EcmaScriptModulesReferenceSubType, EntryReferenceSubType, ReferenceType},
......@@ -576,7 +575,7 @@ impl PagesProject {
.into(),
))),
Value::new(EcmaScriptModulesReferenceSubType::Undefined),
IssueSeverity::Error.cell(),
false,
None,
)
.first_module()
......
......@@ -4,7 +4,6 @@ use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
context::AssetContext,
issue::IssueSeverity,
module::Module,
resolve::{origin::PlainResolveOrigin, parse::Request},
source::Source,
......@@ -37,7 +36,7 @@ impl RuntimeEntry {
Vc::upcast(PlainResolveOrigin::new(asset_context, path)),
request,
None,
IssueSeverity::Error.cell(),
false,
)
.resolve()
.await?
......
......@@ -41,7 +41,6 @@ pub async fn get_swc_ecma_transform_rule_impl(
use turbopack::{resolve_options, resolve_options_context::ResolveOptionsContext};
use turbopack_core::{
asset::Asset,
issue::IssueSeverity,
reference_type::{CommonJsReferenceSubType, ReferenceType},
resolve::{handle_resolve_error, parse::Request, pattern::Pattern, resolve},
};
......@@ -81,7 +80,7 @@ pub async fn get_swc_ecma_transform_rule_impl(
project_path,
request,
resolve_options,
IssueSeverity::Error.cell(),
false,
None,
)
.await?;
......
......@@ -4,7 +4,6 @@ use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
context::AssetContext,
issue::IssueSeverity,
module::Module,
resolve::{origin::PlainResolveOrigin, parse::Request},
source::Source,
......@@ -37,7 +36,7 @@ impl RuntimeEntry {
Vc::upcast(PlainResolveOrigin::new(asset_context, path)),
request,
None,
IssueSeverity::Error.cell(),
false,
)
.resolve()
.await?
......
......@@ -460,6 +460,9 @@ impl ValueToString for ResolveResult {
#[turbo_tasks::function]
async fn to_string(&self) -> Result<Vc<RcStr>> {
let mut result = String::new();
if self.is_unresolveable_ref() {
result.push_str("unresolveable");
}
for (i, (request, item)) in self.primary.iter().enumerate() {
if i > 0 {
result.push_str(", ");
......@@ -1433,7 +1436,7 @@ pub async fn url_resolve(
request: Vc<Request>,
reference_type: Value<ReferenceType>,
issue_source: Option<Vc<IssueSource>>,
issue_severity: Vc<IssueSeverity>,
is_optional: bool,
) -> Result<Vc<ModuleResolveResult>> {
let resolve_options = origin.resolve_options(reference_type.clone());
let rel_request = request.as_relative();
......@@ -1464,7 +1467,7 @@ pub async fn url_resolve(
origin.origin_path(),
request,
resolve_options,
issue_severity,
is_optional,
issue_source,
)
.await
......@@ -1745,7 +1748,7 @@ async fn resolve_internal_inline(
if !has_alias {
ResolvingIssue {
severity: IssueSeverity::Error.cell(),
severity: error_severity(options).await?,
request_type: "server relative import: not implemented yet".to_string(),
request,
file_path: lookup_path,
......@@ -1775,7 +1778,7 @@ async fn resolve_internal_inline(
} => {
if !has_alias {
ResolvingIssue {
severity: IssueSeverity::Error.cell(),
severity: error_severity(options).await?,
request_type: "windows import: not implemented yet".to_string(),
request,
file_path: lookup_path,
......@@ -1829,7 +1832,7 @@ async fn resolve_internal_inline(
Request::Unknown { path } => {
if !has_alias {
ResolvingIssue {
severity: IssueSeverity::Error.cell(),
severity: error_severity(options).await?,
request_type: format!("unknown import: `{}`", path),
request,
file_path: lookup_path,
......@@ -2234,7 +2237,7 @@ async fn apply_in_package(
}
ResolvingIssue {
severity: IssueSeverity::Error.cell(),
severity: error_severity(options).await?,
file_path: *package_json_path,
request_type: format!("alias field ({field})"),
request: Request::parse(Value::new(Pattern::Constant(request))),
......@@ -2676,7 +2679,7 @@ async fn resolve_package_internal_with_imports_field(
// https://github.com/nodejs/node/blob/1b177932/lib/internal/modules/esm/resolve.js#L615-L619
if specifier == "#" || specifier.starts_with("#/") || specifier.ends_with('/') {
ResolvingIssue {
severity: IssueSeverity::Error.cell(),
severity: error_severity(resolve_options).await?,
file_path,
request_type: format!("package imports request: `{specifier}`"),
request,
......@@ -2714,7 +2717,7 @@ pub async fn handle_resolve_error(
origin_path: Vc<FileSystemPath>,
request: Vc<Request>,
resolve_options: Vc<ResolveOptions>,
severity: Vc<IssueSeverity>,
is_optional: bool,
source: Option<Vc<IssueSource>>,
) -> Result<Vc<ModuleResolveResult>> {
async fn is_unresolveable(result: Vc<ModuleResolveResult>) -> Result<bool> {
......@@ -2724,27 +2727,29 @@ pub async fn handle_resolve_error(
Ok(unresolveable) => {
if unresolveable {
emit_unresolveable_issue(
severity,
is_optional,
origin_path,
reference_type,
request,
resolve_options,
source,
);
)
.await?;
}
result
}
Err(err) => {
emit_resolve_error_issue(
severity,
is_optional,
origin_path,
reference_type,
request,
resolve_options,
err,
source,
);
)
.await?;
ModuleResolveResult::unresolveable().cell()
}
})
......@@ -2756,7 +2761,7 @@ pub async fn handle_resolve_source_error(
origin_path: Vc<FileSystemPath>,
request: Vc<Request>,
resolve_options: Vc<ResolveOptions>,
severity: Vc<IssueSeverity>,
is_optional: bool,
source: Option<Vc<IssueSource>>,
) -> Result<Vc<ResolveResult>> {
async fn is_unresolveable(result: Vc<ResolveResult>) -> Result<bool> {
......@@ -2766,41 +2771,48 @@ pub async fn handle_resolve_source_error(
Ok(unresolveable) => {
if unresolveable {
emit_unresolveable_issue(
severity,
is_optional,
origin_path,
reference_type,
request,
resolve_options,
source,
);
)
.await?;
}
result
}
Err(err) => {
emit_resolve_error_issue(
severity,
is_optional,
origin_path,
reference_type,
request,
resolve_options,
err,
source,
);
)
.await?;
ResolveResult::unresolveable().cell()
}
})
}
fn emit_resolve_error_issue(
severity: Vc<IssueSeverity>,
async fn emit_resolve_error_issue(
is_optional: bool,
origin_path: Vc<FileSystemPath>,
reference_type: Value<ReferenceType>,
request: Vc<Request>,
resolve_options: Vc<ResolveOptions>,
err: anyhow::Error,
source: Option<Vc<IssueSource>>,
) {
) -> Result<()> {
let severity = if is_optional || resolve_options.await?.loose_errors {
IssueSeverity::Warning.cell()
} else {
IssueSeverity::Error.cell()
};
ResolvingIssue {
severity,
file_path: origin_path,
......@@ -2812,16 +2824,22 @@ fn emit_resolve_error_issue(
}
.cell()
.emit();
Ok(())
}
fn emit_unresolveable_issue(
severity: Vc<IssueSeverity>,
async fn emit_unresolveable_issue(
is_optional: bool,
origin_path: Vc<FileSystemPath>,
reference_type: Value<ReferenceType>,
request: Vc<Request>,
resolve_options: Vc<ResolveOptions>,
source: Option<Vc<IssueSource>>,
) {
) -> Result<()> {
let severity = if is_optional || resolve_options.await?.loose_errors {
IssueSeverity::Warning.cell()
} else {
IssueSeverity::Error.cell()
};
ResolvingIssue {
severity,
file_path: origin_path,
......@@ -2833,6 +2851,15 @@ fn emit_unresolveable_issue(
}
.cell()
.emit();
Ok(())
}
async fn error_severity(resolve_options: Vc<ResolveOptions>) -> Result<Vc<IssueSeverity>> {
Ok(if resolve_options.await?.loose_errors {
IssueSeverity::Warning.cell()
} else {
IssueSeverity::Error.cell()
})
}
// TODO this should become a TaskInput instead of a Vc
......
......@@ -492,6 +492,8 @@ pub struct ResolveOptions {
pub plugins: Vec<Vc<Box<dyn AfterResolvePlugin>>>,
/// Support resolving *.js requests to *.ts files
pub enable_typescript_with_output_extension: bool,
/// Warn instead of error for resolve errors
pub loose_errors: bool,
pub placeholder_for_future_extensions: (),
}
......
......@@ -13,7 +13,7 @@ use swc_core::css::{
};
use turbo_tasks::{RcStr, Value, Vc};
use turbopack_core::{
issue::{IssueSeverity, IssueSource},
issue::IssueSource,
reference::ModuleReference,
reference_type::{CssReferenceSubType, ImportContext, ReferenceType},
resolve::{origin::ResolveOrigin, parse::Request, url_resolve, ModuleResolveResult},
......@@ -250,6 +250,6 @@ pub fn css_resolve(
request,
Value::new(ReferenceType::Css(ty.into_value())),
issue_source,
IssueSeverity::Error.cell(),
false,
)
}
......@@ -17,7 +17,7 @@ use turbopack_core::{
ChunkingTypeOption,
},
ident::AssetIdent,
issue::{IssueSeverity, IssueSource},
issue::IssueSource,
output::OutputAsset,
reference::ModuleReference,
reference_type::{ReferenceType, UrlReferenceSubType},
......@@ -90,7 +90,7 @@ impl ModuleReference for UrlAssetReference {
self.request,
Value::new(ReferenceType::Url(UrlReferenceSubType::CssUrl)),
Some(self.issue_source),
IssueSeverity::Error.cell(),
false,
)
}
}
......
......@@ -20,7 +20,7 @@ use turbopack_core::{
reference::ModuleReference,
resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
};
use turbopack_resolve::ecmascript::{cjs_resolve, try_to_severity};
use turbopack_resolve::ecmascript::cjs_resolve;
use super::pattern_mapping::{PatternMapping, ResolveType::ChunkItem};
use crate::{
......@@ -64,7 +64,7 @@ impl ModuleReference for AmdDefineAssetReference {
self.origin,
self.request,
Some(self.issue_source),
try_to_severity(self.in_try),
self.in_try,
)
}
}
......@@ -159,7 +159,7 @@ impl CodeGenerateable for AmdDefineWithDependenciesCodeGen {
self.origin,
*request,
Some(self.issue_source),
try_to_severity(self.in_try),
self.in_try,
),
Value::new(ChunkItem),
)
......
......@@ -11,7 +11,7 @@ use turbopack_core::{
reference::ModuleReference,
resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
};
use turbopack_resolve::ecmascript::{cjs_resolve, try_to_severity};
use turbopack_resolve::ecmascript::cjs_resolve;
use super::pattern_mapping::{PatternMapping, ResolveType::ChunkItem};
use crate::{
......@@ -55,7 +55,7 @@ impl ModuleReference for CjsAssetReference {
self.origin,
self.request,
Some(self.issue_source),
try_to_severity(self.in_try),
self.in_try,
)
}
}
......@@ -111,7 +111,7 @@ impl ModuleReference for CjsRequireAssetReference {
self.origin,
self.request,
Some(self.issue_source),
try_to_severity(self.in_try),
self.in_try,
)
}
}
......@@ -144,7 +144,7 @@ impl CodeGenerateable for CjsRequireAssetReference {
self.origin,
self.request,
Some(self.issue_source),
try_to_severity(self.in_try),
self.in_try,
),
Value::new(ChunkItem),
)
......@@ -218,7 +218,7 @@ impl ModuleReference for CjsRequireResolveAssetReference {
self.origin,
self.request,
Some(self.issue_source),
try_to_severity(self.in_try),
self.in_try,
)
}
}
......@@ -251,7 +251,7 @@ impl CodeGenerateable for CjsRequireResolveAssetReference {
self.origin,
self.request,
Some(self.issue_source),
try_to_severity(self.in_try),
self.in_try,
),
Value::new(ChunkItem),
)
......
......@@ -175,7 +175,7 @@ impl ModuleReference for EsmAssetReference {
self.get_origin().resolve().await?,
self.request,
Value::new(ty),
IssueSeverity::Error.cell(),
false,
Some(self.issue_source),
);
......
......@@ -13,7 +13,7 @@ use turbopack_core::{
reference_type::EcmaScriptModulesReferenceSubType,
resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
};
use turbopack_resolve::ecmascript::{esm_resolve, try_to_severity};
use turbopack_resolve::ecmascript::esm_resolve;
use super::super::pattern_mapping::{PatternMapping, ResolveType};
use crate::{
......@@ -63,7 +63,7 @@ impl ModuleReference for EsmAsyncAssetReference {
self.origin,
self.request,
Value::new(EcmaScriptModulesReferenceSubType::DynamicImport),
try_to_severity(self.in_try),
self.in_try,
Some(self.issue_source),
)
}
......@@ -102,7 +102,7 @@ impl CodeGenerateable for EsmAsyncAssetReference {
self.origin,
self.request,
Value::new(EcmaScriptModulesReferenceSubType::DynamicImport),
try_to_severity(self.in_try),
self.in_try,
Some(self.issue_source),
),
if matches!(
......
......@@ -17,7 +17,6 @@ use turbopack_core::{
origin::ResolveOrigin, parse::Request, url_resolve, ExternalType, ModuleResolveResult,
},
};
use turbopack_resolve::ecmascript::try_to_severity;
use super::base::ReferencedAsset;
use crate::{
......@@ -96,7 +95,7 @@ impl ModuleReference for UrlAssetReference {
self.request,
Value::new(ReferenceType::Url(UrlReferenceSubType::EcmaScriptNewUrl)),
Some(self.issue_source),
try_to_severity(self.in_try),
self.in_try,
)
}
}
......
......@@ -2567,7 +2567,7 @@ async fn require_resolve_visitor(
Ok(if args.len() == 1 {
let pat = js_value_to_pattern(&args[0]);
let request = Request::parse(Value::new(pat.clone()));
let resolved = cjs_resolve_source(origin, request, None, IssueSeverity::Warning.cell())
let resolved = cjs_resolve_source(origin, request, None, true)
.resolve()
.await?;
let mut values = resolved
......@@ -2634,7 +2634,7 @@ async fn require_context_visitor(
options.include_subdirs,
Vc::cell(options.filter),
None,
IssueSeverity::Warning.cell(),
true,
);
Ok(JsValue::WellKnownFunction(
......
......@@ -22,13 +22,13 @@ use turbopack_core::{
ChunkingContext,
},
ident::AssetIdent,
issue::{IssueSeverity, IssueSource},
issue::IssueSource,
module::Module,
reference::{ModuleReference, ModuleReferences},
resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
source::Source,
};
use turbopack_resolve::ecmascript::{cjs_resolve, try_to_severity};
use turbopack_resolve::ecmascript::cjs_resolve;
use crate::{
chunk::{
......@@ -165,7 +165,7 @@ impl RequireContextMap {
recursive: bool,
filter: Vc<Regex>,
issue_source: Option<Vc<IssueSource>>,
issue_severity: Vc<IssueSeverity>,
is_optional: bool,
) -> Result<Vc<Self>> {
let origin_path = &*origin.origin_path().parent().await?;
......@@ -176,7 +176,7 @@ impl RequireContextMap {
for (context_relative, path) in list {
if let Some(origin_relative) = origin_path.get_relative_path_to(&*path.await?) {
let request = Request::parse(Value::new(origin_relative.clone().into()));
let result = cjs_resolve(origin, request, issue_source, issue_severity);
let result = cjs_resolve(origin, request, issue_source, is_optional);
map.insert(
context_relative.clone(),
......@@ -228,7 +228,7 @@ impl RequireContextAssetReference {
include_subdirs,
filter,
issue_source,
try_to_severity(in_try),
in_try,
);
let inner = RequireContextAsset {
source,
......
......@@ -12,7 +12,6 @@ use turbopack_core::{
reference_type::{ReferenceType, WorkerReferenceSubType},
resolve::{origin::ResolveOrigin, parse::Request, url_resolve, ModuleResolveResult},
};
use turbopack_resolve::ecmascript::try_to_severity;
use crate::{
code_gen::{CodeGenerateable, CodeGeneration},
......@@ -61,7 +60,7 @@ impl WorkerAssetReference {
// TODO support more worker types
Value::new(ReferenceType::Worker(WorkerReferenceSubType::WebWorker)),
Some(self.issue_source),
try_to_severity(self.in_try),
self.in_try,
);
let Some(module) = *module.first_module().await? else {
......
......@@ -5,7 +5,6 @@ use turbo_tasks_fs::DirectoryContent;
use turbopack_core::{
asset::{Asset, AssetContent},
ident::AssetIdent,
issue::IssueSeverity,
module::Module,
raw_module::RawModule,
reference::{ModuleReference, ModuleReferences},
......@@ -182,7 +181,7 @@ impl CompilerReference {
impl ModuleReference for CompilerReference {
#[turbo_tasks::function]
fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
cjs_resolve(self.origin, self.request, None, IssueSeverity::Error.cell())
cjs_resolve(self.origin, self.request, None, false)
}
}
......@@ -251,7 +250,7 @@ impl TsNodeRequireReference {
impl ModuleReference for TsNodeRequireReference {
#[turbo_tasks::function]
fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
cjs_resolve(self.origin, self.request, None, IssueSeverity::Error.cell())
cjs_resolve(self.origin, self.request, None, false)
}
}
......
use anyhow::Result;
use turbo_tasks::{Value, Vc};
use turbopack_core::{
issue::{IssueSeverity, IssueSource},
issue::IssueSource,
reference_type::{CommonJsReferenceSubType, EcmaScriptModulesReferenceSubType, ReferenceType},
resolve::{
handle_resolve_error, handle_resolve_source_error,
......@@ -79,14 +79,14 @@ pub async fn esm_resolve(
origin: Vc<Box<dyn ResolveOrigin>>,
request: Vc<Request>,
ty: Value<EcmaScriptModulesReferenceSubType>,
issue_severity: Vc<IssueSeverity>,
is_optional: bool,
issue_source: Option<Vc<IssueSource>>,
) -> Result<Vc<ModuleResolveResult>> {
let ty = Value::new(ReferenceType::EcmaScriptModules(ty.into_value()));
let options = apply_esm_specific_options(origin.resolve_options(ty.clone()), ty.clone())
.resolve()
.await?;
specific_resolve(origin, request, options, ty, issue_severity, issue_source).await
specific_resolve(origin, request, options, ty, is_optional, issue_source).await
}
#[turbo_tasks::function]
......@@ -94,14 +94,14 @@ pub async fn cjs_resolve(
origin: Vc<Box<dyn ResolveOrigin>>,
request: Vc<Request>,
issue_source: Option<Vc<IssueSource>>,
issue_severity: Vc<IssueSeverity>,
is_optional: bool,
) -> Result<Vc<ModuleResolveResult>> {
// TODO pass CommonJsReferenceSubType
let ty = Value::new(ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined));
let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()))
.resolve()
.await?;
specific_resolve(origin, request, options, ty, issue_severity, issue_source).await
specific_resolve(origin, request, options, ty, is_optional, issue_source).await
}
#[turbo_tasks::function]
......@@ -109,7 +109,7 @@ pub async fn cjs_resolve_source(
origin: Vc<Box<dyn ResolveOrigin>>,
request: Vc<Request>,
issue_source: Option<Vc<IssueSource>>,
issue_severity: Vc<IssueSeverity>,
is_optional: bool,
) -> Result<Vc<ResolveResult>> {
// TODO pass CommonJsReferenceSubType
let ty = Value::new(ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined));
......@@ -129,7 +129,7 @@ pub async fn cjs_resolve_source(
origin.origin_path(),
request,
options,
issue_severity,
is_optional,
issue_source,
)
.await
......@@ -140,7 +140,7 @@ async fn specific_resolve(
request: Vc<Request>,
options: Vc<ResolveOptions>,
reference_type: Value<ReferenceType>,
issue_severity: Vc<IssueSeverity>,
is_optional: bool,
issue_source: Option<Vc<IssueSource>>,
) -> Result<Vc<ModuleResolveResult>> {
let result = origin.resolve_asset(request, options, reference_type.clone());
......@@ -151,16 +151,8 @@ async fn specific_resolve(
origin.origin_path(),
request,
options,
issue_severity,
is_optional,
issue_source,
)
.await
}
pub fn try_to_severity(in_try: bool) -> Vc<IssueSeverity> {
if in_try {
IssueSeverity::Warning.cell()
} else {
IssueSeverity::Error.cell()
}
}
......@@ -259,6 +259,7 @@ async fn base_resolve_options(
resolved_map: opt.resolved_map,
plugins,
before_resolve_plugins: opt.before_resolve_plugins.clone(),
loose_errors: opt.loose_errors,
..Default::default()
}
.into())
......
......@@ -72,6 +72,9 @@ pub struct ResolveOptionsContext {
/// Plugins which get applied before and after resolving.
pub after_resolve_plugins: Vec<Vc<Box<dyn AfterResolvePlugin>>>,
pub before_resolve_plugins: Vec<Vc<Box<dyn BeforeResolvePlugin>>>,
/// Warn instead of error for resolve errors
pub loose_errors: bool,
#[serde(default)]
pub placeholder_for_future_extensions: (),
}
......
......@@ -456,7 +456,7 @@ pub async fn type_resolve(
origin.origin_path(),
request,
options,
IssueSeverity::Error.cell(),
false,
None,
)
.await
......
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