Unverified Commit 1754f90c authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: slightly fewer turbo tasks calls during resolving (#86542)

The difference is barely measureable though...
```
less tasks:
  Time (mean ± σ):      5.429 s ±  0.099 s    [User: 28.337 s, System: 3.512 s]
canary:
  Time (mean ± σ):      5.547 s ±  0.082 s    [User: 28.730 s, System: 3.480 s]
```
parent 7d1129e9
...@@ -4,6 +4,8 @@ use turbo_rcstr::RcStr; ...@@ -4,6 +4,8 @@ use turbo_rcstr::RcStr;
use turbo_tasks::Vc; use turbo_tasks::Vc;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::ModuleRule; use turbopack::module_options::ModuleRule;
#[allow(unused_imports)]
use turbopack_core::{context::AssetContext, resolve::origin::ResolveOrigin};
use crate::next_config::NextConfig; use crate::next_config::NextConfig;
...@@ -29,6 +31,36 @@ pub async fn get_swc_ecma_transform_plugin_rule( ...@@ -29,6 +31,36 @@ pub async fn get_swc_ecma_transform_plugin_rule(
} }
} }
/// A resolve origin without any asset_context, intended for handle_resolve_error
#[cfg(feature = "plugin")]
#[turbo_tasks::value]
pub struct DummyResolveOrigin {
origin_path: FileSystemPath,
}
#[cfg(feature = "plugin")]
#[turbo_tasks::value_impl]
impl DummyResolveOrigin {
#[turbo_tasks::function]
pub fn new(origin_path: FileSystemPath) -> Vc<Self> {
DummyResolveOrigin { origin_path }.cell()
}
}
#[cfg(feature = "plugin")]
#[turbo_tasks::value_impl]
impl ResolveOrigin for DummyResolveOrigin {
#[turbo_tasks::function]
fn origin_path(&self) -> Vc<FileSystemPath> {
self.origin_path.clone().cell()
}
#[turbo_tasks::function]
fn asset_context(&self) -> Result<Vc<Box<dyn AssetContext>>> {
anyhow::bail!("DummyResolveOrigin has no asset context");
}
}
#[cfg(feature = "plugin")] #[cfg(feature = "plugin")]
pub async fn get_swc_ecma_transform_rule_impl( pub async fn get_swc_ecma_transform_rule_impl(
project_path: FileSystemPath, project_path: FileSystemPath,
...@@ -82,7 +114,7 @@ pub async fn get_swc_ecma_transform_rule_impl( ...@@ -82,7 +114,7 @@ pub async fn get_swc_ecma_transform_rule_impl(
.as_raw_module_result(), .as_raw_module_result(),
ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined), ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined),
// TODO proper error location // TODO proper error location
project_path.clone(), Vc::upcast(DummyResolveOrigin::new(project_path.clone())),
request, request,
resolve_options, resolve_options,
false, false,
......
...@@ -39,7 +39,7 @@ use turbopack_core::{ ...@@ -39,7 +39,7 @@ use turbopack_core::{
output::{OutputAsset, OutputAssets, OutputAssetsWithReferenced}, output::{OutputAsset, OutputAssets, OutputAssetsWithReferenced},
reference_type::{EntryReferenceSubType, ReferenceType}, reference_type::{EntryReferenceSubType, ReferenceType},
resolve::{ resolve::{
origin::{PlainResolveOrigin, ResolveOriginExt}, origin::{PlainResolveOrigin, ResolveOrigin, ResolveOriginExt},
parse::Request, parse::Request,
}, },
}; };
...@@ -287,7 +287,7 @@ async fn build_internal( ...@@ -287,7 +287,7 @@ async fn build_internal(
let ty = ReferenceType::Entry(EntryReferenceSubType::Undefined); let ty = ReferenceType::Entry(EntryReferenceSubType::Undefined);
let request = request_vc.await?; let request = request_vc.await?;
origin origin
.resolve_asset(request_vc, origin.resolve_options(ty.clone()).await?, ty) .resolve_asset(request_vc, origin.resolve_options(ty.clone()), ty)
.await? .await?
.first_module() .first_module()
.await? .await?
......
...@@ -15,7 +15,7 @@ use turbopack_core::{ ...@@ -15,7 +15,7 @@ use turbopack_core::{
module_graph::{ModuleGraph, chunk_group_info::ChunkGroupEntry}, module_graph::{ModuleGraph, chunk_group_info::ChunkGroupEntry},
reference_type::{EntryReferenceSubType, ReferenceType}, reference_type::{EntryReferenceSubType, ReferenceType},
resolve::{ resolve::{
origin::{PlainResolveOrigin, ResolveOriginExt}, origin::{PlainResolveOrigin, ResolveOrigin, ResolveOriginExt},
parse::Request, parse::Request,
}, },
}; };
...@@ -139,7 +139,7 @@ pub async fn create_web_entry_source( ...@@ -139,7 +139,7 @@ pub async fn create_web_entry_source(
.map(|request| async move { .map(|request| async move {
let ty = ReferenceType::Entry(EntryReferenceSubType::Web); let ty = ReferenceType::Entry(EntryReferenceSubType::Web);
Ok(origin Ok(origin
.resolve_asset(request, origin.resolve_options(ty.clone()).await?, ty) .resolve_asset(request, origin.resolve_options(ty.clone()), ty)
.await? .await?
.resolve() .resolve()
.await? .await?
......
...@@ -4,8 +4,8 @@ use anyhow::Result; ...@@ -4,8 +4,8 @@ use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, FxIndexSet, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, ValueToString, Vc,
ValueToString, Vc, debug::ValueDebugFormat, trace::TraceRawVcs, debug::ValueDebugFormat, trace::TraceRawVcs,
}; };
use crate::{ use crate::{
...@@ -299,7 +299,7 @@ pub async fn primary_referenced_modules(module: Vc<Box<dyn Module>>) -> Result<V ...@@ -299,7 +299,7 @@ pub async fn primary_referenced_modules(module: Vc<Box<dyn Module>>) -> Result<V
pub struct ResolvedReference { pub struct ResolvedReference {
pub chunking_type: ChunkingType, pub chunking_type: ChunkingType,
pub binding_usage: BindingUsage, pub binding_usage: BindingUsage,
pub modules: ReadRef<Modules>, pub modules: Vec<ResolvedVc<Box<dyn Module>>>,
} }
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
...@@ -330,9 +330,8 @@ pub async fn primary_chunkable_referenced_modules( ...@@ -330,9 +330,8 @@ pub async fn primary_chunkable_referenced_modules(
let resolved = reference let resolved = reference
.resolve_reference() .resolve_reference()
.resolve()
.await? .await?
.primary_modules() .primary_modules_ref()
.await?; .await?;
let binding_usage = reference.binding_usage().owned().await?; let binding_usage = reference.binding_usage().owned().await?;
......
...@@ -24,7 +24,7 @@ use self::{ ...@@ -24,7 +24,7 @@ use self::{
ConditionValue, ImportMapResult, ResolveInPackage, ResolveIntoPackage, ResolveModules, ConditionValue, ImportMapResult, ResolveInPackage, ResolveIntoPackage, ResolveModules,
ResolveModulesOptions, ResolveOptions, resolve_modules_options, ResolveModulesOptions, ResolveOptions, resolve_modules_options,
}, },
origin::{ResolveOrigin, ResolveOriginExt}, origin::ResolveOrigin,
parse::Request, parse::Request,
pattern::Pattern, pattern::Pattern,
plugin::BeforeResolvePlugin, plugin::BeforeResolvePlugin,
...@@ -260,6 +260,17 @@ impl ModuleResolveResult { ...@@ -260,6 +260,17 @@ impl ModuleResolveResult {
}) })
} }
/// Returns a set (no duplicates) of primary modules in the result.
pub async fn primary_modules_ref(&self) -> Result<Vec<ResolvedVc<Box<dyn Module>>>> {
let mut set = FxIndexSet::default();
for (_, item) in self.primary.iter() {
if let Some(module) = item.as_module().await? {
set.insert(module);
}
}
Ok(set.into_iter().collect())
}
pub fn affecting_sources_iter(&self) -> impl Iterator<Item = ResolvedVc<Box<dyn Source>>> + '_ { pub fn affecting_sources_iter(&self) -> impl Iterator<Item = ResolvedVc<Box<dyn Source>>> + '_ {
self.affecting_sources.iter().copied() self.affecting_sources.iter().copied()
} }
...@@ -1609,10 +1620,11 @@ pub async fn url_resolve( ...@@ -1609,10 +1620,11 @@ pub async fn url_resolve(
issue_source: Option<IssueSource>, issue_source: Option<IssueSource>,
is_optional: bool, is_optional: bool,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
let resolve_options = origin.resolve_options(reference_type.clone()).await?; let resolve_options = origin.resolve_options(reference_type.clone());
let rel_request = request.as_relative(); let rel_request = request.as_relative();
let origin_path_parent = origin.origin_path().await?.parent();
let rel_result = resolve( let rel_result = resolve(
origin.origin_path().await?.parent(), origin_path_parent.clone(),
reference_type.clone(), reference_type.clone(),
rel_request, rel_request,
resolve_options, resolve_options,
...@@ -1620,7 +1632,7 @@ pub async fn url_resolve( ...@@ -1620,7 +1632,7 @@ pub async fn url_resolve(
let result = if *rel_result.is_unresolvable().await? && rel_request.resolve().await? != request let result = if *rel_result.is_unresolvable().await? && rel_request.resolve().await? != request
{ {
let result = resolve( let result = resolve(
origin.origin_path().await?.parent(), origin_path_parent,
reference_type.clone(), reference_type.clone(),
request, request,
resolve_options, resolve_options,
...@@ -1645,7 +1657,7 @@ pub async fn url_resolve( ...@@ -1645,7 +1657,7 @@ pub async fn url_resolve(
handle_resolve_error( handle_resolve_error(
result, result,
reference_type, reference_type,
origin.origin_path().owned().await?, origin,
request, request,
resolve_options, resolve_options,
is_optional, is_optional,
...@@ -3080,21 +3092,18 @@ async fn resolve_package_internal_with_imports_field( ...@@ -3080,21 +3092,18 @@ async fn resolve_package_internal_with_imports_field(
pub async fn handle_resolve_error( pub async fn handle_resolve_error(
result: Vc<ModuleResolveResult>, result: Vc<ModuleResolveResult>,
reference_type: ReferenceType, reference_type: ReferenceType,
origin_path: FileSystemPath, origin: Vc<Box<dyn ResolveOrigin>>,
request: Vc<Request>, request: Vc<Request>,
resolve_options: Vc<ResolveOptions>, resolve_options: Vc<ResolveOptions>,
is_optional: bool, is_optional: bool,
source: Option<IssueSource>, source: Option<IssueSource>,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
async fn is_unresolvable(result: Vc<ModuleResolveResult>) -> Result<bool> { Ok(match result.await {
Ok(*result.resolve().await?.is_unresolvable().await?) Ok(result_ref) => {
} if result_ref.is_unresolvable_ref() {
Ok(match is_unresolvable(result).await {
Ok(unresolvable) => {
if unresolvable {
emit_unresolvable_issue( emit_unresolvable_issue(
is_optional, is_optional,
origin_path, origin,
reference_type, reference_type,
request, request,
resolve_options, resolve_options,
...@@ -3108,7 +3117,7 @@ pub async fn handle_resolve_error( ...@@ -3108,7 +3117,7 @@ pub async fn handle_resolve_error(
Err(err) => { Err(err) => {
emit_resolve_error_issue( emit_resolve_error_issue(
is_optional, is_optional,
origin_path, origin,
reference_type, reference_type,
request, request,
resolve_options, resolve_options,
...@@ -3124,7 +3133,7 @@ pub async fn handle_resolve_error( ...@@ -3124,7 +3133,7 @@ pub async fn handle_resolve_error(
pub async fn handle_resolve_source_error( pub async fn handle_resolve_source_error(
result: Vc<ResolveResult>, result: Vc<ResolveResult>,
reference_type: ReferenceType, reference_type: ReferenceType,
origin_path: FileSystemPath, origin: Vc<Box<dyn ResolveOrigin>>,
request: Vc<Request>, request: Vc<Request>,
resolve_options: Vc<ResolveOptions>, resolve_options: Vc<ResolveOptions>,
is_optional: bool, is_optional: bool,
...@@ -3138,7 +3147,7 @@ pub async fn handle_resolve_source_error( ...@@ -3138,7 +3147,7 @@ pub async fn handle_resolve_source_error(
if unresolvable { if unresolvable {
emit_unresolvable_issue( emit_unresolvable_issue(
is_optional, is_optional,
origin_path, origin,
reference_type, reference_type,
request, request,
resolve_options, resolve_options,
...@@ -3152,7 +3161,7 @@ pub async fn handle_resolve_source_error( ...@@ -3152,7 +3161,7 @@ pub async fn handle_resolve_source_error(
Err(err) => { Err(err) => {
emit_resolve_error_issue( emit_resolve_error_issue(
is_optional, is_optional,
origin_path, origin,
reference_type, reference_type,
request, request,
resolve_options, resolve_options,
...@@ -3167,7 +3176,7 @@ pub async fn handle_resolve_source_error( ...@@ -3167,7 +3176,7 @@ pub async fn handle_resolve_source_error(
async fn emit_resolve_error_issue( async fn emit_resolve_error_issue(
is_optional: bool, is_optional: bool,
origin_path: FileSystemPath, origin: Vc<Box<dyn ResolveOrigin>>,
reference_type: ReferenceType, reference_type: ReferenceType,
request: Vc<Request>, request: Vc<Request>,
resolve_options: Vc<ResolveOptions>, resolve_options: Vc<ResolveOptions>,
...@@ -3181,7 +3190,7 @@ async fn emit_resolve_error_issue( ...@@ -3181,7 +3190,7 @@ async fn emit_resolve_error_issue(
}; };
ResolvingIssue { ResolvingIssue {
severity, severity,
file_path: origin_path.clone(), file_path: origin.origin_path().owned().await?,
request_type: format!("{reference_type} request"), request_type: format!("{reference_type} request"),
request: request.to_resolved().await?, request: request.to_resolved().await?,
resolve_options: resolve_options.to_resolved().await?, resolve_options: resolve_options.to_resolved().await?,
...@@ -3195,7 +3204,7 @@ async fn emit_resolve_error_issue( ...@@ -3195,7 +3204,7 @@ async fn emit_resolve_error_issue(
async fn emit_unresolvable_issue( async fn emit_unresolvable_issue(
is_optional: bool, is_optional: bool,
origin_path: FileSystemPath, origin: Vc<Box<dyn ResolveOrigin>>,
reference_type: ReferenceType, reference_type: ReferenceType,
request: Vc<Request>, request: Vc<Request>,
resolve_options: Vc<ResolveOptions>, resolve_options: Vc<ResolveOptions>,
...@@ -3208,7 +3217,7 @@ async fn emit_unresolvable_issue( ...@@ -3208,7 +3217,7 @@ async fn emit_unresolvable_issue(
}; };
ResolvingIssue { ResolvingIssue {
severity, severity,
file_path: origin_path.clone(), file_path: origin.origin_path().owned().await?,
request_type: format!("{reference_type} request"), request_type: format!("{reference_type} request"),
request: request.to_resolved().await?, request: request.to_resolved().await?,
resolve_options: resolve_options.to_resolved().await?, resolve_options: resolve_options.to_resolved().await?,
......
...@@ -31,6 +31,17 @@ pub trait ResolveOrigin { ...@@ -31,6 +31,17 @@ pub trait ResolveOrigin {
let _ = request; let _ = request;
Vc::cell(None) Vc::cell(None)
} }
/// Get the resolve options that apply for this origin.
#[turbo_tasks::function]
async fn resolve_options(
self: Vc<Self>,
reference_type: ReferenceType,
) -> Result<Vc<ResolveOptions>> {
Ok(self
.asset_context()
.resolve_options(self.origin_path().owned().await?, reference_type))
}
} }
// TODO it would be nice if these methods can be moved to the trait to allow // TODO it would be nice if these methods can be moved to the trait to allow
...@@ -46,12 +57,6 @@ pub trait ResolveOriginExt: Send { ...@@ -46,12 +57,6 @@ pub trait ResolveOriginExt: Send {
reference_type: ReferenceType, reference_type: ReferenceType,
) -> impl Future<Output = Result<Vc<ModuleResolveResult>>> + Send; ) -> impl Future<Output = Result<Vc<ModuleResolveResult>>> + Send;
/// Get the resolve options that apply for this origin.
fn resolve_options(
self: Vc<Self>,
reference_type: ReferenceType,
) -> impl std::future::Future<Output = Result<Vc<ResolveOptions>>> + Send;
/// Adds a transition that is used for resolved assets. /// Adds a transition that is used for resolved assets.
fn with_transition(self: ResolvedVc<Self>, transition: RcStr) -> Vc<Box<dyn ResolveOrigin>>; fn with_transition(self: ResolvedVc<Self>, transition: RcStr) -> Vc<Box<dyn ResolveOrigin>>;
} }
...@@ -74,15 +79,6 @@ where ...@@ -74,15 +79,6 @@ where
) )
} }
async fn resolve_options(
self: Vc<Self>,
reference_type: ReferenceType,
) -> Result<Vc<ResolveOptions>> {
Ok(self
.asset_context()
.resolve_options(self.origin_path().owned().await?, reference_type))
}
fn with_transition(self: ResolvedVc<Self>, transition: RcStr) -> Vc<Box<dyn ResolveOrigin>> { fn with_transition(self: ResolvedVc<Self>, transition: RcStr) -> Vc<Box<dyn ResolveOrigin>> {
Vc::upcast( Vc::upcast(
ResolveOriginWithTransition { ResolveOriginWithTransition {
......
...@@ -37,7 +37,7 @@ use turbopack_resolve::ecmascript::esm_resolve; ...@@ -37,7 +37,7 @@ use turbopack_resolve::ecmascript::esm_resolve;
use super::export::{all_known_export_names, is_export_missing}; use super::export::{all_known_export_names, is_export_missing};
use crate::{ use crate::{
ScopeHoistingContext, TreeShakingMode, EcmascriptModuleAsset, ScopeHoistingContext, TreeShakingMode,
analyzer::imports::ImportAnnotations, analyzer::imports::ImportAnnotations,
chunk::{EcmascriptChunkPlaceable, EcmascriptExports}, chunk::{EcmascriptChunkPlaceable, EcmascriptExports},
code_gen::{CodeGeneration, CodeGenerationHoistedStmt}, code_gen::{CodeGeneration, CodeGenerationHoistedStmt},
...@@ -319,6 +319,7 @@ impl EsmAssetReferences { ...@@ -319,6 +319,7 @@ impl EsmAssetReferences {
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
#[derive(Hash, Debug)] #[derive(Hash, Debug)]
pub struct EsmAssetReference { pub struct EsmAssetReference {
pub module: ResolvedVc<EcmascriptModuleAsset>,
pub origin: ResolvedVc<Box<dyn ResolveOrigin>>, pub origin: ResolvedVc<Box<dyn ResolveOrigin>>,
// Request is a string to avoid eagerly parsing into a `Request` VC // Request is a string to avoid eagerly parsing into a `Request` VC
pub request: RcStr, pub request: RcStr,
...@@ -327,6 +328,7 @@ pub struct EsmAssetReference { ...@@ -327,6 +328,7 @@ pub struct EsmAssetReference {
pub export_name: Option<ModulePart>, pub export_name: Option<ModulePart>,
pub import_usage: ImportUsage, pub import_usage: ImportUsage,
pub import_externals: bool, pub import_externals: bool,
pub tree_shaking_mode: Option<TreeShakingMode>,
pub is_pure_import: bool, pub is_pure_import: bool,
} }
...@@ -342,6 +344,7 @@ impl EsmAssetReference { ...@@ -342,6 +344,7 @@ impl EsmAssetReference {
impl EsmAssetReference { impl EsmAssetReference {
pub fn new( pub fn new(
module: ResolvedVc<EcmascriptModuleAsset>,
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: RcStr, request: RcStr,
issue_source: IssueSource, issue_source: IssueSource,
...@@ -349,8 +352,10 @@ impl EsmAssetReference { ...@@ -349,8 +352,10 @@ impl EsmAssetReference {
export_name: Option<ModulePart>, export_name: Option<ModulePart>,
import_usage: ImportUsage, import_usage: ImportUsage,
import_externals: bool, import_externals: bool,
tree_shaking_mode: Option<TreeShakingMode>,
) -> Self { ) -> Self {
EsmAssetReference { EsmAssetReference {
module,
origin, origin,
request, request,
issue_source, issue_source,
...@@ -358,11 +363,13 @@ impl EsmAssetReference { ...@@ -358,11 +363,13 @@ impl EsmAssetReference {
export_name, export_name,
import_usage, import_usage,
import_externals, import_externals,
tree_shaking_mode,
is_pure_import: false, is_pure_import: false,
} }
} }
pub fn new_pure( pub fn new_pure(
module: ResolvedVc<EcmascriptModuleAsset>,
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: RcStr, request: RcStr,
issue_source: IssueSource, issue_source: IssueSource,
...@@ -370,8 +377,10 @@ impl EsmAssetReference { ...@@ -370,8 +377,10 @@ impl EsmAssetReference {
export_name: Option<ModulePart>, export_name: Option<ModulePart>,
import_usage: ImportUsage, import_usage: ImportUsage,
import_externals: bool, import_externals: bool,
tree_shaking_mode: Option<TreeShakingMode>,
) -> Self { ) -> Self {
EsmAssetReference { EsmAssetReference {
module,
origin, origin,
request, request,
issue_source, issue_source,
...@@ -379,6 +388,7 @@ impl EsmAssetReference { ...@@ -379,6 +388,7 @@ impl EsmAssetReference {
export_name, export_name,
import_usage, import_usage,
import_externals, import_externals,
tree_shaking_mode,
is_pure_import: true, is_pure_import: true,
} }
} }
...@@ -406,17 +416,15 @@ impl ModuleReference for EsmAssetReference { ...@@ -406,17 +416,15 @@ impl ModuleReference for EsmAssetReference {
EcmaScriptModulesReferenceSubType::Import EcmaScriptModulesReferenceSubType::Import
}; };
if let Some(ModulePart::Evaluation) = &self.export_name { let request = Request::parse(self.request.clone().into());
let module: ResolvedVc<crate::EcmascriptModuleAsset> =
ResolvedVc::try_downcast_type(self.origin)
.expect("EsmAssetReference origin should be a EcmascriptModuleAsset");
let tree_shaking_mode = module.options().await?.tree_shaking_mode;
if let Some(TreeShakingMode::ModuleFragments) = tree_shaking_mode { if let Some(TreeShakingMode::ModuleFragments) = self.tree_shaking_mode {
let side_effect_free_packages = module.asset_context().side_effect_free_packages(); if let Some(ModulePart::Evaluation) = &self.export_name {
let side_effect_free_packages =
self.module.asset_context().side_effect_free_packages();
if *module if *self
.module
.is_marked_as_side_effect_free(side_effect_free_packages) .is_marked_as_side_effect_free(side_effect_free_packages)
.await? .await?
{ {
...@@ -430,29 +438,23 @@ impl ModuleReference for EsmAssetReference { ...@@ -430,29 +438,23 @@ impl ModuleReference for EsmAssetReference {
.cell()); .cell());
} }
} }
}
let request = Request::parse(self.request.clone().into());
if let Request::Module { module, .. } = &*request.await? if let Request::Module { module, .. } = &*request.await?
&& module.is_match(TURBOPACK_PART_IMPORT_SOURCE) && module.is_match(TURBOPACK_PART_IMPORT_SOURCE)
{ {
if let Some(part) = &self.export_name { if let Some(part) = &self.export_name {
let module: ResolvedVc<crate::EcmascriptModuleAsset> =
ResolvedVc::try_downcast_type(self.origin)
.expect("EsmAssetReference origin should be a EcmascriptModuleAsset");
return Ok(*ModuleResolveResult::module(ResolvedVc::upcast( return Ok(*ModuleResolveResult::module(ResolvedVc::upcast(
EcmascriptModulePartAsset::select_part(*module, part.clone()) EcmascriptModulePartAsset::select_part(*self.module, part.clone())
.to_resolved() .to_resolved()
.await?, .await?,
))); )));
} }
bail!("export_name is required for part import") bail!("export_name is required for part import")
} }
}
let result = esm_resolve( let result = esm_resolve(
self.get_origin().resolve().await?, self.get_origin(),
request, request,
ty, ty,
false, false,
......
...@@ -324,7 +324,7 @@ impl Module for CachedExternalModule { ...@@ -324,7 +324,7 @@ impl Module for CachedExternalModule {
origin origin
.resolve_asset( .resolve_asset(
Request::parse_string(self.request.clone()), Request::parse_string(self.request.clone()),
origin.resolve_options(ReferenceType::Undefined).await?, origin.resolve_options(ReferenceType::Undefined),
ReferenceType::Undefined, ReferenceType::Undefined,
) )
.await? .await?
......
...@@ -80,7 +80,7 @@ use turbopack_core::{ ...@@ -80,7 +80,7 @@ use turbopack_core::{
reference_type::{CommonJsReferenceSubType, ReferenceType}, reference_type::{CommonJsReferenceSubType, ReferenceType},
resolve::{ resolve::{
FindContextFileResult, ImportUsage, ModulePart, find_context_file, FindContextFileResult, ImportUsage, ModulePart, find_context_file,
origin::{PlainResolveOrigin, ResolveOrigin, ResolveOriginExt}, origin::{PlainResolveOrigin, ResolveOrigin},
parse::Request, parse::Request,
pattern::Pattern, pattern::Pattern,
resolve, resolve,
...@@ -459,6 +459,7 @@ impl AnalyzeEcmascriptModuleResultBuilder { ...@@ -459,6 +459,7 @@ impl AnalyzeEcmascriptModuleResultBuilder {
struct AnalysisState<'a> { struct AnalysisState<'a> {
handler: &'a Handler, handler: &'a Handler,
module: ResolvedVc<EcmascriptModuleAsset>,
source: ResolvedVc<Box<dyn Source>>, source: ResolvedVc<Box<dyn Source>>,
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
compile_time_info: ResolvedVc<CompileTimeInfo>, compile_time_info: ResolvedVc<CompileTimeInfo>,
...@@ -796,7 +797,8 @@ async fn analyze_ecmascript_module_internal( ...@@ -796,7 +797,8 @@ async fn analyze_ecmascript_module_internal(
for (i, r) in eval_context.imports.references().enumerate() { for (i, r) in eval_context.imports.references().enumerate() {
let mut should_add_evaluation = false; let mut should_add_evaluation = false;
let reference = EsmAssetReference::new( let reference = EsmAssetReference::new(
origin, module,
ResolvedVc::upcast(module),
RcStr::from(&*r.module_path.to_string_lossy()), RcStr::from(&*r.module_path.to_string_lossy()),
r.issue_source r.issue_source
.unwrap_or_else(|| IssueSource::from_source_only(source)), .unwrap_or_else(|| IssueSource::from_source_only(source)),
...@@ -832,6 +834,7 @@ async fn analyze_ecmascript_module_internal( ...@@ -832,6 +834,7 @@ async fn analyze_ecmascript_module_internal(
}, },
import_usage.get(&i).cloned().unwrap_or_default(), import_usage.get(&i).cloned().unwrap_or_default(),
import_externals, import_externals,
options.tree_shaking_mode,
) )
.resolved_cell(); .resolved_cell();
...@@ -1056,6 +1059,7 @@ async fn analyze_ecmascript_module_internal( ...@@ -1056,6 +1059,7 @@ async fn analyze_ecmascript_module_internal(
let mut analysis_state = AnalysisState { let mut analysis_state = AnalysisState {
handler: &handler, handler: &handler,
module,
source, source,
origin, origin,
compile_time_info, compile_time_info,
...@@ -1477,6 +1481,7 @@ async fn analyze_ecmascript_module_internal( ...@@ -1477,6 +1481,7 @@ async fn analyze_ecmascript_module_internal(
export.clone(), export.clone(),
|| { || {
EsmAssetReference::new( EsmAssetReference::new(
original_reference.module,
original_reference.origin, original_reference.origin,
original_reference.request.clone(), original_reference.request.clone(),
original_reference.issue_source, original_reference.issue_source,
...@@ -1488,6 +1493,7 @@ async fn analyze_ecmascript_module_internal( ...@@ -1488,6 +1493,7 @@ async fn analyze_ecmascript_module_internal(
// logic earlier (see TODO above) // logic earlier (see TODO above)
original_reference.import_usage.clone(), original_reference.import_usage.clone(),
original_reference.import_externals, original_reference.import_externals,
original_reference.tree_shaking_mode,
) )
.resolved_cell() .resolved_cell()
}, },
...@@ -2902,6 +2908,7 @@ async fn handle_free_var_reference( ...@@ -2902,6 +2908,7 @@ async fn handle_free_var_reference(
// import again if the variable reference turns out be dead code in some later // import again if the variable reference turns out be dead code in some later
// stage of the build, thus mark the import call as /*@__PURE__*/. // stage of the build, thus mark the import call as /*@__PURE__*/.
Ok(EsmAssetReference::new_pure( Ok(EsmAssetReference::new_pure(
state.module,
if let Some(lookup_path) = lookup_path { if let Some(lookup_path) = lookup_path {
ResolvedVc::upcast( ResolvedVc::upcast(
PlainResolveOrigin::new( PlainResolveOrigin::new(
...@@ -2929,6 +2936,7 @@ async fn handle_free_var_reference( ...@@ -2929,6 +2936,7 @@ async fn handle_free_var_reference(
}, },
ImportUsage::SideEffects, ImportUsage::SideEffects,
state.import_externals, state.import_externals,
state.tree_shaking_mode,
) )
.resolved_cell()) .resolved_cell())
}) })
...@@ -3906,7 +3914,7 @@ async fn resolve_as_webpack_runtime( ...@@ -3906,7 +3914,7 @@ async fn resolve_as_webpack_runtime(
transforms: Vc<EcmascriptInputTransforms>, transforms: Vc<EcmascriptInputTransforms>,
) -> Result<Vc<WebpackRuntime>> { ) -> Result<Vc<WebpackRuntime>> {
let ty = ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined); let ty = ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined);
let options = origin.resolve_options(ty.clone()).await?; let options = origin.resolve_options(ty.clone());
let options = apply_cjs_specific_options(options); let options = apply_cjs_specific_options(options);
......
...@@ -10,11 +10,7 @@ use turbopack_core::{ ...@@ -10,11 +10,7 @@ use turbopack_core::{
raw_module::RawModule, raw_module::RawModule,
reference::{ModuleReference, ModuleReferences}, reference::{ModuleReference, ModuleReferences},
reference_type::{CommonJsReferenceSubType, ReferenceType}, reference_type::{CommonJsReferenceSubType, ReferenceType},
resolve::{ resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request},
ModuleResolveResult,
origin::{ResolveOrigin, ResolveOriginExt},
parse::Request,
},
source::Source, source::Source,
}; };
// TODO remove this // TODO remove this
...@@ -61,8 +57,7 @@ impl Module for TsConfigModuleAsset { ...@@ -61,8 +57,7 @@ impl Module for TsConfigModuleAsset {
self.source, self.source,
apply_cjs_specific_options( apply_cjs_specific_options(
self.origin self.origin
.resolve_options(ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined)) .resolve_options(ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined)),
.await?,
), ),
) )
.await?; .await?;
......
...@@ -10,9 +10,7 @@ use turbopack_core::{ ...@@ -10,9 +10,7 @@ use turbopack_core::{
reference::{ModuleReference, ModuleReferences}, reference::{ModuleReference, ModuleReferences},
reference_type::{CommonJsReferenceSubType, ReferenceType}, reference_type::{CommonJsReferenceSubType, ReferenceType},
resolve::{ resolve::{
ModuleResolveResult, ModuleResolveResultItem, ModuleResolveResult, ModuleResolveResultItem, origin::ResolveOrigin, parse::Request,
origin::{ResolveOrigin, ResolveOriginExt},
parse::Request,
resolve, resolve,
}, },
source::Source, source::Source,
...@@ -165,7 +163,7 @@ impl ModuleReference for WebpackRuntimeAssetReference { ...@@ -165,7 +163,7 @@ impl ModuleReference for WebpackRuntimeAssetReference {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn resolve_reference(&self) -> Result<Vc<ModuleResolveResult>> { async fn resolve_reference(&self) -> Result<Vc<ModuleResolveResult>> {
let ty = ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined); let ty = ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined);
let options = self.origin.resolve_options(ty.clone()).await?; let options = self.origin.resolve_options(ty.clone());
let options = apply_cjs_specific_options(options); let options = apply_cjs_specific_options(options);
......
...@@ -44,7 +44,7 @@ pub fn get_condition_maps( ...@@ -44,7 +44,7 @@ pub fn get_condition_maps(
pub fn apply_esm_specific_options( pub fn apply_esm_specific_options(
options: Vc<ResolveOptions>, options: Vc<ResolveOptions>,
reference_type: ReferenceType, reference_type: &ReferenceType,
) -> Vc<ResolveOptions> { ) -> Vc<ResolveOptions> {
let clear_extensions = matches!( let clear_extensions = matches!(
reference_type, reference_type,
...@@ -94,7 +94,7 @@ pub async fn esm_resolve( ...@@ -94,7 +94,7 @@ pub async fn esm_resolve(
issue_source: Option<IssueSource>, issue_source: Option<IssueSource>,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
let ty = ReferenceType::EcmaScriptModules(ty); let ty = ReferenceType::EcmaScriptModules(ty);
let options = apply_esm_specific_options(origin.resolve_options(ty.clone()).await?, ty.clone()) let options = apply_esm_specific_options(origin.resolve_options(ty.clone()), &ty)
.resolve() .resolve()
.await?; .await?;
specific_resolve(origin, request, options, ty, is_optional, issue_source).await specific_resolve(origin, request, options, ty, is_optional, issue_source).await
...@@ -109,7 +109,7 @@ pub async fn cjs_resolve( ...@@ -109,7 +109,7 @@ pub async fn cjs_resolve(
is_optional: bool, is_optional: bool,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
let ty = ReferenceType::CommonJs(ty); let ty = ReferenceType::CommonJs(ty);
let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()).await?) let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()))
.resolve() .resolve()
.await?; .await?;
specific_resolve(origin, request, options, ty, is_optional, issue_source).await specific_resolve(origin, request, options, ty, is_optional, issue_source).await
...@@ -124,7 +124,7 @@ pub async fn cjs_resolve_source( ...@@ -124,7 +124,7 @@ pub async fn cjs_resolve_source(
is_optional: bool, is_optional: bool,
) -> Result<Vc<ResolveResult>> { ) -> Result<Vc<ResolveResult>> {
let ty = ReferenceType::CommonJs(ty); let ty = ReferenceType::CommonJs(ty);
let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()).await?) let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()))
.resolve() .resolve()
.await?; .await?;
let result = resolve( let result = resolve(
...@@ -137,7 +137,7 @@ pub async fn cjs_resolve_source( ...@@ -137,7 +137,7 @@ pub async fn cjs_resolve_source(
handle_resolve_source_error( handle_resolve_source_error(
result, result,
ty, ty,
origin.origin_path().owned().await?, *origin,
*request, *request,
options, options,
is_optional, is_optional,
...@@ -161,7 +161,7 @@ async fn specific_resolve( ...@@ -161,7 +161,7 @@ async fn specific_resolve(
handle_resolve_error( handle_resolve_error(
result, result,
reference_type, reference_type,
origin.origin_path().owned().await?, origin,
request, request,
options, options,
is_optional, is_optional,
......
...@@ -21,7 +21,7 @@ use turbopack_core::{ ...@@ -21,7 +21,7 @@ use turbopack_core::{
ConditionValue, ImportMap, ImportMapping, ResolveIntoPackage, ResolveModules, ConditionValue, ImportMap, ImportMapping, ResolveIntoPackage, ResolveModules,
ResolveOptions, ResolveOptions,
}, },
origin::{ResolveOrigin, ResolveOriginExt}, origin::ResolveOrigin,
parse::Request, parse::Request,
pattern::Pattern, pattern::Pattern,
resolve, resolve,
...@@ -417,7 +417,7 @@ pub async fn type_resolve( ...@@ -417,7 +417,7 @@ pub async fn type_resolve(
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
let ty = ReferenceType::TypeScript(TypeScriptReferenceSubType::Undefined); let ty = ReferenceType::TypeScript(TypeScriptReferenceSubType::Undefined);
let context_path = origin.origin_path().await?.parent(); let context_path = origin.origin_path().await?.parent();
let options = origin.resolve_options(ty.clone()).await?; let options = origin.resolve_options(ty.clone());
let options = apply_typescript_types_options(options); let options = apply_typescript_types_options(options);
let types_request = if let Request::Module { let types_request = if let Request::Module {
module: m, module: m,
...@@ -472,16 +472,7 @@ pub async fn type_resolve( ...@@ -472,16 +472,7 @@ pub async fn type_resolve(
.asset_context() .asset_context()
.process_resolve_result(result, ty.clone()), .process_resolve_result(result, ty.clone()),
); );
handle_resolve_error( handle_resolve_error(result, ty, origin, request, options, false, None).await
result,
ty,
origin.origin_path().owned().await?,
request,
options,
false,
None,
)
.await
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
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