Merge pull request #237 from kwonoj/fix-bin-expr-child

kwonoj · Jul 4, 2024 · f8557e9 · f8557e9
2 parents 64c2cbe + 9c7c3f8
commit f8557e9
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ resolver = "2"
 #lto = true
 
   [workspace.dependencies]
-  istanbul-oxide          = { path = "./packages/istanbul-oxide", version = "0.0.22" }
+  istanbul-oxide          = { path = "./packages/istanbul-oxide", version = "0.0.23" }
   swc-coverage-instrument = { path = "./packages/swc-coverage-instrument" }
 
   getrandom          = { version = "0.2.15" }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swc-plugin-coverage-instrument",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "SWC coverage instrumentation plugin",
   "main": "./target/wasm32-wasi/release/swc_plugin_coverage.wasm",
   "napi": {

diff --git a/packages/istanbul-oxide/Cargo.toml b/packages/istanbul-oxide/Cargo.toml
@@ -5,7 +5,7 @@ edition     = "2021"
 license     = "MIT"
 name        = "istanbul-oxide"
 repository  = "https://github.com/kwonoj/swc-coverage-instrument"
-version     = "0.0.22"
+version     = "0.0.23"
 
 [dependencies]
 indexmap = { workspace = true, features = ["serde"] }

diff --git a/packages/swc-coverage-instrument/Cargo.toml b/packages/swc-coverage-instrument/Cargo.toml
@@ -5,7 +5,7 @@ edition     = "2021"
 license     = "MIT"
 name        = "swc-coverage-instrument"
 repository  = "https://github.com/kwonoj/swc-coverage-instrument"
-version     = "0.0.22"
+version     = "0.0.23"
 
 [dependencies]
 istanbul-oxide = { workspace = true }

diff --git a/packages/swc-coverage-instrument/src/macros/instrumentation_counter_helper.rs b/packages/swc-coverage-instrument/src/macros/instrumentation_counter_helper.rs
@@ -118,6 +118,7 @@ macro_rules! instrumentation_branch_wrap_counter_helper {
                     // replace init with increase expr + init seq
                     *expr = paren_expr;
                 } else {
+                    expr.visit_mut_children_with(self);
                     self.replace_expr_with_branch_counter(expr, branch);
                 }
             }

diff --git a/packages/swc-plugin-coverage/Cargo.toml b/packages/swc-plugin-coverage/Cargo.toml
@@ -5,7 +5,7 @@ edition     = "2021"
 license     = "MIT"
 name        = "swc-plugin-coverage"
 repository  = "https://github.com/kwonoj/swc-coverage-instrument"
-version     = "0.0.22"
+version     = "0.0.23"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/spec/fixtures/issue-233.yaml b/spec/fixtures/issue-233.yaml
@@ -0,0 +1,18 @@
+---
+name: issue 233
+code: |
+  let i = 0;
+
+  const t = true && {
+      renderFn: () => {
+          i++
+      },
+  }
+
+  t.renderFn();
+tests:
+  - name: covers right bin expr fn
+    lines: {'1': 1, '3': 1, '5': 1, '9': 1}
+    branches: {'0': [1, 1]}
+    statements: {'0': 1, '1': 1, '2': 1, '3': 1}
+    functions: {'0': 1}
diff --git a/spec/swc-coverage-custom-transform/Cargo.toml b/spec/swc-coverage-custom-transform/Cargo.toml
@@ -21,7 +21,7 @@ napi-derive = { version = "2.12.3", default-features = false, features = [
 ] }
 serde = { version = "1.0.160", features = ["derive"] }
 serde_json = { version = "1.0.96", features = ["unbounded_depth"] }
-swc-coverage-instrument = { version = "0.0.22", path = "../../packages/swc-coverage-instrument" }
+swc-coverage-instrument = { version = "0.0.23", path = "../../packages/swc-coverage-instrument" }
 
 swc_core = { version = "0.96.2", features = [
   "common_concurrent",