fixup qrl run error handling

Author: wmertens

packages/qwik/src/core/client/dom-container.ts

@@ -1,18 +1,20 @@
 /** @file Public APIs for the SSR */
 
 import { assertTrue } from '../shared/error/assert';
+import { QError, qError } from '../shared/error/error';
+import { ERROR_CONTEXT, isRecoverable } from '../shared/error/error-handling';
 import { getPlatform } from '../shared/platform/platform';
 import type { QRL } from '../shared/qrl/qrl.public';
-import { ERROR_CONTEXT, isRecoverable } from '../shared/error/error-handling';
-import type { ContextId } from '../use/use-context';
+import { ChoreType } from '../shared/scheduler';
+import { _SharedContainer } from '../shared/shared-container';
+import { inflateQRL, parseQRL, wrapDeserializerProxy } from '../shared/shared-serialization';
+import { QContainerValue, type HostElement, type ObjToProxyMap } from '../shared/types';
 import { EMPTY_ARRAY } from '../shared/utils/flyweight';
 import {
   ELEMENT_PROPS,
   ELEMENT_SEQ,
   ELEMENT_SEQ_IDX,
-  getQFuncs,
   OnRenderProp,
-  Q_PROPS_SEPARATOR,
   QBaseAttr,
   QContainerAttr,
   QContainerSelector,
@@ -23,19 +25,18 @@ import {
   QStyle,
   QStyleSelector,
   QSubscribers,
+  Q_PROPS_SEPARATOR,
   USE_ON_LOCAL_SEQ_IDX,
+  getQFuncs,
 } from '../shared/utils/markers';
 import { isPromise } from '../shared/utils/promises';
 import { isSlotProp } from '../shared/utils/prop';
 import { qDev } from '../shared/utils/qdev';
-import { ChoreType } from '../shared/scheduler';
 import {
   convertScopedStyleIdsToArray,
   convertStyleIdsToString,
 } from '../shared/utils/scoped-styles';
-import { _SharedContainer } from '../shared/shared-container';
-import { inflateQRL, parseQRL, wrapDeserializerProxy } from '../shared/shared-serialization';
-import { QContainerValue, type HostElement, type ObjToProxyMap } from '../shared/types';
+import type { ContextId } from '../use/use-context';
 import { processVNodeData } from './process-vnode-data';
 import {
   VNodeFlags,
@@ -65,7 +66,6 @@ import {
   vnode_setProp,
   type VNodeJournal,
 } from './vnode';
-import { QError, qError } from '../shared/error/error';
 
 /** @public */
 export function getDomContainer(element: Element | VNode): IClientContainer {
@@ -190,7 +190,7 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
   }
 
   handleError(err: any, host: HostElement): void {
-    if (qDev) {
+    if (qDev && host) {
       // Clean vdom
       if (typeof document !== 'undefined') {
         const vHost = host as VirtualVNode;
@@ -215,7 +215,7 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
         throw err;
       }
     }
-    const errorStore = this.resolveContext(host, ERROR_CONTEXT);
+    const errorStore = host && this.resolveContext(host, ERROR_CONTEXT);
     if (!errorStore) {
       throw err;
     }

packages/qwik/src/core/client/queue-qrl.ts

@@ -23,5 +23,5 @@ export const queueQRL = (...args: unknown[]) => {
     throw qError(QError.schedulerNotFound);
   }
 
-  return scheduler(ChoreType.RUN_QRL, null, runQrl, args);
+  return scheduler(ChoreType.RUN_QRL, el, runQrl, args);
 };

packages/qwik/src/core/client/vnode-diff.ts

@@ -766,7 +766,7 @@ export const vnode_diff = (
             if (qrl) {
               const value = container.$scheduler$(
                 ChoreType.RUN_QRL,
-                null,
+                element,
                 qrl as QRLInternal<(...args: unknown[]) => unknown>,
                 [event, element]
               ) as unknown;

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

@@ -89,7 +89,7 @@ import {
   type ElementVNode,
   type VirtualVNode,
 } from '../client/types';
-import { VNodeJournalOpCode, vnode_isVNode, vnode_setAttr } from '../client/vnode';
+import { VNodeJournalOpCode, vnode_isVNode, vnode_locate, vnode_setAttr } from '../client/vnode';
 import { vnode_diff } from '../client/vnode-diff';
 import { triggerEffects, type ComputedSignal, type WrappedSignal } from '../signal/signal';
 import { isSignal, type Signal } from '../signal/signal.public';
@@ -214,7 +214,7 @@ export const createScheduler = (
   ): ValueOrPromise<void>;
   function schedule(
     type: ChoreType.RUN_QRL,
-    ignore: null,
+    host: Element,
     target: QRLInternal<(...args: unknown[]) => unknown>,
     args: unknown[]
   ): ValueOrPromise<void>;
@@ -240,7 +240,7 @@ export const createScheduler = (
   ///// IMPLEMENTATION /////
   function schedule(
     type: ChoreType,
-    hostOrTask: HostElement | Task | null = null,
+    hostOrTask: HostElement | Task | Element | null = null,
     targetOrQrl: ChoreTarget | string | null = null,
     payload: any = null
   ): ValueOrPromise<any> {
@@ -325,9 +325,8 @@ export const createScheduler = (
           qrlRuns.length
         ) {
           return Promise.all(qrlRuns)
-            .catch((e) => {
-              // TODO test this and add host prop to error
-              container.handleError(e, null!);
+            .catch(() => {
+              // they are already handled by the qrl runs
             })
             .then(() => drainUpTo(runUptoChore, isServer));
         }
@@ -430,9 +429,23 @@ export const createScheduler = (
                   qrlRuns.splice(qrlRuns.indexOf(handled), 1);
                 })
                 .catch((error) => {
+                  // TODO test this
+                  const host = isDomContainer(container)
+                    ? vnode_locate(container.rootVNode, chore.$host$ as any as Element)
+                    : null!;
                   container.handleError(error, host);
                 });
+              // Don't wait for the promise to resolve
+              // TODO come up with a better solution, we also want concurrent signal handling with tasks but serial tasks
               qrlRuns.push(handled);
+              DEBUG &&
+                debugTrace('execute.DONE (but still running)', chore, currentChore, choreQueue);
+              chore.$returnValue$ = handled;
+              chore.$resolve$?.(handled);
+              currentChore = null;
+              chore.$executed$ = true;
+              // early out so we don't call after()
+              return;
             }
             returnValue = null;
           }