Unverified Commit 043dbc85 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

[Turbopack] HMR invalidation improvements (#70494)

### What?

* round chunk item sizes to cause less changes to chunking
* pick individual values from compile time info to avoid invalidating on
change
* pick next config keys for more granular caching
* split completions into a tree

---------
Co-authored-by: 's avatarNiklas Mischkulnig <4586894+mischnic@users.noreply.github.com>
parent 1d1b846a
...@@ -29,9 +29,9 @@ pub async fn get_next_client_transforms_rules( ...@@ -29,9 +29,9 @@ pub async fn get_next_client_transforms_rules(
) -> Result<Vec<ModuleRule>> { ) -> Result<Vec<ModuleRule>> {
let mut rules = vec![]; let mut rules = vec![];
let modularize_imports_config = &next_config.await?.modularize_imports; let modularize_imports_config = &next_config.modularize_imports().await?;
let enable_mdx_rs = next_config.mdx_rs().await?.is_some(); let enable_mdx_rs = next_config.mdx_rs().await?.is_some();
if let Some(modularize_imports_config) = modularize_imports_config { if !modularize_imports_config.is_empty() {
rules.push(get_next_modularize_imports_rule( rules.push(get_next_modularize_imports_rule(
modularize_imports_config, modularize_imports_config,
enable_mdx_rs, enable_mdx_rs,
......
...@@ -36,6 +36,9 @@ struct CustomRoutes { ...@@ -36,6 +36,9 @@ struct CustomRoutes {
rewrites: Vc<Rewrites>, rewrites: Vc<Rewrites>,
} }
#[turbo_tasks::value(transparent)]
pub struct ModularizeImports(IndexMap<String, ModularizeImportPackageConfig>);
#[turbo_tasks::value(serialization = "custom", eq = "manual")] #[turbo_tasks::value(serialization = "custom", eq = "manual")]
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
...@@ -481,7 +484,8 @@ pub enum ReactCompilerOptionsOrBoolean { ...@@ -481,7 +484,8 @@ pub enum ReactCompilerOptionsOrBoolean {
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
pub struct OptionalReactCompilerOptions(Option<Vc<ReactCompilerOptions>>); pub struct OptionalReactCompilerOptions(Option<Vc<ReactCompilerOptions>>);
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[turbo_tasks::value(eq = "manual")]
#[derive(Clone, Debug, Default, PartialEq)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct ExperimentalConfig { pub struct ExperimentalConfig {
pub allowed_revalidate_header_keys: Option<Vec<RcStr>>, pub allowed_revalidate_header_keys: Option<Vec<RcStr>>,
...@@ -723,7 +727,8 @@ impl StyledComponentsTransformOptionsOrBoolean { ...@@ -723,7 +727,8 @@ impl StyledComponentsTransformOptionsOrBoolean {
} }
} }
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[turbo_tasks::value(eq = "manual")]
#[derive(Clone, Debug, PartialEq, Default)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct CompilerConfig { pub struct CompilerConfig {
pub react_remove_properties: Option<ReactRemoveProperties>, pub react_remove_properties: Option<ReactRemoveProperties>,
...@@ -801,6 +806,11 @@ impl NextConfig { ...@@ -801,6 +806,11 @@ impl NextConfig {
) )
} }
#[turbo_tasks::function]
pub fn compiler(&self) -> Vc<CompilerConfig> {
self.compiler.clone().unwrap_or_default().cell()
}
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn env(&self) -> Vc<EnvMap> { pub fn env(&self) -> Vc<EnvMap> {
// The value expected for env is Record<String, String>, but config itself // The value expected for env is Record<String, String>, but config itself
...@@ -994,6 +1004,16 @@ impl NextConfig { ...@@ -994,6 +1004,16 @@ impl NextConfig {
options.cell() options.cell()
} }
#[turbo_tasks::function]
pub fn modularize_imports(&self) -> Vc<ModularizeImports> {
Vc::cell(self.modularize_imports.clone().unwrap_or_default())
}
#[turbo_tasks::function]
pub fn experimental(&self) -> Vc<ExperimentalConfig> {
self.experimental.clone().cell()
}
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn react_compiler(&self) -> Vc<OptionalReactCompilerOptions> { pub fn react_compiler(&self) -> Vc<OptionalReactCompilerOptions> {
let options = &self.experimental.react_compiler; let options = &self.experimental.react_compiler;
......
...@@ -32,9 +32,9 @@ pub async fn get_next_server_transforms_rules( ...@@ -32,9 +32,9 @@ pub async fn get_next_server_transforms_rules(
) -> Result<Vec<ModuleRule>> { ) -> Result<Vec<ModuleRule>> {
let mut rules = vec![]; let mut rules = vec![];
let modularize_imports_config = &next_config.await?.modularize_imports; let modularize_imports_config = &next_config.modularize_imports().await?;
let mdx_rs = next_config.mdx_rs().await?.is_some(); let mdx_rs = next_config.mdx_rs().await?.is_some();
if let Some(modularize_imports_config) = modularize_imports_config { if !modularize_imports_config.is_empty() {
rules.push(get_next_modularize_imports_rule( rules.push(get_next_modularize_imports_rule(
modularize_imports_config, modularize_imports_config,
mdx_rs, mdx_rs,
......
...@@ -9,10 +9,10 @@ use crate::next_config::{EmotionTransformOptionsOrBoolean, NextConfig}; ...@@ -9,10 +9,10 @@ use crate::next_config::{EmotionTransformOptionsOrBoolean, NextConfig};
pub async fn get_emotion_transform_rule(next_config: Vc<NextConfig>) -> Result<Option<ModuleRule>> { pub async fn get_emotion_transform_rule(next_config: Vc<NextConfig>) -> Result<Option<ModuleRule>> {
let enable_mdx_rs = next_config.mdx_rs().await?.is_some(); let enable_mdx_rs = next_config.mdx_rs().await?.is_some();
let module_rule = next_config let module_rule = next_config
.compiler()
.await? .await?
.compiler .emotion
.as_ref() .as_ref()
.and_then(|value| value.emotion.as_ref())
.and_then(|config| match config { .and_then(|config| match config {
EmotionTransformOptionsOrBoolean::Boolean(true) => { EmotionTransformOptionsOrBoolean::Boolean(true) => {
EmotionTransformer::new(&Default::default()) EmotionTransformer::new(&Default::default())
......
...@@ -18,7 +18,7 @@ use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, Transfor ...@@ -18,7 +18,7 @@ use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, Transfor
use super::module_rule_match_js_no_url; use super::module_rule_match_js_no_url;
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct ModularizeImportPackageConfig { pub struct ModularizeImportPackageConfig {
pub transform: Transform, pub transform: Transform,
...@@ -28,7 +28,7 @@ pub struct ModularizeImportPackageConfig { ...@@ -28,7 +28,7 @@ pub struct ModularizeImportPackageConfig {
pub skip_default_conversion: bool, pub skip_default_conversion: bool,
} }
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs)]
#[serde(untagged)] #[serde(untagged)]
pub enum Transform { pub enum Transform {
#[default] #[default]
......
...@@ -21,10 +21,10 @@ pub async fn get_react_remove_properties_transform_rule( ...@@ -21,10 +21,10 @@ pub async fn get_react_remove_properties_transform_rule(
let enable_mdx_rs = next_config.mdx_rs().await?.is_some(); let enable_mdx_rs = next_config.mdx_rs().await?.is_some();
let module_rule = next_config let module_rule = next_config
.compiler()
.await? .await?
.compiler .react_remove_properties
.as_ref() .as_ref()
.and_then(|value| value.react_remove_properties.as_ref())
.and_then(|config| match config { .and_then(|config| match config {
ReactRemoveProperties::Boolean(false) => None, ReactRemoveProperties::Boolean(false) => None,
ReactRemoveProperties::Boolean(true) => { ReactRemoveProperties::Boolean(true) => {
......
...@@ -14,14 +14,12 @@ pub async fn get_relay_transform_rule( ...@@ -14,14 +14,12 @@ pub async fn get_relay_transform_rule(
) -> Result<Option<ModuleRule>> { ) -> Result<Option<ModuleRule>> {
let enable_mdx_rs = next_config.mdx_rs().await?.is_some(); let enable_mdx_rs = next_config.mdx_rs().await?.is_some();
let project_path = &*project_path.await?; let project_path = &*project_path.await?;
let module_rule = next_config.await?.compiler.as_ref().and_then(|value| { let module_rule = next_config.compiler().await?.relay.as_ref().map(|config| {
value.relay.as_ref().map(|config| { get_ecma_transform_rule(
get_ecma_transform_rule( Box::new(RelayTransformer::new(config, project_path)),
Box::new(RelayTransformer::new(config, project_path)), enable_mdx_rs,
enable_mdx_rs, true,
true, )
)
})
}); });
Ok(module_rule) Ok(module_rule)
......
...@@ -21,10 +21,10 @@ pub async fn get_remove_console_transform_rule( ...@@ -21,10 +21,10 @@ pub async fn get_remove_console_transform_rule(
let enable_mdx_rs = next_config.mdx_rs().await?.is_some(); let enable_mdx_rs = next_config.mdx_rs().await?.is_some();
let module_rule = next_config let module_rule = next_config
.compiler()
.await? .await?
.compiler .remove_console
.as_ref() .as_ref()
.and_then(|value| value.remove_console.as_ref())
.and_then(|config| match config { .and_then(|config| match config {
RemoveConsoleConfig::Boolean(false) => None, RemoveConsoleConfig::Boolean(false) => None,
RemoveConsoleConfig::Boolean(true) => Some(remove_console::Config::All(true)), RemoveConsoleConfig::Boolean(true) => Some(remove_console::Config::All(true)),
......
...@@ -14,10 +14,10 @@ pub async fn get_styled_components_transform_rule( ...@@ -14,10 +14,10 @@ pub async fn get_styled_components_transform_rule(
let enable_mdx_rs = next_config.mdx_rs().await?.is_some(); let enable_mdx_rs = next_config.mdx_rs().await?.is_some();
let module_rule = next_config let module_rule = next_config
.compiler()
.await? .await?
.compiler .styled_components
.as_ref() .as_ref()
.and_then(|value| value.styled_components.as_ref())
.and_then(|config| match config { .and_then(|config| match config {
StyledComponentsTransformOptionsOrBoolean::Boolean(true) => { StyledComponentsTransformOptionsOrBoolean::Boolean(true) => {
Some(StyledComponentsTransformer::new(&Default::default())) Some(StyledComponentsTransformer::new(&Default::default()))
......
...@@ -11,7 +11,7 @@ pub async fn get_swc_ecma_transform_plugin_rule( ...@@ -11,7 +11,7 @@ pub async fn get_swc_ecma_transform_plugin_rule(
next_config: Vc<NextConfig>, next_config: Vc<NextConfig>,
project_path: Vc<FileSystemPath>, project_path: Vc<FileSystemPath>,
) -> Result<Option<ModuleRule>> { ) -> Result<Option<ModuleRule>> {
match next_config.await?.experimental.swc_plugins.as_ref() { match next_config.experimental().await?.swc_plugins.as_ref() {
Some(plugin_configs) if !plugin_configs.is_empty() => { Some(plugin_configs) if !plugin_configs.is_empty() => {
#[cfg(feature = "plugin")] #[cfg(feature = "plugin")]
{ {
......
...@@ -136,12 +136,7 @@ pub async fn get_jsx_transform_options( ...@@ -136,12 +136,7 @@ pub async fn get_jsx_transform_options(
false false
}; };
let is_emotion_enabled = next_config let is_emotion_enabled = next_config.compiler().await?.emotion.is_some();
.await?
.compiler
.as_ref()
.map(|c| c.emotion.is_some())
.unwrap_or_default();
// [NOTE]: ref: WEB-901 // [NOTE]: ref: WEB-901
// next.js does not allow to overriding react runtime config via tsconfig / // next.js does not allow to overriding react runtime config via tsconfig /
......
...@@ -60,14 +60,26 @@ impl Completions { ...@@ -60,14 +60,26 @@ impl Completions {
/// Merges the list of completions into one. /// Merges the list of completions into one.
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn completed(&self) -> anyhow::Result<Vc<Completion>> { pub async fn completed(&self) -> anyhow::Result<Vc<Completion>> {
self.0 if self.0.len() > 100 {
.iter() let mid = self.0.len() / 2;
.map(|&c| async move { let (left, right) = self.0.split_at(mid);
c.await?; let left = Vc::<Completions>::cell(left.to_vec());
Ok(()) let right = Vc::<Completions>::cell(right.to_vec());
}) let left = left.completed();
.try_join() let right = right.completed();
.await?; left.await?;
Ok(Completion::new()) right.await?;
Ok(Completion::new())
} else {
self.0
.iter()
.map(|&c| async move {
c.await?;
Ok(())
})
.try_join()
.await?;
Ok(Completion::new())
}
} }
} }
...@@ -713,6 +713,11 @@ pub trait ChunkType: ValueToString { ...@@ -713,6 +713,11 @@ pub trait ChunkType: ValueToString {
) -> Vc<usize>; ) -> Vc<usize>;
} }
pub fn round_chunk_item_size(size: usize) -> usize {
let a = size.next_power_of_two();
size & (a | (a >> 1) | (a >> 2))
}
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
pub struct ChunkItems(Vec<Vc<Box<dyn ChunkItem>>>); pub struct ChunkItems(Vec<Vc<Box<dyn ChunkItem>>>);
...@@ -752,3 +757,43 @@ where ...@@ -752,3 +757,43 @@ where
chunk_item.chunking_context().chunk_item_id(chunk_item) chunk_item.chunking_context().chunk_item_id(chunk_item)
} }
} }
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_round_chunk_item_size() {
assert_eq!(round_chunk_item_size(0), 0);
assert_eq!(round_chunk_item_size(1), 1);
assert_eq!(round_chunk_item_size(2), 2);
assert_eq!(round_chunk_item_size(3), 3);
assert_eq!(round_chunk_item_size(4), 4);
assert_eq!(round_chunk_item_size(5), 4);
assert_eq!(round_chunk_item_size(6), 6);
assert_eq!(round_chunk_item_size(7), 6);
assert_eq!(round_chunk_item_size(8), 8);
assert_eq!(changes_in_range(0..1000), 19);
assert_eq!(changes_in_range(1000..2000), 2);
assert_eq!(changes_in_range(2000..3000), 1);
assert_eq!(changes_in_range(3000..10000), 4);
fn changes_in_range(range: std::ops::Range<usize>) -> usize {
let len = range.len();
let mut count = 0;
for i in range {
let a = round_chunk_item_size(i);
assert!(a >= i * 2 / 3);
assert!(a <= i);
let b = round_chunk_item_size(i + 1);
if a == b {
count += 1;
}
}
len - count
}
}
}
...@@ -166,6 +166,12 @@ impl From<String> for DefineableNameSegment { ...@@ -166,6 +166,12 @@ impl From<String> for DefineableNameSegment {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct CompileTimeDefines(pub IndexMap<Vec<DefineableNameSegment>, CompileTimeDefineValue>); pub struct CompileTimeDefines(pub IndexMap<Vec<DefineableNameSegment>, CompileTimeDefineValue>);
#[turbo_tasks::value(transparent)]
#[derive(Debug, Clone)]
pub struct CompileTimeDefinesIndividual(
pub IndexMap<Vec<DefineableNameSegment>, Vc<CompileTimeDefineValue>>,
);
impl IntoIterator for CompileTimeDefines { impl IntoIterator for CompileTimeDefines {
type Item = (Vec<DefineableNameSegment>, CompileTimeDefineValue); type Item = (Vec<DefineableNameSegment>, CompileTimeDefineValue);
type IntoIter = indexmap::map::IntoIter<Vec<DefineableNameSegment>, CompileTimeDefineValue>; type IntoIter = indexmap::map::IntoIter<Vec<DefineableNameSegment>, CompileTimeDefineValue>;
...@@ -181,6 +187,16 @@ impl CompileTimeDefines { ...@@ -181,6 +187,16 @@ impl CompileTimeDefines {
pub fn empty() -> Vc<Self> { pub fn empty() -> Vc<Self> {
Vc::cell(IndexMap::new()) Vc::cell(IndexMap::new())
} }
#[turbo_tasks::function]
pub fn individual(&self) -> Vc<CompileTimeDefinesIndividual> {
Vc::cell(
self.0
.iter()
.map(|(key, value)| (key.clone(), value.clone().cell()))
.collect(),
)
}
} }
#[turbo_tasks::value] #[turbo_tasks::value]
...@@ -223,12 +239,28 @@ impl From<CompileTimeDefineValue> for FreeVarReference { ...@@ -223,12 +239,28 @@ impl From<CompileTimeDefineValue> for FreeVarReference {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct FreeVarReferences(pub IndexMap<Vec<DefineableNameSegment>, FreeVarReference>); pub struct FreeVarReferences(pub IndexMap<Vec<DefineableNameSegment>, FreeVarReference>);
#[turbo_tasks::value(transparent)]
#[derive(Debug, Clone)]
pub struct FreeVarReferencesIndividual(
pub IndexMap<Vec<DefineableNameSegment>, Vc<FreeVarReference>>,
);
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl FreeVarReferences { impl FreeVarReferences {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn empty() -> Vc<Self> { pub fn empty() -> Vc<Self> {
Vc::cell(IndexMap::new()) Vc::cell(IndexMap::new())
} }
#[turbo_tasks::function]
pub fn individual(&self) -> Vc<FreeVarReferencesIndividual> {
Vc::cell(
self.0
.iter()
.map(|(key, value)| (key.clone(), value.clone().cell()))
.collect(),
)
}
} }
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
......
...@@ -10,8 +10,8 @@ use turbo_tasks_fs::{rope::Rope, File, FileSystem}; ...@@ -10,8 +10,8 @@ use turbo_tasks_fs::{rope::Rope, File, FileSystem};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{ chunk::{
AsyncModuleInfo, Chunk, ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkType, round_chunk_item_size, AsyncModuleInfo, Chunk, ChunkItem, ChunkItemWithAsyncModuleInfo,
ChunkableModule, ChunkingContext, ModuleId, OutputChunk, OutputChunkRuntimeInfo, ChunkType, ChunkableModule, ChunkingContext, ModuleId, OutputChunk, OutputChunkRuntimeInfo,
}, },
code_builder::{Code, CodeBuilder}, code_builder::{Code, CodeBuilder},
ident::AssetIdent, ident::AssetIdent,
...@@ -489,12 +489,9 @@ impl ChunkType for CssChunkType { ...@@ -489,12 +489,9 @@ impl ChunkType for CssChunkType {
else { else {
bail!("Chunk item is not an css chunk item but reporting chunk type css"); bail!("Chunk item is not an css chunk item but reporting chunk type css");
}; };
Ok(Vc::cell( Ok(Vc::cell(chunk_item.content().await.map_or(0, |content| {
chunk_item round_chunk_item_size(content.inner_code.len())
.content() })))
.await
.map_or(0, |content| content.inner_code.len()),
))
} }
} }
......
...@@ -1903,12 +1903,12 @@ impl JsValue { ...@@ -1903,12 +1903,12 @@ impl JsValue {
/// ///
/// Optionally also prefixes `self` with `prefix`, e.g. to be able to match `typeof foo` if /// Optionally also prefixes `self` with `prefix`, e.g. to be able to match `typeof foo` if
/// `self` is just `foo`. /// `self` is just `foo`.
pub fn match_free_var_reference<'a>( pub fn match_free_var_reference<'a, T>(
&self, &self,
var_graph: Option<&VarGraph>, var_graph: Option<&VarGraph>,
free_var_references: &'a IndexMap<Vec<DefineableNameSegment>, FreeVarReference>, free_var_references: &'a IndexMap<Vec<DefineableNameSegment>, T>,
prefix_self: &Option<DefineableNameSegment>, prefix_self: &Option<DefineableNameSegment>,
) -> Option<&'a FreeVarReference> { ) -> Option<&'a T> {
if let Some(def_name_len) = self.get_defineable_name_len() { if let Some(def_name_len) = self.get_defineable_name_len() {
for (name, value) in free_var_references.iter() { for (name, value) in free_var_references.iter() {
if name.len() != def_name_len + (prefix_self.is_some() as usize) { if name.len() != def_name_len + (prefix_self.is_some() as usize) {
...@@ -1946,10 +1946,10 @@ impl JsValue { ...@@ -1946,10 +1946,10 @@ impl JsValue {
/// Returns any matching defined replacement that matches this value. Optionally also prefixes /// Returns any matching defined replacement that matches this value. Optionally also prefixes
/// `self` with `prefix`, e.g. to be able to match `typeof foo` if `self` is just `foo`. /// `self` with `prefix`, e.g. to be able to match `typeof foo` if `self` is just `foo`.
pub fn match_define<'a>( pub fn match_define<'a, T>(
&self, &self,
defines: &'a IndexMap<Vec<DefineableNameSegment>, CompileTimeDefineValue>, defines: &'a IndexMap<Vec<DefineableNameSegment>, T>,
) -> Option<&'a CompileTimeDefineValue> { ) -> Option<&'a T> {
if let Some(def_name_len) = self.get_defineable_name_len() { if let Some(def_name_len) = self.get_defineable_name_len() {
for (name, value) in defines.iter() { for (name, value) in defines.iter() {
if name.len() != def_name_len { if name.len() != def_name_len {
......
...@@ -2,7 +2,8 @@ use anyhow::{bail, Result}; ...@@ -2,7 +2,8 @@ use anyhow::{bail, Result};
use turbo_tasks::{RcStr, TryJoinIterExt, ValueDefault, ValueToString, Vc}; use turbo_tasks::{RcStr, TryJoinIterExt, ValueDefault, ValueToString, Vc};
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
AsyncModuleInfo, Chunk, ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkingContext, round_chunk_item_size, AsyncModuleInfo, Chunk, ChunkItem, ChunkItemWithAsyncModuleInfo,
ChunkType, ChunkingContext,
}, },
output::OutputAssets, output::OutputAssets,
}; };
...@@ -79,7 +80,7 @@ impl ChunkType for EcmascriptChunkType { ...@@ -79,7 +80,7 @@ impl ChunkType for EcmascriptChunkType {
chunk_item chunk_item
.content_with_async_module_info(async_module_info) .content_with_async_module_info(async_module_info)
.await .await
.map_or(0, |content| content.inner_code.len()), .map_or(0, |content| round_chunk_item_size(content.inner_code.len())),
)) ))
} }
} }
......
...@@ -492,49 +492,10 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -492,49 +492,10 @@ pub(crate) async fn analyse_ecmascript_module_internal(
return analysis.build(false).await; return analysis.build(false).await;
}; };
let compile_time_info = { let compile_time_info = compile_time_info_for_module_type(
let compile_time_info = raw_module.compile_time_info.await?; raw_module.compile_time_info,
let mut free_var_references = compile_time_info.free_var_references.await?.clone_value(); eval_context.is_esm(specified_type),
);
let (typeof_exports, typeof_module) = if eval_context.is_esm(specified_type) {
("undefined", "undefined")
} else {
("object", "object")
};
free_var_references
.entry(vec![
DefineableNameSegment::Name("import".into()),
DefineableNameSegment::Name("meta".into()),
DefineableNameSegment::TypeOf,
])
.or_insert("object".into());
free_var_references
.entry(vec![
DefineableNameSegment::Name("exports".into()),
DefineableNameSegment::TypeOf,
])
.or_insert(typeof_exports.into());
free_var_references
.entry(vec![
DefineableNameSegment::Name("module".into()),
DefineableNameSegment::TypeOf,
])
.or_insert(typeof_module.into());
free_var_references
.entry(vec![
DefineableNameSegment::Name("require".into()),
DefineableNameSegment::TypeOf,
])
.or_insert("function".into());
CompileTimeInfo {
environment: compile_time_info.environment,
defines: compile_time_info.defines,
free_var_references: FreeVarReferences(free_var_references).cell(),
}
.cell()
};
let mut import_references = Vec::new(); let mut import_references = Vec::new();
...@@ -1260,6 +1221,54 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -1260,6 +1221,54 @@ pub(crate) async fn analyse_ecmascript_module_internal(
.await .await
} }
#[turbo_tasks::function]
async fn compile_time_info_for_module_type(
compile_time_info: Vc<CompileTimeInfo>,
is_esm: bool,
) -> Result<Vc<CompileTimeInfo>> {
let compile_time_info = compile_time_info.await?;
let free_var_references = compile_time_info.free_var_references;
let mut free_var_references = free_var_references.await?.clone_value();
let (typeof_exports, typeof_module) = if is_esm {
("undefined", "undefined")
} else {
("object", "object")
};
free_var_references
.entry(vec![
DefineableNameSegment::Name("import".into()),
DefineableNameSegment::Name("meta".into()),
DefineableNameSegment::TypeOf,
])
.or_insert("object".into());
free_var_references
.entry(vec![
DefineableNameSegment::Name("exports".into()),
DefineableNameSegment::TypeOf,
])
.or_insert(typeof_exports.into());
free_var_references
.entry(vec![
DefineableNameSegment::Name("module".into()),
DefineableNameSegment::TypeOf,
])
.or_insert(typeof_module.into());
free_var_references
.entry(vec![
DefineableNameSegment::Name("require".into()),
DefineableNameSegment::TypeOf,
])
.or_insert("function".into());
Ok(CompileTimeInfo {
environment: compile_time_info.environment,
defines: compile_time_info.defines,
free_var_references: FreeVarReferences(free_var_references).cell(),
}
.cell())
}
async fn handle_call<G: Fn(Vec<Effect>) + Send + Sync>( async fn handle_call<G: Fn(Vec<Effect>) + Send + Sync>(
ast_path: &[AstParentKind], ast_path: &[AstParentKind],
span: Span, span: Span,
...@@ -2063,7 +2072,7 @@ async fn handle_member( ...@@ -2063,7 +2072,7 @@ async fn handle_member(
let prop = DefineableNameSegment::Name(prop.into()); let prop = DefineableNameSegment::Name(prop.into());
if let Some(def_name_len) = obj.get_defineable_name_len() { if let Some(def_name_len) = obj.get_defineable_name_len() {
let compile_time_info = state.compile_time_info.await?; let compile_time_info = state.compile_time_info.await?;
let free_var_references = compile_time_info.free_var_references.await?; let free_var_references = compile_time_info.free_var_references.individual().await?;
for (name, value) in free_var_references.iter() { for (name, value) in free_var_references.iter() {
if name.len() != def_name_len + 1 { if name.len() != def_name_len + 1 {
continue; continue;
...@@ -2073,7 +2082,8 @@ async fn handle_member( ...@@ -2073,7 +2082,8 @@ async fn handle_member(
continue; continue;
} }
if it.eq(obj.iter_defineable_name_rev()) if it.eq(obj.iter_defineable_name_rev())
&& handle_free_var_reference(ast_path, value, span, state, analysis).await? && handle_free_var_reference(ast_path, &*value.await?, span, state, analysis)
.await?
{ {
return Ok(()); return Ok(());
} }
...@@ -2107,10 +2117,15 @@ async fn handle_typeof( ...@@ -2107,10 +2117,15 @@ async fn handle_typeof(
) -> Result<()> { ) -> Result<()> {
if let Some(value) = arg.match_free_var_reference( if let Some(value) = arg.match_free_var_reference(
Some(state.var_graph), Some(state.var_graph),
&*state.compile_time_info.await?.free_var_references.await?, &*state
.compile_time_info
.await?
.free_var_references
.individual()
.await?,
&Some(DefineableNameSegment::TypeOf), &Some(DefineableNameSegment::TypeOf),
) { ) {
handle_free_var_reference(ast_path, value, span, state, analysis).await?; handle_free_var_reference(ast_path, &*value.await?, span, state, analysis).await?;
} }
Ok(()) Ok(())
...@@ -2125,7 +2140,7 @@ async fn handle_free_var( ...@@ -2125,7 +2140,7 @@ async fn handle_free_var(
) -> Result<()> { ) -> Result<()> {
if let Some(def_name_len) = var.get_defineable_name_len() { if let Some(def_name_len) = var.get_defineable_name_len() {
let compile_time_info = state.compile_time_info.await?; let compile_time_info = state.compile_time_info.await?;
let free_var_references = compile_time_info.free_var_references.await?; let free_var_references = compile_time_info.free_var_references.individual().await?;
for (name, value) in free_var_references.iter() { for (name, value) in free_var_references.iter() {
if name.len() != def_name_len { if name.len() != def_name_len {
continue; continue;
...@@ -2135,7 +2150,7 @@ async fn handle_free_var( ...@@ -2135,7 +2150,7 @@ async fn handle_free_var(
.iter_defineable_name_rev() .iter_defineable_name_rev()
.eq(name.iter().map(Cow::Borrowed).rev()) .eq(name.iter().map(Cow::Borrowed).rev())
{ {
handle_free_var_reference(ast_path, value, span, state, analysis).await?; handle_free_var_reference(ast_path, &*value.await?, span, state, analysis).await?;
return Ok(()); return Ok(());
} }
} }
...@@ -2448,15 +2463,15 @@ async fn value_visitor_inner( ...@@ -2448,15 +2463,15 @@ async fn value_visitor_inner(
if let JsValue::TypeOf(..) = v { if let JsValue::TypeOf(..) = v {
if let Some(value) = v.match_free_var_reference( if let Some(value) = v.match_free_var_reference(
Some(var_graph), Some(var_graph),
&*compile_time_info.free_var_references.await?, &*compile_time_info.free_var_references.individual().await?,
&None, &None,
) { ) {
return Ok((value.into(), true)); return Ok(((&*value.await?).into(), true));
} }
} }
if let Some(value) = v.match_define(&*compile_time_info.defines.await?) { if let Some(value) = v.match_define(&*compile_time_info.defines.individual().await?) {
return Ok((value.into(), true)); return Ok(((&*value.await?).into(), true));
} }
} }
let value = match v { let value = match v {
......
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