Rebase and fix tests

* Pull in latest `wasmtime` where `main` now works
* Add a `testwasi` implementation for JS and use it in all tests
* Add a dummy `printf` to a C test to ensure it imports `testwasi` like
  the other languages.
* Add a `fd_fdstat_get` stub to make C happy
* Update `fd_write` to only work for fd 1

Author: alexcrichton

Cargo.lock

@@ -26,9 +26,9 @@ pulldown-cmark = { version = "0.8", default-features = false }
 clap = { version = "4.0.9", features = ["derive"] }
 env_logger = "0.9.1"
 
-wasmtime = { git = "https://github.com/alexcrichton/wasmtime", branch = "wit-bindgen-pieces" , features = ["component-model"] }
-wasmtime-wasi = { git = "https://github.com/alexcrichton/wasmtime", branch = "wit-bindgen-pieces" }
-wasmtime-environ = { git = "https://github.com/alexcrichton/wasmtime", branch = "wit-bindgen-pieces" }
+wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", branch = "main" , features = ["component-model"] }
+wasmtime-wasi = { git = "https://github.com/bytecodealliance/wasmtime", branch = "main" }
+wasmtime-environ = { git = "https://github.com/bytecodealliance/wasmtime", branch = "main" }
 wasmprinter = "0.2.41"
 wasmparser = "0.92.0"
 wasm-encoder = "0.18.0"

Cargo.toml

@@ -1,7 +1,7 @@
 // @ts-ignore
 import { readFile } from 'node:fs/promises';
 // @ts-ignore
-import { argv } from 'node:process';
+import { argv, stdout } from 'node:process';
 
 // This is a helper function used from `host.ts` test in the `tests/runtime/*`
 // directory to pass as the `instantiateCore` argument to the `instantiate`
@@ -15,3 +15,9 @@ export async function loadWasm(path: string, imports: any) {
   const m = await WebAssembly.compile(await readFile(root + '/' + path))
   return await WebAssembly.instantiate(m, imports);
 }
+
+export const testwasi = {
+  log(bytes: Uint8Array) {
+    stdout.write(bytes);
+  },
+};

crates/gen-host-js/tests/helpers.ts

@@ -81,6 +81,9 @@ pub extern "C" fn fd_write(
     mut iovs_len: usize,
     nwritten: *mut Size,
 ) -> Errno {
+    if fd != 1 {
+        unreachable();
+    }
     unsafe {
         // Advance to the first non-empty buffer.
         while iovs_len != 0 && (*iovs_ptr).buf_len == 0 {
@@ -116,3 +119,19 @@ pub extern "C" fn fd_close(fd: Fd) -> Errno {
 pub extern "C" fn proc_exit(rval: Exitcode) -> ! {
     unreachable()
 }
+
+#[no_mangle]
+pub extern "C" fn fd_fdstat_get(fd: Fd, fdstat: *mut Fdstat) -> Errno {
+    if fd != 1 {
+        unreachable();
+    }
+
+    unsafe {
+        (*fdstat).fs_filetype = FILETYPE_UNKNOWN;
+        (*fdstat).fs_flags = FDFLAGS_APPEND;
+        (*fdstat).fs_rights_base = RIGHTS_FD_WRITE;
+        (*fdstat).fs_rights_inheriting = RIGHTS_FD_WRITE;
+    }
+
+    ERRNO_SUCCESS
+}

crates/wasi_snapshot_preview1/src/lib.rs

@@ -1,11 +1,12 @@
-import { loadWasm } from "./helpers.js";
+import { loadWasm, testwasi } from "./helpers.js";
 import { instantiate } from "./flavorful.js";
 
 // @ts-ignore
 import * as assert from 'assert';
 
 async function run() {
   const wasm = await instantiate(loadWasm, {
+    testwasi,
     imports: {
       fListInRecord1(x) {},
       fListInRecord2() { return { a: 'list_in_record2' }; },

tests/runtime/flavorful/host.ts

@@ -1,10 +1,11 @@
 import { instantiate } from "./invalid.js";
-import { loadWasm } from "./helpers.js";
+import { loadWasm, testwasi } from "./helpers.js";
 // @ts-ignore
 import * as assert from 'assert';
 
 async function run() {
   const wasm = await instantiate(loadWasm, {
+    testwasi,
     imports: {
       roundtripU8(x) { throw new Error('unreachable'); },
       roundtripS8(x) { throw new Error('unreachable'); },

tests/runtime/invalid/host.ts

@@ -1,11 +1,12 @@
-import { loadWasm } from "./helpers.js";
+import { loadWasm, testwasi } from "./helpers.js";
 import { instantiate } from "./lists.js";
 
 // @ts-ignore
 import * as assert from 'assert';
 
 async function run() {
   const wasm = await instantiate(loadWasm, {
+    testwasi,
     imports: {
       emptyListParam(a) {
         assert.deepStrictEqual(Array.from(a), []);

tests/runtime/lists/host.ts

@@ -1,5 +1,5 @@
 import { instantiate } from "./many_arguments.js";
-import { loadWasm } from "./helpers.js";
+import { loadWasm, testwasi } from "./helpers.js";
 
 function assertEq(x: any, y: any) {
   if (x !== y)
@@ -13,6 +13,7 @@ function assert(x: boolean) {
 
 async function run() {
   const wasm = await instantiate(loadWasm, {
+    testwasi,
     imports: {
       manyArguments(
         a1,

tests/runtime/many_arguments/host.ts

@@ -1,4 +1,4 @@
-import { loadWasm } from "./helpers.js";
+import { loadWasm, testwasi } from "./helpers.js";
 import { instantiate } from "./numbers.js";
 
 function assertEq(x: any, y: any) {
@@ -14,6 +14,7 @@ function assert(x: boolean) {
 async function run() {
   let scalar = 0;
   const wasm = await instantiate(loadWasm, {
+    testwasi,
     imports: {
       roundtripU8(x) { return x; },
       roundtripS8(x) { return x; },