marko 6.3.29 → 6.3.30

package/dist/common/constants/accessor-prop.d.ts

@@ -23,6 +23,7 @@ export declare const PlaceholderBranch = "P";
 export declare const PlaceholderContent = "Q";
 export declare const Renderer = "R";
 export declare const StartNode = "S";
+export declare const Subscriptions = "Z";
 export declare const TagVariable = "T";
 export declare const TagVariableChange = "U";
 type Self = typeof import("./accessor-prop");

package/dist/common/constants/accessor-prop.debug.d.ts

@@ -23,6 +23,7 @@ export declare const PlaceholderBranch = "#PlaceholderBranch";
 export declare const PlaceholderContent = "#PlaceholderContent";
 export declare const Renderer = "#Renderer";
 export declare const StartNode = "#StartNode";
+export declare const Subscriptions = "#Subscriptions";
 export declare const TagVariable = "#TagVariable";
 export declare const TagVariableChange = "#TagVariableChange";
 type Self = typeof import("./accessor-prop.debug");

package/dist/common/types.d.ts

@@ -29,6 +29,7 @@ export interface Scope {
     [AccessorProp.AbortControllers]: Record<string | number, AbortController | void> | undefined;
     [AccessorProp.ClosestBranch]: BranchScope | undefined;
     [AccessorProp.ClosestBranchId]: number | undefined;
+    [AccessorProp.Subscriptions]: Set<Scope>[] | undefined;
     [x: `___${string}`]: never;
     [x: string | number]: any;
 }

package/dist/debug/dom.js

@@ -60,6 +60,7 @@ const PlaceholderBranch = "#PlaceholderBranch";
 const PlaceholderContent = "#PlaceholderContent";
 const Renderer = "#Renderer";
 const StartNode = "#StartNode";
+const Subscriptions = "#Subscriptions";
 const TagVariable = "#TagVariable";
 const TagVariableChange = "#TagVariableChange";
 //#endregion
@@ -400,17 +401,21 @@ function destroyBranch(branch) {
 function destroyScope(scope) {
 	if (scope["#Gen"]) {
 		destroyNestedScopes(scope);
-		resetControllers(scope);
+		cleanupScope(scope);
 	}
 }
 const destroyNestedScopes = function destroyNestedScopes(scope) {
 	scope[Gen$1] = 0;
 	scope[BranchScopes]?.forEach(destroyNestedScopes);
-	scope[AbortScopes]?.forEach(resetControllers);
+	scope[AbortScopes]?.forEach(cleanupScope);
 };
-function resetControllers(scope) {
+function cleanupScope(scope) {
+	scope[Subscriptions]?.forEach(unsubscribe, scope);
 	for (const id in scope[AbortControllers]) $signalReset(scope, id);
 }
+function unsubscribe(subscribers) {
+	subscribers.delete(this);
+}
 function removeAndDestroyBranch(branch) {
 	destroyBranch(branch);
 	removeChildNodes(branch[StartNode], branch[EndNode]);
@@ -565,10 +570,8 @@ function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 }
 function subscribeToScopeSet(ownerScope, accessor, scope) {
 	const subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
-	if (!subscribers.has(scope)) {
-		subscribers.add(scope);
-		$signal(scope, -1).addEventListener("abort", () => ownerScope[accessor].delete(scope));
-	}
+	const { size } = subscribers;
+	if (subscribers.add(scope).size !== size) trackCleanup(scope, subscribers);
 }
 function _closure(...closureSignals) {
 	const [firstSignal] = closureSignals;
@@ -1160,18 +1163,19 @@ function removeChildNodes(startNode, endNode) {
 	}
 }
 function insertChildNodes(parentNode, referenceNode, startNode, endNode) {
-	parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+	if (parentNode.isConnected) parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+	else {
+		const stop = endNode.nextSibling;
+		while (startNode !== stop) {
+			const next = startNode.nextSibling;
+			parentNode.insertBefore(startNode, referenceNode);
+			startNode = next;
+		}
+	}
+	return parentNode;
 }
 function toInsertNode(startNode, endNode) {
-	if (startNode === endNode) return startNode;
-	const parent = new DocumentFragment();
-	const stop = endNode.nextSibling;
-	while (startNode !== stop) {
-		const next = startNode.nextSibling;
-		parent.appendChild(startNode);
-		startNode = next;
-	}
-	return parent;
+	return startNode === endNode ? startNode : insertChildNodes(new DocumentFragment(), null, startNode, endNode);
 }
 //#endregion
 //#region src/dom/resolve-cursor-position.ts
@@ -2090,9 +2094,15 @@ function $signalReset(scope, id) {
 	}
 }
 function $signal(scope, id) {
-	if (scope["#ClosestBranch"]) (scope[ClosestBranch][AbortScopes] ||= /* @__PURE__ */ new Set()).add(scope);
+	trackCleanup(scope);
 	return ((scope[AbortControllers] ||= {})[id] ||= new AbortController()).signal;
 }
+/** Enrols `scope` with its branch so destroying the branch cleans it up. */
+function trackCleanup(scope, subscribers) {
+	const branch = scope[ClosestBranch];
+	if (branch) (branch[AbortScopes] ||= /* @__PURE__ */ new Set()).add(scope);
+	if (subscribers) (scope[Subscriptions] ||= []).push(subscribers);
+}
 function abort(ctrl) {
 	ctrl.abort();
 }

package/dist/debug/dom.mjs

@@ -58,6 +58,7 @@ const PlaceholderBranch = "#PlaceholderBranch";
 const PlaceholderContent = "#PlaceholderContent";
 const Renderer = "#Renderer";
 const StartNode = "#StartNode";
+const Subscriptions = "#Subscriptions";
 const TagVariable = "#TagVariable";
 const TagVariableChange = "#TagVariableChange";
 //#endregion
@@ -398,17 +399,21 @@ function destroyBranch(branch) {
 function destroyScope(scope) {
 	if (scope["#Gen"]) {
 		destroyNestedScopes(scope);
-		resetControllers(scope);
+		cleanupScope(scope);
 	}
 }
 const destroyNestedScopes = function destroyNestedScopes(scope) {
 	scope[Gen$1] = 0;
 	scope[BranchScopes]?.forEach(destroyNestedScopes);
-	scope[AbortScopes]?.forEach(resetControllers);
+	scope[AbortScopes]?.forEach(cleanupScope);
 };
-function resetControllers(scope) {
+function cleanupScope(scope) {
+	scope[Subscriptions]?.forEach(unsubscribe, scope);
 	for (const id in scope[AbortControllers]) $signalReset(scope, id);
 }
+function unsubscribe(subscribers) {
+	subscribers.delete(this);
+}
 function removeAndDestroyBranch(branch) {
 	destroyBranch(branch);
 	removeChildNodes(branch[StartNode], branch[EndNode]);
@@ -563,10 +568,8 @@ function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 }
 function subscribeToScopeSet(ownerScope, accessor, scope) {
 	const subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
-	if (!subscribers.has(scope)) {
-		subscribers.add(scope);
-		$signal(scope, -1).addEventListener("abort", () => ownerScope[accessor].delete(scope));
-	}
+	const { size } = subscribers;
+	if (subscribers.add(scope).size !== size) trackCleanup(scope, subscribers);
 }
 function _closure(...closureSignals) {
 	const [firstSignal] = closureSignals;
@@ -1158,18 +1161,19 @@ function removeChildNodes(startNode, endNode) {
 	}
 }
 function insertChildNodes(parentNode, referenceNode, startNode, endNode) {
-	parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+	if (parentNode.isConnected) parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+	else {
+		const stop = endNode.nextSibling;
+		while (startNode !== stop) {
+			const next = startNode.nextSibling;
+			parentNode.insertBefore(startNode, referenceNode);
+			startNode = next;
+		}
+	}
+	return parentNode;
 }
 function toInsertNode(startNode, endNode) {
-	if (startNode === endNode) return startNode;
-	const parent = new DocumentFragment();
-	const stop = endNode.nextSibling;
-	while (startNode !== stop) {
-		const next = startNode.nextSibling;
-		parent.appendChild(startNode);
-		startNode = next;
-	}
-	return parent;
+	return startNode === endNode ? startNode : insertChildNodes(new DocumentFragment(), null, startNode, endNode);
 }
 //#endregion
 //#region src/dom/resolve-cursor-position.ts
@@ -2088,9 +2092,15 @@ function $signalReset(scope, id) {
 	}
 }
 function $signal(scope, id) {
-	if (scope["#ClosestBranch"]) (scope[ClosestBranch][AbortScopes] ||= /* @__PURE__ */ new Set()).add(scope);
+	trackCleanup(scope);
 	return ((scope[AbortControllers] ||= {})[id] ||= new AbortController()).signal;
 }
+/** Enrols `scope` with its branch so destroying the branch cleans it up. */
+function trackCleanup(scope, subscribers) {
+	const branch = scope[ClosestBranch];
+	if (branch) (branch[AbortScopes] ||= /* @__PURE__ */ new Set()).add(scope);
+	if (subscribers) (scope[Subscriptions] ||= []).push(subscribers);
+}
 function abort(ctrl) {
 	ctrl.abort();
 }

package/dist/dom/abort-signal.d.ts

@@ -1,3 +1,5 @@
 import { type Scope } from "../common/types";
 export declare function $signalReset(scope: Scope, id: string | number): void;
 export declare function $signal(scope: Scope, id: string | number): AbortSignal;
+/** Enrols `scope` with its branch so destroying the branch cleans it up. */
+export declare function trackCleanup(scope: Scope, subscribers?: Set<Scope>): void;

package/dist/dom/dom.d.ts

@@ -27,5 +27,5 @@ export declare function _lifecycle(scope: Scope, thisObj: Record<string, unknown
     onDestroy?: (this: unknown) => void;
 }, index?: number): void;
 export declare function removeChildNodes(startNode: ChildNode, endNode: ChildNode): void;
-export declare function insertChildNodes(parentNode: ParentNode, referenceNode: Node | null, startNode: Node, endNode: Node): void;
+export declare function insertChildNodes(parentNode: ParentNode, referenceNode: Node | null, startNode: Node, endNode: Node): ParentNode;
 export declare function toInsertNode(startNode: Node, endNode: Node): Node;

package/dist/dom.js

@@ -5,7 +5,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
 }, decodeAccessor = (num) => (num + (num < 26 ? 10 : num < 962 ? 334 : 11998)).toString(36), delegate = (type, handler) => handler[type] ||= (document.addEventListener(type, handler, !0), 1), parsers = {}, nextScopeId = 1e6, collectingScopes, destroyNestedScopes = function destroyNestedScopes(scope) {
-	scope.H = 0, scope.D?.forEach(destroyNestedScopes), scope.B?.forEach(resetControllers);
+	scope.H = 0, scope.D?.forEach(destroyNestedScopes), scope.B?.forEach(cleanupScope);
 }, isScheduled, channel, _return = (scope, value) => scope.T?.(value), _var_change = (scope, value) => scope.U?.(value), tagIdsByGlobal = /* @__PURE__ */ new WeakMap(), walker = /* @__PURE__ */ document.createTreeWalker(document), walkInternal = function walkInternal(currentWalkIndex, walkCodes, scope) {
 	let value, currentMultiplier, storedMultiplier = 0, currentScopeIndex = 0;
 	for (; currentWalkIndex < walkCodes.length;) if (value = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value === 32) {
@@ -250,11 +250,15 @@ function destroyBranch(branch) {
 	branch.N?.D?.delete(branch), destroyNestedScopes(branch);
 }
 function destroyScope(scope) {
-	scope.H && (destroyNestedScopes(scope), resetControllers(scope));
+	scope.H && (destroyNestedScopes(scope), cleanupScope(scope));
 }
-function resetControllers(scope) {
+function cleanupScope(scope) {
+	scope.Z?.forEach(unsubscribe, scope);
 	for (let id in scope.A) $signalReset(scope, id);
 }
+function unsubscribe(subscribers) {
+	subscribers.delete(this);
+}
 function removeAndDestroyBranch(branch) {
 	destroyBranch(branch), removeChildNodes(branch.S, branch.K);
 }
@@ -347,8 +351,8 @@ function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 	return ownerSignal._ = fn, ownerSignal;
 }
 function subscribeToScopeSet(ownerScope, accessor, scope) {
-	let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
-	subscribers.has(scope) || (subscribers.add(scope), $signal(scope, -1).addEventListener("abort", () => ownerScope[accessor].delete(scope)));
+	let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set(), { size } = subscribers;
+	subscribers.add(scope).size !== size && trackCleanup(scope, subscribers);
 }
 function _closure(...closureSignals) {
 	let [firstSignal] = closureSignals, scopeInstances = firstSignal.a, signalIndex = firstSignal.b;
@@ -702,16 +706,18 @@ function removeChildNodes(startNode, endNode) {
 	}
 }
 function insertChildNodes(parentNode, referenceNode, startNode, endNode) {
-	parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+	if (parentNode.isConnected) parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+	else {
+		let stop = endNode.nextSibling;
+		for (; startNode !== stop;) {
+			let next = startNode.nextSibling;
+			parentNode.insertBefore(startNode, referenceNode), startNode = next;
+		}
+	}
+	return parentNode;
 }
 function toInsertNode(startNode, endNode) {
-	if (startNode === endNode) return startNode;
-	let parent = new DocumentFragment(), stop = endNode.nextSibling;
-	for (; startNode !== stop;) {
-		let next = startNode.nextSibling;
-		parent.appendChild(startNode), startNode = next;
-	}
-	return parent;
+	return startNode === endNode ? startNode : insertChildNodes(new DocumentFragment(), null, startNode, endNode);
 }
 //#endregion
 //#region src/dom/resolve-cursor-position.ts
@@ -1242,7 +1248,12 @@ function $signalReset(scope, id) {
 	ctrl && (scope.A[id] = void 0, rendering ? queueEffect(ctrl, abort) : abort(ctrl));
 }
 function $signal(scope, id) {
-	return scope.F && (scope.F.B ||= /* @__PURE__ */ new Set()).add(scope), ((scope.A ||= {})[id] ||= new AbortController()).signal;
+	return trackCleanup(scope), ((scope.A ||= {})[id] ||= new AbortController()).signal;
+}
+/** Enrols `scope` with its branch so destroying the branch cleans it up. */
+function trackCleanup(scope, subscribers) {
+	let branch = scope.F;
+	branch && (branch.B ||= /* @__PURE__ */ new Set()).add(scope), subscribers && (scope.Z ||= []).push(subscribers);
 }
 function abort(ctrl) {
 	ctrl.abort();

package/dist/dom.mjs

@@ -5,7 +5,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
 }, decodeAccessor = (num) => (num + (num < 26 ? 10 : num < 962 ? 334 : 11998)).toString(36), delegate = (type, handler) => handler[type] ||= (document.addEventListener(type, handler, !0), 1), parsers = {}, nextScopeId = 1e6, collectingScopes, destroyNestedScopes = function destroyNestedScopes(scope) {
-	scope.H = 0, scope.D?.forEach(destroyNestedScopes), scope.B?.forEach(resetControllers);
+	scope.H = 0, scope.D?.forEach(destroyNestedScopes), scope.B?.forEach(cleanupScope);
 }, isScheduled, channel, _return = (scope, value) => scope.T?.(value), _var_change = (scope, value) => scope.U?.(value), tagIdsByGlobal = /* @__PURE__ */ new WeakMap(), walker = /* @__PURE__ */ document.createTreeWalker(document), walkInternal = function walkInternal(currentWalkIndex, walkCodes, scope) {
 	let value, currentMultiplier, storedMultiplier = 0, currentScopeIndex = 0;
 	for (; currentWalkIndex < walkCodes.length;) if (value = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value === 32) {
@@ -249,11 +249,15 @@ function destroyBranch(branch) {
 	branch.N?.D?.delete(branch), destroyNestedScopes(branch);
 }
 function destroyScope(scope) {
-	scope.H && (destroyNestedScopes(scope), resetControllers(scope));
+	scope.H && (destroyNestedScopes(scope), cleanupScope(scope));
 }
-function resetControllers(scope) {
+function cleanupScope(scope) {
+	scope.Z?.forEach(unsubscribe, scope);
 	for (let id in scope.A) $signalReset(scope, id);
 }
+function unsubscribe(subscribers) {
+	subscribers.delete(this);
+}
 function removeAndDestroyBranch(branch) {
 	destroyBranch(branch), removeChildNodes(branch.S, branch.K);
 }
@@ -346,8 +350,8 @@ function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 	return ownerSignal._ = fn, ownerSignal;
 }
 function subscribeToScopeSet(ownerScope, accessor, scope) {
-	let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set();
-	subscribers.has(scope) || (subscribers.add(scope), $signal(scope, -1).addEventListener("abort", () => ownerScope[accessor].delete(scope)));
+	let subscribers = ownerScope[accessor] ||= /* @__PURE__ */ new Set(), { size } = subscribers;
+	subscribers.add(scope).size !== size && trackCleanup(scope, subscribers);
 }
 function _closure(...closureSignals) {
 	let [firstSignal] = closureSignals, scopeInstances = firstSignal.a, signalIndex = firstSignal.b;
@@ -701,16 +705,18 @@ function removeChildNodes(startNode, endNode) {
 	}
 }
 function insertChildNodes(parentNode, referenceNode, startNode, endNode) {
-	parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+	if (parentNode.isConnected) parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+	else {
+		let stop = endNode.nextSibling;
+		for (; startNode !== stop;) {
+			let next = startNode.nextSibling;
+			parentNode.insertBefore(startNode, referenceNode), startNode = next;
+		}
+	}
+	return parentNode;
 }
 function toInsertNode(startNode, endNode) {
-	if (startNode === endNode) return startNode;
-	let parent = new DocumentFragment(), stop = endNode.nextSibling;
-	for (; startNode !== stop;) {
-		let next = startNode.nextSibling;
-		parent.appendChild(startNode), startNode = next;
-	}
-	return parent;
+	return startNode === endNode ? startNode : insertChildNodes(new DocumentFragment(), null, startNode, endNode);
 }
 //#endregion
 //#region src/dom/resolve-cursor-position.ts
@@ -1241,7 +1247,12 @@ function $signalReset(scope, id) {
 	ctrl && (scope.A[id] = void 0, rendering ? queueEffect(ctrl, abort) : abort(ctrl));
 }
 function $signal(scope, id) {
-	return scope.F && (scope.F.B ||= /* @__PURE__ */ new Set()).add(scope), ((scope.A ||= {})[id] ||= new AbortController()).signal;
+	return trackCleanup(scope), ((scope.A ||= {})[id] ||= new AbortController()).signal;
+}
+/** Enrols `scope` with its branch so destroying the branch cleans it up. */
+function trackCleanup(scope, subscribers) {
+	let branch = scope.F;
+	branch && (branch.B ||= /* @__PURE__ */ new Set()).add(scope), subscribers && (scope.Z ||= []).push(subscribers);
 }
 function abort(ctrl) {
 	ctrl.abort();

package/dist/translator/index.js

@@ -162,6 +162,7 @@ var accessor_prop_debug_exports = /* @__PURE__ */ __exportAll({
 	PlaceholderContent: () => PlaceholderContent$1,
 	Renderer: () => Renderer$1,
 	StartNode: () => StartNode$1,
+	Subscriptions: () => Subscriptions$1,
 	TagVariable: () => TagVariable$1,
 	TagVariableChange: () => TagVariableChange$2
 });
@@ -188,6 +189,7 @@ const PlaceholderBranch$1 = "#PlaceholderBranch";
 const PlaceholderContent$1 = "#PlaceholderContent";
 const Renderer$1 = "#Renderer";
 const StartNode$1 = "#StartNode";
+const Subscriptions$1 = "#Subscriptions";
 const TagVariable$1 = "#TagVariable";
 const TagVariableChange$2 = "#TagVariableChange";
 //#endregion
@@ -948,6 +950,7 @@ var accessor_prop_exports = /* @__PURE__ */ __exportAll({
 	PlaceholderContent: () => "Q",
 	Renderer: () => "R",
 	StartNode: () => "S",
+	Subscriptions: () => "Z",
 	TagVariable: () => "T",
 	TagVariableChange: () => "U"
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.29",
+  "version": "6.3.30",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -54,7 +54,7 @@
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.3.29",
+    "@marko/runtime-tags": "npm:marko@6.3.30",
     "marko": "5.39.30"
   },
   "engines": {