Skip to content

Commit 259e9e9

Browse files
authored
Merge pull request wasmerio#299 from wasmerio/wasmer-3
Adapted API to Wasmer 3.0
2 parents f25d523 + e5bc2fc commit 259e9e9

9 files changed

+783
-509
lines changed

Diff for: Cargo.lock

+228-135
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ crate-type = ["cdylib"]
1010
[dependencies]
1111
js-sys = "0.3.55"
1212
wasm-bindgen = "0.2.73"
13-
wasm-bindgen-futures = "0.4.28"
14-
wasmer = { path = "../wasmer/lib/api", default-features = false, features = ["js-default"] }
13+
wasmer = { path = "../wasmer/lib/api", default-features = false, features = ["js", "std"] }
1514
wasmer-wasi = { path = "../wasmer/lib/wasi", default-features = false, features = ["js"] }
1615
wasmer-vfs = { path = "../wasmer/lib/vfs", default-features = false, features = ["mem-fs"] }
16+
17+
[profile.release]
18+
lto = true
19+
opt-level = 'z'

Diff for: pkg/wasmer_wasi_js.d.ts

+23-16
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,23 @@ export class WASI {
101101
*/
102102
constructor(config: any);
103103
/**
104+
* @param {WebAssembly.Module} module
105+
* @returns {object}
106+
*/
107+
get_imports(module: WebAssembly.Module): object;
108+
/**
104109
* @param {any} module
105-
* @param {object} imports
110+
* @param {object | undefined} imports
106111
* @returns {WebAssembly.Instance}
107112
*/
108-
instantiate(module: any, imports: object): WebAssembly.Instance;
113+
instantiate(module: any, imports?: object): WebAssembly.Instance;
109114
/**
110115
* Start the WASI Instance, it returns the status code when calling the start
111116
* function
117+
* @param {WebAssembly.Instance} instance
112118
* @returns {number}
113119
*/
114-
start(): number;
120+
start(instance: WebAssembly.Instance): number;
115121
/**
116122
* Get the stdout buffer
117123
* Note: this method flushes the stdout
@@ -163,6 +169,19 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
163169

164170
export interface InitOutput {
165171
readonly memory: WebAssembly.Memory;
172+
readonly __wbg_wasmerruntimeerror_free: (a: number) => void;
173+
readonly __wbg_wasi_free: (a: number) => void;
174+
readonly wasi_new: (a: number) => number;
175+
readonly wasi_fs: (a: number) => number;
176+
readonly wasi_get_imports: (a: number, b: number) => number;
177+
readonly wasi_instantiate: (a: number, b: number, c: number) => number;
178+
readonly wasi_start: (a: number, b: number) => number;
179+
readonly wasi_getStdoutBuffer: (a: number, b: number) => void;
180+
readonly wasi_getStdoutString: (a: number, b: number) => void;
181+
readonly wasi_getStderrBuffer: (a: number, b: number) => void;
182+
readonly wasi_getStderrString: (a: number, b: number) => void;
183+
readonly wasi_setStdinBuffer: (a: number, b: number, c: number) => void;
184+
readonly wasi_setStdinString: (a: number, b: number, c: number) => void;
166185
readonly __wbg_memfs_free: (a: number) => void;
167186
readonly memfs_new: () => number;
168187
readonly memfs_readDir: (a: number, b: number, c: number) => number;
@@ -184,24 +203,12 @@ export interface InitOutput {
184203
readonly jsvirtualfile_writeString: (a: number, b: number, c: number) => number;
185204
readonly jsvirtualfile_flush: (a: number) => void;
186205
readonly jsvirtualfile_seek: (a: number, b: number) => number;
187-
readonly __wbg_wasi_free: (a: number) => void;
188-
readonly wasi_new: (a: number) => number;
189-
readonly wasi_fs: (a: number) => number;
190-
readonly wasi_instantiate: (a: number, b: number, c: number) => number;
191-
readonly wasi_start: (a: number) => number;
192-
readonly wasi_getStdoutBuffer: (a: number, b: number) => void;
193-
readonly wasi_getStdoutString: (a: number, b: number) => void;
194-
readonly wasi_getStderrBuffer: (a: number, b: number) => void;
195-
readonly wasi_getStderrString: (a: number, b: number) => void;
196-
readonly wasi_setStdinBuffer: (a: number, b: number, c: number) => void;
197-
readonly wasi_setStdinString: (a: number, b: number, c: number) => void;
198-
readonly __wbg_wasmerruntimeerror_free: (a: number) => void;
199206
readonly __wbindgen_malloc: (a: number) => number;
200207
readonly __wbindgen_realloc: (a: number, b: number, c: number) => number;
201208
readonly __wbindgen_export_2: WebAssembly.Table;
209+
readonly __wbindgen_exn_store: (a: number) => void;
202210
readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
203211
readonly __wbindgen_free: (a: number, b: number) => void;
204-
readonly __wbindgen_exn_store: (a: number) => void;
205212
}
206213

207214
/**

0 commit comments

Comments
 (0)