Skip to content

feat!: support decoding js arguments into structs #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ttytm merged 2 commits into from
Oct 22, 2024
Merged

feat!: support decoding js arguments into structs #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63eb703
feat!: support decoding js arguments into structs
ttytm Oct 13, 2024
aa5f53f
add handleObj() fuction to call_odin example
ttytm Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions examples/call_odin.odin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ DOC :: `<!DOCTYPE html>
<br>
<button onclick="webui.handleBool(true, false);">Call handleBool()</button>
<br>
<button onclick="webui.handleObj(JSON.stringify({ name: 'Bob', age: 30 }), JSON.stringify({ email: 'test@webui.dev', hash: 'abc' }));">Call handleObj()</button>
<br>
<p>Call an Odin function that returns a response</p>
<button onclick="getRespFromOdin();">Call getResponse()</button>
<div>Double: <input type="text" id="my-input" value="2"></div>
Expand All @@ -49,8 +51,10 @@ DOC :: `<!DOCTYPE html>
// JavaScript: `webui.handleStr('Hello', 'World');`
handle_string :: proc "c" (e: ^ui.Event) {
context = runtime.default_context()
str1 := ui.get_arg(string, e)
str2 := ui.get_arg(string, e, 1)
str1, _ := ui.get_arg(string, e)
str2, _ := ui.get_arg(string, e, 1)
_, err := ui.get_arg(string, e, 3)
assert(err == .No_Argument)

fmt.println("handle_string 1:", str1) // Hello
fmt.println("handle_string 2:", str2) // World
Expand All @@ -59,9 +63,9 @@ handle_string :: proc "c" (e: ^ui.Event) {
// JavaScript: `webui.handleInt(123, 456, 789);`
handle_int :: proc "c" (e: ^ui.Event) {
context = runtime.default_context()
num1 := ui.get_arg(int, e)
num2 := ui.get_arg(int, e, 1)
num3 := ui.get_arg(int, e, 2)
num1, _ := ui.get_arg(int, e)
num2, _ := ui.get_arg(int, e, 1)
num3, _ := ui.get_arg(int, e, 2)

fmt.println("handle_int 1:", num1) // 123
fmt.println("handle_int 2:", num2) // 456
Expand All @@ -71,17 +75,36 @@ handle_int :: proc "c" (e: ^ui.Event) {
// JavaScript: webui.handleBool(true, false);
handle_bool :: proc "c" (e: ^ui.Event) {
context = runtime.default_context()
status1 := ui.get_arg(bool, e)
status2 := ui.get_arg(bool, e, 1)
status1, _ := ui.get_arg(bool, e)
status2, _ := ui.get_arg(bool, e, 1)

fmt.println("handle_bool 1:", status1) // true
fmt.println("handle_bool 2:", status2) // false
}

// JavaScript: webui.handleObj(JSON.stringify({ name: 'Bob', age: 30 }), JSON.stringify({ email: 'test@webui.dev', hash: 'abc' }));
handle_struct :: proc "c" (e: ^ui.Event) {
context = runtime.default_context()
Person :: struct {
name: string,
age: int,
}
struct1, _ := ui.get_arg(Person, e)
struct2, err := ui.get_arg(struct {
email, hash: string,
}, e, 1)
if err != nil {
fmt.println("Failed to get arg: ", err)
}

fmt.println("handle_struct 1:", struct1)
fmt.println("handle_struct 2:", struct2)
}

// JavaScript: `const result = await webui.getResponse(number);`
get_response :: proc "c" (e: ^ui.Event) {
context = runtime.default_context()
num := ui.get_arg(int, e)
num, _ := ui.get_arg(int, e)

resp := num * 2
fmt.println("handle_response:", resp)
Expand All @@ -98,6 +121,7 @@ main :: proc() {
ui.bind(w, "handleStr", handle_string)
ui.bind(w, "handleInt", handle_int)
ui.bind(w, "handleBool", handle_bool)
ui.bind(w, "handleObj", handle_struct)
ui.bind(w, "getResponse", get_response)

// Show the HTML UI.
Expand Down
24 changes: 18 additions & 6 deletions webui.odin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package webui
import "base:intrinsics"
import "base:runtime"
import "core:c"
import "core:encoding/json"
import "core:fmt"
import "core:strings"
import "core:time"
Expand Down Expand Up @@ -214,17 +215,28 @@ script :: proc(
return strings.string_from_ptr(buf, int(buffer_len)), .None
}

GetArgError :: union {
enum {
None,
No_Argument,
},
json.Unmarshal_Error,
}

// Parse a JS argument as Odin data type.
get_arg :: proc($T: typeid, e: ^Event, idx: uint = 0) -> T {
get_arg :: proc($T: typeid, e: ^Event, idx: uint = 0) -> (res: T, err: GetArgError) {
if get_size_at(e, idx) == 0 {
return res, .No_Argument
}
when intrinsics.type_is_numeric(T) {
return auto_cast get_int_at(e, idx)
return auto_cast get_int_at(e, idx), nil
} else when T == string {
return string(get_string_at(e, idx))
return string(get_string_at(e, idx)), nil
} else when T == bool {
return get_bool_at(e, idx)
return get_bool_at(e, idx), nil
}
// TODO: unmarshal other types from JSON
return {}
json.unmarshal_string(string(get_string_at(e, idx)), &res) or_return
return
}

// Return the response to JavaScript.
Expand Down