mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-12 21:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved wasmer-js api

Browse Source
This commit is contained in:
Syrus Akbary
2021-09-14 14:57:39 +02:00
parent d7e7c0d375
commit e2d1c3679c
8 changed files with 78 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/api/src/js/module.rs
View File

@@ -1,4 +1,4 @@
use crate::js::export::{Export, VMFunction};
use crate::js::export::Export;
use crate::js::resolver::Resolver;
use crate::js::store::Store;
use crate::js::types::{ExportType, ImportType};
@@ -214,9 +214,9 @@ impl Module {
pub(crate) fn instantiate(
&self,
resolver: &dyn Resolver,
) -> Result<(WebAssembly::Instance, Vec<VMFunction>), RuntimeError> {
) -> Result<(WebAssembly::Instance, Vec<Export>), RuntimeError> {
let imports = js_sys::Object::new();
let mut functions: Vec<VMFunction> = vec![];
let mut import_externs: Vec<Export> = vec![];
for (i, import_type) in self.imports().enumerate() {
let resolved_import =
resolver.resolve(i as u32, import_type.module(), import_type.name());
@@ -239,9 +239,7 @@ impl Module {
&import_namespace.into(),
)?;
}
if let Export::Function(func) = import {
functions.push(func);
}
import_externs.push(import);
}
// in case the import is not found, the JS Wasm VM will handle
// the error for us, so we don't need to handle it
@@ -249,7 +247,7 @@ impl Module {
Ok((
WebAssembly::Instance::new(&self.module, &imports)
.map_err(|e: JsValue| -> RuntimeError { e.into() })?,
functions,
import_externs,
))
}