fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-04-04 03:11:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix optional arguments in TypeScript

Browse Source
This commit is contained in:
Danilo Bargen 2019-04-25 18:44:28 +02:00
parent d139228a34
commit 2384af21c1
3 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
crates/cli-support/src/js/js2rust.rs
View File

@ -2,6 +2,22 @@ use crate::descriptor::{Descriptor, Function};
use crate::js::Context; use crate::js::Context;
use failure::{bail, Error}; use failure::{bail, Error};
pub struct JsArgument {
pub optional: bool,
pub name: String,
pub type_: String,
}
impl JsArgument {
fn required(name: String, type_: String) -> Self {
Self { optional: false, name, type_ }
}
fn optional(name: String, type_: String) -> Self {
Self { optional: true, name, type_ }
}
}
/// Helper struct for manufacturing a shim in JS used to translate JS types to /// Helper struct for manufacturing a shim in JS used to translate JS types to
/// Rust, aka pass from JS back into Rust /// Rust, aka pass from JS back into Rust
pub struct Js2Rust<'a, 'b: 'a> { pub struct Js2Rust<'a, 'b: 'a> {
@ -12,7 +28,7 @@ pub struct Js2Rust<'a, 'b: 'a> {
rust_arguments: Vec<String>, rust_arguments: Vec<String>,
/// Arguments and their types to the JS shim. /// Arguments and their types to the JS shim.
pub js_arguments: Vec<(String, String)>, pub js_arguments: Vec<JsArgument>,
/// Conversions that happen before we invoke the wasm function, such as /// Conversions that happen before we invoke the wasm function, such as
/// converting a string to a ptr/length pair. /// converting a string to a ptr/length pair.
@ -173,7 +189,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
if let Some(kind) = arg.vector_kind() { if let Some(kind) = arg.vector_kind() {
self.js_arguments self.js_arguments
.push((name.clone(), kind.js_ty().to_string())); .push(JsArgument::required(name.clone(), kind.js_ty().to_string()));
let func = self.cx.pass_to_wasm_function(kind)?; let func = self.cx.pass_to_wasm_function(kind)?;
let val = if optional { let val = if optional {
@ -221,7 +237,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
} }
if arg.is_anyref() { if arg.is_anyref() {
self.js_arguments.push((name.clone(), "any".to_string())); self.js_arguments.push(JsArgument::required(name.clone(), "any".to_string()));
if self.cx.config.anyref { if self.cx.config.anyref {
if optional { if optional {
self.cx.expose_add_to_anyref_table()?; self.cx.expose_add_to_anyref_table()?;
@ -250,7 +266,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
if arg.is_wasm_native() { if arg.is_wasm_native() {
self.js_arguments self.js_arguments
.push((name.clone(), "number | undefined".to_string())); .push(JsArgument::optional(name.clone(), "number".to_string()));
if self.cx.config.debug { if self.cx.config.debug {
self.cx.expose_assert_num(); self.cx.expose_assert_num();
@ -272,7 +288,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
if arg.is_abi_as_u32() { if arg.is_abi_as_u32() {
self.js_arguments self.js_arguments
.push((name.clone(), "number | undefined".to_string())); .push(JsArgument::optional(name.clone(), "number".to_string()));
if self.cx.config.debug { if self.cx.config.debug {
self.cx.expose_assert_num(); self.cx.expose_assert_num();
@ -299,7 +315,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
}; };
self.cx.expose_uint32_memory(); self.cx.expose_uint32_memory();
self.js_arguments self.js_arguments
.push((name.clone(), "BigInt | undefined".to_string())); .push(JsArgument::optional(name.clone(), "BigInt".to_string()));
self.prelude(&format!( self.prelude(&format!(
" "
{f}[0] = isLikeNone({name}) ? BigInt(0) : {name}; {f}[0] = isLikeNone({name}) ? BigInt(0) : {name};
@ -320,7 +336,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
match *arg { match *arg {
Descriptor::Boolean => { Descriptor::Boolean => {
self.js_arguments self.js_arguments
.push((name.clone(), "boolean | undefined".to_string())); .push(JsArgument::optional(name.clone(), "boolean".to_string()));
if self.cx.config.debug { if self.cx.config.debug {
self.cx.expose_assert_bool(); self.cx.expose_assert_bool();
self.prelude(&format!( self.prelude(&format!(
@ -337,7 +353,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
} }
Descriptor::Char => { Descriptor::Char => {
self.js_arguments self.js_arguments
.push((name.clone(), "string | undefined".to_string())); .push(JsArgument::optional(name.clone(), "string".to_string()));
self.rust_arguments.push(format!( self.rust_arguments.push(format!(
"isLikeNone({0}) ? 0xFFFFFF : {0}.codePointAt(0)", "isLikeNone({0}) ? 0xFFFFFF : {0}.codePointAt(0)",
name name
@ -345,13 +361,13 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
} }
Descriptor::Enum { hole } => { Descriptor::Enum { hole } => {
self.js_arguments self.js_arguments
.push((name.clone(), "number | undefined".to_string())); .push(JsArgument::optional(name.clone(), "number".to_string()));
self.rust_arguments self.rust_arguments
.push(format!("isLikeNone({0}) ? {1} : {0}", name, hole)); .push(format!("isLikeNone({0}) ? {1} : {0}", name, hole));
} }
Descriptor::RustStruct(ref s) => { Descriptor::RustStruct(ref s) => {
self.js_arguments self.js_arguments
.push((name.clone(), format!("{} | undefined", s))); .push(JsArgument::optional(name.clone(), s.to_string()));
self.prelude(&format!("let ptr{} = 0;", i)); self.prelude(&format!("let ptr{} = 0;", i));
self.prelude(&format!("if (!isLikeNone({0})) {{", name)); self.prelude(&format!("if (!isLikeNone({0})) {{", name));
self.assert_class(&name, s); self.assert_class(&name, s);
@ -371,7 +387,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
} }
if let Some(s) = arg.rust_struct() { if let Some(s) = arg.rust_struct() {
self.js_arguments.push((name.clone(), s.to_string())); self.js_arguments.push(JsArgument::required(name.clone(), s.to_string()));
self.assert_class(&name, s); self.assert_class(&name, s);
self.assert_not_moved(&name); self.assert_not_moved(&name);
if arg.is_by_ref() { if arg.is_by_ref() {
@ -385,7 +401,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
} }
if arg.number().is_some() { if arg.number().is_some() {
self.js_arguments.push((name.clone(), "number".to_string())); self.js_arguments.push(JsArgument::required(name.clone(), "number".to_string()));
if self.cx.config.debug { if self.cx.config.debug {
self.cx.expose_assert_num(); self.cx.expose_assert_num();
@ -403,7 +419,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
self.cx.expose_uint64_cvt_shim() self.cx.expose_uint64_cvt_shim()
}; };
self.cx.expose_uint32_memory(); self.cx.expose_uint32_memory();
self.js_arguments.push((name.clone(), "BigInt".to_string())); self.js_arguments.push(JsArgument::required(name.clone(), "BigInt".to_string()));
self.prelude(&format!( self.prelude(&format!(
" "
{f}[0] = {name}; {f}[0] = {name};
@ -420,7 +436,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
} }
if arg.is_ref_anyref() { if arg.is_ref_anyref() {
self.js_arguments.push((name.clone(), "any".to_string())); self.js_arguments.push(JsArgument::required(name.clone(), "any".to_string()));
if self.cx.config.anyref { if self.cx.config.anyref {
self.anyref_args.push((self.rust_arguments.len(), false)); self.anyref_args.push((self.rust_arguments.len(), false));
self.rust_arguments.push(name); self.rust_arguments.push(name);
@ -440,7 +456,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
match *arg { match *arg {
Descriptor::Boolean => { Descriptor::Boolean => {
self.js_arguments self.js_arguments
.push((name.clone(), "boolean".to_string())); .push(JsArgument::required(name.clone(), "boolean".to_string()));
if self.cx.config.debug { if self.cx.config.debug {
self.cx.expose_assert_bool(); self.cx.expose_assert_bool();
self.prelude(&format!( self.prelude(&format!(
@ -453,7 +469,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
self.rust_arguments.push(format!("{}", name)); self.rust_arguments.push(format!("{}", name));
} }
Descriptor::Char => { Descriptor::Char => {
self.js_arguments.push((name.clone(), "string".to_string())); self.js_arguments.push(JsArgument::required(name.clone(), "string".to_string()));
self.rust_arguments.push(format!("{}.codePointAt(0)", name)) self.rust_arguments.push(format!("{}.codePointAt(0)", name))
} }
_ => bail!( _ => bail!(
@ -735,7 +751,11 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
let mut ret: String = self let mut ret: String = self
.js_arguments .js_arguments
.iter() .iter()
.map(|a| format!("@param {{{}}} {}\n", a.1, a.0)) .map(|a| if a.optional {
format!("@param {{{} | undefined}} {}\n", a.type_, a.name)
} else {
format!("@param {{{}}} {}\n", a.type_, a.name)
})
.collect(); .collect();
ret.push_str(&format!("@returns {{{}}}", self.ret_ty)); ret.push_str(&format!("@returns {{{}}}", self.ret_ty));
ret ret
@ -759,7 +779,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
let js_args = self let js_args = self
.js_arguments .js_arguments
.iter() .iter()
.map(|s| &s.0[..]) .map(|s| &s.name[..])
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join(", "); .join(", ");
let mut js = format!("{}({}) {{\n", prefix, js_args); let mut js = format!("{}({}) {{\n", prefix, js_args);
@ -788,7 +808,11 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
let ts_args = self let ts_args = self
.js_arguments .js_arguments
.iter() .iter()
.map(|s| format!("{}: {}", s.0, s.1)) .map(|s| if s.optional {
format!("{}?: {}", s.name, s.type_)
} else {
format!("{}: {}", s.name, s.type_)
})
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join(", "); .join(", ");
let mut ts = if prefix.is_empty() { let mut ts = if prefix.is_empty() {

2
crates/cli-support/src/js/mod.rs
View File

@ -2963,7 +2963,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
"\n {}{}: {};", "\n {}{}: {};",
if field.readonly { "readonly " } else { "" }, if field.readonly { "readonly " } else { "" },
field.name, field.name,
&cx.js_arguments[0].1 &cx.js_arguments[0].type_
)); ));
cx.finish("", &format!("wasm.{}", wasm_setter), setter).0 cx.finish("", &format!("wasm.{}", wasm_setter), setter).0
}; };

2
crates/typescript-tests/src/opt_args_and_ret.ts
View File

@ -1,3 +1,3 @@
import * as wbg from '../pkg/typescript_tests'; import * as wbg from '../pkg/typescript_tests';
const opt_fn: (a: number | undefined) => number | undefined = wbg.opt_fn; const opt_fn: (a?: number) => number | undefined = wbg.opt_fn;