@bytecodealliance/jco 1.15.1 → 1.15.3

package/obj/js-component-bindgen-component.js

@@ -150,8 +150,9 @@ class AsyncTask {
   #state;
   #isAsync;
   #onResolve = null;
-  #returnedResults = null;
   #entryFnName = null;
+  #subtasks = [];
+  #completionPromise = null;
   
   cancelled = false;
   requested = false;
@@ -164,6 +165,7 @@ class AsyncTask {
   awaitableResume = null;
   awaitableCancel = null;
   
+  
   constructor(opts) {
     if (opts?.id === undefined) { throw new TypeError('missing task ID during task creation'); }
     this.#id = opts.id;
@@ -175,8 +177,16 @@ class AsyncTask {
     this.#isAsync = opts?.isAsync ?? false;
     this.#entryFnName = opts.entryFnName;
     
+    const {
+      promise: completionPromise,
+      resolve: resolveCompletionPromise,
+      reject: rejectCompletionPromise,
+    } = Promise.withResolvers();
+    this.#completionPromise = completionPromise;
+    
     this.#onResolve = (results) => {
-      this.#returnedResults = results;
+      // TODO: handle external facing cancellation (should likely be a rejection)
+      resolveCompletionPromise(results);
     }
   }
   
@@ -184,13 +194,8 @@ class AsyncTask {
   id() { return this.#id; }
   componentIdx() { return this.#componentIdx; }
   isAsync() { return this.#isAsync; }
-  getEntryFnName() { return this.#entryFnName; }
-  
-  takeResults() {
-    const results = this.#returnedResults;
-    this.#returnedResults = null;
-    return results;
-  }
+  entryFnName() { return this.#entryFnName; }
+  completionPromise() { return this.#completionPromise; }
   
   mayEnter(task) {
     const cstate = getOrCreateAsyncState(this.#componentIdx);
@@ -221,7 +226,6 @@ class AsyncTask {
     let mayNotEnter = !this.mayEnter(this);
     const componentHasPendingTasks = cstate.pendingTasks > 0;
     if (mayNotEnter || componentHasPendingTasks) {
-      
       throw new Error('in enter()'); // TODO: remove
       cstate.pendingTasks.set(this.#id, new Awaitable(new Promise()));
       
@@ -233,7 +237,7 @@ class AsyncTask {
           throw new Error('pending task [' + this.#id + '] not found for component instance');
         }
         cstate.pendingTasks.remove(this.#id);
-        this.#onResolve([]);
+        this.#onResolve(new Error('failed enter'));
         return false;
       }
       
@@ -386,7 +390,6 @@ class AsyncTask {
     }
   }
   
-  // NOTE: this should likely be moved to a SubTask class
   async asyncOnBlock(awaitable) {
     _debugLog('[AsyncTask#asyncOnBlock()] args', { taskID: this.#id, awaitable });
     if (!(awaitable instanceof Awaitable)) {
@@ -456,20 +459,23 @@ class AsyncTask {
     }
     if (this.borrowedHandles.length > 0) { throw new Error('task still has borrow handles'); }
     
-    this.#onResolve([]);
+    this.#onResolve(new Error('cancelled'));
     this.#state = AsyncTask.State.RESOLVED;
   }
   
-  resolve(result) {
+  resolve(results) {
+    _debugLog('[AsyncTask#resolve()] args', { results });
     if (this.#state === AsyncTask.State.RESOLVED) {
       throw new Error('task is already resolved');
     }
     if (this.borrowedHandles.length > 0) { throw new Error('task still has borrow handles'); }
-    this.#onResolve(result);
+    this.#onResolve(results.length === 1 ? results[0] : results);
     this.#state = AsyncTask.State.RESOLVED;
   }
   
   exit() {
+    _debugLog('[AsyncTask#exit()] args', { });
+    
     // TODO: ensure there is only one task at a time (scheduler.lock() functionality)
     if (this.#state !== AsyncTask.State.RESOLVED) {
       throw new Error('task exited without resolution');
@@ -488,10 +494,35 @@ class AsyncTask {
     this.startPendingTask();
   }
   
-  startPendingTask(opts) {
-    // TODO: implement
+  startPendingTask(args) {
+    _debugLog('[AsyncTask#startPendingTask()] args', args);
+    throw new Error('AsyncTask#startPendingTask() not implemented');
   }
   
+  createSubtask(args) {
+    _debugLog('[AsyncTask#createSubtask()] args', args);
+    const newSubtask = new AsyncSubtask({
+      componentIdx: this.componentIdx(),
+      taskID: this.id(),
+      memoryIdx: args?.memoryIdx,
+    });
+    this.#subtasks.push(newSubtask);
+    return newSubtask;
+  }
+  
+  currentSubtask() {
+    _debugLog('[AsyncTask#currentSubtask()]');
+    if (this.#subtasks.length === 0) { throw new Error('no current subtask'); }
+    return this.#subtasks.at(-1);
+  }
+  
+  endCurrentSubtask() {
+    _debugLog('[AsyncTask#endCurrentSubtask()]');
+    if (this.#subtasks.length === 0) { throw new Error('cannot end current subtask: no current subtask'); }
+    const subtask = this.#subtasks.pop();
+    subtask.drop();
+    return subtask;
+  }
 }
 
 function unpackCallbackResult(result) {
@@ -520,7 +551,7 @@ class ComponentAsyncState {
   #syncImportWait = Promise.withResolvers();
   #lock = null;
   
-  mayLeave = false;
+  mayLeave = true;
   waitableSets = new RepTable();
   waitables = new RepTable();
   
@@ -626,6 +657,45 @@ isExclusivelyLocked() { return this.#lock !== null; }
 
 }
 
+function prepareCall(memoryIdx) {
+  _debugLog('[prepareCall()] args', { memoryIdx });
+  
+  const taskMeta = getCurrentTask(ASYNC_CURRENT_COMPONENT_IDXS.at(-1), ASYNC_CURRENT_TASK_IDS.at(-1));
+  if (!taskMeta) { throw new Error('invalid/missing current async task meta during prepare call'); }
+  
+  const task = taskMeta.task;
+  if (!task) { throw new Error('unexpectedly missing task in task meta during prepare call'); }
+  
+  const state = getOrCreateAsyncState(task.componentIdx());
+  if (!state) {
+    throw new Error('invalid/missing async state for component instance [' + componentInstanceID + ']');
+  }
+  
+  const subtask = task.createSubtask({
+    memoryIdx,
+  });
+  
+}
+
+function asyncStartCall(callbackIdx, postReturnIdx) {
+  _debugLog('[asyncStartCall()] args', { callbackIdx, postReturnIdx });
+  
+  const taskMeta = getCurrentTask(ASYNC_CURRENT_COMPONENT_IDXS.at(-1), ASYNC_CURRENT_TASK_IDS.at(-1));
+  if (!taskMeta) { throw new Error('invalid/missing current async task meta during prepare call'); }
+  
+  const task = taskMeta.task;
+  if (!task) { throw new Error('unexpectedly missing task in task meta during prepare call'); }
+  
+  const subtask = task.currentSubtask();
+  if (!subtask) { throw new Error('invalid/missing subtask during async start call'); }
+  
+  return Number(subtask.waitableRep()) << 4 | subtask.getStateNumber();
+}
+
+function syncStartCall(callbackIdx) {
+  _debugLog('[syncStartCall()] args', { callbackIdx });
+}
+
 if (!Promise.withResolvers) {
   Promise.withResolvers = () => {
     let resolve;
@@ -695,39 +765,42 @@ class RepTable {
       this.#data.push(null);
       return (this.#data.length >> 1) - 1;
     }
-    this.#data[0] = this.#data[freeIdx];
-    const newFreeIdx = freeIdx << 1;
-    this.#data[newFreeIdx] = val;
-    this.#data[newFreeIdx + 1] = null;
-    return free;
+    this.#data[0] = this.#data[freeIdx << 1];
+    const placementIdx = freeIdx << 1;
+    this.#data[placementIdx] = val;
+    this.#data[placementIdx + 1] = null;
+    return freeIdx;
   }
   
   get(rep) {
-    _debugLog('[RepTable#insert()] args', { rep });
-    const baseIdx = idx << 1;
+    _debugLog('[RepTable#get()] args', { rep });
+    const baseIdx = rep << 1;
     const val = this.#data[baseIdx];
     return val;
   }
   
   contains(rep) {
-    _debugLog('[RepTable#insert()] args', { rep });
-    const baseIdx = idx << 1;
+    _debugLog('[RepTable#contains()] args', { rep });
+    const baseIdx = rep << 1;
     return !!this.#data[baseIdx];
   }
   
   remove(rep) {
-    _debugLog('[RepTable#insert()] args', { idx });
+    _debugLog('[RepTable#remove()] args', { rep });
     if (this.#data.length === 2) { throw new Error('invalid'); }
     
-    const baseIdx = idx << 1;
+    const baseIdx = rep << 1;
     const val = this.#data[baseIdx];
     if (val === 0) { throw new Error('invalid resource rep (cannot be 0)'); }
+    
     this.#data[baseIdx] = this.#data[0];
-    this.#data[0] = idx;
+    this.#data[0] = rep;
+    
     return val;
   }
   
   clear() {
+    _debugLog('[RepTable#clear()] args', { rep });
     this.#data = [0, null];
   }
 }
@@ -766,6 +839,7 @@ function trampoline5() {
   _debugLog('[iface="wasi:cli/stderr@0.2.3", function="get-stderr"][Instruction::Return]', {
     funcName: 'get-stderr',
     paramCount: 1,
+    async: false,
     postReturn: false
   });
   return handle0;
@@ -794,6 +868,7 @@ function trampoline8() {
   _debugLog('[iface="wasi:cli/stdin@0.2.3", function="get-stdin"][Instruction::Return]', {
     funcName: 'get-stdin',
     paramCount: 1,
+    async: false,
     postReturn: false
   });
   return handle0;
@@ -818,6 +893,7 @@ function trampoline9() {
   _debugLog('[iface="wasi:cli/stdout@0.2.3", function="get-stdout"][Instruction::Return]', {
     funcName: 'get-stdout',
     paramCount: 1,
+    async: false,
     postReturn: false
   });
   return handle0;
@@ -853,6 +929,7 @@ function trampoline10(arg0) {
   _debugLog('[iface="wasi:cli/exit@0.2.3", function="exit"][Instruction::Return]', {
     funcName: 'exit',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -887,6 +964,7 @@ function trampoline11(arg0) {
   _debugLog('[iface="wasi:cli/environment@0.2.3", function="get-environment"][Instruction::Return]', {
     funcName: 'get-environment',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1143,6 +1221,7 @@ function trampoline12(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.get-type"][Instruction::Return]', {
     funcName: '[method]descriptor.get-type',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1354,6 +1433,7 @@ function trampoline13(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.metadata-hash"][Instruction::Return]', {
     funcName: '[method]descriptor.metadata-hash',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1552,6 +1632,7 @@ function trampoline14(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="filesystem-error-code"][Instruction::Return]', {
     funcName: 'filesystem-error-code',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1772,6 +1853,7 @@ function trampoline15(arg0, arg1, arg2, arg3, arg4) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.metadata-hash-at"][Instruction::Return]', {
     funcName: '[method]descriptor.metadata-hash-at',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1990,6 +2072,7 @@ function trampoline16(arg0, arg1, arg2) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.read-via-stream"][Instruction::Return]', {
     funcName: '[method]descriptor.read-via-stream',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -2208,6 +2291,7 @@ function trampoline17(arg0, arg1, arg2) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.write-via-stream"][Instruction::Return]', {
     funcName: '[method]descriptor.write-via-stream',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -2426,6 +2510,7 @@ function trampoline18(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.append-via-stream"][Instruction::Return]', {
     funcName: '[method]descriptor.append-via-stream',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -2648,6 +2733,7 @@ function trampoline19(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.read-directory"][Instruction::Return]', {
     funcName: '[method]descriptor.read-directory',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -2933,6 +3019,7 @@ function trampoline20(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.stat"][Instruction::Return]', {
     funcName: '[method]descriptor.stat',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3227,6 +3314,7 @@ function trampoline21(arg0, arg1, arg2, arg3, arg4) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.stat-at"][Instruction::Return]', {
     funcName: '[method]descriptor.stat-at',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3474,6 +3562,7 @@ function trampoline22(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.open-at"][Instruction::Return]', {
     funcName: '[method]descriptor.open-at',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3738,6 +3827,7 @@ function trampoline23(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]directory-entry-stream.read-directory-entry"][Instruction::Return]', {
     funcName: '[method]directory-entry-stream.read-directory-entry',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3818,6 +3908,7 @@ function trampoline24(arg0, arg1, arg2) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]input-stream.read"][Instruction::Return]', {
     funcName: '[method]input-stream.read',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3898,6 +3989,7 @@ function trampoline25(arg0, arg1, arg2) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]input-stream.blocking-read"][Instruction::Return]', {
     funcName: '[method]input-stream.blocking-read',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3972,6 +4064,7 @@ function trampoline26(arg0, arg1) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]output-stream.check-write"][Instruction::Return]', {
     funcName: '[method]output-stream.check-write',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4048,6 +4141,7 @@ function trampoline27(arg0, arg1, arg2, arg3) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]output-stream.write"][Instruction::Return]', {
     funcName: '[method]output-stream.write',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4124,6 +4218,7 @@ function trampoline28(arg0, arg1, arg2, arg3) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]output-stream.blocking-write-and-flush"][Instruction::Return]', {
     funcName: '[method]output-stream.blocking-write-and-flush',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4197,6 +4292,7 @@ function trampoline29(arg0, arg1) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]output-stream.blocking-flush"][Instruction::Return]', {
     funcName: '[method]output-stream.blocking-flush',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4218,6 +4314,7 @@ function trampoline30(arg0, arg1) {
   _debugLog('[iface="wasi:random/random@0.2.3", function="get-random-bytes"][Instruction::Return]', {
     funcName: 'get-random-bytes',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4255,6 +4352,7 @@ function trampoline31(arg0) {
   _debugLog('[iface="wasi:filesystem/preopens@0.2.3", function="get-directories"][Instruction::Return]', {
     funcName: 'get-directories',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4290,6 +4388,7 @@ function trampoline32(arg0) {
   _debugLog('[iface="wasi:cli/terminal-stdin@0.2.3", function="get-terminal-stdin"][Instruction::Return]', {
     funcName: 'get-terminal-stdin',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4325,6 +4424,7 @@ function trampoline33(arg0) {
   _debugLog('[iface="wasi:cli/terminal-stdout@0.2.3", function="get-terminal-stdout"][Instruction::Return]', {
     funcName: 'get-terminal-stdout',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4356,6 +4456,7 @@ function trampoline34(arg0) {
   _debugLog('[iface="wasi:cli/terminal-stderr@0.2.3", function="get-terminal-stderr"][Instruction::Return]', {
     funcName: 'get-terminal-stderr',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4673,7 +4774,12 @@ function generate(arg0, arg1) {
       }
     }
   }
-  _debugLog('[iface="generate", function="generate"] [Instruction::CallWasm] (async? false, @ enter)');
+  _debugLog('[iface="generate", function="generate"][Instruction::CallWasm] enter', {
+    funcName: 'generate',
+    paramCount: 1,
+    async: false,
+    postReturn: true,
+  });
   const _wasm_call_currentTaskID = startCurrentTask(0, false, 'exports1Generate');
   const ret = exports1Generate(ptr0);
   endCurrentTask(0);
@@ -4754,6 +4860,7 @@ function generate(arg0, arg1) {
   _debugLog('[iface="generate", function="generate"][Instruction::Return]', {
     funcName: 'generate',
     paramCount: 1,
+    async: false,
     postReturn: true
   });
   const retCopy = variant39;
@@ -4970,7 +5077,12 @@ function generateTypes(arg0, arg1) {
       }
     }
   }
-  _debugLog('[iface="generate-types", function="generate-types"] [Instruction::CallWasm] (async? false, @ enter)');
+  _debugLog('[iface="generate-types", function="generate-types"][Instruction::CallWasm] enter', {
+    funcName: 'generate-types',
+    paramCount: 1,
+    async: false,
+    postReturn: true,
+  });
   const _wasm_call_currentTaskID = startCurrentTask(0, false, 'exports1GenerateTypes');
   const ret = exports1GenerateTypes(ptr0);
   endCurrentTask(0);
@@ -5013,6 +5125,7 @@ function generateTypes(arg0, arg1) {
   _debugLog('[iface="generate-types", function="generate-types"][Instruction::Return]', {
     funcName: 'generate-types',
     paramCount: 1,
+    async: false,
     postReturn: true
   });
   const retCopy = variant33;
@@ -5033,27 +5146,27 @@ function generateTypes(arg0, arg1) {
 
 let _initialized = false;
 export const $init = (() => {
-  let gen = (function* init () {
+  let gen = (function* _initGenerator () {
     const module0 = fetchCompile(new URL('./js-component-bindgen-component.core.wasm', import.meta.url));
     const module1 = fetchCompile(new URL('./js-component-bindgen-component.core2.wasm', import.meta.url));
-    const module2 = base64Compile('AGFzbQEAAAABZw5gAn9/AGABfwBgAn9/AX9gA39+fwBgBH9/f38Bf2AFf39/f38AYAR/f39/AGAFf39/fn8Bf2AFf39/f38Bf2AJf39/f39+fn9/AX9gAX8Bf2ADf39/AX9gB39/f39/f38AYAJ+fwADJiUCBAcECAkCAgIKAgsBAQAAAAUDAwAAAAUMAAMDAAYGAA0BAQEBBAUBcAElJQe7ASYBMAAAATEAAQEyAAIBMwADATQABAE1AAUBNgAGATcABwE4AAgBOQAJAjEwAAoCMTEACwIxMgAMAjEzAA0CMTQADgIxNQAPAjE2ABACMTcAEQIxOAASAjE5ABMCMjAAFAIyMQAVAjIyABYCMjMAFwIyNAAYAjI1ABkCMjYAGgIyNwAbAjI4ABwCMjkAHQIzMAAeAjMxAB8CMzIAIAIzMwAhAjM0ACICMzUAIwIzNgAkCCRpbXBvcnRzAQAK+QMlCwAgACABQQARAgALDwAgACABIAIgA0EBEQQACxEAIAAgASACIAMgBEECEQcACw8AIAAgASACIANBAxEEAAsRACAAIAEgAiADIARBBBEIAAsZACAAIAEgAiADIAQgBSAGIAcgCEEFEQkACwsAIAAgAUEGEQIACwsAIAAgAUEHEQIACwsAIAAgAUEIEQIACwkAIABBCREKAAsLACAAIAFBChECAAsNACAAIAEgAkELEQsACwkAIABBDBEBAAsJACAAQQ0RAQALCwAgACABQQ4RAAALCwAgACABQQ8RAAALCwAgACABQRARAAALEQAgACABIAIgAyAEQRERBQALDQAgACABIAJBEhEDAAsNACAAIAEgAkETEQMACwsAIAAgAUEUEQAACwsAIAAgAUEVEQAACwsAIAAgAUEWEQAACxEAIAAgASACIAMgBEEXEQUACxUAIAAgASACIAMgBCAFIAZBGBEMAAsLACAAIAFBGREAAAsNACAAIAEgAkEaEQMACw0AIAAgASACQRsRAwALCwAgACABQRwRAAALDwAgACABIAIgA0EdEQYACw8AIAAgASACIANBHhEGAAsLACAAIAFBHxEAAAsLACAAIAFBIBENAAsJACAAQSERAQALCQAgAEEiEQEACwkAIABBIxEBAAsJACAAQSQRAQALAC8JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQHMC4yMzkuMA');
-    const module3 = base64Compile('AGFzbQEAAAABZw5gAn9/AGABfwBgAn9/AX9gA39+fwBgBH9/f38Bf2AFf39/f38AYAR/f39/AGAFf39/fn8Bf2AFf39/f38Bf2AJf39/f39+fn9/AX9gAX8Bf2ADf39/AX9gB39/f39/f38AYAJ+fwAC5AEmAAEwAAIAATEABAABMgAHAAEzAAQAATQACAABNQAJAAE2AAIAATcAAgABOAACAAE5AAoAAjEwAAIAAjExAAsAAjEyAAEAAjEzAAEAAjE0AAAAAjE1AAAAAjE2AAAAAjE3AAUAAjE4AAMAAjE5AAMAAjIwAAAAAjIxAAAAAjIyAAAAAjIzAAUAAjI0AAwAAjI1AAAAAjI2AAMAAjI3AAMAAjI4AAAAAjI5AAYAAjMwAAYAAjMxAAAAAjMyAA0AAjMzAAEAAjM0AAEAAjM1AAEAAjM2AAEACCRpbXBvcnRzAXABJSUJKwEAQQALJQABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fICEiIyQALwlwcm9kdWNlcnMBDHByb2Nlc3NlZC1ieQENd2l0LWNvbXBvbmVudAcwLjIzOS4w');
+    const module2 = base64Compile('AGFzbQEAAAABZw5gAn9/AGABfwBgAn9/AX9gA39+fwBgBH9/f38Bf2AFf39/f38AYAR/f39/AGAFf39/fn8Bf2AFf39/f38Bf2AJf39/f39+fn9/AX9gAX8Bf2ADf39/AX9gB39/f39/f38AYAJ+fwADJiUHAgIIBAQJAgIKAgsBAQAAAAUDAwAAAAUMAAMDAAYGAA0BAQEBBAUBcAElJQe7ASYBMAAAATEAAQEyAAIBMwADATQABAE1AAUBNgAGATcABwE4AAgBOQAJAjEwAAoCMTEACwIxMgAMAjEzAA0CMTQADgIxNQAPAjE2ABACMTcAEQIxOAASAjE5ABMCMjAAFAIyMQAVAjIyABYCMjMAFwIyNAAYAjI1ABkCMjYAGgIyNwAbAjI4ABwCMjkAHQIzMAAeAjMxAB8CMzIAIAIzMwAhAjM0ACICMzUAIwIzNgAkCCRpbXBvcnRzAQAK+QMlEQAgACABIAIgAyAEQQARBwALCwAgACABQQERAgALCwAgACABQQIRAgALEQAgACABIAIgAyAEQQMRCAALDwAgACABIAIgA0EEEQQACw8AIAAgASACIANBBREEAAsZACAAIAEgAiADIAQgBSAGIAcgCEEGEQkACwsAIAAgAUEHEQIACwsAIAAgAUEIEQIACwkAIABBCREKAAsLACAAIAFBChECAAsNACAAIAEgAkELEQsACwkAIABBDBEBAAsJACAAQQ0RAQALCwAgACABQQ4RAAALCwAgACABQQ8RAAALCwAgACABQRARAAALEQAgACABIAIgAyAEQRERBQALDQAgACABIAJBEhEDAAsNACAAIAEgAkETEQMACwsAIAAgAUEUEQAACwsAIAAgAUEVEQAACwsAIAAgAUEWEQAACxEAIAAgASACIAMgBEEXEQUACxUAIAAgASACIAMgBCAFIAZBGBEMAAsLACAAIAFBGREAAAsNACAAIAEgAkEaEQMACw0AIAAgASACQRsRAwALCwAgACABQRwRAAALDwAgACABIAIgA0EdEQYACw8AIAAgASACIANBHhEGAAsLACAAIAFBHxEAAAsLACAAIAFBIBENAAsJACAAQSERAQALCQAgAEEiEQEACwkAIABBIxEBAAsJACAAQSQRAQALAC8JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQHMC4yNDAuMA');
+    const module3 = base64Compile('AGFzbQEAAAABZw5gAn9/AGABfwBgAn9/AX9gA39+fwBgBH9/f38Bf2AFf39/f38AYAR/f39/AGAFf39/fn8Bf2AFf39/f38Bf2AJf39/f39+fn9/AX9gAX8Bf2ADf39/AX9gB39/f39/f38AYAJ+fwAC5AEmAAEwAAcAATEAAgABMgACAAEzAAgAATQABAABNQAEAAE2AAkAATcAAgABOAACAAE5AAoAAjEwAAIAAjExAAsAAjEyAAEAAjEzAAEAAjE0AAAAAjE1AAAAAjE2AAAAAjE3AAUAAjE4AAMAAjE5AAMAAjIwAAAAAjIxAAAAAjIyAAAAAjIzAAUAAjI0AAwAAjI1AAAAAjI2AAMAAjI3AAMAAjI4AAAAAjI5AAYAAjMwAAYAAjMxAAAAAjMyAA0AAjMzAAEAAjM0AAEAAjM1AAEAAjM2AAEACCRpbXBvcnRzAXABJSUJKwEAQQALJQABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fICEiIyQALwlwcm9kdWNlcnMBDHByb2Nlc3NlZC1ieQENd2l0LWNvbXBvbmVudAcwLjI0MC4w');
     ({ exports: exports0 } = yield instantiateCore(yield module2));
     ({ exports: exports1 } = yield instantiateCore(yield module0, {
       wasi_snapshot_preview1: {
         environ_get: exports0['7'],
         environ_sizes_get: exports0['8'],
         fd_close: exports0['9'],
-        fd_filestat_get: exports0['0'],
+        fd_filestat_get: exports0['2'],
         fd_prestat_dir_name: exports0['11'],
         fd_prestat_get: exports0['10'],
-        fd_read: exports0['1'],
-        fd_readdir: exports0['2'],
-        fd_write: exports0['3'],
-        path_filestat_get: exports0['4'],
-        path_open: exports0['5'],
+        fd_read: exports0['4'],
+        fd_readdir: exports0['0'],
+        fd_write: exports0['5'],
+        path_filestat_get: exports0['3'],
+        path_open: exports0['6'],
         proc_exit: exports0['12'],
-        random_get: exports0['6'],
+        random_get: exports0['1'],
       },
     }));
     ({ exports: exports2 } = yield instantiateCore(yield module1, {
@@ -5134,8 +5247,8 @@ export const $init = (() => {
     ({ exports: exports3 } = yield instantiateCore(yield module3, {
       '': {
         $imports: exports0.$imports,
-        '0': exports2.fd_filestat_get,
-        '1': exports2.fd_read,
+        '0': exports2.fd_readdir,
+        '1': exports2.random_get,
         '10': exports2.fd_prestat_get,
         '11': exports2.fd_prestat_dir_name,
         '12': exports2.proc_exit,
@@ -5146,7 +5259,7 @@ export const $init = (() => {
         '17': trampoline15,
         '18': trampoline16,
         '19': trampoline17,
-        '2': exports2.fd_readdir,
+        '2': exports2.fd_filestat_get,
         '20': trampoline18,
         '21': trampoline19,
         '22': trampoline20,
@@ -5157,7 +5270,7 @@ export const $init = (() => {
         '27': trampoline25,
         '28': trampoline26,
         '29': trampoline27,
-        '3': exports2.fd_write,
+        '3': exports2.path_filestat_get,
         '30': trampoline28,
         '31': trampoline29,
         '32': trampoline30,
@@ -5165,9 +5278,9 @@ export const $init = (() => {
         '34': trampoline32,
         '35': trampoline33,
         '36': trampoline34,
-        '4': exports2.path_filestat_get,
-        '5': exports2.path_open,
-        '6': exports2.random_get,
+        '4': exports2.fd_read,
+        '5': exports2.fd_write,
+        '6': exports2.path_open,
         '7': exports2.environ_get,
         '8': exports2.environ_sizes_get,
         '9': exports2.fd_close,

package/obj/wasm-tools.js

@@ -150,8 +150,9 @@ class AsyncTask {
   #state;
   #isAsync;
   #onResolve = null;
-  #returnedResults = null;
   #entryFnName = null;
+  #subtasks = [];
+  #completionPromise = null;
   
   cancelled = false;
   requested = false;
@@ -164,6 +165,7 @@ class AsyncTask {
   awaitableResume = null;
   awaitableCancel = null;
   
+  
   constructor(opts) {
     if (opts?.id === undefined) { throw new TypeError('missing task ID during task creation'); }
     this.#id = opts.id;
@@ -175,8 +177,16 @@ class AsyncTask {
     this.#isAsync = opts?.isAsync ?? false;
     this.#entryFnName = opts.entryFnName;
     
+    const {
+      promise: completionPromise,
+      resolve: resolveCompletionPromise,
+      reject: rejectCompletionPromise,
+    } = Promise.withResolvers();
+    this.#completionPromise = completionPromise;
+    
     this.#onResolve = (results) => {
-      this.#returnedResults = results;
+      // TODO: handle external facing cancellation (should likely be a rejection)
+      resolveCompletionPromise(results);
     }
   }
   
@@ -184,13 +194,8 @@ class AsyncTask {
   id() { return this.#id; }
   componentIdx() { return this.#componentIdx; }
   isAsync() { return this.#isAsync; }
-  getEntryFnName() { return this.#entryFnName; }
-  
-  takeResults() {
-    const results = this.#returnedResults;
-    this.#returnedResults = null;
-    return results;
-  }
+  entryFnName() { return this.#entryFnName; }
+  completionPromise() { return this.#completionPromise; }
   
   mayEnter(task) {
     const cstate = getOrCreateAsyncState(this.#componentIdx);
@@ -221,7 +226,6 @@ class AsyncTask {
     let mayNotEnter = !this.mayEnter(this);
     const componentHasPendingTasks = cstate.pendingTasks > 0;
     if (mayNotEnter || componentHasPendingTasks) {
-      
       throw new Error('in enter()'); // TODO: remove
       cstate.pendingTasks.set(this.#id, new Awaitable(new Promise()));
       
@@ -233,7 +237,7 @@ class AsyncTask {
           throw new Error('pending task [' + this.#id + '] not found for component instance');
         }
         cstate.pendingTasks.remove(this.#id);
-        this.#onResolve([]);
+        this.#onResolve(new Error('failed enter'));
         return false;
       }
       
@@ -386,7 +390,6 @@ class AsyncTask {
     }
   }
   
-  // NOTE: this should likely be moved to a SubTask class
   async asyncOnBlock(awaitable) {
     _debugLog('[AsyncTask#asyncOnBlock()] args', { taskID: this.#id, awaitable });
     if (!(awaitable instanceof Awaitable)) {
@@ -456,20 +459,23 @@ class AsyncTask {
     }
     if (this.borrowedHandles.length > 0) { throw new Error('task still has borrow handles'); }
     
-    this.#onResolve([]);
+    this.#onResolve(new Error('cancelled'));
     this.#state = AsyncTask.State.RESOLVED;
   }
   
-  resolve(result) {
+  resolve(results) {
+    _debugLog('[AsyncTask#resolve()] args', { results });
     if (this.#state === AsyncTask.State.RESOLVED) {
       throw new Error('task is already resolved');
     }
     if (this.borrowedHandles.length > 0) { throw new Error('task still has borrow handles'); }
-    this.#onResolve(result);
+    this.#onResolve(results.length === 1 ? results[0] : results);
     this.#state = AsyncTask.State.RESOLVED;
   }
   
   exit() {
+    _debugLog('[AsyncTask#exit()] args', { });
+    
     // TODO: ensure there is only one task at a time (scheduler.lock() functionality)
     if (this.#state !== AsyncTask.State.RESOLVED) {
       throw new Error('task exited without resolution');
@@ -488,10 +494,35 @@ class AsyncTask {
     this.startPendingTask();
   }
   
-  startPendingTask(opts) {
-    // TODO: implement
+  startPendingTask(args) {
+    _debugLog('[AsyncTask#startPendingTask()] args', args);
+    throw new Error('AsyncTask#startPendingTask() not implemented');
   }
   
+  createSubtask(args) {
+    _debugLog('[AsyncTask#createSubtask()] args', args);
+    const newSubtask = new AsyncSubtask({
+      componentIdx: this.componentIdx(),
+      taskID: this.id(),
+      memoryIdx: args?.memoryIdx,
+    });
+    this.#subtasks.push(newSubtask);
+    return newSubtask;
+  }
+  
+  currentSubtask() {
+    _debugLog('[AsyncTask#currentSubtask()]');
+    if (this.#subtasks.length === 0) { throw new Error('no current subtask'); }
+    return this.#subtasks.at(-1);
+  }
+  
+  endCurrentSubtask() {
+    _debugLog('[AsyncTask#endCurrentSubtask()]');
+    if (this.#subtasks.length === 0) { throw new Error('cannot end current subtask: no current subtask'); }
+    const subtask = this.#subtasks.pop();
+    subtask.drop();
+    return subtask;
+  }
 }
 
 function unpackCallbackResult(result) {
@@ -520,7 +551,7 @@ class ComponentAsyncState {
   #syncImportWait = Promise.withResolvers();
   #lock = null;
   
-  mayLeave = false;
+  mayLeave = true;
   waitableSets = new RepTable();
   waitables = new RepTable();
   
@@ -626,6 +657,45 @@ isExclusivelyLocked() { return this.#lock !== null; }
 
 }
 
+function prepareCall(memoryIdx) {
+  _debugLog('[prepareCall()] args', { memoryIdx });
+  
+  const taskMeta = getCurrentTask(ASYNC_CURRENT_COMPONENT_IDXS.at(-1), ASYNC_CURRENT_TASK_IDS.at(-1));
+  if (!taskMeta) { throw new Error('invalid/missing current async task meta during prepare call'); }
+  
+  const task = taskMeta.task;
+  if (!task) { throw new Error('unexpectedly missing task in task meta during prepare call'); }
+  
+  const state = getOrCreateAsyncState(task.componentIdx());
+  if (!state) {
+    throw new Error('invalid/missing async state for component instance [' + componentInstanceID + ']');
+  }
+  
+  const subtask = task.createSubtask({
+    memoryIdx,
+  });
+  
+}
+
+function asyncStartCall(callbackIdx, postReturnIdx) {
+  _debugLog('[asyncStartCall()] args', { callbackIdx, postReturnIdx });
+  
+  const taskMeta = getCurrentTask(ASYNC_CURRENT_COMPONENT_IDXS.at(-1), ASYNC_CURRENT_TASK_IDS.at(-1));
+  if (!taskMeta) { throw new Error('invalid/missing current async task meta during prepare call'); }
+  
+  const task = taskMeta.task;
+  if (!task) { throw new Error('unexpectedly missing task in task meta during prepare call'); }
+  
+  const subtask = task.currentSubtask();
+  if (!subtask) { throw new Error('invalid/missing subtask during async start call'); }
+  
+  return Number(subtask.waitableRep()) << 4 | subtask.getStateNumber();
+}
+
+function syncStartCall(callbackIdx) {
+  _debugLog('[syncStartCall()] args', { callbackIdx });
+}
+
 if (!Promise.withResolvers) {
   Promise.withResolvers = () => {
     let resolve;
@@ -695,39 +765,42 @@ class RepTable {
       this.#data.push(null);
       return (this.#data.length >> 1) - 1;
     }
-    this.#data[0] = this.#data[freeIdx];
-    const newFreeIdx = freeIdx << 1;
-    this.#data[newFreeIdx] = val;
-    this.#data[newFreeIdx + 1] = null;
-    return free;
+    this.#data[0] = this.#data[freeIdx << 1];
+    const placementIdx = freeIdx << 1;
+    this.#data[placementIdx] = val;
+    this.#data[placementIdx + 1] = null;
+    return freeIdx;
   }
   
   get(rep) {
-    _debugLog('[RepTable#insert()] args', { rep });
-    const baseIdx = idx << 1;
+    _debugLog('[RepTable#get()] args', { rep });
+    const baseIdx = rep << 1;
     const val = this.#data[baseIdx];
     return val;
   }
   
   contains(rep) {
-    _debugLog('[RepTable#insert()] args', { rep });
-    const baseIdx = idx << 1;
+    _debugLog('[RepTable#contains()] args', { rep });
+    const baseIdx = rep << 1;
     return !!this.#data[baseIdx];
   }
   
   remove(rep) {
-    _debugLog('[RepTable#insert()] args', { idx });
+    _debugLog('[RepTable#remove()] args', { rep });
     if (this.#data.length === 2) { throw new Error('invalid'); }
     
-    const baseIdx = idx << 1;
+    const baseIdx = rep << 1;
     const val = this.#data[baseIdx];
     if (val === 0) { throw new Error('invalid resource rep (cannot be 0)'); }
+    
     this.#data[baseIdx] = this.#data[0];
-    this.#data[0] = idx;
+    this.#data[0] = rep;
+    
     return val;
   }
   
   clear() {
+    _debugLog('[RepTable#clear()] args', { rep });
     this.#data = [0, null];
   }
 }
@@ -766,6 +839,7 @@ function trampoline5() {
   _debugLog('[iface="wasi:cli/stderr@0.2.3", function="get-stderr"][Instruction::Return]', {
     funcName: 'get-stderr',
     paramCount: 1,
+    async: false,
     postReturn: false
   });
   return handle0;
@@ -794,6 +868,7 @@ function trampoline8() {
   _debugLog('[iface="wasi:cli/stdin@0.2.3", function="get-stdin"][Instruction::Return]', {
     funcName: 'get-stdin',
     paramCount: 1,
+    async: false,
     postReturn: false
   });
   return handle0;
@@ -818,6 +893,7 @@ function trampoline9() {
   _debugLog('[iface="wasi:cli/stdout@0.2.3", function="get-stdout"][Instruction::Return]', {
     funcName: 'get-stdout',
     paramCount: 1,
+    async: false,
     postReturn: false
   });
   return handle0;
@@ -853,6 +929,7 @@ function trampoline10(arg0) {
   _debugLog('[iface="wasi:cli/exit@0.2.3", function="exit"][Instruction::Return]', {
     funcName: 'exit',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -887,6 +964,7 @@ function trampoline11(arg0) {
   _debugLog('[iface="wasi:cli/environment@0.2.3", function="get-environment"][Instruction::Return]', {
     funcName: 'get-environment',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1143,6 +1221,7 @@ function trampoline12(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.get-type"][Instruction::Return]', {
     funcName: '[method]descriptor.get-type',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1354,6 +1433,7 @@ function trampoline13(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.metadata-hash"][Instruction::Return]', {
     funcName: '[method]descriptor.metadata-hash',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1552,6 +1632,7 @@ function trampoline14(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="filesystem-error-code"][Instruction::Return]', {
     funcName: 'filesystem-error-code',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1772,6 +1853,7 @@ function trampoline15(arg0, arg1, arg2, arg3, arg4) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.metadata-hash-at"][Instruction::Return]', {
     funcName: '[method]descriptor.metadata-hash-at',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -1990,6 +2072,7 @@ function trampoline16(arg0, arg1, arg2) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.read-via-stream"][Instruction::Return]', {
     funcName: '[method]descriptor.read-via-stream',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -2208,6 +2291,7 @@ function trampoline17(arg0, arg1, arg2) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.write-via-stream"][Instruction::Return]', {
     funcName: '[method]descriptor.write-via-stream',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -2426,6 +2510,7 @@ function trampoline18(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.append-via-stream"][Instruction::Return]', {
     funcName: '[method]descriptor.append-via-stream',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -2648,6 +2733,7 @@ function trampoline19(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.read-directory"][Instruction::Return]', {
     funcName: '[method]descriptor.read-directory',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -2933,6 +3019,7 @@ function trampoline20(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.stat"][Instruction::Return]', {
     funcName: '[method]descriptor.stat',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3227,6 +3314,7 @@ function trampoline21(arg0, arg1, arg2, arg3, arg4) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.stat-at"][Instruction::Return]', {
     funcName: '[method]descriptor.stat-at',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3474,6 +3562,7 @@ function trampoline22(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]descriptor.open-at"][Instruction::Return]', {
     funcName: '[method]descriptor.open-at',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3738,6 +3827,7 @@ function trampoline23(arg0, arg1) {
   _debugLog('[iface="wasi:filesystem/types@0.2.3", function="[method]directory-entry-stream.read-directory-entry"][Instruction::Return]', {
     funcName: '[method]directory-entry-stream.read-directory-entry',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3818,6 +3908,7 @@ function trampoline24(arg0, arg1, arg2) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]input-stream.read"][Instruction::Return]', {
     funcName: '[method]input-stream.read',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3898,6 +3989,7 @@ function trampoline25(arg0, arg1, arg2) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]input-stream.blocking-read"][Instruction::Return]', {
     funcName: '[method]input-stream.blocking-read',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -3972,6 +4064,7 @@ function trampoline26(arg0, arg1) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]output-stream.check-write"][Instruction::Return]', {
     funcName: '[method]output-stream.check-write',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4048,6 +4141,7 @@ function trampoline27(arg0, arg1, arg2, arg3) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]output-stream.write"][Instruction::Return]', {
     funcName: '[method]output-stream.write',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4124,6 +4218,7 @@ function trampoline28(arg0, arg1, arg2, arg3) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]output-stream.blocking-write-and-flush"][Instruction::Return]', {
     funcName: '[method]output-stream.blocking-write-and-flush',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4197,6 +4292,7 @@ function trampoline29(arg0, arg1) {
   _debugLog('[iface="wasi:io/streams@0.2.3", function="[method]output-stream.blocking-flush"][Instruction::Return]', {
     funcName: '[method]output-stream.blocking-flush',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4218,6 +4314,7 @@ function trampoline30(arg0, arg1) {
   _debugLog('[iface="wasi:random/random@0.2.3", function="get-random-bytes"][Instruction::Return]', {
     funcName: 'get-random-bytes',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4255,6 +4352,7 @@ function trampoline31(arg0) {
   _debugLog('[iface="wasi:filesystem/preopens@0.2.3", function="get-directories"][Instruction::Return]', {
     funcName: 'get-directories',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4290,6 +4388,7 @@ function trampoline32(arg0) {
   _debugLog('[iface="wasi:cli/terminal-stdin@0.2.3", function="get-terminal-stdin"][Instruction::Return]', {
     funcName: 'get-terminal-stdin',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4325,6 +4424,7 @@ function trampoline33(arg0) {
   _debugLog('[iface="wasi:cli/terminal-stdout@0.2.3", function="get-terminal-stdout"][Instruction::Return]', {
     funcName: 'get-terminal-stdout',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4356,6 +4456,7 @@ function trampoline34(arg0) {
   _debugLog('[iface="wasi:cli/terminal-stderr@0.2.3", function="get-terminal-stderr"][Instruction::Return]', {
     funcName: 'get-terminal-stderr',
     paramCount: 0,
+    async: false,
     postReturn: false
   });
 }
@@ -4461,7 +4562,12 @@ function parse(arg0) {
   if (!_initialized) throwUninitialized();
   var ptr0 = utf8Encode(arg0, realloc1, memory0);
   var len0 = utf8EncodedLen;
-  _debugLog('[iface="local:wasm-tools/tools", function="parse"] [Instruction::CallWasm] (async? false, @ enter)');
+  _debugLog('[iface="local:wasm-tools/tools", function="parse"][Instruction::CallWasm] enter', {
+    funcName: 'parse',
+    paramCount: 2,
+    async: false,
+    postReturn: true,
+  });
   const _wasm_call_currentTaskID = startCurrentTask(0, false, 'toolsParse');
   const ret = toolsParse(ptr0, len0);
   endCurrentTask(0);
@@ -4494,6 +4600,7 @@ function parse(arg0) {
   _debugLog('[iface="local:wasm-tools/tools", function="parse"][Instruction::Return]', {
     funcName: 'parse',
     paramCount: 1,
+    async: false,
     postReturn: true
   });
   const retCopy = variant3;
@@ -4520,7 +4627,12 @@ function print(arg0) {
   var ptr0 = realloc1(0, 0, 1, len0 * 1);
   var src0 = new Uint8Array(val0.buffer || val0, val0.byteOffset, len0 * 1);
   (new Uint8Array(memory0.buffer, ptr0, len0 * 1)).set(src0);
-  _debugLog('[iface="local:wasm-tools/tools", function="print"] [Instruction::CallWasm] (async? false, @ enter)');
+  _debugLog('[iface="local:wasm-tools/tools", function="print"][Instruction::CallWasm] enter', {
+    funcName: 'print',
+    paramCount: 2,
+    async: false,
+    postReturn: true,
+  });
   const _wasm_call_currentTaskID = startCurrentTask(0, false, 'toolsPrint');
   const ret = toolsPrint(ptr0, len0);
   endCurrentTask(0);
@@ -4553,6 +4665,7 @@ function print(arg0) {
   _debugLog('[iface="local:wasm-tools/tools", function="print"][Instruction::Return]', {
     funcName: 'print',
     paramCount: 1,
+    async: false,
     postReturn: true
   });
   const retCopy = variant3;
@@ -4611,7 +4724,12 @@ function componentNew(arg0, arg1) {
     variant5_1 = result4;
     variant5_2 = len4;
   }
-  _debugLog('[iface="local:wasm-tools/tools", function="component-new"] [Instruction::CallWasm] (async? false, @ enter)');
+  _debugLog('[iface="local:wasm-tools/tools", function="component-new"][Instruction::CallWasm] enter', {
+    funcName: 'component-new',
+    paramCount: 5,
+    async: false,
+    postReturn: true,
+  });
   const _wasm_call_currentTaskID = startCurrentTask(0, false, 'toolsComponentNew');
   const ret = toolsComponentNew(ptr0, len0, variant5_0, variant5_1, variant5_2);
   endCurrentTask(0);
@@ -4644,6 +4762,7 @@ function componentNew(arg0, arg1) {
   _debugLog('[iface="local:wasm-tools/tools", function="component-new"][Instruction::Return]', {
     funcName: 'component-new',
     paramCount: 1,
+    async: false,
     postReturn: true
   });
   const retCopy = variant8;
@@ -4670,7 +4789,12 @@ function componentWit(arg0) {
   var ptr0 = realloc1(0, 0, 1, len0 * 1);
   var src0 = new Uint8Array(val0.buffer || val0, val0.byteOffset, len0 * 1);
   (new Uint8Array(memory0.buffer, ptr0, len0 * 1)).set(src0);
-  _debugLog('[iface="local:wasm-tools/tools", function="component-wit"] [Instruction::CallWasm] (async? false, @ enter)');
+  _debugLog('[iface="local:wasm-tools/tools", function="component-wit"][Instruction::CallWasm] enter', {
+    funcName: 'component-wit',
+    paramCount: 2,
+    async: false,
+    postReturn: true,
+  });
   const _wasm_call_currentTaskID = startCurrentTask(0, false, 'toolsComponentWit');
   const ret = toolsComponentWit(ptr0, len0);
   endCurrentTask(0);
@@ -4703,6 +4827,7 @@ function componentWit(arg0) {
   _debugLog('[iface="local:wasm-tools/tools", function="component-wit"][Instruction::Return]', {
     funcName: 'component-wit',
     paramCount: 1,
+    async: false,
     postReturn: true
   });
   const retCopy = variant3;
@@ -4883,7 +5008,12 @@ function componentEmbed(arg0) {
       }
     }
   }
-  _debugLog('[iface="local:wasm-tools/tools", function="component-embed"] [Instruction::CallWasm] (async? false, @ enter)');
+  _debugLog('[iface="local:wasm-tools/tools", function="component-embed"][Instruction::CallWasm] enter', {
+    funcName: 'component-embed',
+    paramCount: 1,
+    async: false,
+    postReturn: true,
+  });
   const _wasm_call_currentTaskID = startCurrentTask(0, false, 'toolsComponentEmbed');
   const ret = toolsComponentEmbed(ptr0);
   endCurrentTask(0);
@@ -4916,6 +5046,7 @@ function componentEmbed(arg0) {
   _debugLog('[iface="local:wasm-tools/tools", function="component-embed"][Instruction::Return]', {
     funcName: 'component-embed',
     paramCount: 1,
+    async: false,
     postReturn: true
   });
   const retCopy = variant27;
@@ -4942,7 +5073,12 @@ function metadataShow(arg0) {
   var ptr0 = realloc1(0, 0, 1, len0 * 1);
   var src0 = new Uint8Array(val0.buffer || val0, val0.byteOffset, len0 * 1);
   (new Uint8Array(memory0.buffer, ptr0, len0 * 1)).set(src0);
-  _debugLog('[iface="local:wasm-tools/tools", function="metadata-show"] [Instruction::CallWasm] (async? false, @ enter)');
+  _debugLog('[iface="local:wasm-tools/tools", function="metadata-show"][Instruction::CallWasm] enter', {
+    funcName: 'metadata-show',
+    paramCount: 2,
+    async: false,
+    postReturn: true,
+  });
   const _wasm_call_currentTaskID = startCurrentTask(0, false, 'toolsMetadataShow');
   const ret = toolsMetadataShow(ptr0, len0);
   endCurrentTask(0);
@@ -5058,6 +5194,7 @@ function metadataShow(arg0) {
   _debugLog('[iface="local:wasm-tools/tools", function="metadata-show"][Instruction::Return]', {
     funcName: 'metadata-show',
     paramCount: 1,
+    async: false,
     postReturn: true
   });
   const retCopy = variant12;
@@ -5112,7 +5249,12 @@ function metadataAdd(arg0, arg1) {
     dataView(memory0).setUint32(base + 12, len6, true);
     dataView(memory0).setUint32(base + 8, result6, true);
   }
-  _debugLog('[iface="local:wasm-tools/tools", function="metadata-add"] [Instruction::CallWasm] (async? false, @ enter)');
+  _debugLog('[iface="local:wasm-tools/tools", function="metadata-add"][Instruction::CallWasm] enter', {
+    funcName: 'metadata-add',
+    paramCount: 4,
+    async: false,
+    postReturn: true,
+  });
   const _wasm_call_currentTaskID = startCurrentTask(0, false, 'toolsMetadataAdd');
   const ret = toolsMetadataAdd(ptr0, len0, result7, len7);
   endCurrentTask(0);
@@ -5145,6 +5287,7 @@ function metadataAdd(arg0, arg1) {
   _debugLog('[iface="local:wasm-tools/tools", function="metadata-add"][Instruction::Return]', {
     funcName: 'metadata-add',
     paramCount: 1,
+    async: false,
     postReturn: true
   });
   const retCopy = variant10;
@@ -5165,11 +5308,11 @@ function metadataAdd(arg0, arg1) {
 
 let _initialized = false;
 export const $init = (() => {
-  let gen = (function* init () {
+  let gen = (function* _initGenerator () {
     const module0 = fetchCompile(new URL('./wasm-tools.core.wasm', import.meta.url));
     const module1 = fetchCompile(new URL('./wasm-tools.core2.wasm', import.meta.url));
-    const module2 = base64Compile('AGFzbQEAAAABZw5gAn9/AGABfwBgAn9/AX9gA39+fwBgBH9/f38Bf2AFf39/f38AYAR/f39/AGAJf39/f39+fn9/AX9gBX9/f35/AX9gBX9/f39/AX9gAX8Bf2ADf39/AX9gB39/f39/f38AYAJ+fwADJiUHCAkCAgQEAgIKAgsBAQAAAAUDAwAAAAUMAAMDAAYGAA0BAQEBBAUBcAElJQe7ASYBMAAAATEAAQEyAAIBMwADATQABAE1AAUBNgAGATcABwE4AAgBOQAJAjEwAAoCMTEACwIxMgAMAjEzAA0CMTQADgIxNQAPAjE2ABACMTcAEQIxOAASAjE5ABMCMjAAFAIyMQAVAjIyABYCMjMAFwIyNAAYAjI1ABkCMjYAGgIyNwAbAjI4ABwCMjkAHQIzMAAeAjMxAB8CMzIAIAIzMwAhAjM0ACICMzUAIwIzNgAkCCRpbXBvcnRzAQAK+QMlGQAgACABIAIgAyAEIAUgBiAHIAhBABEHAAsRACAAIAEgAiADIARBAREIAAsRACAAIAEgAiADIARBAhEJAAsLACAAIAFBAxECAAsLACAAIAFBBBECAAsPACAAIAEgAiADQQURBAALDwAgACABIAIgA0EGEQQACwsAIAAgAUEHEQIACwsAIAAgAUEIEQIACwkAIABBCREKAAsLACAAIAFBChECAAsNACAAIAEgAkELEQsACwkAIABBDBEBAAsJACAAQQ0RAQALCwAgACABQQ4RAAALCwAgACABQQ8RAAALCwAgACABQRARAAALEQAgACABIAIgAyAEQRERBQALDQAgACABIAJBEhEDAAsNACAAIAEgAkETEQMACwsAIAAgAUEUEQAACwsAIAAgAUEVEQAACwsAIAAgAUEWEQAACxEAIAAgASACIAMgBEEXEQUACxUAIAAgASACIAMgBCAFIAZBGBEMAAsLACAAIAFBGREAAAsNACAAIAEgAkEaEQMACw0AIAAgASACQRsRAwALCwAgACABQRwRAAALDwAgACABIAIgA0EdEQYACw8AIAAgASACIANBHhEGAAsLACAAIAFBHxEAAAsLACAAIAFBIBENAAsJACAAQSERAQALCQAgAEEiEQEACwkAIABBIxEBAAsJACAAQSQRAQALAC8JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQHMC4yMzkuMA');
-    const module3 = base64Compile('AGFzbQEAAAABZw5gAn9/AGABfwBgAn9/AX9gA39+fwBgBH9/f38Bf2AFf39/f38AYAR/f39/AGAJf39/f39+fn9/AX9gBX9/f35/AX9gBX9/f39/AX9gAX8Bf2ADf39/AX9gB39/f39/f38AYAJ+fwAC5AEmAAEwAAcAATEACAABMgAJAAEzAAIAATQAAgABNQAEAAE2AAQAATcAAgABOAACAAE5AAoAAjEwAAIAAjExAAsAAjEyAAEAAjEzAAEAAjE0AAAAAjE1AAAAAjE2AAAAAjE3AAUAAjE4AAMAAjE5AAMAAjIwAAAAAjIxAAAAAjIyAAAAAjIzAAUAAjI0AAwAAjI1AAAAAjI2AAMAAjI3AAMAAjI4AAAAAjI5AAYAAjMwAAYAAjMxAAAAAjMyAA0AAjMzAAEAAjM0AAEAAjM1AAEAAjM2AAEACCRpbXBvcnRzAXABJSUJKwEAQQALJQABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fICEiIyQALwlwcm9kdWNlcnMBDHByb2Nlc3NlZC1ieQENd2l0LWNvbXBvbmVudAcwLjIzOS4w');
+    const module2 = base64Compile('AGFzbQEAAAABZw5gAn9/AGABfwBgAn9/AX9gA39+fwBgBH9/f38Bf2AFf39/f38AYAR/f39/AGAFf39/f38Bf2AJf39/f39+fn9/AX9gBX9/f35/AX9gAX8Bf2ADf39/AX9gB39/f39/f38AYAJ+fwADJiUHCAkCAgQEAgIKAgsBAQAAAAUDAwAAAAUMAAMDAAYGAA0BAQEBBAUBcAElJQe7ASYBMAAAATEAAQEyAAIBMwADATQABAE1AAUBNgAGATcABwE4AAgBOQAJAjEwAAoCMTEACwIxMgAMAjEzAA0CMTQADgIxNQAPAjE2ABACMTcAEQIxOAASAjE5ABMCMjAAFAIyMQAVAjIyABYCMjMAFwIyNAAYAjI1ABkCMjYAGgIyNwAbAjI4ABwCMjkAHQIzMAAeAjMxAB8CMzIAIAIzMwAhAjM0ACICMzUAIwIzNgAkCCRpbXBvcnRzAQAK+QMlEQAgACABIAIgAyAEQQARBwALGQAgACABIAIgAyAEIAUgBiAHIAhBAREIAAsRACAAIAEgAiADIARBAhEJAAsLACAAIAFBAxECAAsLACAAIAFBBBECAAsPACAAIAEgAiADQQURBAALDwAgACABIAIgA0EGEQQACwsAIAAgAUEHEQIACwsAIAAgAUEIEQIACwkAIABBCREKAAsLACAAIAFBChECAAsNACAAIAEgAkELEQsACwkAIABBDBEBAAsJACAAQQ0RAQALCwAgACABQQ4RAAALCwAgACABQQ8RAAALCwAgACABQRARAAALEQAgACABIAIgAyAEQRERBQALDQAgACABIAJBEhEDAAsNACAAIAEgAkETEQMACwsAIAAgAUEUEQAACwsAIAAgAUEVEQAACwsAIAAgAUEWEQAACxEAIAAgASACIAMgBEEXEQUACxUAIAAgASACIAMgBCAFIAZBGBEMAAsLACAAIAFBGREAAAsNACAAIAEgAkEaEQMACw0AIAAgASACQRsRAwALCwAgACABQRwRAAALDwAgACABIAIgA0EdEQYACw8AIAAgASACIANBHhEGAAsLACAAIAFBHxEAAAsLACAAIAFBIBENAAsJACAAQSERAQALCQAgAEEiEQEACwkAIABBIxEBAAsJACAAQSQRAQALAC8JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQHMC4yNDAuMA');
+    const module3 = base64Compile('AGFzbQEAAAABZw5gAn9/AGABfwBgAn9/AX9gA39+fwBgBH9/f38Bf2AFf39/f38AYAR/f39/AGAFf39/f38Bf2AJf39/f39+fn9/AX9gBX9/f35/AX9gAX8Bf2ADf39/AX9gB39/f39/f38AYAJ+fwAC5AEmAAEwAAcAATEACAABMgAJAAEzAAIAATQAAgABNQAEAAE2AAQAATcAAgABOAACAAE5AAoAAjEwAAIAAjExAAsAAjEyAAEAAjEzAAEAAjE0AAAAAjE1AAAAAjE2AAAAAjE3AAUAAjE4AAMAAjE5AAMAAjIwAAAAAjIxAAAAAjIyAAAAAjIzAAUAAjI0AAwAAjI1AAAAAjI2AAMAAjI3AAMAAjI4AAAAAjI5AAYAAjMwAAYAAjMxAAAAAjMyAA0AAjMzAAEAAjM0AAEAAjM1AAEAAjM2AAEACCRpbXBvcnRzAXABJSUJKwEAQQALJQABAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR4fICEiIyQALwlwcm9kdWNlcnMBDHByb2Nlc3NlZC1ieQENd2l0LWNvbXBvbmVudAcwLjI0MC4w');
     ({ exports: exports0 } = yield instantiateCore(yield module2));
     ({ exports: exports1 } = yield instantiateCore(yield module0, {
       wasi_snapshot_preview1: {
@@ -5180,10 +5323,10 @@ export const $init = (() => {
         fd_prestat_dir_name: exports0['11'],
         fd_prestat_get: exports0['10'],
         fd_read: exports0['5'],
-        fd_readdir: exports0['1'],
+        fd_readdir: exports0['2'],
         fd_write: exports0['6'],
-        path_filestat_get: exports0['2'],
-        path_open: exports0['0'],
+        path_filestat_get: exports0['0'],
+        path_open: exports0['1'],
         proc_exit: exports0['12'],
         random_get: exports0['3'],
       },
@@ -5266,8 +5409,8 @@ export const $init = (() => {
     ({ exports: exports3 } = yield instantiateCore(yield module3, {
       '': {
         $imports: exports0.$imports,
-        '0': exports2.path_open,
-        '1': exports2.fd_readdir,
+        '0': exports2.path_filestat_get,
+        '1': exports2.path_open,
         '10': exports2.fd_prestat_get,
         '11': exports2.fd_prestat_dir_name,
         '12': exports2.proc_exit,
@@ -5278,7 +5421,7 @@ export const $init = (() => {
         '17': trampoline15,
         '18': trampoline16,
         '19': trampoline17,
-        '2': exports2.path_filestat_get,
+        '2': exports2.fd_readdir,
         '20': trampoline18,
         '21': trampoline19,
         '22': trampoline20,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/jco",
-  "version": "1.15.1",
+  "version": "1.15.3",
   "description": "JavaScript tooling for working with WebAssembly Components",
   "homepage": "https://github.com/bytecodealliance/jco#readme",
   "author": "Guy Bedford",
@@ -71,7 +71,7 @@
     "prepack": "cargo xtask build release"
   },
   "dependencies": {
-    "@bytecodealliance/componentize-js": "^0.19.1",
+    "@bytecodealliance/componentize-js": "^0.19.3",
     "@bytecodealliance/preview2-shim": "^0.17.3",
     "binaryen": "^123.0.0",
     "commander": "^14",
@@ -92,6 +92,7 @@
     "semver": "^7.7.1",
     "smol-toml": "^1.4.2",
     "typescript": "^5.9.2",
-    "vitest": "^3.2.4"
+    "vitest": "^3.2.4",
+    "which": "^2.0.2"
   }
 }

package/src/jco.js

@@ -25,7 +25,7 @@ program
     )
     .usage('<command> [options]')
     .enablePositionalOptions()
-    .version('1.15.1');
+    .version('1.15.3');
 
 function myParseInt(value) {
     return parseInt(value, 10);