fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-03-17 10:40:50 +00:00
Code Issues Projects Releases Wiki Activity

fixup! Fix optional arguments in TypeScript

Browse Source 
Apply feedback about omittable and non-omittable arguments. Thanks
@rhysd!
This commit is contained in:
Danilo Bargen 2019-05-09 18:22:44 +02:00
parent 2384af21c1
commit d9c559f2ca
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -805,16 +805,30 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
};
js.push_str(&invoc);
js.push_str("\n}");
let ts_args = self
.js_arguments
.iter()
.map(|s| if s.optional {
format!("{}?: {}", s.name, s.type_)
// Determine TS parameter list
let mut omittable = true;
let mut ts_args = Vec::with_capacity(self.js_arguments.len());
for arg in self.js_arguments.iter().rev() {
// In TypeScript, we can mark optional parameters as omittable
// using the `?` suffix, but only if they're not followed by
// non-omittable parameters. Therefore iterate the parameter list
// in reverse and stop using the `?` suffix for optional params as
// soon as a non-optional parameter is encountered.
if arg.optional {
if omittable {
ts_args.push(format!("{}?: {}", arg.name, arg.type_));
} else {
ts_args.push(format!("{}: {} | undefined", arg.name, arg.type_));
}
} else {
format!("{}: {}", s.name, s.type_)
})
.collect::<Vec<_>>()
.join(", ");
omittable = false;
ts_args.push(format!("{}: {}", arg.name, arg.type_));
}
}
ts_args.reverse();
let ts_args = ts_args.join(", ");
let mut ts = if prefix.is_empty() {
format!("{}({})", self.js_name, ts_args)
} else {