From bbdc3471aacd875a6e4fe91d69517525ff610169 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 23 Dec 2023 14:32:54 +0100
Subject: [PATCH 1/5] FIx rustc.html example

---
 examples/rustc.html | 3 +--
 src/fs_fd.ts        | 0
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 src/fs_fd.ts

diff --git a/examples/rustc.html b/examples/rustc.html
index 7890b2b..24a515e 100644
--- a/examples/rustc.html
+++ b/examples/rustc.html
@@ -30,8 +30,7 @@
 </p>
 <script type="module">
     import { Fd } from "../dist/fd.js";
-    import { File, Directory } from "../dist/fs_core.js";
-    import { PreopenDirectory } from "../dist/fs_fd.js";
+    import { File, Directory, PreopenDirectory } from "../dist/fs_core.js";
     import { WASI } from "../dist/index.js";
     import { strace } from "../dist/strace.js";
 
diff --git a/src/fs_fd.ts b/src/fs_fd.ts
deleted file mode 100644
index e69de29..0000000

From 5f79345e672032ad3455797e3cf194076803f361 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 23 Dec 2023 14:46:12 +0100
Subject: [PATCH 2/5] Add type hints to all methods of the Fd class

Also fixes a bug in path_readlink
---
 src/fd.ts      | 50 +++++++++++++++++++++++++++++---------------------
 src/fs_core.ts |  2 +-
 src/wasi.ts    | 15 ++++++++-------
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/fd.ts b/src/fd.ts
index 1cd0e18..9bee7a0 100644
--- a/src/fd.ts
+++ b/src/fd.ts
@@ -35,16 +35,24 @@ export class Fd {
   fd_filestat_set_times(atim: bigint, mtim: bigint, fst_flags: number): number {
     return wasi.ERRNO_NOTSUP;
   }
-  fd_pread(view8: Uint8Array, iovs: Array<wasi.Iovec>, offset: bigint) {
+  fd_pread(
+    view8: Uint8Array,
+    iovs: Array<wasi.Iovec>,
+    offset: bigint,
+  ): { ret: number, nread: number } {
     return { ret: wasi.ERRNO_NOTSUP, nread: 0 };
   }
-  fd_prestat_get() {
+  fd_prestat_get(): { ret: number; prestat: wasi.Prestat | null } {
     return { ret: wasi.ERRNO_NOTSUP, prestat: null };
   }
-  fd_prestat_dir_name() {
+  fd_prestat_dir_name(): { ret: number; prestat_dir_name: Uint8Array | null } {
     return { ret: wasi.ERRNO_NOTSUP, prestat_dir_name: null };
   }
-  fd_pwrite(view8: Uint8Array, iovs: Array<wasi.Ciovec>, offset: bigint) {
+  fd_pwrite(
+    view8: Uint8Array,
+    iovs: Array<wasi.Ciovec>,
+    offset: bigint,
+  ): { ret: number, nwritten: number } {
     return { ret: wasi.ERRNO_NOTSUP, nwritten: 0 };
   }
   fd_read(
@@ -68,44 +76,44 @@ export class Fd {
   fd_tell(): { ret: number; offset: bigint } {
     return { ret: wasi.ERRNO_NOTSUP, offset: 0n };
   }
-  fd_write(view8: Uint8Array, iovs: Array<wasi.Ciovec>) {
+  fd_write(view8: Uint8Array, iovs: Array<wasi.Ciovec>): { ret: number; nwritten: number } {
     return { ret: wasi.ERRNO_NOTSUP, nwritten: 0 };
   }
-  path_create_directory(path): number {
+  path_create_directory(path: string): number {
     return wasi.ERRNO_NOTSUP;
   }
-  path_filestat_get(flags, path) {
+  path_filestat_get(flags: number, path: string): { ret: number, filestat: wasi.Filestat | null } {
     return { ret: wasi.ERRNO_NOTSUP, filestat: null };
   }
-  path_filestat_set_times(flags, path, atim, mtim, fst_flags) {
+  path_filestat_set_times(flags: number, path: string, atim: bigint, mtim: bigint, fst_flags: number): number {
     return wasi.ERRNO_NOTSUP;
   }
-  path_link(old_fd, old_flags, old_path, new_path): number {
+  path_link(old_fd: number, old_flags: number, old_path: string, new_path: string): number {
     return wasi.ERRNO_NOTSUP;
   }
   path_open(
-    dirflags,
-    path,
-    oflags,
-    fs_rights_base,
-    fs_rights_inheriting,
-    fdflags,
-  ) {
+    dirflags: number,
+    path: string,
+    oflags: number,
+    fs_rights_base: bigint,
+    fs_rights_inheriting: bigint,
+    fd_flags: number,
+  ): { ret: number; fd_obj: Fd | null } {
     return { ret: wasi.ERRNO_NOTSUP, fd_obj: null };
   }
-  path_readlink(path) {
+  path_readlink(path: string): { ret: number, data: string | null } {
     return { ret: wasi.ERRNO_NOTSUP, data: null };
   }
-  path_remove_directory(path): number {
+  path_remove_directory(path: string): number {
     return wasi.ERRNO_NOTSUP;
   }
-  path_rename(old_path, new_fd, new_path): number {
+  path_rename(old_path: string, new_fd: number, new_path: string): number {
     return wasi.ERRNO_NOTSUP;
   }
-  path_symlink(old_path, new_path): number {
+  path_symlink(old_path: string, new_path: string): number {
     return wasi.ERRNO_NOTSUP;
   }
-  path_unlink_file(path): number {
+  path_unlink_file(path: string): number {
     return wasi.ERRNO_NOTSUP;
   }
 }
diff --git a/src/fs_core.ts b/src/fs_core.ts
index 7a7e65d..50e2758 100644
--- a/src/fs_core.ts
+++ b/src/fs_core.ts
@@ -402,7 +402,7 @@ export class PreopenDirectory extends OpenDirectory {
     this.prestat_name = new TextEncoder().encode(name);
   }
 
-  fd_prestat_get(): { ret: number; prestat: wasi.Prestat } {
+  fd_prestat_get(): { ret: number; prestat: wasi.Prestat | null } {
     return {
       ret: 0,
       prestat: wasi.Prestat.dir(this.prestat_name.length),
diff --git a/src/wasi.ts b/src/wasi.ts
index b4e5047..1cc4ca1 100644
--- a/src/wasi.ts
+++ b/src/wasi.ts
@@ -20,7 +20,7 @@ export default class WASI {
   env: Array<string> = [];
   fds: Array<Fd> = [];
   inst: { exports: { memory: WebAssembly.Memory } };
-  wasiImport: { [key: string]: (...args: Array<unknown>) => unknown };
+  wasiImport: { [key: string]: (...args: Array<any>) => unknown };
 
   /// Start a WASI command
   start(instance: {
@@ -549,9 +549,9 @@ export default class WASI {
         flags: number,
         path_ptr: number,
         path_len: number,
-        atim,
-        mtim,
-        fst_flags,
+        atim: bigint,
+        mtim: bigint,
+        fst_flags: number,
       ) {
         const buffer8 = new Uint8Array(self.inst.exports.memory.buffer);
         if (self.fds[fd] != undefined) {
@@ -651,12 +651,13 @@ export default class WASI {
           debug.log(path);
           const { ret, data } = self.fds[fd].path_readlink(path);
           if (data != null) {
-            if (data.length > buf_len) {
+            const data_buf = new TextEncoder().encode(data);
+            if (data_buf.length > buf_len) {
               buffer.setUint32(nread_ptr, 0, true);
               return wasi.ERRNO_BADF;
             }
-            buffer8.set(data, buf_ptr);
-            buffer.setUint32(nread_ptr, data.length, true);
+            buffer8.set(data_buf, buf_ptr);
+            buffer.setUint32(nread_ptr, data_buf.length, true);
           }
           return ret;
         } else {

From a70d0d6d064199b9b286623ede1eaf3fe6aad330 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 23 Dec 2023 14:47:42 +0100
Subject: [PATCH 3/5] Only import index.js in rustc.html

---
 examples/rustc.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/examples/rustc.html b/examples/rustc.html
index 24a515e..192aa99 100644
--- a/examples/rustc.html
+++ b/examples/rustc.html
@@ -29,11 +29,7 @@
   This demo highlights how far `rustc` can get on this polyfill before failing due to other reasons.
 </p>
 <script type="module">
-    import { Fd } from "../dist/fd.js";
-    import { File, Directory, PreopenDirectory } from "../dist/fs_core.js";
-    import { WASI } from "../dist/index.js";
-    import { strace } from "../dist/strace.js";
-
+    import { Fd, File, Directory, PreopenDirectory, WASI, strace } from "../dist/index.js";
 
     var term = new Terminal({
         convertEol: true,

From 84a69bc5e17d1de0c54dfe74d5ab4e565fc3705d Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 23 Dec 2023 14:57:12 +0100
Subject: [PATCH 4/5] Run prettier

---
 src/fd.ts | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/fd.ts b/src/fd.ts
index 9bee7a0..0dabed8 100644
--- a/src/fd.ts
+++ b/src/fd.ts
@@ -39,7 +39,7 @@ export class Fd {
     view8: Uint8Array,
     iovs: Array<wasi.Iovec>,
     offset: bigint,
-  ): { ret: number, nread: number } {
+  ): { ret: number; nread: number } {
     return { ret: wasi.ERRNO_NOTSUP, nread: 0 };
   }
   fd_prestat_get(): { ret: number; prestat: wasi.Prestat | null } {
@@ -52,7 +52,7 @@ export class Fd {
     view8: Uint8Array,
     iovs: Array<wasi.Ciovec>,
     offset: bigint,
-  ): { ret: number, nwritten: number } {
+  ): { ret: number; nwritten: number } {
     return { ret: wasi.ERRNO_NOTSUP, nwritten: 0 };
   }
   fd_read(
@@ -76,19 +76,36 @@ export class Fd {
   fd_tell(): { ret: number; offset: bigint } {
     return { ret: wasi.ERRNO_NOTSUP, offset: 0n };
   }
-  fd_write(view8: Uint8Array, iovs: Array<wasi.Ciovec>): { ret: number; nwritten: number } {
+  fd_write(
+    view8: Uint8Array,
+    iovs: Array<wasi.Ciovec>,
+  ): { ret: number; nwritten: number } {
     return { ret: wasi.ERRNO_NOTSUP, nwritten: 0 };
   }
   path_create_directory(path: string): number {
     return wasi.ERRNO_NOTSUP;
   }
-  path_filestat_get(flags: number, path: string): { ret: number, filestat: wasi.Filestat | null } {
+  path_filestat_get(
+    flags: number,
+    path: string,
+  ): { ret: number; filestat: wasi.Filestat | null } {
     return { ret: wasi.ERRNO_NOTSUP, filestat: null };
   }
-  path_filestat_set_times(flags: number, path: string, atim: bigint, mtim: bigint, fst_flags: number): number {
+  path_filestat_set_times(
+    flags: number,
+    path: string,
+    atim: bigint,
+    mtim: bigint,
+    fst_flags: number,
+  ): number {
     return wasi.ERRNO_NOTSUP;
   }
-  path_link(old_fd: number, old_flags: number, old_path: string, new_path: string): number {
+  path_link(
+    old_fd: number,
+    old_flags: number,
+    old_path: string,
+    new_path: string,
+  ): number {
     return wasi.ERRNO_NOTSUP;
   }
   path_open(
@@ -101,7 +118,7 @@ export class Fd {
   ): { ret: number; fd_obj: Fd | null } {
     return { ret: wasi.ERRNO_NOTSUP, fd_obj: null };
   }
-  path_readlink(path: string): { ret: number, data: string | null } {
+  path_readlink(path: string): { ret: number; data: string | null } {
     return { ret: wasi.ERRNO_NOTSUP, data: null };
   }
   path_remove_directory(path: string): number {

From 3e3978d6ae04f253a2ca1c5cca68011e0aa14d71 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 23 Dec 2023 14:59:11 +0100
Subject: [PATCH 5/5] Ignore warning about any

---
 src/wasi.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wasi.ts b/src/wasi.ts
index 1cc4ca1..066a8d0 100644
--- a/src/wasi.ts
+++ b/src/wasi.ts
@@ -20,6 +20,7 @@ export default class WASI {
   env: Array<string> = [];
   fds: Array<Fd> = [];
   inst: { exports: { memory: WebAssembly.Memory } };
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   wasiImport: { [key: string]: (...args: Array<any>) => unknown };
 
   /// Start a WASI command