Try #1313:

CHANGELOG.md

@@ -7,6 +7,12 @@
 - [#1329](https://github.com/wasmerio/wasmer/pull/1329) New numbers and strings instructions for WIT
 - [#1332](https://github.com/wasmerio/wasmer/pull/1332) Add option to `CompilerConfig` to force compiler IR verification off even when `debug_assertions` are enabled. This can be used to make debug builds faster, which may be important if you're creating a library that wraps Wasmer and depend on the speed of debug builds.
 - [#1320](https://github.com/wasmerio/wasmer/pull/1320) Change `custom_sections` field in `ModuleInfo` to be more standards compliant by allowing multiple custom sections with the same name. To get the old behavior with the new API, you can add `.last().unwrap()` to accesses. For example, `module_info.custom_sections["custom_section_name"].last().unwrap()`.
+- [#1313](https://github.com/wasmerio/wasmer/pull/1313) Add new high-level public API through `wasmer` crate. Includes many updates including:
+  - Minor improvement: `imports!` macro now handles no trailing comma as well as a trailing comma in namespaces and between namespaces.
+  - New methods on `Module`: `exports`, `imports`, and `custom_sections`.
+  - New way to get exports from an instance with `let func_name: Func<i32, i64> = instance.exports.get("func_name");`.
+  - Improved `Table` APIs including `set` which now allows setting functions directly.  TODO: update this more if `Table::get` gets made public in this PR
+  - TODO: finish the list of changes here
 - [#1303](https://github.com/wasmerio/wasmer/pull/1303) NaN canonicalization for singlepass backend.
 - [#1292](https://github.com/wasmerio/wasmer/pull/1292) Experimental Support for Android (x86_64 and AArch64)
 - [#1305](https://github.com/wasmerio/wasmer/pull/1305) Handle panics from DynamicFunc.

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "wasmer"
+name = "wasmer-bin"
 version = "0.16.2"
 authors = ["The Wasmer Engineering Team <[email protected]>"]
 edition = "2018"
@@ -27,6 +27,7 @@ fern = { version = "0.5", features = ["colored"], optional = true }
 log = "0.4"
 structopt = "0.3"
 wabt = { version = "0.9.1", optional = true }
+wasmer = { path = "lib/api" }
 wasmer-clif-backend = { path = "lib/clif-backend", optional = true }
 wasmer-singlepass-backend = { path = "lib/singlepass-backend", optional = true }
 wasmer-middleware-common = { path = "lib/middleware-common" }
@@ -44,6 +45,8 @@ wasmer-wasi-experimental-io-devices = { path = "lib/wasi-experimental-io-devices
 
 [workspace]
 members = [
+    "lib/api",
+    "lib/api-tests",
     "lib/clif-backend",
     "lib/singlepass-backend",
     "lib/runtime",

Makefile

@@ -160,6 +160,7 @@ test-capi: test-capi-singlepass test-capi-cranelift test-capi-llvm test-capi-ems
 capi-test: test-capi
 
 test-rest:
+	cargo test --release -p api-tests
 	cargo test --release -p wasmer-dev-utils
 	cargo test --release -p wasmer-interface-types
 	cargo test --release -p wasmer-kernel-loader

examples/callback.rs

@@ -1,6 +1,6 @@
 /// This example demonstrates the use of callbacks: calling functions (Host and Wasm)
 /// passed to us from the Wasm via hostcall
-use wasmer_runtime::{compile_with, compiler_for_backend, func, imports, Backend, Ctx};
+use wasmer_runtime::{compile_with, compiler_for_backend, func, imports, Backend, Ctx, Func};
 use wasmer_runtime_core::{structures::TypedIndex, types::TableIndex};
 
 static WASM: &'static str = "examples/callback-guest/callback-guest.wasm";
@@ -40,7 +40,7 @@ fn main() {
         .instantiate(&imports)
         .expect("failed to instantiate wasm module");
 
-    let entry_point = instance.func::<(u32, u32), u32>("main").unwrap();
+    let entry_point: Func<(u32, u32), u32> = instance.exports.get("main").unwrap();
 
     entry_point.call(0, 0).expect("START");
 }

examples/parallel/src/main.rs

@@ -1,5 +1,7 @@
 use rayon::prelude::*;
-use wasmer_runtime::{compile_with, compiler_for_backend, func, imports, instantiate, Backend};
+use wasmer_runtime::{
+    compile_with, compiler_for_backend, func, imports, instantiate, Backend, Func,
+};
 use wasmer_runtime_core::{
     memory::ptr::{Array, WasmPtr},
     vm::Ctx,
@@ -61,7 +63,8 @@ fn main() {
                     .clone()
                     .instantiate(&imports)
                     .expect("failed to instantiate wasm module");
-                let check_password = instance.func::<(u64, u64), u64>("check_password").unwrap();
+                let check_password: Func<(u64, u64), u64> =
+                    instance.exports.get("check_password").unwrap();
                 let j = i * 10000;
                 let result = check_password.call(j, j + 10000).unwrap();
                 print!(".");
@@ -101,7 +104,7 @@ fn main() {
     let instance =
         instantiate(&wasm_bytes[..], &imports).expect("failed to instantiate wasm module");
 
-    let check_password = instance.func::<(u64, u64), u64>("check_password").unwrap();
+    let check_password: Func<(u64, u64), u64> = instance.exports.get("check_password").unwrap();
 
     let mut out: Option<RetStr> = None;
     for i in (0..=u64::max_value()).step_by(10000) {

examples/plugin.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use wasmer_runtime::{compile, func, imports};
+use wasmer_runtime::{compile, func, imports, Func};
 use wasmer_runtime_core::vm::Ctx;
 use wasmer_wasi::{
     generate_import_object_for_version,
@@ -159,7 +159,7 @@ fn main() {
     initialize(instance.context_mut());
 
     // get a reference to the function "plugin_entrypoint" which takes an i32 and returns an i32
-    let entry_point = instance.func::<(i32), i32>("plugin_entrypoint").unwrap();
+    let entry_point: Func<i32, i32> = instance.exports.get("plugin_entrypoint").unwrap();
     // call the "entry_point" function in WebAssembly with the number "2" as the i32 argument
     let result = entry_point.call(2).expect("failed to execute plugin");
     println!("result: {}", result);

fuzz/fuzz_targets/validate_wasm.rs

@@ -2,13 +2,13 @@
 #[macro_use]
 extern crate libfuzzer_sys;
 
-extern crate wasmer;
+extern crate wasmer_bin;
 extern crate wasmer_runtime_core;
 
 use wasmer_runtime_core::backend::Features;
 
 fuzz_target!(|data: &[u8]| {
-    let _ = wasmer::utils::is_wasm_binary(data);
+    let _ = wasmer_bin::utils::is_wasm_binary(data);
     let _ = wasmer_runtime_core::validate_and_report_errors_with_features(
         &data,
         Features {

lib/api-tests/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "api-tests"
+version = "0.16.2"
+authors = ["The Wasmer Engineering Team <[email protected]>"]
+edition = "2018"
+license = "MIT"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+wasmer = { version = "0.16.2", path = "../api" }
+
+[dev-dependencies]
+wabt = "0.9.1"

lib/api-tests/src/lib.rs

@@ -0,0 +1 @@
+