@torpor/view 0.1.6 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torpor/view",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Torpor's view library, for writing and mounting components",
   "type": "module",
   "main": "dist/index.cjs",

package/src/compile/build/client/buildCode.ts

@@ -29,6 +29,7 @@ const importsMap: Record<string, string> = {
 	t_animate: 'import { t_animate } from "${folder}";',
 	t_root: 'import { t_root } from "${folder}";',
 	t_anchor: 'import { t_anchor } from "${folder}";',
+	t_reanchor: 'import { t_reanchor } from "${folder}";',
 	t_child: 'import { t_child } from "${folder}";',
 	t_next: 'import { t_next } from "${folder}";',
 	t_skip: 'import { t_skip } from "${folder}";',

package/src/compile/build/client/buildFragment.ts

@@ -661,18 +661,12 @@ function declareParentAndAnchorFragmentVars(
 		path.children.push(anchorPath);
 
 		node.varName = nextVarName(`${name}_anchor`, status);
-		const anchorVarPath = getFragmentVarPath(
-			fragment,
-			status,
-			`t_anchor(${node.varName}, true)`,
-			anchorPath,
-			varPaths,
-		);
+		const anchorVarPath = getFragmentVarPath(fragment, status, node.varName, anchorPath, varPaths);
 		if (status.options?.useCreateElement) {
 			b.append(`let ${node.varName};`);
 		} else {
 			status.imports.add("t_anchor");
-			b.append(`const ${node.varName} = t_anchor(${anchorVarPath}) as HTMLElement;`);
+			b.append(`let ${node.varName} = t_anchor(${anchorVarPath}) as HTMLElement;`);
 
 			printDebug(node.varName, status, b);
 		}
@@ -685,6 +679,19 @@ function declareParentAndAnchorFragmentVars(
 	// rather than at the end of the fragment
 	buildNode(node, status, b, parentName, anchorName);
 	node.handled = true;
+
+	// Before hydrating, the anchor node actually gets set to the first node
+	// After hydrating, we need to reset the anchor node to the end node
+	if (declare && node.varName) {
+		status.imports.add("t_reanchor");
+		b.append(`${node.varName} = t_reanchor(${node.varName}) as HTMLElement;`);
+		b.append("");
+
+		printDebug(node.varName, status, b);
+	}
+
+	// TODO: Due to the above, I think we only need to set the hydration node at
+	// the end of a fragment, not in every next() call??
 }
 
 function getFragmentVarPath(

package/src/index.ts

@@ -18,6 +18,7 @@ import t_range from "./render/newRange";
 import t_anchor from "./render/nodeAnchor";
 import t_child from "./render/nodeChild";
 import t_next from "./render/nodeNext";
+import t_reanchor from "./render/nodeReanchor";
 import t_root from "./render/nodeRoot";
 import t_skip from "./render/nodeSkip";
 import t_pop_range from "./render/popRange";
@@ -52,6 +53,7 @@ export {
 	t_style,
 	t_range,
 	t_anchor,
+	t_reanchor,
 	t_child,
 	t_next,
 	t_root,

package/src/render/nodeAnchor.ts

@@ -15,20 +15,10 @@ import nodeNext from "./nodeNext";
  * the matched comments.
  *
  * @param node The potential anchor node.
- * @param subsequent Whether this is the second time the anchor is being retrieved.
  * @returns The anchor node.
  */
-export default function nodeAnchor(node: ChildNode, subsequent = false): ChildNode {
+export default function nodeAnchor(node: ChildNode): ChildNode {
 	if (context.hydrationNode) {
-		// The first time we get a node anchor during hydration, the hydration
-		// node gets set to the first node in the statement, and then we work
-		// through the nodes until we get to the anchor node itself. So, the
-		// second time we get the anchor node, the hydration node should have
-		// been set to it. I'm not sure this is going to always be the case...
-		if (subsequent) {
-			return context.hydrationNode;
-		}
-
 		if (isComment(node) && node.data === HYDRATION_START) {
 			// Skip and remove the start node, setting the hydration node in
 			// nodeNext

package/src/render/nodeReanchor.ts

@@ -0,0 +1,18 @@
+import context from "./context";
+
+/**
+ * Gets the anchor node after adding a fragment.
+ *
+ * When hydrating, the anchor node initially gets set to the first node in the
+ * statement, and then we work through the nodes until we get to the anchor node
+ * itself. So, after hydrating, we need to set the anchor node to the actual
+ * anchor node, from the current hydration node.
+ *
+ * I'm not sure this is going to always be the case...
+ *
+ * @param node The anchor node.
+ * @returns The (maybe new) anchor node.
+ */
+export default function nodeReanchor(node: ChildNode): ChildNode {
+	return context.hydrationNode ?? node;
+}

package/test/await/components/output/Await-client.ts

@@ -11,6 +11,7 @@ import t_next from "../../../../src/render/nodeNext";
 import t_pop_range from "../../../../src/render/popRange";
 import t_push_range from "../../../../src/render/pushRange";
 import t_range from "../../../../src/render/newRange";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 import t_run_branch from "../../../../src/render/runControlBranch";
 import t_run_control from "../../../../src/render/runControl";
@@ -50,7 +51,7 @@ export default function Await(
 		// @ts-ignore
 		const t_root_0 = t_root(t_fragment_0, true);
 		const t_await_parent_1 = t_next(t_root_0) as HTMLElement;
-		const t_await_anchor_1 = t_anchor(t_next(t_child(t_await_parent_1))) as HTMLElement;
+		let t_await_anchor_1 = t_anchor(t_next(t_child(t_await_parent_1))) as HTMLElement;
 
 		/* @await */
 		const t_await_range_1 = t_range();
@@ -106,7 +107,9 @@ export default function Await(
 			})(t_await_token_1);
 		});
 
-		const t_button_1 = t_next(t_next(t_anchor(t_await_anchor_1, true), true)) as HTMLElement;
+		t_await_anchor_1 = t_reanchor(t_await_anchor_1) as HTMLElement;
+
+		const t_button_1 = t_next(t_next(t_await_anchor_1, true)) as HTMLElement;
 		// @ts-ignore
 		const t_text_5 = t_next(t_await_parent_1, true);
 		t_event(t_button_1, "click", () => $state.guesser = guessNumber(100));

package/test/await/components/temp/{Await-client-5d753441145fbac078393af24cccadb208453d69.ts → Await-client-e2fc91352ed24b160650d7851d82375910bd28d6.ts}

@@ -11,6 +11,7 @@ import t_next from "../../../../src/render/nodeNext";
 import t_pop_range from "../../../../src/render/popRange";
 import t_push_range from "../../../../src/render/pushRange";
 import t_range from "../../../../src/render/newRange";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 import t_run_branch from "../../../../src/render/runControlBranch";
 import t_run_control from "../../../../src/render/runControl";
@@ -50,7 +51,7 @@ export default function Await(
 		// @ts-ignore
 		const t_root_0 = t_root(t_fragment_0, true);
 		const t_await_parent_1 = t_next(t_root_0) as HTMLElement;
-		const t_await_anchor_1 = t_anchor(t_next(t_child(t_await_parent_1))) as HTMLElement;
+		let t_await_anchor_1 = t_anchor(t_next(t_child(t_await_parent_1))) as HTMLElement;
 
 		/* @await */
 		const t_await_range_1 = t_range();
@@ -106,7 +107,9 @@ export default function Await(
 			})(t_await_token_1);
 		});
 
-		const t_button_1 = t_next(t_next(t_anchor(t_await_anchor_1, true), true)) as HTMLElement;
+		t_await_anchor_1 = t_reanchor(t_await_anchor_1) as HTMLElement;
+
+		const t_button_1 = t_next(t_next(t_await_anchor_1, true)) as HTMLElement;
 		// @ts-ignore
 		const t_text_5 = t_next(t_await_parent_1, true);
 		t_event(t_button_1, "click", () => $state.guesser = guessNumber(100));

package/test/bind/components/output/BindComponent-client.ts

@@ -8,6 +8,7 @@ import t_event from "../../../../src/render/addEvent";
 import t_fmt from "../../../../src/render/formatText";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 
 export default function BindComponent(
@@ -30,7 +31,7 @@ export default function BindComponent(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_comp_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_comp_anchor_1 = t_anchor(t_next(t_child(t_comp_parent_1))) as HTMLElement;
+	let t_comp_anchor_1 = t_anchor(t_next(t_child(t_comp_parent_1))) as HTMLElement;
 
 	/* @component */
 	const t_props_1: any = $watch({});
@@ -42,7 +43,9 @@ export default function BindComponent(
 	});
 	BindText(t_comp_parent_1, t_comp_anchor_1, t_props_1, $context);
 
-	const t_text_1 = t_child(t_next(t_next(t_anchor(t_comp_anchor_1, true), true)));
+	t_comp_anchor_1 = t_reanchor(t_comp_anchor_1) as HTMLElement;
+
+	const t_text_1 = t_child(t_next(t_next(t_comp_anchor_1, true)));
 	// @ts-ignore
 	const t_text_2 = t_next(t_comp_parent_1, true);
 	$run(function setTextContent() {

package/test/bind/components/temp/{BindComponent-client-aaeb489ce72b664c6372f8764f7e665994a751a7.ts → BindComponent-client-c4dbd934eda6b8f9a7afc697b9d6dd3edc3a4a48.ts}

@@ -8,6 +8,7 @@ import t_event from "../../../../src/render/addEvent";
 import t_fmt from "../../../../src/render/formatText";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 
 export default function BindComponent(
@@ -30,7 +31,7 @@ export default function BindComponent(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_comp_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_comp_anchor_1 = t_anchor(t_next(t_child(t_comp_parent_1))) as HTMLElement;
+	let t_comp_anchor_1 = t_anchor(t_next(t_child(t_comp_parent_1))) as HTMLElement;
 
 	/* @component */
 	const t_props_1: any = $watch({});
@@ -42,7 +43,9 @@ export default function BindComponent(
 	});
 	BindText(t_comp_parent_1, t_comp_anchor_1, t_props_1, $context);
 
-	const t_text_1 = t_child(t_next(t_next(t_anchor(t_comp_anchor_1, true), true)));
+	t_comp_anchor_1 = t_reanchor(t_comp_anchor_1) as HTMLElement;
+
+	const t_text_1 = t_child(t_next(t_next(t_comp_anchor_1, true)));
 	// @ts-ignore
 	const t_text_2 = t_next(t_comp_parent_1, true);
 	$run(function setTextContent() {

package/test/buildOutputFiles.ts

@@ -140,6 +140,8 @@ const importsMap: Record<string, string> = {
 	'import { t_root } from "@torpor/view";': 'import t_root from "../../../../src/render/nodeRoot";',
 	'import { t_anchor } from "@torpor/view";':
 		'import t_anchor from "../../../../src/render/nodeAnchor";',
+	'import { t_reanchor } from "@torpor/view";':
+		'import t_reanchor from "../../../../src/render/nodeReanchor";',
 	'import { t_child } from "@torpor/view";':
 		'import t_child from "../../../../src/render/nodeChild";',
 	'import { t_next } from "@torpor/view";': 'import t_next from "../../../../src/render/nodeNext";',

package/test/child-component/components/output/ParentChild-client.ts

@@ -7,6 +7,7 @@ import t_child from "../../../../src/render/nodeChild";
 import t_fmt from "../../../../src/render/formatText";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 
 export default function ParentChild(
@@ -27,13 +28,15 @@ export default function ParentChild(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_comp_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_comp_anchor_1 = t_anchor(t_next(t_child(t_comp_parent_1))) as HTMLElement;
+	let t_comp_anchor_1 = t_anchor(t_next(t_child(t_comp_parent_1))) as HTMLElement;
 
 	/* @component */
 	const t_props_1: any = $watch({});
 	t_props_1["name"] = "Anna";
 	Child(t_comp_parent_1, t_comp_anchor_1, t_props_1, $context);
 
+	t_comp_anchor_1 = t_reanchor(t_comp_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_1 = t_next(t_comp_parent_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_1);

package/test/child-component/components/temp/{ParentChild-client-6cf4d156ea46338815270faf67f56472f1a4ccd4.ts → ParentChild-client-16042a29846dbbeec5905f163bf29b6bb48dfd42.ts}

@@ -7,6 +7,7 @@ import t_child from "../../../../src/render/nodeChild";
 import t_fmt from "../../../../src/render/formatText";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 
 export default function ParentChild(
@@ -27,13 +28,15 @@ export default function ParentChild(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_comp_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_comp_anchor_1 = t_anchor(t_next(t_child(t_comp_parent_1))) as HTMLElement;
+	let t_comp_anchor_1 = t_anchor(t_next(t_child(t_comp_parent_1))) as HTMLElement;
 
 	/* @component */
 	const t_props_1: any = $watch({});
 	t_props_1["name"] = "Anna";
 	Child(t_comp_parent_1, t_comp_anchor_1, t_props_1, $context);
 
+	t_comp_anchor_1 = t_reanchor(t_comp_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_1 = t_next(t_comp_parent_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_1);

package/test/class/components/output/Class-client.ts

@@ -7,6 +7,7 @@ import t_child from "../../../../src/render/nodeChild";
 import t_class from "../../../../src/render/getClasses";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 
 export default function Class(
@@ -32,7 +33,7 @@ export default function Class(
 	const t_div_3 = t_next(t_next(t_div_2, true)) as HTMLDivElement;
 	const t_div_4 = t_next(t_next(t_div_3, true)) as HTMLDivElement;
 	const t_comp_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_comp_anchor_1 = t_anchor(t_next(t_next(t_div_4, true))) as HTMLElement;
+	let t_comp_anchor_1 = t_anchor(t_next(t_next(t_div_4, true))) as HTMLElement;
 
 	/* @component */
 	const t_props_1: any = $watch({});
@@ -41,6 +42,8 @@ export default function Class(
 	});
 	Child(t_comp_parent_1, t_comp_anchor_1, t_props_1, $context);
 
+	t_comp_anchor_1 = t_reanchor(t_comp_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_1 = t_next(t_comp_parent_1, true);
 	$run(function setClasses() {

package/test/class/components/temp/{Class-client-0405eff591f854c04e5728df0479014ef91efc61.ts → Class-client-71b655ee0cbda59527269a2fbf0b6d2a1176bbaa.ts}

@@ -7,6 +7,7 @@ import t_child from "../../../../src/render/nodeChild";
 import t_class from "../../../../src/render/getClasses";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 
 export default function Class(
@@ -32,7 +33,7 @@ export default function Class(
 	const t_div_3 = t_next(t_next(t_div_2, true)) as HTMLDivElement;
 	const t_div_4 = t_next(t_next(t_div_3, true)) as HTMLDivElement;
 	const t_comp_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_comp_anchor_1 = t_anchor(t_next(t_next(t_div_4, true))) as HTMLElement;
+	let t_comp_anchor_1 = t_anchor(t_next(t_next(t_div_4, true))) as HTMLElement;
 
 	/* @component */
 	const t_props_1: any = $watch({});
@@ -41,6 +42,8 @@ export default function Class(
 	});
 	Child(t_comp_parent_1, t_comp_anchor_1, t_props_1, $context);
 
+	t_comp_anchor_1 = t_reanchor(t_comp_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_1 = t_next(t_comp_parent_1, true);
 	$run(function setClasses() {

package/test/component/components/output/Component-client.ts

@@ -4,6 +4,7 @@ import t_add_fragment from "../../../../src/render/addFragment";
 import t_anchor from "../../../../src/render/nodeAnchor";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 
 import Header from "../output/./Header-client";
@@ -25,15 +26,17 @@ export default function Component(
 	const t_fragment_0 = t_fragment($parent.ownerDocument!, t_fragments, 0, ` <!> `);
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
-	const t_comp_anchor_1 = t_anchor(t_next(t_root_0)) as HTMLElement;
+	let t_comp_anchor_1 = t_anchor(t_next(t_root_0)) as HTMLElement;
 
 	/* @component */
 	const t_props_1: any = $watch({});
 	t_props_1["name"] = "Amy";
 	Header(t_fragment_0, t_comp_anchor_1, t_props_1, $context);
 
+	t_comp_anchor_1 = t_reanchor(t_comp_anchor_1) as HTMLElement;
+
 	// @ts-ignore
-	const t_text_1 = t_next(t_anchor(t_comp_anchor_1, true), true);
+	const t_text_1 = t_next(t_comp_anchor_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_1);
 	t_next(t_text_1);
 

package/test/component/components/temp/{Component-client-355b42e5f7411c399e2f50fba3580f4f7c3fa943.ts → Component-client-2f4734d1288dc88d1d5aa532791199969351ec1d.ts}

@@ -4,6 +4,7 @@ import t_add_fragment from "../../../../src/render/addFragment";
 import t_anchor from "../../../../src/render/nodeAnchor";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 
 import Header from "../output/./Header-client";
@@ -25,15 +26,17 @@ export default function Component(
 	const t_fragment_0 = t_fragment($parent.ownerDocument!, t_fragments, 0, ` <!> `);
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
-	const t_comp_anchor_1 = t_anchor(t_next(t_root_0)) as HTMLElement;
+	let t_comp_anchor_1 = t_anchor(t_next(t_root_0)) as HTMLElement;
 
 	/* @component */
 	const t_props_1: any = $watch({});
 	t_props_1["name"] = "Amy";
 	Header(t_fragment_0, t_comp_anchor_1, t_props_1, $context);
 
+	t_comp_anchor_1 = t_reanchor(t_comp_anchor_1) as HTMLElement;
+
 	// @ts-ignore
-	const t_text_1 = t_next(t_anchor(t_comp_anchor_1, true), true);
+	const t_text_1 = t_next(t_comp_anchor_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_1);
 	t_next(t_text_1);
 

package/test/effects/components/output/For-client.ts

@@ -12,6 +12,7 @@ import t_next from "../../../../src/render/nodeNext";
 import t_pop_range from "../../../../src/render/popRange";
 import t_push_range from "../../../../src/render/pushRange";
 import t_range from "../../../../src/render/newRange";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 import t_run_list from "../../../../src/render/runList";
 
@@ -33,7 +34,7 @@ export default function For(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_for_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_for_anchor_1 = t_anchor(t_next(t_child(t_for_parent_1))) as HTMLElement;
+	let t_for_anchor_1 = t_anchor(t_next(t_child(t_for_parent_1))) as HTMLElement;
 
 	/* @for */
 	let t_for_range_1 = t_range();
@@ -68,6 +69,8 @@ export default function For(
 		}
 	);
 
+	t_for_anchor_1 = t_reanchor(t_for_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_3 = t_next(t_for_parent_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_3);

package/test/effects/components/output/If-client.ts

@@ -6,6 +6,7 @@ import t_child from "../../../../src/render/nodeChild";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
 import t_range from "../../../../src/render/newRange";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 import t_run_branch from "../../../../src/render/runControlBranch";
 import t_run_control from "../../../../src/render/runControl";
@@ -28,7 +29,7 @@ export default function If(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_if_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_if_anchor_1 = t_anchor(t_next(t_child(t_if_parent_1))) as HTMLElement;
+	let t_if_anchor_1 = t_anchor(t_next(t_child(t_if_parent_1))) as HTMLElement;
 
 	/* @if */
 	const t_if_range_1 = t_range();
@@ -57,6 +58,8 @@ export default function If(
 		}
 	});
 
+	t_if_anchor_1 = t_reanchor(t_if_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_3 = t_next(t_if_parent_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_3);

package/test/effects/components/output/NestedIf-client.ts

@@ -6,6 +6,7 @@ import t_child from "../../../../src/render/nodeChild";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
 import t_range from "../../../../src/render/newRange";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 import t_run_branch from "../../../../src/render/runControlBranch";
 import t_run_control from "../../../../src/render/runControl";
@@ -28,7 +29,7 @@ export default function NestedIf(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_if_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_if_anchor_1 = t_anchor(t_next(t_child(t_if_parent_1))) as HTMLElement;
+	let t_if_anchor_1 = t_anchor(t_next(t_child(t_if_parent_1))) as HTMLElement;
 
 	/* @if */
 	const t_if_range_1 = t_range();
@@ -38,7 +39,7 @@ export default function NestedIf(
 				const t_fragment_1 = t_fragment($parent.ownerDocument!, t_fragments, 1, ` <!> `);
 				// @ts-ignore
 				const t_root_1 = t_root(t_fragment_1, true);
-				const t_if_anchor_2 = t_anchor(t_next(t_root_1)) as HTMLElement;
+				let t_if_anchor_2 = t_anchor(t_next(t_root_1)) as HTMLElement;
 
 				/* @if */
 				const t_if_range_2 = t_range();
@@ -67,8 +68,10 @@ export default function NestedIf(
 					}
 				});
 
+				t_if_anchor_2 = t_reanchor(t_if_anchor_2) as HTMLElement;
+
 				// @ts-ignore
-				const t_text_3 = t_next(t_anchor(t_if_anchor_2, true), true);
+				const t_text_3 = t_next(t_if_anchor_2, true);
 				t_add_fragment(t_fragment_1, t_if_parent_1, t_before, t_text_3);
 				t_next(t_text_3);
 			});
@@ -79,6 +82,8 @@ export default function NestedIf(
 		}
 	});
 
+	t_if_anchor_1 = t_reanchor(t_if_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_4 = t_next(t_if_parent_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_4);

package/test/effects/components/temp/{For-client-fbe876286c0f99b8391ff0c06c92b58bf580218f.ts → For-client-56df708520a56e3461dd041d5fcf3a6d16d6c653.ts}

@@ -12,6 +12,7 @@ import t_next from "../../../../src/render/nodeNext";
 import t_pop_range from "../../../../src/render/popRange";
 import t_push_range from "../../../../src/render/pushRange";
 import t_range from "../../../../src/render/newRange";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 import t_run_list from "../../../../src/render/runList";
 
@@ -33,7 +34,7 @@ export default function For(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_for_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_for_anchor_1 = t_anchor(t_next(t_child(t_for_parent_1))) as HTMLElement;
+	let t_for_anchor_1 = t_anchor(t_next(t_child(t_for_parent_1))) as HTMLElement;
 
 	/* @for */
 	let t_for_range_1 = t_range();
@@ -68,6 +69,8 @@ export default function For(
 		}
 	);
 
+	t_for_anchor_1 = t_reanchor(t_for_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_3 = t_next(t_for_parent_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_3);

package/test/effects/components/temp/{If-client-420a093f13de6ce07d2d4bc94705901809096cd9.ts → If-client-341b189ef35481d477325e09e9b2d3479b7a6dfc.ts}

@@ -6,6 +6,7 @@ import t_child from "../../../../src/render/nodeChild";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
 import t_range from "../../../../src/render/newRange";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 import t_run_branch from "../../../../src/render/runControlBranch";
 import t_run_control from "../../../../src/render/runControl";
@@ -28,7 +29,7 @@ export default function If(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_if_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_if_anchor_1 = t_anchor(t_next(t_child(t_if_parent_1))) as HTMLElement;
+	let t_if_anchor_1 = t_anchor(t_next(t_child(t_if_parent_1))) as HTMLElement;
 
 	/* @if */
 	const t_if_range_1 = t_range();
@@ -57,6 +58,8 @@ export default function If(
 		}
 	});
 
+	t_if_anchor_1 = t_reanchor(t_if_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_3 = t_next(t_if_parent_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_3);

package/test/effects/components/temp/{NestedIf-client-af88ec303b1a4184263bb370ef5b1f1e8aca8efc.ts → NestedIf-client-4c74efc133b9817ff106e6ffcf4065603030a596.ts}

@@ -6,6 +6,7 @@ import t_child from "../../../../src/render/nodeChild";
 import t_fragment from "../../../../src/render/getFragment";
 import t_next from "../../../../src/render/nodeNext";
 import t_range from "../../../../src/render/newRange";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 import t_run_branch from "../../../../src/render/runControlBranch";
 import t_run_control from "../../../../src/render/runControl";
@@ -28,7 +29,7 @@ export default function NestedIf(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_if_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_if_anchor_1 = t_anchor(t_next(t_child(t_if_parent_1))) as HTMLElement;
+	let t_if_anchor_1 = t_anchor(t_next(t_child(t_if_parent_1))) as HTMLElement;
 
 	/* @if */
 	const t_if_range_1 = t_range();
@@ -38,7 +39,7 @@ export default function NestedIf(
 				const t_fragment_1 = t_fragment($parent.ownerDocument!, t_fragments, 1, ` <!> `);
 				// @ts-ignore
 				const t_root_1 = t_root(t_fragment_1, true);
-				const t_if_anchor_2 = t_anchor(t_next(t_root_1)) as HTMLElement;
+				let t_if_anchor_2 = t_anchor(t_next(t_root_1)) as HTMLElement;
 
 				/* @if */
 				const t_if_range_2 = t_range();
@@ -67,8 +68,10 @@ export default function NestedIf(
 					}
 				});
 
+				t_if_anchor_2 = t_reanchor(t_if_anchor_2) as HTMLElement;
+
 				// @ts-ignore
-				const t_text_3 = t_next(t_anchor(t_if_anchor_2, true), true);
+				const t_text_3 = t_next(t_if_anchor_2, true);
 				t_add_fragment(t_fragment_1, t_if_parent_1, t_before, t_text_3);
 				t_next(t_text_3);
 			});
@@ -79,6 +82,8 @@ export default function NestedIf(
 		}
 	});
 
+	t_if_anchor_1 = t_reanchor(t_if_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_4 = t_next(t_if_parent_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_4);

package/test/for/components/output/For-client.ts

@@ -11,6 +11,7 @@ import t_next from "../../../../src/render/nodeNext";
 import t_pop_range from "../../../../src/render/popRange";
 import t_push_range from "../../../../src/render/pushRange";
 import t_range from "../../../../src/render/newRange";
+import t_reanchor from "../../../../src/render/nodeReanchor";
 import t_root from "../../../../src/render/nodeRoot";
 import t_run_list from "../../../../src/render/runList";
 
@@ -32,7 +33,7 @@ export default function For(
 	// @ts-ignore
 	const t_root_0 = t_root(t_fragment_0, true);
 	const t_for_parent_1 = t_next(t_root_0) as HTMLElement;
-	const t_for_anchor_1 = t_anchor(t_next(t_child(t_for_parent_1))) as HTMLElement;
+	let t_for_anchor_1 = t_anchor(t_next(t_child(t_for_parent_1))) as HTMLElement;
 
 	/* @for */
 	let t_for_range_1 = t_range();
@@ -67,6 +68,8 @@ export default function For(
 		}
 	);
 
+	t_for_anchor_1 = t_reanchor(t_for_anchor_1) as HTMLElement;
+
 	// @ts-ignore
 	const t_text_3 = t_next(t_for_parent_1, true);
 	t_add_fragment(t_fragment_0, $parent, $anchor, t_text_3);