Moved reexports one level down

lib/api/src/js/as_js.rs

@@ -3,13 +3,13 @@
 // use crate::js::RuntimeError;
 use crate::imports::Imports;
 use crate::js::externals::{Extern, Function, Global, Memory, Table};
+use crate::js::instance::Instance;
 use crate::js::vm::{VMExtern, VMFunction, VMGlobal, VMMemory, VMTable};
 use crate::js::wasm_bindgen_polyfill::Global as JsGlobal;
-use crate::js::Instance;
 use crate::store::{AsStoreMut, AsStoreRef};
 use crate::value::Value;
 use crate::Exports;
-use crate::ValType;
+use crate::Type;
 use js_sys::Function as JsFunction;
 use js_sys::WebAssembly::{Memory as JsMemory, Table as JsTable};
 use std::collections::HashMap;
@@ -32,12 +32,12 @@ pub trait AsJs: Sized {
 }
 
 #[inline]
-pub fn param_from_js(ty: &ValType, js_val: &JsValue) -> Value {
+pub fn param_from_js(ty: &Type, js_val: &JsValue) -> Value {
     match ty {
-        ValType::I32 => Value::I32(js_val.as_f64().unwrap() as _),
+        Type::I32 => Value::I32(js_val.as_f64().unwrap() as _),
-        ValType::I64 => Value::I64(js_val.as_f64().unwrap() as _),
+        Type::I64 => Value::I64(js_val.as_f64().unwrap() as _),
-        ValType::F32 => Value::F32(js_val.as_f64().unwrap() as _),
+        Type::F32 => Value::F32(js_val.as_f64().unwrap() as _),
-        ValType::F64 => Value::F64(js_val.as_f64().unwrap()),
+        Type::F64 => Value::F64(js_val.as_f64().unwrap()),
         t => unimplemented!(
             "The type `{:?}` is not yet supported in the JS Function API",
             t
@@ -46,7 +46,7 @@ pub fn param_from_js(ty: &ValType, js_val: &JsValue) -> Value {
 }
 
 impl AsJs for Value {
-    type DefinitionType = ValType;
+    type DefinitionType = Type;
 
     fn as_jsvalue(&self, _store: &impl AsStoreRef) -> JsValue {
         match self {
@@ -71,7 +71,7 @@ impl AsJs for Value {
 }
 
 impl AsJs for wasmer_types::RawValue {
-    type DefinitionType = ValType;
+    type DefinitionType = Type;
 
     fn as_jsvalue(&self, _store: &impl AsStoreRef) -> JsValue {
         unsafe { JsValue::from_f64(self.into()) }

lib/api/src/js/externals/function.rs

@@ -4,10 +4,10 @@ use crate::function_env::{FunctionEnv, FunctionEnvMut};
 use crate::js::as_js::{param_from_js, AsJs}; /* ValFuncRef */
 use crate::js::externals::Extern;
 use crate::js::vm::VMExtern;
-use crate::js::FunctionType;
 use crate::js::RuntimeError;
 use crate::store::{AsStoreMut, AsStoreRef, StoreMut};
 use crate::value::Value;
+use crate::FunctionType;
 use crate::TypedFunction;
 use js_sys::{Array, Function as JSFunction};
 use std::iter::FromIterator;

lib/api/src/js/externals/global.rs

@@ -2,11 +2,11 @@ use crate::exports::{ExportError, Exportable};
 use crate::js::externals::Extern;
 use crate::js::vm::{VMExtern, VMGlobal};
 use crate::js::wasm_bindgen_polyfill::Global as JSGlobal;
-use crate::js::GlobalType;
-use crate::js::Mutability;
 use crate::js::RuntimeError;
 use crate::store::{AsStoreMut, AsStoreRef};
 use crate::value::Value;
+use crate::GlobalType;
+use crate::Mutability;
 use wasm_bindgen::JsValue;
 use wasmer_types::{RawValue, Type};
 

lib/api/src/js/externals/memory.rs

@@ -1,9 +1,9 @@
 use crate::exports::{ExportError, Exportable};
 use crate::js::externals::Extern;
 use crate::js::vm::{VMExtern, VMMemory};
-use crate::js::MemoryType;
 use crate::mem_access::MemoryAccessError;
 use crate::store::{AsStoreMut, AsStoreRef, StoreObjects};
+use crate::MemoryType;
 use std::marker::PhantomData;
 use std::mem::MaybeUninit;
 use std::slice;

lib/api/src/js/externals/table.rs

@@ -2,9 +2,9 @@ use crate::exports::{ExportError, Exportable};
 use crate::js::externals::Extern;
 use crate::js::vm::{VMExtern, VMFunction, VMTable};
 use crate::js::RuntimeError;
-use crate::js::{FunctionType, TableType};
 use crate::store::{AsStoreMut, AsStoreRef};
 use crate::value::Value;
+use crate::{FunctionType, TableType};
 use js_sys::Function;
 
 /// A WebAssembly `table` instance.

lib/api/src/js/mod.rs

@@ -39,33 +39,14 @@ pub(crate) mod vm;
 mod wasm_bindgen_polyfill;
 
 pub use crate::js::as_js::AsJs;
-pub use crate::js::engine::Engine;
 pub use crate::js::error::{DeserializeError, LinkError, SerializeError};
 pub use crate::js::externals::{
     Extern, FromToNativeWasmType, Function, Global, HostFunction, Memory, MemoryError, MemoryView,
     Table, WasmTypeList,
 };
-pub use crate::js::instance::Instance;
 pub use crate::js::module::{Module, ModuleTypeHints};
 pub use crate::js::store::StoreObjects;
 pub use crate::js::trap::RuntimeError;
 
-pub use wasmer_types::is_wasm;
-// TODO: OnCalledAction is needed for asyncify. It will be refactored with https://github.com/wasmerio/wasmer/issues/3451
-pub use wasmer_types::{
-    Bytes, ExportIndex, GlobalInit, LocalFunctionIndex, OnCalledAction, Pages, ValueType,
-    WASM_MAX_PAGES, WASM_MIN_PAGES, WASM_PAGE_SIZE,
-};
-pub use wasmer_types::{
-    ExportType, ExternType, FunctionType, GlobalType, ImportType, MemoryType, Mutability,
-    TableType, Type as ValType, Type,
-};
-
-#[cfg(feature = "wat")]
-pub use wat::parse_bytes as wat2wasm;
-
 #[cfg(feature = "wasm-types-polyfill")]
 pub use wasmparser;
-
-/// Version number of this crate.
-pub const VERSION: &str = env!("CARGO_PKG_VERSION");

lib/api/src/lib.rs

@@ -475,9 +475,28 @@ pub use store::{TrapHandlerFn, Tunables};
 pub use typed_function::TypedFunction;
 pub use value::Value;
 
+// Reexport from other modules
+
+pub use wasmer_derive::ValueType;
+// TODO: OnCalledAction is needed for asyncify. It will be refactored with https://github.com/wasmerio/wasmer/issues/3451
+pub use wasmer_types::{
+    is_wasm, Bytes, CompileError, CpuFeature, DeserializeError, ExportIndex, ExportType,
+    ExternType, FunctionType, GlobalInit, GlobalType, ImportType, LocalFunctionIndex, MemoryType,
+    MiddlewareError, Mutability, OnCalledAction, Pages, ParseCpuFeatureError, SerializeError,
+    TableType, Target, Type, ValueType, WasmError, WasmResult, WASM_MAX_PAGES, WASM_MIN_PAGES,
+    WASM_PAGE_SIZE,
+};
+#[cfg(feature = "wat")]
+pub use wat::parse_bytes as wat2wasm;
+
+// Deprecated types
+
 /// This type is deprecated, it has been replaced by TypedFunction.
 #[deprecated(
     since = "3.0.0",
     note = "NativeFunc has been replaced by TypedFunction"
 )]
 pub type NativeFunc<Args = (), Rets = ()> = TypedFunction<Args, Rets>;
+
+/// Version number of this crate.
+pub const VERSION: &str = env!("CARGO_PKG_VERSION");

lib/api/src/sys/externals/global.rs

@@ -1,10 +1,10 @@
 use crate::exports::{ExportError, Exportable};
 use crate::store::{AsStoreMut, AsStoreRef};
 use crate::sys::externals::Extern;
-use crate::sys::GlobalType;
-use crate::sys::Mutability;
 use crate::sys::RuntimeError;
 use crate::value::Value;
+use crate::GlobalType;
+use crate::Mutability;
 use wasmer_vm::{InternalStoreHandle, StoreHandle, VMExtern, VMGlobal};
 
 /// A WebAssembly `global` instance.

lib/api/src/sys/externals/memory.rs

@@ -1,8 +1,8 @@
 use crate::exports::{ExportError, Exportable};
 use crate::store::{AsStoreMut, AsStoreRef};
 use crate::sys::externals::Extern;
-use crate::sys::MemoryType;
 use crate::MemoryAccessError;
+use crate::MemoryType;
 use std::convert::TryInto;
 use std::marker::PhantomData;
 use std::mem;

lib/api/src/sys/externals/mod.rs

@@ -12,7 +12,7 @@ pub use self::memory_view::MemoryView;
 pub use self::table::Table;
 
 use crate::exports::{ExportError, Exportable};
-use crate::sys::ExternType;
+use crate::ExternType;
 use std::fmt;
 use wasmer_vm::VMExtern;
 

lib/api/src/sys/externals/table.rs

@@ -1,7 +1,7 @@
 use crate::exports::{ExportError, Exportable};
 use crate::store::{AsStoreMut, AsStoreRef};
 use crate::sys::externals::Extern;
-use crate::sys::TableType;
+use crate::TableType;
 use crate::Value;
 use crate::{sys::RuntimeError, ExternRef, Function};
 use wasmer_vm::{InternalStoreHandle, StoreHandle, TableElement, VMExtern, VMTable};

lib/api/src/sys/mod.rs

@@ -10,7 +10,6 @@ pub use crate::sys::externals::{
     Extern, FromToNativeWasmType, Function, Global, HostFunction, Memory, MemoryView, Table,
     WasmTypeList,
 };
-pub use crate::sys::instance::Instance;
 
 pub use crate::sys::tunables::BaseTunables;
 pub use target_lexicon::{Architecture, CallingConvention, OperatingSystem, Triple, HOST};
@@ -19,19 +18,6 @@ pub use wasmer_compiler::{
     wasmparser, CompilerConfig, FunctionMiddleware, MiddlewareReaderState, ModuleMiddleware,
 };
 pub use wasmer_compiler::{Features, FrameInfo, LinkError, RuntimeError, Tunables};
-pub use wasmer_derive::ValueType;
-pub use wasmer_types::is_wasm;
-// TODO: OnCalledAction is needed for asyncify. It will be refactored with https://github.com/wasmerio/wasmer/issues/3451
-pub use wasmer_types::{
-    CpuFeature, ExportType, ExternType, FunctionType, GlobalType, ImportType, MemoryType,
-    Mutability, OnCalledAction, TableType, Target, Type,
-};
-
-pub use wasmer_types::{
-    Bytes, CompileError, DeserializeError, ExportIndex, GlobalInit, LocalFunctionIndex,
-    MiddlewareError, Pages, ParseCpuFeatureError, SerializeError, ValueType, WasmError, WasmResult,
-    WASM_MAX_PAGES, WASM_MIN_PAGES, WASM_PAGE_SIZE,
-};
 
 // TODO: should those be moved into wasmer::vm as well?
 pub use wasmer_vm::{raise_user_trap, MemoryError};
@@ -58,6 +44,3 @@ pub use wasmer_compiler_llvm::{LLVMOptLevel, LLVM};
 
 #[cfg(feature = "compiler")]
 pub use wasmer_compiler::{Artifact, EngineBuilder};
-
-/// Version number of this crate.
-pub const VERSION: &str = env!("CARGO_PKG_VERSION");