Commit d35a6b6b authored by Luke Sandberg's avatar Luke Sandberg

don't collect request keys its dumb

parent f65b10a5
...@@ -650,6 +650,10 @@ pub struct ResolveOptions { ...@@ -650,6 +650,10 @@ pub struct ResolveOptions {
pub loose_errors: bool, pub loose_errors: bool,
/// Collect affecting sources for each resolve result. Useful for tracing. /// Collect affecting sources for each resolve result. Useful for tracing.
pub collect_affecting_sources: bool, pub collect_affecting_sources: bool,
/// When true, skip collecting request keys in resolve results. Request keys are needed for
/// dynamic pattern mapping and key-rewriting transforms; callers that only need the resolved
/// sources/modules (e.g. raw file references) can set this to true to avoid the allocation.
pub skip_request_keys: bool,
/// Whether to parse data URIs into modules (as opposed to keeping them as externals) /// Whether to parse data URIs into modules (as opposed to keeping them as externals)
pub parse_data_uris: bool, pub parse_data_uris: bool,
......
...@@ -287,8 +287,8 @@ impl ReferencedAsset { ...@@ -287,8 +287,8 @@ impl ReferencedAsset {
if result.is_unresolvable_ref() { if result.is_unresolvable_ref() {
return Ok(ReferencedAsset::Unresolvable.cell()); return Ok(ReferencedAsset::Unresolvable.cell());
} }
for (_, result) in result.primary.iter() { for item in result.iter_primary_values() {
match result { match item {
ModuleResolveResultItem::External { ModuleResolveResultItem::External {
name: request, ty, .. name: request, ty, ..
} => { } => {
...@@ -457,7 +457,8 @@ impl ModuleReference for EsmAssetReference { ...@@ -457,7 +457,8 @@ impl ModuleReference for EsmAssetReference {
&& *self.module.side_effects().await? == ModuleSideEffects::SideEffectFree && *self.module.side_effects().await? == ModuleSideEffects::SideEffectFree
{ {
return Ok(ModuleResolveResult { return Ok(ModuleResolveResult {
primary: Box::new([(RequestKey::default(), ModuleResolveResultItem::Ignore)]), primary_keys: Box::new([RequestKey::default()]),
primary_values: Box::new([ModuleResolveResultItem::Ignore]),
affecting_sources: Default::default(), affecting_sources: Default::default(),
} }
.cell()); .cell());
......
...@@ -401,25 +401,28 @@ impl PatternMapping { ...@@ -401,25 +401,28 @@ impl PatternMapping {
resolve_type: ResolveType, resolve_type: ResolveType,
) -> Result<Vc<PatternMapping>> { ) -> Result<Vc<PatternMapping>> {
let result = resolve_result.await?; let result = resolve_result.await?;
match result.primary.len() { match result.primary_len() {
0 => Ok(PatternMapping::Single(SinglePatternMapping::Unresolvable( 0 => Ok(PatternMapping::Single(SinglePatternMapping::Unresolvable(
request_to_string(request).await?.to_string(), request_to_string(request).await?.to_string(),
)) ))
.cell()), .cell()),
1 if !request.request_pattern().await?.has_dynamic_parts() => { 1 if !request.request_pattern().await?.has_dynamic_parts() => {
let resolve_item = &result.primary.first().unwrap().1; let resolve_item = result.primary_values.first().unwrap();
let single_pattern_mapping = let single_pattern_mapping =
to_single_pattern_mapping(origin, chunking_context, resolve_item, resolve_type) to_single_pattern_mapping(origin, chunking_context, resolve_item, resolve_type)
.await?; .await?;
Ok(PatternMapping::Single(single_pattern_mapping).cell()) Ok(PatternMapping::Single(single_pattern_mapping).cell())
} }
_ => { _ => {
debug_assert!(
result.has_keys(),
"PatternMapping::Map requires request keys to be collected"
);
let mut set = HashSet::new(); let mut set = HashSet::new();
let map = result let map = result
.primary .iter_primary()
.iter()
.filter_map(|(k, v)| { .filter_map(|(k, v)| {
let request = k.request.as_ref()?; let request = k?.request.as_ref()?;
set.insert(request).then(|| (request.to_string(), v)) set.insert(request).then(|| (request.to_string(), v))
}) })
.map(|(k, v)| async move { .map(|(k, v)| async move {
......
...@@ -12,7 +12,7 @@ use turbopack_core::{ ...@@ -12,7 +12,7 @@ use turbopack_core::{
resolve::{ resolve::{
ModuleResolveResult, RequestKey, ModuleResolveResult, RequestKey,
pattern::{Pattern, PatternMatch, read_matches}, pattern::{Pattern, PatternMatch, read_matches},
resolve_raw, resolve_raw_without_keys,
}, },
}; };
...@@ -55,7 +55,7 @@ impl ModuleReference for FileSourceReference { ...@@ -55,7 +55,7 @@ impl ModuleReference for FileSourceReference {
pattern = display(self.path.to_string().await?) pattern = display(self.path.to_string().await?)
); );
async { async {
let result = resolve_raw( let result = resolve_raw_without_keys(
self.context_dir.clone(), self.context_dir.clone(),
*self.path, *self.path,
self.collect_affecting_sources, self.collect_affecting_sources,
......
...@@ -76,7 +76,7 @@ pub async fn check_and_emit_too_many_matches_warning( ...@@ -76,7 +76,7 @@ pub async fn check_and_emit_too_many_matches_warning(
context_dir: FileSystemPath, context_dir: FileSystemPath,
pattern: ResolvedVc<Pattern>, pattern: ResolvedVc<Pattern>,
) -> Result<()> { ) -> Result<()> {
let num_matches = result.await?.primary.len(); let num_matches = result.await?.primary_len();
if num_matches > TOO_MANY_MATCHES_LIMIT { if num_matches > TOO_MANY_MATCHES_LIMIT {
TooManyMatchesWarning { TooManyMatchesWarning {
source: issue_source, source: issue_source,
......
...@@ -19,7 +19,7 @@ use turbopack_core::{ ...@@ -19,7 +19,7 @@ use turbopack_core::{
reference::ModuleReference, reference::ModuleReference,
reference_type::{ReferenceType, WorkerReferenceSubType}, reference_type::{ReferenceType, WorkerReferenceSubType},
resolve::{ resolve::{
ModuleResolveResult, ModuleResolveResultItem, ResolveErrorMode, ModuleResolveResult, ModuleResolveResultItem, RequestKey, ResolveErrorMode,
error::handle_resolve_error, origin::ResolveOrigin, parse::Request, pattern::Pattern, error::handle_resolve_error, origin::ResolveOrigin, parse::Request, pattern::Pattern,
resolve_raw, url_resolve, resolve_raw, url_resolve,
}, },
...@@ -173,9 +173,11 @@ impl ModuleReference for WorkerAssetReference { ...@@ -173,9 +173,11 @@ impl ModuleReference for WorkerAssetReference {
// Wrap each resolved module in a WorkerLoaderModule // Wrap each resolved module in a WorkerLoaderModule
let result_ref = result.await?; let result_ref = result.await?;
let mut primary = Vec::with_capacity(result_ref.primary.len()); let mut primary: Vec<(RequestKey, ModuleResolveResultItem)> =
Vec::with_capacity(result_ref.primary_len());
for (request_key, resolve_item) in result_ref.primary.iter() { for (request_key, resolve_item) in result_ref.iter_primary() {
let request_key = request_key.cloned().unwrap_or_default();
match resolve_item { match resolve_item {
ModuleResolveResultItem::Module(module) => { ModuleResolveResultItem::Module(module) => {
let Some(chunkable) = let Some(chunkable) =
...@@ -238,22 +240,18 @@ impl ModuleReference for WorkerAssetReference { ...@@ -238,22 +240,18 @@ impl ModuleReference for WorkerAssetReference {
.await?; .await?;
primary.push(( primary.push((
request_key.clone(), request_key,
ModuleResolveResultItem::Module(ResolvedVc::upcast(loader)), ModuleResolveResultItem::Module(ResolvedVc::upcast(loader)),
)); ));
} }
// Pass through other result types (External, Ignore, etc.) // Pass through other result types (External, Ignore, etc.)
_ => { _ => {
primary.push((request_key.clone(), resolve_item.clone())); primary.push((request_key, resolve_item.clone()));
} }
} }
} }
Ok(ModuleResolveResult { Ok(ModuleResolveResult::from_keyed(primary, result_ref.affecting_sources.clone()).cell())
primary: primary.into_boxed_slice(),
affecting_sources: result_ref.affecting_sources.clone(),
}
.cell())
} }
fn chunking_type(&self) -> Option<ChunkingType> { fn chunking_type(&self) -> Option<ChunkingType> {
......
...@@ -294,8 +294,8 @@ async fn resolve_node_gyp_build_files( ...@@ -294,8 +294,8 @@ async fn resolve_node_gyp_build_files(
true, true,
) )
.await?; .await?;
if let Some((_, ResolveResultItem::Source(source))) = if let Some(ResolveResultItem::Source(source)) =
resolved_prebuilt_file.primary.first() resolved_prebuilt_file.primary_values.first()
{ {
resolved.insert(format!("build/Release/{name}.node").into(), *source); resolved.insert(format!("build/Release/{name}.node").into(), *source);
if collect_affecting_sources { if collect_affecting_sources {
......
...@@ -465,17 +465,14 @@ pub async fn type_resolve( ...@@ -465,17 +465,14 @@ pub async fn type_resolve(
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn as_typings_result(result: Vc<ModuleResolveResult>) -> Result<Vc<ModuleResolveResult>> { pub async fn as_typings_result(result: Vc<ModuleResolveResult>) -> Result<Vc<ModuleResolveResult>> {
let mut result = result.owned().await?; let mut result = result.owned().await?;
result.primary = IntoIterator::into_iter(take(&mut result.primary)) if result.has_keys() {
.map(|(k, v)| { result.primary_keys = IntoIterator::into_iter(take(&mut result.primary_keys))
( .map(|k| RequestKey {
RequestKey { request: k.request.clone(),
request: k.request.clone(), conditions: k.conditions.extend([(rcstr!("types"), true)]),
conditions: k.conditions.extend([(rcstr!("types"), true)]), })
}, .collect();
v, }
)
})
.collect();
Ok(result.cell()) Ok(result.cell())
} }
......
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