wip: revert consumeFragmentStart changes

Author: edison1105

packages/runtime-vapor/src/apiCreateDynamicComponent.ts

@@ -26,11 +26,8 @@ import {
 } from './insertionState'
 import {
   advanceHydrationNode,
-  currentHydrationNode,
-  isComment,
   isHydrating,
   locateHydrationNode,
-  setCurrentHydrationNode,
 } from './dom/hydration'
 import { DynamicFragment, type VaporFragment } from './fragment'
 import type { KeepAliveInstance } from './components/KeepAlive'
@@ -73,11 +70,7 @@ export function createDynamicComponent(
 
         const frag = appContext.vapor.vdomMountVNode(value, currentInstance)
         if (isHydrating) {
-          const consumeFragmentStart = shouldConsumeFragmentStart(value)
-          locateHydrationNode()
-          if (consumeFragmentStart && isComment(currentHydrationNode!, '[')) {
-            setCurrentHydrationNode(currentHydrationNode!.nextSibling)
-          }
+          locateHydrationNode(shouldConsumeFragmentStart(value))
           frag.hydrate()
           if (_isLastInsertion) {
             advanceHydrationNode(_insertionParent!)

packages/runtime-vapor/src/apiCreateFor.ts

@@ -79,10 +79,7 @@ export const createFor = (
   const _insertionIndex = insertionIndex
   const _isLastInsertion = isLastInsertion
   if (isHydrating) {
-    locateHydrationNode()
-    if (isComment(currentHydrationNode!, '[')) {
-      setCurrentHydrationNode(currentHydrationNode!.nextSibling)
-    }
+    locateHydrationNode(true)
   } else {
     resetInsertionState()
   }

packages/runtime-vapor/src/apiCreateIf.ts

@@ -1,11 +1,8 @@
 import { type Block, type BlockFn, insert } from './block'
 import {
   advanceHydrationNode,
-  currentHydrationNode,
-  isComment,
   isHydrating,
   locateHydrationNode,
-  setCurrentHydrationNode,
 } from './dom/hydration'
 import {
   insertionAnchor,
@@ -35,12 +32,9 @@ export function createIf(
   if (once) {
     const ok = condition()
     if (isHydrating) {
-      const consumeFragmentStart =
-        decodeIfShape(blockShape!, ok) === VaporBlockShape.MULTI_ROOT
-      locateHydrationNode()
-      if (consumeFragmentStart && isComment(currentHydrationNode!, '[')) {
-        setCurrentHydrationNode(currentHydrationNode!.nextSibling)
-      }
+      locateHydrationNode(
+        decodeIfShape(blockShape!, ok) === VaporBlockShape.MULTI_ROOT,
+      )
     }
     frag = ok
       ? b1()
@@ -57,12 +51,9 @@ export function createIf(
     renderEffect(() => {
       const ok = condition()
       if (isHydrating) {
-        const consumeFragmentStart =
-          decodeIfShape(blockShape!, ok) === VaporBlockShape.MULTI_ROOT
-        locateHydrationNode()
-        if (consumeFragmentStart && isComment(currentHydrationNode!, '[')) {
-          setCurrentHydrationNode(currentHydrationNode!.nextSibling)
-        }
+        locateHydrationNode(
+          decodeIfShape(blockShape!, ok) === VaporBlockShape.MULTI_ROOT,
+        )
       }
       ;(frag as DynamicFragment).update(
         ok ? b1 : b2,

packages/runtime-vapor/src/dom/hydration.ts

@@ -207,7 +207,7 @@ export function enterHydration(node: Node): () => void {
 }
 
 export let adoptTemplate: (node: Node, template: string) => Node | null
-export let locateHydrationNode: () => void
+export let locateHydrationNode: (consumeFragmentStart?: boolean) => void
 
 type Anchor = Node & {
   // Runtime-created or reused preserve anchor that must stay in place during
@@ -280,7 +280,7 @@ export function locateNextNode(node: Node): Node | null {
       : _next(node)
 }
 
-function locateHydrationNodeImpl() {
+function locateHydrationNodeImpl(consumeFragmentStart = false) {
   let node: Node | null
 
   if (insertionIndex !== undefined) {
@@ -293,6 +293,11 @@ function locateHydrationNodeImpl() {
     node = currentHydrationNode
   }
 
+  // consume fragment start anchor if needed
+  if (consumeFragmentStart && node && isComment(node, '[')) {
+    node = node.nextSibling
+  }
+
   if (__DEV__ && !node) {
     throw new Error(
       `No current hydration node was found.\n` +
@@ -379,12 +384,13 @@ function handleMismatch(node: Node, template: string): Node {
     removeFragmentNodes(node)
   }
 
-  // Range-end markers and preserve anchors are structural boundaries, not
-  // replaceable content. New nodes must be inserted before them.
-  const shouldInsertBefore = isHydrationAnchor(node)
+  // Reused hydration anchors are structural boundaries, not replaceable
+  // content. Mismatch recovery inserts the new node before the anchor and
+  // keeps the anchor in place.
+  const shouldPreserveAnchor = isHydrationAnchor(node)
   const container = parentNode(node)!
-  const next = shouldInsertBefore ? node : _next(node)
-  if (!shouldInsertBefore) {
+  const next = shouldPreserveAnchor ? node : _next(node)
+  if (!shouldPreserveAnchor) {
     remove(node, container)
   }