wip: await all run qrls in wait_for_all

Author: wmertens

packages/qwik/src/core/shared/qrl/qrl-class.ts

@@ -138,14 +138,18 @@ export const createQRL = <TYPE>(
       return fn;
     }
     return function (this: unknown, ...args: QrlArgs<TYPE>) {
-      let context = tryGetInvokeContext();
-      if (context) {
-        return fn.apply(this, args);
-      }
-      context = newInvokeContext();
+      const context = tryGetInvokeContext() || newInvokeContext();
+      const prevQrl = context.$qrl$;
+      const prevEvent = context.$event$;
       context.$qrl$ = qrl;
+      // TODO do we use this?
       context.$event$ = this as Event;
-      return invoke.call(this, context, fn as any, ...args);
+      try {
+        return invoke.call(this, context, fn as any, ...args);
+      } finally {
+        context.$qrl$ = prevQrl;
+        context.$event$ = prevEvent;
+      }
     } as TYPE;
   };
 

packages/qwik/src/core/shared/scheduler.ts

@@ -177,6 +177,7 @@ export const createScheduler = (
   journalFlush: () => void
 ) => {
   const choreQueue: Chore[] = [];
+  const qrlRuns: Promise<any>[] = [];
 
   let currentChore: Chore | null = null;
   let drainScheduled: boolean = false;
@@ -323,6 +324,9 @@ export const createScheduler = (
       }
       executeChore(nextChore, isServer);
       if (nextChore === runUptoChore) {
+        if (nextChore.$type$ === ChoreType.WAIT_FOR_ALL && qrlRuns.length) {
+          return Promise.all(qrlRuns).then(() => drainUpTo(runUptoChore, isServer));
+        }
         break;
       }
     }
@@ -399,9 +403,15 @@ export const createScheduler = (
           try {
             const result = retryOnPromise(() => fn(...(chore.$payload$ as unknown[])));
             if (isPromise(result)) {
-              result.catch((error) => {
-                emitEvent('qerror', { error });
-              });
+              qrlRuns.push(
+                result
+                  .catch((error) => {
+                    emitEvent('qerror', { error });
+                  })
+                  .then(() => {
+                    qrlRuns.splice(qrlRuns.indexOf(result), 1);
+                  })
+              );
             }
           } catch (error) {
             emitEvent('qerror', { error });

packages/qwik/src/core/shared/utils/promises.ts

@@ -111,7 +111,7 @@ export function retryOnPromise<T>(
   fn: () => ValueOrPromise<T>,
   retryCount: number = 0
 ): ValueOrPromise<T> {
-  const retryOrThrow = (e: any) => {
+  const retryOrThrow = (e: any): ValueOrPromise<T> => {
     if (isPromise(e) && retryCount < MAX_RETRY_ON_PROMISE_COUNT) {
       return e.then(retryOnPromise.bind(null, fn, retryCount++)) as ValueOrPromise<T>;
     }