code-gauge 4.2.1 → 4.3.0

package/native/src/languages.rs

@@ -7,6 +7,9 @@ pub struct LanguageDefinition {
     grammar_id: GrammarId,
     pub function_node_types: &'static [&'static str],
     pub decision_node_types: &'static [&'static str],
+    /// Whether cyclomatic complexity follows PMD's Java CycloVisitor (see cyclomatic.rs) instead of
+    /// the generic one-path-per-decision rule.
+    pub pmd_cyclomatic: bool,
     pub nesting_node_types: &'static [&'static str],
     pub ncss_node_types: &'static [&'static str],
     pub ncss_container_node_types: &'static [&'static str],
@@ -656,6 +659,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::JavaScript,
         function_node_types: COMMON_FUNCTION_NODES,
         decision_node_types: COMMON_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: JS_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -666,6 +670,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::JavaScript,
         function_node_types: COMMON_FUNCTION_NODES,
         decision_node_types: COMMON_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: JS_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -676,6 +681,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::TypeScript,
         function_node_types: COMMON_FUNCTION_NODES,
         decision_node_types: COMMON_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: JS_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -686,6 +692,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::Tsx,
         function_node_types: COMMON_FUNCTION_NODES,
         decision_node_types: COMMON_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: JS_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -696,6 +703,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::Python,
         function_node_types: COMMON_FUNCTION_NODES,
         decision_node_types: COMMON_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: PYTHON_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -706,6 +714,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::Go,
         function_node_types: COMMON_FUNCTION_NODES,
         decision_node_types: GO_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: GO_NESTING_NODES,
         ncss_node_types: GO_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -716,6 +725,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::Rust,
         function_node_types: COMMON_FUNCTION_NODES,
         decision_node_types: COMMON_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: RUST_NCSS_NODES,
         ncss_container_node_types: RUST_NCSS_CONTAINERS,
@@ -726,6 +736,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::Java,
         function_node_types: JAVA_FUNCTION_NODES,
         decision_node_types: JAVA_DECISION_NODES,
+        pmd_cyclomatic: true,
         nesting_node_types: JAVA_DECISION_NODES,
         ncss_node_types: JAVA_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -736,6 +747,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::Ruby,
         function_node_types: RUBY_FUNCTION_NODES,
         decision_node_types: RUBY_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: RUBY_DECISION_NODES,
         ncss_node_types: RUBY_NCSS_NODES,
         ncss_container_node_types: RUBY_NCSS_CONTAINERS,
@@ -746,6 +758,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::C,
         function_node_types: C_FUNCTION_NODES,
         decision_node_types: C_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: C_DECISION_NODES,
         ncss_node_types: C_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -756,6 +769,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::Cpp,
         function_node_types: C_FUNCTION_NODES,
         decision_node_types: CPP_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: CPP_DECISION_NODES,
         ncss_node_types: CPP_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -766,6 +780,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::CSharp,
         function_node_types: CSHARP_FUNCTION_NODES,
         decision_node_types: CSHARP_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: CSHARP_DECISION_NODES,
         ncss_node_types: CSHARP_NCSS_NODES,
         ncss_container_node_types: &[],
@@ -776,6 +791,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         grammar_id: GrammarId::Kotlin,
         function_node_types: KOTLIN_FUNCTION_NODES,
         decision_node_types: KOTLIN_DECISION_NODES,
+        pmd_cyclomatic: false,
         nesting_node_types: KOTLIN_DECISION_NODES,
         ncss_node_types: KOTLIN_NCSS_NODES,
         ncss_container_node_types: KOTLIN_NCSS_CONTAINERS,

package/native/src/lib.rs

@@ -6,6 +6,7 @@ use napi_derive::napi;
 use crate::duplication::DuplicationSettings;
 
 mod complexity;
+mod cyclomatic;
 mod dep_degree;
 mod duplication;
 mod functions;
@@ -21,7 +22,7 @@ mod util;
 /// together with `expectedPayloadVersion` in src/nativeMetrics.ts.
 #[napi]
 pub fn payload_version() -> u32 {
-    4
+    5
 }
 
 /// Measures code metrics for the given source, returning the NativeMetrics payload as JSON.

package/native/src/measure.rs

@@ -53,6 +53,8 @@ pub fn measure(
                 // yields the JavaScript string (UTF-16 code unit) column.
                 start_column: node.start_position().column / 2,
                 end_line: node.end_position().row + 1,
+                end_column: node.end_position().column / 2,
+                cyclomatic_complexity: body_metrics.cyclomatic_complexity,
                 // Sonar's written spec adds +1 cognitive complexity per function in a recursion
                 // cycle, but this is intentionally not implemented (issue #22): mainstream
                 // implementations (PMD, SonarQube analyzers) omit it.

package/native/src/types.rs

@@ -40,6 +40,8 @@ pub struct FunctionMetrics {
     pub start_line: usize,
     pub start_column: usize,
     pub end_line: usize,
+    pub end_column: usize,
+    pub cyclomatic_complexity: u64,
     pub cognitive_complexity: u64,
     pub nesting_depth: u64,
     pub ncss: u64,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-gauge",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "description": "Measure code metrics with tree-sitter.",
   "keywords": [
     "cli",
@@ -65,16 +65,16 @@
     "@tsconfig/bun": "1.0.10",
     "@tsconfig/node-lts": "24.0.0",
     "@tsconfig/node-ts": "23.6.4",
-    "@types/bun": "1.4.0",
+    "@types/bun": "1.4.2",
     "@types/node": "25.9.4",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.1.3",
-    "build-ts": "21.0.10",
+    "@willbooster/wb": "22.7.0",
+    "build-ts": "21.0.16",
     "conventional-changelog-conventionalcommits": "9.3.1",
-    "lefthook": "2.1.10",
-    "oxfmt": "0.64.0",
-    "oxlint": "1.79.0",
+    "lefthook": "2.1.14",
+    "oxfmt": "0.68.0",
+    "oxlint": "1.83.0",
     "oxlint-tsgolint": "7.0.2001",
     "semantic-release": "25.0.5",
     "sort-package-json": "4.0.0",
@@ -89,12 +89,12 @@
     "registry": "https://registry.npmjs.org/"
   },
   "optionalDependencies": {
-    "code-gauge-linux-x64-gnu": "4.2.1",
-    "code-gauge-linux-arm64-gnu": "4.2.1",
-    "code-gauge-linux-x64-musl": "4.2.1",
-    "code-gauge-linux-arm64-musl": "4.2.1",
-    "code-gauge-darwin-x64": "4.2.1",
-    "code-gauge-darwin-arm64": "4.2.1",
-    "code-gauge-win32-x64-msvc": "4.2.1"
+    "code-gauge-linux-x64-gnu": "4.3.0",
+    "code-gauge-linux-arm64-gnu": "4.3.0",
+    "code-gauge-linux-x64-musl": "4.3.0",
+    "code-gauge-linux-arm64-musl": "4.3.0",
+    "code-gauge-darwin-x64": "4.3.0",
+    "code-gauge-darwin-arm64": "4.3.0",
+    "code-gauge-win32-x64-msvc": "4.3.0"
   }
 }