@askrjs/askr 0.2.4 → 0.3.1

package/dist/{resolution-ClD-K7Lz.js → resolution-3DskUkjG.js}

@@ -1,183 +1,9 @@
+import { P as isPromiseLike, m as defineScope, v as readScope } from "./instance-VAFYVJOa.js";
 import { n as Fragment, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
-import { b as readScope, m as defineScope } from "./component-internal-C4hKKQBF.js";
-import { p as isPromiseLike } from "./lifecycle-batch-63aXFf2S.js";
 import { S as withPageFramework, b as replacePageRoute, n as getActiveRenderContext } from "./render-context-B7ohlh6t.js";
-import { i as ROUTE_ROOT_COMPONENT } from "./csp-nonce-9NFUb7hJ.js";
-import { c as withTelemetry, t as createQueryPrefetchContext } from "./query-registry-Bua3cDyb.js";
-import { c as removeRouteBasePath, i as getMatchingRouteRecord, l as buildRouteContext, o as addRouteBasePath, s as normalizeRouteBasePath, u as buildRouteContextBase, v as getActiveRouteAuthOptions } from "./route-matching-Bo6UqG-5.js";
-//#region src/router/route-data-loader.ts
-/** Thrown when a route's `loader` rejects; wraps the original `cause`. */
-var RouteDataLoadError = class extends Error {
-	constructor(route, phase, cause) {
-		const detail = cause instanceof Error ? cause.message : String(cause);
-		super("[Askr] Route data loader failed for \"" + route + "\" during " + phase + " loading: " + detail);
-		this.name = "RouteDataLoadError";
-		this.route = route;
-		this.phase = phase;
-		this.cause = cause;
-	}
-};
-function isAbortError(error) {
-	return typeof error === "object" && error !== null && "name" in error && error.name === "AbortError";
-}
-function loadPhase(mode) {
-	if (mode === "spa") return "client";
-	if (mode === "ssg") return "ssg";
-	return "server";
-}
-/** @internal Add route context to failures from lazyRouteData(). */
-function _wrapRouteDataLoadError(error, context) {
-	if (error instanceof RouteDataLoadError || isAbortError(error)) throw error;
-	throw new RouteDataLoadError(context.href || context.pathname, loadPhase(context.mode), error);
-}
-//#endregion
-//#region src/router/lazy.ts
-const pendingLazy = /* @__PURE__ */ new Set();
-const lazyStates = /* @__PURE__ */ new WeakMap();
-const handlerLazyComponents = /* @__PURE__ */ new WeakMap();
-function startLazyLoad(state) {
-	if (state.promise) return state.promise;
-	let promise;
-	promise = Promise.resolve().then(state.factory).then((mod) => {
-		state.resolved = typeof mod === "function" ? mod : mod.default;
-		state.loadError = null;
-		state.hasLoadError = false;
-	}, (err) => {
-		state.loadError = err;
-		state.hasLoadError = true;
-	}).finally(() => {
-		if (state.hasLoadError) state.promise = null;
-		pendingLazy.delete(promise);
-	});
-	state.promise = promise;
-	pendingLazy.add(promise);
-	return promise;
-}
-/** Wrap a dynamic-import factory as a {@link LazyRouteComponent}, loaded on first use. */
-function lazy(factory) {
-	const state = {
-		factory,
-		promise: null,
-		resolved: null,
-		loadError: null,
-		hasLoadError: false
-	};
-	const component = ((params) => {
-		if (state.hasLoadError) throw state.loadError;
-		if (!state.resolved) throw new Error("lazy() component used before it was resolved. Matched routes load automatically; call component.preload() for explicit preloading.");
-		return state.resolved(params);
-	});
-	Object.defineProperty(component, "preload", { value: () => startLazyLoad(state) });
-	lazyStates.set(component, state);
-	return component;
-}
-/**
-* Create a cached route loader backed by a dynamic import. The module is only
-* requested when the owning route matches, unless preload() is called.
-*/
-function lazyRouteData(factory, select) {
-	let imported = null;
-	const load = () => {
-		if (imported) return imported;
-		imported = Promise.resolve().then(factory).catch((error) => {
-			imported = null;
-			throw error;
-		});
-		return imported;
-	};
-	const loader = ((context) => load().then((module) => select ? select(module, context) : module).catch((error) => _wrapRouteDataLoadError(error, context)));
-	Object.defineProperty(loader, "preload", { value: () => load().then(() => void 0) });
-	return loader;
-}
-function _preloadRouteRecord(record) {
-	const imports = [
-		record.component,
-		...record.pageChain.map((scope) => scope.component),
-		...record.layoutChain.map((scope) => scope.component)
-	].flatMap((component) => {
-		const state = lazyStates.get(component);
-		return state ? [startLazyLoad(state)] : [];
-	});
-	return imports.length > 0 ? Promise.all(imports).then(() => void 0) : null;
-}
-function _associateLazyHandler(handler, components) {
-	handlerLazyComponents.set(handler, components);
-}
-function _preloadRouteHandler(handler) {
-	const imports = (handlerLazyComponents.get(handler) ?? []).flatMap((component) => {
-		const state = lazyStates.get(component);
-		return state ? [startLazyLoad(state)] : [];
-	});
-	return imports.length > 0 ? Promise.all(imports).then(() => void 0) : null;
-}
-//#endregion
-//#region src/router/rendering.ts
-const outletScope = defineScope(null);
-/** Renders the nested route content for the enclosing layout or page scope. */
-function Outlet() {
-	return {
-		$$typeof: ELEMENT_TYPE,
-		type: Fragment,
-		props: { children: readScope(outletScope) },
-		key: null
-	};
-}
-function applyPageChain(pageChain, params, content, deferComponents = false) {
-	let nextContent = content;
-	for (let i = pageChain.length - 1; i >= 0; i--) nextContent = outletScope({
-		value: nextContent,
-		children: deferComponents ? createRouteComponentVNode(pageChain[i].component, params) : pageChain[i].component(params)
-	});
-	return nextContent;
-}
-function createRouteComponentVNode(component, params, routeRoot = false) {
-	return {
-		$$typeof: ELEMENT_TYPE,
-		type: component,
-		props: params,
-		key: null,
-		...routeRoot ? { [ROUTE_ROOT_COMPONENT]: true } : {}
-	};
-}
-function createRouteHandler(component, pageChain, layoutChain, deferComponents = false) {
-	const handler = (params) => {
-		let content = deferComponents ? createRouteComponentVNode(component, params, true) : component(params);
-		content = applyPageChain(pageChain, params, content, deferComponents);
-		for (let i = layoutChain.length - 1; i >= 0; i--) {
-			const layout = layoutChain[i].component;
-			content = layout({ children: content });
-		}
-		return content;
-	};
-	_associateLazyHandler(handler, [
-		component,
-		...pageChain.map((scope) => scope.component),
-		...layoutChain.map((scope) => scope.component)
-	]);
-	return handler;
-}
-function getRenderHandler(record) {
-	return record.renderHandler ?? createRouteHandler(record.component, record.pageChain, record.layoutChain, true);
-}
-//#endregion
-//#region src/router/auth.ts
-let clientAuth = Object.freeze({
-	authenticated: false,
-	principal: null,
-	session: null,
-	tenant: null
-});
-/** Return the identity resolved for the route currently being rendered. */
-function currentAuth() {
-	return getActiveRenderContext()?.authContext ?? clientAuth;
-}
-/** @internal Updated atomically with route resolution. */
-function setCurrentAuth(context) {
-	clientAuth = context;
-	const render = getActiveRenderContext();
-	if (render) render.authContext = context;
-}
-//#endregion
+import { t as ROUTE_ROOT_COMPONENT } from "./router-internal-7nuNEHfG.js";
+import { c as withTelemetry, t as createQueryPrefetchContext } from "./query-registry-LrYpQsDJ.js";
+import { c as removeRouteBasePath, i as getMatchingRouteRecord, l as buildRouteContext, o as addRouteBasePath, s as normalizeRouteBasePath, u as buildRouteContextBase, y as getActiveRouteAuthOptions } from "./route-matching-CUzZ31gT.js";
 //#region src/common/deferred-value.ts
 const DEFERRED_VALUE = Symbol.for("@askrjs/askr/deferred-value");
 const DEFERRED_BOUNDARY = Symbol.for("@askrjs/askr/deferred-boundary");
@@ -386,6 +212,177 @@ function withoutRouteHydrationMetadata(framework) {
 	return next;
 }
 //#endregion
+//#region src/router/route-data-loader.ts
+/** Thrown when a route's `loader` rejects; wraps the original `cause`. */
+var RouteDataLoadError = class extends Error {
+	constructor(route, phase, cause) {
+		const detail = cause instanceof Error ? cause.message : String(cause);
+		super("[Askr] Route data loader failed for \"" + route + "\" during " + phase + " loading: " + detail);
+		this.name = "RouteDataLoadError";
+		this.route = route;
+		this.phase = phase;
+		this.cause = cause;
+	}
+};
+function isAbortError(error) {
+	return typeof error === "object" && error !== null && "name" in error && error.name === "AbortError";
+}
+function loadPhase(mode) {
+	if (mode === "spa") return "client";
+	if (mode === "ssg") return "ssg";
+	return "server";
+}
+/** @internal Add route context to failures from lazyRouteData(). */
+function _wrapRouteDataLoadError(error, context) {
+	if (error instanceof RouteDataLoadError || isAbortError(error)) throw error;
+	throw new RouteDataLoadError(context.href || context.pathname, loadPhase(context.mode), error);
+}
+//#endregion
+//#region src/router/lazy.ts
+const pendingLazy = /* @__PURE__ */ new Set();
+const lazyStates = /* @__PURE__ */ new WeakMap();
+const handlerLazyComponents = /* @__PURE__ */ new WeakMap();
+function startLazyLoad(state) {
+	if (state.promise) return state.promise;
+	let promise;
+	promise = Promise.resolve().then(state.factory).then((mod) => {
+		state.resolved = typeof mod === "function" ? mod : mod.default;
+		state.loadError = null;
+		state.hasLoadError = false;
+	}, (err) => {
+		state.loadError = err;
+		state.hasLoadError = true;
+	}).finally(() => {
+		if (state.hasLoadError) state.promise = null;
+		pendingLazy.delete(promise);
+	});
+	state.promise = promise;
+	pendingLazy.add(promise);
+	return promise;
+}
+/** Wrap a dynamic-import factory as a {@link LazyRouteComponent}, loaded on first use. */
+function lazy(factory) {
+	const state = {
+		factory,
+		promise: null,
+		resolved: null,
+		loadError: null,
+		hasLoadError: false
+	};
+	const component = ((params) => {
+		if (state.hasLoadError) throw state.loadError;
+		if (!state.resolved) throw new Error("lazy() component used before it was resolved. Matched routes load automatically; call component.preload() for explicit preloading.");
+		return state.resolved(params);
+	});
+	Object.defineProperty(component, "preload", { value: () => startLazyLoad(state) });
+	lazyStates.set(component, state);
+	return component;
+}
+/**
+* Create a cached route loader backed by a dynamic import. The module is only
+* requested when the owning route matches, unless preload() is called.
+*/
+function lazyRouteData(factory, select) {
+	let imported = null;
+	const load = () => {
+		if (imported) return imported;
+		imported = Promise.resolve().then(factory).catch((error) => {
+			imported = null;
+			throw error;
+		});
+		return imported;
+	};
+	const loader = ((context) => load().then((module) => select ? select(module, context) : module).catch((error) => _wrapRouteDataLoadError(error, context)));
+	Object.defineProperty(loader, "preload", { value: () => load().then(() => void 0) });
+	return loader;
+}
+function _preloadRouteRecord(record) {
+	const imports = [
+		record.component,
+		...record.pageChain.map((scope) => scope.component),
+		...record.layoutChain.map((scope) => scope.component)
+	].flatMap((component) => {
+		const state = lazyStates.get(component);
+		return state ? [startLazyLoad(state)] : [];
+	});
+	return imports.length > 0 ? Promise.all(imports).then(() => void 0) : null;
+}
+function _associateLazyHandler(handler, components) {
+	handlerLazyComponents.set(handler, components);
+}
+function _preloadRouteHandler(handler) {
+	const imports = (handlerLazyComponents.get(handler) ?? []).flatMap((component) => {
+		const state = lazyStates.get(component);
+		return state ? [startLazyLoad(state)] : [];
+	});
+	return imports.length > 0 ? Promise.all(imports).then(() => void 0) : null;
+}
+//#endregion
+//#region src/router/rendering.ts
+const outletScope = defineScope(null);
+/** Renders the nested route content for the enclosing layout or page scope. */
+function Outlet() {
+	return {
+		$$typeof: ELEMENT_TYPE,
+		type: Fragment,
+		props: { children: readScope(outletScope) },
+		key: null
+	};
+}
+function applyPageChain(pageChain, params, content, deferComponents = false) {
+	let nextContent = content;
+	for (let i = pageChain.length - 1; i >= 0; i--) nextContent = outletScope({
+		value: nextContent,
+		children: deferComponents ? createRouteComponentVNode(pageChain[i].component, params) : pageChain[i].component(params)
+	});
+	return nextContent;
+}
+function createRouteComponentVNode(component, params, routeRoot = false) {
+	return {
+		$$typeof: ELEMENT_TYPE,
+		type: component,
+		props: params,
+		key: null,
+		...routeRoot ? { [ROUTE_ROOT_COMPONENT]: true } : {}
+	};
+}
+function createRouteHandler(component, pageChain, layoutChain, deferComponents = false) {
+	const handler = (params) => {
+		let content = deferComponents ? createRouteComponentVNode(component, params, true) : component(params);
+		content = applyPageChain(pageChain, params, content, deferComponents);
+		for (let i = layoutChain.length - 1; i >= 0; i--) {
+			const layout = layoutChain[i].component;
+			content = layout({ children: content });
+		}
+		return content;
+	};
+	_associateLazyHandler(handler, [
+		component,
+		...pageChain.map((scope) => scope.component),
+		...layoutChain.map((scope) => scope.component)
+	]);
+	return handler;
+}
+function getRenderHandler(record) {
+	return record.renderHandler ?? createRouteHandler(record.component, record.pageChain, record.layoutChain, true);
+}
+let clientAuth = Object.freeze({
+	authenticated: false,
+	principal: null,
+	session: null,
+	tenant: null
+});
+/** Return the identity resolved for the route currently being rendered. */
+function currentAuth() {
+	return getActiveRenderContext()?.authContext ?? clientAuth;
+}
+/** @internal Updated atomically with route resolution. */
+function setCurrentAuth(context) {
+	clientAuth = context;
+	const render = getActiveRenderContext();
+	if (render) render.authContext = context;
+}
+//#endregion
 //#region src/router/resolution.ts
 const anonymous = () => ({
 	authenticated: false,
@@ -401,6 +398,10 @@ function getRouteRenderContext(result) {
 function getRouteRenderData(result) {
 	return routeRenderData.get(result);
 }
+/** Router-owned inspection of the record selected by request resolution. */
+function resolvedRouteHasLoader(result) {
+	return typeof result.record?.options?.loader === "function";
+}
 function createRouteRenderResult(record, params, context, handler) {
 	const result = {
 		kind: "render",
@@ -527,6 +528,14 @@ function resolveMatchedRoute(record, params, context, authOptions, request, tele
 	const decision = record.options.auth(context.auth);
 	return isPromiseLike(decision) ? Promise.resolve(decision).then(continueResolution) : continueResolution(decision);
 }
+/**
+* Callers may omit `signal`, and `RouteRequestOptions.signal` is optional in the
+* published contract. Route context still needs an `AbortSignal`, so this stands
+* in for "this caller supplied no cancellation". It never aborts: a route loader
+* receiving it cannot be cancelled through `context.signal`. Prefer passing a
+* real signal.
+*/
+const NEVER_ABORTED = new AbortController().signal;
 /** Resolve `target` against a route registry, applying auth/policies to produce a render/redirect/deny result. */
 function resolveRouteRequest(target, options) {
 	if (!options?.registry) throw new TypeError("resolveRouteRequest requires options.registry.");
@@ -538,7 +547,7 @@ function resolveRouteRequest(target, options) {
 		const match = getMatchingRouteRecord(logicalTarget, records);
 		if (!match) return null;
 		const mode = options.mode ?? getDefaultRouteMode();
-		const signal = options.signal ?? getActiveRenderContext()?.signal ?? new AbortController().signal;
+		const signal = options.signal ?? getActiveRenderContext()?.signal ?? NEVER_ABORTED;
 		const authOptions = getActiveRouteAuthOptions(options.auth ?? options.registry.manifest.auth);
 		const base = buildRouteContextBase(logicalTarget, match.params, {
 			mode,
@@ -565,4 +574,4 @@ function resolveRouteRequest(target, options) {
 	});
 }
 //#endregion
-export { RouteDataLoadError as S, createRouteHandler as _, resolveRouteRequest as a, lazy as b, prepareRouteHydrationData as c, DEFERRED_BOUNDARY as d, defer as f, Outlet as g, currentAuth as h, hasRouteRenderData as i, validateRouteHydrationData as l, reviveDeferredValue as m, getRouteRenderContext as n, getRouteHydrationMetadata as o, isDeferred as p, getRouteRenderData as r, guardHydratedRouteData as s, bindResolvedRouteData as t, withoutRouteHydrationMetadata as u, getRenderHandler as v, lazyRouteData as x, _preloadRouteHandler as y };
+export { reviveDeferredValue as C, isDeferred as S, prepareRouteHydrationData as _, resolveRouteRequest as a, DEFERRED_BOUNDARY as b, Outlet as c, _preloadRouteHandler as d, lazy as f, guardHydratedRouteData as g, getRouteHydrationMetadata as h, hasRouteRenderData as i, createRouteHandler as l, RouteDataLoadError as m, getRouteRenderContext as n, resolvedRouteHasLoader as o, lazyRouteData as p, getRouteRenderData as r, currentAuth as s, bindResolvedRouteData as t, getRenderHandler as u, validateRouteHydrationData as v, defer as x, withoutRouteHydrationMetadata as y };

package/dist/{resource-operation-Vz1S5h2k.js → resource-18-sFRl9.js}

@@ -1,11 +1,10 @@
-import { t as enqueueRuntimeLane, y as logger } from "./access-BucjYZcX.js";
-import { f as getCurrentComponentInstance } from "./component-scope-4I3yEMkb.js";
-import { S as withAsyncResourceContext, d as registerCommitOperationForInstance, h as getCurrentContextFrame } from "./component-internal-C4hKKQBF.js";
-import { p as isPromiseLike } from "./lifecycle-batch-63aXFf2S.js";
-import { t as brandSnapshotSource } from "./snapshot-source-BB42xgwb.js";
+import { t as enqueueRuntimeLane, v as logger } from "./access-CEA2pOry.js";
+import { P as isPromiseLike, d as registerCommitOperationForInstance, h as getCurrentContextFrame, y as withAsyncResourceContext } from "./instance-VAFYVJOa.js";
+import { O as ownCleanup, f as getCurrentComponentInstance } from "./scope-Cq_iYbTR.js";
+import { t as brandSnapshotSource } from "./snapshot-source-An4iKajG.js";
 import { C as SSRDataMissingError, a as getResourceVerificationSnapshot, i as getNextRenderKey, n as getActiveRenderContext, o as isHydrationVerificationRender, p as throwSSRDataMissing, r as getCurrentRenderData, s as recordResourceVerificationSnapshot } from "./render-context-B7ohlh6t.js";
-import { t as state } from "./state-BGJgYSyQ.js";
-//#region src/runtime/resource-cell.ts
+import { t as state } from "./state-BXJfudq1.js";
+//#region src/runtime/lifecycle/resource-cell.ts
 /**
 * Pure, component-agnostic ResourceCell state machine.
 * - Holds value/pending/error/generation/controller
@@ -45,59 +44,82 @@ var ResourceCell = class {
 		this.snapshot.value = this.value;
 		this.snapshot.pending = this.pending;
 		this.snapshot.error = this.error;
-		for (const cb of this.subscribers) cb();
+		for (const cb of this.subscribers) try {
+			cb();
+		} catch (error) {
+			this.reportError(error, "Resource subscriber error");
+		}
+	}
+	reportError(error, label = "Async resource error") {
+		try {
+			logger.error(`[Askr] ${label}${this.ownerName ? ` in ${this.ownerName}` : ""}:`, error);
+		} catch {}
 	}
 	start(ssr = false, notify = true) {
 		if (this.disposed) return;
 		const generation = this.generation;
-		this.controller?.abort();
+		const previous = this.controller;
 		const controller = new AbortController();
 		this.controller = controller;
+		const current = () => this.generation === generation && this.controller === controller && !controller.signal.aborted;
+		previous?.abort();
+		if (!current()) return;
 		this.pending = true;
 		this.error = null;
 		if (notify) this.notifySubscribers();
+		if (!current()) return;
+		const fail = (reason, asynchronous = false) => {
+			if (!current()) return;
+			let error;
+			try {
+				if (asynchronous && (reason instanceof Error && reason.name === "AbortError" || typeof DOMException !== "undefined" && reason instanceof DOMException && reason.name === "AbortError")) return;
+				error = reason instanceof Error ? reason : new Error(String(reason));
+			} catch {
+				error = /* @__PURE__ */ new Error("Resource error normalization failed");
+			}
+			if (!current()) return;
+			this.pending = false;
+			this.error = error;
+			if (asynchronous) this.reportError(reason);
+			if (current() && (notify || asynchronous)) this.notifySubscribers();
+		};
 		let result;
+		let asynchronous;
 		try {
 			result = withAsyncResourceContext(this.resourceFrame, () => this.fn({ signal: controller.signal }));
+			asynchronous = isPromiseLike(result);
 		} catch (err) {
-			this.pending = false;
-			this.error = err instanceof Error ? err : new Error(String(err));
-			if (notify) this.notifySubscribers();
+			fail(err);
 			return;
 		}
-		if (!isPromiseLike(result)) {
+		if (!asynchronous) {
+			if (!current()) return;
 			this.value = result;
 			this.pending = false;
 			this.error = null;
 			if (notify) this.notifySubscribers();
 			return;
 		}
-		if (ssr) throwSSRDataMissing();
-		Promise.resolve(result).then((val) => {
-			if (this.generation !== generation) return;
-			if (this.controller !== controller) return;
-			if (controller.signal.aborted) return;
-			this.value = val;
-			this.pending = false;
-			this.error = null;
-			this.notifySubscribers();
-		}).catch((err) => {
-			if (this.generation !== generation) return;
-			if (this.controller !== controller) return;
-			if (controller.signal.aborted || err instanceof Error && err.name === "AbortError" || typeof DOMException !== "undefined" && err instanceof DOMException && err.name === "AbortError") return;
-			this.pending = false;
-			this.error = err instanceof Error ? err : new Error(String(err));
-			try {
-				if (this.ownerName) logger.error(`[Askr] Async resource error in ${this.ownerName}:`, err);
-				else logger.error("[Askr] Async resource error:", err);
-			} catch {}
-			this.notifySubscribers();
-		});
+		if (ssr) {
+			new Promise((resolve) => resolve(result)).then(void 0, () => {});
+			controller.abort();
+			throwSSRDataMissing();
+		}
+		try {
+			Promise.resolve(result).then((val) => {
+				if (!current()) return;
+				this.value = val;
+				this.pending = false;
+				this.error = null;
+				this.notifySubscribers();
+			}, (err) => fail(err, true));
+		} catch (err) {
+			fail(err);
+		}
 	}
 	refresh() {
 		if (this.disposed) return;
 		this.generation++;
-		this.controller?.abort();
 		this.start();
 	}
 	abort() {
@@ -111,7 +133,7 @@ var ResourceCell = class {
 	}
 };
 //#endregion
-//#region src/runtime/resource-operation.ts
+//#region src/runtime/lifecycle/resource.ts
 function hydrationVerificationSnapshot() {
 	return brandSnapshotSource({
 		value: null,
@@ -121,6 +143,42 @@ function hydrationVerificationSnapshot() {
 	});
 }
 /**
+* What resource data, if any, the current render was given.
+*
+* Both the outside-a-component path and the in-component path asked this
+* question, each spelling out the same two-part test by hand. One answer keeps
+* the "is this a hydrating render with preloaded values" decision from drifting
+* between them.
+*/
+function resolveResourceRenderData() {
+	const renderData = getCurrentRenderData()?.resources;
+	return {
+		renderData,
+		hasPreloadedData: Boolean(renderData && (getActiveRenderContext()?.resourceDataProvided || Object.keys(renderData).some((key) => key.startsWith("r:"))))
+	};
+}
+/**
+* Resolve a resource declared outside any component instance.
+*
+* Only legitimate during a synchronous SSR render that already carries resolved
+* data; every other caller is creating a resource where it cannot be owned.
+*/
+function resolveResourceWithoutInstance() {
+	const { renderData, hasPreloadedData } = resolveResourceRenderData();
+	if (renderData && hasPreloadedData) {
+		const key = getNextRenderKey();
+		if (!(key in renderData)) throwSSRDataMissing();
+		return brandSnapshotSource({
+			value: renderData[key],
+			pending: false,
+			error: null,
+			refresh: () => {}
+		});
+	}
+	if (getActiveRenderContext()) throwSSRDataMissing();
+	throw new Error("[Askr] resource() must be called during component render inside an app. Do not create resources at module scope or outside render.");
+}
+/**
 * Resource primitive — simple, deterministic async primitive
 * Usage: resource(fn, deps)
 * - fn receives { signal }
@@ -133,24 +191,8 @@ function hydrationVerificationSnapshot() {
 function resource(fn, deps = []) {
 	const instance = getCurrentComponentInstance();
 	const inst = instance;
-	if (!instance) {
-		const renderData = getCurrentRenderData()?.resources;
-		if (renderData && (getActiveRenderContext()?.resourceDataProvided || Object.keys(renderData).some((key) => key.startsWith("r:")))) {
-			const key = getNextRenderKey();
-			if (!(key in renderData)) throwSSRDataMissing();
-			const val = renderData[key];
-			return brandSnapshotSource({
-				value: val,
-				pending: false,
-				error: null,
-				refresh: () => {}
-			});
-		}
-		if (getActiveRenderContext()) throwSSRDataMissing();
-		throw new Error("[Askr] resource() must be called during component render inside an app. Do not create resources at module scope or outside render.");
-	}
-	const renderData = getCurrentRenderData()?.resources;
-	const hasPreloadedResourceData = Boolean(renderData && (getActiveRenderContext()?.resourceDataProvided || Object.keys(renderData).some((key) => key.startsWith("r:"))));
+	if (!instance) return resolveResourceWithoutInstance();
+	const { renderData, hasPreloadedData: hasPreloadedResourceData } = resolveResourceRenderData();
 	const renderKey = inst.ssr || hasPreloadedResourceData ? getNextRenderKey() : null;
 	const verificationSnapshot = renderKey ? getResourceVerificationSnapshot(renderKey) : null;
 	if (renderData && hasPreloadedResourceData && renderKey && renderKey in renderData) {
@@ -209,10 +251,8 @@ function resource(fn, deps = []) {
 				inst.notifyUpdate?.();
 			} catch {}
 		});
-		(inst.cleanupFns ??= []).push(() => {
-			unsubscribe();
-			cell.dispose();
-		});
+		ownCleanup(inst.owner, unsubscribe);
+		ownCleanup(inst.owner, () => cell.dispose());
 		if (inst.ssr) {
 			cell.start(true, false);
 			if (!cell.pending) {