code-gauge 4.7.0 → 4.8.0

package/native/src/languages.rs

@@ -1,3 +1,4 @@
+use std::sync::OnceLock;
 use tree_sitter::Language;
 
 /// Per-language node-type configuration mirroring src/languages.ts.
@@ -14,6 +15,9 @@ pub struct LanguageDefinition {
     pub nesting_node_types: &'static [&'static str],
     pub ncss_node_types: &'static [&'static str],
     pub ncss_container_node_types: &'static [&'static str],
+    /// Parents whose braceless `consequence`/`alternative`/`body` child counts like the single
+    /// statement of a braced body, for grammars that wrap it in no statement node.
+    pub ncss_bare_body_parent_node_types: &'static [&'static str],
 }
 
 #[derive(Clone, Copy)]
@@ -32,6 +36,8 @@ enum GrammarId {
     Tsx,
 }
 
+const GRAMMAR_COUNT: usize = GrammarId::Tsx as usize + 1;
+
 impl LanguageDefinition {
     pub fn grammar(&self) -> Language {
         match self.grammar_id {
@@ -40,8 +46,8 @@ impl LanguageDefinition {
             GrammarId::CSharp => tree_sitter_c_sharp::language(),
             GrammarId::Go => tree_sitter_go::language(),
             GrammarId::Java => tree_sitter_java::language(),
-            GrammarId::JavaScript => tree_sitter_javascript::language(),
-            GrammarId::Kotlin => tree_sitter_kotlin::language(),
+            GrammarId::JavaScript => tree_sitter_javascript::LANGUAGE.into(),
+            GrammarId::Kotlin => tree_sitter_kotlin::LANGUAGE.into(),
             GrammarId::Python => tree_sitter_python::language(),
             GrammarId::Ruby => tree_sitter_ruby::language(),
             GrammarId::Rust => tree_sitter_rust::language(),
@@ -49,6 +55,23 @@ impl LanguageDefinition {
             GrammarId::Tsx => tree_sitter_typescript::language_tsx(),
         }
     }
+
+    /// The grammar's node kind names, indexed by kind id.
+    pub fn kind_names(&self) -> &'static [&'static str] {
+        static KIND_NAMES: [OnceLock<Vec<&'static str>>; GRAMMAR_COUNT] =
+            [const { OnceLock::new() }; GRAMMAR_COUNT];
+        KIND_NAMES[self.grammar_id as usize].get_or_init(|| {
+            let grammar = self.grammar();
+            (0..grammar.node_kind_count())
+                .map(|id| {
+                    u16::try_from(id)
+                        .ok()
+                        .and_then(|id| grammar.node_kind_for_id(id))
+                        .unwrap_or_default()
+                })
+                .collect()
+        })
+    }
 }
 
 const COMMON_FUNCTION_NODES: &[&str] = &[
@@ -641,16 +664,21 @@ const KOTLIN_NCSS_NODES: &[&str] = &[
     "getter",
     "setter",
 ];
-// `control_structure_body` holds a braceless branch/loop body (`if (x) foo()`), which counts like
-// the single statement of a braced one; `function_body` holds an expression body (`fun f() = x`).
+// `function_body` holds an expression body (`fun f() = x`).
 const KOTLIN_NCSS_CONTAINERS: &[&str] = &[
     "source_file",
-    "import_list",
-    "statements",
+    "block",
     "class_body",
     "enum_class_body",
-    "control_structure_body",
     "function_body",
+    "lambda_literal",
+];
+const KOTLIN_NCSS_BARE_BODY_PARENTS: &[&str] = &[
+    "if_expression",
+    "for_statement",
+    "while_statement",
+    "do_while_statement",
+    "when_entry",
 ];
 
 pub const LANGUAGES: &[LanguageDefinition] = &[
@@ -664,6 +692,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: JS_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "jsx",
@@ -675,6 +704,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: JS_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "typescript",
@@ -686,6 +716,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: JS_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "tsx",
@@ -697,6 +728,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: JS_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "python",
@@ -708,6 +740,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: PYTHON_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "go",
@@ -719,6 +752,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: GO_NESTING_NODES,
         ncss_node_types: GO_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "rust",
@@ -730,6 +764,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: COMMON_NESTING_NODES,
         ncss_node_types: RUST_NCSS_NODES,
         ncss_container_node_types: RUST_NCSS_CONTAINERS,
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "java",
@@ -741,6 +776,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: JAVA_DECISION_NODES,
         ncss_node_types: JAVA_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "ruby",
@@ -752,6 +788,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: RUBY_DECISION_NODES,
         ncss_node_types: RUBY_NCSS_NODES,
         ncss_container_node_types: RUBY_NCSS_CONTAINERS,
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "c",
@@ -763,6 +800,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: C_DECISION_NODES,
         ncss_node_types: C_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "cpp",
@@ -774,6 +812,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: CPP_DECISION_NODES,
         ncss_node_types: CPP_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "csharp",
@@ -785,6 +824,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: CSHARP_DECISION_NODES,
         ncss_node_types: CSHARP_NCSS_NODES,
         ncss_container_node_types: &[],
+        ncss_bare_body_parent_node_types: &[],
     },
     LanguageDefinition {
         name: "kotlin",
@@ -796,6 +836,7 @@ pub const LANGUAGES: &[LanguageDefinition] = &[
         nesting_node_types: KOTLIN_DECISION_NODES,
         ncss_node_types: KOTLIN_NCSS_NODES,
         ncss_container_node_types: KOTLIN_NCSS_CONTAINERS,
+        ncss_bare_body_parent_node_types: KOTLIN_NCSS_BARE_BODY_PARENTS,
     },
 ];
 

package/native/src/lib.rs

@@ -12,18 +12,23 @@ mod measure;
 mod napi;
 mod ncss;
 mod near_miss;
+mod tree_index;
 mod types;
 mod util;
 #[cfg(target_family = "wasm")]
 mod wasm;
+#[cfg(not(target_family = "wasm"))]
+mod worker_pool;
 
-/// Version of the native payload schema. The TypeScript wrapper refuses a binding whose version
-/// differs from the one it expects, so a stale prebuilt addon fails with a clear rebuild message
-/// instead of silently returning an incompatible payload. Bump on every payload-shape change,
-/// together with `expectedPayloadVersion` in src/nativeMetrics.ts.
+/// Version of the native payload schema and binding functions. The TypeScript wrapper refuses a
+/// binding whose version differs from the one it expects, so a stale prebuilt addon fails with a
+/// clear rebuild message instead of silently returning an incompatible payload or lacking a
+/// function (a failure the scan would only report per file). Bump on every payload-shape change
+/// and every change to the exported binding functions, together with `expectedPayloadVersion` in
+/// src/nativeMetrics.ts.
 /// scripts/installNative.mjs parses the literal from this function's source.
 pub fn payload_version() -> u32 {
-    7
+    8
 }
 
 /// Measures code metrics for the given source, returning the NativeMetrics payload as JSON; with