CHANGELOG.md

@@ -2,6 +2,25 @@
 
 --------------------------------------------------------------------------------
 
+## 0.2.50
+
+Released 2019-08-19.
+
+### Added
+
+* Experimental support with a `WASM_INTERFACE_TYPES=1` environment variable has
+  been added to emit a Wasm Interface Types custom section, making the output of
+  `wasm-bindgen` a single standalone WebAssembly file.
+  [#1725](https://github.com/rustwasm/wasm-bindgen/pull/1725)
+
+### Fixed
+
+* Unrelated errors are now no longer accidentally swallowed by the
+  `instantiateStreaming` fallback.
+  [#1723](https://github.com/rustwasm/wasm-bindgen/pull/1723)
+
+--------------------------------------------------------------------------------
+
 ## 0.2.49
 
 Released 2019-08-14.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-bindgen"
-version = "0.2.49"
+version = "0.2.50"
 authors = ["The wasm-bindgen Developers"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -36,14 +36,14 @@ strict-macro = ["wasm-bindgen-macro/strict-macro"]
 xxx_debug_only_print_generated_code = ["wasm-bindgen-macro/xxx_debug_only_print_generated_code"]
 
 [dependencies]
-wasm-bindgen-macro = { path = "crates/macro", version = "=0.2.49" }
+wasm-bindgen-macro = { path = "crates/macro", version = "=0.2.50" }
 serde = { version = "1.0", optional = true }
 serde_json = { version = "1.0", optional = true }
 cfg-if = "0.1.9"
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-js-sys = { path = 'crates/js-sys', version = '0.3.26' }
-wasm-bindgen-test = { path = 'crates/test', version = '=0.2.49' }
+js-sys = { path = 'crates/js-sys', version = '0.3.27' }
+wasm-bindgen-test = { path = 'crates/test', version = '=0.2.50' }
 serde_derive = "1.0"
 wasm-bindgen-test-crate-a = { path = 'tests/crates/a', version = '0.1' }
 wasm-bindgen-test-crate-b = { path = 'tests/crates/b', version = '0.1' }

crates/anyref-xform/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-bindgen-anyref-xform"
-version = "0.2.49"
+version = "0.2.50"
 authors = ["The wasm-bindgen Developers"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/anyref-xform"

crates/backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-bindgen-backend"
-version = "0.2.49"
+version = "0.2.50"
 authors = ["The wasm-bindgen Developers"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/backend"
@@ -22,4 +22,4 @@ log = "0.4"
 proc-macro2 = "1.0"
 quote = '1.0'
 syn = { version = '1.0', features = ['full'] }
-wasm-bindgen-shared = { path = "../shared", version = "=0.2.49" }
+wasm-bindgen-shared = { path = "../shared", version = "=0.2.50" }

crates/cli-support/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-bindgen-cli-support"
-version = "0.2.49"
+version = "0.2.50"
 authors = ["The wasm-bindgen Developers"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/cli-support"
@@ -19,8 +19,8 @@ rustc-demangle = "0.1.13"
 serde_json = "1.0"
 tempfile = "3.0"
 walrus = "0.11.0"
-wasm-bindgen-anyref-xform = { path = '../anyref-xform', version = '=0.2.49' }
-wasm-bindgen-shared = { path = "../shared", version = '=0.2.49' }
-wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.49' }
-wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.49' }
+wasm-bindgen-anyref-xform = { path = '../anyref-xform', version = '=0.2.50' }
+wasm-bindgen-shared = { path = "../shared", version = '=0.2.50' }
+wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.50' }
+wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.50' }
 wasm-webidl-bindings = "0.4.0"

crates/cli-support/src/anyref.rs

@@ -6,7 +6,7 @@ use walrus::Module;
 use wasm_bindgen_anyref_xform::Context;
 use wasm_webidl_bindings::ast;
 
-pub fn process(module: &mut Module) -> Result<(), Error> {
+pub fn process(module: &mut Module, wasm_interface_types: bool) -> Result<(), Error> {
     let mut cfg = Context::default();
     cfg.prepare(module)?;
     let bindings = module
@@ -45,18 +45,24 @@ pub fn process(module: &mut Module) -> Result<(), Error> {
 
     cfg.run(module)?;
 
-    // Make sure to export the `anyref` table for the JS bindings since it
-    // will need to be initialized. If it doesn't exist though then the
-    // module must not use it, so we skip it.
-    let table = module.tables.iter().find(|t| match t.kind {
-        walrus::TableKind::Anyref(_) => true,
-        _ => false,
-    });
-    let table = match table {
-        Some(t) => t.id(),
-        None => return Ok(()),
-    };
-    module.exports.add("__wbg_anyref_table", table);
+    // If our output is using WebAssembly interface types then our bindings will
+    // never use this table, so no need to export it. Otherwise it's highly
+    // likely in web/JS embeddings this will be used, so make sure we export it
+    // to avoid it getting gc'd accidentally.
+    if !wasm_interface_types {
+        // Make sure to export the `anyref` table for the JS bindings since it
+        // will need to be initialized. If it doesn't exist though then the
+        // module must not use it, so we skip it.
+        let table = module.tables.iter().find(|t| match t.kind {
+            walrus::TableKind::Anyref(_) => true,
+            _ => false,
+        });
+        let table = match table {
+            Some(t) => t.id(),
+            None => return Ok(()),
+        };
+        module.exports.add("__wbg_anyref_table", table);
+    }
 
     // Clean up now-unused intrinsics and shims and such
     walrus::passes::gc::run(module);

crates/cli-support/src/intrinsic.rs

@@ -50,6 +50,15 @@ macro_rules! intrinsics {
                     )*
                 }
             }
+
+            /// Returns the symbol name of this intrinsic
+            pub fn name(&self) -> &'static str {
+                match self {
+                    $(
+                        Intrinsic::$name => $sym,
+                    )*
+                }
+            }
         }
     };
 }

crates/cli-support/src/js/mod.rs

@@ -536,13 +536,19 @@ impl<'a> Context<'a> {
                         if (typeof WebAssembly.instantiateStreaming === 'function') {{
                             result = WebAssembly.instantiateStreaming(response, imports)
                                 .catch(e => {{
-                                    console.warn(\"`WebAssembly.instantiateStreaming` failed. Assuming this is \
-                                                    because your server does not serve wasm with \
-                                                    `application/wasm` MIME type. Falling back to \
-                                                    `WebAssembly.instantiate` which is slower. Original \
-                                                    error:\\n\", e);
                                     return response
-                                        .then(r => r.arrayBuffer())
+                                        .then(r => {{
+                                            if (r.headers.get('Content-Type') != 'application/wasm') {{
+                                                console.warn(\"`WebAssembly.instantiateStreaming` failed \
+                                                                because your server does not serve wasm with \
+                                                                `application/wasm` MIME type. Falling back to \
+                                                                `WebAssembly.instantiate` which is slower. Original \
+                                                                error:\\n\", e);
+                                                return r.arrayBuffer();
+                                            }} else {{
+                                                throw e;
+                                            }}
+                                        }})
                                         .then(bytes => WebAssembly.instantiate(bytes, imports));
                                 }});
                         }} else {{
@@ -2075,11 +2081,13 @@ impl<'a> Context<'a> {
                 &binding.outgoing,
                 wasm_ty.params(),
                 &webidl.params,
+                self.config.wasm_interface_types,
             )
             && webidl::incoming_do_not_require_glue(
                 &binding.incoming,
                 &webidl.result.into_iter().collect::<Vec<_>>(),
                 wasm_ty.results(),
+                self.config.wasm_interface_types,
             )
     }
 

crates/cli-support/src/lib.rs

@@ -36,6 +36,7 @@ pub struct Bindgen {
     // "ready to be instantiated on any thread"
     threads: wasm_bindgen_threads_xform::Config,
     anyref: bool,
+    wasm_interface_types: bool,
     encode_into: EncodeInto,
 }
 
@@ -49,6 +50,7 @@ pub struct Output {
     snippets: HashMap<String, Vec<String>>,
     local_modules: HashMap<String, String>,
     npm_dependencies: HashMap<String, (PathBuf, String)>,
+    wasm_interface_types: bool,
 }
 
 #[derive(Clone)]
@@ -73,6 +75,8 @@ pub enum EncodeInto {
 
 impl Bindgen {
     pub fn new() -> Bindgen {
+        let anyref = env::var("WASM_BINDGEN_ANYREF").is_ok();
+        let wasm_interface_types = env::var("WASM_INTERFACE_TYPES").is_ok();
         Bindgen {
             input: Input::None,
             out_name: None,
@@ -88,7 +92,8 @@ impl Bindgen {
             emit_start: true,
             weak_refs: env::var("WASM_BINDGEN_WEAKREF").is_ok(),
             threads: threads_config(),
-            anyref: env::var("WASM_BINDGEN_ANYREF").is_ok(),
+            anyref: anyref || wasm_interface_types,
+            wasm_interface_types,
             encode_into: EncodeInto::Test,
         }
     }
@@ -315,15 +320,15 @@ impl Bindgen {
         // the webidl bindings proposal) as well as an auxiliary section for all
         // sorts of miscellaneous information and features #[wasm_bindgen]
         // supports that aren't covered by WebIDL bindings.
-        webidl::process(&mut module, self.anyref, self.emit_start)?;
+        webidl::process(&mut module, self.anyref, self.wasm_interface_types, self.emit_start)?;
 
         // Now that we've got type information from the webidl processing pass,
         // touch up the output of rustc to insert anyref shims where necessary.
         // This is only done if the anyref pass is enabled, which it's
         // currently off-by-default since `anyref` is still in development in
         // engines.
         if self.anyref {
-            anyref::process(&mut module)?;
+            anyref::process(&mut module, self.wasm_interface_types)?;
         }
 
         let aux = module
@@ -344,6 +349,11 @@ impl Bindgen {
             (npm_dependencies, cx.finalize(stem)?)
         };
 
+        if self.wasm_interface_types {
+            webidl::standard::add_section(&mut module, &aux, &bindings)
+                .with_context(|_| "failed to generate a standard wasm bindings custom section")?;
+        }
+
         Ok(Output {
             module,
             stem: stem.to_string(),
@@ -354,6 +364,7 @@ impl Bindgen {
             ts,
             mode: self.mode.clone(),
             typescript: self.typescript,
+            wasm_interface_types: self.wasm_interface_types,
         })
     }
 
@@ -506,6 +517,7 @@ fn unexported_unused_lld_things(module: &mut Module) {
 
 impl Output {
     pub fn js(&self) -> &str {
+        assert!(!self.wasm_interface_types);
         &self.js
     }
 
@@ -518,6 +530,23 @@ impl Output {
     }
 
     fn _emit(&self, out_dir: &Path) -> Result<(), Error> {
+        let wasm_name = if self.wasm_interface_types {
+            self.stem.clone()
+        } else {
+            format!("{}_bg", self.stem)
+        };
+        let wasm_path = out_dir
+            .join(wasm_name)
+            .with_extension("wasm");
+        fs::create_dir_all(out_dir)?;
+        let wasm_bytes = self.module.emit_wasm()?;
+        fs::write(&wasm_path, wasm_bytes)
+            .with_context(|_| format!("failed to write `{}`", wasm_path.display()))?;
+
+        if self.wasm_interface_types {
+            return Ok(())
+        }
+
         // Write out all local JS snippets to the final destination now that
         // we've collected them from all the programs.
         for (identifier, list) in self.snippets.iter() {
@@ -554,7 +583,6 @@ impl Output {
         } else {
             "js"
         };
-        fs::create_dir_all(out_dir)?;
         let js_path = out_dir.join(&self.stem).with_extension(extension);
         fs::write(&js_path, reset_indentation(&self.js))
             .with_context(|_| format!("failed to write `{}`", js_path.display()))?;
@@ -565,10 +593,6 @@ impl Output {
                 .with_context(|_| format!("failed to write `{}`", ts_path.display()))?;
         }
 
-        let wasm_path = out_dir
-            .join(format!("{}_bg", self.stem))
-            .with_extension("wasm");
-
         if self.mode.nodejs() {
             let js_path = wasm_path.with_extension(extension);
             let shim = self.generate_node_wasm_import(&self.module, &wasm_path);
@@ -583,9 +607,6 @@ impl Output {
                 .with_context(|_| format!("failed to write `{}`", ts_path.display()))?;
         }
 
-        let wasm_bytes = self.module.emit_wasm()?;
-        fs::write(&wasm_path, wasm_bytes)
-            .with_context(|_| format!("failed to write `{}`", wasm_path.display()))?;
         Ok(())
     }