feat(cursors): fix test utils and marking parents as dirty for operation

Author: Varixo

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

@@ -1135,9 +1135,9 @@ export const vnode_insertBefore = (
 
   const parentIsDeleted = parent.flags & VNodeFlags.Deleted;
 
+  let adjustedInsertBefore: VNode | null = null;
   // if the parent is deleted, then we don't need to insert the new child
   if (!parentIsDeleted) {
-    let adjustedInsertBefore: VNode | null = null;
     if (insertBefore == null) {
       if (vnode_isVirtualVNode(parent)) {
         // If `insertBefore` is null, than we need to insert at the end of the list.
@@ -1153,17 +1153,6 @@ export const vnode_insertBefore = (
       adjustedInsertBefore = insertBefore;
     }
     adjustedInsertBefore && vnode_ensureInflatedIfText(adjustedInsertBefore);
-
-    // Here we know the insertBefore node
-    if (domChildren && domChildren.length) {
-      for (const child of domChildren) {
-        addVNodeOperation(child, {
-          operationType: VNodeOperationType.InsertOrMove,
-          parent: parentNode!,
-          target: vnode_getNode(adjustedInsertBefore),
-        });
-      }
-    }
   }
 
   // link newChild into the previous/next list
@@ -1185,6 +1174,17 @@ export const vnode_insertBefore = (
   if (parentIsDeleted) {
     // if the parent is deleted, then the new child is also deleted
     newChild.flags |= VNodeFlags.Deleted;
+  } else {
+    // Here we know the insertBefore node
+    if (domChildren && domChildren.length) {
+      for (const child of domChildren) {
+        addVNodeOperation(child, {
+          operationType: VNodeOperationType.InsertOrMove,
+          parent: parentNode!,
+          target: vnode_getNode(adjustedInsertBefore),
+        });
+      }
+    }
   }
 };
 

packages/qwik/src/core/shared/vnode/vnode-dirty.ts

@@ -54,11 +54,16 @@ export function addVNodeOperation(
 ): void {
   vNode.operation = operation;
 
+  let child: VNode = vNode;
   let parent: VNode | null = vNode.parent || vNode.slotParent;
-  while (parent && !(parent.dirty & ChoreBits.DIRTY_MASK)) {
+  while (
+    parent &&
+    !(parent.dirty & ChoreBits.DIRTY_MASK && parent.dirtyChildren?.includes(child))
+  ) {
     parent.dirtyChildren ||= [];
-    parent.dirtyChildren.push(vNode);
+    parent.dirtyChildren.push(child);
     parent.dirty |= ChoreBits.CHILDREN;
+    child = parent;
     parent = parent.parent || parent.slotParent;
   }
 }

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

@@ -20,10 +20,11 @@ export abstract class VNode extends BackRef {
     super();
   }
 
-  toString(): string {
-    if (isDev) {
-      return vnode_toString.call(this);
-    }
-    return String(this);
-  }
+  // TODO: this creates debug issues
+  // toString(): string {
+  //   if (isDev) {
+  //     return vnode_toString.call(this);
+  //   }
+  //   return String(this);
+  // }
 }

packages/qwik/src/testing/element-fixture.ts

@@ -8,9 +8,7 @@ import { QFuncsPrefix, QInstanceAttr } from '../core/shared/utils/markers';
 import { delay } from '../core/shared/utils/promises';
 import { invokeApply, newInvokeContextFromTuple } from '../core/use/use-core';
 import { createWindow } from './document';
-import { getTestPlatform } from './platform';
 import type { MockDocument, MockWindow } from './types';
-import { ChoreType } from '../core/shared/util-chore-type';
 
 /**
  * Creates a simple DOM structure for testing components.
@@ -132,9 +130,8 @@ export async function trigger(
     const attrName = prefix + fromCamelToKebabCase(eventName);
     await dispatch(element, attrName, event, scope);
   }
-  const waitForQueueChore = container?.$scheduler$(ChoreType.WAIT_FOR_QUEUE);
-  if (waitForIdle && waitForQueueChore) {
-    await waitForQueueChore.$returnValue$;
+  if (waitForIdle && container) {
+    await container.$renderPromise$;
   }
 }
 
@@ -198,10 +195,8 @@ export const dispatch = async (
 
 export async function advanceToNextTimerAndFlush(container: Container) {
   vi.advanceTimersToNextTimer();
-  const waitForQueueChore = container.$scheduler$(ChoreType.WAIT_FOR_QUEUE);
-  await getTestPlatform().flush();
-  if (waitForQueueChore) {
-    await waitForQueueChore.$returnValue$;
+  if (container) {
+    await container.$renderPromise$;
   }
 }