codegraphcontext-rust 0.9.15__tar.gz → 0.9.17__tar.gz

{codegraphcontext_rust-0.9.15 → codegraphcontext_rust-0.9.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegraphcontext-rust
-Version: 0.9.15
+Version: 0.9.17
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11

{codegraphcontext_rust-0.9.15 → codegraphcontext_rust-0.9.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "codegraphcontext-rust"
-version = "0.9.15"
+version = "0.9.17"
 description = "Rust-accelerated code indexing engine for CodeGraphContext. 19 languages, 5-18x faster parsing via tree-sitter + rayon."
 authors = [
     { name = "Shashank Shekhar Singh", email = "shashankshekharsingh1205@gmail.com" },

{codegraphcontext_rust-0.9.15 → codegraphcontext_rust-0.9.17}/rust/cgc-core/src/lang/c_lang.rs

@@ -3,7 +3,7 @@ use std::collections::HashSet;
 use streaming_iterator::StreamingIterator;
 use tree_sitter::{Language, Node, Query, QueryCursor};
 
-use super::{get_node_text, get_parent_context, LanguageExtractor};
+use super::{class_kind, get_node_text, get_parent_context, LanguageExtractor};
 use crate::types::*;
 
 const COMPLEXITY_TYPES: &[&str] = &[
@@ -271,6 +271,7 @@ impl LanguageExtractor for CExtractor {
             let (context, context_type, _) = self.get_parent_context_c(&func_node, source);
 
             let mut func = FunctionData {
+                return_type: None,
                 name,
                 line_number: node.start_position().row + 1,
                 end_line: func_node.end_position().row + 1,
@@ -317,6 +318,7 @@ impl LanguageExtractor for CExtractor {
             let (context, _, _) = self.get_parent_context_c(&struct_node, source);
 
             let mut class = ClassData {
+                kind: class_kind(&struct_node),
                 name,
                 line_number: struct_node.start_position().row + 1,
                 end_line: struct_node.end_position().row + 1,
@@ -348,6 +350,7 @@ impl LanguageExtractor for CExtractor {
             let name = get_node_text(&node, source).to_string();
 
             let mut class = ClassData {
+                kind: class_kind(&union_node),
                 name,
                 line_number: union_node.start_position().row + 1,
                 end_line: union_node.end_position().row + 1,
@@ -379,6 +382,7 @@ impl LanguageExtractor for CExtractor {
             let name = get_node_text(&node, source).to_string();
 
             let mut class = ClassData {
+                kind: class_kind(&enum_node),
                 name,
                 line_number: enum_node.start_position().row + 1,
                 end_line: enum_node.end_position().row + 1,
@@ -410,6 +414,7 @@ impl LanguageExtractor for CExtractor {
             let name = get_node_text(&node, source).to_string();
 
             let mut class = ClassData {
+                kind: class_kind(&macro_node),
                 name,
                 line_number: macro_node.start_position().row + 1,
                 end_line: macro_node.end_position().row + 1,
@@ -493,6 +498,7 @@ impl LanguageExtractor for CExtractor {
                 self.get_parent_context_c(&node, source);
 
             calls.push(CallData {
+                receiver_chain: Vec::new(),
                 name: call_name.clone(),
                 full_name: call_name,
                 line_number: node.start_position().row + 1,

{codegraphcontext_rust-0.9.15 → codegraphcontext_rust-0.9.17}/rust/cgc-core/src/lang/cpp.rs

@@ -3,7 +3,7 @@ use std::collections::HashSet;
 use streaming_iterator::StreamingIterator;
 use tree_sitter::{Language, Node, Query, QueryCursor};
 
-use super::{get_node_text, LanguageExtractor};
+use super::{class_kind, get_node_text, LanguageExtractor};
 use crate::types::*;
 
 const COMPLEXITY_TYPES: &[&str] = &[
@@ -346,6 +346,7 @@ impl CppExtractor {
             let name = get_node_text(&node, source).to_string();
 
             let mut class = ClassData {
+                kind: class_kind(&struct_node),
                 name,
                 line_number: struct_node.start_position().row + 1,
                 end_line: struct_node.end_position().row + 1,
@@ -385,6 +386,7 @@ impl CppExtractor {
             let name = get_node_text(&node, source).to_string();
 
             let mut class = ClassData {
+                kind: class_kind(&enum_node),
                 name,
                 line_number: enum_node.start_position().row + 1,
                 end_line: enum_node.end_position().row + 1,
@@ -424,6 +426,7 @@ impl CppExtractor {
             let name = get_node_text(&node, source).to_string();
 
             let mut class = ClassData {
+                kind: class_kind(&union_node),
                 name,
                 line_number: union_node.start_position().row + 1,
                 end_line: union_node.end_position().row + 1,
@@ -463,6 +466,7 @@ impl CppExtractor {
             let name = get_node_text(&node, source).to_string();
 
             let mut class = ClassData {
+                kind: class_kind(&macro_node),
                 name,
                 line_number: macro_node.start_position().row + 1,
                 end_line: macro_node.end_position().row + 1,
@@ -549,6 +553,7 @@ impl LanguageExtractor for CppExtractor {
             let class_ctx = class_context.or_else(|| self.get_class_context_cpp(&func_node, source));
 
             let mut func = FunctionData {
+                return_type: None,
                 name,
                 line_number: node.start_position().row + 1,
                 end_line: func_node.end_position().row + 1,
@@ -602,6 +607,7 @@ impl LanguageExtractor for CppExtractor {
             let bases = self.extract_base_classes(&node, source);
 
             let mut class = ClassData {
+                kind: class_kind(&node),
                 name,
                 line_number: node.start_position().row + 1,
                 end_line: node.end_position().row + 1,
@@ -707,6 +713,7 @@ impl LanguageExtractor for CppExtractor {
             let class_context = self.get_class_context_cpp(&node, source);
 
             calls.push(CallData {
+                receiver_chain: Vec::new(),
                 name: func_name,
                 full_name: raw_text.to_string(),
                 line_number: node.start_position().row + 1,

{codegraphcontext_rust-0.9.15 → codegraphcontext_rust-0.9.17}/rust/cgc-core/src/lang/csharp.rs

@@ -3,7 +3,7 @@ use std::collections::HashSet;
 use streaming_iterator::StreamingIterator;
 use tree_sitter::{Language, Node, Query, QueryCursor};
 
-use super::{get_node_text, get_parent_context, LanguageExtractor};
+use super::{class_kind, get_node_text, get_parent_context, LanguageExtractor};
 use crate::types::*;
 
 const COMPLEXITY_TYPES: &[&str] = &[
@@ -256,6 +256,7 @@ impl LanguageExtractor for CSharpExtractor {
             let class_context = self.get_class_context_csharp(&func_node, source);
 
             let mut func = FunctionData {
+                return_type: None,
                 name,
                 line_number: node.start_position().row + 1,
                 end_line: func_node.end_position().row + 1,
@@ -303,6 +304,7 @@ impl LanguageExtractor for CSharpExtractor {
             let (context, _, _) = self.get_parent_context_csharp(&class_node, source);
 
             let mut class = ClassData {
+                kind: class_kind(&class_node),
                 name,
                 line_number: class_node.start_position().row + 1,
                 end_line: class_node.end_position().row + 1,
@@ -335,6 +337,7 @@ impl LanguageExtractor for CSharpExtractor {
             let bases = self.extract_base_list(&iface_node, source);
 
             let mut class = ClassData {
+                kind: class_kind(&iface_node),
                 name,
                 line_number: iface_node.start_position().row + 1,
                 end_line: iface_node.end_position().row + 1,
@@ -367,6 +370,7 @@ impl LanguageExtractor for CSharpExtractor {
             let bases = self.extract_base_list(&struct_node, source);
 
             let mut class = ClassData {
+                kind: class_kind(&struct_node),
                 name,
                 line_number: struct_node.start_position().row + 1,
                 end_line: struct_node.end_position().row + 1,
@@ -398,6 +402,7 @@ impl LanguageExtractor for CSharpExtractor {
             let name = get_node_text(&node, source).to_string();
 
             let mut class = ClassData {
+                kind: class_kind(&enum_node),
                 name,
                 line_number: enum_node.start_position().row + 1,
                 end_line: enum_node.end_position().row + 1,
@@ -489,6 +494,7 @@ impl LanguageExtractor for CSharpExtractor {
             let class_context = self.get_class_context_csharp(&node, source);
 
             calls.push(CallData {
+                receiver_chain: Vec::new(),
                 name: call_name.clone(),
                 full_name: call_name,
                 line_number,

{codegraphcontext_rust-0.9.15 → codegraphcontext_rust-0.9.17}/rust/cgc-core/src/lang/dart.rs

@@ -1,7 +1,7 @@
 use streaming_iterator::StreamingIterator;
 use tree_sitter::{Language, Node, Query, QueryCursor};
 
-use super::{get_node_text, get_parent_context, LanguageExtractor};
+use super::{class_kind, get_node_text, get_parent_context, LanguageExtractor};
 use crate::types::*;
 
 const COMPLEXITY_TYPES: &[&str] = &[
@@ -224,6 +224,7 @@ impl LanguageExtractor for DartExtractor {
             );
 
             let mut func = FunctionData {
+                return_type: None,
                 name,
                 line_number: node.start_position().row + 1,
                 end_line,
@@ -303,6 +304,7 @@ impl LanguageExtractor for DartExtractor {
             let (context, _, _) = get_parent_context(&node, source, FC_TYPES);
 
             let mut class = ClassData {
+                kind: class_kind(&node),
                 name,
                 line_number: node.start_position().row + 1,
                 end_line: node.end_position().row + 1,
@@ -381,6 +383,7 @@ impl LanguageExtractor for DartExtractor {
             );
 
             calls.push(CallData {
+                receiver_chain: Vec::new(),
                 name: call_name.clone(),
                 full_name: call_name,
                 line_number: node.start_position().row + 1,

{codegraphcontext_rust-0.9.15 → codegraphcontext_rust-0.9.17}/rust/cgc-core/src/lang/elixir.rs

@@ -1,7 +1,7 @@
 use streaming_iterator::StreamingIterator;
 use tree_sitter::{Language, Node, Query, QueryCursor};
 
-use super::{get_node_text, LanguageExtractor};
+use super::{class_kind, get_node_text, LanguageExtractor};
 use crate::types::*;
 
 const COMPLEXITY_TYPES: &[&str] = &[
@@ -246,6 +246,7 @@ impl ElixirExtractor {
                         let module_name = self.enclosing_module_name(node, source);
 
                         let mut func = FunctionData {
+                            return_type: None,
                             name,
                             line_number: node.start_position().row + 1,
                             end_line: node.end_position().row + 1,
@@ -318,6 +319,7 @@ impl ElixirExtractor {
                     if let Some(name) = module_name {
                         if has_do_block {
                             let mut class = ClassData {
+                                kind: class_kind(&node),
                                 name,
                                 line_number: node.start_position().row + 1,
                                 end_line: node.end_position().row + 1,
@@ -452,6 +454,7 @@ impl ElixirExtractor {
                     self.get_elixir_parent_context(node, source);
 
                 calls.push(CallData {
+                    receiver_chain: Vec::new(),
                     name: name.clone(),
                     full_name,
                     line_number: node.start_position().row + 1,
@@ -472,6 +475,7 @@ impl ElixirExtractor {
                         self.get_elixir_parent_context(node, source);
 
                     calls.push(CallData {
+                        receiver_chain: Vec::new(),
                         name: name.clone(),
                         full_name: name,
                         line_number: node.start_position().row + 1,

{codegraphcontext_rust-0.9.15 → codegraphcontext_rust-0.9.17}/rust/cgc-core/src/lang/go.rs

@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
 use streaming_iterator::StreamingIterator;
 use tree_sitter::{Language, Node, Query, QueryCursor};
 
-use super::{get_node_text, get_parent_context, LanguageExtractor};
+use super::{class_kind, get_node_text, get_parent_context, LanguageExtractor};
 use crate::types::*;
 
 const COMPLEXITY_TYPES: &[&str] = &[
@@ -176,8 +176,11 @@ impl GoExtractor {
                 if child.kind() == "parameter_declaration" {
                     let type_node = child.child_by_field_name("type");
                     if let Some(tn) = type_node {
-                        let type_text = get_node_text(&tn, source);
-                        return Some(type_text.trim_start_matches('*').to_string());
+                        // Strip pointer and type parameters: `*List[T]` -> `List`.
+                        return self.base_type_name(&tn, source).or_else(|| {
+                            let type_text = get_node_text(&tn, source);
+                            Some(type_text.trim_start_matches('*').to_string())
+                        });
                     }
                 }
             }
@@ -185,6 +188,69 @@ impl GoExtractor {
         None
     }
 
+    /// Bare type name of a type node: `T`, `*T`, `pkg.T`, `T[U]` all yield `T`.
+    fn base_type_name(&self, type_node: &Node, source: &[u8]) -> Option<String> {
+        match type_node.kind() {
+            "type_identifier" => Some(get_node_text(type_node, source).to_string()),
+            "pointer_type" => type_node
+                .named_child(0)
+                .and_then(|inner| self.base_type_name(&inner, source)),
+            "qualified_type" => type_node
+                .child_by_field_name("name")
+                .map(|n| get_node_text(&n, source).to_string()),
+            "generic_type" => type_node
+                .child_by_field_name("type")
+                .and_then(|inner| self.base_type_name(&inner, source)),
+            _ => None,
+        }
+    }
+
+    /// Embedded (anonymous) fields of a struct_type, e.g. `Base`, `*Base`, `pkg.Base`.
+    fn struct_embedded_bases(&self, struct_type: &Node, source: &[u8]) -> Vec<String> {
+        let mut bases = Vec::new();
+        for i in 0..struct_type.named_child_count() {
+            let Some(field_list) = struct_type.named_child(i) else { continue };
+            if field_list.kind() != "field_declaration_list" {
+                continue;
+            }
+            for j in 0..field_list.named_child_count() {
+                let Some(field) = field_list.named_child(j) else { continue };
+                if field.kind() != "field_declaration" || field.child_by_field_name("name").is_some() {
+                    continue;
+                }
+                if let Some(base) = field
+                    .child_by_field_name("type")
+                    .and_then(|t| self.base_type_name(&t, source))
+                {
+                    bases.push(base);
+                }
+            }
+        }
+        bases
+    }
+
+    /// Embedded interfaces of an interface_type, e.g. `io.Reader`, `Closer`.
+    /// Type-set constraints (`~int | string`) and the builtins `any`/`comparable`
+    /// are not inheritance and are skipped.
+    fn interface_embedded_bases(&self, interface_type: &Node, source: &[u8]) -> Vec<String> {
+        let mut bases = Vec::new();
+        for i in 0..interface_type.named_child_count() {
+            let Some(elem) = interface_type.named_child(i) else { continue };
+            if elem.kind() != "type_elem" || elem.named_child_count() != 1 {
+                continue;
+            }
+            if let Some(base) = elem
+                .named_child(0)
+                .and_then(|t| self.base_type_name(&t, source))
+            {
+                if base != "any" && base != "comparable" {
+                    bases.push(base);
+                }
+            }
+        }
+        bases
+    }
+
     fn get_docstring(&self, func_node: &Node, source: &[u8]) -> Option<String> {
         let mut prev = func_node.prev_sibling();
         while let Some(sib) = prev {
@@ -338,6 +404,7 @@ impl LanguageExtractor for GoExtractor {
             let complexity = self.calculate_go_complexity(func_node, source);
 
             let mut func = FunctionData {
+                return_type: None,
                 name,
                 line_number: func_node.start_position().row + 1,
                 end_line: func_node.end_position().row + 1,
@@ -382,12 +449,19 @@ impl LanguageExtractor for GoExtractor {
                 None => continue,
             };
             let name = get_node_text(&node, source).to_string();
+            let bases = node
+                .parent()
+                .and_then(|spec| spec.child_by_field_name("type"))
+                .filter(|t| t.kind() == "struct_type")
+                .map(|t| self.struct_embedded_bases(&t, source))
+                .unwrap_or_default();
 
             let mut class = ClassData {
+                kind: class_kind(&type_decl),
                 name,
                 line_number: type_decl.start_position().row + 1,
                 end_line: type_decl.end_position().row + 1,
-                bases: Vec::new(),
+                bases,
                 context: None,
                 decorators: Vec::new(),
                 lang: self.lang_name().to_string(),
@@ -414,12 +488,19 @@ impl LanguageExtractor for GoExtractor {
                 None => continue,
             };
             let name = get_node_text(&node, source).to_string();
+            let bases = node
+                .parent()
+                .and_then(|spec| spec.child_by_field_name("type"))
+                .filter(|t| t.kind() == "interface_type")
+                .map(|t| self.interface_embedded_bases(&t, source))
+                .unwrap_or_default();
 
             let mut class = ClassData {
+                kind: class_kind(&type_decl),
                 name,
                 line_number: type_decl.start_position().row + 1,
                 end_line: type_decl.end_position().row + 1,
-                bases: Vec::new(),
+                bases,
                 context: None,
                 decorators: Vec::new(),
                 lang: self.lang_name().to_string(),
@@ -532,6 +613,7 @@ impl LanguageExtractor for GoExtractor {
             let context = get_parent_context(&node, source, fc_types);
 
             calls.push(CallData {
+                receiver_chain: Vec::new(),
                 name,
                 full_name,
                 line_number,
@@ -668,6 +750,78 @@ type Speaker interface {
         assert!(classes.iter().any(|c| c.name == "Speaker"));
     }
 
+    #[test]
+    fn test_struct_embedded_fields_as_bases() {
+        let code = r#"
+package main
+
+type Server struct {
+    Base
+    *Logger
+    http.Handler
+    name string
+    a, b int
+}
+"#;
+        let (tree, source) = parse_source(code);
+        let ext = GoExtractor;
+        let classes = ext.find_classes(&tree.root_node(), &source, false);
+        let server = classes.iter().find(|c| c.name == "Server").unwrap();
+        assert_eq!(server.bases, vec!["Base", "Logger", "Handler"]);
+    }
+
+    #[test]
+    fn test_interface_embedding_as_bases() {
+        let code = r#"
+package main
+
+type ReadCloser interface {
+    io.Reader
+    Closer
+    Extra() int
+}
+
+type Number interface {
+    ~int | ~float64
+}
+
+type Key interface {
+    comparable
+}
+"#;
+        let (tree, source) = parse_source(code);
+        let ext = GoExtractor;
+        let classes = ext.find_classes(&tree.root_node(), &source, false);
+        let rc = classes.iter().find(|c| c.name == "ReadCloser").unwrap();
+        assert_eq!(rc.bases, vec!["Reader", "Closer"]);
+        let num = classes.iter().find(|c| c.name == "Number").unwrap();
+        assert!(num.bases.is_empty());
+        let key = classes.iter().find(|c| c.name == "Key").unwrap();
+        assert!(key.bases.is_empty());
+    }
+
+    #[test]
+    fn test_generic_receiver_strips_type_params() {
+        let code = r#"
+package main
+
+type List[T any] struct {
+    items []T
+}
+
+func (l *List[T]) Push(v T) {}
+
+func (p Pair[K, V]) Key() K { return p.k }
+"#;
+        let (tree, source) = parse_source(code);
+        let ext = GoExtractor;
+        let funcs = ext.find_functions(&tree.root_node(), &source, false);
+        let push = funcs.iter().find(|f| f.name == "Push").unwrap();
+        assert_eq!(push.class_context.as_deref(), Some("List"));
+        let key = funcs.iter().find(|f| f.name == "Key").unwrap();
+        assert_eq!(key.class_context.as_deref(), Some("Pair"));
+    }
+
     #[test]
     fn test_find_imports() {
         let code = r#"

{codegraphcontext_rust-0.9.15 → codegraphcontext_rust-0.9.17}/rust/cgc-core/src/lang/haskell.rs

@@ -1,7 +1,7 @@
 use streaming_iterator::StreamingIterator;
 use tree_sitter::{Language, Node, Query, QueryCursor};
 
-use super::{get_node_text, get_parent_context, LanguageExtractor};
+use super::{class_kind, get_node_text, get_parent_context, LanguageExtractor};
 use crate::types::*;
 
 const COMPLEXITY_TYPES: &[&str] = &[
@@ -158,6 +158,7 @@ impl LanguageExtractor for HaskellExtractor {
                     let complexity = self.calculate_complexity(&node);
 
                     let mut func = FunctionData {
+                        return_type: None,
                         name: func_name,
                         line_number: node.start_position().row + 1,
                         end_line: node.end_position().row + 1,
@@ -204,6 +205,7 @@ impl LanguageExtractor for HaskellExtractor {
                     );
 
                     let mut func = FunctionData {
+                        return_type: None,
                         name: func_name,
                         line_number: node.start_position().row + 1,
                         end_line: node.end_position().row + 1,
@@ -255,6 +257,7 @@ impl LanguageExtractor for HaskellExtractor {
             let class_name = get_node_text(&name_node, source).to_string();
 
             let mut class = ClassData {
+                kind: class_kind(&node),
                 name: class_name,
                 line_number: node.start_position().row + 1,
                 end_line: node.end_position().row + 1,
@@ -341,6 +344,7 @@ impl LanguageExtractor for HaskellExtractor {
             );
 
             calls.push(CallData {
+                receiver_chain: Vec::new(),
                 name: call_name.clone(),
                 full_name: call_name,
                 line_number: node.start_position().row + 1,