Use WASI generated types instead of manual ones

Cargo.toml

@@ -44,6 +44,7 @@ members = [
     "lib/vm",
     "lib/wasi",
     "lib/wasi-types",
+    "lib/wasi-types-generated",
     "lib/wasi-experimental-io-devices",
     "lib/wasi-local-networking",
     "lib/types",

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

@@ -58,6 +58,35 @@ impl<'a> MemoryView<'a> {
         self.size
     }
 
+    // TODO: do we want a proper implementation here instead?
+    /// Retrieve a slice of the memory contents.
+    ///
+    /// # Safety
+    ///
+    /// Until the returned slice is dropped, it is undefined behaviour to
+    /// modify the memory contents in any way including by calling a wasm
+    /// function that writes to the memory or by resizing the memory.
+    #[doc(hidden)]
+    pub unsafe fn data_unchecked(&self) -> &[u8] {
+        unimplemented!("direct data pointer access is not possible in JavaScript");
+    }
+
+    // TODO: do we want a proper implementation here instead?
+    /// Retrieve a mutable slice of the memory contents.
+    ///
+    /// # Safety
+    ///
+    /// This method provides interior mutability without an UnsafeCell. Until
+    /// the returned value is dropped, it is undefined behaviour to read or
+    /// write to the pointed-to memory in any way except through this slice,
+    /// including by calling a wasm function that reads the memory contents or
+    /// by resizing this Memory.
+    #[allow(clippy::mut_from_ref)]
+    #[doc(hidden)]
+    pub unsafe fn data_unchecked_mut(&self) -> &mut [u8] {
+        unimplemented!("direct data pointer access is not possible in JavaScript");
+    }
+
     /// Returns the size (in [`Pages`]) of the `Memory`.
     ///
     /// # Example

lib/types/src/value.rs

@@ -98,6 +98,7 @@ macro_rules! primitives {
     )*)
 }
 primitives! {
+    bool
     i8 u8
     i16 u16
     i32 u32

lib/wasi-experimental-io-devices/src/link-ext.rs

@@ -5,7 +5,10 @@ use std::collections::{BTreeSet, VecDeque};
 use std::convert::TryInto;
 use std::io::{Read, Seek, SeekFrom, Write};
 use tracing::debug;
-use wasmer_wasi::{types::*, WasiInodes};
+use wasmer_wasi::{
+    types::{wasi::Filesize, *},
+    WasiInodes,
+};
 use wasmer_wasi::{Fd, VirtualFile, WasiFs, WasiFsError, ALL_RIGHTS, VIRTUAL_ROOT_FD};
 
 use minifb::{Key, KeyRepeat, MouseButton, Scale, Window, WindowOptions};
@@ -417,7 +420,7 @@ impl VirtualFile for FrameBuffer {
     fn size(&self) -> u64 {
         0
     }
-    fn set_len(&mut self, _new_size: __wasi_filesize_t) -> Result<(), WasiFsError> {
+    fn set_len(&mut self, _new_size: Filesize) -> Result<(), WasiFsError> {
         Ok(())
     }
     fn unlink(&mut self) -> Result<(), WasiFsError> {

lib/wasi-types-generated/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "wasmer-wasi-types-generated"
+version = "3.0.0-beta"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+wasmer-derive = { path = "../derive", version = "=3.0.0-beta" }
+wasmer-types = { path = "../types", version = "=3.0.0-beta" }
+
+[dependencies.wit-bindgen-rust]
+default-features = false
+git = "https://github.com/wasmerio/wit-bindgen.git"
+branch = "main"
+package = "wit-bindgen-gen-rust-wasm"
+
+[features]
+js = []
+sys = []

lib/wasi-types-generated/regenerate.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+BASEDIR=$(dirname "$0")
+
+rm -f \
+    "$BASEDIR"/src/bindings.rs \
+    "$BASEDIR"/src/*/bindings.rs
+
+# TODO: merge typenames.wit and wasi_unstable.wit
+
+wit-bindgen rust-wasm \
+    --import \
+    "$BASEDIR"/wit-clean/typenames.wit \
+    --out-dir "$BASEDIR"/src/wasi
+
+#wit-bindgen rust-wasm --import wit/wasi-snapshot0.wit wit/wasi-filesystem.wit --out-dir .

lib/wasi-types-generated/src/lib.rs

@@ -0,0 +1,4 @@
+pub mod wasi;
+pub mod wasi_filesystem;
+pub mod wasi_io_typenames;
+pub mod wasi_snapshot0;