Skip to content

feat(minifier): minify conditions with de Morgan's law. #6698

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

Closed
7086cmd wants to merge 1 commit into from
Closed

feat(minifier): minify conditions with de Morgan's law. #6698

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
66 changes: 56 additions & 10 deletions crates/oxc_minifier/src/ast_passes/peephole_minimize_conditions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use oxc_ast::ast::*;
use oxc_span::SPAN;
use oxc_traverse::{Traverse, TraverseCtx};

use crate::CompressorPass;
Expand Down Expand Up @@ -42,19 +43,65 @@ impl<'a> PeepholeMinimizeConditions {
Self { changed: false }
}

// Utils
fn apply_unary_not(expr: &mut Expression<'a>, ctx: &mut TraverseCtx<'a>) -> Expression<'a> {
match expr {
Expression::UnaryExpression(unary) if unary.operator.is_not() => {
ctx.ast.move_expression(&mut unary.argument)
}
_ => ctx.ast.expression_unary(
SPAN,
UnaryOperator::LogicalNot,
ctx.ast.move_expression(expr),
),
}
}

/// This functionality checks if the unary operator will increase the number of quotes.
/// Scenes that will increase the number of quotes are binary.
fn will_unary_increase_quotes(expr: &Expression<'a>) -> i32 {
match expr {
Expression::BinaryExpression(_) | Expression::LogicalExpression(_) => 1,
Expression::UnaryExpression(un) if un.operator.is_not() => -1,
_ => 0,
}
}

/// Try to minimize NOT nodes such as `!(x==y)`.
fn try_minimize_not(
expr: &mut UnaryExpression<'a>,
ctx: &mut TraverseCtx<'a>,
) -> Option<Expression<'a>> {
debug_assert!(expr.operator.is_not());
if let Expression::BinaryExpression(binary_expr) = &mut expr.argument {
if let Some(new_op) = binary_expr.operator.equality_inverse_operator() {
binary_expr.operator = new_op;
return Some(ctx.ast.move_expression(&mut expr.argument));
match &mut expr.argument {
Expression::BinaryExpression(binary_expr) => {
binary_expr.operator = binary_expr.operator.equality_inverse_operator()?;
Some(ctx.ast.move_expression(&mut expr.argument))
}
Expression::UnaryExpression(unary_expr) if unary_expr.operator.is_not() => {
Some(ctx.ast.move_expression(&mut unary_expr.argument))
}
Expression::LogicalExpression(logical_expr) => {
let new_op = match logical_expr.operator {
LogicalOperator::And => LogicalOperator::Or,
LogicalOperator::Or => LogicalOperator::And,
LogicalOperator::Coalesce => return None,
};
// Apply each of the De Morgan's laws
// It can handle the not in other iterations.
let left_increase = Self::will_unary_increase_quotes(&logical_expr.left);
let right_increase = Self::will_unary_increase_quotes(&logical_expr.right);
(left_increase + right_increase < 1).then(|| {
ctx.ast.expression_logical(
expr.span,
Self::apply_unary_not(&mut logical_expr.left, ctx),
new_op,
Self::apply_unary_not(&mut logical_expr.right, ctx),
)
})
}
_ => None,
}
None
}
}

Expand Down Expand Up @@ -357,10 +404,9 @@ mod test {
}

#[test]
#[ignore]
fn test_minimize_while_condition() {
// This test uses constant folding logic, so is only here for completeness.
fold("while(!!true) foo()", "while(1) foo()");
// fold("while(!!true) foo()", "while(1) foo()");
// These test tryMinimizeCondition
fold("while(!!x) foo()", "while(x) foo()");
fold("while(!(!x&&!y)) foo()", "while(x||y) foo()");
Expand All @@ -374,9 +420,9 @@ mod test {
fold_same("while(!(x+y||z)) foo()");
fold_same("while(!(x&&y*z)) foo()");
fold("while(!(!!x&&y)) foo()", "while(!x||!y) foo()");
fold("while(x&&!0) foo()", "while(x) foo()");
fold("while(x||!1) foo()", "while(x) foo()");
fold("while(!((x,y)&&z)) foo()", "while((x,!y)||!z) foo()");
// fold("while(x&&!0) foo()", "while(x) foo()");
// fold("while(x||!1) foo()", "while(x) foo()");
// fold("while(!((x,y)&&z)) foo()", "while((x,!y)||!z) foo()");
}

#[test]
Expand Down
24 changes: 12 additions & 12 deletions tasks/minsize/minsize.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
Original | Minified | esbuild | Gzip | esbuild

72.14 kB | 24.12 kB | 23.70 kB | 8.62 kB | 8.54 kB | react.development.js
72.14 kB | 24.12 kB | 23.70 kB | 8.61 kB | 8.54 kB | react.development.js

173.90 kB | 61.67 kB | 59.82 kB | 19.54 kB | 19.33 kB | moment.js
173.90 kB | 61.66 kB | 59.82 kB | 19.54 kB | 19.33 kB | moment.js

287.63 kB | 92.70 kB | 90.07 kB | 32.27 kB | 31.95 kB | jquery.js
287.63 kB | 92.66 kB | 90.07 kB | 32.24 kB | 31.95 kB | jquery.js

342.15 kB | 121.90 kB | 118.14 kB | 44.59 kB | 44.37 kB | vue.js
342.15 kB | 121.86 kB | 118.14 kB | 44.56 kB | 44.37 kB | vue.js

544.10 kB | 73.49 kB | 72.48 kB | 26.13 kB | 26.20 kB | lodash.js
544.10 kB | 73.44 kB | 72.48 kB | 26.09 kB | 26.20 kB | lodash.js

555.77 kB | 276.27 kB | 270.13 kB | 91.09 kB | 90.80 kB | d3.js
555.77 kB | 276.23 kB | 270.13 kB | 91.05 kB | 90.80 kB | d3.js

1.01 MB | 467.63 kB | 458.89 kB | 126.75 kB | 126.71 kB | bundle.min.js
1.01 MB | 467.59 kB | 458.89 kB | 126.74 kB | 126.71 kB | bundle.min.js

1.25 MB | 662.73 kB | 646.76 kB | 164.00 kB | 163.73 kB | three.js
1.25 MB | 662.63 kB | 646.76 kB | 163.99 kB | 163.73 kB | three.js

2.14 MB | 741.37 kB | 724.14 kB | 181.41 kB | 181.07 kB | victory.js
2.14 MB | 741.28 kB | 724.14 kB | 181.36 kB | 181.07 kB | victory.js

3.20 MB | 1.02 MB | 1.01 MB | 331.98 kB | 331.56 kB | echarts.js
3.20 MB | 1.02 MB | 1.01 MB | 331.75 kB | 331.56 kB | echarts.js

6.69 MB | 2.39 MB | 2.31 MB | 496.10 kB | 488.28 kB | antd.js
6.69 MB | 2.39 MB | 2.31 MB | 495.86 kB | 488.28 kB | antd.js

10.95 MB | 3.56 MB | 3.49 MB | 911.23 kB | 915.50 kB | typescript.js
10.95 MB | 3.56 MB | 3.49 MB | 909.92 kB | 915.50 kB | typescript.js