fix: ret definition, test failure

Author: vados-cosmonic

crates/js-component-bindgen/src/function_bindgen.rs

@@ -254,7 +254,7 @@ impl FunctionBindgen<'_> {
     ///
     fn write_result_assignment(&mut self, amt: usize, results: &mut Vec<String>) {
         match amt {
-            0 => {}
+            0 => uwrite!(self.src, "let ret;"),
             1 => {
                 uwrite!(self.src, "let ret = ");
                 results.push("ret".to_string());

crates/js-component-bindgen/src/intrinsics/p3/async_task.rs

@@ -1347,27 +1347,21 @@ impl AsyncTaskIntrinsic {
 
                         const callbackFnName = task.getCallbackFnName();
 
-                        // TODO: how can we know whether this is a Promise? (due to WebAssembly.promising, because async)
-                        // BUT, attempting to await this promising with a host import that is async fails with
-                        // 'trying to suspend JS frames'
                         callbackResult = await callbackResult;
+                        if (callbackResult === undefined) {{ return; }}
 
                         let callbackCode;
                         let waitableSetRep;
                         let unpacked;
-                        if (callbackResult !== undefined) {{
-                            if (!({i32_typecheck}(callbackResult))) {{
-                                throw new Error('invalid callback result [' + callbackResult + '], not a number');
-                            }}
-                            if (callbackResult < 0 || callbackResult > 3) {{
-                                throw new Error('invalid async return value, outside callback code range');
-                            }}
-                            unpacked = {unpack_callback_result_fn}(callbackResult);
-                            callbackCode = unpacked[0];
-                            waitableSetRep = unpacked[1];
-                        }} else {{
-                            throw new Error('NO INTIIAL CALLBACK RESULT');
+                        if (!({i32_typecheck}(callbackResult))) {{
+                            throw new Error('invalid callback result [' + callbackResult + '], not a number');
+                        }}
+                        if (callbackResult < 0 || callbackResult > 3) {{
+                            throw new Error('invalid async return value, outside callback code range');
                         }}
+                        unpacked = {unpack_callback_result_fn}(callbackResult);
+                        callbackCode = unpacked[0];
+                        waitableSetRep = unpacked[1];
 
                         let eventCode;
                         let index;

crates/js-component-bindgen/src/intrinsics/p3/host.rs

@@ -144,18 +144,22 @@ impl HostIntrinsic {
                             throw new Error(`task component idx [${{ currentCallerTask.componentIdx() }}] differs from caller [${{ callerInstanceIdx }}] (callee ${{ calleeInstanceIdx }})`);
                         }}
 
-                        const directParams = storagePtr === -1;
+                        // TODO: support direct params based on storagePtr/args
+                        const directParams = true;
                         let getCalleeParamsFn;
                         if (directParams) {{
                             const directParamsArr = argArray.slice(8);
                             getCalleeParamsFn = () => directParamsArr;
                         }} else {{
-                            if (memoryIdx === null) {{ throw new Error('memory index not supplied to prepare depsite indirect params being used'); }}
+                            if (memoryIdx === null) {{ throw new Error('memory idx not supplied to prepare depsite indirect params being used'); }}
 
                             // TODO: call startFn() which lifts parameters into given space
                             //
                             // TODO: if we're using indirect params/the max number of params,
                             // then the last param is actually a return pointer?
+                            //
+                            // storagePtr can come in as -2 (likely packed)
+                            // storageLen can come in as a value like 1193328 (and then the wasm-sent params)
                             throw new Error(`indirect parameter loading not yet supported`);
                         }}
 

packages/jco/test/p3/ported/wasmtime/component-async/post-return.js

@@ -101,7 +101,6 @@ suite('post-return async sleep scenario', () => {
             });
             const instance = res.instance;
             cleanup = res.cleanup;
-            console.log("FOLDER:", res.outputDir);
 
             const result = await instance['local:local/sleep-post-return'].asyncRun(waitTimeMs);
             expect(result).toBeUndefined();