feat(es/minifier): Enable conditionals by default (#4687)

crates/dbg-swc/.gitignore

@@ -1,10 +1,13 @@
 /*.output.js
 /input.js
 *.orig
+input.new.js
+input.orig.js
 
 *.txt
 
 /.input
+/.compare
 
 # creduce
 creduce_bug*

crates/dbg-swc/src/minify/compare.rs

@@ -1,14 +1,11 @@
-use std::{
-    path::{Path, PathBuf},
-    process::{Command, Stdio},
-    sync::Arc,
-};
+use std::{path::PathBuf, process::Command, sync::Arc};
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result};
 use clap::Args;
 use swc_common::SourceMap;
 
 use crate::util::{
+    make_pretty,
     minifier::{get_esbuild_output, get_minified},
     print_js,
 };
@@ -54,17 +51,3 @@ impl CompareCommand {
         Ok(())
     }
 }
-
-fn make_pretty(f: &Path) -> Result<()> {
-    let mut c = Command::new("npx");
-    c.stderr(Stdio::inherit());
-    c.arg("js-beautify").arg("--replace").arg(f);
-
-    let output = c.output().context("failed to run prettier")?;
-
-    if !output.status.success() {
-        bail!("prettier failed");
-    }
-
-    Ok(())
-}

crates/dbg-swc/src/minify/diff_options.rs

@@ -0,0 +1,122 @@
+use std::{
+    fs,
+    path::{Path, PathBuf},
+    process::Command,
+    sync::Arc,
+};
+
+use anyhow::{Context, Result};
+use clap::Args;
+use rayon::prelude::*;
+use swc_common::{SourceMap, GLOBALS};
+use swc_ecma_minifier::option::{CompressOptions, MinifyOptions};
+use swc_ecma_transforms_base::fixer::fixer;
+use swc_ecma_visit::VisitMutWith;
+use tracing::info;
+
+use crate::util::{all_js_files, make_pretty, parse_js, print_js};
+
+/// Useful for checking if the minifier is working correctly, even with the new
+/// option.
+#[derive(Debug, Args)]
+pub struct DiffOptionCommand {
+    pub path: PathBuf,
+
+    #[clap(long)]
+    pub open: bool,
+}
+
+impl DiffOptionCommand {
+    pub fn run(self, cm: Arc<SourceMap>) -> Result<()> {
+        let js_files = all_js_files(&self.path)?;
+
+        let inputs = js_files
+            .into_iter()
+            .filter(|p| p.file_name() == Some("input.js".as_ref()))
+            .collect::<Vec<_>>();
+
+        let files = GLOBALS.with(|globals| {
+            inputs
+                .into_par_iter()
+                .map(|f| GLOBALS.set(globals, || self.process_file(cm.clone(), &f)))
+                .collect::<Result<Vec<_>>>()
+        })?;
+
+        for (orig_path, new_path) in files.into_iter().flatten() {
+            if self.open {
+                let mut c = Command::new("code");
+                c.arg("--diff").arg("--wait");
+                c.arg(&orig_path);
+                c.arg(&new_path);
+                c.output().context("failed to run vscode")?;
+            }
+        }
+
+        Ok(())
+    }
+
+    fn process_file(&self, cm: Arc<SourceMap>, f: &Path) -> Result<Option<(PathBuf, PathBuf)>> {
+        info!("Processing `{}`", f.display());
+
+        let fm = cm.load_file(f)?;
+        let m = parse_js(fm)?;
+
+        let orig = {
+            let m = m.clone();
+            let mut m = swc_ecma_minifier::optimize(
+                m.module,
+                cm.clone(),
+                Some(&m.comments),
+                None,
+                &MinifyOptions {
+                    compress: Some(Default::default()),
+                    mangle: None,
+                    ..Default::default()
+                },
+                &swc_ecma_minifier::option::ExtraOptions {
+                    unresolved_mark: m.unresolved_mark,
+                    top_level_mark: m.top_level_mark,
+                },
+            );
+            m.visit_mut_with(&mut fixer(None));
+            print_js(cm.clone(), &m, false)?
+        };
+
+        let new = {
+            let mut m = swc_ecma_minifier::optimize(
+                m.module,
+                cm.clone(),
+                Some(&m.comments),
+                None,
+                &MinifyOptions {
+                    compress: Some(CompressOptions {
+                        conditionals: true,
+                        ..Default::default()
+                    }),
+                    mangle: None,
+                    ..Default::default()
+                },
+                &swc_ecma_minifier::option::ExtraOptions {
+                    unresolved_mark: m.unresolved_mark,
+                    top_level_mark: m.top_level_mark,
+                },
+            );
+            m.visit_mut_with(&mut fixer(None));
+            print_js(cm, &m, false)?
+        };
+
+        if orig == new {
+            fs::remove_file(f)?;
+            return Ok(None);
+        }
+
+        let orig_path = f.with_extension("orig.js");
+        fs::write(&orig_path, orig)?;
+        make_pretty(&orig_path)?;
+        let new_path = f.with_extension("new.js");
+        fs::write(&new_path, new)?;
+        make_pretty(&new_path)?;
+
+        Ok(Some((orig_path, new_path)))
+    }
+}

crates/dbg-swc/src/minify/mod.rs

@@ -4,9 +4,13 @@ use anyhow::Result;
 use clap::Subcommand;
 use swc_common::SourceMap;
 
-use self::{compare::CompareCommand, ensure_size::EnsureSize, reduce::ReduceCommand};
+use self::{
+    compare::CompareCommand, diff_options::DiffOptionCommand, ensure_size::EnsureSize,
+    reduce::ReduceCommand,
+};
 
 mod compare;
+mod diff_options;
 mod ensure_size;
 mod reduce;
 
@@ -15,6 +19,7 @@ mod reduce;
 pub enum MinifyCommand {
     Reduce(ReduceCommand),
     Compare(CompareCommand),
+    DiffOption(DiffOptionCommand),
     EnsureSize(EnsureSize),
 }
 
@@ -24,6 +29,7 @@ impl MinifyCommand {
             MinifyCommand::Reduce(cmd) => cmd.run(cm),
             MinifyCommand::EnsureSize(cmd) => cmd.run(cm),
             MinifyCommand::Compare(cmd) => cmd.run(cm),
+            MinifyCommand::DiffOption(cmd) => cmd.run(cm),
         }
     }
 }

crates/dbg-swc/src/util/mod.rs

@@ -1,5 +1,6 @@
 use std::{
     path::{Path, PathBuf},
+    process::{Command, Stdio},
     sync::Arc,
 };
 
@@ -21,6 +22,20 @@ where
     op()
 }
 
+pub fn make_pretty(f: &Path) -> Result<()> {
+    let mut c = Command::new("npx");
+    c.stderr(Stdio::inherit());
+    c.arg("js-beautify").arg("--replace").arg(f);
+
+    let output = c.output().context("failed to run prettier")?;
+
+    if !output.status.success() {
+        bail!("prettier failed");
+    }
+
+    Ok(())
+}
+
 pub fn parse_js(fm: Arc<SourceFile>) -> Result<ModuleRecord> {
     let unresolved_mark = Mark::new();
     let top_level_mark = Mark::new();
@@ -80,7 +95,7 @@ pub fn print_js(cm: Arc<SourceMap>, m: &Module, minify: bool) -> Result<String>
     String::from_utf8(buf).context("swc emitted non-utf8 output")
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct ModuleRecord {
     pub module: Module,
     pub comments: SingleThreadedComments,

crates/swc/tests/fixture/issues-4xxx/4249/1/output/index.js

@@ -1,5 +1,5 @@
 foo({
     bar: function(data, baz) {
-        !(!(baz ? data.quxA : data.quxB) && !(baz ? data.corgeA : data.corgeB) && (baz ? data.get("waldo") : data.waldo)) ? (baz ? data.quxA : data.quxB) || (baz ? data.get("waldo") : data.waldo) || (baz ? !data.corgeA : !data.corgeB) || pass() : pass();
+        !(!(baz ? data.quxA : data.quxB) && !(baz ? data.corgeA : data.corgeB) && (baz ? data.get("waldo") : data.waldo)) && ((baz ? data.quxA : data.quxB) || (baz ? data.get("waldo") : data.waldo) || (baz ? !data.corgeA : !data.corgeB)) || pass();
     }
 });

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

@@ -12,8 +12,7 @@ var Formatting;
         }
         GetIndentationEditsWorker(token, nextToken, node, sameLineIndent) {
             var result = new List_TextEditInfo(), indentationInfo = null;
-            if (this.AdjustStartOffsetIfNeeded(token, node), this.scriptBlockBeginLineNumber == token.lineNumber()) return result;
-            if (!sameLineIndent && this.IsMultiLineString(token)) return result;
+            if (this.AdjustStartOffsetIfNeeded(token, node), this.scriptBlockBeginLineNumber == token.lineNumber() || !sameLineIndent && this.IsMultiLineString(token)) return result;
             if (null == (indentationInfo = this.GetSpecialCaseIndentation(token, node))) {
                 for(; !node.CanIndent() && null != node.Parent && token.Span.span.start() == node.Parent.AuthorNode.Details.StartOffset;)node = node.Parent;
                 indentationInfo = node.CanIndent() && token.Span.span.start() == node.AuthorNode.Details.StartOffset ? node.GetEffectiveIndentation(this) : token.Token == AuthorTokenKind.atkIdentifier && null != nextToken && nextToken.Token == AuthorTokenKind.atkColon ? node.GetEffectiveChildrenIndentation(this) : this.ApplyIndentationDeltaFromParent(token, node);

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

@@ -17,8 +17,7 @@ import * as swcHelpers from "@swc/helpers";
             return result;
         }, _proto.GetIndentationEditsWorker = function(token, nextToken, node, sameLineIndent) {
             var result = new List_TextEditInfo(), indentationInfo = null;
-            if (this.AdjustStartOffsetIfNeeded(token, node), this.scriptBlockBeginLineNumber == token.lineNumber()) return result;
-            if (!sameLineIndent && this.IsMultiLineString(token)) return result;
+            if (this.AdjustStartOffsetIfNeeded(token, node), this.scriptBlockBeginLineNumber == token.lineNumber() || !sameLineIndent && this.IsMultiLineString(token)) return result;
             if (null == (indentationInfo = this.GetSpecialCaseIndentation(token, node))) {
                 for(; !node.CanIndent() && null != node.Parent && token.Span.span.start() == node.Parent.AuthorNode.Details.StartOffset;)node = node.Parent;
                 indentationInfo = node.CanIndent() && token.Span.span.start() == node.AuthorNode.Details.StartOffset ? node.GetEffectiveIndentation(this) : token.Token == AuthorTokenKind.atkIdentifier && null != nextToken && nextToken.Token == AuthorTokenKind.atkColon ? node.GetEffectiveChildrenIndentation(this) : this.ApplyIndentationDeltaFromParent(token, node);

crates/swc/tests/vercel/full/react-autosuggest/1/output/index.js

@@ -97,8 +97,7 @@ var ItemsList = function(_Component) {
     var Derived, Constructor1, protoProps, staticProps, _super = (Derived = ItemsList1, function() {
         var self, call, result, Super = _getPrototypeOf(Derived);
         if (function() {
-            if ("undefined" == typeof Reflect || !Reflect.construct) return !1;
-            if (Reflect.construct.sham) return !1;
+            if ("undefined" == typeof Reflect || !Reflect.construct || Reflect.construct.sham) return !1;
             if ("function" == typeof Proxy) return !0;
             try {
                 return Date.prototype.toString.call(Reflect.construct(Date, [], function() {})), !0;