wasm-idle 0.0.14 → 0.0.16

package/dist/clang/index.js

@@ -51,6 +51,8 @@ export default class Clang {
             stdin: options.stdin,
             path: this.path
         });
+        this.getModule(clangUrl(this.path));
+        this.getModule(lldUrl(this.path));
         this.ready = this.memfs.ready.then(() => this.hostLogAsync(`Untarring ${rootUrl(this.path)}`, readBuffer(rootUrl(this.path)).then(buffer => untar(buffer, this.memfs))));
     }
     hostLog(message) {
@@ -96,7 +98,7 @@ export default class Clang {
         await this.ready;
         const lld = await this.getModule(lldUrl(this.path));
         return await this.run(lld, this.log, 'wasm-ld', '--no-threads', '--export-dynamic', // TODO required?
-        '-z', `stack-size=${stackSize}`, `-L${libdir}`, crt1, obj, '-lc', '-lc++', '-lc++abi', '-o', wasm);
+        '-z', `stack-size=${stackSize}`, `-L${libdir}`, crt1, obj, '-lc', '-lc++', '-lc++abi', '-lm', `-Llib/clang/8.0.1/lib/wasi`, '-lclang_rt.builtins-wasm32', '-o', wasm);
     }
     async run(module, out, ...args) {
         this.memfs.out = out;

package/dist/clang/url.js

@@ -1,4 +1,4 @@
-export const memfsUrl = (prefix) => prefix + '/clang/bin/memfs';
-export const clangUrl = (prefix) => prefix + '/clang/bin/clang';
-export const lldUrl = (prefix) => prefix + '/clang/bin/lld';
+export const memfsUrl = (prefix) => prefix + '/clang/bin/memfs.zip';
+export const clangUrl = (prefix) => prefix + '/clang/bin/clang.zip';
+export const lldUrl = (prefix) => prefix + '/clang/bin/lld.zip';
 export const rootUrl = (prefix) => prefix + '/clang/bin/sysroot.tar';

package/dist/clang/wasm.d.ts

@@ -1,3 +1,3 @@
-export declare function compile(filename: string): Promise<WebAssembly.Module>;
+export declare function compile(filename: string): Promise<any>;
 export declare function getInstance(module: WebAssembly.Module, imports: WebAssembly.Imports): Promise<WebAssembly.Instance>;
 export declare const readBuffer: (name: string) => Promise<ArrayBuffer>;

package/dist/clang/wasm.js

@@ -1,13 +1,19 @@
+import * as zip from "@zip.js/zip.js";
 const url = (url) => url;
+const store = {};
 export async function compile(filename) {
     // TODO: make compileStreaming work. It needs the server to use the
     // application/wasm mimetype.
-    if (false && WebAssembly.compileStreaming) {
-        return WebAssembly.compileStreaming(fetch(url(filename)));
-    }
-    else {
-        const response = await fetch(url(filename));
-        return WebAssembly.compile(await response.arrayBuffer());
+    if (store[filename])
+        return store[filename];
+    const response = await fetch(url(filename));
+    const blob = await response.blob();
+    const reader = new zip.ZipReader(new zip.BlobReader(blob));
+    const entries = await reader.getEntries();
+    for (const entry of entries) {
+        console.log(`Found WASM file: ${entry.filename}`);
+        const data = await entry.getData(new zip.Uint8ArrayWriter());
+        return store[filename] = WebAssembly.compile(data);
     }
 }
 export function getInstance(module, imports) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-idle",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "A simple web app to run C++/Python code in the browser",
   "license": "MIT",
   "type": "module",
@@ -36,7 +36,8 @@
     "vite": "^4.5.0"
   },
   "dependencies": {
-    "pyodide": "0.24.1",
+    "@zip.js/zip.js": "^2.7.30",
+    "pyodide": "0.23.1",
     "xterm": "^5.3.0",
     "xterm-addon-canvas": "^0.5.0",
     "xterm-addon-fit": "^0.8.0",