feat(cursors): fix apply journal

Author: Varixo

packages/qwik/src/core/shared/cursor/cursor-flush.ts

@@ -24,7 +24,7 @@ export function executeFlushPhase(cursor: Cursor, container: Container): void {
 
 function flushChanges(vNode: VNode): void {
   const journal = getCursorJournal(vNode);
-  if (!journal) {
+  if (!journal || journal.length === 0) {
     return;
   }
   for (const operation of journal) {
@@ -74,7 +74,7 @@ function flushChanges(vNode: VNode): void {
       }
     }
   }
-  setCursorJournal(vNode, []);
+  setCursorJournal(vNode, null);
 }
 
 function executeAfterFlush(container: Container, cursor: Cursor): void {

packages/qwik/src/core/shared/cursor/cursor-props.ts

@@ -205,7 +205,7 @@ export function getCursorContainer(vNode: VNode): Container | null {
  * @param vNode - The vNode
  * @param journal - The journal to set
  */
-export function setCursorJournal(vNode: VNode, journal: VNodeJournal): void {
+export function setCursorJournal(vNode: VNode, journal: VNodeJournal | null): void {
   const props = (vNode.props ||= {});
   props[CURSOR_JOURNAL_KEY] = journal;
 }

packages/qwik/src/core/shared/cursor/cursor-walker.ts

@@ -28,7 +28,7 @@ import {
   setCursorJournal,
 } from './cursor-props';
 import { ChoreBits } from '../vnode/enums/chore-bits.enum';
-import { getHighestPriorityCursor, removeCursorFromQueue } from './cursor-queue';
+import { addCursorToQueue, getHighestPriorityCursor, removeCursorFromQueue } from './cursor-queue';
 import { executeFlushPhase } from './cursor-flush';
 import { createNextTick } from '../platform/next-tick';
 import { isPromise } from '../utils/promises';
@@ -97,11 +97,6 @@ export function walkCursor(cursor: Cursor, options: WalkOptions): void {
   const isServer = isServerPlatform();
   const startTime = performance.now();
 
-  // Check if cursor is already complete
-  if (!cursor.dirty) {
-    return;
-  }
-
   // Check if cursor is blocked by a promise
   const blockingPromise = getVNodePromise(cursor);
   if (blockingPromise) {
@@ -111,6 +106,12 @@ export function walkCursor(cursor: Cursor, options: WalkOptions): void {
   const container = getCursorContainer(cursor);
   assertDefined(container, 'Cursor container not found');
 
+  // Check if cursor is already complete
+  if (!cursor.dirty) {
+    finishWalk(container, cursor, isServer);
+    return;
+  }
+
   let journal = getCursorJournal(cursor);
   if (!journal) {
     journal = [];
@@ -188,6 +189,7 @@ export function walkCursor(cursor: Cursor, options: WalkOptions): void {
       DEBUG && console.warn('walkCursor: blocking promise', currentVNode.toString());
       // Store promise on cursor and pause
       setVNodePromise(cursor, result);
+      removeCursorFromQueue(cursor);
 
       const host = currentVNode;
       result
@@ -197,6 +199,7 @@ export function walkCursor(cursor: Cursor, options: WalkOptions): void {
         })
         .finally(() => {
           setVNodePromise(cursor, null);
+          addCursorToQueue(container, cursor);
           triggerCursors();
         });
     }

packages/qwik/src/core/ssr/ssr-render-component.ts

@@ -35,6 +35,7 @@ export const applyQwikComponentBody = (
   if (jsx.key !== null) {
     host.setProp(ELEMENT_KEY, jsx.key);
   }
-  const componentChore = ssr.$scheduler$(ChoreType.COMPONENT, host, componentQrl, srcProps);
-  return getChorePromise(componentChore);
+  return executeComponent(ssr, host, host, componentQrl, srcProps);
+  // const componentChore = ssr.$scheduler$(ChoreType.COMPONENT, host, componentQrl, srcProps);
+  // return getChorePromise(componentChore);
 };

packages/qwik/src/server/ssr-render.ts

@@ -89,7 +89,7 @@ export const renderToStream = async (
 
   await setServerPlatform(opts, resolvedManifest);
   await ssrContainer.render(jsx);
-  await ssrContainer.$scheduler$(ChoreType.WAIT_FOR_QUEUE).$returnValue$;
+  // await ssrContainer.$scheduler$(ChoreType.WAIT_FOR_QUEUE).$returnValue$;
 
   // Flush remaining chunks in the buffer
   flush();