CHANGELOG.md

@@ -32,6 +32,37 @@ Released YYYY-MM-DD.
 
 --------------------------------------------------------------------------------
 
+## 0.2.47
+
+Released 2019-06-19.
+
+### Changed
+
+* The `HtmlHyperlinkElement` should now include more native methods after a
+  small edit to the WebIDL.
+  [#1604](https://github.com/rustwasm/wasm-bindgen/pull/1604)
+
+* Duplicate names for getters/setters now have a first-class `wasm-bindgen`
+  error.
+  [#1605](https://github.com/rustwasm/wasm-bindgen/pull/1605)
+
+### Fixed
+
+* TypeScript definition of `init` with `--target web` now reflects that the
+  first argument is optional.
+  [#1599](https://github.com/rustwasm/wasm-bindgen/pull/1599)
+
+* A panic with the futures 0.3 support has been fixed.
+  [#1598](https://github.com/rustwasm/wasm-bindgen/pull/1598)
+
+* More slice types are recognized as becoming immutable in some WebIDL methods.
+  [#1602](https://github.com/rustwasm/wasm-bindgen/pull/1602)
+
+* The function table is now no longer too aggressively removed.
+  [#1606](https://github.com/rustwasm/wasm-bindgen/pull/1606)
+
+--------------------------------------------------------------------------------
+
 ## 0.2.46
 
 Released 2019-06-14.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-bindgen"
-version = "0.2.46"
+version = "0.2.47"
 authors = ["The wasm-bindgen Developers"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -35,13 +35,13 @@ 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.46" }
+wasm-bindgen-macro = { path = "crates/macro", version = "=0.2.47" }
 serde = { version = "1.0", optional = true }
 serde_json = { version = "1.0", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-js-sys = { path = 'crates/js-sys', version = '0.3.23' }
-wasm-bindgen-test = { path = 'crates/test', version = '=0.2.46' }
+js-sys = { path = 'crates/js-sys', version = '0.3.24' }
+wasm-bindgen-test = { path = 'crates/test', version = '=0.2.47' }
 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' }

azure-pipelines.yml

@@ -252,8 +252,9 @@ jobs:
     steps:
       - template: ci/azure-install-rust.yml
       - script: |
-          which mdbook || cargo install mdbook
-          which mdbook-linkcheck || cargo install mdbook-linkcheck
+          set -e
+          curl -L https://github.com/rust-lang-nursery/mdBook/releases/download/v0.3.0/mdbook-v0.3.0-x86_64-unknown-linux-gnu.tar.gz | tar xzf -
+          echo "##vso[task.prependpath]$PWD"
         displayName: "Install mdbook"
       - script: (cd guide && mv _theme theme && mdbook build)
       - task: PublishPipelineArtifact@0

crates/anyref-xform/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-bindgen-anyref-xform"
-version = "0.2.46"
+version = "0.2.47"
 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.46"
+version = "0.2.47"
 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 = "0.4.8"
 quote = '0.6'
 syn = { version = '0.15', features = ['full'] }
-wasm-bindgen-shared = { path = "../shared", version = "=0.2.46" }
+wasm-bindgen-shared = { path = "../shared", version = "=0.2.47" }

crates/cli-support/Cargo.toml

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

crates/cli-support/src/descriptors.rs

@@ -40,7 +40,24 @@ pub fn execute(module: &mut Module) -> Result<WasmBindgenDescriptorsSectionId, E
 
     // Delete all descriptor functions and imports from the module now that
     // we've executed all of them.
+    //
+    // Note though that during this GC pass it's a bit aggressive in that it can
+    // delete the function table entirely. We don't actually know at this point
+    // whether we need the function table or not. The bindings generation may
+    // need to export the table so the JS glue can call functions in it, and
+    // that's only discovered during binding selection. For now we just add
+    // synthetic root exports for all tables in the module, and then we delete
+    // the exports just after GC. This should keep tables like the function
+    // table alive during GC all the way through to the bindings generation
+    // where we can either actually export it or gc it out since it's not used.
+    let mut exported_tables = Vec::new();
+    for table in module.tables.iter() {
+        exported_tables.push(module.exports.add("foo", table.id()));
+    }
     walrus::passes::gc::run(module);
+    for export in exported_tables {
+        module.exports.delete(export);
+    }
 
     Ok(module.customs.add(section))
 }

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

@@ -396,7 +396,7 @@ impl<'a> Context<'a> {
         Ok(imports)
     }
 
-    fn ts_for_init_fn(has_memory: bool) -> String {
+    fn ts_for_init_fn(has_memory: bool, has_module_or_path_optional: bool) -> String {
         let (memory_doc, memory_param) = if has_memory {
             (
                 "* @param {WebAssembly.Memory} maybe_memory\n",
@@ -405,6 +405,7 @@ impl<'a> Context<'a> {
         } else {
             ("", "")
         };
+        let arg_optional = if has_module_or_path_optional { "?" } else { "" };
         format!(
             "\n\
             /**\n\
@@ -417,9 +418,9 @@ impl<'a> Context<'a> {
             * @returns {{Promise<any>}}\n\
             */\n\
             export default function init \
-                (module_or_path: RequestInfo | BufferSource | WebAssembly.Module{}): Promise<any>;
+                (module_or_path{}: RequestInfo | BufferSource | WebAssembly.Module{}): Promise<any>;
         ",
-            memory_doc, memory_param
+            memory_doc, arg_optional, memory_param
         )
     }
 
@@ -461,7 +462,7 @@ 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(), !default_module_path.is_empty());
 
         // Initialize the `imports` object for all import definitions that we're
         // directed to wire up.
@@ -1819,7 +1820,10 @@ impl<'a> Context<'a> {
     }
 
     pub fn generate(&mut self, aux: &WasmBindgenAux) -> Result<(), Error> {
-        for (id, export) in sorted_iter(&aux.export_map) {
+        let mut pairs = aux.export_map.iter().collect::<Vec<_>>();
+        pairs.sort_by_key(|(k, _)| *k);
+        check_duplicated_getter_and_setter_names(&pairs)?;
+        for (id, export) in pairs {
             self.generate_export(*id, export).with_context(|_| {
                 format!(
                     "failed to generate bindings for Rust export `{}`",
@@ -2122,6 +2126,51 @@ impl<'a> Context<'a> {
     }
 }
 
+fn check_duplicated_getter_and_setter_names(
+    exports: &[(&ExportId, &AuxExport)],
+) -> Result<(), Error> {
+    let verify_exports =
+        |first_class, first_field, second_class, second_field| -> Result<(), Error> {
+            let both_are_in_the_same_class = first_class == second_class;
+            let both_are_referencing_the_same_field = first_field == second_field;
+            if both_are_in_the_same_class && both_are_referencing_the_same_field {
+                bail!(format!(
+                    "There can be only one getter/setter definition for `{}` in `{}`",
+                    first_field, first_class
+                ));
+            }
+            Ok(())
+        };
+    for (idx, (_, first_export)) in exports.iter().enumerate() {
+        for (_, second_export) in exports.iter().skip(idx + 1) {
+            match (&first_export.kind, &second_export.kind) {
+                (
+                    AuxExportKind::Getter {
+                        class: first_class,
+                        field: first_field,
+                    },
+                    AuxExportKind::Getter {
+                        class: second_class,
+                        field: second_field,
+                    },
+                ) => verify_exports(first_class, first_field, second_class, second_field)?,
+                (
+                    AuxExportKind::Setter {
+                        class: first_class,
+                        field: first_field,
+                    },
+                    AuxExportKind::Setter {
+                        class: second_class,
+                        field: second_field,
+                    },
+                ) => verify_exports(first_class, first_field, second_class, second_field)?,
+                _ => {}
+            }
+        }
+    }
+    Ok(())
+}
+
 fn generate_identifier(name: &str, used_names: &mut HashMap<String, usize>) -> String {
     let cnt = used_names.entry(name.to_string()).or_insert(0);
     *cnt += 1;
@@ -2204,7 +2253,7 @@ impl ExportedClass {
     }
 }
 
-/// Returns a sorted iterator over a hash mpa, sorted based on key.
+/// Returns a sorted iterator over a hash map, sorted based on key.
 ///
 /// The intention of this API is to be used whenever the iteration order of a
 /// `HashMap` might affect the generated JS bindings. We want to ensure that the

crates/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-bindgen-cli"
-version = "0.2.46"
+version = "0.2.47"
 authors = ["The wasm-bindgen Developers"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/cli"
@@ -9,7 +9,7 @@ documentation = "https://rustwasm.github.io/wasm-bindgen/"
 categories = ["wasm"]
 description = """
 Command line interface of the `#[wasm_bindgen]` attribute and project. For more
-information see https://github.com/alexcrichton/wasm-bindgen.
+information see https://github.com/rustwasm/wasm-bindgen.
 """
 edition = '2018'
 
@@ -25,8 +25,8 @@ serde = { version = "1.0", features = ['derive'] }
 serde_derive = "1.0"
 serde_json = "1.0"
 walrus = "0.8.0"
-wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.46" }
-wasm-bindgen-shared = { path = "../shared", version = "=0.2.46" }
+wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.47" }
+wasm-bindgen-shared = { path = "../shared", version = "=0.2.47" }
 
 [dev-dependencies]
 assert_cmd = "0.11"

crates/futures/Cargo.toml

@@ -7,19 +7,19 @@ license = "MIT/Apache-2.0"
 name = "wasm-bindgen-futures"
 repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/futures"
 readme = "./README.md"
-version = "0.3.23"
+version = "0.3.24"
 edition = "2018"
 
 [dependencies]
 futures = "0.1.20"
-js-sys = { path = "../js-sys", version = '0.3.23' }
-wasm-bindgen = { path = "../..", version = '0.2.46' }
+js-sys = { path = "../js-sys", version = '0.3.24' }
+wasm-bindgen = { path = "../..", version = '0.2.47' }
 futures-util-preview = { version = "0.3.0-alpha.15", optional = true }
 futures-channel-preview = { version = "0.3.0-alpha.15", optional = true }
 lazy_static = { version = "1.3.0", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-wasm-bindgen-test = { path = '../test', version = '0.2.46' }
+wasm-bindgen-test = { path = '../test', version = '0.2.47' }
 
 [features]
 futures_0_3 = ["futures-util-preview", "futures-channel-preview", "lazy_static"]

crates/futures/src/futures_0_3.rs

@@ -233,27 +233,27 @@ where
 
                     match lock.pop_front() {
                         Some(task) => {
-                            let mut future = task.future.borrow_mut();
-
-                            let poll = {
-                                // This will only panic if the Future wakes up the Waker after returning Poll::Ready
-                                let mut future = future.as_mut().unwrap_throw();
-
-                                // Clear `is_queued` flag so that it will re-queue if poll calls waker.wake()
-                                task.is_queued.set(false);
-
-                                // This is necessary because the polled task might queue more tasks
-                                drop(lock);
-
-                                // TODO is there some way of saving these so they don't need to be recreated all the time ?
-                                let waker = ArcWake::into_waker(task.clone());
-                                let cx = &mut Context::from_waker(&waker);
-                                Pin::new(&mut future).poll(cx)
-                            };
-
-                            if let Poll::Ready(_) = poll {
-                                // Cleanup the Future immediately
-                                *future = None;
+                            let mut borrow = task.future.borrow_mut();
+
+                            // This will only be None if the Future wakes up the Waker after returning Poll::Ready
+                            if let Some(future) = borrow.as_mut() {
+                                let poll = {
+                                    // Clear `is_queued` flag so that it will re-queue if poll calls waker.wake()
+                                    task.is_queued.set(false);
+
+                                    // This is necessary because the polled task might queue more tasks
+                                    drop(lock);
+
+                                    // TODO is there some way of saving these so they don't need to be recreated all the time ?
+                                    let waker = ArcWake::into_waker(task.clone());
+                                    let cx = &mut Context::from_waker(&waker);
+                                    Pin::new(future).poll(cx)
+                                };
+
+                                if let Poll::Ready(_) = poll {
+                                    // Cleanup the Future immediately
+                                    *borrow = None;
+                                }
                             }
                         },
                         None => {

crates/js-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "js-sys"
-version = "0.3.23"
+version = "0.3.24"
 authors = ["The wasm-bindgen Developers"]
 readme = "./README.md"
 categories = ["wasm"]
@@ -19,9 +19,9 @@ test = false
 doctest = false
 
 [dependencies]
-wasm-bindgen = { path = "../..", version = "0.2.46" }
+wasm-bindgen = { path = "../..", version = "0.2.47" }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 futures = "0.1.20"
-wasm-bindgen-test = { path = '../test', version = '=0.2.46' }
-wasm-bindgen-futures = { path = '../futures', version = '=0.3.23' }
+wasm-bindgen-test = { path = '../test', version = '=0.2.47' }
+wasm-bindgen-futures = { path = '../futures', version = '=0.3.24' }

crates/macro-support/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-bindgen-macro-support"
-version = "0.2.46"
+version = "0.2.47"
 authors = ["The wasm-bindgen Developers"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro-support"
@@ -20,5 +20,5 @@ strict-macro = []
 syn = { version = '0.15.0', features = ['visit'] }
 quote = '0.6'
 proc-macro2 = "0.4.9"
-wasm-bindgen-backend = { path = "../backend", version = "=0.2.46" }
-wasm-bindgen-shared = { path = "../shared", version = "=0.2.46" }
+wasm-bindgen-backend = { path = "../backend", version = "=0.2.47" }
+wasm-bindgen-shared = { path = "../shared", version = "=0.2.47" }