jscall 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1df05fa2e6cee8575b7cdf9a95d35c264422d66c1c793f71e620462380a891bc
-  data.tar.gz: 4bae39ef37ec190d8c6b87fb4541c0ec4f074b7c5b09eeecc1d92a4a47dd570c
+  metadata.gz: ccebaf9700a3adef5c0bba832014a8f29ecfecee4d2e6fd1303c77a986bd6e5a
+  data.tar.gz: ea718525489e87dd340200008540c269b33e5b3432a8b6eb6ddd6103ca53329e
 SHA512:
-  metadata.gz: 16c12783ff80fefb85e4453ca09b54faf4b614895157f4e57108379a51ef0ebbacc2fb38ddff7d87faef50a5c3880a6690cfeb03dc5e5d67be447e36236475af
-  data.tar.gz: a5b57ae8e5d7d891648d457ed32f481ea1b0d528d973e693e164f5053e39f6bfce235148fc22990a53e52e5d7ceaa5eb91dc3297b4b89b8a7af90aa47b88ff54
+  metadata.gz: d6852583f9276d903886d9f3ff1dbcf3ca16569844567f43751bee97917715d0014c8bf598e84aae7a2ba4db6145398b397c1b21e59d921755a6c8d3b0f6bee9
+  data.tar.gz: 3fe7e88204d5971a3a425ca3a2329f560a547204e06e009f791017036ef75e2054da4716b2ddc948b8d170d3eaa05845c30551a88e700cda03eee814530f4857

data/README.md

@@ -110,6 +110,11 @@ created in Ruby.
 Note that you must `await` every call to Ruby object since it is
 asynchronous call.
 
+A shorthand for `obj.to_a()` is `obj.to_a` in Ruby.  However,
+this shorthand is not available in JavaScript.
+You must explicitly write `obj.to_a()`
+in JavaScript when `obj` is a Ruby object.
+
 In JavaScript, `Ruby.exec` is available to run a program in Ruby.
 For example,
 

data/lib/jscall/main.mjs

@@ -43,8 +43,8 @@ const exported = new class {
         }
     }
 
-    export_remoteref(prref) {   // proxy for remote reference
-        return prref.__self__.id
+    export_remoteref(rref) {   // proxy for remote reference
+        return rref.id
     }
 
     next_element() {
@@ -61,6 +61,8 @@ const exported = new class {
         const obj = this.objects[idx]
         if (typeof obj === 'number')
             throw `unknown index is given to find(): ${idx}`
+        else if (obj === null)
+            throw `null is exported? ${idx}`
         else
             return obj
     }
@@ -95,12 +97,12 @@ const remoteRefHandler = new class {
         else
             return (...args) => {
                 // this returns Promise
-                return funcall_to_ruby(obj.id, name, args)
+                return funcall_to_ruby(obj, name, args)
             }
     }
     apply(obj, self, args) {
         // this returns Promise
-        return funcall_to_ruby(obj.id, 'call', args)
+        return funcall_to_ruby(obj, 'call', args)
     }
 }
 
@@ -154,11 +156,11 @@ const encode_obj = obj => {
     else if (obj instanceof Map) {
         const hash = {}
         for (const [key, value] of obj.entries())
-            hash[key] = value
+            hash[key] = encode_obj(value)
         return [param_hash, hash]
     }
     else if (obj instanceof RemoteRef)
-        return [param_local_object, exported.export_remoteref(obj)]
+        return [param_local_object, exported.export_remoteref(obj.__self__)]
     else
         return [param_object, exported.export(obj)]
 }
@@ -203,12 +205,12 @@ export const decode_obj_or_error = obj => {
 const js_eval = eval
 
 export const funcall_from_ruby = cmd => {
+    if (debug_level >= 10)
+        console.error(`RubyToJS> ${cmd[3]} ${cmd[1]} ${cmd[2]}`)
+
     const receiver = decode_obj(cmd[2])
     const name = cmd[3]
     const args = cmd[4].map(e => decode_obj(e))
-    if (debug_level >= 10)
-        console.error(`RubyToJS> ${name} ${cmd[1]}`)
-
     if (name.endsWith('=')) {
         const name2 = name.substring(0, name.length - 1)
         if (receiver === null)
@@ -311,13 +313,13 @@ export const make_cmd_eval = src => {
     return reply_with_piggyback([cmd_eval, message_id, src])
 }
 
-let funcall_to_ruby = (receiver_id, name, args) => {
+let funcall_to_ruby = (receiver, name, args) => {
     return new Promise((resolve, reject) => {
-        const cmd = make_cmd_call(receiver_id, name, args)
+        const cmd = make_cmd_call(receiver, name, args)
         const message_id = cmd[1]
         callback_stack.push([message_id, resolve, reject])
         if (debug_level >= 10)
-            console.error(`JStoRuby< ${name} ${message_id}`)
+            console.error(`JStoRuby< ${name} ${message_id} ${cmd[2][1]}`)
 
         stdout_puts(JSON.stringify(cmd))
     })
@@ -325,7 +327,8 @@ let funcall_to_ruby = (receiver_id, name, args) => {
 
 export const set_funcall_to_ruby = f => { funcall_to_ruby = f }
 
-export const make_cmd_call = (receiver_id, name, args) => {
+export const make_cmd_call = (obj, name, args) => {
+    const receiver_id = exported.export_remoteref(obj)
     const message_id = fresh_id()
     const receiver = [param_local_object, receiver_id]
     const encoded_args = args.map(e => encode_obj(e))

data/lib/jscall/synch.mjs

@@ -171,8 +171,8 @@ export const exec = src => {
     return event_loop()
 }
 
-main.set_funcall_to_ruby((receiver_id, name, args) => {
-    const cmd = main.make_cmd_call(receiver_id, name, args)
+main.set_funcall_to_ruby((receiver, name, args) => {
+    const cmd = main.make_cmd_call(receiver, name, args)
     main.stdout_puts(JSON.stringify(cmd))
     return event_loop()
 })

data/lib/jscall/version.rb

@@ -3,5 +3,5 @@
 # Copyright (C) 2022- Shigeru Chiba.  All rights reserved.
 
 module Jscall
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jscall
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Shigeru Chiba
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick