Expose rust function for accessing wasm memory (#93)

kylebarron · Jan 31, 2024 · e0312b4 · e0312b4
1 parent aec6c79
commit e0312b4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/tests/ffi.test.ts b/tests/ffi.test.ts
@@ -13,8 +13,7 @@ import { Type } from "../src/types";
 
 wasm.setPanicHook();
 
-// @ts-expect-error
-const WASM_MEMORY: WebAssembly.Memory = wasm.__wasm.memory;
+const WASM_MEMORY = wasm.wasmMemory();
 
 const TEST_TABLE = loadIPCTableFromDisk("tests/table.arrow");
 const FFI_TABLE = arrowTableToFFI(TEST_TABLE);

diff --git a/tests/record-batch.test.ts b/tests/record-batch.test.ts
@@ -10,8 +10,7 @@ import { readFileSync } from "fs";
 
 wasm.setPanicHook();
 
-// @ts-expect-error
-const WASM_MEMORY: WebAssembly.Memory = wasm.__wasm.memory;
+const WASM_MEMORY = wasm.wasmMemory()
 
 const TEST_TABLE = loadIPCTableFromDisk("tests/table.arrow");
 const FFI_RECORD_BATCH = arrowTableToFFIRecordBatch(TEST_TABLE);

diff --git a/tests/rust-arrow-ffi/src/lib.rs b/tests/rust-arrow-ffi/src/lib.rs
@@ -57,3 +57,16 @@ pub fn set_panic_hook() {
     // https://github.com/rustwasm/console_error_panic_hook#readme
     console_error_panic_hook::set_once();
 }
+
+/// Returns a handle to this wasm instance's `WebAssembly.Memory`
+#[wasm_bindgen(js_name = wasmMemory)]
+pub fn memory() -> JsValue {
+    wasm_bindgen::memory()
+}
+
+/// Returns a handle to this wasm instance's `WebAssembly.Table` which is the indirect function
+/// table used by Rust
+#[wasm_bindgen(js_name = _functionTable)]
+pub fn function_table() -> JsValue {
+    wasm_bindgen::function_table()
+}