Added Wasmer Js API

.github/workflows/js.yaml

@@ -0,0 +1,31 @@
+on:
+  push:
+    branches:
+      - 'master'
+      - 'staging'
+      - 'trying'
+    tags:
+      # this is _not_ a regex, see: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
+      - '[0-9]+.[0-9]+.[0-9]+*'
+
+name: wasmer-js tests
+
+env:
+  RUST_BACKTRACE: 1
+
+jobs:
+  wasmer-js:
+    name: wasmer-js
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+      - name: Install wasm-pack
+        run: |
+          curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+      - name: Test wasmer-js
+        run: make test-js

Cargo.toml

@@ -43,6 +43,7 @@ members = [
     "lib/engine-universal",
     "lib/engine-dylib",
     "lib/engine-staticlib",
+    "lib/js-api",
     "lib/object",
     "lib/vm",
     "lib/wasi",

Makefile

@@ -148,7 +148,7 @@ ifneq ($(ENABLE_LLVM), 0)
 	endif
 endif
 
-exclude_tests := --exclude wasmer-c-api --exclude wasmer-cli
+exclude_tests := --exclude wasmer-c-api --exclude wasmer-cli --exclude wasmer-js
 # Is failing to compile in Linux for some reason
 exclude_tests += --exclude wasmer-wasi-experimental-io-devices
 # We run integration tests separately (it requires building the c-api)
@@ -500,6 +500,10 @@ test-packages:
 	cargo test --manifest-path lib/compiler-singlepass/Cargo.toml --release --no-default-features --features=std
 	cargo test --manifest-path lib/cli/Cargo.toml $(compiler_features) --release
 
+test-js:
+	cd lib/js-api && wasm-pack test --node -- --features=wat
+
+
 #####
 #
 # Testing compilers.

lib/README.md

@@ -7,6 +7,8 @@ composed of a set of crates. We can group them as follows:
   programatically through the `wasmer` crate,
 * `c-api` — The public C API exposes everything a C user needs to use
   Wasmer programatically,
+* `js-api` — The public JavaScript API exposes everything a user needs to run Wasmer
+  in a client like a browser or on a server like NodeJS or Deno,
 * `cache` — The traits and types to cache compiled WebAssembly
   modules,
 * `cli` — The Wasmer CLI itself,

lib/api/src/cell.rs

@@ -2,7 +2,6 @@ pub use std::cell::Cell;
 
 use core::cmp::Ordering;
 use core::fmt::{self, Debug};
-use std::fmt::Pointer;
 
 /// A mutable Wasm-memory location.
 #[repr(transparent)]
@@ -121,10 +120,10 @@ impl<'a, T: Copy> WasmCell<'a, T> {
     }
 }
 
-impl<T: Debug> Debug for WasmCell<'_, T> {
+impl<T: Debug + Copy> Debug for WasmCell<'_, T> {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.inner.fmt(f)
+        write!(f, "WasmCell({:?})", self.inner.get())
     }
 }
 

lib/api/src/module.rs

@@ -11,7 +11,8 @@ use wasmer_compiler::CompileError;
 #[cfg(feature = "wat")]
 use wasmer_compiler::WasmError;
 use wasmer_engine::{Artifact, DeserializeError, Resolver, SerializeError};
-use wasmer_vm::{ExportsIterator, ImportsIterator, InstanceHandle, ModuleInfo};
+use wasmer_types::{ExportsIterator, ImportsIterator, ModuleInfo};
+use wasmer_vm::InstanceHandle;
 
 #[derive(Error, Debug)]
 pub enum IoCompileError {

lib/api/src/ptr.rs

@@ -281,7 +281,13 @@ impl<T: Copy, Ty> Eq for WasmPtr<T, Ty> {}
 
 impl<T: Copy, Ty> fmt::Debug for WasmPtr<T, Ty> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "WasmPtr({:#x})", self.offset)
+        write!(
+            f,
+            "WasmPtr(offset: {}, pointer: {:#x}, align: {})",
+            self.offset,
+            self.offset,
+            mem::align_of::<T>()
+        )
     }
 }
 

lib/cli/src/c_gen/staticlib_header.rs

@@ -2,7 +2,7 @@
 
 use super::{generate_c, CStatement, CType};
 use wasmer_compiler::{Symbol, SymbolRegistry};
-use wasmer_vm::ModuleInfo;
+use wasmer_types::ModuleInfo;
 
 /// Helper functions to simplify the usage of the Staticlib engine.
 const HELPER_FUNCTIONS: &str = r#"

lib/compiler-cranelift/src/func_environ.rs

@@ -18,12 +18,12 @@ use wasmer_compiler::{WasmError, WasmResult};
 use wasmer_types::entity::EntityRef;
 use wasmer_types::entity::PrimaryMap;
 use wasmer_types::{
-    FunctionIndex, FunctionType, GlobalIndex, LocalFunctionIndex, MemoryIndex, SignatureIndex,
-    TableIndex, Type as WasmerType,
+    FunctionIndex, FunctionType, GlobalIndex, LocalFunctionIndex, MemoryIndex, ModuleInfo,
+    SignatureIndex, TableIndex, Type as WasmerType,
 };
 use wasmer_vm::VMBuiltinFunctionIndex;
 use wasmer_vm::VMOffsets;
-use wasmer_vm::{MemoryStyle, ModuleInfo, TableStyle};
+use wasmer_vm::{MemoryStyle, TableStyle};
 
 /// Compute an `ir::ExternalName` for a given wasm function index.
 pub fn get_function_name(func_index: FunctionIndex) -> ir::ExternalName {

lib/compiler-cranelift/src/sink.rs

@@ -6,8 +6,8 @@ use cranelift_codegen::ir::{self, ExternalName};
 use cranelift_entity::EntityRef as CraneliftEntityRef;
 use wasmer_compiler::{JumpTable, Relocation, RelocationTarget, TrapInformation};
 use wasmer_types::entity::EntityRef;
-use wasmer_types::{FunctionIndex, LocalFunctionIndex};
-use wasmer_vm::{ModuleInfo, TrapCode};
+use wasmer_types::{FunctionIndex, LocalFunctionIndex, ModuleInfo};
+use wasmer_vm::TrapCode;
 
 /// Implementation of a relocation sink that just saves all the information for later
 pub(crate) struct RelocSink<'a> {

lib/compiler-llvm/src/translator/code.rs

@@ -31,10 +31,10 @@ use wasmer_compiler::{
 };
 use wasmer_types::entity::PrimaryMap;
 use wasmer_types::{
-    FunctionIndex, FunctionType, GlobalIndex, LocalFunctionIndex, MemoryIndex, SignatureIndex,
-    TableIndex, Type,
+    FunctionIndex, FunctionType, GlobalIndex, LocalFunctionIndex, MemoryIndex, ModuleInfo,
+    SignatureIndex, TableIndex, Type,
 };
-use wasmer_vm::{MemoryStyle, ModuleInfo, TableStyle, VMOffsets};
+use wasmer_vm::{MemoryStyle, TableStyle, VMOffsets};
 
 const FUNCTION_SECTION: &str = "__TEXT,wasmer_function";
 

lib/compiler-llvm/src/translator/intrinsics.rs

@@ -26,9 +26,8 @@ use wasmer_compiler::CompileError;
 use wasmer_types::entity::{EntityRef, PrimaryMap};
 use wasmer_types::{
     FunctionIndex, FunctionType as FuncType, GlobalIndex, LocalFunctionIndex, MemoryIndex,
-    Mutability, SignatureIndex, TableIndex, Type,
+    ModuleInfo as WasmerCompilerModule, Mutability, SignatureIndex, TableIndex, Type,
 };
-use wasmer_vm::ModuleInfo as WasmerCompilerModule;
 use wasmer_vm::{MemoryStyle, TrapCode, VMBuiltinFunctionIndex, VMOffsets};
 
 pub fn type_to_llvm_ptr<'ctx>(

lib/compiler-singlepass/src/codegen_x64.rs

@@ -17,10 +17,10 @@ use wasmer_types::{
     FunctionType,
 };
 use wasmer_types::{
-    FunctionIndex, GlobalIndex, LocalFunctionIndex, LocalMemoryIndex, MemoryIndex, SignatureIndex,
-    TableIndex, Type,
+    FunctionIndex, GlobalIndex, LocalFunctionIndex, LocalMemoryIndex, MemoryIndex, ModuleInfo,
+    SignatureIndex, TableIndex, Type,
 };
-use wasmer_vm::{MemoryStyle, ModuleInfo, TableStyle, TrapCode, VMBuiltinFunctionIndex, VMOffsets};
+use wasmer_vm::{MemoryStyle, TableStyle, TrapCode, VMBuiltinFunctionIndex, VMOffsets};
 
 /// The singlepass per-function code generator.
 pub struct FuncGen<'a> {