Merge pull request wasmerio#299 from wasmerio/wasmer-3

Adapted API to Wasmer 3.0

Cargo.toml

@@ -10,7 +10,10 @@ crate-type = ["cdylib"]
 [dependencies]
 js-sys = "0.3.55"
 wasm-bindgen = "0.2.73"
-wasm-bindgen-futures = "0.4.28"
-wasmer = { path = "../wasmer/lib/api", default-features = false, features = ["js-default"] }
+wasmer = { path = "../wasmer/lib/api", default-features = false, features = ["js", "std"] }
 wasmer-wasi = { path = "../wasmer/lib/wasi", default-features = false, features = ["js"] }
 wasmer-vfs = { path = "../wasmer/lib/vfs", default-features = false, features = ["mem-fs"] }
+
+[profile.release]
+lto = true
+opt-level = 'z'

pkg/wasmer_wasi_js.d.ts

@@ -101,17 +101,23 @@ export class WASI {
 */
   constructor(config: any);
 /**
+* @param {WebAssembly.Module} module
+* @returns {object}
+*/
+  get_imports(module: WebAssembly.Module): object;
+/**
 * @param {any} module
-* @param {object} imports
+* @param {object | undefined} imports
 * @returns {WebAssembly.Instance}
 */
-  instantiate(module: any, imports: object): WebAssembly.Instance;
+  instantiate(module: any, imports?: object): WebAssembly.Instance;
 /**
 * Start the WASI Instance, it returns the status code when calling the start
 * function
+* @param {WebAssembly.Instance} instance
 * @returns {number}
 */
-  start(): number;
+  start(instance: WebAssembly.Instance): number;
 /**
 * Get the stdout buffer
 * Note: this method flushes the stdout
@@ -163,6 +169,19 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
+  readonly __wbg_wasmerruntimeerror_free: (a: number) => void;
+  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_instantiate: (a: number, b: number, c: number) => number;
+  readonly wasi_start: (a: number, b: number) => number;
+  readonly wasi_getStdoutBuffer: (a: number, b: number) => void;
+  readonly wasi_getStdoutString: (a: number, b: number) => void;
+  readonly wasi_getStderrBuffer: (a: number, b: number) => void;
+  readonly wasi_getStderrString: (a: number, b: number) => void;
+  readonly wasi_setStdinBuffer: (a: number, b: number, c: number) => void;
+  readonly wasi_setStdinString: (a: number, b: number, c: number) => void;
   readonly __wbg_memfs_free: (a: number) => void;
   readonly memfs_new: () => number;
   readonly memfs_readDir: (a: number, b: number, c: number) => number;
@@ -184,24 +203,12 @@ export interface InitOutput {
   readonly jsvirtualfile_writeString: (a: number, b: number, c: number) => number;
   readonly jsvirtualfile_flush: (a: number) => void;
   readonly jsvirtualfile_seek: (a: number, b: number) => number;
-  readonly __wbg_wasi_free: (a: number) => void;
-  readonly wasi_new: (a: number) => number;
-  readonly wasi_fs: (a: number) => number;
-  readonly wasi_instantiate: (a: number, b: number, c: number) => number;
-  readonly wasi_start: (a: number) => number;
-  readonly wasi_getStdoutBuffer: (a: number, b: number) => void;
-  readonly wasi_getStdoutString: (a: number, b: number) => void;
-  readonly wasi_getStderrBuffer: (a: number, b: number) => void;
-  readonly wasi_getStderrString: (a: number, b: number) => void;
-  readonly wasi_setStdinBuffer: (a: number, b: number, c: number) => void;
-  readonly wasi_setStdinString: (a: number, b: number, c: number) => void;
-  readonly __wbg_wasmerruntimeerror_free: (a: number) => void;
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number) => number;
   readonly __wbindgen_export_2: WebAssembly.Table;
+  readonly __wbindgen_exn_store: (a: number) => void;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
-  readonly __wbindgen_exn_store: (a: number) => void;
 }
 
 /**