@askrjs/askr 0.4.0 → 0.4.2

package/dist/{render-sync-IC5lMFpq.js → render-sync-Qz-9Hcqw.js}

@@ -1,17 +1,17 @@
-import { A as untrack, F as logger, j as Owner, t as ComponentInstance } from "./instance-BAnfmXOR.js";
+import { A as untrack, I as logger, j as Owner, t as ComponentInstance } from "./instance-DL-YKrj6.js";
 import { n as readValue } from "./readable-DFWOsTac.js";
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { v as clarifyRenderOverflow } from "./hooks-BimKStr4.js";
-import { r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-DwGw1A6Q.js";
+import { v as clarifyRenderOverflow } from "./hooks-kjLigwDJ.js";
+import { r as validateCspNonce, t as CspNonceScope } from "./csp-nonce-D-XM_uuJ.js";
 import { C as withHydrationRenderUrl, T as SSRDataMissingError, _ as createPageRenderEnvelope, b as isPageRenderEnvelope, f as startRenderPhase$1, m as stopRenderPhase$1, r as getCurrentRenderData, t as configureRenderContextProvider, w as withPageFramework, y as isEmptyPageRenderEnvelope } from "./render-context-DGHnEveC.js";
-import { o as functionChildOutput, s as normalizeChildren } from "./error-boundary-Bpwofwps.js";
+import { o as functionChildOutput, s as normalizeChildren } from "./error-boundary-ChXoIFVl.js";
 import { n as isPromiseLike } from "./promise-Dz8iIHAm.js";
-import { d as DEFERRED_BOUNDARY, i as dehydrateDataRuntime, p as isDeferred } from "./query-registry-WMCN0BJL.js";
-import { ft as getRouteHydrationMetadata, ht as validateRouteHydrationData } from "./resolution-Cx82-xjW.js";
-import { a as SSR_PORTAL_HOST, n as Portal, o as comparePortalWriterOrder, s as createSSRPortalAnchorToken, t as DefaultPortal } from "./portal-DuOKfnLa.js";
-import { t as createDataRuntime } from "./data-runtime-C1bFAlba.js";
-import { d as isCustomElementName, o as isUnsafeUrlAttribute, s as rejectUnsafeUrlAttribute, u as getPublicAttributeName } from "./url-CnbfpX0K.js";
-import { d as booleanAttributeValue, f as isSkippedProp, h as styleValueText, l as isPropertyOnlyProp, m as normalizeStylePropertyName, p as keepsFalseValue, r as sanitizeCssValue, t as SSR_RENDER_DATA_ATTR } from "./ssr-DoV-vJ-5.js";
+import { d as DEFERRED_BOUNDARY, i as dehydrateDataRuntime, p as isDeferred } from "./query-registry-tzSiVrV_.js";
+import { ft as getRouteHydrationMetadata, ht as validateRouteHydrationData } from "./resolution-CF1BqHLm.js";
+import { a as SSR_PORTAL_HOST, n as Portal, o as comparePortalWriterOrder, s as createSSRPortalAnchorToken, t as DefaultPortal } from "./portal-LYf4cbHd.js";
+import { t as createDataRuntime } from "./data-runtime-i-RD0Ffm.js";
+import { d as isCustomElementName, o as isUnsafeUrlAttribute, s as rejectUnsafeUrlAttribute, u as getPublicAttributeName } from "./url-C9xMpMMv.js";
+import { d as booleanAttributeValue, f as isSkippedProp, h as styleValueText, l as isPropertyOnlyProp, m as normalizeStylePropertyName, p as keepsFalseValue, r as sanitizeCssValue, t as SSR_RENDER_DATA_ATTR } from "./ssr-DPfdcq0e.js";
 //#region src/ssr/escape.ts
 /**
 * HTML escaping utilities for SSR
@@ -321,7 +321,7 @@ const REDACTED_DEFERRED_ERROR = "Deferred value rejected.";
 function exposedDeferredError(error) {
 	return error instanceof Error && error.expose === true ? error.message : REDACTED_DEFERRED_ERROR;
 }
-function hydrationReplacer(_key, value) {
+function hydrationReplacer(value) {
 	if (!isDeferred(value)) return value;
 	if (value.state === "fulfilled") return {
 		[DEFERRED_PAYLOAD]: "fulfilled",
@@ -368,7 +368,23 @@ function serializeHydrationRenderData(data, runtime) {
 	const routeHydration = getRouteHydrationMetadata(payload.framework);
 	if (routeHydration) validateRouteHydrationData(payload.route, routeHydration.r);
 	if (isEmptyPageRenderEnvelope(payload)) return "";
-	return `<script type="application/json" ${SSR_RENDER_DATA_ATTR}="true">${JSON.stringify(payload, hydrationReplacer).replace(/</g, "\\u003C").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029")}<\/script>`;
+	const deferredPaths = [];
+	const paths = /* @__PURE__ */ new WeakMap();
+	let hasDeferredMarker = false;
+	return `<script type="application/json" ${SSR_RENDER_DATA_ATTR}="true">${JSON.stringify({
+		...payload,
+		get deferredPaths() {
+			return deferredPaths.length > 0 || hasDeferredMarker ? deferredPaths : void 0;
+		}
+	}, function(key, value) {
+		if (key === DEFERRED_PAYLOAD && (value === "fulfilled" || value === "rejected")) hasDeferredMarker = true;
+		const parentPath = paths.get(this);
+		const path = parentPath ? [...parentPath, key] : [];
+		if (isDeferred(value)) deferredPaths.push(path);
+		const encoded = hydrationReplacer(value);
+		if (encoded && typeof encoded === "object") paths.set(encoded, path);
+		return encoded;
+	}).replace(/</g, "\\u003C").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029")}<\/script>`;
 }
 //#endregion
 //#region src/ssr/sink.ts
@@ -457,6 +473,16 @@ var StreamSink = class {
 //#region src/ssr/attrs.ts
 const ESCAPED_ATTR_VALUE_CACHE_LIMIT = 512;
 const escapedAttrValueCache = /* @__PURE__ */ new Map();
+function readReferenceAttributeCell(cell) {
+	const descriptor = cell && Object.getOwnPropertyDescriptor(cell, "value");
+	if (!descriptor || !("value" in descriptor) || descriptor.value !== void 0 && typeof descriptor.value !== "string") throw new TypeError("SSR reference attribute cells require a string or undefined data value.");
+	return descriptor.value;
+}
+function renderReferenceAttributeCell(name, cell, sink) {
+	const value = readReferenceAttributeCell(cell);
+	if (value === void 0) return;
+	sink.write(" " + name + "=\"" + getEscapedAttrValue(value) + "\"");
+}
 function isEventHandler(key) {
 	return key.length >= 2 && key.slice(0, 2).toLowerCase() === "on";
 }
@@ -473,13 +499,13 @@ function resolvePropValue(value) {
 * element whose attributes are inspected before they are written. Returns
 * `props` itself when nothing needs reading.
 */
-function resolveReactiveAttributeProps(props) {
+function resolveReactiveAttributeProps(props, referenceCells) {
 	if (!props || typeof props !== "object") return props;
 	let resolved = null;
 	const propsObj = props;
 	for (const key in propsObj) {
 		const value = propsObj[key];
-		if (typeof value !== "function" || isSkippedProp(key) || isEventHandler(key)) continue;
+		if (typeof value !== "function" || isSkippedProp(key) || isEventHandler(key) || referenceCells && Object.prototype.hasOwnProperty.call(referenceCells, key)) continue;
 		resolved ??= { ...propsObj };
 		resolved[key] = resolvePropValue(value);
 	}
@@ -506,7 +532,7 @@ function getEscapedAttrValue(value) {
 * object values on custom elements) have no markup and are left out; the
 * client applies them when it hydrates.
 */
-function renderAttrsDirect(props, sink, tagName = "") {
+function renderAttrsDirect(props, sink, tagName = "", referenceCells) {
 	if (!props || typeof props !== "object") return;
 	const customElement = isCustomElementName(tagName);
 	const propsObj = props;
@@ -514,6 +540,14 @@ function renderAttrsDirect(props, sink, tagName = "") {
 		if (isSkippedProp(key) || key === "dangerouslySetInnerHTML") continue;
 		if (isEventHandler(key)) continue;
 		if (key.charCodeAt(0) === 95) continue;
+		if (referenceCells && Object.prototype.hasOwnProperty.call(referenceCells, key)) {
+			if (key !== "aria-labelledby" && key !== "aria-describedby" && key !== "aria-controls") throw new TypeError("SSR reference attribute cells only support derived ARIA references.");
+			const cell = referenceCells[key];
+			readReferenceAttributeCell(cell);
+			if (sink.writeReferenceAttribute) sink.writeReferenceAttribute(key, cell);
+			else renderReferenceAttributeCell(key, cell, sink);
+			continue;
+		}
 		const value = resolvePropValue(propsObj[key]);
 		if (isPropertyOnlyProp(tagName, key, value)) continue;
 		if (value !== null && typeof value === "object" && key.startsWith("attr:")) continue;
@@ -674,6 +708,9 @@ function stopRenderPhase() {
 * render contains preloaded resource slots. Portal hosts write tokens that
 * are replaced with their final content once the render root completes.
 */
+const CHILDREN_BEFORE_ATTRS = Symbol.for("askr.ssr.children-before-attrs");
+const ATTRIBUTE_ROOT = Symbol.for("askr.ssr.attribute-root");
+const ATTRIBUTE_CELLS = Symbol.for("askr.ssr.attribute-cells");
 /**
 * Collects writes so they can be published or dropped. An ErrorBoundary's
 * subtree renders into one first, so markup from a subtree that then throws
@@ -685,24 +722,38 @@ var BufferedSink = class {
 	}
 	write(html) {
 		if (html) this.operations.push({
-			portalHost: false,
+			kind: "text",
 			text: html
 		});
 	}
 	writePortalHost(token) {
 		this.operations.push({
-			portalHost: true,
+			kind: "portal",
 			text: token
 		});
 	}
+	writeReferenceAttribute(name, cell) {
+		this.operations.push({
+			kind: "reference",
+			name,
+			cell
+		});
+	}
+	beginAttributeRoot() {
+		this.operations.push({ kind: "root" });
+	}
 	/** The buffered markup, without portal host tokens. */
 	html() {
 		let html = "";
-		for (const operation of this.operations) if (!operation.portalHost) html += operation.text;
+		for (const operation of this.operations) if (operation.kind === "text") html += operation.text;
 		return html;
 	}
 	publishTo(sink) {
-		for (const operation of this.operations) if (operation.portalHost && sink.writePortalHost) sink.writePortalHost(operation.text);
+		for (const operation of this.operations) if (operation.kind === "root") sink.beginAttributeRoot?.();
+		else if (operation.kind === "reference") {
+			if (sink.writeReferenceAttribute) sink.writeReferenceAttribute(operation.name, operation.cell);
+			else sink.write(referenceAttributeToken(operation.name, operation.cell));
+		} else if (operation.kind === "portal" && sink.writePortalHost) sink.writePortalHost(operation.text);
 		else sink.write(operation.text);
 	}
 };
@@ -720,8 +771,14 @@ var PortalSink = class {
 	writePortalHost(token) {
 		(this.buffered ??= []).push(token);
 	}
+	beginAttributeRoot() {
+		this.buffered ??= [];
+	}
+	writeReferenceAttribute(name, cell) {
+		(this.buffered ??= []).push(referenceAttributeToken(name, cell));
+	}
 	flush(ctx) {
-		if (this.buffered) this.sink.write(resolvePortals(this.buffered.join(""), ctx));
+		if (this.buffered) this.sink.write(resolveReferenceAttributes(resolvePortals(this.buffered.join(""), ctx)));
 	}
 };
 let current = null;
@@ -761,11 +818,18 @@ function componentOutput(value) {
 }
 function renderComponent(fn, props, sink) {
 	const render = state();
+	const destination = sink;
+	const attributeRoot = props[ATTRIBUTE_ROOT] === true ? new BufferedSink() : null;
+	if (attributeRoot) {
+		attributeRoot.beginAttributeRoot();
+		sink = attributeRoot;
+	}
 	let owner = render.owner;
 	for (;;) {
 		const instance = new ComponentInstance(owner, fn, props);
 		instance.server = true;
 		instance.serverContext = render.ctx;
+		if (attributeRoot) render.attributeRoots.add(instance);
 		const output = runComponent(instance);
 		const resources = getCurrentRenderData()?.resources;
 		if (instance.serverResourceKeys.length && resources && Object.keys(resources).some((key) => /^r:\d+$/.test(key))) sink.write(`<!--askr-resource:${instance.serverResourceKeys.join(",")}-->`);
@@ -779,6 +843,7 @@ function renderComponent(fn, props, sink) {
 		}
 		if (!instance.boundary) {
 			withOwner(instance, () => renderValue(componentOutput(output), sink));
+			attributeRoot?.publishTo(destination);
 			return;
 		}
 		const buffer = new BufferedSink();
@@ -796,9 +861,11 @@ function renderComponent(fn, props, sink) {
 			} finally {
 				reportBoundaryCleanupErrors(cleanupErrors);
 			}
+			attributeRoot?.publishTo(destination);
 			return;
 		}
 		buffer.publishTo(sink);
+		attributeRoot?.publishTo(destination);
 		return;
 	}
 }
@@ -890,19 +957,35 @@ function renderChild(child, sink) {
 function assertElementName(name) {
 	if (!/^[A-Za-z][A-Za-z0-9._:-]*$/.test(name)) throw new TypeError(`Invalid SSR element name: ${JSON.stringify(name)}`);
 }
+/** Resolve only inputs needed to choose the child's parsing/selection context. */
+function resolveEarlyContextProps(props, names) {
+	const descriptors = Object.getOwnPropertyDescriptors(props);
+	for (const name of names) {
+		if (!(name in props)) continue;
+		const value = props[name];
+		descriptors[name] = {
+			value: typeof value === "function" ? untrack(() => readValue(value)) : value,
+			enumerable: descriptors[name]?.enumerable ?? true,
+			configurable: true,
+			writable: true
+		};
+	}
+	return Object.create(Object.getPrototypeOf(props), descriptors);
+}
 function renderElement(tag, props, sink) {
 	assertElementName(tag);
 	if (VOID_ELEMENTS.has(tag)) {
 		sink.write("<" + tag);
-		renderAttrsDirect(props, sink, tag);
+		renderHostAttrs(props, sink, tag);
 		sink.write(" />");
 		return;
 	}
 	const render = state();
+	const childrenBeforeAttrs = props[CHILDREN_BEFORE_ATTRS] === true;
 	const parentNamespace = render.namespace;
 	const lower = tag.toLowerCase();
 	const namespace = getElementNamespace(parentNamespace, lower);
-	let elementProps = lower === "annotation-xml" || namespace === "html" && (lower === "select" || lower === "option" && parentNamespace === "select") ? resolveReactiveAttributeProps(props) ?? props : props;
+	let elementProps = lower === "annotation-xml" || namespace === "html" && (lower === "select" || lower === "option" && parentNamespace === "select") ? childrenBeforeAttrs ? resolveEarlyContextProps(props, lower === "annotation-xml" ? ["encoding"] : lower === "select" ? ["value", "multiple"] : ["value"]) : resolveReactiveAttributeProps(props, referenceCellsFor(props)) ?? props : props;
 	const selection = render.selectSelections[render.selectSelections.length - 1];
 	let renderedChildren = null;
 	if (lower === "option" && parentNamespace === "select" && selection) {
@@ -917,14 +1000,27 @@ function renderElement(tag, props, sink) {
 		} else value = String(own);
 		const selected = selection.values.has(value) && (selection.multiple || !selection.matched);
 		if (selected) selection.matched = true;
-		elementProps = {
+		if (childrenBeforeAttrs) {
+			const descriptors = Object.getOwnPropertyDescriptors(elementProps);
+			descriptors.selected = {
+				value: selected,
+				enumerable: true,
+				configurable: true,
+				writable: true
+			};
+			elementProps = Object.create(Object.getPrototypeOf(elementProps), descriptors);
+		} else elementProps = {
 			...elementProps,
 			selected
 		};
 	}
 	if (renderedChildren) {
+		if (childrenBeforeAttrs) {
+			writeBufferedElement(tag, elementProps, null, sink, renderedChildren);
+			return;
+		}
 		sink.write("<" + tag);
-		renderAttrsDirect(elementProps, sink, tag);
+		renderHostAttrs(elementProps, sink, tag);
 		sink.write(">");
 		renderedChildren.publishTo(sink);
 		sink.write("</" + tag + ">");
@@ -943,7 +1039,7 @@ function renderElement(tag, props, sink) {
 	}
 	const rawText = getRawTextElementInContext(parentNamespace, namespace, lower);
 	try {
-		withNamespace(getChildNamespace(parentNamespace, namespace, lower, elementProps), () => writeElement(tag, elementProps, rawText, sink));
+		withNamespace(getChildNamespace(parentNamespace, namespace, lower, elementProps), () => writeElement(tag, elementProps, rawText, sink, childrenBeforeAttrs));
 	} finally {
 		if (nextSelection) render.selectSelections.pop();
 	}
@@ -1029,9 +1125,24 @@ function optionTextValue(html) {
 	}
 	return text;
 }
-function writeElement(tag, props, rawText, sink) {
+function writeBufferedElement(tag, props, rawText, sink, children) {
+	const opening = new BufferedSink();
+	opening.write("<" + tag);
+	renderHostAttrs(props, opening, rawText === null ? tag : void 0);
+	opening.write(">");
+	opening.publishTo(sink);
+	children.publishTo(sink);
+	sink.write("</" + tag + ">");
+}
+function writeElement(tag, props, rawText, sink, childrenBeforeAttrs) {
+	if (childrenBeforeAttrs) {
+		const children = new BufferedSink();
+		writeContent(props, rawText, children);
+		writeBufferedElement(tag, props, rawText, sink, children);
+		return;
+	}
 	sink.write("<" + tag);
-	renderAttrsDirect(props, sink, rawText === null ? tag : void 0);
+	renderHostAttrs(props, sink, rawText === null ? tag : void 0);
 	sink.write(">");
 	writeContent(props, rawText, sink);
 	sink.write("</" + tag + ">");
@@ -1108,6 +1219,49 @@ function flattenText(value, element) {
 	visit(value);
 	return out;
 }
+function referenceCellsFor(props) {
+	const cells = props[ATTRIBUTE_CELLS];
+	if (!cells || typeof cells !== "object") return void 0;
+	const render = state();
+	for (let owner = render.owner; owner; owner = owner.parent) if (render.attributeRoots.has(owner)) return cells;
+}
+function renderHostAttrs(props, sink, tag) {
+	const cells = referenceCellsFor(props);
+	if (!cells) {
+		renderAttrsDirect(props, sink, tag);
+		return;
+	}
+	renderAttrsDirect(props, {
+		write: (html) => sink.write(html),
+		writeReferenceAttribute: (name, cell) => {
+			if (sink.writeReferenceAttribute) sink.writeReferenceAttribute(name, cell);
+			else sink.write(referenceAttributeToken(name, cell));
+		}
+	}, tag, cells);
+}
+function referenceAttributeToken(name, cell) {
+	const render = state();
+	readReferenceAttributeCell(cell);
+	if (render.referenceAttributeNonce === null) {
+		const nonce = globalThis.crypto.getRandomValues(/* @__PURE__ */ new Uint32Array(4));
+		render.referenceAttributeNonce = Array.from(nonce, (part) => part.toString(16).padStart(8, "0")).join("");
+	}
+	const token = `<!--askr-attribute:${render.referenceAttributeNonce}:${render.nextReferenceAttribute++}-->`;
+	render.referenceAttributes.set(token, {
+		name,
+		cell
+	});
+	return token;
+}
+function resolveReferenceAttributes(html) {
+	let resolved = html;
+	for (const [token, { name, cell }] of state().referenceAttributes) {
+		const sink = new StringSink();
+		renderReferenceAttributeCell(name, cell, sink);
+		resolved = resolved.replace(token, () => sink.toString());
+	}
+	return resolved;
+}
 function renderToString(value, namespace) {
 	const sink = new StringSink();
 	withNamespace(namespace, () => renderValue(value, sink));
@@ -1143,7 +1297,11 @@ function withServerRender(ctx, fn) {
 		owner,
 		namespace: "html",
 		portalNamespaces: /* @__PURE__ */ new Map(),
-		selectSelections: []
+		selectSelections: [],
+		attributeRoots: /* @__PURE__ */ new WeakSet(),
+		referenceAttributes: /* @__PURE__ */ new Map(),
+		referenceAttributeNonce: null,
+		nextReferenceAttribute: 0
 	};
 	let result;
 	try {
@@ -1211,7 +1369,7 @@ function renderToStringSync(component, props, options) {
 				const sink = new StringSink();
 				renderValue(rootElement(component, props ?? {}, nonce), sink);
 				sink.end();
-				const html = resolvePortals(sink.toString(), ctx);
+				const html = resolveReferenceAttributes(resolvePortals(sink.toString(), ctx));
 				options?.onContext?.(ctx);
 				return html + serializeHydrationRenderData(ctx.hydrationData ?? void 0, ctx.dataRuntime);
 			});

package/dist/{resolution-Cx82-xjW.js → resolution-CF1BqHLm.js}

@@ -1,10 +1,10 @@
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { r as currentAppRuntime } from "./hooks-BimKStr4.js";
-import { r as readScope, t as defineScope } from "./scope-CwpVSHVf.js";
+import { r as currentAppRuntime } from "./hooks-kjLigwDJ.js";
+import { r as readScope, t as defineScope } from "./scope-ila_zaId.js";
 import { S as replacePageRoute, n as getActiveRenderContext, w as withPageFramework } from "./render-context-DGHnEveC.js";
 import { n as isPromiseLike } from "./promise-Dz8iIHAm.js";
-import { c as withTelemetry, l as jsonTransportPropertyPath, p as isDeferred, t as createQueryPrefetchContext, u as validateJsonTransportValue } from "./query-registry-WMCN0BJL.js";
-import { c as resolveNavigationUrl, i as formatNavigationUrl } from "./url-CnbfpX0K.js";
+import { c as withTelemetry, l as jsonTransportPropertyPath, p as isDeferred, t as createQueryPrefetchContext, u as validateJsonTransportValue } from "./query-registry-tzSiVrV_.js";
+import { c as resolveNavigationUrl, i as formatNavigationUrl } from "./url-C9xMpMMv.js";
 //#region src/router/route-hydration.ts
 function isDeferredHydrationValue(value) {
 	return isDeferred(value);
@@ -71,7 +71,7 @@ function guardOmissions(value, omissions, route, path = "$") {
 	if (cached) return cached;
 	const guarded = new Proxy(value, { get(target, property, receiver) {
 		if (typeof property === "string") {
-			const omitted = omissions[property];
+			const omitted = Object.prototype.hasOwnProperty.call(omissions, property) ? omissions[property] : void 0;
 			if (omitted && !Object.prototype.hasOwnProperty.call(target, property)) omittedRead(route, propertyPath(path, property));
 			const child = Reflect.get(target, property, receiver);
 			return omitted === 1 ? child : guardOmissions(child, omitted, route, propertyPath(path, property));
@@ -276,6 +276,15 @@ function formatCatchAllCapture(parts) {
 	if (parts.length === 1) return decodePathSegment(parts[0]);
 	return "/" + parts.map(decodePathSegment).join("/");
 }
+function setCapturedParameter(params, name, value) {
+	if (name === "__proto__") Object.defineProperty(params, name, {
+		value,
+		enumerable: true,
+		configurable: true,
+		writable: true
+	});
+	else params[name] = value;
+}
 /**
 * Match pre-split URL parts against pre-parsed route segments.
 *
@@ -308,11 +317,11 @@ function matchSegments(urlParts, segments) {
 			if (!staticSegmentMatches(seg.value, part)) return null;
 		} else if (seg.kind === "splat") {
 			if (params === null) params = {};
-			params[seg.value] = normalizeCapturedSplatParts(urlParts.slice(i).map(decodePathSegment)).join("/");
+			setCapturedParameter(params, seg.value, normalizeCapturedSplatParts(urlParts.slice(i).map(decodePathSegment)).join("/"));
 			return params;
 		} else {
 			if (params === null) params = {};
-			if (seg.kind === "param") params[seg.value] = decodePathSegment(part);
+			if (seg.kind === "param") setCapturedParameter(params, seg.value, decodePathSegment(part));
 			else params["*"] = decodePathSegment(part);
 		}
 	}
@@ -702,7 +711,12 @@ function makeQuery(search) {
 		},
 		toJSON() {
 			const output = {};
-			for (const [key, values] of mapping.entries()) output[key] = values.length > 1 ? [...values] : values[0];
+			for (const [key, values] of mapping.entries()) Object.defineProperty(output, key, {
+				value: values.length > 1 ? [...values] : values[0],
+				enumerable: true,
+				configurable: true,
+				writable: true
+			});
 			return output;
 		}
 	});

package/dist/{resource-CLjB7RBQ.js → resource-BhcaFqdB.js}

@@ -1,6 +1,6 @@
-import { A as untrack, F as logger, N as runWithOwner, S as queueTask, d as recordUndo } from "./instance-BAnfmXOR.js";
+import { A as untrack, I as logger, N as runWithOwner, S as queueTask, d as recordUndo } from "./instance-DL-YKrj6.js";
 import { t as brandSnapshotSource } from "./snapshot-Cjx4N988.js";
-import { c as onCommit, i as currentComponent, n as createSource, o as hookSlot, r as currentAppRuntime, s as notify, u as readSource } from "./hooks-BimKStr4.js";
+import { c as onCommit, i as currentComponent, n as createSource, o as hookSlot, r as currentAppRuntime, s as notify, u as readSource } from "./hooks-kjLigwDJ.js";
 import { T as SSRDataMissingError, a as getResourceVerificationSnapshot, h as throwSSRDataMissing, i as getNextRenderKey, n as getActiveRenderContext, o as isHydrationVerificationRender, r as getCurrentRenderData, s as recordResourceVerificationSnapshot } from "./render-context-DGHnEveC.js";
 import { n as isPromiseLike } from "./promise-Dz8iIHAm.js";
 //#region src/core/api/resource-cell.ts

package/dist/resources/index.js

@@ -1,7 +1,7 @@
-import { S as queueTask } from "../instance-BAnfmXOR.js";
-import { c as onCommit, i as currentComponent, n as createSource, o as hookSlot, s as notify, u as readSource } from "../hooks-BimKStr4.js";
-import { a as routeActive, c as watch, i as on, n as windowFocused, o as task, r as capture, s as timer, t as documentVisible } from "../browser-activity-CB8e-V4f.js";
-import { t as resource } from "../resource-CLjB7RBQ.js";
+import { S as queueTask } from "../instance-DL-YKrj6.js";
+import { c as onCommit, i as currentComponent, n as createSource, o as hookSlot, s as notify, u as readSource } from "../hooks-kjLigwDJ.js";
+import { a as routeActive, c as watch, i as on, n as windowFocused, o as task, r as capture, s as timer, t as documentVisible } from "../browser-activity-2r5gA1Cb.js";
+import { t as resource } from "../resource-BhcaFqdB.js";
 //#region src/core/api/stream.ts
 /**
 * stream(): a component-owned async iterable. It connects after the render
@@ -74,6 +74,17 @@ async function consume(slot, generation, iterable) {
 		publish(slot);
 	}
 }
+function failGeneration(slot, generation, error) {
+	if (!isCurrent(slot, generation)) return;
+	stopGeneration(generation);
+	if (slot.disposed || slot.current !== generation || slot.generation !== generation.id) return;
+	slot.current = null;
+	slot.snapshot.status = "error";
+	slot.snapshot.pending = false;
+	slot.snapshot.stale = slot.hasValue;
+	slot.snapshot.error = toError(error);
+	publish(slot);
+}
 function startSlot(slot) {
 	if (!slot.activated || slot.disposed) return;
 	const previous = slot.current;
@@ -94,23 +105,11 @@ function startSlot(slot) {
 	try {
 		result = slot.source({ signal: generation.controller.signal });
 	} catch (error) {
-		if (!isCurrent(slot, generation)) return;
-		slot.current = null;
-		slot.snapshot.status = "error";
-		slot.snapshot.pending = false;
-		slot.snapshot.stale = slot.hasValue;
-		slot.snapshot.error = toError(error);
-		publish(slot);
+		failGeneration(slot, generation, error);
 		return;
 	}
 	Promise.resolve(result).then((iterable) => consume(slot, generation, iterable)).catch((error) => {
-		if (!isCurrent(slot, generation)) return;
-		slot.current = null;
-		slot.snapshot.status = "error";
-		slot.snapshot.pending = false;
-		slot.snapshot.stale = slot.hasValue;
-		slot.snapshot.error = toError(error);
-		publish(slot);
+		failGeneration(slot, generation, error);
 	});
 }
 function queueStart(slot) {
@@ -152,9 +151,7 @@ function createSlot(source, options) {
 	const slot = {
 		kind: "stream",
 		source,
-		pendingSource: source,
 		deps: (options.deps ?? []).slice(),
-		pendingDeps: (options.deps ?? []).slice(),
 		snapshot,
 		generation: 0,
 		current: null,
@@ -190,12 +187,12 @@ function requireStreamOwner() {
 	if (!instance) throw new Error("[Askr] stream() must be called during component render inside an app.");
 	return instance;
 }
-function commitSlot(instance, slot) {
-	const depsChanged = !depsEqual(slot.deps, slot.pendingDeps);
+function commitSlot(instance, slot, source, deps) {
+	const depsChanged = !depsEqual(slot.deps, deps);
 	const firstCommit = !slot.activated;
 	slot.owner = instance;
-	slot.source = slot.pendingSource;
-	slot.deps = slot.pendingDeps;
+	slot.source = source;
+	slot.deps = deps;
 	if (firstCommit) slot.activated = true;
 	if (!slot.cleanupRegistered) {
 		slot.cleanupRegistered = true;
@@ -217,9 +214,10 @@ function stream(sourceOrGetter, connectOrOptions, drivenOptions) {
 function createStream(instance, source, options) {
 	const slot = hookSlot(instance, "stream", () => createSlot(source, options));
 	readSource(slot.readers);
-	slot.pendingSource = source;
-	slot.pendingDeps = (options.deps ?? []).slice();
-	if (!instance.server) onCommit(instance, () => commitSlot(instance, slot));
+	if (!instance.server) {
+		const deps = (options.deps ?? []).slice();
+		onCommit(instance, () => commitSlot(instance, slot, source, deps));
+	}
 	return slot.snapshot;
 }
 //#endregion

package/dist/router/index.js

@@ -1,12 +1,12 @@
 import { n as jsx } from "../jsx-runtime-C4idqHY0.js";
-import { C as currentRoute, a as nextHistoryIndex, b as syncRegisteredRouteSnapshot, c as reconcileRouteMeta, f as saveScrollPosition, g as parseTargetUrl, h as getWindowHref, i as commitHistoryIndex, l as resolveRouteMeta, m as getRegisteredAppsSnapshot, n as navigate, p as getCurrentHref, r as navigateToPublicHref, u as serializeRouteMeta, v as setCurrentRouteLocation, w as onRouteChange, x as toDocumentUrl, y as syncAppRegistrationLocation } from "../navigate-CP_0Zy5U.js";
-import { f as defer, p as isDeferred } from "../query-registry-WMCN0BJL.js";
-import { M as getActiveRouteBasePath, a as resolveRouteRequest, at as lazyRouteData, b as addLogicalRouteBasePath, c as forbidden, ct as encodePathSegment, d as unauthorized, et as Outlet, f as currentAuth, it as lazy, l as notFound, o as allow, ot as RouteDataLoadError, s as deny, u as redirect, v as matchRoute, x as addRouteBasePath } from "../resolution-Cx82-xjW.js";
-import { n as createRouteRegistry } from "../manifest-CW9gyNBY.js";
-import { a as group, c as route, i as fallback, n as resolveDeferredValues, o as index, r as routeData, s as page, t as Resolve } from "../deferred-bEEHHvic.js";
-import { a as isSafeHref, r as assertPathHrefStaysOnOrigin } from "../url-CnbfpX0K.js";
-import { o as mergeProps } from "../compose-ref-DWzdbxsD.js";
-import { t as applyInteractionPolicy } from "../interactions-D2BoREb-.js";
+import { C as currentRoute, a as nextHistoryIndex, b as syncRegisteredRouteSnapshot, c as reconcileRouteMeta, f as saveScrollPosition, g as parseTargetUrl, h as getWindowHref, i as commitHistoryIndex, l as resolveRouteMeta, m as getRegisteredAppsSnapshot, n as navigate, p as getCurrentHref, r as navigateToPublicHref, u as serializeRouteMeta, v as setCurrentRouteLocation, w as onRouteChange, x as toDocumentUrl, y as syncAppRegistrationLocation } from "../navigate-DsfO12hB.js";
+import { f as defer, p as isDeferred } from "../query-registry-tzSiVrV_.js";
+import { M as getActiveRouteBasePath, a as resolveRouteRequest, at as lazyRouteData, b as addLogicalRouteBasePath, c as forbidden, ct as encodePathSegment, d as unauthorized, et as Outlet, f as currentAuth, it as lazy, l as notFound, o as allow, ot as RouteDataLoadError, s as deny, u as redirect, v as matchRoute, x as addRouteBasePath } from "../resolution-CF1BqHLm.js";
+import { n as createRouteRegistry } from "../manifest-BNupb86f.js";
+import { a as group, c as route, i as fallback, n as resolveDeferredValues, o as index, r as routeData, s as page, t as Resolve } from "../deferred-nGZglpj6.js";
+import { a as isSafeHref, r as assertPathHrefStaysOnOrigin } from "../url-C9xMpMMv.js";
+import { o as mergeProps } from "../compose-ref-ccRU59BM.js";
+import { t as applyInteractionPolicy } from "../interactions-B_wfsDQg.js";
 //#region src/router/route-query.ts
 function getRouteQueryHistoryMode(options) {
 	if (options.history) return options.history;

package/dist/{scope-CwpVSHVf.js → scope-ila_zaId.js}

@@ -1,6 +1,6 @@
-import { M as getOwner } from "./instance-BAnfmXOR.js";
+import { M as getOwner } from "./instance-DL-YKrj6.js";
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { i as currentComponent } from "./hooks-BimKStr4.js";
+import { i as currentComponent } from "./hooks-kjLigwDJ.js";
 //#region src/core/api/scope.ts
 /**
 * Lexical scopes. A scope's provider is a component that records its value