First release of sheetruby, a spreadsheet application powered by mrubyedge.

Author: udzura

.cargo/config.toml

@@ -3,7 +3,7 @@ rustflags = [
     "-C",
     "link-args=-o out.js",
     "-C",
-    "link-args=-s EXPORTED_FUNCTIONS=['_eval_ruby_script_returning_json','_eval_ruby_script_returning_json1','_main']",
+    "link-args=-s EXPORTED_FUNCTIONS=['_eval_ruby_script_returning_json','_eval_ruby_script_returning_json1','_eval_ruby_script_returning_json2','_eval_ruby_script_returning_json3','_main']",
     "-C",
     "link-args=-s EXPORTED_RUNTIME_METHODS=['ccall','cwrap','UTF8ToString']",
     "-C",

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sheetruby"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2024"
 
 [dependencies]
@@ -10,7 +10,6 @@ mrubyedge-math = "0.1.0"
 mrubyedge-serde-json = "0.1.0"
 
 [profile.dev]
-# FIXME: unccomment 
 # panic = "abort" # Reduce panic handling overhead
 
 [profile.release]

Cargo.toml

@@ -1,38 +1,43 @@
 /**
  * eval ruby script and return integer value
- * Arguments are accessible as $arg1, $arg2, etc. in Ruby code.
+ * Arguments are accessible as $arg1, $arg2, $arg3 in Ruby code.
  * @param {string} text ruby code.
- * @param {...(string|number|Array<Array<string|number>>)} args arguments accessible as $arg1, $arg2, etc. (converted to string).
- * @return The integer result of the Ruby script.
+ * @param {...(string|number|Array<Array<string|number>>)} args arguments accessible as $arg1, $arg2, $arg3 (up to 3 arguments).
+ * @return The result of the Ruby script (type inferred from JSON).
  * @customfunction
 */
 function EVAL_RUBY_SCRIPT(text) {
     var args = Array.prototype.slice.call(arguments, 1);
+    var result;
     if (args.length === 0) {
-        const result = Module.ccall(
+        result = Module.ccall(
             'eval_ruby_script_returning_json',
             'string',
             ['string'],
             [text]
         );
-        return JSON.parse(result);
     } else if (args.length === 1) {
-        const result = Module.ccall(
+        result = Module.ccall(
             'eval_ruby_script_returning_json1',
             'string',
             ['string', 'string'],
             [text, JSON.stringify(args[0])]
         );
-        return JSON.parse(result);
+    } else if (args.length === 2) {
+        result = Module.ccall(
+            'eval_ruby_script_returning_json2',
+            'string',
+            ['string', 'string', 'string'],
+            [text, JSON.stringify(args[0]), JSON.stringify(args[1])]
+        );
     } else {
-        // For now, only support up to 1 argument
-        // TODO: Add support for more arguments
-        const result = Module.ccall(
-            'eval_ruby_script_returning_json1',
+        // 3 or more arguments - use json3 (max 3 args supported)
+        result = Module.ccall(
+            'eval_ruby_script_returning_json3',
             'string',
-            ['string', 'string'],
-            [text, JSON.stringify(args[0])]
+            ['string', 'string', 'string', 'string'],
+            [text, JSON.stringify(args[0]), JSON.stringify(args[1]), JSON.stringify(args[2])]
         );
-        return JSON.parse(result);
     }
+    return JSON.parse(result);
 }

combined.js

@@ -120,3 +120,84 @@ pub extern "C" fn eval_ruby_script_returning_json1(
         }
     }
 }
+
+#[unsafe(no_mangle)]
+pub extern "C" fn eval_ruby_script_returning_json2(
+    text_ptr: *const c_char,
+    arg1_ptr: *const c_char,
+    arg2_ptr: *const c_char,
+) -> *const c_char {
+    unsafe {
+        let text = cstr_to_str(text_ptr);
+        let arg1 = cstr_to_str(arg1_ptr);
+        let arg2 = cstr_to_str(arg2_ptr);
+        match eval_ruby_script_with_setup(text, |vm| {
+            let arg1_str = RObject::string(arg1.to_string()).to_refcount_assigned();
+            let arg1_json = mrubyedge_serde_json::mrb_json_class_load(vm, &[arg1_str])
+                .unwrap_or_else(|_| RObject::nil().to_refcount_assigned());
+            vm.globals.insert("$arg1".to_string(), arg1_json);
+
+            let arg2_str = RObject::string(arg2.to_string()).to_refcount_assigned();
+            let arg2_json = mrubyedge_serde_json::mrb_json_class_load(vm, &[arg2_str])
+                .unwrap_or_else(|_| RObject::nil().to_refcount_assigned());
+            vm.globals.insert("$arg2".to_string(), arg2_json);
+        }) {
+            Some(result) => {
+                let s: String = (&*result).try_into().unwrap_or_default();
+                match CString::new(s) {
+                    Ok(cstring) => {
+                        let ptr = cstring.as_ptr();
+                        LAST_STRING_RESULT = Some(cstring);
+                        ptr
+                    }
+                    Err(_) => std::ptr::null(),
+                }
+            }
+            None => std::ptr::null(),
+        }
+    }
+}
+
+#[unsafe(no_mangle)]
+pub extern "C" fn eval_ruby_script_returning_json3(
+    text_ptr: *const c_char,
+    arg1_ptr: *const c_char,
+    arg2_ptr: *const c_char,
+    arg3_ptr: *const c_char,
+) -> *const c_char {
+    unsafe {
+        let text = cstr_to_str(text_ptr);
+        let arg1 = cstr_to_str(arg1_ptr);
+        let arg2 = cstr_to_str(arg2_ptr);
+        let arg3 = cstr_to_str(arg3_ptr);
+        match eval_ruby_script_with_setup(text, |vm| {
+            let arg1_str = RObject::string(arg1.to_string()).to_refcount_assigned();
+            let arg1_json = mrubyedge_serde_json::mrb_json_class_load(vm, &[arg1_str])
+                .unwrap_or_else(|_| RObject::nil().to_refcount_assigned());
+            vm.globals.insert("$arg1".to_string(), arg1_json);
+
+            let arg2_str = RObject::string(arg2.to_string()).to_refcount_assigned();
+            let arg2_json = mrubyedge_serde_json::mrb_json_class_load(vm, &[arg2_str])
+                .unwrap_or_else(|_| RObject::nil().to_refcount_assigned());
+            vm.globals.insert("$arg2".to_string(), arg2_json);
+
+            let arg3_str = RObject::string(arg3.to_string()).to_refcount_assigned();
+            let arg3_json = mrubyedge_serde_json::mrb_json_class_load(vm, &[arg3_str])
+                .unwrap_or_else(|_| RObject::nil().to_refcount_assigned());
+            vm.globals.insert("$arg3".to_string(), arg3_json);
+        }) {
+            Some(result) => {
+                let s: String = (&*result).try_into().unwrap_or_default();
+                match CString::new(s) {
+                    Ok(cstring) => {
+                        let ptr = cstring.as_ptr();
+                        LAST_STRING_RESULT = Some(cstring);
+                        ptr
+                    }
+                    Err(_) => std::ptr::null(),
+                }
+            }
+            None => std::ptr::null(),
+        }
+    }
+}