update browser_wasi_shim and install with npm

This temporarily regresses ZLS's ability to resolve the zig library directory

Author: Techatrix

package-lock.json

@@ -5,6 +5,7 @@
     "serve": "parcel 404.html"
   },
   "dependencies": {
+    "@bjorn3/browser_wasi_shim": "^0.4.1",
     "@codemirror/autocomplete": "^6.4.2",
     "@codemirror/commands": "^6.2.2",
     "@codemirror/language": "^6.6.0",

package.json

@@ -50,10 +50,7 @@ export default class ZlsClient extends LspClient {
         if (this.worker) {
             const str = JSON.stringify(message);
 
-    const final =
-`Content-Length: ${str.length}\r
-\r
-${str}`
+            const final = `Content-Length: ${str.length}\r\n\r\n${str}`;
 
             this.sharer.lock();
 

src/editor.ts

@@ -1,30 +1,45 @@
 import zigTar from "url:./zig.tar.gz";
 import { ungzip } from "pako";
 import { untar } from "@immutabl3/tar";
-import { Directory, File } from "./wasi";
+import { Directory, File } from "@bjorn3/browser_wasi_shim";
 
 export async function getLatestZigArchive() {
     const archive = await (await fetch(zigTar, {})).arrayBuffer();
     const entries = await untar(ungzip(archive));
 
-    const first = entries[0].path;
-
-    let dirs = new Directory({});
+    let root: TreeNode = new Map();
 
     for (const e of entries) {
-        if (e.type === "file") {
-            const path = e.path.slice(first.length);
-            const splitPath = path.split("/");
-
-            let c = dirs;
-            for (const segment of splitPath.slice(0, -1)) {
-                c.contents[segment] = c.contents[segment] ?? new Directory({});
-                c = c.contents[segment] as Directory;
-            }
+        if (e.type !== "file") continue;
+        if (!e.path.startsWith("lib/")) continue;
+        const path = e.path.slice("lib/".length);
+        const splitPath = path.split("/");
 
-            c.contents[splitPath[splitPath.length - 1]] = new File(e.getBinary())
+        let c = root;
+        for (const segment of splitPath.slice(0, -1)) {
+            if (!c.has(segment)) {
+                c.set(segment, new Map());
+            }
+            c = c.get(segment) as TreeNode;
         }
+
+
+        c.set(splitPath[splitPath.length - 1], e.getBinary());
     }
 
-    return dirs;
+    return convert(root);
+}
+
+type TreeNode = Map<string, TreeNode | Uint8Array>;
+
+function convert(node: TreeNode): Directory {
+    return new Directory(
+        [...node.entries()].map(([key, value]) => {
+            if (value instanceof Uint8Array) {
+                return [key, new File(value)];
+            } else {
+                return [key, convert(value)];
+            }
+        })
+    )
 }