Unverified Commit f41441a0 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Durable use cache: optimize env var existence checks (#98504)

We now separately track code that accesses non-inlined env vars at
runtime in two categories
- (existing) actual reads, the full value is accessed
- (new) only unset/falsy/truthy is read at runtime

For the second case, we only need to invalidate use-cache functions when
the given env var transitioned betwen unset/falsy/truthy. But
transitioning between two different truthy values doesn't caused
invalidation.
parent 30d6d8f4
......@@ -4691,6 +4691,7 @@ dependencies = [
"either",
"futures",
"indexmap 2.14.0",
"itertools 0.10.5",
"next-core",
"regex",
"roaring",
......
......@@ -25,6 +25,7 @@ byteorder = { workspace = true }
either = { workspace = true }
futures = { workspace = true }
indexmap = { workspace = true }
itertools = { workspace = true }
next-core = { workspace = true }
regex = { workspace = true }
roaring = { workspace = true }
......
......@@ -2,6 +2,8 @@ use std::{borrow::Cow, collections::BTreeMap, io::Write, sync::LazyLock};
use anyhow::{Context, Result, bail};
use bincode::{Decode, Encode};
use either::Either;
use itertools::Itertools;
use next_core::{
get_next_package,
next_client_reference::{CssClientReferenceModule, EcmascriptClientReferenceModule},
......@@ -48,7 +50,7 @@ use turbopack_core::{
virtual_source::VirtualSource,
};
use turbopack_ecmascript::{
EcmascriptAnalyzable, EcmascriptParsable, EnvVarInfo,
EcmascriptAnalyzable, EcmascriptParsable, EnvVarAccessMode, EnvVarInfo,
chunk::{EcmascriptChunkItem, EcmascriptChunkItemExt, EcmascriptChunkPlaceable},
module_fragments::part::module::EcmascriptModulePartAsset,
parse::ParseResult,
......@@ -353,7 +355,8 @@ impl Asset for ServerActionManifestAsset {
.await?,
durability: data.as_ref().map(|d| ActionManifestWorkerEntryDurability {
code_hash: d.ident_code_hash.as_str(),
runtime_env_vars: d.runtime_env_vars.as_slice(),
runtime_env_vars_read: d.runtime_env_vars_read.as_slice(),
runtime_env_vars_existence: d.runtime_env_vars_existence.as_slice(),
}),
},
);
......@@ -405,10 +408,13 @@ pub async fn to_rsc_context(
#[turbo_tasks::value]
#[derive(Debug)]
struct ModulesInformation {
/// The combined code hash of all modules in the subgraph
/// The combined code hash of all modules in the subgraph.
pub ident_code_hash: RcStr,
/// The merged and deduplicated list of all runtime env vars referenced in the subgraph
pub runtime_env_vars: Vec<RcStr>,
/// The merged and deduplicated list of all runtime env vars read in the subgraph.
pub runtime_env_vars_read: Vec<RcStr>,
/// The merged and deduplicated list of runtime env vars used only checked for set/falsy/truthy
/// in the subgraph.
pub runtime_env_vars_existence: Vec<RcStr>,
}
#[turbo_tasks::function]
......@@ -457,6 +463,24 @@ async fn compute_subtree_content_hash(
/* include_traced */ true,
)?;
let data = modules
.into_iter()
.map(async |m| {
Ok((
m,
module_hash(
*module_graph,
chunking_context,
async_module_info,
*m,
hash_salt,
)
.await?,
))
})
.try_join()
.await?;
static PRINT_USE_CACHE_SUBTREE: LazyLock<bool> = LazyLock::new(|| {
std::env::var_os("TURBOPACK_PRINT_USE_CACHE_SUBTREE")
.is_some_and(|v| v == "1" || v == "true")
......@@ -465,24 +489,25 @@ async fn compute_subtree_content_hash(
println!(
"Modules in subtree for {}:\n{}",
entry.ident().await?.path,
modules
.iter()
.map(async |m| {
let data = module_hash(
*module_graph,
chunking_context,
async_module_info,
**m,
hash_salt,
)
.await?;
data.iter()
.map(async |(m, data)| {
Ok(format!(
" '{}': {} with env: {}",
m.ident_string().await?,
data.ident_code_hash,
data.env_var_info
.as_ref()
.map(|e| e.runtime.clone())
.map(|e| {
e.runtime
.iter()
.map(|(name, mode)| match mode {
EnvVarAccessMode::Read => format!("read {name}"),
EnvVarAccessMode::Existence => {
format!("exists {name}")
}
})
.collect::<Vec<_>>()
})
.unwrap_or_default()
.join(",")
))
......@@ -493,40 +518,44 @@ async fn compute_subtree_content_hash(
);
}
let data = modules
.into_iter()
.map(async |m| {
Ok((
m,
module_hash(
*module_graph,
chunking_context,
async_module_info,
*m,
hash_salt,
)
.await?,
))
})
.try_join()
.await?;
let mut hashes = Vec::with_capacity(data.len());
let mut runtime_env_vars = FxIndexSet::default();
let mut runtime_env_vars = FxIndexMap::default();
for (_m, data) in &data {
hashes.push(&data.ident_code_hash);
if let Some(env) = &data.env_var_info {
runtime_env_vars.extend(env.runtime.iter());
for (name, mode) in &env.runtime {
match mode {
EnvVarAccessMode::Read => {
// Overwrite
runtime_env_vars.insert(name.clone(), EnvVarAccessMode::Read);
}
EnvVarAccessMode::Existence => {
// Keep EnvVarAccessMode::Read if it already exists
runtime_env_vars
.entry(name.clone())
.or_insert(EnvVarAccessMode::Existence);
}
}
}
}
}
let hash = deterministic_hash("", hashes, HashAlgorithm::Xxh3Hash128Hex).into();
let (runtime_read, runtime_existence): (Vec<_>, Vec<_>) =
runtime_env_vars.into_iter().partition_map(|(name, mode)| {
if mode == EnvVarAccessMode::Read {
Either::Left(name)
} else {
Either::Right(name)
}
});
anyhow::Ok(
ModulesInformation {
ident_code_hash: hash,
runtime_env_vars: runtime_env_vars.into_iter().cloned().collect(),
runtime_env_vars_read: runtime_read,
runtime_env_vars_existence: runtime_existence,
}
.cell(),
)
......
......@@ -472,7 +472,8 @@ pub struct ActionManifestWorkerEntry<'a> {
#[serde(rename_all = "camelCase")]
pub struct ActionManifestWorkerEntryDurability<'a> {
pub code_hash: &'a str,
pub runtime_env_vars: &'a [RcStr],
pub runtime_env_vars_read: &'a [RcStr],
pub runtime_env_vars_existence: &'a [RcStr],
}
#[derive(Serialize, Debug, Clone)]
......
......@@ -74,7 +74,8 @@ type Actions = {
async: boolean
durability?: {
codeHash: string
runtimeEnvVars: string[]
runtimeEnvVarsRead: string[]
runtimeEnvVarsExistence: string[]
}
}
}
......
......@@ -375,7 +375,8 @@ function createServerModuleMap(): ServerModuleMap {
async: boolean
durability?: {
codeHash: string
runtimeEnvVars: readonly string[]
runtimeEnvVarsRead: readonly string[]
runtimeEnvVarsExistence: readonly string[]
}
}
| undefined
......
......@@ -3675,12 +3675,11 @@ export async function cache(
* This returns a cache key that has to cover everything that can affect the result of the cached
* function (apart from the arguments). So
* - codeHash: the code itself that generates the return value
* - Notably, this excludes the following modules. Those are included via the Next.js version
* anyway:
* - Notably, this excludes the following modules. Those are included via the Next.js version anyway:
* - react, react-dom, private-next-rsc-server-reference, private-next-rsc-cache-wrapper
* - runtimeEnvVars: the keys and values runtime environment variables that the code reads (and are
* not inlined)
* - the version of Next.js (to account for RSC wire format changes, or use-cache-wrapper.ts
* - runtimeEnvVarsRead: the keys and values of runtime environment variables that the code reads
* - runtimeEnvVarExistence: the unset/falsy/truthy state of runtime environment variables used in boolean contexts
* - the version of Next.js (to account for RSC wire format changes, or use-cache-wrapper.ts changes)
*
* In case that granular information isn't available, fall back to
* buildId/deploymentId/hmrRefreshHash, which is a correct hash but over-invalidates way too often.
......@@ -3702,16 +3701,21 @@ async function computeCacheKeyImplementationPart(
// Hash the env var values, to not leak secrets into the cache key.
.createHash('sha256')
.update(
durability.runtimeEnvVars
.map((k) => {
[
...durability.runtimeEnvVarsRead.map((k) => {
// Make sure not to stringify `undefined` and `"undefined"` to the same value.
return process.env[k] != null ? `${k}=${process.env[k]}` : k
})
.join('\0') ?? ''
return process.env[k] != null ? `${k}==${process.env[k]}` : k
}),
...durability.runtimeEnvVarsExistence.map((k) => {
const value = process.env[k]
const state = value == null ? 'unset' : value ? 'truthy' : 'falsy'
return `${k}~=${state}`
}),
].join('\0') ?? ''
)
.digest('hex')
// When more accurate analysis information is available, use codeHash + runtimeEnvVars
// When more accurate analysis information is available, use codeHash + runtime env vars
return [durability.codeHash, nextVersion, runtimeEnvVarStateHash]
} else {
// Because the Action ID is not yet unique per implementation of that Action we can't
......
async function logic() {
'use cache'
if (!process.env.FOO || !process.env.BAR) {
return true
}
return false
}
export default async function Page() {
const value = await logic()
return <p>{value}</p>
}
import Image from 'next/image'
async function logic() {
'use cache'
return Date.now()
}
export default async function Page() {
const value = await logic()
return (
<div>
<Image src="/vercel.svg" alt="Vercel Logo" width={72} height={16} />
<p>{value}</p>
</div>
)
}
......@@ -3,8 +3,10 @@
*/
const nextConfig = {
cacheComponents: true,
supportsImmutableAssets: true,
experimental: {
durableUseCacheEntries: true,
runtimeServerDeploymentId: true,
},
}
......
......@@ -4,7 +4,13 @@ async function getCodeHashes(
next: NextInstance,
pages?: string[]
): Promise<
{ id: string; page: string; codeHash?: string; runtimeEnvVars?: string[] }[]
{
id: string
page: string
codeHash?: string
runtimeEnvVarsRead?: string[]
runtimeEnvVarsExistence?: string[]
}[]
> {
const manifest = await next.readJSON(
'.next/server/server-reference-manifest.json'
......@@ -14,7 +20,8 @@ async function getCodeHashes(
id: string
page: string
codeHash?: string
runtimeEnvVars?: string[]
runtimeEnvVarsRead?: string[]
runtimeEnvVarsExistence?: string[]
}[] = []
for (const [actionId, entry] of Object.entries<any>(manifest.node)) {
for (const [workerKey, worker] of Object.entries<any>(entry.workers)) {
......@@ -23,12 +30,13 @@ async function getCodeHashes(
id: actionId,
page: workerKey,
codeHash: worker?.durability?.codeHash,
runtimeEnvVars: worker?.durability?.runtimeEnvVars,
runtimeEnvVarsRead: worker?.durability?.runtimeEnvVarsRead,
runtimeEnvVarsExistence: worker?.durability?.runtimeEnvVarsExistence,
})
}
}
}
hashes.sort((a, b) => a.page.localeCompare(b.page))
return hashes
}
......@@ -43,45 +51,90 @@ async function getCodeHashes(
it('emits codeHash only for use-cache functions', async () => {
const values = Object.values(await getCodeHashes(next))
expect(values.length).toBe(4)
const valuesWithoutCodeHash = values.filter(
(e) => typeof e.codeHash !== 'string'
)
expect(valuesWithoutCodeHash.length).toBe(1)
expect(valuesWithoutCodeHash[0].page).toBe('app/use-server/page')
})
it('lists non-inlined runtime env vars', async () => {
const data = await getCodeHashes(next)
expect(data.find((e) => e.page === 'app/use-cache/page').runtimeEnvVars)
.toMatchInlineSnapshot(`
expect(valuesWithoutCodeHash.map((v) => v.page)).toMatchInlineSnapshot(`
[
"BUNDLED_NON_INLINED_ENVVAR",
"NEXT_PRIVATE_DEBUG_CACHE",
"__NEXT_DEV_SERVER",
"NEXT_PRIVATE_DEBUG_RUNTIME_DATA",
"NEXT_PRIVATE_DEBUG_VALIDATION",
"NEXT_OTEL_VERBOSE",
"NEXT_OTEL_PERFORMANCE_PREFIX",
"NEXT_SERVER_ACTIONS_ENCRYPTION_KEY",
"EXTERNAL_ENV_VAR",
"app/use-server/page",
]
`)
})
it('lists non-inlined runtime env vars', async () => {
// TODO ideally app/next-image/page wouldn't include NEXT_DEPLOYMENT_ID.
// But currently the import chain
// next/image.js
// -> packages/next/src/shared/lib/get-img-props.ts
// -> packages/next/src/shared/lib/deployment-id.ts
// reads NEXT_DEPLOYMENT_ID
const data = await getCodeHashes(next)
expect(
data.find((e) => e.page === 'app/env-dynamic/page').runtimeEnvVars
Object.fromEntries(
data
.filter((d) => d.runtimeEnvVarsRead || d.runtimeEnvVarsExistence)
.map((d) => [
d.page,
[
...d.runtimeEnvVarsRead,
...d.runtimeEnvVarsExistence.map((v) => `exist ${v}`),
],
])
)
).toMatchInlineSnapshot(`
[
"NEXT_PRIVATE_DEBUG_CACHE",
"__NEXT_DEV_SERVER",
"NEXT_PRIVATE_DEBUG_RUNTIME_DATA",
"NEXT_PRIVATE_DEBUG_VALIDATION",
"NEXT_OTEL_VERBOSE",
"NEXT_OTEL_PERFORMANCE_PREFIX",
"NEXT_SERVER_ACTIONS_ENCRYPTION_KEY",
]
{
"app/env-dynamic/page": [
"NEXT_OTEL_VERBOSE",
"NEXT_OTEL_PERFORMANCE_PREFIX",
"NEXT_SERVER_ACTIONS_ENCRYPTION_KEY",
"exist NEXT_PRIVATE_DEBUG_CACHE",
"exist __NEXT_DEV_SERVER",
"exist NEXT_PRIVATE_DEBUG_RUNTIME_DATA",
"exist NEXT_PRIVATE_DEBUG_VALIDATION",
],
"app/env-existence/page": [
"NEXT_OTEL_VERBOSE",
"NEXT_OTEL_PERFORMANCE_PREFIX",
"NEXT_SERVER_ACTIONS_ENCRYPTION_KEY",
"exist FOO",
"exist BAR",
"exist NEXT_PRIVATE_DEBUG_CACHE",
"exist __NEXT_DEV_SERVER",
"exist NEXT_PRIVATE_DEBUG_RUNTIME_DATA",
"exist NEXT_PRIVATE_DEBUG_VALIDATION",
],
"app/next-image/page": [
"NEXT_OTEL_VERBOSE",
"NEXT_OTEL_PERFORMANCE_PREFIX",
"NEXT_SERVER_ACTIONS_ENCRYPTION_KEY",
"NEXT_DEPLOYMENT_ID",
"exist NEXT_PRIVATE_DEBUG_CACHE",
"exist __NEXT_DEV_SERVER",
"exist NEXT_PRIVATE_DEBUG_RUNTIME_DATA",
"exist NEXT_PRIVATE_DEBUG_VALIDATION",
],
"app/use-cache-client/page": [
"NEXT_OTEL_VERBOSE",
"NEXT_OTEL_PERFORMANCE_PREFIX",
"NEXT_SERVER_ACTIONS_ENCRYPTION_KEY",
"exist NEXT_PRIVATE_DEBUG_CACHE",
"exist __NEXT_DEV_SERVER",
"exist NEXT_PRIVATE_DEBUG_RUNTIME_DATA",
"exist NEXT_PRIVATE_DEBUG_VALIDATION",
],
"app/use-cache/page": [
"BUNDLED_NON_INLINED_ENVVAR",
"NEXT_OTEL_VERBOSE",
"NEXT_OTEL_PERFORMANCE_PREFIX",
"NEXT_SERVER_ACTIONS_ENCRYPTION_KEY",
"EXTERNAL_ENV_VAR",
"exist NEXT_PRIVATE_DEBUG_CACHE",
"exist __NEXT_DEV_SERVER",
"exist NEXT_PRIVATE_DEBUG_RUNTIME_DATA",
"exist NEXT_PRIVATE_DEBUG_VALIDATION",
],
}
`)
})
})
......
......@@ -373,6 +373,63 @@ describe.each(['NEXT_DEPLOYMENT_ID', 'BUILD_ID', 'default'])(
}
})
it('should recompute when runtime env var truthiness changes', async () => {
await next.patchFile(
'app/logic.ts',
`export function getDate() {
return new Date().toISOString() + ':' + Boolean(process.env.FOOBAR)
}`,
async () => {
try {
delete next.env['FOOBAR']
const unset = await execute(
next,
'NEXT_DEPLOYMENT_ID',
'dpl-id-unset'
)
next.env['FOOBAR'] = ''
const falsy = await execute(
next,
'NEXT_DEPLOYMENT_ID',
'dpl-id-falsy'
)
// unset -> falsy revalidates
expect(unset.keyRoot).not.toBe(falsy.keyRoot)
expect(unset.dataRoot).not.toBe(falsy.dataRoot)
expect(unset.dataRoot).toEndWith(':false')
next.env['FOOBAR'] = 'truthy-1'
const truthy1 = await execute(
next,
'NEXT_DEPLOYMENT_ID',
'dpl-id-truthy-1'
)
// falsy -> truthy revalidates
expect(falsy.keyRoot).not.toBe(truthy1.keyRoot)
expect(falsy.dataRoot).not.toBe(truthy1.dataRoot)
expect(falsy.dataRoot).toEndWith(':false')
expect(truthy1.dataRoot).toEndWith(':true')
next.env['FOOBAR'] = 'truthy-2'
const truthy2 = await execute(
next,
'NEXT_DEPLOYMENT_ID',
'dpl-id-truthy-2'
)
// truthy -> different truthy DOESN'T revalidate
expect(truthy1.keyRoot).toBe(truthy2.keyRoot)
expect(truthy1.dataRoot).toBe(truthy2.dataRoot)
} finally {
delete next.env['FOOBAR']
}
}
)
})
it('should still work when imported client reference changes', async () => {
const key1 = await execute(next, 'NEXT_DEPLOYMENT_ID', 'dpl-id-1')
const browser = await next.browser('/import-use-client')
......
......@@ -150,6 +150,9 @@ pub enum Effect<'a> {
prop: BumpBox<'a, JsValue<'a>>,
ast_path: BumpBox<'a, [AstParentKind]>,
span: Span,
// Whether this value from this member access only ends up being used as a truthiness check
// (and the full value doesn't escape).
in_truthiness_context: bool,
},
/// A property access created by an object destructuring pattern.
DestructuredMember {
......
......@@ -7,7 +7,7 @@ use bumpalo::boxed::Box as BumpBox;
use rustc_hash::FxHashMap;
use smallvec::SmallVec;
use swc_core::{
common::{BytePos, Span, Spanned, SyntaxContext, pass::AstNodePath},
common::{BytePos, Mark, Span, Spanned, SyntaxContext, pass::AstNodePath},
ecma::{
ast::*,
atoms::atom,
......@@ -833,6 +833,52 @@ fn is_expression_statement(ast_path: &AstNodePath<AstParentNodeRef<'_>>) -> bool
false
}
fn is_in_boolean_context(
ast_path: &AstNodePath<AstParentNodeRef<'_>>,
unresolved_mark: Mark,
) -> bool {
for parent in ast_path.iter().rev() {
match parent {
// Transparent expression wrappers.
AstParentNodeRef::Expr(..) | AstParentNodeRef::ParenExpr(_, ParenExprField::Expr) => {}
// A plain call argument may reach Boolean().
AstParentNodeRef::ExprOrSpread(arg, ExprOrSpreadField::Expr)
if arg.spread.is_none() => {}
// Logical results inherit their consumer's context.
AstParentNodeRef::BinExpr(
BinExpr {
op: BinaryOp::LogicalAnd | BinaryOp::LogicalOr | BinaryOp::NullishCoalescing,
..
},
BinExprField::Left | BinExprField::Right,
) => {}
// Only logical negation coerces to boolean.
AstParentNodeRef::UnaryExpr(expr, UnaryExprField::Arg) => {
return expr.op == UnaryOp::Bang;
}
// Only the first argument to global Boolean is coerced.
AstParentNodeRef::CallExpr(call, CallExprField::Args(0)) => {
return matches!(
&call.callee,
Callee::Expr(callee)
if matches!(&**callee, Expr::Ident(ident) if is_global(ident, "Boolean", unresolved_mark))
);
}
// Control-flow tests coerce their value to boolean.
AstParentNodeRef::IfStmt(_, IfStmtField::Test)
| AstParentNodeRef::CondExpr(_, CondExprField::Test)
| AstParentNodeRef::ForStmt(_, ForStmtField::Test)
| AstParentNodeRef::WhileStmt(_, WhileStmtField::Test)
| AstParentNodeRef::DoWhileStmt(_, DoWhileStmtField::Test) => return true,
// A selected ternary branch becomes the ternary's result. Needed for the if(ternary)
AstParentNodeRef::CondExpr(_, CondExprField::Cons | CondExprField::Alt) => {}
// Any other parent consumes the actual value.
_ => return false,
}
}
false
}
/// Returns the [`MemberExpr`] where the current node is the object:
/// `<node>.<prop>` or `<node>[<expr>]`.
fn member_access_parent<'r>(
......@@ -1791,6 +1837,10 @@ impl VisitAstPath for Analyzer<'_, '_> {
prop: prop_value,
ast_path: as_parent_path_in(self.arena, ast_path),
span: member_expr.span(),
in_truthiness_context: is_in_boolean_context(
ast_path,
self.eval_context.unresolved_mark,
),
});
}
......
......@@ -83,9 +83,9 @@ use swc_core::{
use tracing::{Instrument, Level, instrument};
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{
FxDashMap, FxIndexMap, ReadRef, ResolvedVc, SerializationInvalidator, TryJoinIterExt, Upcast,
ValueToString, Vc, get_serialization_invalidator, parking_lot_mutex_bincode,
trace::TraceRawVcs, turbofmt,
FxDashMap, FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, SerializationInvalidator,
TryJoinIterExt, Upcast, ValueToString, Vc, get_serialization_invalidator,
parking_lot_mutex_bincode, trace::TraceRawVcs, turbofmt,
};
use turbo_tasks_fs::{FileJsonContent, FileSystemPath, glob::Glob, rope::Rope};
use turbopack_core::{
......@@ -434,14 +434,23 @@ pub trait EcmascriptParsable {
#[turbo_tasks::value(shared)]
#[derive(Default, Debug)]
pub struct EnvVarInfo {
/// List of environment variables that are referenced (but not inlined) in the module.
pub runtime: Vec<RcStr>,
/// List of environment variables accessed at runtime (not inlined) in the module.
#[bincode(with = "turbo_bincode::indexmap")]
pub runtime: FxIndexMap<RcStr, EnvVarAccessMode>,
// TODO add this back once we can do it without regressing performance
// Whether the module potentially references all environment variables (because of a
// non-statically analyzeable `process.env`).
// pub runtime_all: Option<IssueSource>,
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, TraceRawVcs, NonLocalValue, Encode, Decode)]
pub enum EnvVarAccessMode {
/// The value is read.
Read,
/// Only the existence of the variable is checked, we only care about unset vs falsy vs truthy.
Existence,
}
#[turbo_tasks::value_impl]
impl EnvVarInfo {
#[turbo_tasks::function]
......
......@@ -99,8 +99,8 @@ use worker::{WorkerAssetReference, WorkerGlobalPlaceholder, WorkerGlobalsReplace
pub use crate::references::esm::export::{FollowExportsResult, follow_reexports};
use crate::{
AnalyzeMode, EcmascriptModuleAsset, EcmascriptModuleAssetType, EcmascriptParsable, EnvVarInfo,
ModuleTypeResult, TypeofWindow,
AnalyzeMode, EcmascriptModuleAsset, EcmascriptModuleAssetType, EcmascriptParsable,
EnvVarAccessMode, EnvVarInfo, ModuleTypeResult, TypeofWindow,
analyzer::{
Bump, BumpVec, ConstantNumber, ConstantString, ConstantValue as JsConstantValue, JsValue,
JsValueUrlKind, Modified, ModuleValue, ObjectPart, RequireContextValue, ThreadLocal,
......@@ -235,7 +235,7 @@ struct AnalyzeEcmascriptModuleResultBuilder {
source_map: Option<ResolvedVc<Box<dyn GenerateSourceMap>>>,
cjs_static_exports: Option<CjsStaticExports>,
env_var_info_runtime: FxIndexSet<RcStr>,
env_var_info_runtime: FxIndexMap<RcStr, EnvVarAccessMode>,
#[cfg(debug_assertions)]
ident: RcStr,
......@@ -349,9 +349,17 @@ impl AnalyzeEcmascriptModuleResultBuilder {
self.successful = successful;
}
/// Adds a runtime environment variable reference to the analysis result.
pub fn add_runtime_env_var_reference(&mut self, runtime_env: RcStr) {
self.env_var_info_runtime.insert(runtime_env);
pub fn add_runtime_env_var_reference_read(&mut self, runtime_env: RcStr) {
self.env_var_info_runtime
// Overwrite any existing value with Existence.
.insert(runtime_env, EnvVarAccessMode::Read);
}
pub fn add_runtime_env_var_reference_existence(&mut self, runtime_env: RcStr) {
self.env_var_info_runtime
.entry(runtime_env)
// Only set if it hasn't been set to Read already.
.or_insert(EnvVarAccessMode::Existence);
}
pub fn add_esm_reference_namespace_resolved(
......@@ -460,7 +468,7 @@ impl AnalyzeEcmascriptModuleResultBuilder {
source_map: self.source_map,
cjs_static_exports: self.cjs_static_exports,
env_var_info: EnvVarInfo {
runtime: self.env_var_info_runtime.into_iter().collect(),
runtime: self.env_var_info_runtime,
}
.resolved_cell(),
},
......@@ -1280,6 +1288,7 @@ async fn analyze_ecmascript_module_internal(
mut prop,
ast_path,
span,
in_truthiness_context,
} => {
// Intentionally not awaited because `handle_member` reads this only when needed
let obj =
......@@ -1296,7 +1305,9 @@ async fn analyze_ecmascript_module_internal(
span,
&analysis_state,
&mut analysis,
MembershipType::Member,
MembershipType::Member {
in_truthiness_context,
},
)
.await?;
}
......@@ -1333,7 +1344,7 @@ async fn analyze_ecmascript_module_internal(
)
})
{
analysis.add_runtime_env_var_reference(RcStr::from(prop));
analysis.add_runtime_env_var_reference_read(RcStr::from(prop));
}
}
}
......@@ -3501,9 +3512,10 @@ fn extract_hot_dep_strings(arg: &JsValue<'_>) -> Option<Vec<RcStr>> {
}
enum MembershipType {
Member,
Member { in_truthiness_context: bool },
In,
}
async fn handle_membership<'a>(
ast_path: &[AstParentKind],
link_obj: impl Future<Output = Result<JsValue<'a>>> + Send + Sync,
......@@ -3525,7 +3537,7 @@ async fn handle_membership<'a>(
if has_member && let Some((mut name, false)) = obj_name.clone() {
name.0.push(DefinableNameSegmentRef::Name(prop));
match ty {
MembershipType::Member => {
MembershipType::Member { .. } => {
if let Some(value) = state
.compile_time_info_ref
.free_var_references
......@@ -3559,7 +3571,7 @@ async fn handle_membership<'a>(
&& let JsValue::WellKnownFunction(WellKnownFunctionKind::Require) = &obj
{
analysis.add_code_gen::<CodeGen>(match ty {
MembershipType::Member => {
MembershipType::Member { .. } => {
CjsRequireCacheAccess::new(ast_path.to_vec().into()).into()
}
MembershipType::In => ConstantValueCodeGen::new(
......@@ -3583,7 +3595,20 @@ async fn handle_membership<'a>(
]
)
}) {
analysis.add_runtime_env_var_reference(RcStr::from(prop));
match ty {
MembershipType::In => {
analysis.add_runtime_env_var_reference_existence(RcStr::from(prop));
}
MembershipType::Member {
in_truthiness_context,
} => {
if in_truthiness_context {
analysis.add_runtime_env_var_reference_existence(RcStr::from(prop));
} else {
analysis.add_runtime_env_var_reference_read(RcStr::from(prop));
}
}
}
return Ok(());
}
}
......
use std::path::PathBuf;
use anyhow::Result;
use either::Either;
use itertools::Itertools;
use swc_core::{
self,
testing::{NormalizedOutput, fixture},
......@@ -20,7 +22,7 @@ use turbopack_test_utils::noop_asset_context::NoopAssetContext;
use crate::{
AnalyzeMode, EcmascriptInputTransforms, EcmascriptModuleAsset, EcmascriptOptions,
references::analyze_ecmascript_module,
EnvVarAccessMode, references::analyze_ecmascript_module,
};
#[fixture("tests/references/**/input.js")]
......@@ -125,7 +127,21 @@ async fn fixture_op(input: RcStr, analyze_mode: AnalyzeMode) -> anyhow::Result<(
let env_var_info = analysis.env_var_info.await?;
NormalizedOutput::from(format!("runtime: {:#?}", env_var_info.runtime))
let (runtime_read, runtime_existence): (Vec<_>, Vec<_>) =
env_var_info.runtime.iter().partition_map(|(name, mode)| {
if *mode == EnvVarAccessMode::Read {
Either::Left(name)
} else {
Either::Right(name)
}
});
let mut value = format!("runtime: {runtime_read:#?}");
if !runtime_existence.is_empty() {
value.push_str(&format!("\nruntime_existence: {runtime_existence:#?}"));
}
NormalizedOutput::from(value)
.compare_to_file(input.with_file_name(format!(
"env-vars{}.snapshot",
match analyze_mode {
......
......@@ -64,6 +64,7 @@
),
],
span: 53..87,
in_truthiness_context: false,
},
MemberCall {
obj: Array {
......@@ -303,6 +304,7 @@
),
],
span: 135..169,
in_truthiness_context: false,
},
MemberCall {
obj: Array {
......@@ -542,6 +544,7 @@
),
],
span: 219..253,
in_truthiness_context: false,
},
MemberCall {
obj: Array {
......@@ -660,6 +663,7 @@
),
],
span: 281..296,
in_truthiness_context: false,
},
FreeVar {
var: "require",
......@@ -1013,6 +1017,7 @@
),
],
span: 339..354,
in_truthiness_context: false,
},
FreeVar {
var: "require",
......
......@@ -61,6 +61,7 @@
),
],
span: 39..63,
in_truthiness_context: false,
},
Member {
obj: FreeVar(
......@@ -113,6 +114,7 @@
),
],
span: 50..62,
in_truthiness_context: false,
},
FreeVar {
var: "global",
......@@ -211,6 +213,7 @@
),
],
span: 100..116,
in_truthiness_context: false,
},
Member {
obj: FreeVar(
......@@ -263,6 +266,7 @@
),
],
span: 103..115,
in_truthiness_context: false,
},
FreeVar {
var: "global",
......@@ -355,6 +359,7 @@
),
],
span: 129..134,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -398,5 +403,6 @@
),
],
span: 147..152,
in_truthiness_context: false,
},
]
......@@ -304,6 +304,7 @@
),
],
span: 555..566,
in_truthiness_context: false,
},
FreeVar {
var: "console",
......
......@@ -270,6 +270,7 @@
),
],
span: 57..81,
in_truthiness_context: false,
},
Member {
obj: FreeVar(
......@@ -342,6 +343,7 @@
),
],
span: 57..68,
in_truthiness_context: false,
},
FreeVar {
var: "process",
......
......@@ -151,6 +151,7 @@
),
],
span: 99..122,
in_truthiness_context: false,
},
ImportedBinding {
esm_reference_index: 1,
......@@ -254,6 +255,7 @@
),
],
span: 123..138,
in_truthiness_context: false,
},
ImportMeta {
ast_path: [
......@@ -474,6 +476,7 @@
),
],
span: 176..203,
in_truthiness_context: false,
},
Member {
obj: WellKnownObject(
......@@ -528,6 +531,7 @@
),
],
span: 204..219,
in_truthiness_context: false,
},
ImportMeta {
ast_path: [
......@@ -742,6 +746,7 @@
),
],
span: 257..284,
in_truthiness_context: false,
},
FreeVar {
var: "__filename",
......@@ -941,6 +946,7 @@
),
],
span: 335..362,
in_truthiness_context: false,
},
Member {
obj: FreeVar(
......@@ -995,6 +1001,7 @@
),
],
span: 363..377,
in_truthiness_context: false,
},
FreeVar {
var: "globalThis",
......
......@@ -263,6 +263,7 @@
),
],
span: 296..329,
in_truthiness_context: false,
},
FreeVar {
var: "platformKey",
......@@ -524,6 +525,7 @@
),
],
span: 515..530,
in_truthiness_context: false,
},
FreeVar {
var: "require",
......
......@@ -169,6 +169,7 @@
),
],
span: 2725..2739,
in_truthiness_context: false,
},
FreeVar {
var: "__filename",
......@@ -447,6 +448,7 @@
),
],
span: 2775..2789,
in_truthiness_context: false,
},
FreeVar {
var: "__dirname",
......@@ -1184,6 +1186,7 @@
),
],
span: 3526..3536,
in_truthiness_context: false,
},
FreeVar {
var: "__dirname",
......@@ -1820,6 +1823,7 @@
),
],
span: 3671..3682,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -2208,6 +2212,7 @@
),
],
span: 1005..1021,
in_truthiness_context: false,
},
FreeVar {
var: "process",
......@@ -2347,6 +2352,7 @@
),
],
span: 1025..1032,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -2495,6 +2501,7 @@
),
],
span: 1038..1051,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -2707,6 +2714,7 @@
),
],
span: 1112..1145,
in_truthiness_context: false,
},
],
range: Exact(
......@@ -2899,6 +2907,7 @@
),
],
span: 1239..1273,
in_truthiness_context: false,
},
],
range: Exact(
......@@ -3643,6 +3652,7 @@
),
],
span: 1602..1617,
in_truthiness_context: false,
},
FreeVar {
var: "require",
......@@ -4040,6 +4050,7 @@
),
],
span: 1712..1725,
in_truthiness_context: false,
},
FreeVar {
var: "fs",
......@@ -4321,6 +4332,7 @@
),
],
span: 1758..1773,
in_truthiness_context: false,
},
FreeVar {
var: "require",
......@@ -5038,6 +5050,7 @@
),
],
span: 2299..2311,
in_truthiness_context: false,
},
Member {
obj: FreeVar(
......@@ -5129,6 +5142,7 @@
),
],
span: 2312..2327,
in_truthiness_context: false,
},
FreeVar {
var: "require",
......@@ -5497,6 +5511,7 @@
),
],
span: 2367..2376,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -5599,6 +5614,7 @@
),
],
span: 2422..2435,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -5919,6 +5935,7 @@
),
],
span: 2463..2476,
in_truthiness_context: false,
},
FreeVar {
var: "fs",
......@@ -6189,6 +6206,7 @@
),
],
span: 2501..2516,
in_truthiness_context: false,
},
FreeVar {
var: "fs",
......@@ -6455,6 +6473,7 @@
),
],
span: 2548..2560,
in_truthiness_context: false,
},
FreeVar {
var: "fs",
......
......@@ -47,6 +47,7 @@
),
],
span: 13..24,
in_truthiness_context: false,
},
FreeVar {
var: "Buffer",
......
......@@ -85,6 +85,7 @@
),
],
span: 80..91,
in_truthiness_context: false,
},
FreeVar {
var: "Object",
......@@ -335,6 +336,7 @@
),
],
span: 108..119,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -426,6 +428,7 @@
),
],
span: 142..149,
in_truthiness_context: false,
},
Member {
obj: FreeVar(
......@@ -516,6 +519,7 @@
),
],
span: 155..168,
in_truthiness_context: false,
},
FreeVar {
var: "console",
......@@ -1081,6 +1085,7 @@
),
],
span: 208..219,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -1181,6 +1186,7 @@
),
],
span: 224..238,
in_truthiness_context: false,
},
Conditional {
condition: Variable(
......@@ -1572,6 +1578,7 @@
),
],
span: 271..282,
in_truthiness_context: false,
},
Call {
func: Variable(
......
......@@ -41,6 +41,7 @@
),
],
span: 9..25,
in_truthiness_context: false,
},
ImportMeta {
ast_path: [
......
......@@ -475,6 +475,7 @@
),
],
span: 366..379,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......
......@@ -39,6 +39,7 @@
),
],
span: 1622..1636,
in_truthiness_context: false,
},
FreeVar {
var: "module",
......@@ -165,6 +166,7 @@
),
],
span: 138..149,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -236,6 +238,7 @@
),
],
span: 173..206,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -294,6 +297,7 @@
),
],
span: 380..388,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -376,6 +380,7 @@
),
],
span: 484..488,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -606,6 +611,7 @@
),
],
span: 532..540,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -848,6 +854,7 @@
),
],
span: 585..593,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -1090,6 +1097,7 @@
),
],
span: 637..645,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -1332,6 +1340,7 @@
),
],
span: 691..699,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -1574,6 +1583,7 @@
),
],
span: 743..751,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -1816,6 +1826,7 @@
),
],
span: 796..804,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -2058,6 +2069,7 @@
),
],
span: 850..858,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -2300,6 +2312,7 @@
),
],
span: 902..910,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -2542,6 +2555,7 @@
),
],
span: 954..962,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -2784,6 +2798,7 @@
),
],
span: 1008..1017,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -3026,6 +3041,7 @@
),
],
span: 1058..1067,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -3268,6 +3284,7 @@
),
],
span: 1113..1122,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -3510,6 +3527,7 @@
),
],
span: 1166..1175,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -3752,6 +3770,7 @@
),
],
span: 1219..1228,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -3994,6 +4013,7 @@
),
],
span: 1274..1283,
in_truthiness_context: false,
},
Call {
func: Variable(
......
......@@ -41,6 +41,7 @@
),
],
span: 35..43,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -93,6 +94,7 @@
),
],
span: 70..82,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -305,6 +307,7 @@
),
],
span: 139..160,
in_truthiness_context: false,
},
Member {
obj: Array {
......@@ -390,6 +393,7 @@
),
],
span: 139..153,
in_truthiness_context: false,
},
FreeVar {
var: "unknown",
......@@ -648,6 +652,7 @@
),
],
span: 200..221,
in_truthiness_context: false,
},
Member {
obj: Array {
......@@ -733,6 +738,7 @@
),
],
span: 200..214,
in_truthiness_context: false,
},
FreeVar {
var: "unknown",
......@@ -934,6 +940,7 @@
),
],
span: 304..313,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -986,6 +993,7 @@
),
],
span: 348..360,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......
......@@ -30,6 +30,7 @@
),
],
span: 1..4,
in_truthiness_context: false,
},
FreeVar {
var: "A",
......
......@@ -44,6 +44,7 @@
),
],
span: 16..43,
in_truthiness_context: false,
},
FreeVar {
var: "global",
......
......@@ -92,6 +92,7 @@
),
],
span: 36..51,
in_truthiness_context: false,
},
ImportMeta {
ast_path: [
......
......@@ -41,6 +41,7 @@
),
],
span: 75..83,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -84,6 +85,7 @@
),
],
span: 96..107,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -127,6 +129,7 @@
),
],
span: 120..128,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -170,6 +173,7 @@
),
],
span: 141..152,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -213,6 +217,7 @@
),
],
span: 165..173,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -256,6 +261,7 @@
),
],
span: 186..197,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -299,6 +305,7 @@
),
],
span: 210..218,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -342,6 +349,7 @@
),
],
span: 231..242,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -385,6 +393,7 @@
),
],
span: 308..323,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -428,6 +437,7 @@
),
],
span: 336..351,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -471,6 +481,7 @@
),
],
span: 364..379,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -514,6 +525,7 @@
),
],
span: 392..407,
in_truthiness_context: false,
},
DestructuredMember {
obj: Variable(
......@@ -730,6 +742,7 @@
),
],
span: 576..592,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -773,6 +786,7 @@
),
],
span: 605..621,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -816,6 +830,7 @@
),
],
span: 634..650,
in_truthiness_context: false,
},
FreeVar {
var: "global",
......@@ -967,6 +982,7 @@
),
],
span: 728..737,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -1010,6 +1026,7 @@
),
],
span: 750..759,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -1053,6 +1070,7 @@
),
],
span: 772..781,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -1096,6 +1114,7 @@
),
],
span: 794..803,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -1139,5 +1158,6 @@
),
],
span: 816..825,
in_truthiness_context: false,
},
]
......@@ -107,6 +107,7 @@
),
],
span: 212..227,
in_truthiness_context: false,
},
FreeVar {
var: "performance",
......@@ -441,6 +442,7 @@
),
],
span: 257..292,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -562,6 +564,7 @@
),
],
span: 257..282,
in_truthiness_context: false,
},
MemberCall {
obj: Member(
......@@ -893,6 +896,7 @@
),
],
span: 356..371,
in_truthiness_context: false,
},
FreeVar {
var: "performance",
......@@ -1419,6 +1423,7 @@
),
],
span: 608..621,
in_truthiness_context: true,
},
Unreachable {
start_ast_path: [
......
......@@ -78,6 +78,7 @@
),
],
span: 30..41,
in_truthiness_context: false,
},
FreeVar {
var: "Object",
......@@ -228,6 +229,7 @@
),
],
span: 56..62,
in_truthiness_context: false,
},
FreeVar {
var: "Object",
......
......@@ -189,6 +189,7 @@
),
],
span: 102..113,
in_truthiness_context: false,
},
FreeVar {
var: "console",
......@@ -483,6 +484,7 @@
),
],
span: 508..519,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......
......@@ -87,6 +87,7 @@
),
],
span: 50..61,
in_truthiness_context: false,
},
FreeVar {
var: "Math",
......@@ -297,6 +298,7 @@
),
],
span: 273..287,
in_truthiness_context: false,
},
FreeVar {
var: "JSON",
......
......@@ -237,6 +237,7 @@
),
],
span: 115..124,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -360,6 +361,7 @@
),
],
span: 158..167,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -483,6 +485,7 @@
),
],
span: 202..211,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -606,6 +609,7 @@
),
],
span: 246..255,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -729,6 +733,7 @@
),
],
span: 291..300,
in_truthiness_context: false,
},
FreeVar {
var: "global",
......@@ -1021,6 +1026,7 @@
),
],
span: 458..465,
in_truthiness_context: false,
},
Member {
obj: Member(
......@@ -1083,6 +1089,7 @@
),
],
span: 486..493,
in_truthiness_context: false,
},
ImportedBinding {
esm_reference_index: 1,
......
......@@ -400,6 +400,7 @@
),
],
span: 171..183,
in_truthiness_context: false,
},
FreeVar {
var: "process",
......@@ -1136,6 +1137,7 @@
),
],
span: 345..361,
in_truthiness_context: false,
},
FreeVar {
var: "process",
......@@ -1447,6 +1449,7 @@
),
],
span: 419..431,
in_truthiness_context: false,
},
FreeVar {
var: "process",
......@@ -1562,6 +1565,7 @@
),
],
span: 438..454,
in_truthiness_context: false,
},
FreeVar {
var: "process",
......@@ -1879,6 +1883,7 @@
),
],
span: 512..518,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -1941,6 +1946,7 @@
),
],
span: 522..532,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -2208,6 +2214,7 @@
),
],
span: 592..598,
in_truthiness_context: false,
},
Call {
func: Variable(
......
......@@ -47,6 +47,7 @@
),
],
span: 70..85,
in_truthiness_context: false,
},
FreeVar {
var: "require",
......@@ -261,6 +262,7 @@
),
],
span: 164..179,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -389,6 +391,7 @@
),
],
span: 34..46,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -465,6 +468,7 @@
),
],
span: 34..40,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......
......@@ -46,6 +46,7 @@
),
],
span: 39..48,
in_truthiness_context: false,
},
FreeVar {
var: "this",
......
......@@ -256,6 +256,7 @@
),
],
span: 108..114,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......
......@@ -77,6 +77,7 @@
),
],
span: 46..56,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -156,6 +157,7 @@
),
],
span: 66..77,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -235,6 +237,7 @@
),
],
span: 89..104,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -357,6 +360,7 @@
),
],
span: 259..280,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -604,6 +608,7 @@
),
],
span: 327..348,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -1161,6 +1166,7 @@
),
],
span: 828..861,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -1485,6 +1491,7 @@
),
],
span: 965..985,
in_truthiness_context: false,
},
Member {
obj: Variable(
......@@ -1639,6 +1646,7 @@
),
],
span: 965..975,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -2223,6 +2231,7 @@
),
],
span: 1156..1177,
in_truthiness_context: false,
},
MemberCall {
obj: Variable(
......@@ -2418,6 +2427,7 @@
),
],
span: 1252..1273,
in_truthiness_context: false,
},
Call {
func: Variable(
......@@ -2669,6 +2679,7 @@
),
],
span: 1342..1356,
in_truthiness_context: false,
},
FreeVar {
var: "module",
......
......@@ -92,6 +92,7 @@
),
],
span: 40..55,
in_truthiness_context: false,
},
ImportMeta {
ast_path: [
......
runtime: [
"FOO1",
"FOO2",
"FOO3",
"FOO4",
"FOO5",
"FOO6",
"FOO7",
"FOO8",
]
runtime_existence: [
"FOO_EXIST2",
"FOO_EXIST4",
"FOO_EXIST6",
]
runtime: [
"FOO1",
"FOO2",
"FOO3",
"FOO4",
"FOO5",
"FOO6",
"FOO7",
"FOO8",
]
runtime_existence: [
"FOO_EXIST2",
"FOO_EXIST4",
"FOO_EXIST6",
]
runtime: [
"FOO1",
"FOO2",
"FOO3",
"FOO4",
"FOO5",
"FOO6",
"FOO7",
"FOO8",
]
runtime_existence: [
"FOO_EXIST2",
"FOO_EXIST4",
"FOO_EXIST6",
]
......@@ -3,7 +3,7 @@ const env = process.env
if (env.FOO1 === 'x') {
return false
}
if ('FOO2' in env) {
if ('FOO_EXIST2' in env) {
return true
}
......@@ -14,7 +14,7 @@ const p = process
if (p.env.FOO3 === 'x') {
return false
}
if ('FOO4' in p.env) {
if ('FOO_EXIST4' in p.env) {
return true
}
......@@ -25,7 +25,7 @@ const p1 = p
if (p1.env.FOO5 === 'x') {
return false
}
if ('FOO6' in p1.env) {
if ('FOO_EXIST6' in p1.env) {
return true
}
......
runtime: [
"FOO_COMPOUND_READ1",
"FOO_COMPOUND_READ2",
"FOO_COMPOUND_READ3",
"FOO_COMPOUND_READ4",
"FOO_AND_READ1",
"FOO_AND_READ2",
"FOO_BOOLEAN_EXTRA_READ",
"FOO_BOOLEAN_SPREAD_READ",
"FOO_TERNARY_READ2",
"FOO_TERNARY_READ1",
"FOO_READ_DOMINATES",
"FOO_BOTH",
"FOO_FN_READ5",
"FOO_SHADOWED_READ6",
]
runtime_existence: [
"FOO1",
"FOO2",
"FOO_COMPOUND1",
"FOO_COMPOUND2",
"FOO_COMPOUND3",
"FOO_COMPOUND4",
"FOO_COMPOUND5",
"FOO_COMPOUND6",
"FOO_AND1",
"FOO_AND2",
"FOO_NESTED1",
"FOO_NESTED2",
"FOO_NESTED3",
"FOO_PAREN",
"FOO_TERNARY_TEST",
"FOO_TERNARY2",
"FOO_TERNARY1",
"FOO3",
"FOO4",
]
runtime: [
"FOO_COMPOUND_READ1",
"FOO_COMPOUND_READ2",
"FOO_COMPOUND_READ3",
"FOO_COMPOUND_READ4",
"FOO_AND_READ1",
"FOO_AND_READ2",
"FOO_BOOLEAN_EXTRA_READ",
"FOO_BOOLEAN_SPREAD_READ",
"FOO_TERNARY_READ2",
"FOO_TERNARY_READ1",
"FOO_READ_DOMINATES",
"FOO_BOTH",
"FOO_FN_READ5",
"FOO_SHADOWED_READ6",
]
runtime_existence: [
"FOO1",
"FOO2",
"FOO_COMPOUND1",
"FOO_COMPOUND2",
"FOO_COMPOUND3",
"FOO_COMPOUND4",
"FOO_COMPOUND5",
"FOO_COMPOUND6",
"FOO_AND1",
"FOO_AND2",
"FOO_NESTED1",
"FOO_NESTED2",
"FOO_NESTED3",
"FOO_PAREN",
"FOO_TERNARY_TEST",
"FOO_TERNARY2",
"FOO_TERNARY1",
"FOO3",
"FOO4",
]
runtime: [
"FOO_COMPOUND_READ1",
"FOO_COMPOUND_READ2",
"FOO_COMPOUND_READ3",
"FOO_COMPOUND_READ4",
"FOO_AND_READ1",
"FOO_AND_READ2",
"FOO_BOOLEAN_EXTRA_READ",
"FOO_BOOLEAN_SPREAD_READ",
"FOO_TERNARY_READ2",
"FOO_TERNARY_READ1",
"FOO_READ_DOMINATES",
"FOO_BOTH",
"FOO_FN_READ5",
"FOO_SHADOWED_READ6",
]
runtime_existence: [
"FOO1",
"FOO2",
"FOO_COMPOUND1",
"FOO_COMPOUND2",
"FOO_COMPOUND3",
"FOO_COMPOUND4",
"FOO_COMPOUND5",
"FOO_COMPOUND6",
"FOO_AND1",
"FOO_AND2",
"FOO_NESTED1",
"FOO_NESTED2",
"FOO_NESTED3",
"FOO_PAREN",
"FOO_TERNARY_TEST",
"FOO_TERNARY2",
"FOO_TERNARY1",
"FOO3",
"FOO4",
]
if ('FOO1' in process.env) {
return true
}
if ('INLINED1' in process.env) {
return true
}
if (process.env.FOO2) {
return true
}
if (process.env.INLINED2) {
return true
}
const a = !process.env.FOO3
const b = !process.env.INLINED3
const c = Boolean(process.env.FOO4)
const d = Boolean(process.env.INLINED4)
const e = something(process.env.FOO_FN_READ5)
function shadowed(Boolean) {
return Boolean(process.env.FOO_SHADOWED_READ6)
}
const g = !process.env.FOO_COMPOUND1 || !process.env.FOO_COMPOUND2
const h = process.env.FOO_COMPOUND_READ1 || process.env.FOO_COMPOUND_READ2
if (process.env.FOO_COMPOUND3 || process.env.FOO_COMPOUND4) {
return true
}
const i = process.env.FOO_COMPOUND_READ3 ?? process.env.FOO_COMPOUND_READ4
if (process.env.FOO_COMPOUND5 ?? process.env.FOO_COMPOUND6) {
return true
}
const j = process.env.FOO_AND_READ1 && process.env.FOO_AND_READ2
if (process.env.FOO_AND1 && process.env.FOO_AND2) {
return true
}
if (
(process.env.FOO_NESTED1 || process.env.FOO_NESTED2) &&
process.env.FOO_NESTED3
) {
return true
}
if (process.env.FOO_PAREN) {
return true
}
const k = Boolean(other, process.env.FOO_BOOLEAN_EXTRA_READ)
const l = Boolean(...process.env.FOO_BOOLEAN_SPREAD_READ)
const m = process.env.FOO_TERNARY_TEST ? 'yes' : 'no'
if (condition ? process.env.FOO_TERNARY1 : process.env.FOO_TERNARY2) {
return true
}
const n = condition
? process.env.FOO_TERNARY_READ1
: process.env.FOO_TERNARY_READ2
if (process.env.FOO_READ_DOMINATES) {
return true
}
console.log(process.env.FOO_READ_DOMINATES)
if (process.env.FOO_BOTH) {
console.log(process.env.FOO_BOTH)
}
......@@ -3,8 +3,7 @@ runtime: [
"FOO2",
"FOO3",
"FOO4",
"INLINED2",
"FOO5",
"INLINED3",
"FOO6",
"INLINED4",
]
......@@ -3,8 +3,7 @@ runtime: [
"FOO2",
"FOO3",
"FOO4",
"INLINED2",
"FOO5",
"INLINED3",
"FOO6",
"INLINED4",
]
......@@ -3,8 +3,7 @@ runtime: [
"FOO2",
"FOO3",
"FOO4",
"INLINED2",
"FOO5",
"INLINED3",
"FOO6",
"INLINED4",
]
......@@ -5,23 +5,16 @@ if (process.env.INLINED1 === 'x') {
return false
}
if ('FOO2' in process.env) {
return true
}
if ('INLINED2' in process.env) {
return true
}
const NAME = 'FOO3'
const NAME = 'FOO2'
console.log(process.env[NAME])
const { FOO4, ['FOO5']: renamed, INLINED3 } = process.env
console.log(FOO4, renamed)
const { FOO3, ['FOO4']: renamed, INLINED2 } = process.env
console.log(FOO3, renamed)
// TODO this is actually not inlined yet
console.log(INLINED3)
console.log(INLINED2)
function readEnv({ FOO6, INLINED4 } = process.env) {
function readEnv({ FOO5, INLINED4 } = process.env) {
// TODO this is actually not inlined yet
return FOO6 + INLINED4
return FOO5 + INLINED4
}
console.log(readEnv())
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