tree_sitter_language_pack 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73a601edb6bb285bf825a5b588c6fb9ae58fa8f1a0bda7c4d537cdfc9f72a912
-  data.tar.gz: 331e45aafcaf276595cfa679aa5de2524204b5ba4bcb138d4c1b423471576964
+  metadata.gz: 6db995bcd67cec0642ed17f3ce6da23f5a8f4dc71118f2cc06cdbc3ce6e5b8b5
+  data.tar.gz: c2fee6f228184924cf2b7a908aec4d9e7dba3a6e607d0dfbb40de6be0efa296a
 SHA512:
-  metadata.gz: e197f722769c8cbb45aabbe38d713bfb234036c74d523d521041814916e5518ef6f4acd5c6b66ab0f1317404d7fc608b5043915aa93331c876769363674627d8
-  data.tar.gz: b3efc14816133eec048d9a988fba3b0620a991a3d3c9426eb6968bdce14925d6eeaa20bfb4394d0e561f828f7661e720d344cff09ec3bd421dc2697aa0fcc752
+  metadata.gz: 2c924f922d81454f9b02727e9f4883d31d80de10b4823cdff445f1b590fb60cc4851b86d57612a64ee4a52f65ff7ec962b16b85fe4ac55453d178afe34ae4169
+  data.tar.gz: e3323b3ed5f2f61fd4942ab6157d34ef998228d0e668b5b01873e2c57f8ab5e9ff5566df2b8ab76023f2a9e529a44ee255521ca9bb799a1ebff81460435f7427

data/src/lib.rs

@@ -1,4 +1,4 @@
-use magnus::{Error, Ruby, function, method, prelude::*};
+use magnus::{Error, IntoValue, Ruby, Value as RbValue, function, method, prelude::*};
 use std::sync::Mutex;
 
 /// Wraps a tree-sitter Tree for safe sharing across the Ruby boundary.
@@ -84,20 +84,55 @@ fn parse_string(ruby: &Ruby, language: String, source: String) -> Result<TreeWra
     Ok(TreeWrapper(Mutex::new(tree)))
 }
 
-/// Unified process method that accepts a JSON config string and returns a JSON result string.
+/// Convert a serde_json::Value to a native Ruby object (Hash, Array, String, Integer, Float, true/false, nil).
+fn json_value_to_ruby(ruby: &Ruby, value: &serde_json::Value) -> Result<RbValue, Error> {
+    Ok(match value {
+        serde_json::Value::Null => ruby.qnil().as_value(),
+        serde_json::Value::Bool(b) => (*b).into_value_with(ruby),
+        serde_json::Value::Number(n) => {
+            if let Some(i) = n.as_i64() {
+                i.into_value_with(ruby)
+            } else if let Some(u) = n.as_u64() {
+                u.into_value_with(ruby)
+            } else if let Some(f) = n.as_f64() {
+                f.into_value_with(ruby)
+            } else {
+                ruby.qnil().as_value()
+            }
+        }
+        serde_json::Value::String(s) => s.as_str().into_value_with(ruby),
+        serde_json::Value::Array(arr) => {
+            let ary = ruby.ary_new_capa(arr.len());
+            for item in arr {
+                ary.push(json_value_to_ruby(ruby, item)?)?;
+            }
+            ary.as_value()
+        }
+        serde_json::Value::Object(map) => {
+            let hash = ruby.hash_new();
+            for (k, v) in map {
+                hash.aset(k.as_str(), json_value_to_ruby(ruby, v)?)?;
+            }
+            hash.as_value()
+        }
+    })
+}
+
+/// Unified process method that accepts a JSON config string and returns a native Ruby Hash.
 ///
 /// The config JSON must contain at least `"language"`. Optional fields:
 /// - `structure`, `imports`, `exports`, `comments`, `docstrings`, `symbols`, `diagnostics` (booleans, default true)
 /// - `chunk_max_size` (integer or null, default null meaning no chunking)
-fn process(ruby: &Ruby, source: String, config_json: String) -> Result<String, Error> {
+fn process(ruby: &Ruby, source: String, config_json: String) -> Result<RbValue, Error> {
     let core_config: tree_sitter_language_pack::ProcessConfig = serde_json::from_str(&config_json)
         .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("invalid config JSON: {e}")))?;
 
     let result = tree_sitter_language_pack::process(&source, &core_config)
         .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("{e}")))?;
 
-    serde_json::to_string(&result)
-        .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("serialization failed: {e}")))
+    let json_value = serde_json::to_value(&result)
+        .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("serialization failed: {e}")))?;
+    json_value_to_ruby(ruby, &json_value)
 }
 
 /// Extract patterns from source code using a JSON configuration.
@@ -106,16 +141,17 @@ fn process(ruby: &Ruby, source: String, config_json: String) -> Result<String, E
 /// - `language` (string): the language name
 /// - `patterns` (object): named patterns to run, each with a `query` field
 ///
-/// Returns a JSON string with extraction results.
-fn extract(ruby: &Ruby, source: String, config_json: String) -> Result<String, Error> {
+/// Returns a native Ruby Hash with extraction results.
+fn extract(ruby: &Ruby, source: String, config_json: String) -> Result<RbValue, Error> {
     let config: tree_sitter_language_pack::ExtractionConfig = serde_json::from_str(&config_json)
         .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("invalid config JSON: {e}")))?;
 
     let result = tree_sitter_language_pack::extract_patterns(&source, &config)
         .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("{e}")))?;
 
-    serde_json::to_string(&result)
-        .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("serialization failed: {e}")))
+    let json_value = serde_json::to_value(&result)
+        .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("serialization failed: {e}")))?;
+    json_value_to_ruby(ruby, &json_value)
 }
 
 /// Validate extraction patterns without running them.
@@ -124,16 +160,17 @@ fn extract(ruby: &Ruby, source: String, config_json: String) -> Result<String, E
 /// - `language` (string): the language name
 /// - `patterns` (object): named patterns to validate
 ///
-/// Returns a JSON string with validation results.
-fn validate_extraction(ruby: &Ruby, config_json: String) -> Result<String, Error> {
+/// Returns a native Ruby Hash with validation results.
+fn validate_extraction(ruby: &Ruby, config_json: String) -> Result<RbValue, Error> {
     let config: tree_sitter_language_pack::ExtractionConfig = serde_json::from_str(&config_json)
         .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("invalid config JSON: {e}")))?;
 
     let result = tree_sitter_language_pack::validate_extraction(&config)
         .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("{e}")))?;
 
-    serde_json::to_string(&result)
-        .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("serialization failed: {e}")))
+    let json_value = serde_json::to_value(&result)
+        .map_err(|e| Error::new(ruby.exception_runtime_error(), format!("serialization failed: {e}")))?;
+    json_value_to_ruby(ruby, &json_value)
 }
 
 /// Initialize the language pack with configuration.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree_sitter_language_pack
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - kreuzberg.dev