From 94dc85b10925618e27ab522cc3b4c28288cd8331 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Wed, 31 Aug 2022 04:10:02 -0700
Subject: [PATCH] Changed from get_imports to getImports. Also fixed #301

---
 lib.ts                          |   4 +++-
 pkg/wasmer_wasi_js.d.ts         |   4 ++--
 pkg/wasmer_wasi_js.js           |   4 ++--
 pkg/wasmer_wasi_js_bg.wasm      | Bin 623936 -> 623935 bytes
 pkg/wasmer_wasi_js_bg.wasm.d.ts |   2 +-
 src/wasi.rs                     |   1 +
 tests/index.spec.js             |   4 ++--
 tsconfig.json                   |   2 +-
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib.ts b/lib.ts
index 492c998a..d8de227e 100644
--- a/lib.ts
+++ b/lib.ts
@@ -1,6 +1,6 @@
 // import load, { WASI } from "./pkg/index";
 export * from "./pkg/wasmer_wasi_js";
-import { InitInput } from "./pkg/wasmer_wasi_js";
+// import { InitInput } from "./pkg/wasmer_wasi_js";
 import load from "./pkg/wasmer_wasi_js";
 import wasm_bytes from "./pkg/wasmer_wasi_js_bg.wasm";
 
@@ -71,6 +71,8 @@ function dataUriToBuffer(uri: string): MimeBuffer {
 	return buffer;
 }
 
+export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
+
 let inited: Promise<any> | null = null;
 export const init = async (input?: InitInput | Promise<InitInput>, force?: boolean) => {
     if (inited === null || force === true) {
diff --git a/pkg/wasmer_wasi_js.d.ts b/pkg/wasmer_wasi_js.d.ts
index 859e9835..9fa46e74 100644
--- a/pkg/wasmer_wasi_js.d.ts
+++ b/pkg/wasmer_wasi_js.d.ts
@@ -104,7 +104,7 @@ export class WASI {
 * @param {WebAssembly.Module} module
 * @returns {object}
 */
-  get_imports(module: WebAssembly.Module): object;
+  getImports(module: WebAssembly.Module): object;
 /**
 * @param {any} module
 * @param {object | undefined} imports
@@ -173,7 +173,7 @@ export interface InitOutput {
   readonly __wbg_wasi_free: (a: number) => void;
   readonly wasi_new: (a: number) => number;
   readonly wasi_fs: (a: number) => number;
-  readonly wasi_get_imports: (a: number, b: number) => number;
+  readonly wasi_getImports: (a: number, b: number) => number;
   readonly wasi_instantiate: (a: number, b: number, c: number) => number;
   readonly wasi_start: (a: number, b: number) => number;
   readonly wasi_getStdoutBuffer: (a: number, b: number) => void;
diff --git a/pkg/wasmer_wasi_js.js b/pkg/wasmer_wasi_js.js
index 75e113ac..1ce0b06d 100644
--- a/pkg/wasmer_wasi_js.js
+++ b/pkg/wasmer_wasi_js.js
@@ -512,8 +512,8 @@ export class WASI {
     * @param {WebAssembly.Module} module
     * @returns {object}
     */
-    get_imports(module) {
-        var ret = wasm.wasi_get_imports(this.ptr, addHeapObject(module));
+    getImports(module) {
+        var ret = wasm.wasi_getImports(this.ptr, addHeapObject(module));
         return takeObject(ret);
     }
     /**
diff --git a/pkg/wasmer_wasi_js_bg.wasm b/pkg/wasmer_wasi_js_bg.wasm
index 9019ce8a161591fd76a5a96dbecc98bbdc0d383b..6c5b9b6fbbaad176e4f33abb9cb267a2e33d11cf 100644
GIT binary patch
delta 82
zcmX@mrMACIZ9|P9<B!R;f}vde<%z|a@#(20p3Qd!+wTf80x=U1GXpUT5VHa?8xXSt
cF~|11f}E4g8P82G@Z=O{yu7``lXHhP06{z-i~s-t

delta 83
zcmdnrrFNi8Z9|P9<Il;pf}z|3<%z|a@#(20@tMtc1l#WjG6FFZ5HkZY3lOscF&hxG
d12M<;JA#~(%o)#4&-dgMXS}q%-IH^NH2`M@AOHXW

diff --git a/pkg/wasmer_wasi_js_bg.wasm.d.ts b/pkg/wasmer_wasi_js_bg.wasm.d.ts
index 2ca1479d..9db5351c 100644
--- a/pkg/wasmer_wasi_js_bg.wasm.d.ts
+++ b/pkg/wasmer_wasi_js_bg.wasm.d.ts
@@ -5,7 +5,7 @@ export function __wbg_wasmerruntimeerror_free(a: number): void;
 export function __wbg_wasi_free(a: number): void;
 export function wasi_new(a: number): number;
 export function wasi_fs(a: number): number;
-export function wasi_get_imports(a: number, b: number): number;
+export function wasi_getImports(a: number, b: number): number;
 export function wasi_instantiate(a: number, b: number, c: number): number;
 export function wasi_start(a: number, b: number): number;
 export function wasi_getStdoutBuffer(a: number, b: number): void;
diff --git a/src/wasi.rs b/src/wasi.rs
index cff3a8bf..ad0b0784 100644
--- a/src/wasi.rs
+++ b/src/wasi.rs
@@ -129,6 +129,7 @@ impl WASI {
         Ok(mem_fs.clone())
     }
 
+    #[wasm_bindgen(js_name = getImports)]    
     pub fn get_imports(
         &mut self,
         module: js_sys::WebAssembly::Module,
diff --git a/tests/index.spec.js b/tests/index.spec.js
index 027c49f8..66bad830 100644
--- a/tests/index.spec.js
+++ b/tests/index.spec.js
@@ -82,7 +82,7 @@ test('wasi start empty fails', async() => {
   let moduleBytes = fs.readFileSync(__dirname + '/test.wasm');
   let wasi = new WASI({});
   const module = await WebAssembly.compile(moduleBytes);
-  let imports = wasi.get_imports(module);
+  let imports = wasi.getImports(module);
   // console.log(imports);
   let instance = await WebAssembly.instantiate(module, {
     ...imports,
@@ -97,7 +97,7 @@ test('get imports', async() => {
   let moduleBytes = fs.readFileSync(__dirname + '/test.wasm');
   let wasi = new WASI({});
   const module = await WebAssembly.compile(moduleBytes);
-  let imports = wasi.get_imports(module);
+  let imports = wasi.getImports(module);
   // console.log(imports);
   let instance = await WebAssembly.instantiate(module, {
     ...imports,
diff --git a/tsconfig.json b/tsconfig.json
index bb9075d5..9bd9e995 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "include": ["*"],
+    "include": ["pkg"],
     "exclude": ["dist"],
     "compilerOptions": {
       "outDir": "./dist/",