rubydex 0.1.0.beta9 → 0.1.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9838707935ff868fb005a0d85254747ea6e3a5b5871c0626f5ec6641e0878e2
-  data.tar.gz: 87f4157545d244bfb3bb7e869914dc355d1d2b3dd0e181e439ce81ce1073cdc5
+  metadata.gz: 13a3cb3d4cbe536ab21b25d16a2ec0903b600dd2ffe90b062657c38cefc3dfbd
+  data.tar.gz: 43664af48f34fe8ca7cf006cc5a77548fad873df329b5f45c344aea0f34fff14
 SHA512:
-  metadata.gz: 7a69359f6261bb54eb0f576fbb9c31b85eb209c45fdb60d81d5f965abed05ac535409191b8a87376bcabe8278149ef1f87c8097162204d583f1ed2670bea7d5e
-  data.tar.gz: 862070c2cd67d83aae2da083987235017610d9637d6b90b49b8270a6ab8d3c4a1914333e30152f025f3e24e317fd3b3d0a74f3f20e64ffcf25752503c40baa7f
+  metadata.gz: 3e8f31a47de5aa62df61a57c9545a3b93155617e96fb4064ef95201c38c43949b524688e3ad8204471240dacc62f0f2e34b02fd49e2257fd181b1b9d69b0924a
+  data.tar.gz: c7ebeb6983652dfd86591054a954ee1ecb3b5bc55c00a43581014344c337f46e5ccc5b6539fe50e9861bd30ef7e88ba596e7734570575ed3dee3d3437c707519

data/ext/rubydex/declaration.c

@@ -295,6 +295,29 @@ static VALUE rdxr_declaration_descendants(VALUE self) {
     return self;
 }
 
+// Namespace#members: () -> Enumerator[Declaration]
+static VALUE rdxr_declaration_members(VALUE self) {
+    if (!rb_block_given_p()) {
+        return rb_enumeratorize(self, rb_str_new2("members"), 0, NULL);
+    }
+
+    HandleData *data;
+    TypedData_Get_Struct(self, HandleData, &handle_type, data);
+
+    void *graph;
+    TypedData_Get_Struct(data->graph_obj, void *, &graph_type, graph);
+
+    void *iter = rdx_declaration_members(graph, data->id);
+    if (iter == NULL) {
+        rb_raise(rb_eRuntimeError, "failed to create iterator");
+    }
+
+    VALUE args = rb_ary_new_from_args(2, data->graph_obj, ULL2NUM((uintptr_t)iter));
+    rb_ensure(rdxi_declarations_yield, args, rdxi_declarations_ensure, args);
+
+    return self;
+}
+
 // Size function for the Declaration#references enumerator
 static VALUE declaration_references_size(VALUE self, VALUE _args, VALUE _eobj) {
     HandleData *data;
@@ -359,6 +382,7 @@ void rdxi_initialize_declaration(VALUE mRubydex) {
     rb_define_method(cNamespace, "singleton_class", rdxr_declaration_singleton_class, 0);
     rb_define_method(cNamespace, "ancestors", rdxr_declaration_ancestors, 0);
     rb_define_method(cNamespace, "descendants", rdxr_declaration_descendants, 0);
+    rb_define_method(cNamespace, "members", rdxr_declaration_members, 0);
 
     rb_funcall(rb_singleton_class(cDeclaration), rb_intern("private"), 1, ID2SYM(rb_intern("new")));
 }

data/ext/rubydex/graph.c

@@ -43,11 +43,7 @@ static VALUE rdxr_graph_index_all(VALUE self, VALUE file_paths) {
     size_t error_count = 0;
     const char *const *errors = rdx_index_all(graph, (const char **)converted_file_paths, length, &error_count);
 
-    // Free the converted file paths and allow the GC to collect them
-    for (size_t i = 0; i < length; i++) {
-        free(converted_file_paths[i]);
-    }
-    free(converted_file_paths);
+    rdxi_free_str_array(converted_file_paths, length);
 
     if (errors == NULL) {
         return rb_ary_new();
@@ -128,9 +124,24 @@ static VALUE rdxr_graph_declarations(VALUE self) {
     return self;
 }
 
-// Graph#search: () -> Enumerator[Declaration]
-// Returns an enumerator that yields all declarations lazily
+static VALUE rdxr_graph_yield_search_results(VALUE self, void *iter) {
+    if (iter == NULL) {
+        // The only case where the iterator will be NULL instead of a list is if the query cannot be converted to a Rust
+        // string
+        rb_raise(rb_eRuntimeError, "Converting query to Rust string failed");
+    }
+
+    VALUE args = rb_ary_new_from_args(2, self, ULL2NUM((uintptr_t)iter));
+    rb_ensure(rdxi_declarations_yield, args, rdxi_declarations_ensure, args);
+
+    return self;
+}
+
+// Graph#search: (String query) -> Enumerator[Declaration]
+// Returns an enumerator that yields declarations matching the query exactly (substring match)
 static VALUE rdxr_graph_search(VALUE self, VALUE query) {
+    Check_Type(query, T_STRING);
+
     if (!rb_block_given_p()) {
         return rb_enumeratorize(self, rb_str_new2("search"), 1, &query);
     }
@@ -138,20 +149,22 @@ static VALUE rdxr_graph_search(VALUE self, VALUE query) {
     void *graph;
     TypedData_Get_Struct(self, void *, &graph_type, graph);
 
-    const char *c_query = StringValueCStr(query);
+    return rdxr_graph_yield_search_results(self, rdx_graph_declarations_search(graph, StringValueCStr(query)));
+}
 
-    void *iter = rdx_graph_declarations_search(graph, c_query);
+// Graph#fuzzy_search: (String query) -> Enumerator[Declaration]
+// Returns an enumerator that yields declarations matching the query fuzzily
+static VALUE rdxr_graph_fuzzy_search(VALUE self, VALUE query) {
+    Check_Type(query, T_STRING);
 
-    if (iter == NULL) {
-        // The only case where the iterator will be NULL instead of a list is if the query cannot be converted to a Rust
-        // string
-        rb_raise(rb_eRuntimeError, "Converting query to Rust string failed");
+    if (!rb_block_given_p()) {
+        return rb_enumeratorize(self, rb_str_new2("fuzzy_search"), 1, &query);
     }
 
-    VALUE args = rb_ary_new_from_args(2, self, ULL2NUM((uintptr_t)iter));
-    rb_ensure(rdxi_declarations_yield, args, rdxi_declarations_ensure, args);
+    void *graph;
+    TypedData_Get_Struct(self, void *, &graph_type, graph);
 
-    return self;
+    return rdxr_graph_yield_search_results(self, rdx_graph_declarations_fuzzy_search(graph, StringValueCStr(query)));
 }
 
 // Body function for rb_ensure in Graph#documents
@@ -348,10 +361,7 @@ static VALUE rdxr_graph_resolve_constant(VALUE self, VALUE const_name, VALUE nes
     const CDeclaration *decl =
         rdx_graph_resolve_constant(graph, StringValueCStr(const_name), (const char **)converted_file_paths, length);
 
-    for (size_t i = 0; i < length; i++) {
-        free(converted_file_paths[i]);
-    }
-    free(converted_file_paths);
+    rdxi_free_str_array(converted_file_paths, length);
 
     if (decl == NULL) {
         return Qnil;
@@ -379,10 +389,7 @@ static VALUE rdxr_graph_resolve_require_path(VALUE self, VALUE require_path, VAL
 
     const uint64_t *uri_id = rdx_resolve_require_path(graph, path_str, (const char **)converted_paths, paths_len);
 
-    for (size_t i = 0; i < paths_len; i++) {
-        free(converted_paths[i]);
-    }
-    free(converted_paths);
+    rdxi_free_str_array(converted_paths, paths_len);
 
     if (uri_id == NULL) {
         return Qnil;
@@ -407,10 +414,7 @@ static VALUE rdxr_graph_require_paths(VALUE self, VALUE load_path) {
     size_t out_count = 0;
     const char *const *results = rdx_require_paths(graph, (const char **)converted_paths, paths_len, &out_count);
 
-    for (size_t i = 0; i < paths_len; i++) {
-        free(converted_paths[i]);
-    }
-    free(converted_paths);
+    rdxi_free_str_array(converted_paths, paths_len);
 
     if (results == NULL) {
         return rb_ary_new();
@@ -501,6 +505,7 @@ void rdxi_initialize_graph(VALUE moduleRubydex) {
     rb_define_method(cGraph, "check_integrity", rdxr_graph_check_integrity, 0);
     rb_define_method(cGraph, "[]", rdxr_graph_aref, 1);
     rb_define_method(cGraph, "search", rdxr_graph_search, 1);
+    rb_define_method(cGraph, "fuzzy_search", rdxr_graph_fuzzy_search, 1);
     rb_define_method(cGraph, "encoding=", rdxr_graph_set_encoding, 1);
     rb_define_method(cGraph, "resolve_require_path", rdxr_graph_resolve_require_path, 2);
     rb_define_method(cGraph, "require_paths", rdxr_graph_require_paths, 1);

data/ext/rubydex/utils.c

@@ -19,6 +19,16 @@ char **rdxi_str_array_to_char(VALUE array, size_t length) {
     return converted_array;
 }
 
+// Free a char** array allocated by rdxi_str_array_to_char
+void rdxi_free_str_array(char **array, size_t length) {
+    if (array != NULL) {
+        for (size_t i = 0; i < length; i++) {
+            free(array[i]);
+        }
+        free(array);
+    }
+}
+
 // Verify that the Ruby object is an array of strings or raise `TypeError`
 void rdxi_check_array_of_strings(VALUE array) {
     Check_Type(array, T_ARRAY);

data/ext/rubydex/utils.h

@@ -4,9 +4,12 @@
 #include "ruby.h"
 
 // Convert a Ruby array of strings into a double char pointer so that we can pass that to Rust.
-// This copies the data so it must be freed
+// This copies the data so it must be freed with rdxi_free_str_array
 char **rdxi_str_array_to_char(VALUE array, size_t length);
 
+// Free a char** array allocated by rdxi_str_array_to_char
+void rdxi_free_str_array(char **array, size_t length);
+
 // Verify that the Ruby object is an array of strings or raise `TypeError`
 void rdxi_check_array_of_strings(VALUE array);
 

data/lib/rubydex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubydex
-  VERSION = "0.1.0.beta9"
+  VERSION = "0.1.0.beta10"
 end

data/rbi/rubydex.rbi

@@ -59,6 +59,9 @@ class Rubydex::Namespace < Rubydex::Declaration
   sig { returns(T::Enumerable[Rubydex::Namespace]) }
   def descendants; end
 
+  sig { returns(T::Enumerable[Rubydex::Declaration]) }
+  def members; end
+
   sig { params(name: String).returns(T.nilable(Rubydex::Declaration)) }
   def member(name); end
 
@@ -203,6 +206,9 @@ class Rubydex::Graph
   sig { params(query: String).returns(T::Enumerable[Rubydex::Declaration]) }
   def search(query); end
 
+  sig { params(query: String).returns(T::Enumerable[Rubydex::Declaration]) }
+  def fuzzy_search(query); end
+
   sig { params(encoding: String).void }
   def encoding=(encoding); end