fix: early return if chore is already running

Author: Varixo

.changeset/poor-peaches-roll.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': patch
+---
+
+fix: correct running chores handling edge case

packages/qwik/src/core/shared/scheduler-journal-block.unit.tsx

@@ -30,7 +30,7 @@ describe('should block journal flush during node-diff and component runs', () =>
   let vA: ElementVNode = null!;
   let vAHost: VirtualVNode = null!;
   let choreQueue: ChoreArray;
-  let blockedChores: Set<Chore>;
+  let blockedChores: ChoreArray;
   let runningChores: Set<Chore>;
 
   async function waitForDrain() {
@@ -44,7 +44,7 @@ describe('should block journal flush during node-diff and component runs', () =>
     const container = getDomContainer(document.body);
     container.handleError = vi.fn();
     choreQueue = new ChoreArray();
-    blockedChores = new Set();
+    blockedChores = new ChoreArray();
     runningChores = new Set();
     scheduler = createScheduler(
       container,

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

@@ -355,6 +355,13 @@ This is often caused by modifying a signal in an already rendered component duri
       chore.$type$ !== ChoreType.QRL_RESOLVE && chore.$type$ !== ChoreType.RUN_QRL;
 
     if (shouldBlock) {
+      const runningChore = getRunningChore(chore);
+      if (runningChore) {
+        if (isResourceChore(runningChore)) {
+          addBlockedChore(chore, runningChore, blockedChores);
+        }
+        return chore;
+      }
       const blockingChore = findBlockingChore(
         chore,
         choreQueue,
@@ -366,12 +373,6 @@ This is often caused by modifying a signal in an already rendered component duri
         addBlockedChore(chore, blockingChore, blockedChores);
         return chore;
       }
-
-      const runningChore = getRunningChore(chore);
-      if (runningChore) {
-        addBlockedChore(chore, runningChore, blockedChores);
-        return chore;
-      }
     }
 
     addChoreAndIncrementBlockingCounter(chore, choreQueue);
@@ -890,19 +891,20 @@ function vNodeAlreadyDeleted(chore: Chore): boolean {
   return !!(chore.$host$ && vnode_isVNode(chore.$host$) && chore.$host$.flags & VNodeFlags.Deleted);
 }
 
+function isResourceChore(chore: Chore): boolean {
+  return (
+    chore.$type$ === ChoreType.TASK &&
+    !!chore.$payload$ &&
+    !!((chore.$payload$ as Task).$flags$ & TaskFlags.RESOURCE)
+  );
+}
+
 export function addBlockedChore(
   blockedChore: Chore,
   blockingChore: Chore,
   blockedChores: ChoreArray
 ): void {
-  if (
-    !(
-      blockedChore.$type$ === ChoreType.TASK &&
-      blockedChore.$payload$ &&
-      (blockedChore.$payload$ as Task).$flags$ & TaskFlags.RESOURCE
-    ) &&
-    choreComparator(blockedChore, blockingChore) === 0
-  ) {
+  if (!isResourceChore(blockedChore) && choreComparator(blockedChore, blockingChore) === 0) {
     return;
   }
   DEBUG &&

packages/qwik/src/core/shared/scheduler.unit.tsx

@@ -1159,6 +1159,26 @@ describe('scheduler', () => {
       nextTickSpy.mockRestore();
     });
   });
+
+  it('should early return if chore is already running', async () => {
+    const mockHost = vnode_newVirtual();
+    mockHost.setProp('q:id', 'test-host');
+    const mockQrl = { $hash$: 'test-qrl-hash' } as any;
+
+    // Create and start a chore
+    const chore1 = scheduler(ChoreType.COMPONENT, mockHost as any, mockQrl, null);
+    runningChores.add(chore1!);
+    choreQueue.length = 0;
+    expect(choreQueue.length).toBe(0);
+
+    // Schedule the same chore again
+    scheduler(ChoreType.COMPONENT, mockHost as any, mockQrl, null);
+
+    // still 0
+    expect(choreQueue.length).toBe(0);
+    expect(blockedChores.length).toBe(0);
+    expect(runningChores.size).toBe(1);
+  });
 });
 
 function mockTask(host: VNode, opts: { index?: number; qrl?: QRL; visible?: boolean }): Task {

packages/qwik/src/core/shared/shared-container.ts

@@ -37,7 +37,7 @@ export abstract class _SharedContainer implements Container {
     };
 
     const choreQueue = new ChoreArray();
-    const blockedChores = new Set<Chore>();
+    const blockedChores = new ChoreArray();
     const runningChores = new Set<Chore>();
     this.$scheduler$ = createScheduler(
       this,