fix: object migration fixes

Author: Varixo

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

@@ -25,7 +25,6 @@ import {
   QLocaleAttr,
   QManifestHashAttr,
   QScopedStyle,
-  QSlotParent,
   QStyle,
   QStyleSelector,
   Q_PROPS_SEPARATOR,
@@ -232,7 +231,7 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
         vNode =
           vnode_getParent(vNode) ||
           // If virtual node, than it could be a slot so we need to read its parent.
-          vNode.getProp<VNode>(QSlotParent, this.vNodeLocate);
+          vNode.getSlotParent();
       } else {
         vNode = vnode_getParent(vNode);
       }
@@ -275,7 +274,7 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
           if (typeof value == 'string') {
             const projection = this.vNodeLocate(value);
             props[i + 1] = projection;
-            (projection as VirtualVNode).getProp(QSlotParent, (id) => this.vNodeLocate(id));
+            projection.getSlotParent();
           }
         }
       }

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

@@ -26,7 +26,6 @@ import {
   QContainerAttr,
   QDefaultSlot,
   QSlot,
-  QSlotParent,
   QBackRefs,
   QTemplate,
   Q_PREFIX,
@@ -450,7 +449,7 @@ export const vnode_diff = (
       isDev && (vNewNode as VirtualVNode).setProp(DEBUG_TYPE, VirtualType.Projection);
       isDev && (vNewNode as VirtualVNode).setProp('q:code', 'expectProjection');
       (vNewNode as VirtualVNode).setProp(QSlot, slotName);
-      (vNewNode as VirtualVNode).setProp(QSlotParent, vParent);
+      (vNewNode as VirtualVNode).slotParent = vParent;
       (vParent as VirtualVNode).setProp(slotName, vNewNode);
     }
   }
@@ -1404,9 +1403,7 @@ export function cleanup(container: ClientContainer, vNode: VNode) {
              */
             if (vNode.flags & VNodeFlags.Virtual) {
               // The QSlotParent is used to find the slot parent during scheduling
-              (vNode as VirtualVNode).getProp<string>(QSlotParent, (id) =>
-                vnode_locate(container.rootVNode, id)
-              );
+              vNode.getSlotParent();
             }
           });
           return;

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

@@ -10,10 +10,15 @@ import {
 /** @internal */
 export abstract class VNode {
   props: (string | null | boolean)[] | null = null;
+  slotParent: VNode | null = null;
+
+  getSlotParent(): VNode | null {
+    return this.slotParent;
+  }
 
   constructor(
     public flags: VNodeFlags,
-    public parent: ElementVNode | VirtualVNode | null | undefined,
+    public parent: ElementVNode | VirtualVNode | null,
     public previousSibling: VNode | null | undefined,
     public nextSibling: VNode | null | undefined
   ) {}
@@ -22,9 +27,9 @@ export abstract class VNode {
     const type = this.flags;
     if ((type & VNodeFlags.ELEMENT_OR_VIRTUAL_MASK) !== 0) {
       type & VNodeFlags.Element && vnode_ensureElementInflated(this);
+      this.props ||= [];
       const idx = mapApp_findIndx(this.props as any, key, 0);
       if (idx >= 0) {
-        this.props ||= [];
         let value = this.props[idx + 1] as any;
         if (typeof value === 'string' && getObject) {
           this.props[idx + 1] = value = getObject(value);
@@ -90,7 +95,7 @@ export abstract class VNode {
 export class TextVNode extends VNode {
   constructor(
     flags: VNodeFlags,
-    parent: ElementVNode | VirtualVNode | null | undefined,
+    parent: ElementVNode | VirtualVNode | null,
     previousSibling: VNode | null | undefined,
     nextSibling: VNode | null | undefined,
     public textNode: Text | null,
@@ -104,7 +109,7 @@ export class TextVNode extends VNode {
 export class VirtualVNode extends VNode {
   constructor(
     flags: VNodeFlags,
-    parent: ElementVNode | VirtualVNode | null | undefined,
+    parent: ElementVNode | VirtualVNode | null,
     previousSibling: VNode | null | undefined,
     nextSibling: VNode | null | undefined,
     public firstChild: VNode | null | undefined,
@@ -118,7 +123,7 @@ export class VirtualVNode extends VNode {
 export class ElementVNode extends VirtualVNode {
   constructor(
     flags: VNodeFlags,
-    parent: ElementVNode | VirtualVNode | null | undefined,
+    parent: ElementVNode | VirtualVNode | null,
     previousSibling: VNode | null | undefined,
     nextSibling: VNode | null | undefined,
     firstChild: VNode | null | undefined,

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

@@ -147,7 +147,6 @@ import {
   QIgnoreEnd,
   QScopedStyle,
   QSlot,
-  QSlotParent,
   QStyle,
   QStylesAllSelector,
 } from '../shared/utils/markers';
@@ -1150,11 +1149,7 @@ export const vnode_getDomParentVNode = (
   includeProjection = true
 ): ElementVNode | null => {
   while (vnode && !vnode_isElementVNode(vnode)) {
-    vnode =
-      vnode.parent ||
-      (includeProjection
-        ? vnode.getProp(QSlotParent, (id) => (vnode_isVNode(id) ? id : null))
-        : null)!;
+    vnode = vnode.parent || (includeProjection ? vnode.getSlotParent() : null)!;
   }
   return vnode;
 };
@@ -1672,38 +1667,27 @@ export const vnode_getProps = (vnode: ElementVNode | VirtualVNode): unknown[] =>
 };
 
 export const vnode_getParent = (vnode: VNode): VNode | null => {
-  return vnode.parent || null;
+  return vnode.parent!;
 };
 
-export const vnode_isDescendantOf = (
-  vnode: VNode,
-  ancestor: VNode,
-  rootVNode: ElementVNode | null
-): boolean => {
-  let parent: VNode | null = vnode_getParentOrProjectionParent(vnode, rootVNode);
+export const vnode_isDescendantOf = (vnode: VNode, ancestor: VNode): boolean => {
+  let parent: VNode | null = vnode_getParentOrProjectionParent(vnode);
   while (parent) {
     if (parent === ancestor) {
       return true;
     }
-    parent = vnode_getParentOrProjectionParent(parent, rootVNode);
+    parent = vnode_getParentOrProjectionParent(parent);
   }
   return false;
 };
 
-export const vnode_getParentOrProjectionParent = (
-  vnode: VNode,
-  rootVNode: ElementVNode | null
-): VNode | null => {
-  if (rootVNode) {
-    const parentProjection: VNode | null = vnode.getProp(QSlotParent, (id) =>
-      vnode_locate(rootVNode, id)
-    );
-    if (parentProjection) {
-      // This is a projection, so we need to check the parent of the projection
-      return parentProjection;
-    }
+export const vnode_getParentOrProjectionParent = (vnode: VNode): VNode | null => {
+  const parentProjection: VNode | null = vnode.slotParent;
+  if (parentProjection) {
+    // This is a projection, so we need to check the parent of the projection
+    return parentProjection;
   }
-  return vnode_getParent(vnode);
+  return vnode.parent;
 };
 
 export const vnode_getNode = (vnode: VNode | null): Element | Text | null => {
@@ -1894,7 +1878,10 @@ function materializeFromVNodeData(
       }
       setEffectBackRefFromVNodeData(vParent, consumeValue(), container);
     } else if (peek() === VNodeDataChar.SLOT_PARENT) {
-      vParent.setProp(QSlotParent, consumeValue());
+      if (!container) {
+        container = getDomContainer(element);
+      }
+      vParent.slotParent = vnode_locate(container!.rootVNode, consumeValue());
     } else if (peek() === VNodeDataChar.CONTEXT) {
       vParent.setAttr(QCtxAttr, consumeValue(), null);
     } else if (peek() === VNodeDataChar.OPEN) {
@@ -1995,9 +1982,7 @@ export const vnode_getProjectionParentComponent = (
       vHost &&
       (vnode_isVirtualVNode(vHost) ? vHost.getProp(OnRenderProp, null) === null : true)
     ) {
-      const qSlotParent = vHost.getProp<VNode | null>(QSlotParent, (id) =>
-        vnode_locate(rootVNode, id)
-      );
+      const qSlotParent = vHost.getSlotParent();
       const vProjectionParent = vnode_isVirtualVNode(vHost) && qSlotParent;
       if (vProjectionParent) {
         // We found a projection, so we need to go up one more level.

packages/qwik/src/core/client/vnode.unit.tsx

@@ -415,10 +415,10 @@ describe('vnode', () => {
     });
     it('should place attributes on Virtual', () => {
       parent.innerHTML = ``;
-      document.qVNodeData.set(parent, '{?:sparent_@:key_}');
+      document.qVNodeData.set(parent, '{@:key_}');
       expect(vParent).toMatchVDOM(
         <test>
-          <Fragment {...({ 'q:sparent': ':sparent_' } as any)} key=":key_" />
+          <Fragment key=":key_" />
         </test>
       );
     });

packages/qwik/src/core/qwik.core.api.md

@@ -1845,6 +1845,8 @@ export abstract class _VNode {
     // (undocumented)
     getProp<T>(key: string, getObject: ((id: string) => any) | null): T | null;
     // (undocumented)
+    getSlotParent(): _VNode | null;
+    // (undocumented)
     nextSibling: _VNode | null | undefined;
     // (undocumented)
     parent: _ElementVNode | _VirtualVNode | null | undefined;
@@ -1857,6 +1859,8 @@ export abstract class _VNode {
     // (undocumented)
     setProp(key: string, value: any): void;
     // (undocumented)
+    slotParent: _VNode | null;
+    // (undocumented)
     toString(): string;
 }
 

packages/qwik/src/core/shared/scheduler-document-position.ts

@@ -1,7 +1,6 @@
-import { vnode_getNextSibling, vnode_getPreviousSibling, vnode_locate } from '../client/vnode';
+import { vnode_getNextSibling, vnode_getPreviousSibling } from '../client/vnode';
 import type { ElementVNode, VNode } from '../client/vnode-impl';
 import type { ISsrNode } from '../ssr/ssr-types';
-import { QSlotParent } from './utils/markers';
 
 /// These global variables are used to avoid creating new arrays for each call to `vnode_documentPosition`.
 const aVNodePath: VNode[] = [];
@@ -27,13 +26,11 @@ export const vnode_documentPosition = (
   let bDepth = -1;
   while (a) {
     const vNode = (aVNodePath[++aDepth] = a);
-    a = (vNode.parent ||
-      (rootVNode && a.getProp(QSlotParent, (id) => vnode_locate(rootVNode, id))))!;
+    a = (vNode.parent || a.slotParent)!;
   }
   while (b) {
     const vNode = (bVNodePath[++bDepth] = b);
-    b = (vNode.parent ||
-      (rootVNode && b.getProp(QSlotParent, (id) => vnode_locate(rootVNode, id))))!;
+    b = (vNode.parent || b.slotParent)!;
   }
 
   while (aDepth >= 0 && bDepth >= 0) {
@@ -59,7 +56,7 @@ export const vnode_documentPosition = (
           return -1;
         }
       } while (cursor);
-      if (rootVNode && b.getProp(QSlotParent, (id) => vnode_locate(rootVNode, id))) {
+      if (b.slotParent) {
         // The "b" node is a projection, so we need to set it after "a" node,
         // because the "a" node could be a context provider.
         return -1;

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

@@ -29,17 +29,17 @@ const VISIBLE_BLOCKING_RULES: BlockingRule[] = [
   {
     blockedType: ChoreType.VISIBLE,
     blockingType: ChoreType.NODE_DIFF,
-    match: (blocked, blocking, container) =>
-      isDescendant(blocked, blocking, container) || isDescendant(blocking, blocked, container),
+    match: (blocked, blocking) =>
+      isDescendant(blocked, blocking) || isDescendant(blocking, blocked),
   },
   // COMPONENT blocks VISIBLE on same host
   // if the blocked chore is a child of the blocking chore
   // or the blocked chore is a sibling of the blocking chore
   {
     blockedType: ChoreType.VISIBLE,
     blockingType: ChoreType.COMPONENT,
-    match: (blocked, blocking, container) =>
-      isDescendant(blocked, blocking, container) || isDescendant(blocking, blocked, container),
+    match: (blocked, blocking) =>
+      isDescendant(blocked, blocking) || isDescendant(blocking, blocked),
   },
 ];
 
@@ -103,17 +103,13 @@ const BLOCKING_RULES: BlockingRule[] = [
   },
 ];
 
-function isDescendant(descendantChore: Chore, ancestorChore: Chore, container: Container): boolean {
+function isDescendant(descendantChore: Chore, ancestorChore: Chore): boolean {
   const descendantHost = descendantChore.$host$;
   const ancestorHost = ancestorChore.$host$;
   if (!vnode_isVNode(descendantHost) || !vnode_isVNode(ancestorHost)) {
     return false;
   }
-  return vnode_isDescendantOf(
-    descendantHost,
-    ancestorHost,
-    (container as ClientContainer).rootVNode
-  );
+  return vnode_isDescendantOf(descendantHost, ancestorHost);
 }
 
 function isSameHost(a: Chore, b: Chore): boolean {
@@ -134,7 +130,7 @@ function findBlockingChoreInQueue(
     if (candidate.$type$ >= ChoreType.VISIBLE || candidate.$type$ === ChoreType.TASK) {
       continue;
     }
-    if (isDescendant(chore, candidate, container)) {
+    if (isDescendant(chore, candidate)) {
       return candidate;
     }
   }
@@ -152,22 +148,14 @@ export function findBlockingChore(
   if (blockingChoreInChoreQueue) {
     return blockingChoreInChoreQueue;
   }
-  const blockingChoreInBlockedChores = findBlockingChoreInQueue(
-    chore,
-    Array.from(blockedChores),
-    container
-  );
-  if (blockingChoreInBlockedChores) {
-    return blockingChoreInBlockedChores;
-  }
-  const blockingChoreInRunningChores = findBlockingChoreInQueue(
-    chore,
-    Array.from(runningChores),
-    container
-  );
-  if (blockingChoreInRunningChores) {
-    return blockingChoreInRunningChores;
-  }
+  // const blockingChoreInBlockedChores = findBlockingChoreInQueue(
+  //   chore,
+  //   Array.from(blockedChores),
+  //   container
+  // );
+  // if (blockingChoreInBlockedChores) {
+  //   return blockingChoreInBlockedChores;
+  // }
 
   for (const rule of BLOCKING_RULES) {
     if (chore.$type$ !== rule.blockedType) {

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

@@ -3,7 +3,7 @@ import { findBlockingChore, findBlockingChoreForVisible } from './scheduler-rule
 import { ChoreType } from './util-chore-type';
 import { addBlockedChore, type Chore } from './scheduler';
 import { Task, TaskFlags } from '../use/use-task';
-import { ELEMENT_SEQ, QSlotParent } from './utils/markers';
+import { ELEMENT_SEQ } from './utils/markers';
 import type { Container } from './types';
 import { vnode_newVirtual } from '../client/vnode';
 import { $, type QRL } from './qrl/qrl.public';
@@ -630,7 +630,7 @@ describe('findBlockingChore', () => {
       const childProjectionVNode = vnode_newVirtual();
       parentProjectionVNode.parent = rootVNode;
       parentProjectionVNode.setProp('', childProjectionVNode);
-      childProjectionVNode.setProp(QSlotParent, parentProjectionVNode);
+      childProjectionVNode.slotParent = parentProjectionVNode;
       const ancestorProjectionChore = createMockChore(ChoreType.COMPONENT, parentProjectionVNode);
       const descendantProjectionChore = createMockChore(ChoreType.COMPONENT, childProjectionVNode);
       const choreQueue = [ancestorProjectionChore];