diff --git a/crates/oxc/src/compiler.rs b/crates/oxc/src/compiler.rs index ef5196ba8147f..c2f3a055fcb43 100644 --- a/crates/oxc/src/compiler.rs +++ b/crates/oxc/src/compiler.rs @@ -27,7 +27,7 @@ impl CompilerInterface for Compiler { } fn after_codegen(&mut self, ret: CodegenReturn) { - self.printed = ret.source_text; + self.printed = ret.code; } } diff --git a/crates/oxc_codegen/examples/codegen.rs b/crates/oxc_codegen/examples/codegen.rs index 9fceb36b286ba..3804cf50d0921 100644 --- a/crates/oxc_codegen/examples/codegen.rs +++ b/crates/oxc_codegen/examples/codegen.rs @@ -68,5 +68,5 @@ fn codegen(source_text: &str, ret: &ParserReturn<'_>, minify: bool) -> String { ) .with_options(CodegenOptions { minify, ..CodegenOptions::default() }) .build(&ret.program) - .source_text + .code } diff --git a/crates/oxc_codegen/examples/sourcemap.rs b/crates/oxc_codegen/examples/sourcemap.rs index 779ef4caeefc2..8518287972b3f 100644 --- a/crates/oxc_codegen/examples/sourcemap.rs +++ b/crates/oxc_codegen/examples/sourcemap.rs @@ -27,19 +27,14 @@ fn main() -> std::io::Result<()> { return Ok(()); } - let CodegenReturn { source_text, source_map } = CodeGenerator::new() + let CodegenReturn { code, map } = CodeGenerator::new() .enable_source_map(path.to_string_lossy().as_ref(), &source_text) .build(&ret.program); - if let Some(source_map) = source_map { + if let Some(source_map) = map { let result = source_map.to_json_string(); - let hash = BASE64_STANDARD.encode(format!( - "{}\0{}{}\0{}", - source_text.len(), - source_text, - result.len(), - result - )); + let hash = + BASE64_STANDARD.encode(format!("{}\0{}{}\0{}", code.len(), code, result.len(), result)); println!("https://evanw.github.io/source-map-visualization/#{hash}"); } diff --git a/crates/oxc_codegen/src/lib.rs b/crates/oxc_codegen/src/lib.rs index 40871c85cc1b6..9d8fe0cc30a71 100644 --- a/crates/oxc_codegen/src/lib.rs +++ b/crates/oxc_codegen/src/lib.rs @@ -58,11 +58,11 @@ pub struct CommentOptions { /// Output from [`Codegen::build`] pub struct CodegenReturn { /// The generated source code. - pub source_text: String, + pub code: String, /// The source map from the input source code to the generated source code. /// /// You must use [`Codegen::enable_source_map`] for this to be [`Some`]. - pub source_map: Option, + pub map: Option, } pub struct Codegen<'a> { @@ -228,9 +228,9 @@ impl<'a> Codegen<'a> { #[must_use] pub fn build(mut self, program: &Program<'_>) -> CodegenReturn { program.print(&mut self, Context::default()); - let source_text = self.into_source_text(); - let source_map = self.sourcemap_builder.map(SourcemapBuilder::into_sourcemap); - CodegenReturn { source_text, source_map } + let code = self.into_source_text(); + let map = self.sourcemap_builder.map(SourcemapBuilder::into_sourcemap); + CodegenReturn { code, map } } #[must_use] diff --git a/crates/oxc_codegen/tests/integration/main.rs b/crates/oxc_codegen/tests/integration/main.rs index 31327f9a484d0..73e5b9827b3b2 100644 --- a/crates/oxc_codegen/tests/integration/main.rs +++ b/crates/oxc_codegen/tests/integration/main.rs @@ -23,7 +23,7 @@ pub fn codegen(source_text: &str) -> String { CommentOptions { preserve_annotate_comments: true }, ) .build(&ret.program) - .source_text + .code } pub fn snapshot(name: &str, cases: &[&str]) { diff --git a/crates/oxc_codegen/tests/integration/tester.rs b/crates/oxc_codegen/tests/integration/tester.rs index 10b2d6acf202f..6dd64ba49a1af 100644 --- a/crates/oxc_codegen/tests/integration/tester.rs +++ b/crates/oxc_codegen/tests/integration/tester.rs @@ -14,7 +14,7 @@ pub fn test(source_text: &str, expected: &str) { CommentOptions { preserve_annotate_comments: true }, ) .build(&ret.program) - .source_text; + .code; assert_eq!(result, expected, "\nfor source: {source_text:?}"); } @@ -22,7 +22,7 @@ pub fn test_without_source(source_text: &str, expected: &str) { let source_type = SourceType::jsx(); let allocator = Allocator::default(); let ret = Parser::new(&allocator, source_text, source_type).parse(); - let result = CodeGenerator::new().build(&ret.program).source_text; + let result = CodeGenerator::new().build(&ret.program).code; assert_eq!(result, expected, "\nfor source: {source_text:?}"); } @@ -33,6 +33,6 @@ pub fn test_minify(source_text: &str, expected: &str) { let result = CodeGenerator::new() .with_options(CodegenOptions { minify: true, ..CodegenOptions::default() }) .build(&ret.program) - .source_text; + .code; assert_eq!(result, expected, "\nfor minify source: {source_text}"); } diff --git a/crates/oxc_isolated_declarations/examples/isolated_declarations.rs b/crates/oxc_isolated_declarations/examples/isolated_declarations.rs index c20970ea0f4c4..fedc99f37c04a 100644 --- a/crates/oxc_isolated_declarations/examples/isolated_declarations.rs +++ b/crates/oxc_isolated_declarations/examples/isolated_declarations.rs @@ -46,7 +46,7 @@ fn main() { CommentOptions { preserve_annotate_comments: false }, ) .build(&id_ret.program) - .source_text; + .code; println!("Dts Emit:\n"); println!("{printed}\n"); diff --git a/crates/oxc_isolated_declarations/tests/deno/mod.rs b/crates/oxc_isolated_declarations/tests/deno/mod.rs index 211b7f3b37947..d9ca61aecdb9d 100644 --- a/crates/oxc_isolated_declarations/tests/deno/mod.rs +++ b/crates/oxc_isolated_declarations/tests/deno/mod.rs @@ -20,9 +20,9 @@ mod tests { IsolatedDeclarationsOptions { strip_internal: true }, ) .build(&ret.program); - let actual = CodeGenerator::new().build(&ret.program).source_text; + let actual = CodeGenerator::new().build(&ret.program).code; let expected_program = Parser::new(&allocator, expected, source_type).parse().program; - let expected = CodeGenerator::new().build(&expected_program).source_text; + let expected = CodeGenerator::new().build(&expected_program).code; assert_eq!(actual.trim(), expected.trim()); } diff --git a/crates/oxc_isolated_declarations/tests/mod.rs b/crates/oxc_isolated_declarations/tests/mod.rs index 84531a961d905..e67169764e6d2 100644 --- a/crates/oxc_isolated_declarations/tests/mod.rs +++ b/crates/oxc_isolated_declarations/tests/mod.rs @@ -27,7 +27,7 @@ fn transform(path: &Path, source_text: &str) -> String { CommentOptions { preserve_annotate_comments: false }, ) .build(&id_ret.program) - .source_text; + .code; let mut snapshot = format!("```\n==================== .D.TS ====================\n\n{code}\n\n"); diff --git a/crates/oxc_minifier/examples/mangler.rs b/crates/oxc_minifier/examples/mangler.rs index 3e71995dbddfd..620bc522027ee 100644 --- a/crates/oxc_minifier/examples/mangler.rs +++ b/crates/oxc_minifier/examples/mangler.rs @@ -40,5 +40,5 @@ fn mangler(source_text: &str, source_type: SourceType, debug: bool) -> String { let ret = Parser::new(&allocator, source_text, source_type).parse(); let program = allocator.alloc(ret.program); let mangler = Mangler::new().with_options(MangleOptions { debug }).build(program); - CodeGenerator::new().with_mangler(Some(mangler)).build(program).source_text + CodeGenerator::new().with_mangler(Some(mangler)).build(program).code } diff --git a/crates/oxc_minifier/examples/minifier.rs b/crates/oxc_minifier/examples/minifier.rs index 21671c6a39d7f..df11ac47ba4ff 100644 --- a/crates/oxc_minifier/examples/minifier.rs +++ b/crates/oxc_minifier/examples/minifier.rs @@ -47,5 +47,5 @@ fn minify( let mut program = ret.program; let options = MinifierOptions { mangle, compress: CompressOptions::default() }; let ret = Minifier::new(options).build(allocator, &mut program); - CodeGenerator::new().with_mangler(ret.mangler).build(&program).source_text + CodeGenerator::new().with_mangler(ret.mangler).build(&program).code } diff --git a/crates/oxc_minifier/src/tester.rs b/crates/oxc_minifier/src/tester.rs index be10af518e08c..e159d0036f0b9 100644 --- a/crates/oxc_minifier/src/tester.rs +++ b/crates/oxc_minifier/src/tester.rs @@ -37,5 +37,5 @@ fn run<'a, P: CompressorPass<'a>>( CodeGenerator::new() .with_options(CodegenOptions { single_quote: true, ..CodegenOptions::default() }) .build(&program) - .source_text + .code } diff --git a/crates/oxc_minifier/tests/mangler/mod.rs b/crates/oxc_minifier/tests/mangler/mod.rs index 8ce4ef7913dfd..e264e2075d132 100644 --- a/crates/oxc_minifier/tests/mangler/mod.rs +++ b/crates/oxc_minifier/tests/mangler/mod.rs @@ -12,7 +12,7 @@ fn mangle(source_text: &str) -> String { let ret = Parser::new(&allocator, source_text, source_type).parse(); let program = ret.program; let mangler = Mangler::new().build(&program); - CodeGenerator::new().with_mangler(Some(mangler)).build(&program).source_text + CodeGenerator::new().with_mangler(Some(mangler)).build(&program).code } #[test] diff --git a/crates/oxc_minifier/tests/mod.rs b/crates/oxc_minifier/tests/mod.rs index 2b6812d0d6be5..b0417b98c3c95 100644 --- a/crates/oxc_minifier/tests/mod.rs +++ b/crates/oxc_minifier/tests/mod.rs @@ -24,5 +24,5 @@ fn run(source_text: &str, source_type: SourceType, options: Option String { CodeGenerator::new() .with_options(CodegenOptions { single_quote: true, ..CodegenOptions::default() }) .build(program) - .source_text + .code } diff --git a/crates/oxc_transformer/tests/plugins/replace_global_defines.rs b/crates/oxc_transformer/tests/plugins/replace_global_defines.rs index c096cb36b03f3..9fa7aec2293df 100644 --- a/crates/oxc_transformer/tests/plugins/replace_global_defines.rs +++ b/crates/oxc_transformer/tests/plugins/replace_global_defines.rs @@ -20,7 +20,7 @@ pub(crate) fn test(source_text: &str, expected: &str, config: ReplaceGlobalDefin let result = CodeGenerator::new() .with_options(CodegenOptions { single_quote: true, ..CodegenOptions::default() }) .build(program) - .source_text; + .code; let expected = run(expected, source_type); assert_eq!(result, expected, "for source {source_text}"); } diff --git a/crates/oxc_wasm/src/lib.rs b/crates/oxc_wasm/src/lib.rs index a3d3fef65bc08..ef245fd626502 100644 --- a/crates/oxc_wasm/src/lib.rs +++ b/crates/oxc_wasm/src/lib.rs @@ -285,7 +285,7 @@ impl Oxc { ..CodegenOptions::default() }) .build(&program) - .source_text; + .code; Ok(()) } diff --git a/napi/minify/src/lib.rs b/napi/minify/src/lib.rs index bed6d9a655d05..550785a5e69a0 100644 --- a/napi/minify/src/lib.rs +++ b/napi/minify/src/lib.rs @@ -24,5 +24,5 @@ pub fn minify(filename: String, source_text: String) -> String { .with_mangler(mangler) .with_capacity(source_text.len()) .build(&program) - .source_text + .code } diff --git a/napi/transform/src/isolated_declaration.rs b/napi/transform/src/isolated_declaration.rs index 3c78170594e94..bda6c65a9744e 100644 --- a/napi/transform/src/isolated_declaration.rs +++ b/napi/transform/src/isolated_declaration.rs @@ -55,8 +55,8 @@ pub fn isolated_declaration( let errors = wrap_diagnostics(source_path, source_type, &source_text, errors); IsolatedDeclarationsResult { - code: codegen_ret.source_text, - map: codegen_ret.source_map.map(SourceMap::from), + code: codegen_ret.code, + map: codegen_ret.map.map(SourceMap::from), errors, } } diff --git a/napi/transform/src/transformer.rs b/napi/transform/src/transformer.rs index 893a738bccc2b..28f194ddf6336 100644 --- a/napi/transform/src/transformer.rs +++ b/napi/transform/src/transformer.rs @@ -112,13 +112,13 @@ impl CompilerInterface for Compiler { } fn after_codegen(&mut self, ret: CodegenReturn) { - self.printed = ret.source_text; - self.printed_sourcemap = ret.source_map.map(SourceMap::from); + self.printed = ret.code; + self.printed_sourcemap = ret.map.map(SourceMap::from); } fn after_isolated_declarations(&mut self, ret: CodegenReturn) { - self.declaration.replace(ret.source_text); - self.declaration_map = ret.source_map.map(SourceMap::from); + self.declaration.replace(ret.code); + self.declaration_map = ret.map.map(SourceMap::from); } } diff --git a/tasks/benchmark/benches/codegen.rs b/tasks/benchmark/benches/codegen.rs index c7e5979bdb105..f7fe082b1ec49 100644 --- a/tasks/benchmark/benches/codegen.rs +++ b/tasks/benchmark/benches/codegen.rs @@ -15,7 +15,7 @@ fn bench_codegen(criterion: &mut Criterion) { let mut group = criterion.benchmark_group("codegen"); group.bench_with_input(id.clone(), &ret.program, |b, program| { - b.iter_with_large_drop(|| CodeGenerator::new().build(program).source_map); + b.iter_with_large_drop(|| CodeGenerator::new().build(program).map); }); group.finish(); diff --git a/tasks/benchmark/benches/sourcemap.rs b/tasks/benchmark/benches/sourcemap.rs index 691f69f034d04..a5fcef03c201b 100644 --- a/tasks/benchmark/benches/sourcemap.rs +++ b/tasks/benchmark/benches/sourcemap.rs @@ -17,16 +17,16 @@ fn bench_sourcemap(criterion: &mut Criterion) { let allocator = Allocator::default(); let ret = Parser::new(&allocator, source_text, source_type).parse(); - let CodegenReturn { source_text: output_txt, .. } = CodeGenerator::new() + let CodegenReturn { code: output_txt, .. } = CodeGenerator::new() .enable_source_map(file.file_name.as_str(), source_text) .build(&ret.program); let lines = output_txt.matches('\n').count() as u32; b.iter(|| { - let CodegenReturn { source_map, .. } = CodeGenerator::new() + let CodegenReturn { map, .. } = CodeGenerator::new() .enable_source_map(file.file_name.as_str(), source_text) .build(&ret.program); - if let Some(sourcemap) = source_map { + if let Some(sourcemap) = map { let concat_sourcemap_builder = ConcatSourceMapBuilder::from_sourcemaps(&[ (&sourcemap, 0), (&sourcemap, lines), diff --git a/tasks/coverage/src/driver.rs b/tasks/coverage/src/driver.rs index 655fbd08a077d..790219c359fc3 100644 --- a/tasks/coverage/src/driver.rs +++ b/tasks/coverage/src/driver.rs @@ -111,7 +111,7 @@ impl CompilerInterface for Driver { } fn after_codegen(&mut self, ret: CodegenReturn) { - self.printed = ret.source_text; + self.printed = ret.code; } } diff --git a/tasks/coverage/src/runtime/mod.rs b/tasks/coverage/src/runtime/mod.rs index 0b534fdce00ca..41200b3d62042 100644 --- a/tasks/coverage/src/runtime/mod.rs +++ b/tasks/coverage/src/runtime/mod.rs @@ -139,7 +139,7 @@ impl Case for CodegenRuntimeTest262Case { let source_type = SourceType::default().with_module(is_module); let allocator = Allocator::default(); let ret = Parser::new(&allocator, source_text, source_type).parse(); - let mut text = CodeGenerator::new().build(&ret.program).source_text; + let mut text = CodeGenerator::new().build(&ret.program).code; if is_only_strict { text = format!("\"use strict\";\n{text}"); } diff --git a/tasks/coverage/src/typescript/meta.rs b/tasks/coverage/src/typescript/meta.rs index 35eb9897d182b..924032a20f80e 100644 --- a/tasks/coverage/src/typescript/meta.rs +++ b/tasks/coverage/src/typescript/meta.rs @@ -202,7 +202,7 @@ impl Baseline { let allocator = Allocator::default(); let source_type = SourceType::from_path(Path::new(&self.name)).unwrap(); let ret = Parser::new(&allocator, &self.original, source_type).parse(); - let printed = CodeGenerator::new().build(&ret.program).source_text; + let printed = CodeGenerator::new().build(&ret.program).code; self.oxc_printed = printed; } diff --git a/tasks/coverage/src/typescript/transpile_runner.rs b/tasks/coverage/src/typescript/transpile_runner.rs index 06667c93fb512..c04325b015cc0 100644 --- a/tasks/coverage/src/typescript/transpile_runner.rs +++ b/tasks/coverage/src/typescript/transpile_runner.rs @@ -185,6 +185,6 @@ fn transpile(path: &Path, source_text: &str) -> (String, Vec) { IsolatedDeclarationsOptions { strip_internal: true }, ) .build(&ret.program); - let printed = CodeGenerator::new().build(&ret.program).source_text; + let printed = CodeGenerator::new().build(&ret.program).code; (printed, ret.errors) } diff --git a/tasks/minsize/src/lib.rs b/tasks/minsize/src/lib.rs index d20fba0c38dbd..1c8bf6f6401e2 100644 --- a/tasks/minsize/src/lib.rs +++ b/tasks/minsize/src/lib.rs @@ -115,7 +115,7 @@ fn minify(source_text: &str, source_type: SourceType, options: MinifierOptions) .with_options(CodegenOptions { minify: true, ..CodegenOptions::default() }) .with_mangler(ret.mangler) .build(program) - .source_text + .code } fn gzip_size(s: &str) -> usize { diff --git a/tasks/transform_conformance/src/driver.rs b/tasks/transform_conformance/src/driver.rs index 3875488691e17..701caca8f1a55 100644 --- a/tasks/transform_conformance/src/driver.rs +++ b/tasks/transform_conformance/src/driver.rs @@ -36,7 +36,7 @@ impl CompilerInterface for Driver { } fn after_codegen(&mut self, ret: CodegenReturn) { - self.printed = ret.source_text; + self.printed = ret.code; } fn after_transform( diff --git a/tasks/transform_conformance/src/test_case.rs b/tasks/transform_conformance/src/test_case.rs index 35211c842366c..84b89b48e36cf 100644 --- a/tasks/transform_conformance/src/test_case.rs +++ b/tasks/transform_conformance/src/test_case.rs @@ -306,7 +306,7 @@ impl TestCase for ConformanceTestCase { // CommentOptions { preserve_annotate_comments: true }, // ) .build(&ret.program) - .source_text + .code }, ); @@ -396,7 +396,7 @@ impl ExecTestCase { let source_text = fs::read_to_string(&target_path).unwrap(); let source_type = SourceType::from_path(&target_path).unwrap(); let transformed_ret = Parser::new(&allocator, &source_text, source_type).parse(); - let result = CodeGenerator::new().build(&transformed_ret.program).source_text; + let result = CodeGenerator::new().build(&transformed_ret.program).code; fs::write(&target_path, result).unwrap(); target_path }