Merge branch 'main' of github.com:wasmerio/wasmer-js

# Conflicts:
#	Cargo.lock

Author: syrusakbary

Cargo.lock

@@ -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'

Cargo.toml

@@ -28,7 +28,7 @@ import { init, WASI } from '@wasmer/wasi';
 
 ### Deno
 
-This package is published in Deno in the `wasm` package, you can import it direclty with:
+This package is published in Deno in the `wasm` package, you can import it directly with:
 
 ```ts
 import { init, WASI } from 'https://deno.land/x/wasm/wasi.ts';
@@ -55,10 +55,10 @@ let wasi = new WASI({
 const moduleBytes = fetch("https://deno.land/x/wasm/tests/demo.wasm");
 const module = await WebAssembly.compileStreaming(moduleBytes);
 // Instantiate the WASI module
-await wasi.instantiate(module, {});
+let instance = await wasi.instantiate(module, {});
 
 // Run the start function
-let exitCode = wasi.start();
+let exitCode = wasi.start(instance);
 let stdout = wasi.getStdoutString();
 
  // This should print "hello world (exit code: 0)"
@@ -80,7 +80,7 @@ export class WASI {
   instantiate(module: any, imports: object): WebAssembly.Instance;
   // Start the WASI Instance, it returns the status code when calling the start
   // function
-  start(): number;
+  start(instance: WebAssembly.Instance): number;
   // Get the stdout buffer
   // Note: this method flushes the stdout
   getStdoutBuffer(): Uint8Array;

README.md

@@ -10,7 +10,7 @@ let wasi = new WASI({
 
 const moduleBytes = fetch("https://cdn.deno.land/wasm/versions/v1.0.1/raw/tests/mapdir.wasm");
 const module = await WebAssembly.compileStreaming(moduleBytes);
-await wasi.instantiate(module, {});
+let instance = await wasi.instantiate(module, {});
 
 wasi.fs.createDir("/a");
 wasi.fs.createDir("/b");
@@ -19,7 +19,7 @@ let file = wasi.fs.open("/file", {read: true, write: true, create: true});
 file.writeString("fileContents");
 file.seek(0);
 
-let exitCode = wasi.start();
+let exitCode = wasi.start(instance);
 let stdout = wasi.getStdoutString();
 // This should print "hello world (exit code: 0)"
 console.log(`${stdout}(exit code: ${exitCode})`);

examples/deno/fs.ts

@@ -10,9 +10,9 @@ let wasi = new WASI({
 
 const moduleBytes = fetch("https://cdn.deno.land/wasm/versions/v1.0.1/raw/tests/demo.wasm");
 const module = await WebAssembly.compileStreaming(moduleBytes);
-await wasi.instantiate(module, {});
+let instance = await wasi.instantiate(module, {});
 
-let exitCode = wasi.start();
+let exitCode = wasi.start(instance);
 let stdout = wasi.getStdoutString();
  // This should print "hello world (exit code: 0)"
 console.log(`${stdout}(exit code: ${exitCode})`);

examples/deno/helloworld.ts

@@ -14,7 +14,7 @@ const buf = fs.readFileSync('../../tests/mapdir.wasm');
 const module = await WebAssembly.compile(
   new Uint8Array(buf)
 );
-await wasi.instantiate(module, {});
+let instance = await wasi.instantiate(module, {});
 
 wasi.fs.createDir("/a");
 wasi.fs.createDir("/b");
@@ -23,7 +23,7 @@ let file = wasi.fs.open("/file", {read: true, write: true, create: true});
 file.writeString("fileContents");
 file.seek(0);
 
-let exitCode = wasi.start();
+let exitCode = wasi.start(instance);
 let stdout = wasi.getStdoutString();
 
 // This should print "hello world (exit code: 0)"

examples/node/fs.mjs

@@ -14,9 +14,9 @@ const buf = fs.readFileSync('../../tests/demo.wasm');
 const module = await WebAssembly.compile(
   new Uint8Array(buf)
 );
-await wasi.instantiate(module, {});
+let instance = await wasi.instantiate(module, {});
 
-let exitCode = wasi.start();
+let exitCode = wasi.start(instance);
 let stdout = wasi.getStdoutString();
 // This should print "hello world (exit code: 0)"
 console.log(`${stdout}(exit code: ${exitCode})`);

examples/node/helloworld.mjs

@@ -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;
 }
 
 /**