refactor(minifier): make the minifier api only accept an ast (#990)

Cargo.lock

@@ -1669,7 +1669,10 @@ dependencies = [
  "humansize",
  "jemallocator",
  "mimalloc",
+ "oxc_allocator",
+ "oxc_codegen",
  "oxc_minifier",
+ "oxc_parser",
  "oxc_span",
  "oxc_tasks_common",
 ]

crates/oxc_codegen/Cargo.toml

@@ -25,4 +25,4 @@ bitflags   = { workspace = true }
 num-bigint = { workspace = true }
 
 [dev-dependencies]
-oxc_parser    = { workspace = true }
+oxc_parser = { workspace = true }

crates/oxc_minifier/Cargo.toml

@@ -18,18 +18,19 @@ doctest = false
 [dependencies]
 oxc_allocator = { workspace = true }
 oxc_span      = { workspace = true }
-oxc_parser    = { workspace = true }
 oxc_ast       = { workspace = true }
 oxc_semantic  = { workspace = true }
 oxc_syntax    = { workspace = true }
 oxc_index     = { workspace = true }
-oxc_codegen   = { workspace = true }
 
-num-bigint    = { workspace = true }
-itertools     = { workspace = true }
-num-traits    = { workspace = true }
+num-bigint = { workspace = true }
+itertools  = { workspace = true }
+num-traits = { workspace = true }
 
 [dev-dependencies]
+oxc_parser  = { workspace = true }
+oxc_codegen = { workspace = true }
+
 insta     = { workspace = true }
 walkdir   = { workspace = true }
 pico-args = { workspace = true }

crates/oxc_minifier/examples/minifier.rs

@@ -1,7 +1,11 @@
 use std::path::Path;
 
+use oxc_allocator::Allocator;
+use oxc_codegen::{Codegen, CodegenOptions};
 use oxc_minifier::{Minifier, MinifierOptions};
+use oxc_parser::Parser;
 use oxc_span::SourceType;
+
 use pico_args::Arguments;
 
 #[cfg(not(target_env = "msvc"))]
@@ -29,12 +33,20 @@ fn main() {
     let source_type = SourceType::from_path(path).unwrap();
 
     let options = MinifierOptions { mangle, ..MinifierOptions::default() };
-    let printed = Minifier::new(&source_text, source_type, options).build();
+    let printed = minify(&source_text, source_type, options);
     println!("{printed}");
 
     if twice {
         let options = MinifierOptions { mangle, ..MinifierOptions::default() };
-        let printed = Minifier::new(&printed, source_type, options).build();
+        let printed = minify(&printed, source_type, options);
         println!("{printed}");
     }
 }
+
+fn minify(source_text: &str, source_type: SourceType, options: MinifierOptions) -> String {
+    let allocator = Allocator::default();
+    let program = Parser::new(&allocator, source_text, source_type).parse().program;
+    let program = allocator.alloc(program);
+    Minifier::new(options).build(&allocator, program);
+    Codegen::<true>::new(source_text.len(), CodegenOptions).build(program)
+}

crates/oxc_minifier/src/lib.rs

@@ -4,52 +4,39 @@ mod compressor;
 mod mangler;
 
 use oxc_allocator::Allocator;
-use oxc_codegen::Codegen;
-use oxc_parser::Parser;
-use oxc_span::SourceType;
+use oxc_ast::ast::Program;
 
 pub use crate::{
     compressor::{CompressOptions, Compressor},
     mangler::ManglerBuilder,
 };
-pub use oxc_codegen::CodegenOptions;
 
 #[derive(Debug, Clone, Copy)]
 pub struct MinifierOptions {
     pub mangle: bool,
     pub compress: CompressOptions,
-    pub codegen: CodegenOptions,
 }
 
 impl Default for MinifierOptions {
     fn default() -> Self {
-        Self { mangle: true, compress: CompressOptions::default(), codegen: CodegenOptions }
+        Self { mangle: true, compress: CompressOptions::default() }
     }
 }
 
-pub struct Minifier<'a> {
-    source_text: &'a str,
-    source_type: SourceType,
+pub struct Minifier {
     options: MinifierOptions,
 }
 
-impl<'a> Minifier<'a> {
-    pub fn new(source_text: &'a str, source_type: SourceType, options: MinifierOptions) -> Self {
-        Self { source_text, source_type, options }
+impl Minifier {
+    pub fn new(options: MinifierOptions) -> Self {
+        Self { options }
     }
 
-    pub fn build(self) -> String {
-        let allocator = Allocator::default();
-        let ret = Parser::new(&allocator, self.source_text, self.source_type).parse();
-
-        let program = allocator.alloc(ret.program);
-        Compressor::new(&allocator, self.options.compress).build(program);
-
-        let codegen = Codegen::<true>::new(self.source_text.len(), self.options.codegen);
+    pub fn build<'a>(self, allocator: &'a Allocator, program: &mut Program<'a>) {
+        Compressor::new(allocator, self.options.compress).build(program);
         // if self.options.mangle {
         // let mangler = ManglerBuilder.build(program);
         // printer.with_mangler(mangler);
         // }
-        codegen.build(program)
     }
 }

crates/oxc_minifier/tests/mod.rs

@@ -6,9 +6,24 @@ mod oxc;
 mod tdewolff;
 mod terser;
 
-use oxc_minifier::{CodegenOptions, CompressOptions, Minifier, MinifierOptions};
+use oxc_allocator::Allocator;
+use oxc_codegen::{Codegen, CodegenOptions};
+use oxc_minifier::{CompressOptions, Minifier, MinifierOptions};
+use oxc_parser::Parser;
 use oxc_span::SourceType;
 
+pub(crate) fn minify(
+    source_text: &str,
+    source_type: SourceType,
+    options: MinifierOptions,
+) -> String {
+    let allocator = Allocator::default();
+    let program = Parser::new(&allocator, source_text, source_type).parse().program;
+    let program = allocator.alloc(program);
+    Minifier::new(options).build(&allocator, program);
+    Codegen::<true>::new(source_text.len(), CodegenOptions).build(program)
+}
+
 pub(crate) fn test(source_text: &str, expected: &str) {
     let options = MinifierOptions { mangle: false, ..MinifierOptions::default() };
     test_with_options(source_text, expected, options);
@@ -16,7 +31,7 @@ pub(crate) fn test(source_text: &str, expected: &str) {
 
 pub(crate) fn test_with_options(source_text: &str, expected: &str, options: MinifierOptions) {
     let source_type = SourceType::default();
-    let minified = Minifier::new(source_text, source_type, options).build();
+    let minified = minify(source_text, source_type, options);
     assert_eq!(expected, minified, "for source {source_text}");
 }
 
@@ -27,17 +42,16 @@ pub(crate) fn test_same(source_text: &str) {
 pub(crate) fn test_reparse(source_text: &str) {
     let source_type = SourceType::default();
     let options = MinifierOptions { mangle: false, ..MinifierOptions::default() };
-    let minified = Minifier::new(source_text, source_type, options).build();
-    let minified2 = Minifier::new(&minified, source_type, options).build();
+    let minified = minify(source_text, source_type, options);
+    let minified2 = minify(&minified, source_type, options);
     assert_eq!(minified, minified2, "for source {source_text}");
 }
 
 pub(crate) fn test_without_compress_booleans(source_text: &str, expected: &str) {
     let source_type = SourceType::default();
     let compress_options = CompressOptions { booleans: false, ..CompressOptions::default() };
-    let options =
-        MinifierOptions { mangle: false, compress: compress_options, codegen: CodegenOptions };
-    let minified = Minifier::new(source_text, source_type, options).build();
+    let options = MinifierOptions { mangle: false, compress: compress_options };
+    let minified = minify(source_text, source_type, options);
     assert_eq!(expected, minified, "for source {source_text}");
 }
 
@@ -50,7 +64,7 @@ where
     let snapshot: String = sources
         .into_iter()
         .map(|source| {
-            let minified = Minifier::new(source, source_type, options).build();
+            let minified = minify(source, source_type, options);
             format!(
                 "==================================== SOURCE ====================================
 {source}

crates/oxc_minifier/tests/oxc/code_removal.rs

@@ -23,7 +23,6 @@ fn console_removal() {
     let options = MinifierOptions {
         mangle: false,
         compress: CompressOptions { drop_console: true, ..CompressOptions::default() },
-        ..MinifierOptions::default()
     };
     test_with_options("console.log('hi')", "", options);
     test_with_options("let x = console.error('oops')", "let x", options);

crates/oxc_minifier/tests/terser/mod.rs

@@ -1,11 +1,13 @@
 use oxc_allocator::Allocator;
 #[allow(clippy::wildcard_imports)]
 use oxc_ast::ast::*;
-use oxc_minifier::{CodegenOptions, CompressOptions, Minifier, MinifierOptions};
+use oxc_minifier::{CompressOptions, MinifierOptions};
 use oxc_parser::Parser;
 use oxc_span::{SourceType, Span};
 use walkdir::WalkDir;
 
+use super::minify;
+
 #[test]
 fn test() {
     let files = WalkDir::new("tests/terser/fixtures")
@@ -65,12 +67,8 @@ impl TestCase {
         }
 
         let source_type = SourceType::default();
-        let options = MinifierOptions {
-            mangle: false,
-            compress: self.compress_options,
-            codegen: CodegenOptions,
-        };
-        let minified_source_text = Minifier::new(self.input.as_ref(), source_type, options).build();
+        let options = MinifierOptions { mangle: false, compress: self.compress_options };
+        let minified_source_text = minify(self.input.as_ref(), source_type, options);
         assert_eq!(
             remove_whitespace(minified_source_text.as_str()),
             remove_whitespace(self.expect.as_ref()),

crates/oxc_transformer/Cargo.toml

@@ -23,5 +23,5 @@ oxc_syntax    = { workspace = true }
 oxc_semantic  = { workspace = true }
 
 [dev-dependencies]
-oxc_parser    = { workspace = true }
-oxc_codegen   = { workspace = true }
+oxc_parser  = { workspace = true }
+oxc_codegen = { workspace = true }

tasks/benchmark/Cargo.toml

@@ -39,15 +39,16 @@ name    = "resolver"
 harness = false
 
 [dependencies]
-oxc_span                  = { workspace = true }
-oxc_allocator             = { workspace = true }
-oxc_parser                = { workspace = true }
-oxc_minifier              = { workspace = true }
-oxc_tasks_common          = { workspace = true }
-oxc_semantic              = { workspace = true }
-oxc_resolver              = { workspace = true }
-oxc_linter                = { workspace = true }
-oxc_transformer           = { workspace = true }
+oxc_span         = { workspace = true }
+oxc_allocator    = { workspace = true }
+oxc_parser       = { workspace = true }
+oxc_minifier     = { workspace = true }
+oxc_tasks_common = { workspace = true }
+oxc_semantic     = { workspace = true }
+oxc_resolver     = { workspace = true }
+oxc_linter       = { workspace = true }
+oxc_transformer  = { workspace = true }
+
 rayon                     = { workspace = true }
 criterion                 = { workspace = true }
 codspeed-criterion-compat = { workspace = true, optional = true }

tasks/benchmark/benches/minifier.rs

@@ -6,9 +6,12 @@ static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-use oxc_benchmark::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use oxc_allocator::Allocator;
 use oxc_minifier::{Minifier, MinifierOptions};
+use oxc_parser::Parser;
 use oxc_span::SourceType;
+
+use oxc_benchmark::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use oxc_tasks_common::TestFiles;
 
 fn bench_minifier(criterion: &mut Criterion) {
@@ -20,7 +23,13 @@ fn bench_minifier(criterion: &mut Criterion) {
             |b, source_text| {
                 let source_type = SourceType::from_path(&file.file_name).unwrap();
                 let options = MinifierOptions::default();
-                b.iter_with_large_drop(|| Minifier::new(source_text, source_type, options).build());
+                b.iter_with_large_drop(|| {
+                    let allocator = Allocator::default();
+                    let program = Parser::new(&allocator, source_text, source_type).parse().program;
+                    let program = allocator.alloc(program);
+                    Minifier::new(options).build(&allocator, program);
+                    allocator
+                });
             },
         );
     }

tasks/coverage/src/minifier.rs

@@ -1,6 +1,9 @@
 use std::path::{Path, PathBuf};
 
+use oxc_allocator::Allocator;
+use oxc_codegen::{Codegen, CodegenOptions};
 use oxc_minifier::{CompressOptions, Minifier, MinifierOptions};
+use oxc_parser::Parser;
 use oxc_span::SourceType;
 
 use crate::{
@@ -83,11 +86,19 @@ fn get_result(source_text: &str, source_type: SourceType) -> TestResult {
         compress: CompressOptions { evaluate: false, ..CompressOptions::default() },
         ..MinifierOptions::default()
     };
-    let source_text1 = Minifier::new(source_text, source_type, options).build();
-    let source_text2 = Minifier::new(&source_text1, source_type, options).build();
+    let source_text1 = minify(source_text, source_type, options);
+    let source_text2 = minify(&source_text1, source_type, options);
     if source_text1 == source_text2 {
         TestResult::Passed
     } else {
         TestResult::ParseError(String::new(), false)
     }
 }
+
+fn minify(source_text: &str, source_type: SourceType, options: MinifierOptions) -> String {
+    let allocator = Allocator::default();
+    let program = Parser::new(&allocator, source_text, source_type).parse().program;
+    let program = allocator.alloc(program);
+    Minifier::new(options).build(&allocator, program);
+    Codegen::<true>::new(source_text.len(), CodegenOptions).build(program)
+}

tasks/minsize/Cargo.toml

@@ -9,8 +9,11 @@ license.workspace = true
 doctest = false
 
 [dependencies]
-oxc_span     = { workspace = true }
-oxc_minifier = { workspace = true }
+oxc_span      = { workspace = true }
+oxc_allocator = { workspace = true }
+oxc_parser    = { workspace = true }
+oxc_codegen   = { workspace = true }
+oxc_minifier  = { workspace = true }
 
 oxc_tasks_common = { workspace = true }
 flate2           = { workspace = true }

tasks/minsize/src/lib.rs

@@ -14,7 +14,11 @@ use std::{
 use brotlic::{BlockSize, BrotliEncoderOptions, CompressorWriter, Quality, WindowSize};
 use flate2::{write::GzEncoder, Compression};
 use humansize::{format_size, DECIMAL};
+
+use oxc_allocator::Allocator;
+use oxc_codegen::{Codegen, CodegenOptions};
 use oxc_minifier::{CompressOptions, Minifier, MinifierOptions};
+use oxc_parser::Parser;
 use oxc_span::SourceType;
 use oxc_tasks_common::{project_root, TestFile, TestFiles};
 
@@ -41,7 +45,7 @@ pub fn run() -> Result<(), io::Error> {
     ));
     out.push_str(&format!(" {:width$}\n", "Brotli", width = 10));
     for file in files.files() {
-        let minified = minify(file);
+        let minified = minify_twice(file);
         let s = format!(
             "{:width$} -> {:width$} -> {:width$} {:width$} {}\n\n",
             format_size(file.source_text.len(), DECIMAL),
@@ -60,18 +64,26 @@ pub fn run() -> Result<(), io::Error> {
     Ok(())
 }
 
-fn minify(file: &TestFile) -> String {
+fn minify_twice(file: &TestFile) -> String {
     let source_type = SourceType::from_path(&file.file_name).unwrap();
     let options = MinifierOptions {
         compress: CompressOptions { evaluate: false, ..CompressOptions::default() },
         ..MinifierOptions::default()
     };
-    let source_text1 = Minifier::new(&file.source_text, source_type, options).build();
-    let source_text2 = Minifier::new(&source_text1, source_type, options).build();
+    let source_text1 = minify(&file.source_text, source_type, options);
+    let source_text2 = minify(&source_text1, source_type, options);
     assert!(source_text1 == source_text2, "Minification failed for {}", &file.file_name);
     source_text2
 }
 
+fn minify(source_text: &str, source_type: SourceType, options: MinifierOptions) -> String {
+    let allocator = Allocator::default();
+    let program = Parser::new(&allocator, source_text, source_type).parse().program;
+    let program = allocator.alloc(program);
+    Minifier::new(options).build(&allocator, program);
+    Codegen::<true>::new(source_text.len(), CodegenOptions).build(program)
+}
+
 fn gzip_size(s: &str) -> usize {
     let mut e = GzEncoder::new(Vec::new(), Compression::best());
     e.write_all(s.as_bytes()).unwrap();