[WIP] Async

packages/compiler/src/__tests__/errorsUtils.test.ts

@@ -10,11 +10,11 @@ const testCases = fs.readdirSync(DIR);
 testCases.forEach((filename: string) => {
   const testFunc = filename.startsWith("only.") ? test.only : test;
   const testName = filename.replace(/^only\./, "");
-  testFunc(`${testName}`, () => {
+  testFunc(`${testName}`, async () => {
     const eel = fs.readFileSync(path.join(DIR, filename), { encoding: "utf8" });
     let compilerError = null;
     try {
-      compileModule({
+      await compileModule({
         pools: { main: new Set() },
         functions: { run: { pool: "main", code: eel } },
       });

packages/compiler/src/compiler.ts

@@ -36,12 +36,12 @@ type CompilerOptions = {
   preParsed?: boolean;
 };
 
-export function compileModule({
+export async function compileModule({
   pools,
   functions: funcs,
   eelVersion = 2,
   preParsed = false,
-}: CompilerOptions) {
+}: CompilerOptions): Promise<Uint8Array> {
   if (Object.keys(pools).includes("shims")) {
     throw new Error(
       'You may not name a pool "shims". "shims" is reserved for injected JavaScript functions.'
@@ -81,7 +81,7 @@ export function compileModule({
     localVariables: number[];
   }[] = [];
 
-  Object.entries(funcs).forEach(([name, { pool, code }]) => {
+  for (const [name, { pool, code }] of Object.entries(funcs)) {
     if (pools[pool] == null) {
       const poolsList = Object.keys(pools);
       if (poolsList.length === 0) {
@@ -108,7 +108,7 @@ export function compileModule({
       throw new Error("Invalid AST");
     }
     if (ast.body.length === 0) {
-      return;
+      continue;
     }
     const localVariables: number[] = [];
     const context: CompilerContext = {
@@ -160,7 +160,8 @@ export function compileModule({
       returns: [],
       localVariables,
     });
-  });
+    await Promise.resolve();
+  }
 
   const localFuncs = localFuncOrder.map(name => {
     const func = localFuncMap[name];

packages/compiler/src/loader.ts

@@ -26,7 +26,7 @@ export async function loadModule({
   Object.entries(pools).forEach(([key, globals]) => {
     compilerPools[key] = new Set(Object.keys(globals));
   });
-  const buffer = compileModule({
+  const buffer = await compileModule({
     pools: compilerPools,
     functions,
     eelVersion,

packages/compiler/tools/__tests__/binary.test.ts

@@ -12,7 +12,7 @@ test("Can execute hand crafted binary Wasm", async () => {
     shims,
   };
 
-  const buffer = compileModule({
+  const buffer = await compileModule({
     pools: {
       main: new Set(Object.keys(importObject.main)),
     },

packages/compiler/tools/parseMilk.js

@@ -128,17 +128,17 @@ const BAD = new Set([
   "fixtures/mega/Telek & EMPR - Hell Cave (Fiddle A Bit (Flicker @xis) Mix).milk", // vnum_increment = ;
 ]);
 
-function validate(milkPath, context) {
+async function validate(milkPath, context) {
   if (BAD.has(milkPath)) {
     return;
   }
   const presetIni = fs.readFileSync(milkPath, { encoding: "utf8" });
   const eels = getEels(presetIni);
 
-  Object.entries(eels).forEach(([name, eel]) => {
+  for (const [name, eel] of Object.entries(eels)) {
     try {
       const root = parse(eel);
-      compileModule({
+      await compileModule({
         globals: new Set(),
         functions: { run: root },
         shims,
@@ -155,7 +155,7 @@ function validate(milkPath, context) {
       }
       throw e;
     }
-  });
+  }
 }
 
 let milkFiles;
@@ -184,10 +184,10 @@ const context = {
 const errors = {};
 let good = 0;
 let bad = 0;
-milkFiles.forEach(milk => {
+for (const milk of milkFiles) {
   // console.log(`Validating eel in "${milk}"...`);
   try {
-    validate(milk, context);
+    await validate(milk, context);
     good++;
   } catch (e) {
     const messageLines = e.message.split("\n");
@@ -209,7 +209,7 @@ milkFiles.forEach(milk => {
     }
     bad++;
   }
-});
+}
 
 if (bad === 0) {
   console.log("No errors found!");

packages/playground/src/hooks.js

@@ -74,19 +74,20 @@ export function useWasm(code, globals, eelVersion) {
     if (code == null) {
       return;
     }
-    try {
-      const wasm = compileModule({
-        functions: {
-          main: { pool: "main", code }
-        },
-        pools: { main: new Set(Object.keys(globals)) },
-        eelVersion
+    compileModule({
+      functions: {
+        main: { pool: "main", code }
+      },
+      pools: { main: new Set(Object.keys(globals)) },
+      eelVersion
+    })
+      .then(wasm => {
+        setWasm(wasm);
+        setWasmError(null);
+      })
+      .catch(e => {
+        setWasmError(e);
       });
-      setWasm(wasm);
-      setWasmError(null);
-    } catch (e) {
-      setWasmError(e);
-    }
   }, [code, eelVersion, globals]);
 
   return [wasm, wasmError, eelVersion];