Generate Symbol.dispose entries for exposed structs (and define Symbo…

…l.dispose if it doesn't exist)

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

@@ -1080,10 +1080,15 @@ impl<'a> Context<'a> {
                 const ptr = this.__destroy_into_raw();
                 wasm.{}(ptr, 0);
             }}
+            
+            [Symbol.dispose]() {{
+                this.free();
+            }}
             ",
             wasm_bindgen_shared::free_function(name),
         ));
         ts_dst.push_str("  free(): void;\n");
+        ts_dst.push_str("  [Symbol.dispose](): void;\n");
         dst.push_str(&class.contents);
         ts_dst.push_str(&class.typescript);
 
@@ -1486,6 +1491,14 @@ impl<'a> Context<'a> {
         Ok(ret)
     }
 
+    fn expose_symbol_dispose(&mut self) -> Result<(), Error> {
+        if !self.should_write_global("symbol_dispose") {
+            return Ok(());
+        }
+        self.global(&"if(!Symbol.dispose) { Symbol.dispose = Symbol('Symbol.dispose'); }");
+        Ok(())
+    }
+
     fn expose_text_encoder(&mut self) -> Result<(), Error> {
         if !self.should_write_global("text_encoder") {
             return Ok(());
@@ -2476,6 +2489,10 @@ impl<'a> Context<'a> {
 
     pub fn generate(&mut self) -> Result<(), Error> {
         self.prestore_global_import_identifiers()?;
+        // conditionally override Symbol.dispose
+        if !self.aux.structs.is_empty() {
+            self.expose_symbol_dispose()?;
+        }
         for (id, adapter) in crate::sorted_iter(&self.wit.adapters) {
             let instrs = match &adapter.kind {
                 AdapterKind::Import { .. } => continue,

crates/cli/tests/reference/builder.d.ts

@@ -4,6 +4,7 @@
 */
 export class ClassBuilder {
   free(): void;
+  [Symbol.dispose](): void;
 /**
 * @returns {ClassBuilder}
 */

crates/cli/tests/reference/builder.js

@@ -4,6 +4,8 @@ export function __wbg_set_wasm(val) {
 }
 
 
+if(!Symbol.dispose) { Symbol.dispose = Symbol('Symbol.dispose'); }
+
 const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;
 
 let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
@@ -50,6 +52,10 @@ export class ClassBuilder {
         const ptr = this.__destroy_into_raw();
         wasm.__wbg_classbuilder_free(ptr, 0);
     }
+
+    [Symbol.dispose]() {
+        this.free();
+    }
     /**
     * @returns {ClassBuilder}
     */

crates/cli/tests/reference/constructor.d.ts

@@ -4,6 +4,7 @@
 */
 export class ClassConstructor {
   free(): void;
+  [Symbol.dispose](): void;
 /**
 */
   constructor();

crates/cli/tests/reference/constructor.js

@@ -4,6 +4,8 @@ export function __wbg_set_wasm(val) {
 }
 
 
+if(!Symbol.dispose) { Symbol.dispose = Symbol('Symbol.dispose'); }
+
 const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;
 
 let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
@@ -42,6 +44,10 @@ export class ClassConstructor {
         const ptr = this.__destroy_into_raw();
         wasm.__wbg_classconstructor_free(ptr, 0);
     }
+
+    [Symbol.dispose]() {
+        this.free();
+    }
     /**
     */
     constructor() {

crates/cli/tests/reference/raw.d.ts

@@ -9,6 +9,7 @@ export function test1(test: number): number;
 */
 export class Test {
   free(): void;
+  [Symbol.dispose](): void;
 /**
 * @param {number} test
 * @returns {Test}

crates/cli/tests/reference/raw.js

@@ -6,6 +6,8 @@ export function __wbg_set_wasm(val) {
 }
 
 
+if(!Symbol.dispose) { Symbol.dispose = Symbol('Symbol.dispose'); }
+
 const heap = new Array(128).fill(undefined);
 
 heap.push(undefined, null, true, false);
@@ -89,6 +91,10 @@ export class Test {
         const ptr = this.__destroy_into_raw();
         wasm.__wbg_test_free(ptr, 0);
     }
+
+    [Symbol.dispose]() {
+        this.free();
+    }
     /**
     * @param {number} test
     * @returns {Test}