gate Symbol.dispose generation behind WASM_BINDGEN_SYMBOL_DISPOSE env var, update tests to reflect lack of said var

Author: H-Plus-Time

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

@@ -1080,15 +1080,20 @@ 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");
+        if self.config.symbol_dispose {
+            dst.push_str(
+                "
+                [Symbol.dispose]() {{
+                    this.free();
+                }}
+                ",
+            );
+            ts_dst.push_str("  [Symbol.dispose](): void;\n");
+        }
         dst.push_str(&class.contents);
         ts_dst.push_str(&class.typescript);
 
@@ -1495,7 +1500,7 @@ impl<'a> Context<'a> {
         if !self.should_write_global("symbol_dispose") {
             return Ok(());
         }
-        self.global(&"if(!Symbol.dispose) { Symbol.dispose = Symbol('Symbol.dispose'); }");
+        self.global("if(!Symbol.dispose) { Symbol.dispose = Symbol('Symbol.dispose'); }");
         Ok(())
     }
 
@@ -2490,7 +2495,7 @@ 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() {
+        if self.config.symbol_dispose && !self.aux.structs.is_empty() {
             self.expose_symbol_dispose()?;
         }
         for (id, adapter) in crate::sorted_iter(&self.wit.adapters) {

crates/cli-support/src/lib.rs

@@ -42,6 +42,7 @@ pub struct Bindgen {
     multi_value: bool,
     encode_into: EncodeInto,
     split_linked_modules: bool,
+    symbol_dispose: bool,
 }
 
 pub struct Output {
@@ -88,6 +89,7 @@ impl Bindgen {
         let externref =
             env::var("WASM_BINDGEN_ANYREF").is_ok() || env::var("WASM_BINDGEN_EXTERNREF").is_ok();
         let multi_value = env::var("WASM_BINDGEN_MULTI_VALUE").is_ok();
+        let symbol_dispose = env::var("WASM_BINDGEN_SYMBOL_DISPOSE").is_ok();
         Bindgen {
             input: Input::None,
             out_name: None,
@@ -109,6 +111,7 @@ impl Bindgen {
             encode_into: EncodeInto::Test,
             omit_default_module_path: true,
             split_linked_modules: false,
+            symbol_dispose,
         }
     }
 

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

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

crates/cli/tests/reference/builder.js

@@ -4,8 +4,6 @@ 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 });
@@ -52,10 +50,6 @@ 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,7 +4,6 @@
 */
 export class ClassConstructor {
   free(): void;
-  [Symbol.dispose](): void;
 /**
 */
   constructor();

crates/cli/tests/reference/constructor.js

@@ -4,8 +4,6 @@ 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 });
@@ -44,10 +42,6 @@ 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,7 +9,6 @@ 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,8 +6,6 @@ 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);
@@ -91,10 +89,6 @@ export class Test {
         const ptr = this.__destroy_into_raw();
         wasm.__wbg_test_free(ptr, 0);
     }
-
-    [Symbol.dispose]() {
-        this.free();
-    }
     /**
     * @param {number} test
     * @returns {Test}