remove duplicate code

Author: timfish

tests/common/mod.rs

@@ -7,81 +7,7 @@ use orchestrion_js::*;
 use std::io::prelude::*;
 use std::path::PathBuf;
 use std::process::Command;
-use std::sync::Arc;
-use swc::{
-    config::{IsModule, SourceMapsConfig},
-    try_with_handler, Compiler, HandlerOpts, PrintArgs,
-};
-use swc_core::common::{comments::Comments, errors::ColorConfig, FileName, FilePathMapping};
-use swc_core::ecma::ast::EsVersion;
-use swc_ecma_parser::{EsSyntax, Syntax};
-use swc_ecma_visit::VisitMutWith;
-
-fn print_result(original: &str, modified: &str) {
-    println!(
-        "\n - == === Original === == - \n{}\n\n\n - == === Modified === == - \n{}\n\n",
-        original, modified
-    );
-}
-
-fn transpile(
-    contents: &str,
-    is_module: IsModule,
-    instrumentation: &mut InstrumentationVisitor,
-) -> String {
-    let compiler = Compiler::new(Arc::new(swc_core::common::SourceMap::new(
-        FilePathMapping::empty(),
-    )));
-    try_with_handler(
-        compiler.cm.clone(),
-        HandlerOpts {
-            color: ColorConfig::Never,
-            skip_filename: false,
-        },
-        |handler| {
-            let source_file = compiler.cm.new_source_file(
-                Arc::new(FileName::Real(PathBuf::from("index.mjs"))),
-                contents.to_string(),
-            );
-
-            let program = compiler
-                .parse_js(
-                    source_file.to_owned(),
-                    handler,
-                    EsVersion::latest(),
-                    Syntax::Es(EsSyntax {
-                        explicit_resource_management: true,
-                        import_attributes: true,
-                        decorators: true,
-                        ..Default::default()
-                    }),
-                    is_module,
-                    Some(&compiler.comments() as &dyn Comments),
-                )
-                .map(|mut program| {
-                    program.visit_mut_with(instrumentation);
-                    program
-                })
-                .unwrap();
-            let result = compiler
-                .print(
-                    &program,
-                    PrintArgs {
-                        source_file_name: None,
-                        source_map: SourceMapsConfig::Bool(false),
-                        comments: None,
-                        emit_source_map_columns: false,
-                        ..Default::default()
-                    },
-                )
-                .unwrap();
-
-            print_result(contents, &result.code);
-            Ok(result.code)
-        },
-    )
-    .unwrap()
-}
+use swc::config::IsModule;
 
 static TEST_MODULE_NAME: &str = "undici";
 static TEST_MODULE_PATH: &str = "index.mjs";
@@ -101,7 +27,9 @@ pub fn transpile_and_test(test_file: &str, mjs: bool, config: Config) {
     let mut contents = String::new();
     file.read_to_string(&mut contents).unwrap();
 
-    let result = transpile(&contents, IsModule::Bool(mjs), &mut instrumentations);
+    let result = instrumentations
+        .transform(&contents, IsModule::Bool(mjs))
+        .unwrap();
 
     let instrumented_file = test_dir.join(format!("instrumented.{}", extension));
     let mut file = std::fs::File::create(&instrumented_file).unwrap();