patch

Author: hazae41

patch.js

@@ -55,6 +55,46 @@ const beforeMemoryJs = `export class Memory {
     }
 }`
 
+const beforeMemoryJs2 = `export class Memory {
+
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+        MemoryFinalization.unregister(this);
+        return ptr;
+    }
+
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_memory_free(ptr, 0);
+    }
+    /**
+    * @param {Uint8Array} inner
+    */
+    constructor(inner) {
+        const ptr0 = passArray8ToWasm0(inner, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.memory_new(ptr0, len0);
+        this.__wbg_ptr = ret >>> 0;
+        MemoryFinalization.register(this, this.__wbg_ptr, this);
+        return this;
+    }
+    /**
+    * @returns {number}
+    */
+    ptr() {
+        const ret = wasm.memory_ptr(this.__wbg_ptr);
+        return ret >>> 0;
+    }
+    /**
+    * @returns {number}
+    */
+    len() {
+        const ret = wasm.memory_len(this.__wbg_ptr);
+        return ret >>> 0;
+    }
+}`
+
 const afterMemoryJs = `export class Memory {
 
     static __wrap(ptr) {
@@ -68,6 +108,8 @@ const afterMemoryJs = `export class Memory {
     __destroy_into_raw() {
         const ptr = this.__wbg_ptr;
         this.__wbg_ptr = 0;
+        this.__wbg_ptr0 = 0;
+        this.__wbg_len0 = 0;
         MemoryFinalization.unregister(this);
         return ptr;
     }
@@ -84,6 +126,8 @@ const afterMemoryJs = `export class Memory {
         const len0 = WASM_VECTOR_LEN;
         const ret = wasm.memory_new(ptr0, len0);
         this.__wbg_ptr = ret >>> 0;
+        this.__wbg_ptr0 = ptr0 >>> 0;
+        this.__wbg_len0 = len0 >>> 0;
         MemoryFinalization.register(this, this.__wbg_ptr, this);
         return this;
     }
@@ -102,10 +146,84 @@ const afterMemoryJs = `export class Memory {
         return ret >>> 0;
     }
     /**
+    * @returns {number}
+    */
+    get ptr0() {
+        return this.__wbg_ptr0 ??= this.ptr();
+    }
+    /**
+    * @returns {number}
+    */
+    get len0() {
+        return this.__wbg_len0 ??= this.len();
+    }
+    /**
+    * @returns {Uint8Array}
+    */
+    get bytes() {
+        return getUint8ArrayMemory0().subarray(this.ptr0, this.ptr0 + this.len0);
+    }
+}`
+
+const afterMemoryJs2 = `export class Memory {
+
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+        this.__wbg_ptr0 = 0;
+        this.__wbg_len0 = 0;
+        MemoryFinalization.unregister(this);
+        return ptr;
+    }
+
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_memory_free(ptr, 0);
+    }
+    /**
+    * @param {Uint8Array} inner
+    */
+    constructor(inner) {
+        const ptr0 = passArray8ToWasm0(inner, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.memory_new(ptr0, len0);
+        this.__wbg_ptr = ret >>> 0;
+        this.__wbg_ptr0 = ptr0 >>> 0;
+        this.__wbg_len0 = len0 >>> 0;
+        MemoryFinalization.register(this, this.__wbg_ptr, this);
+        return this;
+    }
+    /**
+    * @returns {number}
+    */
+    ptr() {
+        const ret = wasm.memory_ptr(this.__wbg_ptr);
+        return ret >>> 0;
+    }
+    /**
+    * @returns {number}
+    */
+    len() {
+        const ret = wasm.memory_len(this.__wbg_ptr);
+        return ret >>> 0;
+    }
+    /**
+    * @returns {number}
+    */
+    get ptr0() {
+        return this.__wbg_ptr0 ??= this.ptr();
+    }
+    /**
+    * @returns {number}
+    */
+    get len0() {
+        return this.__wbg_len0 ??= this.len();
+    }
+    /**
     * @returns {Uint8Array}
     */
     get bytes() {
-        return getUint8ArrayMemory0().subarray(this.ptr(), this.ptr() + this.len());
+        return getUint8ArrayMemory0().subarray(this.ptr0, this.ptr0 + this.len0);
     }
 }`
 
@@ -147,8 +265,12 @@ const afterMemoryTs = `export class Memory {
 
 const glueJs = readFileSync(`./src/wasm/pkg/${name}.js`, "utf8")
   .replaceAll(beforeMemoryJs, afterMemoryJs)
+  .replaceAll(beforeMemoryJs2, afterMemoryJs2)
   .replaceAll(`free()`, `[Symbol.dispose]()`)
   .replaceAll(`(typeof FinalizationRegistry === 'undefined')`, `true`)
+  .replaceAll(`.register(this, this.__wbg_ptr, this)`, ``)
+  .replaceAll(`.register(obj, obj.__wbg_ptr, obj)`, ``)
+  .replaceAll(`.unregister(this)`, ``)
   .replaceAll(`module_or_path = new URL('${name}_bg.wasm', import.meta.url);`, `throw new Error();`)
 
 const glueTs = readFileSync(`./src/wasm/pkg/${name}.d.ts`, "utf8")

src/wasm/pkg/memory_wasm.js

@@ -37,7 +37,9 @@ export class Memory {
     __destroy_into_raw() {
         const ptr = this.__wbg_ptr;
         this.__wbg_ptr = 0;
-        MemoryFinalization.unregister(this);
+        this.__wbg_ptr0 = 0;
+        this.__wbg_len0 = 0;
+        MemoryFinalization;
         return ptr;
     }
 
@@ -53,7 +55,9 @@ export class Memory {
         const len0 = WASM_VECTOR_LEN;
         const ret = wasm.memory_new(ptr0, len0);
         this.__wbg_ptr = ret >>> 0;
-        MemoryFinalization.register(this, this.__wbg_ptr, this);
+        this.__wbg_ptr0 = ptr0 >>> 0;
+        this.__wbg_len0 = len0 >>> 0;
+        MemoryFinalization;
         return this;
     }
     /**
@@ -70,6 +74,24 @@ export class Memory {
         const ret = wasm.memory_len(this.__wbg_ptr);
         return ret >>> 0;
     }
+    /**
+    * @returns {number}
+    */
+    get ptr0() {
+        return this.__wbg_ptr0 ??= this.ptr();
+    }
+    /**
+    * @returns {number}
+    */
+    get len0() {
+        return this.__wbg_len0 ??= this.len();
+    }
+    /**
+    * @returns {Uint8Array}
+    */
+    get bytes() {
+        return getUint8ArrayMemory0().subarray(this.ptr0, this.ptr0 + this.len0);
+    }
 }
 
 async function __wbg_load(module, imports) {