Skip to content
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.

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

Allow creating Vecs of exported enums #3624

Merged
merged 2 commits into from
Sep 20, 2023
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
60 changes: 60 additions & 0 deletions crates/backend/src/codegen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1383,6 +1383,7 @@ impl ToTokens for ast::Enum {
}
}
});
let try_from_cast_clauses = cast_clauses.clone();
let wasm_bindgen = &self.wasm_bindgen;
(quote! {
#[automatically_derived]
Expand Down Expand Up @@ -1427,6 +1428,65 @@ impl ToTokens for ast::Enum {
inform(#hole);
}
}

#[automatically_derived]
impl #wasm_bindgen::__rt::core::convert::From<#enum_name> for
#wasm_bindgen::JsValue
{
fn from(value: #enum_name) -> Self {
#wasm_bindgen::JsValue::from_f64((value as u32).into())
}
}

#[allow(clippy::all)]
impl #wasm_bindgen::__rt::core::convert::TryFrom<#wasm_bindgen::JsValue> for #enum_name {
type Error = #wasm_bindgen::JsValue;

fn try_from(value: #wasm_bindgen::JsValue)
-> #wasm_bindgen::__rt::std::result::Result<Self, Self::Error> {
let js = f64::try_from(&value)? as u32;

#wasm_bindgen::__rt::std::result::Result::Ok(
#(#try_from_cast_clauses else)* {
return #wasm_bindgen::__rt::std::result::Result::Err(value)
}
)
}
}

impl #wasm_bindgen::describe::WasmDescribeVector for #enum_name {
fn describe_vector() {
use #wasm_bindgen::describe::*;
inform(VECTOR);
<#wasm_bindgen::JsValue as #wasm_bindgen::describe::WasmDescribe>::describe();
}
}

impl #wasm_bindgen::convert::VectorIntoWasmAbi for #enum_name {
type Abi = <
#wasm_bindgen::__rt::std::boxed::Box<[#wasm_bindgen::JsValue]>
as #wasm_bindgen::convert::IntoWasmAbi
>::Abi;

fn vector_into_abi(
vector: #wasm_bindgen::__rt::std::boxed::Box<[#enum_name]>
) -> Self::Abi {
#wasm_bindgen::convert::js_value_vector_into_abi(vector)
}
}

impl #wasm_bindgen::convert::VectorFromWasmAbi for #enum_name {
type Abi = <
#wasm_bindgen::__rt::std::boxed::Box<[#wasm_bindgen::JsValue]>
as #wasm_bindgen::convert::FromWasmAbi
>::Abi;

unsafe fn vector_from_abi(
js: Self::Abi
) -> #wasm_bindgen::__rt::std::boxed::Box<[#enum_name]> {
#wasm_bindgen::convert::js_value_vector_from_abi(js)
}
}
})
.to_tokens(into);
}
Expand Down
23 changes: 23 additions & 0 deletions tests/wasm/enum_vecs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
const wasm = require('wasm-bindgen-test.js');
const assert = require('assert');

exports.pass_enum_vec = () => {
const el1 = wasm.EnumArrayElement.Unit;
const el2 = wasm.EnumArrayElement.Unit;
const ret = wasm.consume_enum_vec([el1, el2]);
assert.strictEqual(ret.length, 3);

const ret2 = wasm.consume_optional_enum_vec(ret);
assert.strictEqual(ret2.length, 4);

assert.strictEqual(wasm.consume_optional_enum_vec(undefined), undefined);
};

exports.pass_invalid_enum_vec = () => {
try {
wasm.consume_enum_vec(['not an enum value']);
} catch (e) {
assert.match(e.message, /invalid enum value passed/)
assert.match(e.stack, /consume_enum_vec/)
}
};
36 changes: 36 additions & 0 deletions tests/wasm/enum_vecs.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
use wasm_bindgen::prelude::*;
use wasm_bindgen_test::*;

#[wasm_bindgen(module = "tests/wasm/enum_vecs.js")]
extern "C" {
fn pass_enum_vec();
fn pass_invalid_enum_vec();
}

#[wasm_bindgen]
pub enum EnumArrayElement {
Unit,
}

#[wasm_bindgen]
pub fn consume_enum_vec(mut vec: Vec<EnumArrayElement>) -> Vec<EnumArrayElement> {
vec.push(EnumArrayElement::Unit);
vec
}

#[wasm_bindgen]
pub fn consume_optional_enum_vec(
vec: Option<Vec<EnumArrayElement>>,
) -> Option<Vec<EnumArrayElement>> {
vec.map(consume_enum_vec)
}

#[wasm_bindgen_test]
fn test_valid() {
pass_enum_vec();
}

#[wasm_bindgen_test]
fn test_invalid() {
pass_invalid_enum_vec();
}
1 change: 1 addition & 0 deletions tests/wasm/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pub mod closures;
pub mod comments;
pub mod duplicate_deps;
pub mod duplicates;
pub mod enum_vecs;
pub mod enums;
#[path = "final.rs"]
pub mod final_;
Expand Down