Apply review suggestions

Author: timokoessler

instrumentation-wasm/Cargo.lock

@@ -10,13 +10,13 @@ name = "node_code_instrumentation"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-oxc_allocator = "0.73.2"
-oxc_ast = "0.73.2"
-oxc_codegen = "0.73.2"
-oxc_parser = "0.73.2"
-oxc_semantic = "0.73.2"
-oxc_span = "0.73.2"
-oxc_traverse = "0.73.2"
+oxc_allocator = "0.74.0"
+oxc_ast = "0.74.0"
+oxc_codegen = "0.74.0"
+oxc_parser = "0.74.0"
+oxc_semantic = "0.74.0"
+oxc_span = "0.74.0"
+oxc_traverse = "0.74.0"
 serde = "1.0.219"
 serde_json = "1.0.140"
 wasm-bindgen = "0.2.100"

instrumentation-wasm/Cargo.toml

@@ -1,6 +1,13 @@
 use oxc_allocator::{Allocator, CloneIn};
 use oxc_ast::ast::{Expression, MemberExpression};
 
+/**
+ * This funcion tries to get the name of a member expression in the form of a string.
+ * Examples:
+ * - `app.get = () => {}` will return `app.get`
+ * - `app.prototype.get = () => {}` will return `app.prototype.get`
+ * - `app[method] = () => {}` will return `app[method]`
+ */
 pub fn get_name_str_for_member_expr<'a>(
     allocator: &'a Allocator,
     member_expr: &MemberExpression,

instrumentation-wasm/src/js_transformer/helpers/get_name_str_for_member_expr.rs

@@ -32,6 +32,16 @@ const IMPORT_METHODS: [(&str, ImportMethodPredicate); 3] = [
     ),
 ];
 
+fn is_common_js(source_type: &SourceType, has_module_syntax: bool) -> bool {
+    if source_type.is_script() {
+        return true;
+    }
+    if source_type.is_unambiguous() && !has_module_syntax {
+        return true; // Unambiguous mode without module syntax
+    }
+    false // Otherwise, it's ESM
+}
+
 pub fn insert_import_statement<'a>(
     source_type: &SourceType,
     has_module_syntax: bool,
@@ -41,7 +51,7 @@ pub fn insert_import_statement<'a>(
     file_instructions: &FileInstructions,
 ) {
     // Common JS require() statement
-    if source_type.is_script() || source_type.is_unambiguous() && !has_module_syntax {
+    if is_common_js(source_type, has_module_syntax) {
         let mut require_args: OxcVec<'a, Argument<'a>> = builder.vec_with_capacity(1);
         require_args.push(Argument::StringLiteral(builder.alloc_string_literal(
             SPAN,

instrumentation-wasm/src/js_transformer/helpers/insert_import_statement.rs

@@ -1,21 +1,14 @@
 use oxc_span::SourceType;
 
-/*
-0 -> JS, auto-detect CJS or ESM
-1 -> TypeScript (ESM)
-2 -> CJS
-3 -> MJS (ESM)
-4 -> TSX
-Default -> JS, auto-detect CJS or ESM
-*/
-pub fn select_sourcetype_based_on_enum(src_type: i32) -> SourceType {
+pub fn select_sourcetype_based_on_enum(src_type: &str) -> SourceType {
     // 0 is generic type.
     match src_type {
-        0 => SourceType::unambiguous(),
-        1 => SourceType::ts(),
-        2 => SourceType::cjs(),
-        3 => SourceType::mjs(),
-        4 => SourceType::tsx(),
+        "unambiguous" => SourceType::unambiguous(),
+        "ts" => SourceType::ts(),
+        "cjs" => SourceType::cjs(),
+        "mjs" => SourceType::mjs(),
+        "tsx" => SourceType::tsx(),
+        "jsx" => SourceType::jsx(),
         _ => SourceType::unambiguous(),
     }
 }