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

Merge pull request #1419 from alexcrichton/init-is-hard

Browse Source 
Fix instantiation with a `Module`
This commit is contained in:
Alex Crichton 2019-04-02 16:41:34 -05:00 committed by GitHub
commit 76a03adfa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -903,12 +903,12 @@ impl<'a> Context<'a> {
let ts = Self::ts_for_init_fn(mem.import.is_some()); let ts = Self::ts_for_init_fn(mem.import.is_some());
let js = format!( let js = format!(
"\ "\
function init(module_or_path{init_memory_arg}) {{ function init(module{init_memory_arg}) {{
let result; let result;
const imports = {{ './{module}': __exports }}; const imports = {{ './{module}': __exports }};
if (module_or_path instanceof URL || typeof module_or_path === 'string' || module_or_path instanceof Request) {{ if (module instanceof URL || typeof module === 'string' || module instanceof Request) {{
{init_memory2} {init_memory2}
const response = fetch(module_or_path); const response = fetch(module);
if (typeof WebAssembly.instantiateStreaming === 'function') {{ if (typeof WebAssembly.instantiateStreaming === 'function') {{
result = WebAssembly.instantiateStreaming(response, imports) result = WebAssembly.instantiateStreaming(response, imports)
.catch(e => {{ .catch(e => {{
@ -928,9 +928,13 @@ impl<'a> Context<'a> {
}} }}
}} else {{ }} else {{
{init_memory1} {init_memory1}
result = WebAssembly.instantiate(module_or_path, imports) result = WebAssembly.instantiate(module, imports)
.then(instance => {{ .then(result => {{
return {{ instance, module: module_or_path }}; if (result instanceof WebAssembly.Instance) {{
return {{ instance: result, module }};
}} else {{
return result;
}}
}}); }});
}} }}
return result.then(({{instance, module}}) => {{ return result.then(({{instance, module}}) => {{