marko 6.3.34 → 6.3.35

package/dist/{dom-6hBvZW7X.mjs → dom-BP2XSglG.mjs}

@@ -52,7 +52,7 @@ let unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeStyleAttr = (c) => c === ";" ? "
 	let childScopeAccessor = "A" + nodeAccessor, rendererAccessor = "D" + nodeAccessor;
 	return (scope, newRenderer, getInput) => {
 		let normalizedRenderer = normalizeDynamicRenderer(newRenderer);
-		if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.a || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) if (setConditionalRenderer(scope, nodeAccessor, normalizedRenderer || (getContent ? getContent(scope) : void 0), createBranchWithTagNameOrRenderer), getTagVar && (scope[childScopeAccessor].T = (value) => getTagVar()(scope, value)), typeof normalizedRenderer == "string") {
+		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(normalizedRenderer)) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) if (setConditionalRenderer(scope, nodeAccessor, normalizedRenderer || (getContent ? getContent(scope) : void 0), createBranchWithTagNameOrRenderer), getTagVar && (scope[childScopeAccessor] ? scope[childScopeAccessor].T = (value) => getTagVar()(scope, value) : getTagVar()(scope, void 0)), typeof normalizedRenderer == "string") {
 			if (getContent) {
 				let content = getContent(scope);
 				setConditionalRenderer(scope[childScopeAccessor], "a", content, createAndSetupBranch), content.f && subscribeToScopeSet(content.e, content.f, scope[childScopeAccessor].Aa);
@@ -78,7 +78,7 @@ let unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeStyleAttr = (c) => c === ";" ? "
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let childScopeAccessor = "A" + nodeAccessor, rendererAccessor = "D" + nodeAccessor;
 	return (scope, renderer) => {
-		if (scope[rendererAccessor] !== (scope[rendererAccessor] = renderer?.a || renderer) && (setConditionalRenderer(scope, nodeAccessor, renderer, createAndSetupBranch), renderer?.f && subscribeToScopeSet(renderer.e, renderer.f, scope[childScopeAccessor])), renderer) for (let accessor in renderer.g) renderer.g[accessor](scope[childScopeAccessor], renderer.h[accessor]);
+		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(renderer)) && (setConditionalRenderer(scope, nodeAccessor, renderer, createAndSetupBranch), renderer?.f && subscribeToScopeSet(renderer.e, renderer.f, scope[childScopeAccessor])), renderer) for (let accessor in renderer.g) renderer.g[accessor](scope[childScopeAccessor], renderer.h[accessor]);
 	};
 }), _resume_dynamic_tag = /*@__PURE__*/ withBranches(() => _resume("d", dynamicTagScript)), loop = /*@__PURE__*/ withBranches((forEach) => (nodeAccessor, template, walks, setup, params) => {
 	nodeAccessor = decodeAccessor(nodeAccessor);
@@ -462,9 +462,13 @@ function _var(scope, childAccessor, signal) {
 function _return_change(scope, changeHandler) {
 	scope.U = changeHandler || void 0;
 }
-function _id({ $: $global }) {
-	let id = tagIdsByGlobal.get($global) || 0;
-	return tagIdsByGlobal.set($global, id + 1), "c" + $global.runtimeId + $global.renderId + id.toString(36);
+function _id(scope, accessor) {
+	let id = accessor !== void 0 && scope[accessor];
+	if (!id) {
+		let $global = scope.$, n = tagIdsByGlobal.get($global) || 0;
+		tagIdsByGlobal.set($global, n + 1), id = "c" + $global.runtimeId + $global.renderId + n.toString(36), accessor !== void 0 && (scope[accessor] = id);
+	}
+	return id;
 }
 function _script(id, fn) {
 	return _resume(id, fn), (scope) => {
@@ -474,17 +478,17 @@ function _script(id, fn) {
 function _el_read(value) {
 	return value;
 }
-function* traverse(scope, path, i = path.length - 1) {
-	if (scope) if (Symbol.iterator in scope) for (let childScope of scope.values()) yield* traverse(childScope, path, i);
+function* traverse(scope, path, args, i = path.length - 1) {
+	if (scope) if (Symbol.iterator in scope) for (let childScope of scope.values()) yield* traverse(childScope, path, args, i);
 	else {
 		let item = scope[path[i]];
-		i ? yield* traverse(item, path, i - 1) : yield typeof item == "function" ? item() : item;
+		i ? yield* traverse(item, path, args, i - 1) : yield typeof item == "function" ? item(...args) : item;
 	}
 }
 function _hoist(...path) {
 	return path = path.map((p) => typeof p == "string" ? p : decodeAccessor(p)), (scope) => {
-		let fn = () => traverse(scope, path).next().value;
-		return fn[Symbol.iterator] = () => traverse(scope, path), fn;
+		let fn = (...args) => traverse(scope, path, args).next().value;
+		return fn[Symbol.iterator] = () => traverse(scope, path, []), fn;
 	};
 }
 function _hoist_resume(id, ...path) {
@@ -756,7 +760,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs, controllable) {
 }
 function _attr_content(scope, nodeAccessor, value) {
 	let content = normalizeClientRender(value);
-	scope["D" + nodeAccessor] !== (scope["D" + nodeAccessor] = content?.a) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.f && subscribeToScopeSet(content.e, content.f, scope["A" + nodeAccessor]));
+	scope["D" + nodeAccessor] !== (scope["D" + nodeAccessor] = rendererKey(content)) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.f && subscribeToScopeSet(content.e, content.f, scope["A" + nodeAccessor]));
 	for (let accessor in content?.g) content.g[accessor](scope["A" + nodeAccessor], content.h[accessor]);
 }
 function _attrs_script(scope, nodeAccessor) {
@@ -874,7 +878,7 @@ function _attr_input_value_dynamic_default(scope, nodeAccessor, value) {
 }
 function _attr_input_value(scope, nodeAccessor, value, valueChange, setDefault = _attr_input_value_default) {
 	let el = scope[nodeAccessor], normalizedValue = normalizeAttrValue(value) || "";
-	scope["E" + nodeAccessor] = valueChange, scope["G" + nodeAccessor] = normalizedValue, scope["F" + nodeAccessor] = valueChange ? 2 : 5, valueChange && scope.H < runId ? setInputValue(el, normalizedValue) : setDefault(scope, nodeAccessor, normalizedValue);
+	scope["E" + nodeAccessor] = valueChange, scope["G" + nodeAccessor] = normalizedValue, scope["F" + nodeAccessor] = valueChange ? 2 : 5, valueChange && scope.H < runId ? setInputValue(el, normalizedValue) : setDefault(scope, nodeAccessor, value);
 }
 function _attr_input_value_attribute_default(scope, nodeAccessor, value) {
 	_attr(scope[nodeAccessor], "value", value);
@@ -1119,6 +1123,9 @@ function renderCatch(scope, error) {
 		placeholderBranch && (tryWithCatch.O && (tryWithCatch.O.i = 0), owner["A" + tryWithCatch.C] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(owner, tryWithCatch.C, tryWithCatch.E, createAndSetupBranch), tryWithCatch.E?.d?.(owner["A" + tryWithCatch.C], [error]);
 	} else throw error;
 }
+function rendererKey(renderer) {
+	return renderer?.e ? renderer.a + " " + renderer.e.L : renderer?.a || renderer;
+}
 function patchDynamicTag(fn) {
 	_dynamic_tag = fn(_dynamic_tag);
 }

package/dist/{dom-B-XpL2_H.js → dom-BeF9xIzO.js}

@@ -52,7 +52,7 @@ let unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeStyleAttr = (c) => c === ";" ? "
 	let childScopeAccessor = "A" + nodeAccessor, rendererAccessor = "D" + nodeAccessor;
 	return (scope, newRenderer, getInput) => {
 		let normalizedRenderer = normalizeDynamicRenderer(newRenderer);
-		if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.a || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) if (setConditionalRenderer(scope, nodeAccessor, normalizedRenderer || (getContent ? getContent(scope) : void 0), createBranchWithTagNameOrRenderer), getTagVar && (scope[childScopeAccessor].T = (value) => getTagVar()(scope, value)), typeof normalizedRenderer == "string") {
+		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(normalizedRenderer)) || getContent && !(normalizedRenderer || scope[childScopeAccessor])) if (setConditionalRenderer(scope, nodeAccessor, normalizedRenderer || (getContent ? getContent(scope) : void 0), createBranchWithTagNameOrRenderer), getTagVar && (scope[childScopeAccessor] ? scope[childScopeAccessor].T = (value) => getTagVar()(scope, value) : getTagVar()(scope, void 0)), typeof normalizedRenderer == "string") {
 			if (getContent) {
 				let content = getContent(scope);
 				setConditionalRenderer(scope[childScopeAccessor], "a", content, createAndSetupBranch), content.f && subscribeToScopeSet(content.e, content.f, scope[childScopeAccessor].Aa);
@@ -78,7 +78,7 @@ let unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeStyleAttr = (c) => c === ";" ? "
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let childScopeAccessor = "A" + nodeAccessor, rendererAccessor = "D" + nodeAccessor;
 	return (scope, renderer) => {
-		if (scope[rendererAccessor] !== (scope[rendererAccessor] = renderer?.a || renderer) && (setConditionalRenderer(scope, nodeAccessor, renderer, createAndSetupBranch), renderer?.f && subscribeToScopeSet(renderer.e, renderer.f, scope[childScopeAccessor])), renderer) for (let accessor in renderer.g) renderer.g[accessor](scope[childScopeAccessor], renderer.h[accessor]);
+		if (scope[rendererAccessor] !== (scope[rendererAccessor] = rendererKey(renderer)) && (setConditionalRenderer(scope, nodeAccessor, renderer, createAndSetupBranch), renderer?.f && subscribeToScopeSet(renderer.e, renderer.f, scope[childScopeAccessor])), renderer) for (let accessor in renderer.g) renderer.g[accessor](scope[childScopeAccessor], renderer.h[accessor]);
 	};
 }), _resume_dynamic_tag = /*@__PURE__*/ withBranches(() => _resume("d", dynamicTagScript)), loop = /*@__PURE__*/ withBranches((forEach) => (nodeAccessor, template, walks, setup, params) => {
 	nodeAccessor = decodeAccessor(nodeAccessor);
@@ -462,9 +462,13 @@ function _var(scope, childAccessor, signal) {
 function _return_change(scope, changeHandler) {
 	scope.U = changeHandler || void 0;
 }
-function _id({ $: $global }) {
-	let id = tagIdsByGlobal.get($global) || 0;
-	return tagIdsByGlobal.set($global, id + 1), "c" + $global.runtimeId + $global.renderId + id.toString(36);
+function _id(scope, accessor) {
+	let id = accessor !== void 0 && scope[accessor];
+	if (!id) {
+		let $global = scope.$, n = tagIdsByGlobal.get($global) || 0;
+		tagIdsByGlobal.set($global, n + 1), id = "c" + $global.runtimeId + $global.renderId + n.toString(36), accessor !== void 0 && (scope[accessor] = id);
+	}
+	return id;
 }
 function _script(id, fn) {
 	return _resume(id, fn), (scope) => {
@@ -474,17 +478,17 @@ function _script(id, fn) {
 function _el_read(value) {
 	return value;
 }
-function* traverse(scope, path, i = path.length - 1) {
-	if (scope) if (Symbol.iterator in scope) for (let childScope of scope.values()) yield* traverse(childScope, path, i);
+function* traverse(scope, path, args, i = path.length - 1) {
+	if (scope) if (Symbol.iterator in scope) for (let childScope of scope.values()) yield* traverse(childScope, path, args, i);
 	else {
 		let item = scope[path[i]];
-		i ? yield* traverse(item, path, i - 1) : yield typeof item == "function" ? item() : item;
+		i ? yield* traverse(item, path, args, i - 1) : yield typeof item == "function" ? item(...args) : item;
 	}
 }
 function _hoist(...path) {
 	return path = path.map((p) => typeof p == "string" ? p : decodeAccessor(p)), (scope) => {
-		let fn = () => traverse(scope, path).next().value;
-		return fn[Symbol.iterator] = () => traverse(scope, path), fn;
+		let fn = (...args) => traverse(scope, path, args).next().value;
+		return fn[Symbol.iterator] = () => traverse(scope, path, []), fn;
 	};
 }
 function _hoist_resume(id, ...path) {
@@ -756,7 +760,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs, controllable) {
 }
 function _attr_content(scope, nodeAccessor, value) {
 	let content = normalizeClientRender(value);
-	scope["D" + nodeAccessor] !== (scope["D" + nodeAccessor] = content?.a) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.f && subscribeToScopeSet(content.e, content.f, scope["A" + nodeAccessor]));
+	scope["D" + nodeAccessor] !== (scope["D" + nodeAccessor] = rendererKey(content)) && (setConditionalRenderer(scope, nodeAccessor, content, createAndSetupBranch), content?.f && subscribeToScopeSet(content.e, content.f, scope["A" + nodeAccessor]));
 	for (let accessor in content?.g) content.g[accessor](scope["A" + nodeAccessor], content.h[accessor]);
 }
 function _attrs_script(scope, nodeAccessor) {
@@ -874,7 +878,7 @@ function _attr_input_value_dynamic_default(scope, nodeAccessor, value) {
 }
 function _attr_input_value(scope, nodeAccessor, value, valueChange, setDefault = _attr_input_value_default) {
 	let el = scope[nodeAccessor], normalizedValue = normalizeAttrValue(value) || "";
-	scope["E" + nodeAccessor] = valueChange, scope["G" + nodeAccessor] = normalizedValue, scope["F" + nodeAccessor] = valueChange ? 2 : 5, valueChange && scope.H < runId ? setInputValue(el, normalizedValue) : setDefault(scope, nodeAccessor, normalizedValue);
+	scope["E" + nodeAccessor] = valueChange, scope["G" + nodeAccessor] = normalizedValue, scope["F" + nodeAccessor] = valueChange ? 2 : 5, valueChange && scope.H < runId ? setInputValue(el, normalizedValue) : setDefault(scope, nodeAccessor, value);
 }
 function _attr_input_value_attribute_default(scope, nodeAccessor, value) {
 	_attr(scope[nodeAccessor], "value", value);
@@ -1119,6 +1123,9 @@ function renderCatch(scope, error) {
 		placeholderBranch && (tryWithCatch.O && (tryWithCatch.O.i = 0), owner["A" + tryWithCatch.C] = placeholderBranch, destroyBranch(tryWithCatch)), caughtError.add(pendingEffects), setConditionalRenderer(owner, tryWithCatch.C, tryWithCatch.E, createAndSetupBranch), tryWithCatch.E?.d?.(owner["A" + tryWithCatch.C], [error]);
 	} else throw error;
 }
+function rendererKey(renderer) {
+	return renderer?.e ? renderer.a + " " + renderer.e.L : renderer?.a || renderer;
+}
 function patchDynamicTag(fn) {
 	_dynamic_tag = fn(_dynamic_tag);
 }

package/dist/dom.js

@@ -1,4 +1,4 @@
-let require_control_flow = require("./dom-B-XpL2_H.js"), empty = [], rest = Symbol(), classIdToBranch = /* @__PURE__ */ new Map(), classEventResolver, scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
+let require_control_flow = require("./dom-BeF9xIzO.js"), empty = [], rest = Symbol(), classIdToBranch = /* @__PURE__ */ new Map(), classEventResolver, scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
 	require_control_flow.vt($global.runtimeId);
 	let render = self[$global.runtimeId]?.[$global.renderId], scopes = render && scopesByRender.get(render);
 	return render && !scopes && scopesByRender.set(render, scopes = {}), scopes;

package/dist/dom.mjs

@@ -65,7 +65,7 @@ let empty = [], rest = Symbol(), classIdToBranch = /* @__PURE__ */ new Map(), cl
 	let renderer = _content(id, template, walks, setup, inputSignal)();
 	return renderer.mount = mount, renderer._ = renderer, _resume(id, renderer);
 };
-import { $ as _html, $t as queueEffect, A as _attr_select_value, At as _id, B as _attr_class, Bt as _assert_init, C as _attr_input_checked_default, Ct as _closure_get, D as _attr_input_value_default, Dt as _for_selector, E as _attr_input_value_attribute_default, Et as _for_closure, F as _controllable_select, Ft as _return, G as _attr_style, Gt as _on, H as _attr_class_items, Ht as insertBranchBefore, I as _controllable_textarea, It as _return_change, J as _attrs, K as _attr_style_item, Kt as $signal, Lt as _script, M as _attr_select_value_script, Mt as _let, N as _controllable_input, Nt as _let_change, O as _attr_input_value_dynamic_default, Ot as _hoist, P as _controllable_open, Pt as _or, Q as _attrs_script, Qt as queueAsyncRender, Rt as _var, S as _attr_input_checkedValue_script, St as _closure, T as _attr_input_value, Tt as _el_read, U as _attr_content, Ut as removeAndDestroyBranch, V as _attr_class_item, Vt as destroyBranch, W as _attr_nonce, Wt as syncGen, X as _attrs_partial, Y as _attrs_content, Z as _attrs_partial_content, Zt as prepareEffects, _ as _attr_details_or_dialog_open_default, _t as getRegisteredWithScope, a as _for_in, an as forTo, at as _to_text, b as _attr_input_checkedValue, bt as ready, c as _for_until, cn as _call, ct as _content, d as _show, dt as createAndSetupBranch, en as run, et as _lifecycle, f as _try, ft as createBranch, g as _attr_details_or_dialog_open, gt as _var_resume, h as renderCatch, ht as _resume, i as _dynamic_tag_content, in as forOf, it as _text_content, j as _attr_select_value_default, jt as _if_closure, k as _attr_input_value_script, kt as _hoist_resume, l as _if, ln as decodeAccessor, lt as _content_closures, m as patchDynamicTag, mt as _el, n as _await_promise, nn as runId, nt as _style_shell, o as _for_of, on as forUntil, ot as insertChildNodes, p as addAwaitCounter, pt as setupBranch, q as _attr_style_items, qt as $signalReset, r as _dynamic_tag, rn as forIn, rt as _text, s as _for_to, sn as _assert_hoist, st as toInsertNode, t as _await_content, tn as runEffects, tt as _style_rule_item, u as _resume_dynamic_tag, ut as _content_resume, v as _attr_details_or_dialog_open_script, vt as init, w as _attr_input_checked_script, wt as _const, x as _attr_input_checkedValue_default, xt as _child_setup, y as _attr_input_checked, yt as initEmbedded, z as _attr, zt as _var_change } from "./dom-6hBvZW7X.mjs";
+import { $ as _html, $t as queueEffect, A as _attr_select_value, At as _id, B as _attr_class, Bt as _assert_init, C as _attr_input_checked_default, Ct as _closure_get, D as _attr_input_value_default, Dt as _for_selector, E as _attr_input_value_attribute_default, Et as _for_closure, F as _controllable_select, Ft as _return, G as _attr_style, Gt as _on, H as _attr_class_items, Ht as insertBranchBefore, I as _controllable_textarea, It as _return_change, J as _attrs, K as _attr_style_item, Kt as $signal, Lt as _script, M as _attr_select_value_script, Mt as _let, N as _controllable_input, Nt as _let_change, O as _attr_input_value_dynamic_default, Ot as _hoist, P as _controllable_open, Pt as _or, Q as _attrs_script, Qt as queueAsyncRender, Rt as _var, S as _attr_input_checkedValue_script, St as _closure, T as _attr_input_value, Tt as _el_read, U as _attr_content, Ut as removeAndDestroyBranch, V as _attr_class_item, Vt as destroyBranch, W as _attr_nonce, Wt as syncGen, X as _attrs_partial, Y as _attrs_content, Z as _attrs_partial_content, Zt as prepareEffects, _ as _attr_details_or_dialog_open_default, _t as getRegisteredWithScope, a as _for_in, an as forTo, at as _to_text, b as _attr_input_checkedValue, bt as ready, c as _for_until, cn as _call, ct as _content, d as _show, dt as createAndSetupBranch, en as run, et as _lifecycle, f as _try, ft as createBranch, g as _attr_details_or_dialog_open, gt as _var_resume, h as renderCatch, ht as _resume, i as _dynamic_tag_content, in as forOf, it as _text_content, j as _attr_select_value_default, jt as _if_closure, k as _attr_input_value_script, kt as _hoist_resume, l as _if, ln as decodeAccessor, lt as _content_closures, m as patchDynamicTag, mt as _el, n as _await_promise, nn as runId, nt as _style_shell, o as _for_of, on as forUntil, ot as insertChildNodes, p as addAwaitCounter, pt as setupBranch, q as _attr_style_items, qt as $signalReset, r as _dynamic_tag, rn as forIn, rt as _text, s as _for_to, sn as _assert_hoist, st as toInsertNode, t as _await_content, tn as runEffects, tt as _style_rule_item, u as _resume_dynamic_tag, ut as _content_resume, v as _attr_details_or_dialog_open_script, vt as init, w as _attr_input_checked_script, wt as _const, x as _attr_input_checkedValue_default, xt as _child_setup, y as _attr_input_checked, yt as initEmbedded, z as _attr, zt as _var_change } from "./dom-BP2XSglG.mjs";
 //#region src/common/attr-tag.ts
 function attrTag(attrs) {
 	return attrs[Symbol.iterator] = attrTagIterator, attrs[rest] = empty, attrs;

package/dist/html/dynamic-tag.d.ts

@@ -5,7 +5,7 @@ interface BodyContentObject {
     content: ServerRenderer;
 }
 export declare let _dynamic_tag: (scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, inputOrArgs: unknown, content?: (() => void) | 0, inputIsArgs?: 1, serializeReason?: 1 | 0) => unknown;
-export declare function _content(id: string, fn: ServerRenderer): ServerRenderer;
+export declare function _content(id: string, fn: ServerRenderer, scopeId?: number): ServerRenderer;
 export declare function _content_resume(id: string, fn: ServerRenderer, scopeId?: number): ServerRenderer;
 export declare const patchDynamicTag: (patch: (tag: unknown, scopeId: number, accessor: Accessor) => unknown) => void;
 export {};

package/dist/html/serializer.d.ts

@@ -5,7 +5,14 @@ export interface SerializeChannel {
     readyId?: string;
     parent?: SerializeChannel;
 }
-export declare function setDebugInfo(obj: WeakKey, file: string, loc: string | 0, vars?: Record<string, string>): void;
+interface Debug {
+    file: string;
+    loc: string | 0;
+    vars: Record<string, string | [name: string, loc?: string]> | undefined;
+    slots?: Record<string, string>;
+}
+export declare function setDebugInfo(obj: WeakKey, file: string, loc: string | 0, vars?: Debug["vars"]): void;
+export declare function setDebugSlotName(obj: WeakKey, accessor: string, name: string): void;
 export declare class Serializer {
     #private;
     pending(channel?: SerializeChannel): boolean;
@@ -23,3 +30,4 @@ export declare function getRegistered(val: WeakKey): {
 export declare function toObjectKey(name: string): string;
 export declare function toAccess(accessor: string): string;
 export declare function quote(str: string, startPos: number): string;
+export {};

package/dist/html/template.d.ts

@@ -1,6 +1,7 @@
 import { RendererProp, type Template } from "../common/types";
 export type ServerRenderer = ((...args: unknown[]) => unknown) & {
     [RendererProp.Id]?: string;
+    [RendererProp.Owner]?: number;
     [RendererProp.Embed]?: boolean;
 };
 export declare const _template: (templateId: string, renderer: ServerRenderer, page?: 1) => Template;

package/dist/html/writer.d.ts

@@ -21,6 +21,7 @@ export declare function getChunk(): Chunk | undefined;
 export declare function withChunk<T>(chunk: Chunk, cb: () => T): T;
 export declare function getContext(key: keyof NonNullable<Chunk["context"]>): unknown;
 export declare function getState(): State;
+export declare function rendererKey(renderer: unknown): unknown;
 export declare function getScopeId(scope: unknown): number | undefined;
 export declare function getScopeById(scopeId: number | undefined): ScopeInternals | undefined;
 export declare function $global(): $Global & {

package/dist/html.js

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&\r]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -278,7 +278,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 		};
 		result = shouldResume ? withBranchId(branchId, render) : render(), rendered = _peek_scope_id() !== branchId, beforeBranch !== void 0 && (applyBranchStart(chunk, beforeBranch, rendered), _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : ""))));
 	}
-	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: renderer?.a || renderer }) : _scope_id(), result;
+	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: rendererKey(renderer) }) : _scope_id(), result;
 }, patchDynamicTag = ((originalDynamicTag) => (patch) => {
 	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
 		let patched = patch(tag, scopeId, accessor);
@@ -1264,6 +1264,9 @@ function getContext(key) {
 function getState() {
 	return $chunk.boundary.state;
 }
+function rendererKey(renderer) {
+	return renderer?.e === void 0 ? renderer?.a || renderer : renderer.a + " " + renderer.e;
+}
 function getScopeId(scope) {
 	return scope[K_SCOPE_ID];
 }
@@ -1342,7 +1345,7 @@ function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
 	let shouldResume = serializeReason !== 0, render = normalizeServerRender(content), branchId = _peek_scope_id();
 	render && (shouldResume ? withBranchId(branchId, render) : render()), _peek_scope_id() === branchId ? _scope_id() : shouldResume && writeScope(scopeId, {
 		["A" + nodeAccessor]: writeScope(branchId, {}),
-		["D" + nodeAccessor]: render?.a
+		["D" + nodeAccessor]: rendererKey(render)
 	});
 }
 function normalizeServerRender(value) {
@@ -1857,7 +1860,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, seriali
 }
 function _textarea_value(value) {
 	let escaped = _escape(normalizeStrAttrValue(value));
-	return escaped[0] === "\n" || escaped[0] === "\r" ? "\n" + escaped : escaped;
+	return escaped[0] === "\n" ? "\n" + escaped : escaped;
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _attr("value", value);
@@ -1994,11 +1997,11 @@ function normalizeStrAttrValue(value) {
 }
 //#endregion
 //#region src/html/dynamic-tag.ts
-function _content(id, fn) {
-	return fn.a = id, fn;
+function _content(id, fn, scopeId) {
+	return fn.a = id, fn.e = scopeId, fn;
 }
 function _content_resume(id, fn, scopeId) {
-	return _resume(_content(id, fn), id, scopeId);
+	return _resume(_content(id, fn, scopeId), id, scopeId);
 }
 //#endregion
 //#region src/html/template.ts
@@ -2209,14 +2212,17 @@ function writeTriggerScript(html, triggers) {
 	let htmlStr = _escape_script(JSON.stringify(html)), exprs = triggers.map((trigger) => {
 		let options = trigger.options && toObjectExpression(trigger.options);
 		switch (trigger.type) {
-			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(${querySelectorOrLoad(trigger.selector)})`;
 			case "idle": return `(self.requestIdleCallback||l)(l${options ? `,${options}` : ""})`;
 			case "media": return `(m=>m.matches?l():m.addEventListener("change",l,{once:1}))(matchMedia(${JSON.stringify(trigger.selector)}))`;
-			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(${querySelectorOrLoad(trigger.selector)})`;
 		}
 	});
 	writeScript(`((p,h,d,l=$=>{d||p.after(new Range().createContextualFragment(d=h))})=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
 }
+function querySelectorOrLoad(selector) {
+	return `document.querySelector(${JSON.stringify(selector)})||l()`;
+}
 function toObjectExpression(options) {
 	let result = "{", sep = "";
 	for (let key in options) Object.hasOwn(options, key) && (result += sep + toObjectKey(key) + ":" + JSON.stringify(options[key]), sep = ",");

package/dist/html.mjs

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&\r]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<(\/style)/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -278,7 +278,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 		};
 		result = shouldResume ? withBranchId(branchId, render) : render(), rendered = _peek_scope_id() !== branchId, beforeBranch !== void 0 && (applyBranchStart(chunk, beforeBranch, rendered), _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : ""))));
 	}
-	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: renderer?.a || renderer }) : _scope_id(), result;
+	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: rendererKey(renderer) }) : _scope_id(), result;
 }, patchDynamicTag = ((originalDynamicTag) => (patch) => {
 	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
 		let patched = patch(tag, scopeId, accessor);
@@ -1263,6 +1263,9 @@ function getContext(key) {
 function getState() {
 	return $chunk.boundary.state;
 }
+function rendererKey(renderer) {
+	return renderer?.e === void 0 ? renderer?.a || renderer : renderer.a + " " + renderer.e;
+}
 function getScopeId(scope) {
 	return scope[K_SCOPE_ID];
 }
@@ -1341,7 +1344,7 @@ function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
 	let shouldResume = serializeReason !== 0, render = normalizeServerRender(content), branchId = _peek_scope_id();
 	render && (shouldResume ? withBranchId(branchId, render) : render()), _peek_scope_id() === branchId ? _scope_id() : shouldResume && writeScope(scopeId, {
 		["A" + nodeAccessor]: writeScope(branchId, {}),
-		["D" + nodeAccessor]: render?.a
+		["D" + nodeAccessor]: rendererKey(render)
 	});
 }
 function normalizeServerRender(value) {
@@ -1856,7 +1859,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, seriali
 }
 function _textarea_value(value) {
 	let escaped = _escape(normalizeStrAttrValue(value));
-	return escaped[0] === "\n" || escaped[0] === "\r" ? "\n" + escaped : escaped;
+	return escaped[0] === "\n" ? "\n" + escaped : escaped;
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _attr("value", value);
@@ -1993,11 +1996,11 @@ function normalizeStrAttrValue(value) {
 }
 //#endregion
 //#region src/html/dynamic-tag.ts
-function _content(id, fn) {
-	return fn.a = id, fn;
+function _content(id, fn, scopeId) {
+	return fn.a = id, fn.e = scopeId, fn;
 }
 function _content_resume(id, fn, scopeId) {
-	return _resume(_content(id, fn), id, scopeId);
+	return _resume(_content(id, fn, scopeId), id, scopeId);
 }
 //#endregion
 //#region src/html/template.ts
@@ -2208,14 +2211,17 @@ function writeTriggerScript(html, triggers) {
 	let htmlStr = _escape_script(JSON.stringify(html)), exprs = triggers.map((trigger) => {
 		let options = trigger.options && toObjectExpression(trigger.options);
 		switch (trigger.type) {
-			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(${querySelectorOrLoad(trigger.selector)})`;
 			case "idle": return `(self.requestIdleCallback||l)(l${options ? `,${options}` : ""})`;
 			case "media": return `(m=>m.matches?l():m.addEventListener("change",l,{once:1}))(matchMedia(${JSON.stringify(trigger.selector)}))`;
-			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(${querySelectorOrLoad(trigger.selector)})`;
 		}
 	});
 	writeScript(`((p,h,d,l=$=>{d||p.after(new Range().createContextualFragment(d=h))})=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
 }
+function querySelectorOrLoad(selector) {
+	return `document.querySelector(${JSON.stringify(selector)})||l()`;
+}
 function toObjectExpression(options) {
 	let result = "{", sep = "";
 	for (let key in options) Object.hasOwn(options, key) && (result += sep + toObjectKey(key) + ":" + JSON.stringify(options[key]), sep = ",");