Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 19 additions & 16 deletions crates/oxc_ecmascript/src/constant_evaluation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -495,15 +495,7 @@ impl<'a> ConstantEvaluation<'a> for StaticMemberExpression<'a> {
_target_ty: Option<ValueType>,
) -> Option<ConstantValue<'a>> {
match self.property.name.as_str() {
"length" => {
if let Some(ConstantValue::String(s)) = self.object.evaluate_value(ctx) {
Some(ConstantValue::Number(s.encode_utf16().count().to_f64().unwrap()))
} else if let Expression::ArrayExpression(arr) = &self.object {
Some(ConstantValue::Number(arr.elements.len().to_f64().unwrap()))
} else {
None
}
}
"length" => evaluate_value_length(&self.object, ctx),
_ => None,
}
}
Expand All @@ -517,19 +509,30 @@ impl<'a> ConstantEvaluation<'a> for ComputedMemberExpression<'a> {
) -> Option<ConstantValue<'a>> {
match &self.expression {
Expression::StringLiteral(s) if s.value == "length" => {
if let Some(ConstantValue::String(s)) = self.object.evaluate_value(ctx) {
Some(ConstantValue::Number(s.encode_utf16().count().to_f64().unwrap()))
} else if let Expression::ArrayExpression(arr) = &self.object {
Some(ConstantValue::Number(arr.elements.len().to_f64().unwrap()))
} else {
None
}
evaluate_value_length(&self.object, ctx)
}
_ => None,
}
}
}

fn evaluate_value_length<'a>(
object: &Expression<'a>,
ctx: &impl ConstantEvaluationCtx<'a>,
) -> Option<ConstantValue<'a>> {
if let Some(ConstantValue::String(s)) = object.evaluate_value(ctx) {
Some(ConstantValue::Number(s.encode_utf16().count().to_f64().unwrap()))
} else if let Expression::ArrayExpression(arr) = object {
if arr.elements.iter().any(|e| matches!(e, ArrayExpressionElement::SpreadElement(_))) {
None
} else {
Some(ConstantValue::Number(arr.elements.len().to_f64().unwrap()))
}
} else {
None
}
}

impl<'a> ConstantEvaluation<'a> for CallExpression<'a> {
fn evaluate_value_to(
&self,
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_minifier/src/peephole/fold_constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1778,6 +1778,7 @@ mod test {
// Cannot fold
fold("x = [foo(), 0].length", "x = [foo(),0].length");
fold_same("x = y.length");
fold_same("[...[1, 2, 3]].length");
}

#[test]
Expand Down
Loading