@vidact/runtime 0.2.0-beta.0 → 0.2.0-beta.5

package/dist/hydration.js

@@ -1,489 +1,476 @@
-import { HydrationMismatch, installHydrationOperations, } from './hydration-bridge.js';
-const HYDRATION_PREFIX = 'vidact:v1';
+import { HydrationMismatch, installHydrationOperations } from "./hydration-bridge.js";
+//#region src/hydration.ts
 let activeHydration;
 let activeInsertionPoint;
-const hydrationFragments = new WeakMap();
-export function beginHydration(host) {
-    if (activeHydration !== undefined) {
-        throw new Error('a Vidact hydration is already active');
-    }
-    const ranges = scanRanges(host);
-    const root = ranges.roots[0];
-    if (root === undefined || ranges.roots.length !== 1) {
-        throw mismatch('expected exactly one vidact:v1 root marker range');
-    }
-    activeHydration = {
-        host,
-        root,
-        components: ranges.components,
-        claimedElements: new WeakSet(),
-        elementComponents: collectElementComponents(host),
-        elements: collectPostorderElements(root),
-        cursors: new WeakMap([[host, root[0].nextSibling]]),
-        slots: new WeakMap(),
-        componentIndex: 0,
-        claimedElementCount: 0,
-        pendingStructuralParents: 0,
-        activeComponentStart: undefined,
-    };
-    return () => {
-        activeHydration = undefined;
-    };
-}
-export function finishHydration() {
-    const state = requireHydration();
-    if (state.componentIndex !== state.components.length) {
-        throw mismatch(`claimed ${state.componentIndex} of ${state.components.length} server component ranges`);
-    }
-    if (state.claimedElementCount !== state.elements.length) {
-        throw mismatch(`claimed ${state.claimedElementCount} of ${state.elements.length} server elements`);
-    }
-    const rootCursor = cursor(state, state.host);
-    if (rootCursor !== state.root[1]) {
-        throw mismatch(`compiled root did not consume the complete server root range; stopped at ${JSON.stringify(markerValue(rootCursor) ?? rootCursor?.nodeName ?? null)}`);
-    }
-}
-export function hydrationRootMarkers() {
-    return requireHydration().root;
-}
-export function isHydrating() {
-    return activeHydration !== undefined;
-}
-export function createHydrationFragment(children) {
-    const fragment = document.createDocumentFragment();
-    hydrationFragments.set(fragment, children);
-    return fragment;
-}
-export function hydrationFragmentChildren(fragment) {
-    return hydrationFragments.get(fragment);
-}
-export function isHydrationMismatch(error) {
-    return error instanceof HydrationMismatch;
-}
-export function claimHydrationElement(localName, namespace, matchesExpected) {
-    const state = activeHydration;
-    if (state === undefined)
-        return undefined;
-    const candidates = state.elements.filter((candidate) => !state.claimedElements.has(candidate) &&
-        (state.activeComponentStart === undefined ||
-            state.elementComponents.get(candidate) === state.activeComponentStart) &&
-        candidate.localName === localName &&
-        candidate.namespaceURI === namespace);
-    const expectedMatches = matchesExpected === undefined ? candidates : candidates.filter(matchesExpected);
-    const matches = expectedMatches.length === 0 ? candidates : expectedMatches;
-    const element = state.pendingStructuralParents > 0
-        ? (matches.find(containsArrayMarker) ?? matches[0])
-        : matches[0];
-    if (element === undefined) {
-        throw mismatch(state.pendingStructuralParents > 0
-            ? `missing server structural parent <${localName}>`
-            : `missing server element <${localName}>`);
-    }
-    if (state.pendingStructuralParents > 0)
-        state.pendingStructuralParents = 0;
-    state.claimedElements.add(element);
-    state.claimedElementCount += 1;
-    state.cursors.set(element, element.firstChild);
-    return element;
-}
-export function noteHydrationStructuralParent() {
-    if (activeHydration !== undefined)
-        activeHydration.pendingStructuralParents += 1;
-}
-export function claimHydrationComponentRange() {
-    const state = activeHydration;
-    if (state === undefined)
-        return undefined;
-    const range = state.components[state.componentIndex];
-    if (range === undefined)
-        throw mismatch('missing server component marker range');
-    state.componentIndex += 1;
-    const parent = range[0].parentNode;
-    if (parent === null || range[1].parentNode !== parent) {
-        throw mismatch('server component marker range is detached');
-    }
-    return range;
-}
-export function withHydrationComponentRange(range, operation) {
-    const state = activeHydration;
-    if (state === undefined)
-        return operation();
-    const previous = state.activeComponentStart;
-    state.activeComponentStart = range[0];
-    try {
-        return operation();
-    }
-    finally {
-        state.activeComponentStart = previous;
-    }
-}
-export function withHydrationCursor(parent, value, operation) {
-    const state = activeHydration;
-    if (state === undefined)
-        return operation();
-    const hadCursor = state.cursors.has(parent);
-    const previous = state.cursors.get(parent) ?? null;
-    state.cursors.set(parent, value);
-    try {
-        return operation();
-    }
-    finally {
-        if (hadCursor)
-            state.cursors.set(parent, previous);
-        else
-            state.cursors.delete(parent);
-    }
-}
-export function claimHydrationNode(parent, node) {
-    const state = activeHydration;
-    if (state === undefined)
-        return false;
-    enterHydrationSlot(state, parent);
-    const next = cursor(state, parent);
-    if (isMarker(next, `${HYDRATION_PREFIX}:s`)) {
-        const end = findClosingSibling(next, `${HYDRATION_PREFIX}:s`);
-        if (next.nextSibling !== node || node.nextSibling !== end) {
-            throw mismatch(`server node range does not contain exactly the expected ${node.nodeName}`);
-        }
-        setHydrationCursor(state, parent, end.nextSibling);
-        return true;
-    }
-    if (next !== node) {
-        throw mismatch(`expected existing ${node.nodeName} at the current hydration position`);
-    }
-    setHydrationCursor(state, parent, node.nextSibling);
-    return true;
-}
-export function claimHydrationComponentMount(parent, start, end) {
-    const state = activeHydration;
-    if (state === undefined)
-        return false;
-    enterHydrationSlot(state, parent);
-    const current = cursor(state, parent);
-    if ((current !== start && current !== end) ||
-        start.parentNode !== parent ||
-        end.parentNode !== parent) {
-        throw mismatch('server component range does not match the compiled child position');
-    }
-    setHydrationCursor(state, parent, end.nextSibling);
-    return true;
-}
-export function claimHydrationText(parent, expected) {
-    return claimHydrationTextRange(parent, expected)?.[2];
-}
-export function claimHydrationTextRange(parent, expected) {
-    const state = activeHydration;
-    if (state === undefined)
-        return undefined;
-    enterHydrationSlot(state, parent);
-    const start = cursor(state, parent);
-    if (!isMarker(start, `${HYDRATION_PREFIX}:t`)) {
-        throw mismatch('expected a vidact:v1 text marker');
-    }
-    const end = findClosingSibling(start, `${HYDRATION_PREFIX}:t`);
-    const nodes = [];
-    for (let node = start.nextSibling; node !== null && node !== end; node = node.nextSibling) {
-        nodes.push(node);
-    }
-    if (nodes.length > 1 || (nodes.length === 1 && !(nodes[0] instanceof Text))) {
-        throw mismatch('server text marker must contain at most one text node');
-    }
-    const text = nodes[0] ?? null;
-    if ((text?.data ?? '') !== expected) {
-        throw mismatch(`server text ${JSON.stringify(text?.data ?? '')} does not match ${JSON.stringify(expected)}`);
-    }
-    setHydrationCursor(state, parent, end.nextSibling);
-    return [start, end, text];
-}
-export function claimHydrationArrayRange(parent) {
-    const state = activeHydration;
-    if (state === undefined)
-        return undefined;
-    enterHydrationSlot(state, parent);
-    const start = cursor(state, parent);
-    if (!isMarker(start, `${HYDRATION_PREFIX}:a`)) {
-        throw mismatch(`expected a vidact:v1 array marker in ${parent.nodeName}; found ${JSON.stringify(markerValue(start) ?? start?.nodeName ?? null)}`);
-    }
-    const end = findClosingSibling(start, `${HYDRATION_PREFIX}:a`);
-    state.cursors.set(parent, start.nextSibling);
-    return [start, end];
-}
-export function finishHydrationArrayRange(parent, end) {
-    const state = requireHydration();
-    if (cursor(state, parent) !== end) {
-        throw mismatch('compiled collection did not consume its complete server array range');
-    }
-    setHydrationCursor(state, parent, end.nextSibling);
-}
-export function claimHydrationSlotRange(parent) {
-    const state = activeHydration;
-    if (state === undefined)
-        return undefined;
-    const start = cursor(state, parent);
-    if (!isMarker(start, `${HYDRATION_PREFIX}:b`)) {
-        throw mismatch(`expected a vidact:v1 child-slot marker in ${parent.nodeName}; found ${JSON.stringify(markerValue(start) ?? start?.nodeName ?? null)} after ${JSON.stringify(markerValue(start?.previousSibling) ?? start?.previousSibling?.nodeName ?? null)}; insertion=${JSON.stringify(markerValue(activeInsertionPoint?.[1]) ?? activeInsertionPoint?.[1]?.nodeName ?? null)}`);
-    }
-    const end = findClosingSibling(start, `${HYDRATION_PREFIX}:b`);
-    const slots = state.slots.get(parent) ?? [];
-    slots.push(end);
-    state.slots.set(parent, slots);
-    state.cursors.set(parent, start.nextSibling);
-    return [start, end];
-}
-export function borrowHydrationSlotRange(parent, current) {
-    const state = activeHydration;
-    if (state === undefined)
-        return undefined;
-    const start = (current ? cursor(state, parent) : cursor(state, parent)?.previousSibling);
-    if (!isMarker(start, `${HYDRATION_PREFIX}:b`))
-        return undefined;
-    if (!current &&
-        activeInsertionPoint?.[0] === parent &&
-        isMarker(activeInsertionPoint[1], `/${HYDRATION_PREFIX}:b`)) {
-        return [start, activeInsertionPoint[1]];
-    }
-    return [start, findClosingSibling(start, `${HYDRATION_PREFIX}:b`)];
-}
-export function claimHydrationSuspenseFallback(parent) {
-    const state = activeHydration;
-    if (state === undefined)
-        return undefined;
-    const marker = cursor(state, parent);
-    if (!isMarker(marker, `${HYDRATION_PREFIX}:p`))
-        return undefined;
-    setHydrationCursor(state, parent, marker.nextSibling);
-    return marker;
-}
-export function withoutHydration(operation) {
-    const previous = activeHydration;
-    activeHydration = undefined;
-    try {
-        return operation();
-    }
-    finally {
-        activeHydration = previous;
-    }
-}
-export function withHydrationInsertion(parent, before, operation) {
-    if (activeHydration === undefined)
-        return operation();
-    const previous = activeInsertionPoint;
-    activeInsertionPoint = [parent, before];
-    try {
-        return operation();
-    }
-    finally {
-        activeInsertionPoint = previous;
-    }
-}
-export function hydrationInsertionPoint() {
-    return activeInsertionPoint;
-}
-export function hydrationCursor(parent) {
-    const state = activeHydration;
-    return state === undefined ? undefined : cursor(state, parent);
-}
-export function hydrationRangeParent(start, end) {
-    if (activeHydration === undefined)
-        return undefined;
-    const parent = start.parentNode;
-    if (parent === null || end.parentNode !== parent)
-        throw mismatch('detached server marker range');
-    return parent;
+const hydrationFragments = /* @__PURE__ */ new WeakMap();
+function beginHydration(host) {
+	if (activeHydration !== void 0) throw new Error("a Vidact hydration is already active");
+	const ranges = scanRanges(host);
+	const root = ranges.roots[0];
+	if (root === void 0 || ranges.roots.length !== 1) throw mismatch(`expected exactly one v2 root marker range`);
+	activeHydration = {
+		host,
+		root,
+		components: ranges.components,
+		claimedElements: /* @__PURE__ */ new WeakSet(),
+		elementComponents: collectElementComponents(host),
+		elements: collectPostorderElements(root),
+		cursors: new WeakMap([[host, root[0].nextSibling]]),
+		slots: /* @__PURE__ */ new WeakMap(),
+		componentIndex: 0,
+		claimedElementCount: 0,
+		pendingStructuralParents: 0,
+		activeComponentStart: void 0
+	};
+	return () => {
+		activeHydration = void 0;
+	};
+}
+function finishHydration() {
+	const state = requireHydration();
+	if (state.componentIndex !== state.components.length) throw mismatch(`claimed ${state.componentIndex} of ${state.components.length} server component ranges`);
+	if (state.claimedElementCount !== state.elements.length) throw mismatch(`claimed ${state.claimedElementCount} of ${state.elements.length} server elements`);
+	const rootCursor = cursor(state, state.host);
+	if (rootCursor !== state.root[1]) throw mismatch(`compiled root did not consume the complete server root range; stopped at ${JSON.stringify(markerValue(rootCursor) ?? rootCursor?.nodeName ?? null)}`);
+}
+function hydrationRootMarkers() {
+	return requireHydration().root;
+}
+function isHydrating() {
+	return activeHydration !== void 0;
+}
+function createHydrationFragment(children) {
+	const fragment = document.createDocumentFragment();
+	hydrationFragments.set(fragment, children);
+	return fragment;
+}
+function hydrationFragmentChildren(fragment) {
+	return hydrationFragments.get(fragment);
+}
+function isHydrationMismatch(error) {
+	return error instanceof HydrationMismatch;
+}
+function claimHydrationElement(localName, namespace, matchesExpected) {
+	const state = activeHydration;
+	if (state === void 0) return void 0;
+	const candidates = state.elements.filter((candidate) => !state.claimedElements.has(candidate) && (state.activeComponentStart === void 0 || state.elementComponents.get(candidate) === state.activeComponentStart) && candidate.localName === localName && candidate.namespaceURI === namespace);
+	const expectedMatches = matchesExpected === void 0 ? candidates : candidates.filter(matchesExpected);
+	const matches = expectedMatches.length === 0 ? candidates : expectedMatches;
+	const element = state.pendingStructuralParents > 0 ? matches.find(containsArrayMarker) ?? matches[0] : matches[0];
+	if (element === void 0) throw mismatch(state.pendingStructuralParents > 0 ? `missing server structural parent <${localName}>` : `missing server element <${localName}>`);
+	if (state.pendingStructuralParents > 0) state.pendingStructuralParents = 0;
+	state.claimedElements.add(element);
+	state.claimedElementCount += 1;
+	state.cursors.set(element, initialCursor(element));
+	return element;
+}
+/**
+* Called by a compiled list right before its container element is claimed. Lists are the
+* only structural bindings whose server markup carries an `a` marker, so they are the
+* only ones that may prefer a candidate containing one — for a conditional, Suspense or
+* any other structural child that bias would pick an unrelated element that happens to
+* hold a list (see `claimHydrationElement`).
+*/
+function noteHydrationStructuralParent() {
+	if (activeHydration !== void 0) activeHydration.pendingStructuralParents += 1;
+}
+function claimHydrationComponentRange() {
+	const state = activeHydration;
+	if (state === void 0) return void 0;
+	const range = state.components[state.componentIndex];
+	if (range === void 0) throw mismatch("missing server component marker range");
+	state.componentIndex += 1;
+	const parent = range[0].parentNode;
+	if (parent === null || range[1].parentNode !== parent) throw mismatch("server component marker range is detached");
+	return range;
+}
+function withHydrationComponentRange(range, operation) {
+	const state = activeHydration;
+	if (state === void 0) return operation();
+	const previous = state.activeComponentStart;
+	state.activeComponentStart = range[0];
+	try {
+		return operation();
+	} finally {
+		state.activeComponentStart = previous;
+	}
+}
+function withHydrationCursor(parent, value, operation) {
+	const state = activeHydration;
+	if (state === void 0) return operation();
+	const hadCursor = state.cursors.has(parent);
+	const previous = state.cursors.get(parent) ?? null;
+	state.cursors.set(parent, value);
+	try {
+		return operation();
+	} finally {
+		if (hadCursor) state.cursors.set(parent, previous);
+		else state.cursors.delete(parent);
+	}
+}
+function claimHydrationNode(parent, node) {
+	const state = activeHydration;
+	if (state === void 0) return false;
+	enterHydrationSlot(state, parent);
+	if (cursor(state, parent) !== node) throw mismatch(`expected existing ${node.nodeName} at the current hydration position`);
+	setHydrationCursor(state, parent, node.nextSibling);
+	return true;
+}
+function claimHydrationComponentMount(parent, start, end) {
+	const state = activeHydration;
+	if (state === void 0) return false;
+	enterHydrationSlot(state, parent);
+	const current = cursor(state, parent);
+	if (current !== start && current !== end || start.parentNode !== parent || end.parentNode !== parent) throw mismatch("server component range does not match the compiled child position");
+	setHydrationCursor(state, parent, end.nextSibling);
+	return true;
+}
+function claimHydrationText(parent, expected) {
+	const state = activeHydration;
+	if (state === void 0) return void 0;
+	enterHydrationSlot(state, parent);
+	return claimTextPrefix(state, parent, expected);
+}
+/**
+* Claims the text for a scalar binding together with a range it can later swap an
+* element or collection into. The server emits no markers around text, so the binding
+* borrows the enclosing child-slot markers when the slot holds exactly this text — the
+* common case, and no DOM is touched. A text node shared with adjacent scalars (one
+* parsed node for several array items) gets fresh anchor comments instead.
+*/
+function claimHydrationTextRange(parent, expected) {
+	const state = activeHydration;
+	if (state === void 0) return void 0;
+	enterHydrationSlot(state, parent);
+	const at = cursor(state, parent);
+	const slotStart = at === null ? parent.lastChild : at.previousSibling;
+	const text = claimTextPrefix(state, parent, expected);
+	const slotEnd = text === null ? at : text.nextSibling;
+	if (isMarker(slotStart, `v2:b`) && isMarker(slotEnd, `/v2:b`) && findClosingSibling(slotStart, `v2:b`) === slotEnd) return [
+		slotStart,
+		slotEnd,
+		text
+	];
+	const start = document.createComment("");
+	const end = document.createComment("");
+	const reference = text ?? at;
+	parent.insertBefore(start, reference);
+	parent.insertBefore(end, text === null ? reference : text.nextSibling);
+	return [
+		start,
+		end,
+		text
+	];
+}
+/**
+* The server renders a scalar as bare text, and nothing at all for an empty one. Adjacent
+* scalars in one collection parse into a single text node, so a claim takes only its own
+* prefix and splits the rest off for the next claim.
+*/
+function claimTextPrefix(state, parent, expected) {
+	const node = cursor(state, parent);
+	if (expected === "") {
+		if (node instanceof Text && node.data === "") {
+			setHydrationCursor(state, parent, node.nextSibling);
+			return node;
+		}
+		setHydrationCursor(state, parent, node);
+		return null;
+	}
+	if (!(node instanceof Text)) throw mismatch(`expected server text ${JSON.stringify(expected)} in ${describeNode(parent)}; found ${describeNode(node)}`);
+	if (!node.data.startsWith(expected)) throw mismatch(`server text ${JSON.stringify(node.data)} does not match ${JSON.stringify(expected)}`);
+	if (node.data.length > expected.length) node.splitText(expected.length);
+	setHydrationCursor(state, parent, node.nextSibling);
+	return node;
+}
+function claimHydrationArrayRange(parent) {
+	const state = activeHydration;
+	if (state === void 0) return void 0;
+	enterHydrationSlot(state, parent);
+	const start = cursor(state, parent);
+	if (!isMarker(start, `v2:a`)) throw mismatch(`expected a v2 array marker in ${describeNode(parent)}; found ${JSON.stringify(markerValue(start) ?? start?.nodeName ?? null)}`);
+	const end = findClosingSibling(start, `v2:a`);
+	state.cursors.set(parent, start.nextSibling);
+	return [start, end];
+}
+function finishHydrationArrayRange(parent, end) {
+	const state = requireHydration();
+	if (cursor(state, parent) !== end) throw mismatch("compiled collection did not consume its complete server array range");
+	setHydrationCursor(state, parent, end.nextSibling);
+}
+function claimHydrationSlotRange(parent) {
+	const state = activeHydration;
+	if (state === void 0) return void 0;
+	const start = cursor(state, parent);
+	if (!isMarker(start, `v2:b`)) throw mismatch(`expected a v2 child-slot marker in ${describeNode(parent)}; found ${JSON.stringify(markerValue(start) ?? start?.nodeName ?? null)} after ${JSON.stringify(markerValue(start?.previousSibling) ?? start?.previousSibling?.nodeName ?? null)}; insertion=${JSON.stringify(markerValue(activeInsertionPoint?.[1]) ?? activeInsertionPoint?.[1]?.nodeName ?? null)}`);
+	const end = findClosingSibling(start, `v2:b`);
+	const slots = state.slots.get(parent) ?? [];
+	slots.push(end);
+	state.slots.set(parent, slots);
+	state.cursors.set(parent, start.nextSibling);
+	return [start, end];
+}
+function borrowHydrationSlotRange(parent, current) {
+	const state = activeHydration;
+	if (state === void 0) return void 0;
+	const start = current ? cursor(state, parent) : cursor(state, parent)?.previousSibling;
+	if (!isMarker(start, `v2:b`)) return void 0;
+	if (!current && activeInsertionPoint?.[0] === parent && isMarker(activeInsertionPoint[1], `/v2:b`)) return [start, activeInsertionPoint[1]];
+	return [start, findClosingSibling(start, `v2:b`)];
+}
+/**
+* Claims everything between two markers as-is, without hydrating into it. A Suspense
+* boundary uses this when the server rendered its content but the client cannot
+* produce it yet (a lazy chunk still loading): the server DOM stays on screen as a
+* dehydrated boundary and the client render replaces it once the resource resolves.
+* The elements and component ranges inside are marked claimed so `finishHydration`'s
+* accounting still balances.
+*/
+function skipHydrationRange(start, end) {
+	const state = requireHydration();
+	const parent = start.parentNode;
+	if (parent === null || end.parentNode !== parent) throw mismatch("detached server marker range");
+	for (const element of collectPostorderElements([start, end])) {
+		if (state.claimedElements.has(element)) continue;
+		state.claimedElements.add(element);
+		state.claimedElementCount += 1;
+	}
+	while (state.componentIndex < state.components.length) {
+		const componentStart = state.components[state.componentIndex][0];
+		if (!((start.compareDocumentPosition(componentStart) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0 && (componentStart.compareDocumentPosition(end) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0)) break;
+		state.componentIndex += 1;
+	}
+	state.pendingStructuralParents = 0;
+	setHydrationCursor(state, parent, end);
+}
+function claimHydrationSuspenseFallback(parent) {
+	const state = activeHydration;
+	if (state === void 0) return void 0;
+	const marker = cursor(state, parent);
+	if (!isMarker(marker, `v2:p`)) return void 0;
+	setHydrationCursor(state, parent, marker.nextSibling);
+	return marker;
+}
+function withoutHydration(operation) {
+	const previous = activeHydration;
+	activeHydration = void 0;
+	try {
+		return operation();
+	} finally {
+		activeHydration = previous;
+	}
+}
+function withHydrationInsertion(parent, before, operation) {
+	if (activeHydration === void 0) return operation();
+	const previous = activeInsertionPoint;
+	activeInsertionPoint = [parent, before];
+	try {
+		return operation();
+	} finally {
+		activeInsertionPoint = previous;
+	}
+}
+function hydrationInsertionPoint() {
+	return activeInsertionPoint;
+}
+function hydrationCursor(parent) {
+	const state = activeHydration;
+	return state === void 0 ? void 0 : cursor(state, parent);
+}
+function hydrationRangeParent(start, end) {
+	if (activeHydration === void 0) return void 0;
+	const parent = start.parentNode;
+	if (parent === null || end.parentNode !== parent) throw mismatch("detached server marker range");
+	return parent;
 }
 function requireHydration() {
-    if (activeHydration === undefined)
-        throw new Error('no Vidact hydration is active');
-    return activeHydration;
+	if (activeHydration === void 0) throw new Error("no Vidact hydration is active");
+	return activeHydration;
 }
 function cursor(state, parent) {
-    if (!state.cursors.has(parent))
-        state.cursors.set(parent, parent.firstChild);
-    return state.cursors.get(parent) ?? null;
+	if (!state.cursors.has(parent)) state.cursors.set(parent, initialCursor(parent));
+	return state.cursors.get(parent) ?? null;
+}
+function initialCursor(parent) {
+	return parent.firstChild;
 }
 function enterHydrationSlot(state, parent) {
-    const slots = state.slots.get(parent) ?? [];
-    let start = cursor(state, parent);
-    while (isMarker(start, `${HYDRATION_PREFIX}:b`)) {
-        slots.push(findClosingSibling(start, `${HYDRATION_PREFIX}:b`));
-        start = start.nextSibling;
-    }
-    if (slots.length !== 0)
-        state.slots.set(parent, slots);
-    state.cursors.set(parent, start);
+	const slots = state.slots.get(parent) ?? [];
+	let start = cursor(state, parent);
+	while (isMarker(start, `v2:b`)) {
+		slots.push(findClosingSibling(start, `v2:b`));
+		start = start.nextSibling;
+	}
+	if (slots.length !== 0) state.slots.set(parent, slots);
+	state.cursors.set(parent, start);
 }
 function setHydrationCursor(state, parent, value) {
-    const slots = state.slots.get(parent);
-    let next = value;
-    if (slots !== undefined) {
-        for (;;) {
-            const end = slots.at(-1);
-            if (end !== next)
-                break;
-            slots.pop();
-            next = end.nextSibling;
-        }
-    }
-    state.cursors.set(parent, next);
+	const slots = state.slots.get(parent);
+	let next = value;
+	if (slots !== void 0) for (;;) {
+		const end = slots.at(-1);
+		if (end !== next) break;
+		slots.pop();
+		next = end.nextSibling;
+	}
+	state.cursors.set(parent, next);
 }
 function mismatch(message) {
-    return new HydrationMismatch(message);
+	return new HydrationMismatch(message);
+}
+/** `DIV.class-a[data-x]` — enough of an element to find it in the server markup. */
+function describeNode(node) {
+	if (!(node instanceof Element)) return node?.nodeName ?? "null";
+	const classes = node.classList.length === 0 ? "" : `.${[...node.classList].join(".")}`;
+	const data = [...node.attributes].filter((attribute) => attribute.name.startsWith("data-") || attribute.name === "id").map((attribute) => `[${attribute.name}]`).join("");
+	return `${node.nodeName}${classes}${data}`;
 }
 function markerValue(node) {
-    return node instanceof Comment ? node.data : undefined;
+	return node instanceof Comment ? node.data : void 0;
 }
 function isMarker(node, value) {
-    return markerValue(node) === value;
+	return markerValue(node) === value;
 }
 function findClosingSibling(start, kind) {
-    let depth = 0;
-    for (let node = start.nextSibling; node !== null; node = node.nextSibling) {
-        if (isMarker(node, kind)) {
-            depth += 1;
-            continue;
-        }
-        if (!isMarker(node, `/${kind}`))
-            continue;
-        if (depth === 0)
-            return node;
-        depth -= 1;
-    }
-    throw mismatch(`missing closing ${kind} marker`);
-}
+	let depth = 0;
+	for (let node = start.nextSibling; node !== null; node = node.nextSibling) {
+		if (isMarker(node, kind)) {
+			depth += 1;
+			continue;
+		}
+		if (!isMarker(node, `/${kind}`)) continue;
+		if (depth === 0) return node;
+		depth -= 1;
+	}
+	throw mismatch(`missing closing ${kind} marker`);
+}
+/** Paired markers; `p` (pending fallback) is a lone marker and stays out of the stacks. */
+const RANGE_MARKER = new RegExp(`^\\/?v2:([abchr])$`);
 function scanRanges(host) {
-    const roots = [];
-    const components = [];
-    const stacks = new Map();
-    const walker = document.createTreeWalker(host, NodeFilter.SHOW_COMMENT);
-    for (let node = walker.nextNode(); node !== null; node = walker.nextNode()) {
-        const comment = node;
-        const match = comment.data.match(/^\/?vidact:v1:([abchrst])$/);
-        if (match === null)
-            continue;
-        const kind = match[1];
-        if (!comment.data.startsWith('/')) {
-            const stack = stacks.get(kind) ?? [];
-            stack.push(comment);
-            stacks.set(kind, stack);
-            continue;
-        }
-        const start = stacks.get(kind)?.pop();
-        if (start === undefined)
-            throw mismatch(`orphan closing vidact:v1:${kind} marker`);
-        if (kind === 'r')
-            roots.push([start, comment]);
-        if (kind === 'c')
-            components.push([start, comment]);
-    }
-    if ([...stacks.values()].some((stack) => stack.length !== 0)) {
-        throw mismatch('unclosed vidact:v1 hydration marker');
-    }
-    components.sort(([left], [right]) => {
-        const position = left.compareDocumentPosition(right);
-        if (position & Node.DOCUMENT_POSITION_FOLLOWING)
-            return -1;
-        if (position & Node.DOCUMENT_POSITION_PRECEDING)
-            return 1;
-        return 0;
-    });
-    return { roots, components };
+	const roots = [];
+	const components = [];
+	const stacks = /* @__PURE__ */ new Map();
+	const walker = document.createTreeWalker(host, NodeFilter.SHOW_COMMENT);
+	for (let node = walker.nextNode(); node !== null; node = walker.nextNode()) {
+		const comment = node;
+		const match = RANGE_MARKER.exec(comment.data);
+		if (match === null) continue;
+		const kind = match[1];
+		if (!comment.data.startsWith("/")) {
+			const stack = stacks.get(kind) ?? [];
+			stack.push(comment);
+			stacks.set(kind, stack);
+			continue;
+		}
+		const start = stacks.get(kind)?.pop();
+		if (start === void 0) throw mismatch(`orphan closing v2:${kind} marker`);
+		if (kind === "r") roots.push([start, comment]);
+		if (kind === "c") components.push([start, comment]);
+	}
+	if ([...stacks.values()].some((stack) => stack.length !== 0)) throw mismatch(`unclosed v2 hydration marker`);
+	components.sort(([left], [right]) => {
+		const position = left.compareDocumentPosition(right);
+		if (position & Node.DOCUMENT_POSITION_FOLLOWING) return -1;
+		if (position & Node.DOCUMENT_POSITION_PRECEDING) return 1;
+		return 0;
+	});
+	return {
+		roots,
+		components
+	};
 }
 function collectPostorderElements(root) {
-    const elements = [];
-    const visit = (element) => {
-        visitChildren(element);
-        elements.push(element);
-    };
-    const visitChildren = (parent) => {
-        let opaqueDepth = 0;
-        for (const child of parent.childNodes) {
-            if (isMarker(child, `${HYDRATION_PREFIX}:h`)) {
-                opaqueDepth += 1;
-                continue;
-            }
-            if (isMarker(child, `/${HYDRATION_PREFIX}:h`)) {
-                opaqueDepth -= 1;
-                continue;
-            }
-            if (opaqueDepth === 0 && child instanceof Element)
-                visit(child);
-        }
-        if (opaqueDepth !== 0)
-            throw mismatch('unbalanced vidact:v1 raw HTML marker range');
-    };
-    let opaqueDepth = 0;
-    for (let node = root[0].nextSibling; node !== null && node !== root[1]; node = node.nextSibling) {
-        if (isMarker(node, `${HYDRATION_PREFIX}:h`)) {
-            opaqueDepth += 1;
-            continue;
-        }
-        if (isMarker(node, `/${HYDRATION_PREFIX}:h`)) {
-            opaqueDepth -= 1;
-            continue;
-        }
-        if (opaqueDepth === 0 && node instanceof Element)
-            visit(node);
-    }
-    if (opaqueDepth !== 0)
-        throw mismatch('unbalanced vidact:v1 raw HTML marker range');
-    return elements;
+	const elements = [];
+	const visit = (element) => {
+		visitChildren(element);
+		elements.push(element);
+	};
+	const visitChildren = (parent) => {
+		let opaqueDepth = 0;
+		for (const child of parent.childNodes) {
+			if (isMarker(child, `v2:h`)) {
+				opaqueDepth += 1;
+				continue;
+			}
+			if (isMarker(child, `/v2:h`)) {
+				opaqueDepth -= 1;
+				continue;
+			}
+			if (opaqueDepth === 0 && child instanceof Element) visit(child);
+		}
+		if (opaqueDepth !== 0) throw mismatch(`unbalanced v2 raw HTML marker range`);
+	};
+	let opaqueDepth = 0;
+	for (let node = root[0].nextSibling; node !== null && node !== root[1]; node = node.nextSibling) {
+		if (isMarker(node, `v2:h`)) {
+			opaqueDepth += 1;
+			continue;
+		}
+		if (isMarker(node, `/v2:h`)) {
+			opaqueDepth -= 1;
+			continue;
+		}
+		if (opaqueDepth === 0 && node instanceof Element) visit(node);
+	}
+	if (opaqueDepth !== 0) throw mismatch(`unbalanced v2 raw HTML marker range`);
+	return elements;
 }
 function collectElementComponents(host) {
-    const owners = new WeakMap();
-    const components = [];
-    const walker = document.createTreeWalker(host, NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_COMMENT);
-    for (let node = walker.nextNode(); node !== null; node = walker.nextNode()) {
-        if (isMarker(node, `${HYDRATION_PREFIX}:c`)) {
-            components.push(node);
-            continue;
-        }
-        if (isMarker(node, `/${HYDRATION_PREFIX}:c`)) {
-            components.pop();
-            continue;
-        }
-        if (node instanceof Element) {
-            const owner = components.at(-1);
-            if (owner !== undefined)
-                owners.set(node, owner);
-        }
-    }
-    return owners;
+	const owners = /* @__PURE__ */ new WeakMap();
+	const components = [];
+	const walker = document.createTreeWalker(host, NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_COMMENT);
+	for (let node = walker.nextNode(); node !== null; node = walker.nextNode()) {
+		if (isMarker(node, `v2:c`)) {
+			components.push(node);
+			continue;
+		}
+		if (isMarker(node, `/v2:c`)) {
+			components.pop();
+			continue;
+		}
+		if (node instanceof Element) {
+			const owner = components.at(-1);
+			if (owner !== void 0) owners.set(node, owner);
+		}
+	}
+	return owners;
 }
 function containsArrayMarker(element) {
-    const walker = document.createTreeWalker(element, NodeFilter.SHOW_COMMENT);
-    for (let node = walker.nextNode(); node !== null; node = walker.nextNode()) {
-        if (isMarker(node, `${HYDRATION_PREFIX}:a`))
-            return true;
-    }
-    return false;
-}
-export function installHydration() {
-    installHydrationOperations({
-        begin: beginHydration,
-        finish: finishHydration,
-        rootMarkers: hydrationRootMarkers,
-        active: isHydrating,
-        createFragment: createHydrationFragment,
-        fragmentChildren: hydrationFragmentChildren,
-        claimElement: claimHydrationElement,
-        noteStructuralParent: noteHydrationStructuralParent,
-        claimComponentRange: claimHydrationComponentRange,
-        withComponentRange: withHydrationComponentRange,
-        withCursor: withHydrationCursor,
-        claimNode: claimHydrationNode,
-        claimComponentMount: claimHydrationComponentMount,
-        claimText: claimHydrationText,
-        claimTextRange: claimHydrationTextRange,
-        claimArrayRange: claimHydrationArrayRange,
-        finishArrayRange: finishHydrationArrayRange,
-        claimSlotRange: claimHydrationSlotRange,
-        borrowSlotRange: borrowHydrationSlotRange,
-        claimSuspenseFallback: claimHydrationSuspenseFallback,
-        withoutHydration,
-        withInsertion: withHydrationInsertion,
-        insertionPoint: hydrationInsertionPoint,
-        cursor: hydrationCursor,
-        rangeParent: hydrationRangeParent,
-    });
-}
+	const walker = document.createTreeWalker(element, NodeFilter.SHOW_COMMENT);
+	for (let node = walker.nextNode(); node !== null; node = walker.nextNode()) if (isMarker(node, `v2:a`)) return true;
+	return false;
+}
+function installHydration() {
+	installHydrationOperations({
+		begin: beginHydration,
+		finish: finishHydration,
+		rootMarkers: hydrationRootMarkers,
+		active: isHydrating,
+		createFragment: createHydrationFragment,
+		fragmentChildren: hydrationFragmentChildren,
+		claimElement: claimHydrationElement,
+		noteStructuralParent: noteHydrationStructuralParent,
+		claimComponentRange: claimHydrationComponentRange,
+		withComponentRange: withHydrationComponentRange,
+		withCursor: withHydrationCursor,
+		claimNode: claimHydrationNode,
+		claimComponentMount: claimHydrationComponentMount,
+		claimText: claimHydrationText,
+		claimTextRange: claimHydrationTextRange,
+		claimArrayRange: claimHydrationArrayRange,
+		finishArrayRange: finishHydrationArrayRange,
+		claimSlotRange: claimHydrationSlotRange,
+		borrowSlotRange: borrowHydrationSlotRange,
+		claimSuspenseFallback: claimHydrationSuspenseFallback,
+		skipRange: skipHydrationRange,
+		withoutHydration,
+		withInsertion: withHydrationInsertion,
+		insertionPoint: hydrationInsertionPoint,
+		cursor: hydrationCursor,
+		rangeParent: hydrationRangeParent
+	});
+}
+//#endregion
+export { beginHydration, borrowHydrationSlotRange, claimHydrationArrayRange, claimHydrationComponentMount, claimHydrationComponentRange, claimHydrationElement, claimHydrationNode, claimHydrationSlotRange, claimHydrationSuspenseFallback, claimHydrationText, claimHydrationTextRange, createHydrationFragment, finishHydration, finishHydrationArrayRange, hydrationCursor, hydrationFragmentChildren, hydrationInsertionPoint, hydrationRangeParent, hydrationRootMarkers, installHydration, isHydrating, isHydrationMismatch, noteHydrationStructuralParent, skipHydrationRange, withHydrationComponentRange, withHydrationCursor, withHydrationInsertion, withoutHydration };
+
 //# sourceMappingURL=hydration.js.map