refactor: use direct fields for nextSibling and parent

Author: Varixo

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

@@ -51,8 +51,6 @@ import {
   vnode_applyJournal,
   vnode_createErrorDiv,
   vnode_getDomParent,
-  vnode_getNextSibling,
-  vnode_getParent,
   vnode_getProps,
   vnode_insertBefore,
   vnode_isElementVNode,
@@ -170,13 +168,13 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
     return inflateQRL(this, parseQRL(qrl)) as QRL<T>;
   }
 
-  handleError(err: any, host: HostElement | null): void {
+  handleError(err: any, host: VNode | null): void {
     if (qDev && host) {
       if (typeof document !== 'undefined') {
         const vHost = host as VirtualVNode;
         const journal: VNodeJournal = [];
-        const vHostParent = vnode_getParent(vHost) as VirtualVNode | ElementVNode | undefined;
-        const vHostNextSibling = vnode_getNextSibling(vHost);
+        const vHostParent = vHost.parent;
+        const vHostNextSibling = vHost.nextSibling as VNode | null;
         const vErrorDiv = vnode_createErrorDiv(document, vHost, err, journal);
         // If the host is an element node, we need to insert the error div into its parent.
         const insertHost = vnode_isElementVNode(vHost) ? vHostParent || vHost : vHost;
@@ -202,15 +200,15 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
     errorStore.error = err;
   }
 
-  setContext<T>(host: HostElement, context: ContextId<T>, value: T): void {
+  setContext<T>(host: VNode, context: ContextId<T>, value: T): void {
     let ctx = this.getHostProp<Array<string | unknown>>(host, QCtxAttr);
     if (ctx == null) {
       this.setHostProp(host, QCtxAttr, (ctx = []));
     }
     mapArray_set(ctx, context.id, value, 0, true);
   }
 
-  resolveContext<T>(host: HostElement, contextId: ContextId<T>): T | undefined {
+  resolveContext<T>(host: VNode, contextId: ContextId<T>): T | undefined {
     while (host) {
       const ctx = this.getHostProp<Array<string | unknown>>(host, QCtxAttr);
       if (ctx != null && mapArray_has(ctx, contextId.id, 0)) {
@@ -221,19 +219,19 @@ export class DomContainer extends _SharedContainer implements IClientContainer {
     return undefined;
   }
 
-  getParentHost(host: HostElement): HostElement | null {
-    let vNode = vnode_getParent(host as any);
+  getParentHost(host: VNode): VNode | null {
+    let vNode: VNode | null = host.parent;
     while (vNode) {
       if (vnode_isVirtualVNode(vNode)) {
         if (vNode.getProp(OnRenderProp, null) !== null) {
-          return vNode as any as HostElement;
+          return vNode;
         }
         vNode =
-          vnode_getParent(vNode) ||
+          vNode.parent ||
           // If virtual node, than it could be a slot so we need to read its parent.
-          vNode.getSlotParent();
+          vNode.slotParent;
       } else {
-        vNode = vnode_getParent(vNode);
+        vNode = vNode.parent;
       }
     }
     return null;

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

@@ -51,9 +51,7 @@ import {
   vnode_getDomParentVNode,
   vnode_getElementName,
   vnode_getFirstChild,
-  vnode_getNextSibling,
   vnode_getNode,
-  vnode_getParent,
   vnode_getProjectionParentComponent,
   vnode_getProps,
   vnode_getText,
@@ -270,22 +268,22 @@ export const vnode_diff = (
   /**
    * Advance the `vCurrent` to the next sibling.
    *
-   * Normally this is just `vCurrent = vnode_getNextSibling(vCurrent)`. However, this gets
-   * complicated if `retrieveChildWithKey` was called, because then we are consuming nodes out of
-   * order and can't rely on `vnode_getNextSibling` and instead we need to go by `vSiblings`.
+   * Normally this is just `vCurrent = vCurrent.nextSibling`. However, this gets complicated if
+   * `retrieveChildWithKey` was called, because then we are consuming nodes out of order and can't
+   * rely on `nextSibling` and instead we need to go by `vSiblings`.
    */
   function peekNextSibling() {
     // If we don't have a `vNewNode`, than that means we just reconciled the current node.
     // So advance it.
-    return vCurrent ? vnode_getNextSibling(vCurrent) : null;
+    return vCurrent ? (vCurrent.nextSibling as VNode | null) : null;
   }
 
   /**
    * Advance the `vCurrent` to the next sibling.
    *
-   * Normally this is just `vCurrent = vnode_getNextSibling(vCurrent)`. However, this gets
-   * complicated if `retrieveChildWithKey` was called, because then we are consuming nodes out of
-   * order and can't rely on `vnode_getNextSibling` and instead we need to go by `vSiblings`.
+   * Normally this is just `vCurrent = vCurrent.nextSibling`. However, this gets complicated if
+   * `retrieveChildWithKey` was called, because then we are consuming nodes out of order and can't
+   * rely on `nextSibling` and instead we need to go by `vSiblings`.
    */
   function advanceToNextSibling() {
     vCurrent = peekNextSibling();
@@ -534,7 +532,7 @@ export const vnode_diff = (
       let vChild: VNode | null = vFirstChild;
       while (vChild) {
         cleanup(container, vChild);
-        vChild = vnode_getNextSibling(vChild);
+        vChild = vChild.nextSibling as VNode | null;
       }
       vnode_truncate(journal, vCurrent as ElementVNode | VirtualVNode, vFirstChild);
     }
@@ -547,7 +545,7 @@ export const vnode_diff = (
       while (vCurrent) {
         const toRemove = vCurrent;
         advanceToNextSibling();
-        if (vParent === vnode_getParent(toRemove)) {
+        if (vParent === toRemove.parent) {
           cleanup(container, toRemove);
           // If we are diffing projection than the parent is not the parent of the node.
           // If that is the case we don't want to remove the node from the parent.
@@ -708,7 +706,7 @@ export const vnode_diff = (
     if (!isSameElementName || jsxKey !== getKey(vCurrent)) {
       // So we have a key and it does not match the current node.
       // We need to do a forward search to find it.
-      // The complication is that once we start taking nodes out of order we can't use `vnode_getNextSibling`
+      // The complication is that once we start taking nodes out of order we can't use `nextSibling`
       vNewNode = retrieveChildWithKey(elementName, jsxKey);
       if (vNewNode === null) {
         // No existing node with key exists, just create a new one.
@@ -962,7 +960,7 @@ export const vnode_diff = (
             vSiblings.set(name + ':' + vKey, vNode);
           }
         }
-        vNode = vnode_getNextSibling(vNode);
+        vNode = vNode.nextSibling as VNode | null;
       }
     } else {
       if (key === null) {
@@ -1129,7 +1127,7 @@ export const vnode_diff = (
               ) === null
             : true)
         ) {
-          componentHost = vnode_getParent(componentHost);
+          componentHost = componentHost.parent;
         }
 
         const jsxOutput = executeComponent(
@@ -1370,7 +1368,7 @@ export function cleanup(container: ClientContainer, vNode: VNode) {
               let projectionChild = vnode_getFirstChild(projection);
               while (projectionChild) {
                 cleanup(container, projectionChild);
-                projectionChild = vnode_getNextSibling(projectionChild);
+                projectionChild = projectionChild.nextSibling as VNode | null;
               }
 
               cleanupStaleUnclaimedProjection(container.$journal$, projection);
@@ -1403,7 +1401,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.getSlotParent();
+              vNode.slotParent;
             }
           });
           return;
@@ -1418,25 +1416,25 @@ export function cleanup(container: ClientContainer, vNode: VNode) {
       return;
     }
     // Out of children, go to next sibling
-    const vNextSibling = vnode_getNextSibling(vCursor);
+    const vNextSibling = vCursor.nextSibling as VNode | null;
     if (vNextSibling) {
       vCursor = vNextSibling;
       continue;
     }
 
     // Out of siblings, go to parent
-    vParent = vnode_getParent(vCursor);
+    vParent = vCursor.parent;
     while (vParent) {
       if (vParent === vNode) {
         // We are back where we started, we are done.
         return;
       }
-      const vNextParentSibling = vnode_getNextSibling(vParent);
+      const vNextParentSibling = vParent.nextSibling as VNode | null;
       if (vNextParentSibling) {
         vCursor = vNextParentSibling;
         break;
       }
-      vParent = vnode_getParent(vParent);
+      vParent = vParent.parent;
     }
     if (vParent == null) {
       // We are done.
@@ -1448,7 +1446,7 @@ export function cleanup(container: ClientContainer, vNode: VNode) {
 function cleanupStaleUnclaimedProjection(journal: VNodeJournal, projection: VNode) {
   // we are removing a node where the projection would go after slot render.
   // This is not needed, so we need to cleanup still unclaimed projection
-  const projectionParent = vnode_getParent(projection);
+  const projectionParent = projection.parent;
   if (projectionParent) {
     const projectionParentType = projectionParent.flags;
     if (

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

@@ -17,8 +17,6 @@ import {
   vnode_getDomParentVNode,
   vnode_getElementName,
   vnode_getFirstChild,
-  vnode_getNextSibling,
-  vnode_getParent,
   vnode_isElementVNode,
   vnode_isTextVNode,
   type VNodeJournal,
@@ -147,7 +145,7 @@ function vnode_cloneElementWithNamespace(
 
       // We need to check if the parent is a foreignObject element
       // and get a new namespace data.
-      const vCursorParent = vnode_getParent(vCursor);
+      const vCursorParent = vCursor.parent;
       // For the first vNode parentNode is not parent from vNode tree, but parent from DOM tree
       // this is because vNode is not moved yet.
       // rootElement is null only for the first vNode
@@ -206,24 +204,24 @@ function vnode_cloneElementWithNamespace(
       return rootElement;
     }
     // Out of children, go to next sibling
-    const vNextSibling = vnode_getNextSibling(vCursor);
+    const vNextSibling = vCursor.nextSibling as VNode | null;
     if (vNextSibling) {
       vCursor = vNextSibling;
       continue;
     }
     // Out of siblings, go to parent
-    vParent = vnode_getParent(vCursor);
+    vParent = vCursor.parent;
     while (vParent) {
       if (vParent === elementVNode) {
         // We are back where we started, we are done.
         return rootElement;
       }
-      const vNextParentSibling = vnode_getNextSibling(vParent);
+      const vNextParentSibling = vParent.nextSibling as VNode | null;
       if (vNextParentSibling) {
         vCursor = vNextParentSibling;
         return rootElement;
       }
-      vParent = vnode_getParent(vParent);
+      vParent = vParent.parent;
     }
     if (vParent == null) {
       // We are done.

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

@@ -434,24 +434,24 @@ export function vnode_walkVNode(
       return;
     }
     // Out of children, go to next sibling
-    const vNextSibling = vnode_getNextSibling(vCursor);
+    const vNextSibling = vCursor.nextSibling as VNode | null;
     if (vNextSibling) {
       vCursor = vNextSibling;
       continue;
     }
     // Out of siblings, go to parent
-    vParent = vnode_getParent(vCursor);
+    vParent = vCursor.parent;
     while (vParent) {
       if (vParent === vNode) {
         // We are back where we started, we are done.
         return;
       }
-      const vNextParentSibling = vnode_getNextSibling(vParent);
+      const vNextParentSibling = vParent.nextSibling as VNode | null;
       if (vNextParentSibling) {
         vCursor = vNextParentSibling;
         break;
       }
-      vParent = vnode_getParent(vParent);
+      vParent = vParent.parent;
     }
     if (vParent == null) {
       // We are done.
@@ -507,7 +507,7 @@ export function vnode_getDOMChildNodes(
         ? vnode_getDOMChildNodes(journal, vNode, true, childNodes as (ElementVNode | TextVNode)[])
         : vnode_getDOMChildNodes(journal, vNode, false, childNodes as (Element | Text)[]);
     }
-    vNode = vnode_getNextSibling(vNode);
+    vNode = vNode.nextSibling as VNode | null;
   }
   return childNodes;
 }
@@ -728,7 +728,7 @@ const vnode_getChildWithIdx = (vNode: VNode, childIdx: number): VNode => {
   let child = vnode_getFirstChild(vNode);
   assertDefined(child, 'Missing child.');
   while (child.flags >>> VNodeFlagsIndex.shift !== childIdx) {
-    child = vnode_getNextSibling(child);
+    child = child.nextSibling as VNode | null;
     assertDefined(child, 'Missing child.');
   }
   return child;
@@ -744,7 +744,7 @@ export const vnode_getVNodeForChildNode = (
   assertDefined(child, 'Missing child.');
   while (child && (child instanceof ElementVNode ? child.element !== childElement : true)) {
     if (vnode_isVirtualVNode(child)) {
-      const next = vnode_getNextSibling(child);
+      const next = child.nextSibling as VNode | null;
       const firstChild = vnode_getFirstChild(child);
       if (firstChild) {
         next && vNodeStack.push(next);
@@ -753,7 +753,7 @@ export const vnode_getVNodeForChildNode = (
         child = next || (vNodeStack.length ? vNodeStack.pop()! : null);
       }
     } else {
-      const next = vnode_getNextSibling(child);
+      const next = child.nextSibling as VNode | null;
       if (next) {
         child = next;
       } else {
@@ -1149,7 +1149,7 @@ export const vnode_getDomParentVNode = (
   includeProjection = true
 ): ElementVNode | null => {
   while (vnode && !vnode_isElementVNode(vnode)) {
-    vnode = vnode.parent || (includeProjection ? vnode.getSlotParent() : null)!;
+    vnode = vnode.parent || (includeProjection ? vnode.slotParent : null)!;
   }
   return vnode;
 };
@@ -1160,7 +1160,7 @@ export const vnode_remove = (
   vToRemove: VNode,
   removeDOM: boolean
 ) => {
-  assertEqual(vParent, vnode_getParent(vToRemove), 'Parent mismatch.');
+  assertEqual(vParent, vToRemove.parent, 'Parent mismatch.');
   if (vnode_isTextVNode(vToRemove)) {
     vnode_ensureTextInflated(journal, vToRemove);
   }
@@ -1208,7 +1208,7 @@ export const vnode_queryDomNodes = (
     let child = vnode_getFirstChild(vNode);
     while (child) {
       vnode_queryDomNodes(child, selector, cb);
-      child = vnode_getNextSibling(child);
+      child = child.nextSibling as VNode | null;
     }
   }
 };
@@ -1666,10 +1666,6 @@ export const vnode_getProps = (vnode: ElementVNode | VirtualVNode): unknown[] =>
   return vnode.props;
 };
 
-export const vnode_getParent = (vnode: VNode): VNode | null => {
-  return vnode.parent;
-};
-
 export const vnode_isDescendantOf = (vnode: VNode, ancestor: VNode): boolean => {
   let parent: VNode | null = vnode_getParentOrProjectionParent(vnode);
   while (parent) {
@@ -1781,7 +1777,7 @@ export function vnode_toString(
       }
       strings.push('</' + tag + '>');
     }
-    vnode = (siblings && vnode_getNextSibling(vnode)) || null;
+    vnode = (siblings && vnode.nextSibling) || null;
   } while (vnode);
   return strings.join('\n' + offset);
 }
@@ -1988,10 +1984,10 @@ export const vnode_getProjectionParentComponent = (
         // We found a projection, so we need to go up one more level.
         projectionDepth++;
       }
-      vHost = vProjectionParent || vnode_getParent(vHost)!;
+      vHost = vProjectionParent || vHost.parent!;
     }
     if (projectionDepth > 0) {
-      vHost = vnode_getParent(vHost)!;
+      vHost = vHost.parent!;
     }
   }
   return vHost as VirtualVNode | null;