Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ jobs:
moonrun --version

- name: moon check
run: moon check --deny-warn
run: moon check --deny-warn --target=js

- name: moon info and moon fmt
run: |
moon info
moon info --target=js
moon fmt
git diff --exit-code

Expand Down
2 changes: 1 addition & 1 deletion moon.mod.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rami3l/js-ffi",
"version": "0.2.2",
"version": "0.2.3",
"readme": "README.md",
"repository": "",
"license": "Apache-2.0",
Expand Down
3 changes: 2 additions & 1 deletion src/js/js.mbti
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package rami3l/js-ffi/js
package "rami3l/js-ffi/js"

// Values
fn async_all[T](Array[() -> T!]) -> Array[T]!
Expand Down Expand Up @@ -82,6 +82,7 @@ impl Object {
new() -> Self
op_get[K, V](Self, K) -> V
op_set[K, V](Self, K, V) -> Unit
to_value(Self) -> Value
}

type Optional[_]
Expand Down
5 changes: 5 additions & 0 deletions src/js/object.mbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ pub fn Object::from_value_unchecked(value : Value) -> Object {
value
}

///|
pub fn Object::to_value(self : Object) -> Value {
self._
}

///|
pub extern "js" fn Object::from_value(value : Value) -> Optional[Object] =
#| (value) => (value) instanceof Object ? value : undefined
Expand Down
8 changes: 6 additions & 2 deletions src/js/object_test.mbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
///|
test "Object::extend_object" {
let obj = @js.Object(@json.from_json!({ "a": 1, "b": 2, "c": 3 }))
let obj1 = @js.Object(@json.from_json!({ "b": [6, 7], "d": 44, "a": 55 }))
let obj = @js.Object::from_value_unchecked(
@json.from_json!({ "a": 1, "b": 2, "c": 3 }),
)
let obj1 = @js.Object::from_value_unchecked(
@json.from_json!({ "b": [6, 7], "d": 44, "a": 55 }),
)
@json.inspect!(obj.extend_object(obj1)._.to_json!(), content={
"a": 55,
"b": [6, 7],
Expand Down