Skip to content

Turbopack: selective reads of defined env vars in module analysis #88759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sokra wants to merge 1 commit into
base: sokra/equivalent-selective-read
Choose a base branch
from
+169 −288
Open

Turbopack: selective reads of defined env vars in module analysis #88759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/next-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ rustc-hash = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
serde_path_to_error = { workspace = true }
smallvec = { workspace = true }
swc_sourcemap = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
Expand Down
31 changes: 11 additions & 20 deletions crates/next-core/src/raw_ecmascript_module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::io::Write;
use anyhow::{Result, bail};
use once_cell::sync::Lazy;
use regex::Regex;
use smallvec::smallvec;
use tracing::Instrument;
use turbo_rcstr::rcstr;
use turbo_tasks::{FxIndexMap, FxIndexSet, ResolvedVc, TryJoinIterExt, ValueToString, Vc};
Expand All @@ -13,7 +14,8 @@ use turbopack_core::{
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext},
code_builder::CodeBuilder,
compile_time_info::{
CompileTimeDefineValue, CompileTimeInfo, DefinableNameSegment, FreeVarReference,
CompileTimeDefineValue, CompileTimeInfo, DefinableNameSegmentRef, DefinableNameSegmentRefs,
FreeVarReference,
},
context::AssetContext,
ident::AssetIdent,
Expand Down Expand Up @@ -201,12 +203,7 @@ impl EcmascriptChunkItem for RawEcmascriptChunkItem {

let mut code = CodeBuilder::default();
if !env_vars.is_empty() {
let replacements = module
.compile_time_info
.await?
.free_var_references
.individual()
.await?;
let replacements = module.compile_time_info.await?.free_var_references;
code += "var process = {env:\n";
writeln!(
code,
Expand All @@ -217,20 +214,14 @@ impl EcmascriptChunkItem for RawEcmascriptChunkItem {
.map(async |name| {
Ok((
name,
if let Some(value) =
replacements.get(&DefinableNameSegment::Name(name.into()))
&& let Some((_, value)) =
value.0.iter().find(|(path, _)| {
matches!(
path.as_slice(),
[
DefinableNameSegment::Name(a),
DefinableNameSegment::Name(b)
] if a == "process" && b == "env"
)
})
if let Some(value) = replacements
.get(&DefinableNameSegmentRefs(smallvec![
DefinableNameSegmentRef::Name("process"),
DefinableNameSegmentRef::Name("env"),
DefinableNameSegmentRef::Name(name),
]))
.await?
{
let value = value.await?;
let value = match &*value {
FreeVarReference::Value(
CompileTimeDefineValue::String(value),
Expand Down
106 changes: 53 additions & 53 deletions turbopack/crates/turbopack-core/src/compile_time_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
use anyhow::Result;
use bincode::{Decode, Encode};
use indexmap::Equivalent;
use rustc_hash::FxHashSet;
use smallvec::SmallVec;
use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, NonLocalValue, ResolvedVc, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::FileSystemPath;
Expand Down Expand Up @@ -157,6 +160,7 @@ impl From<serde_json::Value> for CompileTimeDefineValue {
#[derive(Debug, Clone, Hash, PartialOrd, Ord)]
pub enum DefinableNameSegment {
Name(RcStr),
Call(RcStr),
TypeOf,
}

Expand All @@ -178,20 +182,48 @@ impl From<String> for DefinableNameSegment {
}
}

#[turbo_tasks::value(transparent)]
#[derive(Hash, PartialEq, Eq)]
pub enum DefinableNameSegmentRef<'a> {
Name(&'a str),
Call(&'a str),
TypeOf,
}

impl Equivalent<DefinableNameSegment> for DefinableNameSegmentRef<'_> {
fn equivalent(&self, key: &DefinableNameSegment) -> bool {
match (self, key) {
(DefinableNameSegmentRef::Name(a), DefinableNameSegment::Name(b)) => **a == *b.as_str(),
(DefinableNameSegmentRef::Call(a), DefinableNameSegment::Call(b)) => **a == *b.as_str(),
(DefinableNameSegmentRef::TypeOf, DefinableNameSegment::TypeOf) => true,
_ => false,
}
}
}

#[derive(Hash, PartialEq, Eq)]
pub struct DefinableNameSegmentRefs<'a>(pub SmallVec<[DefinableNameSegmentRef<'a>; 4]>);

impl Equivalent<Vec<DefinableNameSegment>> for DefinableNameSegmentRefs<'_> {
fn equivalent(&self, key: &Vec<DefinableNameSegment>) -> bool {
if self.0.len() != key.len() {
return false;
}
for (a, b) in self.0.iter().zip(key.iter()) {
if !a.equivalent(b) {
return false;
}
}
true
}
}

#[turbo_tasks::value(transparent, cell = "keyed")]
Copy link
Contributor

@vercel vercel bot Jan 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The members() function extracts the wrong property name from paths ending with Call or TypeOf segments, returning the previous Name instead of the actual property name at the end of the path.

Fix on Vercel

#[derive(Debug, Clone)]
pub struct CompileTimeDefines(
#[bincode(with = "turbo_bincode::indexmap")]
pub FxIndexMap<Vec<DefinableNameSegment>, CompileTimeDefineValue>,
);

#[turbo_tasks::value(transparent)]
#[derive(Debug, Clone)]
pub struct CompileTimeDefinesIndividual(
#[bincode(with = "turbo_bincode::indexmap")]
pub FxIndexMap<Vec<DefinableNameSegment>, ResolvedVc<CompileTimeDefineValue>>,
);

impl IntoIterator for CompileTimeDefines {
type Item = (Vec<DefinableNameSegment>, CompileTimeDefineValue);
type IntoIter = indexmap::map::IntoIter<Vec<DefinableNameSegment>, CompileTimeDefineValue>;
Expand All @@ -207,20 +239,6 @@ impl CompileTimeDefines {
pub fn empty() -> Vc<Self> {
Vc::cell(FxIndexMap::default())
}

#[turbo_tasks::function]
pub fn individual(&self) -> Vc<CompileTimeDefinesIndividual> {
let mut map: FxIndexMap<Vec<DefinableNameSegment>, ResolvedVc<CompileTimeDefineValue>> =
self.0
.iter()
.map(|(key, value)| (key.clone(), value.clone().resolved_cell()))
.collect();

// Sort keys to make order as deterministic as possible
map.sort_keys();

Vc::cell(map)
}
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, TraceRawVcs, NonLocalValue, Encode, Decode)]
Expand Down Expand Up @@ -275,26 +293,15 @@ impl From<CompileTimeDefineValue> for FreeVarReference {
}
}

#[turbo_tasks::value(transparent)]
#[turbo_tasks::value(transparent, cell = "keyed")]
#[derive(Debug, Clone)]
pub struct FreeVarReferences(
#[bincode(with = "turbo_bincode::indexmap")]
pub FxIndexMap<Vec<DefinableNameSegment>, FreeVarReference>,
);

#[derive(Debug, Default, Clone, PartialEq, Eq, TraceRawVcs, NonLocalValue, Encode, Decode)]
pub struct FreeVarReferenceVcs(
#[bincode(with = "turbo_bincode::indexmap")]
pub FxIndexMap<Vec<DefinableNameSegment>, ResolvedVc<FreeVarReference>>,
);

/// A map from the last element (the member prop) to a map of the rest of the name to the value.
#[turbo_tasks::value(transparent)]
#[derive(Debug, Clone)]
pub struct FreeVarReferencesIndividual(
#[bincode(with = "turbo_bincode::indexmap")]
pub FxIndexMap<DefinableNameSegment, FreeVarReferenceVcs>,
);
#[turbo_tasks::value(transparent, cell = "keyed")]
pub struct FreeVarReferencesMembers(FxHashSet<RcStr>);

#[turbo_tasks::value_impl]
impl FreeVarReferences {
Expand All @@ -304,24 +311,17 @@ impl FreeVarReferences {
}

#[turbo_tasks::function]
pub fn individual(&self) -> Vc<FreeVarReferencesIndividual> {
let mut result: FxIndexMap<DefinableNameSegment, FreeVarReferenceVcs> =
FxIndexMap::default();

for (key, value) in &self.0 {
let (last_key, key) = key.split_last().unwrap();
result
.entry(last_key.clone())
.or_default()
.0
.insert(key.to_vec(), value.clone().resolved_cell());
pub fn members(&self) -> Vc<FreeVarReferencesMembers> {
let mut members = FxHashSet::default();
for (key, _) in self.0.iter() {
if let Some(DefinableNameSegment::Name(name)) = key
.iter()
.rfind(|segment| matches!(segment, DefinableNameSegment::Name(_)))
{
members.insert(name.clone());
}
}

// Sort keys to make order as deterministic as possible
result.sort_keys();
result.iter_mut().for_each(|(_, inner)| inner.0.sort_keys());

Vc::cell(result)
Vc::cell(members)
}
}

Expand Down
Loading
Loading