@bytecodealliance/jco 1.17.4 → 1.17.5

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

@@ -2051,10 +2051,52 @@ function _lowerImportBackwardsCompat(args) {
     importFn,
   } = args;
   
-  const { taskID } = _getGlobalCurrentTaskMeta(componentIdx);
+  let meta = _getGlobalCurrentTaskMeta(componentIdx);
+  let createdTask;
+  
+  // Some components depend on initialization logic (i.e. `_initialize` or some such
+  // core wasm export) that is embedded in the component, but is not executed or wizer'd
+  // away before the transpiled component is attempted to be used.
+  //
+  // These components execut their initialization logic *when they are imported* in the
+  // transpiled context -- so we may get a call to an export that is lowered without going
+  // through `CallWasm` or `CallInterface`.
+  //
+  if (!meta) {
+    if (funcTypeIsAsync || (isAsync && !isManualAsync)) {
+      throw new Error('p3 async wasm exports cannot use backwards compat auto-task init');
+    }
+    
+    const [newTask, newTaskID] = createNewCurrentTask({
+      componentIdx,
+      isAsync,
+      isManualAsync,
+      callingWasmExport: false,
+    });
+    createdTask = newTask;
+    
+    // Since we're managing the task creation ourselves we must clear ourselves
+    createdTask.registerOnResolveHandler(() => {
+      _clearCurrentTask({
+        taskID: task.id(),
+        componentIdx: task.componentIdx(),
+      });
+    });
+    
+    _setGlobalCurrentTaskMeta({
+      componentIdx,
+      taskID: newTaskID,
+    });
+    
+    meta = _getGlobalCurrentTaskMeta(componentIdx);
+  }
+  
+  const { taskID } = meta;
   
   const taskMeta = getCurrentTask(componentIdx, taskID);
-  if (!taskMeta) { throw new Error('invalid/missing async task meta'); }
+  if (!taskMeta) {
+    throw new Error('invalid/missing async task meta');
+  }
   
   const task = taskMeta.task;
   if (!task) { throw new Error('invalid/missing async task'); }
@@ -2098,13 +2140,20 @@ function _lowerImportBackwardsCompat(args) {
     // TODO(breaking): remove once we get rid of manual async import specification,
     // as func types cannot be detected in that case only (and we don't need that w/ p3)
     if (!isManualAsync && !isAsync && !funcTypeIsAsync) {
+      if (createdTask) { createdTask.enterSync(); }
+      
       const res = importFn(...params);
+      
       // TODO(breaking): remove once we get rid of manual async import specification,
       // as func types cannot be detected in that case only (and we don't need that w/ p3)
       if (!funcTypeIsAsync && !subtask.isReturned()) {
         throw new Error('post-execution subtasks must either be async or returned');
       }
-      return subtask.getResult();
+      
+      const syncRes = subtask.getResult();
+      if (createdTask) { createdTask.resolve([syncRes]); }
+      
+      return syncRes;
     }
     
     // Sync-lowered async functions requires async behavior because the callee *can* block,
@@ -2173,10 +2222,16 @@ function _lowerImportBackwardsCompat(args) {
     queueMicrotask(async () => {
       try {
         _debugLog('[_lowerImportBackwardsCompat()] calling lowered import', { importFn, params });
-        const res = await importFn(...params);
+        if (createdTask) { await createdTask.enter(); }
+        
+        const asyncRes = await importFn(...params);
         if (requiresManualAsyncResult) {
           manualAsyncResult.resolve(subtask.getResult());
         }
+        
+        if (createdTask) { createdTask.resolve([asyncRes]); }
+        
+        
       } catch (err) {
         _debugLog("[_lowerImportBackwardsCompat()] import fn error:", err);
         if (requiresManualAsyncResult) {

package/obj/wasm-tools.js

@@ -2051,10 +2051,52 @@ function _lowerImportBackwardsCompat(args) {
     importFn,
   } = args;
   
-  const { taskID } = _getGlobalCurrentTaskMeta(componentIdx);
+  let meta = _getGlobalCurrentTaskMeta(componentIdx);
+  let createdTask;
+  
+  // Some components depend on initialization logic (i.e. `_initialize` or some such
+  // core wasm export) that is embedded in the component, but is not executed or wizer'd
+  // away before the transpiled component is attempted to be used.
+  //
+  // These components execut their initialization logic *when they are imported* in the
+  // transpiled context -- so we may get a call to an export that is lowered without going
+  // through `CallWasm` or `CallInterface`.
+  //
+  if (!meta) {
+    if (funcTypeIsAsync || (isAsync && !isManualAsync)) {
+      throw new Error('p3 async wasm exports cannot use backwards compat auto-task init');
+    }
+    
+    const [newTask, newTaskID] = createNewCurrentTask({
+      componentIdx,
+      isAsync,
+      isManualAsync,
+      callingWasmExport: false,
+    });
+    createdTask = newTask;
+    
+    // Since we're managing the task creation ourselves we must clear ourselves
+    createdTask.registerOnResolveHandler(() => {
+      _clearCurrentTask({
+        taskID: task.id(),
+        componentIdx: task.componentIdx(),
+      });
+    });
+    
+    _setGlobalCurrentTaskMeta({
+      componentIdx,
+      taskID: newTaskID,
+    });
+    
+    meta = _getGlobalCurrentTaskMeta(componentIdx);
+  }
+  
+  const { taskID } = meta;
   
   const taskMeta = getCurrentTask(componentIdx, taskID);
-  if (!taskMeta) { throw new Error('invalid/missing async task meta'); }
+  if (!taskMeta) {
+    throw new Error('invalid/missing async task meta');
+  }
   
   const task = taskMeta.task;
   if (!task) { throw new Error('invalid/missing async task'); }
@@ -2098,13 +2140,20 @@ function _lowerImportBackwardsCompat(args) {
     // TODO(breaking): remove once we get rid of manual async import specification,
     // as func types cannot be detected in that case only (and we don't need that w/ p3)
     if (!isManualAsync && !isAsync && !funcTypeIsAsync) {
+      if (createdTask) { createdTask.enterSync(); }
+      
       const res = importFn(...params);
+      
       // TODO(breaking): remove once we get rid of manual async import specification,
       // as func types cannot be detected in that case only (and we don't need that w/ p3)
       if (!funcTypeIsAsync && !subtask.isReturned()) {
         throw new Error('post-execution subtasks must either be async or returned');
       }
-      return subtask.getResult();
+      
+      const syncRes = subtask.getResult();
+      if (createdTask) { createdTask.resolve([syncRes]); }
+      
+      return syncRes;
     }
     
     // Sync-lowered async functions requires async behavior because the callee *can* block,
@@ -2173,10 +2222,16 @@ function _lowerImportBackwardsCompat(args) {
     queueMicrotask(async () => {
       try {
         _debugLog('[_lowerImportBackwardsCompat()] calling lowered import', { importFn, params });
-        const res = await importFn(...params);
+        if (createdTask) { await createdTask.enter(); }
+        
+        const asyncRes = await importFn(...params);
         if (requiresManualAsyncResult) {
           manualAsyncResult.resolve(subtask.getResult());
         }
+        
+        if (createdTask) { createdTask.resolve([asyncRes]); }
+        
+        
       } catch (err) {
         _debugLog("[_lowerImportBackwardsCompat()] import fn error:", err);
         if (requiresManualAsyncResult) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bytecodealliance/jco",
-    "version": "1.17.4",
+    "version": "1.17.5",
     "description": "JavaScript tooling for working with WebAssembly Components",
     "keywords": [
         "Component",