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

fix up some strings that looked funky after rustfmt

Browse Source
This commit is contained in:
R. Andrew Ohana 2018-06-15 23:39:51 -07:00
parent 9127a0419f
commit 7626b55d00
5 changed files with 193 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,7 +393,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
\n}} finally {{\n\ \n}} finally {{\n\
{} {}
}}\n\ }}\n\
", ",
&invoc, &self.finally, &invoc, &self.finally,
) )
}; };

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

@ -113,7 +113,7 @@ impl<'a> Context<'a> {
" "
if (typeof(val) === 'number') throw new Error('corrupt slab'); if (typeof(val) === 'number') throw new Error('corrupt slab');
val.cnt += 1; val.cnt += 1;
", ",
) )
} else { } else {
String::from("val.cnt += 1;") String::from("val.cnt += 1;")
@ -130,17 +130,20 @@ impl<'a> Context<'a> {
{} {}
return idx; return idx;
}} }}
", ",
bump_cnt bump_cnt
)) ))
})?; })?;
self.bind("__wbindgen_object_drop_ref", &|me| { self.bind("__wbindgen_object_drop_ref", &|me| {
me.expose_drop_ref(); me.expose_drop_ref();
Ok("function(i) { Ok(String::from(
dropRef(i); "
}" function(i) {
.to_string()) dropRef(i);
}
",
))
})?; })?;
self.bind("__wbindgen_string_new", &|me| { self.bind("__wbindgen_string_new", &|me| {
@ -151,40 +154,44 @@ impl<'a> Context<'a> {
function(p, l) { function(p, l) {
return addHeapObject(getStringFromWasm(p, l)); return addHeapObject(getStringFromWasm(p, l));
} }
", ",
)) ))
})?; })?;
self.bind("__wbindgen_number_new", &|me| { self.bind("__wbindgen_number_new", &|me| {
me.expose_add_heap_object(); me.expose_add_heap_object();
Ok(String::from( Ok(String::from(
"function(i) { "
return addHeapObject(i); function(i) {
}", return addHeapObject(i);
}
",
)) ))
})?; })?;
self.bind("__wbindgen_number_get", &|me| { self.bind("__wbindgen_number_get", &|me| {
me.expose_get_object(); me.expose_get_object();
me.expose_uint8_memory(); me.expose_uint8_memory();
Ok(format!( Ok(String::from(
" "
function(n, invalid) {{ function(n, invalid) {
let obj = getObject(n); let obj = getObject(n);
if (typeof(obj) === 'number') return obj; if (typeof(obj) === 'number') return obj;
getUint8Memory()[invalid] = 1; getUint8Memory()[invalid] = 1;
return 0; return 0;
}} }
" ",
)) ))
})?; })?;
self.bind("__wbindgen_undefined_new", &|me| { self.bind("__wbindgen_undefined_new", &|me| {
me.expose_add_heap_object(); me.expose_add_heap_object();
Ok(String::from( Ok(String::from(
"function() { "
return addHeapObject(undefined); function() {
}", return addHeapObject(undefined);
}
",
)) ))
})?; })?;
@ -195,7 +202,7 @@ impl<'a> Context<'a> {
function() { function() {
return addHeapObject(null); return addHeapObject(null);
} }
", ",
)) ))
})?; })?;
@ -206,7 +213,7 @@ impl<'a> Context<'a> {
function(idx) { function(idx) {
return getObject(idx) === null ? 1 : 0; return getObject(idx) === null ? 1 : 0;
} }
", ",
)) ))
})?; })?;
@ -217,7 +224,7 @@ impl<'a> Context<'a> {
function(idx) { function(idx) {
return getObject(idx) === undefined ? 1 : 0; return getObject(idx) === undefined ? 1 : 0;
} }
", ",
)) ))
})?; })?;
@ -228,7 +235,7 @@ impl<'a> Context<'a> {
function(v) { function(v) {
return addHeapObject(v === 1); return addHeapObject(v === 1);
} }
", ",
)) ))
})?; })?;
@ -244,25 +251,25 @@ impl<'a> Context<'a> {
return 2; return 2;
} }
} }
", ",
)) ))
})?; })?;
self.bind("__wbindgen_symbol_new", &|me| { self.bind("__wbindgen_symbol_new", &|me| {
me.expose_get_string_from_wasm(); me.expose_get_string_from_wasm();
me.expose_add_heap_object(); me.expose_add_heap_object();
Ok(format!( Ok(String::from(
" "
function(ptr, len) {{ function(ptr, len) {
let a; let a;
if (ptr === 0) {{ if (ptr === 0) {
a = Symbol(); a = Symbol();
}} else {{ } else {
a = Symbol(getStringFromWasm(ptr, len)); a = Symbol(getStringFromWasm(ptr, len));
}} }
return addHeapObject(a); return addHeapObject(a);
}} }
" ",
)) ))
})?; })?;
@ -273,7 +280,7 @@ impl<'a> Context<'a> {
function(i) { function(i) {
return typeof(getObject(i)) === 'symbol' ? 1 : 0; return typeof(getObject(i)) === 'symbol' ? 1 : 0;
} }
", ",
)) ))
})?; })?;
@ -290,7 +297,7 @@ impl<'a> Context<'a> {
getUint32Memory()[len_ptr / 4] = len; getUint32Memory()[len_ptr / 4] = len;
return ptr; return ptr;
} }
", ",
)) ))
})?; })?;
@ -303,7 +310,7 @@ impl<'a> Context<'a> {
obj.a = obj.b = 0; obj.a = obj.b = 0;
dropRef(i); dropRef(i);
} }
", ",
)) ))
})?; })?;
@ -314,7 +321,7 @@ impl<'a> Context<'a> {
function(i) { function(i) {
dropRef(i); dropRef(i);
} }
", ",
)) ))
})?; })?;
@ -326,7 +333,7 @@ impl<'a> Context<'a> {
function(ptr, len) { function(ptr, len) {
return addHeapObject(JSON.parse(getStringFromWasm(ptr, len))); return addHeapObject(JSON.parse(getStringFromWasm(ptr, len)));
} }
", ",
)) ))
})?; })?;
@ -341,7 +348,7 @@ impl<'a> Context<'a> {
getUint32Memory()[ptrptr / 4] = ptr; getUint32Memory()[ptrptr / 4] = ptr;
return len; return len;
} }
", ",
)) ))
})?; })?;
@ -352,7 +359,7 @@ impl<'a> Context<'a> {
function(a, b) { function(a, b) {
return getObject(a) === getObject(b) ? 1 : 0; return getObject(a) === getObject(b) ? 1 : 0;
} }
", ",
)) ))
})?; })?;
@ -365,35 +372,36 @@ impl<'a> Context<'a> {
// isn't gc'd). // isn't gc'd).
self.bind("__wbindgen_throw", &|me| { self.bind("__wbindgen_throw", &|me| {
me.expose_get_string_from_wasm(); me.expose_get_string_from_wasm();
Ok(format!( Ok(String::from(
" "
function(ptr, len) {{ function(ptr, len) {
throw new Error(getStringFromWasm(ptr, len)); throw new Error(getStringFromWasm(ptr, len));
}} }
" ",
)) ))
})?; })?;
self.rewrite_imports(module_name); self.rewrite_imports(module_name);
let mut js = if self.config.no_modules { let mut js = if self.config.no_modules {
format!(" format!(
(function() {{ "
var wasm; (function() {{
const __exports = {{}}; var wasm;
{globals} const __exports = {{}};
function init(wasm_path) {{ {globals}
return fetch(wasm_path) function init(wasm_path) {{
.then(response => response.arrayBuffer()) return fetch(wasm_path)
.then(buffer => WebAssembly.instantiate(buffer, {{ './{module}': __exports }})) .then(response => response.arrayBuffer())
.then(({{instance}}) => {{ .then(buffer => WebAssembly.instantiate(buffer, {{ './{module}': __exports }}))
wasm = init.wasm = instance.exports; .then(({{instance}}) => {{
return; wasm = init.wasm = instance.exports;
}}); return;
}}; }});
self.{global_name} = Object.assign(init, __exports); }};
}})(); self.{global_name} = Object.assign(init, __exports);
", }})();
",
globals = self.globals, globals = self.globals,
module = module_name, module = module_name,
global_name = self.config.no_modules_global global_name = self.config.no_modules_global
@ -476,7 +484,7 @@ impl<'a> Context<'a> {
this.ptr = args[0].ptr; this.ptr = args[0].ptr;
return; return;
}} }}
", ",
name name
)); ));
@ -488,7 +496,7 @@ impl<'a> Context<'a> {
// This invocation of new will call this constructor with a ConstructorToken // This invocation of new will call this constructor with a ConstructorToken
let instance = {class}.{constructor}(...args); let instance = {class}.{constructor}(...args);
this.ptr = instance.ptr; this.ptr = instance.ptr;
", ",
class = name, class = name,
constructor = constructor constructor = constructor
)); ));
@ -510,7 +518,7 @@ impl<'a> Context<'a> {
constructor(ptr) {{ constructor(ptr) {{
this.ptr = ptr; this.ptr = ptr;
}} }}
", ",
name name
)); ));
} }
@ -523,10 +531,10 @@ impl<'a> Context<'a> {
&new_name, &new_name,
&format!( &format!(
" "
function(ptr) {{ function(ptr) {{
return addHeapObject({}.__construct(ptr)); return addHeapObject({}.__construct(ptr));
}} }}
", ",
name name
), ),
None, None,
@ -578,7 +586,7 @@ impl<'a> Context<'a> {
this.ptr = 0; this.ptr = 0;
wasm.{}(ptr); wasm.{}(ptr);
}} }}
", ",
shared::free_function(&name) shared::free_function(&name)
)); ));
ts_dst.push_str("free(): void;\n"); ts_dst.push_str("free(): void;\n");
@ -714,7 +722,7 @@ impl<'a> Context<'a> {
String::from( String::from(
" "
if ((idx & 1) === 1) throw new Error('cannot drop ref of stack objects'); if ((idx & 1) === 1) throw new Error('cannot drop ref of stack objects');
", ",
) )
} else { } else {
String::new() String::new()
@ -725,14 +733,14 @@ impl<'a> Context<'a> {
if (typeof(obj) === 'number') throw new Error('corrupt slab'); if (typeof(obj) === 'number') throw new Error('corrupt slab');
obj.cnt -= 1; obj.cnt -= 1;
if (obj.cnt > 0) return; if (obj.cnt > 0) return;
", ",
) )
} else { } else {
String::from( String::from(
" "
obj.cnt -= 1; obj.cnt -= 1;
if (obj.cnt > 0) return; if (obj.cnt > 0) return;
", ",
) )
}; };
self.global(&format!( self.global(&format!(
@ -745,7 +753,7 @@ impl<'a> Context<'a> {
slab[idx >> 1] = slab_next; slab[idx >> 1] = slab_next;
slab_next = idx >> 1; slab_next = idx >> 1;
}} }}
", ",
validate_owned, dec_ref validate_owned, dec_ref
)); ));
} }
@ -767,7 +775,7 @@ impl<'a> Context<'a> {
if (stack.length === 0) return; if (stack.length === 0) return;
throw new Error('stack is not currently empty'); throw new Error('stack is not currently empty');
} }
", ",
None, None,
); );
} }
@ -789,13 +797,13 @@ impl<'a> Context<'a> {
"assertSlabEmpty", "assertSlabEmpty",
&format!( &format!(
" "
function() {{ function() {{
for (let i = {}; i < slab.length; i++) {{ for (let i = {}; i < slab.length; i++) {{
if (typeof(slab[i]) === 'number') continue; if (typeof(slab[i]) === 'number') continue;
throw new Error('slab is not currently empty'); throw new Error('slab is not currently empty');
}}
}} }}
}} ",
",
initial_values.len() initial_values.len()
), ),
None, None,
@ -808,11 +816,11 @@ impl<'a> Context<'a> {
return; return;
} }
self.expose_global_slab(); self.expose_global_slab();
self.global(&format!( self.global(
" "
let slab_next = slab.length; let slab_next = slab.length;
" ",
)); );
} }
fn expose_get_object(&mut self) { fn expose_get_object(&mut self) {
@ -827,13 +835,13 @@ impl<'a> Context<'a> {
" "
if (typeof(val) === 'number') throw new Error('corrupt slab'); if (typeof(val) === 'number') throw new Error('corrupt slab');
return val.obj; return val.obj;
", ",
) )
} else { } else {
String::from( String::from(
" "
return val.obj; return val.obj;
", ",
) )
}; };
self.global(&format!( self.global(&format!(
@ -846,7 +854,7 @@ impl<'a> Context<'a> {
{} {}
}} }}
}} }}
", ",
get_obj get_obj
)); ));
} }
@ -860,7 +868,7 @@ impl<'a> Context<'a> {
function _assertNum(n) {{ function _assertNum(n) {{
if (typeof(n) !== 'number') throw new Error('expected a number argument'); if (typeof(n) !== 'number') throw new Error('expected a number argument');
}} }}
" "
)); ));
} }
@ -875,7 +883,7 @@ impl<'a> Context<'a> {
throw new Error('expected a boolean argument'); throw new Error('expected a boolean argument');
}} }}
}} }}
" "
)); ));
} }
@ -902,7 +910,7 @@ impl<'a> Context<'a> {
getUint8Memory().set(buf, ptr); getUint8Memory().set(buf, ptr);
return [ptr, buf.length]; return [ptr, buf.length];
}} }}
", ",
debug debug
)); ));
Ok(()) Ok(())
@ -956,7 +964,7 @@ impl<'a> Context<'a> {
{}().set(arg, ptr / {size}); {}().set(arg, ptr / {size});
return [ptr, arg.length]; return [ptr, arg.length];
}} }}
", ",
name, name,
delegate, delegate,
size = size size = size
@ -969,25 +977,25 @@ impl<'a> Context<'a> {
return; return;
} }
if self.config.nodejs { if self.config.nodejs {
self.global(&format!( self.global(
" "
const TextEncoder = require('util').TextEncoder; const TextEncoder = require('util').TextEncoder;
" ",
)); );
} else if !(self.config.browser || self.config.no_modules) { } else if !(self.config.browser || self.config.no_modules) {
self.global(&format!( self.global(
" "
const TextEncoder = typeof self === 'object' && self.TextEncoder const TextEncoder = typeof self === 'object' && self.TextEncoder
? self.TextEncoder ? self.TextEncoder
: require('util').TextEncoder; : require('util').TextEncoder;
" ",
)); );
} }
self.global(&format!( self.global(
" "
let cachedEncoder = new TextEncoder('utf-8'); let cachedEncoder = new TextEncoder('utf-8');
" ",
)); );
} }
fn expose_text_decoder(&mut self) { fn expose_text_decoder(&mut self) {
@ -995,25 +1003,25 @@ impl<'a> Context<'a> {
return; return;
} }
if self.config.nodejs { if self.config.nodejs {
self.global(&format!( self.global(
" "
const TextDecoder = require('util').TextDecoder; const TextDecoder = require('util').TextDecoder;
" ",
)); );
} else if !(self.config.browser || self.config.no_modules) { } else if !(self.config.browser || self.config.no_modules) {
self.global(&format!( self.global(
" "
const TextDecoder = typeof self === 'object' && self.TextDecoder const TextDecoder = typeof self === 'object' && self.TextDecoder
? self.TextDecoder ? self.TextDecoder
: require('util').TextDecoder; : require('util').TextDecoder;
" ",
)); );
} }
self.global(&format!( self.global(
" "
let cachedDecoder = new TextDecoder('utf-8'); let cachedDecoder = new TextDecoder('utf-8');
" ",
)); );
} }
fn expose_constructor_token(&mut self) { fn expose_constructor_token(&mut self) {
@ -1028,7 +1036,7 @@ impl<'a> Context<'a> {
this.ptr = ptr; this.ptr = ptr;
} }
} }
", ",
); );
} }
@ -1038,13 +1046,13 @@ impl<'a> Context<'a> {
} }
self.expose_text_decoder(); self.expose_text_decoder();
self.expose_uint8_memory(); self.expose_uint8_memory();
self.global(&format!( self.global(
" "
function getStringFromWasm(ptr, len) {{ function getStringFromWasm(ptr, len) {
return cachedDecoder.decode(getUint8Memory().subarray(ptr, ptr + len)); return cachedDecoder.decode(getUint8Memory().subarray(ptr, ptr + len));
}} }
" ",
)); );
} }
fn expose_get_array_js_value_from_wasm(&mut self) { fn expose_get_array_js_value_from_wasm(&mut self) {
@ -1053,19 +1061,19 @@ impl<'a> Context<'a> {
} }
self.expose_get_array_u32_from_wasm(); self.expose_get_array_u32_from_wasm();
self.expose_take_object(); self.expose_take_object();
self.global(&format!( self.global(
" "
function getArrayJsValueFromWasm(ptr, len) {{ function getArrayJsValueFromWasm(ptr, len) {
const mem = getUint32Memory(); const mem = getUint32Memory();
const slice = mem.subarray(ptr / 4, ptr / 4 + len); const slice = mem.subarray(ptr / 4, ptr / 4 + len);
const result = []; const result = [];
for (let i = 0; i < slice.length; i++) {{ for (let i = 0; i < slice.length; i++) {
result.push(takeObject(slice[i])); result.push(takeObject(slice[i]));
}} }
return result; return result;
}} }
" ",
)); );
} }
fn expose_get_array_i8_from_wasm(&mut self) { fn expose_get_array_i8_from_wasm(&mut self) {
@ -1127,7 +1135,7 @@ impl<'a> Context<'a> {
function {name}(ptr, len) {{ function {name}(ptr, len) {{
return {mem}().subarray(ptr / {size}, ptr / {size} + len); return {mem}().subarray(ptr / {size}, ptr / {size} + len);
}} }}
", ",
name = name, name = name,
mem = mem, mem = mem,
size = size, size = size,
@ -1240,7 +1248,7 @@ impl<'a> Context<'a> {
}} }}
return cache{name}; return cache{name};
}} }}
", ",
name = name, name = name,
js = js, js = js,
)); ));
@ -1250,16 +1258,16 @@ impl<'a> Context<'a> {
if !self.exposed_globals.insert("assert_class") { if !self.exposed_globals.insert("assert_class") {
return; return;
} }
self.global(&format!( self.global(
" "
function _assertClass(instance, klass) {{ function _assertClass(instance, klass) {
if (!(instance instanceof klass)) {{ if (!(instance instanceof klass)) {
throw new Error(`expected instance of ${{klass.name}}`); throw new Error(`expected instance of ${klass.name}`);
}} }
return instance.ptr; return instance.ptr;
}} }
" ",
)); );
} }
fn expose_borrowed_objects(&mut self) { fn expose_borrowed_objects(&mut self) {
@ -1267,14 +1275,14 @@ impl<'a> Context<'a> {
return; return;
} }
self.expose_global_stack(); self.expose_global_stack();
self.global(&format!( self.global(
" "
function addBorrowedObject(obj) {{ function addBorrowedObject(obj) {
stack.push(obj); stack.push(obj);
return ((stack.length - 1) << 1) | 1; return ((stack.length - 1) << 1) | 1;
}} }
" ",
)); );
} }
fn expose_take_object(&mut self) { fn expose_take_object(&mut self) {
@ -1283,15 +1291,15 @@ impl<'a> Context<'a> {
} }
self.expose_get_object(); self.expose_get_object();
self.expose_drop_ref(); self.expose_drop_ref();
self.global(&format!( self.global(
" "
function takeObject(idx) {{ function takeObject(idx) {
const ret = getObject(idx); const ret = getObject(idx);
dropRef(idx); dropRef(idx);
return ret; return ret;
}} }
" ",
)); );
} }
fn expose_add_heap_object(&mut self) { fn expose_add_heap_object(&mut self) {
@ -1305,13 +1313,13 @@ impl<'a> Context<'a> {
" "
if (typeof(next) !== 'number') throw new Error('corrupt slab'); if (typeof(next) !== 'number') throw new Error('corrupt slab');
slab_next = next; slab_next = next;
", ",
) )
} else { } else {
String::from( String::from(
" "
slab_next = next; slab_next = next;
", ",
) )
}; };
self.global(&format!( self.global(&format!(
@ -1324,7 +1332,7 @@ impl<'a> Context<'a> {
slab[idx] = {{ obj, cnt: 1 }}; slab[idx] = {{ obj, cnt: 1 }};
return idx << 1; return idx << 1;
}} }}
", ",
set_slab_next set_slab_next
)); ));
} }
@ -1441,7 +1449,7 @@ impl<'a> Context<'a> {
const idx = globalArgumentPtr() / 4 + arg; const idx = globalArgumentPtr() / 4 + arg;
return getUint32Memory()[idx]; return getUint32Memory()[idx];
} }
", ",
); );
Ok(()) Ok(())
} }
@ -1455,12 +1463,12 @@ impl<'a> Context<'a> {
" "
let cachedGlobalArgumentPtr = null; let cachedGlobalArgumentPtr = null;
function globalArgumentPtr() { function globalArgumentPtr() {
if (cachedGlobalArgumentPtr === null) {{ if (cachedGlobalArgumentPtr === null) {
cachedGlobalArgumentPtr = wasm.__wbindgen_global_argument_ptr(); cachedGlobalArgumentPtr = wasm.__wbindgen_global_argument_ptr();
}} }
return cachedGlobalArgumentPtr; return cachedGlobalArgumentPtr;
} }
", ",
); );
Ok(()) Ok(())
} }
@ -1488,7 +1496,7 @@ impl<'a> Context<'a> {
} }
throw new Error('descriptor not found'); throw new Error('descriptor not found');
} }
", ",
); );
} }
@ -1754,10 +1762,10 @@ impl<'a, 'b> SubContext<'a, 'b> {
&import.shim, &import.shim,
&format!( &format!(
" "
function() {{ function() {{
return addHeapObject({}); return addHeapObject({});
}} }}
", ",
obj obj
), ),
None, None,
@ -1797,7 +1805,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
format!( format!(
"function(y) {{ "function(y) {{
return this.{}; return this.{};
}}", }}",
g g
) )
} else { } else {
@ -1806,7 +1814,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
"GetOwnOrInheritedPropertyDescriptor\ "GetOwnOrInheritedPropertyDescriptor\
({}{}, '{}').get", ({}{}, '{}').get",
class, class,
if is_static { "" } else { ".prototype " }, if is_static { "" } else { ".prototype" },
g, g,
) )
} }
@ -1824,7 +1832,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
"GetOwnOrInheritedPropertyDescriptor\ "GetOwnOrInheritedPropertyDescriptor\
({}{}, '{}').set", ({}{}, '{}').set",
class, class,
if is_static { "" } else { ".prototype " }, if is_static { "" } else { ".prototype" },
s, s,
) )
} }
@ -1861,7 +1869,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
self.cx.global(&format!( self.cx.global(&format!(
" "
const {}_target = {}; const {}_target = {};
", ",
import.shim, target import.shim, target
)); ));
format!( format!(
@ -1877,7 +1885,7 @@ impl<'a, 'b> SubContext<'a, 'b> {
self.cx.global(&format!( self.cx.global(&format!(
" "
const {}_target = {}; const {}_target = {};
", ",
import.shim, name import.shim, name
)); ));
format!("{}_target", import.shim) format!("{}_target", import.shim)

26
crates/cli-support/src/js/rust2js.rs
View File

@ -271,7 +271,7 @@ impl<'a, 'b> Rust2Js<'a, 'b> {
const mem = getUint32Memory(); const mem = getUint32Memory();
mem[ret / 4] = retptr; mem[ret / 4] = retptr;
mem[ret / 4 + 1] = retlen; mem[ret / 4 + 1] = retlen;
", ",
f f
); );
return Ok(()); return Ok(());
@ -336,12 +336,12 @@ impl<'a, 'b> Rust2Js<'a, 'b> {
invoc = format!( invoc = format!(
"\ "\
try {{\n\ try {{\n\
{} {}
}} catch (e) {{\n\ }} catch (e) {{\n\
{} {}
}}\ }}\
", ",
&invoc, catch &invoc, catch
); );
}; };
@ -349,12 +349,12 @@ impl<'a, 'b> Rust2Js<'a, 'b> {
if self.finally.len() > 0 { if self.finally.len() > 0 {
invoc = format!( invoc = format!(
"\ "\
try {{\n\ try {{\n\
{} {}
}} finally {{\n\ }} finally {{\n\
{} {}
}}\ }}\
", ",
&invoc, &self.finally &invoc, &self.finally
); );
} }

2
crates/cli-support/src/lib.rs
View File

@ -212,7 +212,7 @@ impl Bindgen {
const wasmModule = new WebAssembly.Module(bytes); const wasmModule = new WebAssembly.Module(bytes);
const wasmInstance = new WebAssembly.Instance(wasmModule, imports); const wasmInstance = new WebAssembly.Instance(wasmModule, imports);
module.exports = wasmInstance.exports; module.exports = wasmInstance.exports;
", ",
path.file_name().unwrap().to_str().unwrap() path.file_name().unwrap().to_str().unwrap()
)); ));

27
crates/cli-support/src/wasm2es6js.rs
View File

@ -77,7 +77,7 @@ impl Output {
exports.push_str(&format!( exports.push_str(&format!(
" "
export const {}: WebAssembly.Memory; export const {}: WebAssembly.Memory;
", ",
entry.field() entry.field()
)); ));
continue; continue;
@ -111,7 +111,7 @@ impl Output {
exports.push_str(&format!( exports.push_str(&format!(
" "
export function {name}({args}): {ret}; export function {name}({args}): {ret};
", ",
name = entry.field(), name = entry.field(),
args = args, args = args,
ret = if ty.return_type().is_some() { ret = if ty.return_type().is_some() {
@ -212,7 +212,7 @@ impl Output {
export function {name}({args}) {{ export function {name}({args}) {{
{ret} wasm.exports.{name}({args}); {ret} wasm.exports.{name}({args});
}} }}
", ",
name = entry.field(), name = entry.field(),
args = args, args = args,
ret = if ty.return_type().is_some() { ret = if ty.return_type().is_some() {
@ -224,11 +224,13 @@ impl Output {
} }
} }
let inst = format!( let inst = format!(
"WebAssembly.instantiate(bytes,{{ {imports} }}) "
WebAssembly.instantiate(bytes,{{ {imports} }})
.then(obj => {{ .then(obj => {{
wasm = obj.instance; wasm = obj.instance;
{memory} {memory}
}})", }})
",
imports = imports, imports = imports,
memory = if export_mem { memory = if export_mem {
"memory = wasm.exports.memory;" "memory = wasm.exports.memory;"
@ -247,7 +249,8 @@ impl Output {
bytes = Uint8Array.from(atob(base64), c => c.charCodeAt(0)); bytes = Uint8Array.from(atob(base64), c => c.charCodeAt(0));
}} else {{ }} else {{
bytes = Buffer.from(base64, 'base64'); bytes = Buffer.from(base64, 'base64');
}}", }}
",
base64 = base64::encode(&wasm) base64 = base64::encode(&wasm)
), ),
inst, inst,
@ -256,9 +259,11 @@ impl Output {
( (
String::new(), String::new(),
format!( format!(
"fetch('{path}') "
.then(res => res.arrayBuffer()) fetch('{path}')
.then(bytes => {inst})", .then(res => res.arrayBuffer())
.then(bytes => {inst})
",
path = path, path = path,
inst = inst inst = inst
), ),
@ -274,7 +279,7 @@ impl Output {
{mem_export} {mem_export}
export const booted = {booted}; export const booted = {booted};
{exports} {exports}
", ",
bytes = bytes, bytes = bytes,
booted = booted, booted = booted,
js_imports = js_imports, js_imports = js_imports,
@ -440,7 +445,7 @@ impl Output {
Infinity, Infinity,
}}, imports, mem); }}, imports, mem);
{js_exports} {js_exports}
", ",
js_imports = js_imports, js_imports = js_imports,
js_init_mem = js_init_mem, js_init_mem = js_init_mem,
asm_func = asm_func, asm_func = asm_func,