feat(es/minifier): Compress common sub expressions in sequences (#7587)

Author: Austaras

crates/swc/tests/tsc-references/controlFlowOptionalChain.2.minified.js

@@ -616,6 +616,87 @@ impl Optimizer<'_> {
                 }))
             }
 
+            (Expr::Seq(left), Expr::Seq(right)) => {
+                let left_len = left.exprs.len();
+                let right_len = right.exprs.len();
+                let min_len = left_len.min(right_len);
+
+                let mut idx = 0;
+
+                while idx < min_len
+                    && left.exprs[left_len - idx - 1]
+                        .eq_ignore_span(&right.exprs[right_len - idx - 1])
+                    && !matches!(
+                        &*left.exprs[left_len - idx - 1],
+                        Expr::Yield(..) | Expr::Fn(..)
+                    )
+                {
+                    idx += 1;
+                }
+
+                if idx == 0 {
+                    None
+                } else if idx == left_len {
+                    self.changed = true;
+                    report_change!("conditionals: Reducing similar seq expr in cons");
+
+                    let mut alt = right.exprs.take();
+
+                    alt.truncate(alt.len() - idx);
+
+                    let mut seq = vec![Box::new(Expr::Bin(BinExpr {
+                        span: DUMMY_SP,
+                        left: test.take(),
+                        op: op!("||"),
+                        right: Expr::from_exprs(alt),
+                    }))];
+                    seq.append(&mut left.exprs);
+
+                    Some(Expr::Seq(SeqExpr {
+                        span: DUMMY_SP,
+                        exprs: seq,
+                    }))
+                } else if idx == right_len {
+                    self.changed = true;
+                    report_change!("conditionals: Reducing similar seq expr in alt");
+
+                    let mut cons = left.exprs.take();
+
+                    cons.truncate(cons.len() - idx);
+
+                    let mut seq = vec![Box::new(Expr::Bin(BinExpr {
+                        span: DUMMY_SP,
+                        left: test.take(),
+                        op: op!("&&"),
+                        right: Expr::from_exprs(cons),
+                    }))];
+                    seq.append(&mut right.exprs);
+
+                    Some(Expr::Seq(SeqExpr {
+                        span: DUMMY_SP,
+                        exprs: seq,
+                    }))
+                } else {
+                    self.changed = true;
+                    report_change!("conditionals: Reducing similar seq expr");
+                    let _ = left.exprs.split_off(left_len - idx);
+                    let mut common = right.exprs.split_off(right_len - idx);
+
+                    let mut seq = vec![Box::new(Expr::Cond(CondExpr {
+                        span: DUMMY_SP,
+                        test: test.take(),
+                        cons: Box::new(Expr::Seq(left.take())),
+                        alt: Box::new(Expr::Seq(right.take())),
+                    }))];
+                    seq.append(&mut common);
+
+                    Some(Expr::Seq(SeqExpr {
+                        span: DUMMY_SP,
+                        exprs: seq,
+                    }))
+                }
+            }
+
             _ => None,
         }
     }

crates/swc_ecma_minifier/src/compress/optimize/conditionals.rs

@@ -4208,7 +4208,7 @@
             (parent[i + 1 & 3] || parent[i + 2 & 3] || parent[i + 3 & 3]) && (retainer = parent, j = i);
         }
         for(; node.data !== d;)if (previous = node, !(node = node.next)) return this;
-        return ((next = node.next) && delete node.next, previous) ? (next ? previous.next = next : delete previous.next, this) : parent ? (next ? parent[i] = next : delete parent[i], (node = parent[0] || parent[1] || parent[2] || parent[3]) && node === (parent[3] || parent[2] || parent[1] || parent[0]) && !node.length && (retainer ? retainer[j] = node : this._root = node), this) : (this._root = next, this);
+        return ((next = node.next) && delete node.next, previous) ? next ? previous.next = next : delete previous.next : parent ? (next ? parent[i] = next : delete parent[i], (node = parent[0] || parent[1] || parent[2] || parent[3]) && node === (parent[3] || parent[2] || parent[1] || parent[0]) && !node.length && (retainer ? retainer[j] = node : this._root = node)) : this._root = next, this;
     }, treeProto.removeAll = function(data) {
         for(var i = 0, n = data.length; i < n; ++i)this.remove(data[i]);
         return this;
@@ -10067,11 +10067,11 @@
         return values;
     }, exports1.interval = function(callback, delay, time) {
         var t = new Timer, total = delay;
-        return null == delay ? (t.restart(callback, delay, time), t) : (t._restart = t.restart, t.restart = function(callback, delay, time) {
+        return null == delay || (t._restart = t.restart, t.restart = function(callback, delay, time) {
             delay = +delay, time = null == time ? now() : +time, t._restart(function tick(elapsed) {
                 elapsed += total, t._restart(tick, total += delay, time), callback(elapsed);
             }, delay, time);
-        }, t.restart(callback, delay, time), t);
+        }), t.restart(callback, delay, time), t;
     }, exports1.isoFormat = formatIso, exports1.isoParse = parseIso, exports1.json = function(input, init) {
         return fetch(input, init).then(responseJson);
     }, exports1.lab = lab, exports1.lch = function(l, c, h, opacity) {

crates/swc_ecma_minifier/tests/benches-full/d3.js

@@ -1059,7 +1059,7 @@
             }
         }, Transformable.prototype.getGlobalScale = function(out) {
             var m = this.transform;
-            return (out = out || [], m) ? (out[0] = Math.sqrt(m[0] * m[0] + m[1] * m[1]), out[1] = Math.sqrt(m[2] * m[2] + m[3] * m[3]), m[0] < 0 && (out[0] = -out[0]), m[3] < 0 && (out[1] = -out[1]), out) : (out[0] = 1, out[1] = 1, out);
+            return (out = out || [], m) ? (out[0] = Math.sqrt(m[0] * m[0] + m[1] * m[1]), out[1] = Math.sqrt(m[2] * m[2] + m[3] * m[3]), m[0] < 0 && (out[0] = -out[0]), m[3] < 0 && (out[1] = -out[1])) : (out[0] = 1, out[1] = 1), out;
         }, Transformable.prototype.transformCoordToLocal = function(x, y) {
             var v2 = [
                 x,
@@ -4327,12 +4327,12 @@
                 firstCmpt
             ] : [], result;
         }
-        return 'none' === indexOption || !1 === indexOption ? (assert(opt.enableNone, '`"none"` or `false` is not a valid value on index option.'), result.models = [], result) : ('all' === indexOption && (assert(opt.enableAll, '`"all"` is not a valid value on index option.'), indexOption = idOption = nameOption = null), result.models = ecModel.queryComponents({
+        return 'none' === indexOption || !1 === indexOption ? (assert(opt.enableNone, '`"none"` or `false` is not a valid value on index option.'), result.models = []) : ('all' === indexOption && (assert(opt.enableAll, '`"all"` is not a valid value on index option.'), indexOption = idOption = nameOption = null), result.models = ecModel.queryComponents({
             mainType: mainType,
             index: indexOption,
             id: idOption,
             name: nameOption
-        }), result);
+        })), result;
     }
     function setAttribute(dom, key, value) {
         dom.setAttribute ? dom.setAttribute(key, value) : dom[key] = value;
@@ -36753,19 +36753,16 @@
             ], xLeft += sizePlusGap), showPrevBtn && (prevBtnPosition = [
                 xLeft,
                 0
-            ], xLeft += sizePlusGap), showNextBtn && (nextBtnPosition = [
-                xRight - controlSize,
-                0
-            ], xRight -= sizePlusGap)) : (showPlayBtn && (playPosition = [
+            ], xLeft += sizePlusGap)) : (showPlayBtn && (playPosition = [
                 xRight - controlSize,
                 0
             ], xRight -= sizePlusGap), showPrevBtn && (prevBtnPosition = [
                 0,
                 0
-            ], xLeft += sizePlusGap), showNextBtn && (nextBtnPosition = [
+            ], xLeft += sizePlusGap)), showNextBtn && (nextBtnPosition = [
                 xRight - controlSize,
                 0
-            ], xRight -= sizePlusGap));
+            ], xRight -= sizePlusGap);
             var axisExtent = [
                 xLeft,
                 xRight

crates/swc_ecma_minifier/tests/benches-full/echarts.js

@@ -1522,7 +1522,7 @@
         return out;
     }
     function listWeekdaysImpl(localeSorted, format, index, field) {
-        'boolean' == typeof localeSorted ? (isNumber(format) && (index = format, format = void 0), format = format || '') : (index = format = localeSorted, localeSorted = !1, isNumber(format) && (index = format, format = void 0), format = format || '');
+        'boolean' == typeof localeSorted || (index = format = localeSorted, localeSorted = !1), isNumber(format) && (index = format, format = void 0), format = format || '';
         var i, locale = getLocale(), shift = localeSorted ? locale._week.dow : 0, out = [];
         if (null != index) return get$1(format, (index + shift) % 7, field, 'day');
         for(i = 0; i < 7; i++)out[i] = get$1(format, (i + shift) % 7, field, 'day');

crates/swc_ecma_minifier/tests/benches-full/moment.js

@@ -7235,15 +7235,15 @@
         var fixed = def.fixed;
         if (!fixed && "=" != node.operator && !node.logical) return finish_walk();
         var eq = "=" == node.operator, value = eq ? node.right : node;
-        return is_modified(compressor, tw, node, value, 0) ? finish_walk() : (def.references.push(sym), node.logical || (eq || (def.chained = !0), def.fixed = eq ? function() {
+        return is_modified(compressor, tw, node, value, 0) ? finish_walk() : ((def.references.push(sym), node.logical || (eq || (def.chained = !0), def.fixed = eq ? function() {
             return node.right;
         } : function() {
             return make_node(AST_Binary, node, {
                 operator: node.operator.slice(0, -1),
                 left: fixed instanceof AST_Node ? fixed : fixed(),
                 right: node.right
             });
-        }), node.logical) ? (mark(tw, def, !1), push(tw), node.right.walk(tw), pop(tw), !0) : (mark(tw, def, !1), node.right.walk(tw), mark(tw, def, !0), mark_escaped(tw, def, sym.scope, node, value, 0, 1), !0);
+        }), node.logical) ? (mark(tw, def, !1), push(tw), node.right.walk(tw), pop(tw)) : (mark(tw, def, !1), node.right.walk(tw), mark(tw, def, !0), mark_escaped(tw, def, sym.scope, node, value, 0, 1)), !0);
     }), def_reduce_vars(AST_Binary, function(tw) {
         if (lazy_op.has(this.operator)) return this.left.walk(tw), push(tw), this.right.walk(tw), pop(tw), !0;
     }), def_reduce_vars(AST_Block, function(tw, descend, compressor) {
@@ -8705,7 +8705,7 @@
                 operator: "void",
                 expression: expressions[end]
             }), expressions.length = end + 1);
-        }(), 0 == end) ? ((self1 = maintain_this_binding(compressor.parent(), compressor.self(), expressions[0])) instanceof AST_Sequence || (self1 = self1.optimize(compressor)), self1) : (self1.expressions = expressions, self1);
+        }(), 0 == end) ? (self1 = maintain_this_binding(compressor.parent(), compressor.self(), expressions[0])) instanceof AST_Sequence || (self1 = self1.optimize(compressor)) : self1.expressions = expressions, self1;
     }), AST_Unary.DEFMETHOD("lift_sequences", function(compressor) {
         if (compressor.option("sequences") && this.expression instanceof AST_Sequence) {
             var x = this.expression.expressions.slice(), e = this.clone();

crates/swc_ecma_minifier/tests/benches-full/terser.js

@@ -769,7 +769,7 @@
             return this._onChangeCallback(), this;
         }, _proto.setFromUnitVectors = function(vFrom, vTo) {
             var r = vFrom.dot(vTo) + 1;
-            return r < 0.000001 ? (r = 0, Math.abs(vFrom.x) > Math.abs(vFrom.z) ? (this._x = -vFrom.y, this._y = vFrom.x, this._z = 0, this._w = r) : (this._x = 0, this._y = -vFrom.z, this._z = vFrom.y, this._w = r)) : (this._x = vFrom.y * vTo.z - vFrom.z * vTo.y, this._y = vFrom.z * vTo.x - vFrom.x * vTo.z, this._z = vFrom.x * vTo.y - vFrom.y * vTo.x, this._w = r), this.normalize();
+            return r < 0.000001 ? (r = 0, Math.abs(vFrom.x) > Math.abs(vFrom.z) ? (this._x = -vFrom.y, this._y = vFrom.x, this._z = 0) : (this._x = 0, this._y = -vFrom.z, this._z = vFrom.y)) : (this._x = vFrom.y * vTo.z - vFrom.z * vTo.y, this._y = vFrom.z * vTo.x - vFrom.x * vTo.z, this._z = vFrom.x * vTo.y - vFrom.y * vTo.x), this._w = r, this.normalize();
         }, _proto.angleTo = function(q) {
             return 2 * Math.acos(Math.abs(MathUtils.clamp(this.dot(q), -1, 1)));
         }, _proto.rotateTowards = function(q, step) {
@@ -1229,7 +1229,7 @@
             var deltaLengthSq = this.center.distanceToSquared(point);
             return void 0 === target && (console.warn('THREE.Sphere: .clampPoint() target is now required'), target = new Vector3()), target.copy(point), deltaLengthSq > this.radius * this.radius && (target.sub(this.center).normalize(), target.multiplyScalar(this.radius).add(this.center)), target;
         }, _proto.getBoundingBox = function(target) {
-            return (void 0 === target && (console.warn('THREE.Sphere: .getBoundingBox() target is now required'), target = new Box3()), this.isEmpty()) ? (target.makeEmpty(), target) : (target.set(this.center, this.center), target.expandByScalar(this.radius), target);
+            return (void 0 === target && (console.warn('THREE.Sphere: .getBoundingBox() target is now required'), target = new Box3()), this.isEmpty()) ? target.makeEmpty() : (target.set(this.center, this.center), target.expandByScalar(this.radius)), target;
         }, _proto.applyMatrix4 = function(matrix) {
             return this.center.applyMatrix4(matrix), this.radius = this.radius * matrix.getMaxScaleOnAxis(), this;
         }, _proto.translate = function(offset) {
@@ -1700,7 +1700,7 @@
                 for(var i = 0; i < arguments.length; i++)this.add(arguments[i]);
                 return this;
             }
-            return object === this ? (console.error('THREE.Object3D.add: object can\'t be added as a child of itself.', object), this) : (object && object.isObject3D ? (null !== object.parent && object.parent.remove(object), object.parent = this, this.children.push(object), object.dispatchEvent(_addedEvent)) : console.error('THREE.Object3D.add: object not an instance of THREE.Object3D.', object), this);
+            return object === this ? console.error('THREE.Object3D.add: object can\'t be added as a child of itself.', object) : object && object.isObject3D ? (null !== object.parent && object.parent.remove(object), object.parent = this, this.children.push(object), object.dispatchEvent(_addedEvent)) : console.error('THREE.Object3D.add: object not an instance of THREE.Object3D.', object), this;
         },
         remove: function(object) {
             if (arguments.length > 1) {