From 585b33621a9ad9997ba215aafd31ad5893764ab9 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 31 Jul 2024 11:15:56 +0200 Subject: [PATCH] rename addtional property to logical property --- .../src/analyzer/builtin.rs | 26 ++--- .../turbopack-ecmascript/src/analyzer/mod.rs | 82 ++++++------- .../src/references/mod.rs | 2 +- crates/turbopack-ecmascript/src/utils.rs | 2 +- .../tests/analyzer/graph/1/graph.snapshot | 4 +- .../tests/analyzer/graph/2/graph.snapshot | 2 +- .../analyzer/graph/assign/graph.snapshot | 12 +- .../graph/conditional-import/graph.snapshot | 2 +- .../analyzer/graph/cycle-cache/graph.snapshot | 110 +++++++++--------- .../graph/default-args/graph.snapshot | 4 +- .../graph/esbuild-reduced/graph.snapshot | 6 +- .../analyzer/graph/esbuild/graph.snapshot | 12 +- .../analyzer/graph/md5-reduced/graph.snapshot | 18 +-- .../tests/analyzer/graph/md5_2/graph.snapshot | 12 +- .../analyzer/graph/member-call/graph.snapshot | 2 +- .../analyzer/graph/nested-args/graph.snapshot | 2 +- .../analyzer/graph/op-assign/graph.snapshot | 4 +- .../analyzer/graph/pack-2521/graph.snapshot | 2 +- .../analyzer/graph/pack-2682/graph.snapshot | 2 +- .../analyzer/graph/sequences/graph.snapshot | 2 +- .../tests/analyzer/graph/try/graph.snapshot | 2 +- 21 files changed, 154 insertions(+), 156 deletions(-) diff --git a/crates/turbopack-ecmascript/src/analyzer/builtin.rs b/crates/turbopack-ecmascript/src/analyzer/builtin.rs index 96448ff4f7e4ad..5cf5eb51412f26 100644 --- a/crates/turbopack-ecmascript/src/analyzer/builtin.rs +++ b/crates/turbopack-ecmascript/src/analyzer/builtin.rs @@ -2,9 +2,7 @@ use std::mem::take; use swc_core::ecma::atoms::js_word; -use super::{ - AdditionalProperty, ConstantNumber, ConstantValue, JsValue, LogicalOperator, ObjectPart, -}; +use super::{ConstantNumber, ConstantValue, JsValue, LogicalOperator, LogicalProperty, ObjectPart}; /// Replaces some builtin values with their resulting values. Called early /// without lazy nested values. This allows to skip a lot of work to process the @@ -107,7 +105,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => { *value = JsValue::alternatives( take(values) @@ -166,7 +164,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => { *value = JsValue::alternatives( take(values) @@ -310,7 +308,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => { *value = JsValue::alternatives( take(values) @@ -412,7 +410,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => { *value = JsValue::alternatives( take(values) @@ -460,7 +458,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool { box JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, }, ref mut args, ) => { @@ -564,27 +562,27 @@ pub fn replace_builtin(value: &mut JsValue) -> bool { let property = match op { LogicalOperator::Or => { if any_unset { - Some(AdditionalProperty::Truthy) + Some(LogicalProperty::Truthy) } else if all_set { - Some(AdditionalProperty::Falsy) + Some(LogicalProperty::Falsy) } else { None } } LogicalOperator::And => { if any_unset { - Some(AdditionalProperty::Falsy) + Some(LogicalProperty::Falsy) } else if all_set { - Some(AdditionalProperty::Truthy) + Some(LogicalProperty::Truthy) } else { None } } LogicalOperator::NullishCoalescing => { if any_unset { - Some(AdditionalProperty::NonNullish) + Some(LogicalProperty::NonNullish) } else if all_set { - Some(AdditionalProperty::Nullish) + Some(LogicalProperty::Nullish) } else { None } diff --git a/crates/turbopack-ecmascript/src/analyzer/mod.rs b/crates/turbopack-ecmascript/src/analyzer/mod.rs index 2816531ff1750f..11fa87a0175e87 100644 --- a/crates/turbopack-ecmascript/src/analyzer/mod.rs +++ b/crates/turbopack-ecmascript/src/analyzer/mod.rs @@ -351,20 +351,20 @@ enum JsValueMetaKind { } #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)] -pub enum AdditionalProperty { +pub enum LogicalProperty { Truthy, Falsy, Nullish, NonNullish, } -impl Display for AdditionalProperty { +impl Display for LogicalProperty { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { - AdditionalProperty::Truthy => write!(f, "truthy"), - AdditionalProperty::Falsy => write!(f, "falsy"), - AdditionalProperty::Nullish => write!(f, "nullish"), - AdditionalProperty::NonNullish => write!(f, "non-nullish"), + LogicalProperty::Truthy => write!(f, "truthy"), + LogicalProperty::Falsy => write!(f, "falsy"), + LogicalProperty::Nullish => write!(f, "nullish"), + LogicalProperty::NonNullish => write!(f, "non-nullish"), } } } @@ -429,7 +429,7 @@ pub enum JsValue { Alternatives { total_nodes: usize, values: Vec, - additional_property: Option, + logical_property: Option, }, /// A function reference. The return value might contain [JsValue::Argument] /// placeholders that need to be replaced when calling this function. @@ -594,15 +594,15 @@ impl Display for JsValue { JsValue::Alternatives { total_nodes: _, values: list, - additional_property, + logical_property, } => { let list = list .iter() .map(|v| v.to_string()) .collect::>() .join(" | "); - if let Some(additional_property) = additional_property { - write!(f, "({}){{{}}}", list, additional_property) + if let Some(logical_property) = logical_property { + write!(f, "({}){{{}}}", list, logical_property) } else { write!(f, "({})", list) } @@ -770,18 +770,18 @@ impl JsValue { Self::Alternatives { total_nodes: 1 + total_nodes(&list), values: list, - additional_property: None, + logical_property: None, } } pub fn alternatives_with_addtional_property( list: Vec, - additional_property: AdditionalProperty, + logical_property: LogicalProperty, ) -> Self { Self::Alternatives { total_nodes: 1 + total_nodes(&list), values: list, - additional_property: Some(additional_property), + logical_property: Some(logical_property), } } @@ -1118,7 +1118,7 @@ impl JsValue { | JsValue::Alternatives { total_nodes: _, values: list, - additional_property: _, + logical_property: _, } | JsValue::Concat(_, list) | JsValue::Logical(_, _, list) @@ -1305,7 +1305,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property, + logical_property, } => { let list = pretty_join( &values @@ -1319,8 +1319,8 @@ impl JsValue { "", "| ", ); - if let Some(additional_property) = additional_property { - format!("({}){{{}}}", list, additional_property) + if let Some(logical_property) = logical_property { + format!("({}){{{}}}", list, logical_property) } else { format!("({})", list) } @@ -1881,7 +1881,7 @@ impl JsValue { | JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => values.iter().any(JsValue::has_side_effects), JsValue::Binary(_, a, _, b) => a.has_side_effects() || b.has_side_effects(), JsValue::Tenary(_, test, cons, alt) => { @@ -1934,11 +1934,11 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property, - } => match additional_property { - Some(AdditionalProperty::Truthy) => Some(true), - Some(AdditionalProperty::Falsy) => Some(false), - Some(AdditionalProperty::Nullish) => Some(false), + logical_property, + } => match logical_property { + Some(LogicalProperty::Truthy) => Some(true), + Some(LogicalProperty::Falsy) => Some(false), + Some(LogicalProperty::Nullish) => Some(false), _ => merge_if_known(values, JsValue::is_truthy), }, JsValue::Not(_, value) => value.is_truthy().map(|x| !x), @@ -2021,9 +2021,9 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property, - } => match additional_property { - Some(AdditionalProperty::Nullish) => Some(true), + logical_property, + } => match logical_property { + Some(LogicalProperty::Nullish) => Some(true), _ => merge_if_known(values, JsValue::is_nullish), }, JsValue::Logical(_, op, list) => match op { @@ -2056,7 +2056,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => merge_if_known(values, JsValue::is_empty_string), JsValue::Logical(_, op, list) => match op { LogicalOperator::And => { @@ -2090,7 +2090,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => values.iter().any(|x| x.is_unknown()), _ => false, } @@ -2133,7 +2133,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => merge_if_known(values, JsValue::is_string), JsValue::Call( @@ -2175,7 +2175,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => merge_if_known(values, |a| a.starts_with(str)), JsValue::Concat(_, list) => { if let Some(item) = list.iter().next() { @@ -2210,7 +2210,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => merge_if_known(values, |alt| alt.ends_with(str)), JsValue::Concat(_, list) => { if let Some(item) = list.last() { @@ -2314,7 +2314,7 @@ fn shortcircuit_if_known( macro_rules! for_each_children_async { ($value:expr, $visit_fn:expr, $($args:expr),+) => { Ok(match &mut $value { - JsValue::Alternatives { total_nodes: _, values: list, additional_property: _ } + JsValue::Alternatives { total_nodes: _, values: list, logical_property: _ } | JsValue::Concat(_, list) | JsValue::Add(_, list) | JsValue::Logical(_, _, list) @@ -2618,7 +2618,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values: list, - additional_property: _, + logical_property: _, } | JsValue::Concat(_, list) | JsValue::Add(_, list) @@ -2857,7 +2857,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values: list, - additional_property: _, + logical_property: _, } | JsValue::Concat(_, list) | JsValue::Add(_, list) @@ -2952,7 +2952,7 @@ impl JsValue { if let JsValue::Alternatives { total_nodes: c, values, - additional_property: _, + logical_property: _, } = self { if !values.contains(&v) { @@ -2964,7 +2964,7 @@ impl JsValue { *self = JsValue::Alternatives { total_nodes: 1 + l.total_nodes() + v.total_nodes(), values: vec![l, v], - additional_property: None, + logical_property: None, }; } } @@ -2979,7 +2979,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => { if values.len() == 1 { *self = take(&mut values[0]); @@ -2990,7 +2990,7 @@ impl JsValue { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => { for v in values { set.insert(SimilarJsValue(v)); @@ -3169,12 +3169,12 @@ impl JsValue { JsValue::Alternatives { total_nodes: lc, values: l, - additional_property: lp, + logical_property: lp, }, JsValue::Alternatives { total_nodes: rc, values: r, - additional_property: rp, + logical_property: rp, }, ) => lc == rc && all_similar(l, r, depth - 1) && lp == rp, (JsValue::FreeVar(l), JsValue::FreeVar(r)) => l == r, @@ -3275,7 +3275,7 @@ impl JsValue { | JsValue::Alternatives { total_nodes: _, values: v, - additional_property: _, + logical_property: _, } | JsValue::Concat(_, v) | JsValue::Add(_, v) diff --git a/crates/turbopack-ecmascript/src/references/mod.rs b/crates/turbopack-ecmascript/src/references/mod.rs index 97e27385e4b612..13aad13028344c 100644 --- a/crates/turbopack-ecmascript/src/references/mod.rs +++ b/crates/turbopack-ecmascript/src/references/mod.rs @@ -1208,7 +1208,7 @@ async fn handle_call) + Send + Sync>( JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => { for alt in values { handle_call_boxed( diff --git a/crates/turbopack-ecmascript/src/utils.rs b/crates/turbopack-ecmascript/src/utils.rs index 15c9608130c64c..9e547a4fafcfa0 100644 --- a/crates/turbopack-ecmascript/src/utils.rs +++ b/crates/turbopack-ecmascript/src/utils.rs @@ -32,7 +32,7 @@ pub fn js_value_to_pattern(value: &JsValue) -> Pattern { JsValue::Alternatives { total_nodes: _, values, - additional_property: _, + logical_property: _, } => Pattern::Alternatives(values.iter().map(js_value_to_pattern).collect()), JsValue::Concat(_, parts) => { Pattern::Concatenation(parts.iter().map(js_value_to_pattern).collect()) diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/1/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/1/graph.snapshot index 02a531907288c6..4878de07550e25 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/1/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/1/graph.snapshot @@ -60,7 +60,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -83,7 +83,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ] diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/2/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/2/graph.snapshot index 7bea004bc849ef..aa24e8ff919b9f 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/2/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/2/graph.snapshot @@ -18,7 +18,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/assign/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/assign/graph.snapshot index 462efc74490157..3de47abdc5bb51 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/assign/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/assign/graph.snapshot @@ -30,7 +30,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -51,7 +51,7 @@ has_side_effects: true, }, ], - additional_property: None, + logical_property: None, }, ), ( @@ -72,7 +72,7 @@ has_side_effects: true, }, ], - additional_property: None, + logical_property: None, }, ), ( @@ -95,7 +95,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -118,7 +118,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -141,7 +141,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ] diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/conditional-import/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/conditional-import/graph.snapshot index c915ad6e5d4e9c..0199caec2444a4 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/conditional-import/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/conditional-import/graph.snapshot @@ -65,7 +65,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/cycle-cache/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/cycle-cache/graph.snapshot index f3523f6527d27a..c5d77d6fcc985e 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/cycle-cache/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/cycle-cache/graph.snapshot @@ -296,7 +296,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -332,7 +332,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -368,7 +368,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -503,7 +503,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -524,7 +524,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -545,7 +545,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -566,7 +566,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -587,7 +587,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -608,7 +608,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -629,7 +629,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -650,7 +650,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -671,7 +671,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -692,7 +692,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -713,7 +713,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -734,7 +734,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -755,7 +755,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -776,7 +776,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -797,7 +797,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -818,7 +818,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -839,7 +839,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -860,7 +860,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -881,7 +881,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -902,7 +902,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -923,7 +923,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -944,7 +944,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -965,7 +965,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -986,7 +986,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1007,7 +1007,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1028,7 +1028,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1049,7 +1049,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1070,7 +1070,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1091,7 +1091,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1112,7 +1112,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1133,7 +1133,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1154,7 +1154,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1175,7 +1175,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1196,7 +1196,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1217,7 +1217,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1238,7 +1238,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1259,7 +1259,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1280,7 +1280,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1301,7 +1301,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1322,7 +1322,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1343,7 +1343,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1364,7 +1364,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1385,7 +1385,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1412,7 +1412,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1457,7 +1457,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1502,7 +1502,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1547,7 +1547,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1592,7 +1592,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1637,7 +1637,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1682,7 +1682,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1715,7 +1715,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1748,7 +1748,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/default-args/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/default-args/graph.snapshot index 0c8ddb725b5a74..ac23445a8fd7a3 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/default-args/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/default-args/graph.snapshot @@ -72,7 +72,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -113,7 +113,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ] diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/esbuild-reduced/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/esbuild-reduced/graph.snapshot index c0bcce00b77a46..24bf0012aacbed 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/esbuild-reduced/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/esbuild-reduced/graph.snapshot @@ -56,7 +56,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -210,7 +210,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -304,7 +304,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/esbuild/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/esbuild/graph.snapshot index 7f0047cbf59a55..bb5b84ddd19aad 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/esbuild/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/esbuild/graph.snapshot @@ -90,7 +90,7 @@ mutable: true, }, ], - additional_property: None, + logical_property: None, }, ), ), @@ -194,7 +194,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -402,7 +402,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ), @@ -418,7 +418,7 @@ True, ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -829,7 +829,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -999,7 +999,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/md5-reduced/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/md5-reduced/graph.snapshot index 1ca1ef24bdf020..52680aefd324b4 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/md5-reduced/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/md5-reduced/graph.snapshot @@ -300,7 +300,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -626,7 +626,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -952,7 +952,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1273,7 +1273,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1326,7 +1326,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1496,7 +1496,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1523,7 +1523,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1550,7 +1550,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -1577,7 +1577,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/md5_2/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/md5_2/graph.snapshot index 361fb4b80c3023..2c29fc6aa48fa5 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/md5_2/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/md5_2/graph.snapshot @@ -1566,7 +1566,7 @@ has_side_effects: true, }, ], - additional_property: None, + logical_property: None, }, ), ( @@ -2809,7 +2809,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -4084,7 +4084,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -5352,7 +5352,7 @@ has_side_effects: true, }, ], - additional_property: None, + logical_property: None, }, ), ( @@ -5465,7 +5465,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( @@ -5660,7 +5660,7 @@ [], ), ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/member-call/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/member-call/graph.snapshot index 501899f404d7f7..76fcea0c60381b 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/member-call/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/member-call/graph.snapshot @@ -89,7 +89,7 @@ mutable: true, }, ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/nested-args/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/nested-args/graph.snapshot index d6c32c75c9927a..2ffd2360188658 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/nested-args/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/nested-args/graph.snapshot @@ -142,7 +142,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ), diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/op-assign/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/op-assign/graph.snapshot index 92b9df50755da9..92d230a5b2a381 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/op-assign/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/op-assign/graph.snapshot @@ -16,7 +16,7 @@ has_side_effects: true, }, ], - additional_property: None, + logical_property: None, }, ), ), @@ -71,7 +71,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/pack-2521/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/pack-2521/graph.snapshot index b32ec5e360cbe8..b0514f5fabc236 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/pack-2521/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/pack-2521/graph.snapshot @@ -180,7 +180,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ] diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/pack-2682/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/pack-2682/graph.snapshot index e6888748bdaa65..9363f06a5bf3c1 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/pack-2682/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/pack-2682/graph.snapshot @@ -168,7 +168,7 @@ ), ), ], - additional_property: None, + logical_property: None, }, ), ] diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/sequences/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/sequences/graph.snapshot index 8be1660817aca8..f444fb7deb3e71 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/sequences/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/sequences/graph.snapshot @@ -17,7 +17,7 @@ has_side_effects: true, }, ], - additional_property: None, + logical_property: None, }, ), ( diff --git a/crates/turbopack-ecmascript/tests/analyzer/graph/try/graph.snapshot b/crates/turbopack-ecmascript/tests/analyzer/graph/try/graph.snapshot index 1be893ba3faf32..68a3fd5f81264d 100644 --- a/crates/turbopack-ecmascript/tests/analyzer/graph/try/graph.snapshot +++ b/crates/turbopack-ecmascript/tests/analyzer/graph/try/graph.snapshot @@ -62,7 +62,7 @@ ], ), ], - additional_property: None, + logical_property: None, }, ), ]