@askrjs/askr 0.3.1 → 0.4.1

package/dist/resources/index.js

@@ -1,12 +1,13 @@
-import { t as enqueueRuntimeLane } from "../access-CEA2pOry.js";
-import { a as registerCommitOperation, u as routeComponentErrorToBoundary } from "../instance-VAFYVJOa.js";
-import { O as ownCleanup, f as getCurrentComponentInstance, h as getSignal, i as claimHookIndex } from "../scope-Cq_iYbTR.js";
-import { n as getComponentLifecycleSlot } from "../capabilities-Bbf0mlp9.js";
-import { t as createFineGrainedEffect } from "../effect-C3Zsc1k6.js";
-import { t as resource } from "../resource-18-sFRl9.js";
-import { a as routeActive, i as windowFocused, n as documentVisible, r as resolveListenerTarget, t as timer } from "../timer-C7uqnJVt.js";
-import { n as onRouteChange } from "../activity-oy2YFTFF.js";
-//#region src/runtime/lifecycle/stream.ts
+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
+* that declared it commits, publishes each value to the components that read
+* its snapshot, and disconnects with the component.
+*/
 function toError(value) {
 	return value instanceof Error ? value : new Error(String(value));
 }
@@ -15,9 +16,7 @@ function depsEqual(left, right) {
 }
 function publish(slot) {
 	if (slot.disposed) return;
-	try {
-		slot.owner?.notifyUpdate?.();
-	} catch {}
+	notify(slot.readers);
 }
 function setStartingState(slot) {
 	const retained = slot.hasValue;
@@ -29,9 +28,9 @@ function setStartingState(slot) {
 function returnIterator(generation) {
 	if (generation.returned || !generation.iterator) return;
 	generation.returned = true;
-	const returnMethod = generation.iterator.return;
-	if (typeof returnMethod !== "function") return;
 	try {
+		const returnMethod = generation.iterator.return;
+		if (typeof returnMethod !== "function") return;
 		Promise.resolve(returnMethod.call(generation.iterator)).catch(() => {});
 	} catch {}
 }
@@ -75,9 +74,22 @@ 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;
-	stopGeneration(slot.current);
+	const previous = slot.current;
+	stopGeneration(previous);
+	if (slot.disposed || slot.current !== previous) return;
 	slot.explicitlyClosed = false;
 	setStartingState(slot);
 	publish(slot);
@@ -93,38 +105,28 @@ 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) {
 	if (slot.startQueued || slot.disposed || slot.explicitlyClosed) return;
 	slot.startQueued = true;
-	enqueueRuntimeLane("post", () => {
+	queueTask(() => {
 		slot.startQueued = false;
-		if (!slot.owner?.notifyUpdate || slot.explicitlyClosed) return;
+		if (!slot.owner || slot.owner.disposed || slot.explicitlyClosed) return;
 		startSlot(slot);
 	});
 }
 function closeSlot(slot) {
 	if (slot.disposed) return;
 	slot.explicitlyClosed = true;
-	stopGeneration(slot.current);
+	const previous = slot.current;
+	stopGeneration(previous);
+	if (slot.disposed || slot.current !== previous || !slot.explicitlyClosed) return;
 	slot.current = null;
 	slot.snapshot.status = "closed";
 	slot.snapshot.pending = false;
@@ -149,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,
@@ -161,7 +161,8 @@ function createSlot(source, options) {
 		hasValue: Object.prototype.hasOwnProperty.call(options, "initialValue"),
 		cleanupRegistered: false,
 		startQueued: false,
-		owner: null
+		owner: null,
+		readers: createSource()
 	};
 	snapshot.restart = () => {
 		if (slot.disposed) return;
@@ -179,247 +180,45 @@ function disposeSlot(slot) {
 	stopGeneration(slot.current);
 	slot.current = null;
 	slot.owner = null;
-	if (slot.activated && false);
 	slot.activated = false;
 }
-function commitSlot(instance, slot) {
-	const depsChanged = !depsEqual(slot.deps, slot.pendingDeps);
+function requireStreamOwner() {
+	const instance = currentComponent();
+	if (!instance) throw new Error("[Askr] stream() must be called during component render inside an app.");
+	return instance;
+}
+function commitSlot(instance, slot, source, deps) {
+	const depsChanged = !depsEqual(slot.deps, deps);
 	const firstCommit = !slot.activated;
-	const wasRunning = slot.current !== null;
 	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;
-		ownCleanup(instance.owner, () => disposeSlot(slot));
-	}
-	if (!slot.explicitlyClosed && (firstCommit || depsChanged && wasRunning)) queueStart(slot);
-}
-function getStreamSlot(instance, index, source, options) {
-	const slots = instance.lifecycleSlots ??= [];
-	const existing = slots[index];
-	if (existing) {
-		if (existing.kind !== "stream") throw new Error(`stream() lifecycle order violation: slot ${index} already belongs to ${existing.kind ?? "another primitive"}(). Keep lifecycle primitives in a stable top-level order.`);
-		return existing;
-	}
-	const slot = createSlot(source, options);
-	slots[index] = slot;
-	return slot;
-}
-/** Subscribe to a streaming data source for the current component's lifetime, with auto reconnect/cleanup. */
-function stream(source, options = {}) {
-	const instance = getCurrentComponentInstance();
-	if (!instance) return createSnapshot(options);
-	const slot = getStreamSlot(instance, claimHookIndex(instance, "stream"), source, options);
-	slot.pendingSource = source;
-	slot.pendingDeps = (options.deps ?? []).slice();
-	if (!instance.ssr) registerCommitOperation(() => commitSlot(instance, slot));
-	return slot.snapshot;
-}
-//#endregion
-//#region src/runtime/lifecycle/listener.ts
-function normalizeListenerOptions(options) {
-	if (options === void 0 || typeof options === "boolean") return options;
-	return {
-		...options.capture !== void 0 ? { capture: options.capture } : {},
-		...options.once !== void 0 ? { once: options.once } : {},
-		...options.passive !== void 0 ? { passive: options.passive } : {},
-		...options.signal !== void 0 ? { signal: options.signal } : {}
-	};
-}
-function listenerOptionsEqual(a, b) {
-	if (a === b) return true;
-	if (typeof a === "boolean" || typeof b === "boolean") return a === b;
-	if (!a || !b) return a === b;
-	return a.capture === b.capture && a.once === b.once && a.passive === b.passive && a.signal === b.signal;
-}
-function detachListenerSlot(slot) {
-	if (!slot.attached || !slot.target) return;
-	slot.target.removeEventListener(slot.event, slot.listener, slot.options);
-	slot.attached = false;
-}
-function commitListenerSlot(instance, slot) {
-	slot.handler = slot.pendingHandler;
-	const resolvedTarget = resolveListenerTarget(slot.pendingTarget);
-	if (!slot.attached || slot.target !== resolvedTarget || slot.event !== slot.pendingEvent || !listenerOptionsEqual(slot.options, slot.pendingOptions)) {
-		detachListenerSlot(slot);
-		slot.target = resolvedTarget;
-		slot.event = slot.pendingEvent;
-		slot.options = slot.pendingOptions;
-		if (slot.target) {
-			slot.target.addEventListener(slot.event, slot.listener, slot.options);
-			slot.attached = true;
-		}
-	}
-	if (!slot.cleanupRegistered) {
-		slot.cleanupRegistered = true;
-		ownCleanup(instance.owner, () => {
-			detachListenerSlot(slot);
-			slot.cleanupRegistered = false;
-		});
+		instance.onCleanup(() => disposeSlot(slot));
 	}
-}
-/** Attach an owned event listener to `target` for the current component's lifetime. */
-function on(target, event, handler, options) {
-	const instance = getCurrentComponentInstance();
-	if (!instance) return;
-	const index = claimHookIndex(instance, "on");
-	const normalizedOptions = normalizeListenerOptions(options);
-	const slot = getComponentLifecycleSlot(instance, index, "listener", () => {
-		const createdSlot = {
-			kind: "listener",
-			target: null,
-			event,
-			handler,
-			listener: ((evt) => {
-				createdSlot.handler.call(createdSlot.target, evt);
-			}),
-			options: void 0,
-			pendingTarget: target,
-			pendingEvent: event,
-			pendingHandler: handler,
-			pendingOptions: normalizedOptions,
-			attached: false,
-			cleanupRegistered: false
-		};
-		return createdSlot;
-	});
-	slot.pendingTarget = target;
-	slot.pendingEvent = event;
-	slot.pendingHandler = handler;
-	slot.pendingOptions = normalizedOptions;
-	registerCommitOperation(() => {
-		commitListenerSlot(instance, slot);
-	});
-}
-//#endregion
-//#region src/runtime/lifecycle/task.ts
-/** Runs an owned task after commit. */
-function task(fn) {
-	const instance = getCurrentComponentInstance();
-	if (!instance) return;
-	const index = claimHookIndex(instance, "task");
-	const slot = getComponentLifecycleSlot(instance, index, "task", () => ({
-		kind: "task",
-		started: false,
-		task: fn
-	}));
-	if (!slot.started) {
-		slot.task = fn;
-		registerCommitOperation(async () => {
-			if (slot.started) return;
-			slot.started = true;
-			return await slot.task();
+	if (!slot.explicitlyClosed && (firstCommit || depsChanged)) queueStart(slot);
+}
+function stream(sourceOrGetter, connectOrOptions, drivenOptions) {
+	const instance = requireStreamOwner();
+	if (typeof connectOrOptions === "function") {
+		const value = sourceOrGetter();
+		return createStream(instance, (context) => connectOrOptions(value, context), {
+			...drivenOptions,
+			deps: [value]
 		});
 	}
-}
-/**
-* Capture the result of a synchronous expression at call time and return a
-* thunk that returns the captured value later. This is a low-level helper for
-* cases where async continuations need to observe a snapshot of values at the
-* moment scheduling occurred.
-*
-* Usage (public API):
-* const snapshot = capture(() => someState());
-* Promise.resolve().then(() => { use(snapshot()); });
-*/
-function capture(fn) {
-	const value = fn();
-	return () => value;
-}
-//#endregion
-//#region src/runtime/lifecycle/watch.ts
-function watchValuesEqual(previous, next) {
-	if (previous.length !== next.length) return false;
-	for (let index = 0; index < previous.length; index += 1) if (!Object.is(previous[index], next[index])) return false;
-	return true;
-}
-function stopWatchGeneration(slot) {
-	const controller = slot.controller;
-	slot.controller = null;
-	if (controller && !controller.signal.aborted) controller.abort();
-	const cleanup = slot.cleanup;
-	slot.cleanup = null;
-	cleanup?.();
-}
-function stopWatchSlot(slot) {
-	stopWatchGeneration(slot);
-	slot.effect?.cleanup();
-	slot.effect = null;
-}
-function reportWatchError(instance, error) {
-	if (!routeComponentErrorToBoundary(instance, error)) throw error;
-}
-function commitWatchSlot(instance, slot) {
-	slot.callback = slot.pendingCallback;
-	slot.sources = slot.pendingSources;
-	const compute = () => {
-		const values = slot.sources.map((source) => source());
-		return values.length === 1 ? values[0] : values;
-	};
-	const observe = (value, previous) => {
-		stopWatchGeneration(slot);
-		const controller = new AbortController();
-		slot.controller = controller;
-		const initial = !slot.hasObserved;
-		slot.hasObserved = true;
-		let result;
-		try {
-			result = slot.callback(value, {
-				initial,
-				previous,
-				signal: controller.signal
-			});
-		} catch (error) {
-			reportWatchError(instance, error);
-			return;
-		}
-		if (typeof result === "function") {
-			slot.cleanup = result;
-			return;
-		}
-		if (result && typeof result.then === "function") Promise.resolve(result).catch((error) => {
-			if (!controller.signal.aborted) reportWatchError(instance, error);
-		});
-	};
-	if (!slot.effect) slot.effect = createFineGrainedEffect({
-		lane: "post",
-		compute,
-		commit: observe,
-		equals: (previous, next) => Array.isArray(previous) && Array.isArray(next) ? watchValuesEqual(previous, next) : Object.is(previous, next),
-		onError: (error) => reportWatchError(instance, error)
-	});
-	else slot.effect.updateCompute(compute);
-	if (!slot.cleanupRegistered) {
-		slot.cleanupRegistered = true;
-		ownCleanup(instance.owner, () => {
-			stopWatchSlot(slot);
-			slot.cleanupRegistered = false;
-		});
+	return createStream(instance, sourceOrGetter, connectOrOptions ?? {});
+}
+function createStream(instance, source, options) {
+	const slot = hookSlot(instance, "stream", () => createSlot(source, options));
+	readSource(slot.readers);
+	if (!instance.server) {
+		const deps = (options.deps ?? []).slice();
+		onCommit(instance, () => commitSlot(instance, slot, source, deps));
 	}
-}
-function watch(sourceOrSources, callback) {
-	const instance = getCurrentComponentInstance();
-	if (!instance) return;
-	const index = claimHookIndex(instance, "watch");
-	const sources = Array.isArray(sourceOrSources) ? sourceOrSources : [sourceOrSources];
-	const slot = getComponentLifecycleSlot(instance, index, "watch", () => ({
-		kind: "watch",
-		sources,
-		pendingSources: sources,
-		callback,
-		pendingCallback: callback,
-		effect: null,
-		controller: null,
-		cleanup: null,
-		cleanupRegistered: false,
-		hasObserved: false
-	}));
-	slot.pendingSources = sources;
-	slot.pendingCallback = callback;
-	if (instance.ssr) return;
-	registerCommitOperation(() => commitWatchSlot(instance, slot));
+	return slot.snapshot;
 }
 //#endregion
-export { capture, documentVisible, getSignal, on, onRouteChange, resource, routeActive, stream, task, timer, watch, windowFocused };
+export { capture, documentVisible, on, resource, routeActive, stream, task, timer, watch, windowFocused };

package/dist/router/index.d.ts

@@ -60,8 +60,8 @@ import {
   AuthContext as AuthContext$1,
   AuthRequirement,
   AuthRequirement as AuthRequirement$1,
-} from '@askrjs/auth';
-import { ObjectSchema } from '@askrjs/schema';
+  ObjectSchema,
+} from '../peer-types.js';
 /** A single query-string value accepted by {@link updateRouteQuery}. */
 type RouteQueryParamValue = string | number | boolean | null | undefined;
 /** A query-string value, or an array of them for a repeated param. */
@@ -222,6 +222,11 @@ declare function resolveRouteRequest(
   target: string,
   options: RouteRequestOptions
 ): RouteRequestResult | Promise<RouteRequestResult>;
+/** Match a path against a route registry without resolving route policies or loading data. */
+declare function matchRoute(
+  pathname: string,
+  options: { registry: RouteRegistry }
+): RouteMatch | null;
 /**
  * Run `definition` to declare routes (via `route`/`page`/`group`/`fallback`)
  * and build a {@link RouteRegistry} to pass to `createSPA`/`hydrateSPA`.
@@ -268,7 +273,7 @@ declare function lazyRouteData<TModule, TData = TModule>(
 declare function Outlet(): JSXElement;
 /** Which environment a route's data loader ran (or failed) in. */
 type RouteDataLoadPhase = 'client' | 'server' | 'ssg';
-/** Thrown when a route's `loader` rejects; wraps the original `cause`. */
+/** Rejection of a `lazyRouteData()` loader whose import or `select` failed; wraps the original `cause`. */
 declare class RouteDataLoadError extends Error {
   readonly route: string;
   readonly phase: RouteDataLoadPhase;
@@ -277,9 +282,12 @@ declare class RouteDataLoadError extends Error {
 }
 /** Policy decision: allow the route to render. */
 declare function allow(): AccessAllowDecision;
-/** Policy decision: redirect the visitor to `to`. */
+/**
+ * Policy decision: redirect the visitor to `to`. A string is a logical path
+ * that gains the registry `basePath`; a `to()` destination is used as-is.
+ */
 declare function redirect(
-  to: string,
+  to: string | RouteDestination,
   init?: {
     status?: AccessRedirectStatus;
     replace?: boolean;
@@ -514,6 +522,7 @@ export {
   isDeferred,
   lazy,
   lazyRouteData,
+  matchRoute,
   navigate,
   notFound,
   onRouteChange,

package/dist/router/index.js

@@ -1,13 +1,12 @@
-import { n as createRouteRegistry } from "../manifest-D1P3UNWV.js";
-import { n as isSafeHref } from "../router-internal-7nuNEHfG.js";
-import { t as jsx } from "../jsx-runtime-CPJXAOBF.js";
-import { a as serializeRouteMeta, c as getCurrentHref, d as parseTargetUrl, h as syncRegisteredRouteSnapshot, i as resolveRouteMeta, l as getRegisteredAppsSnapshot, m as syncAppRegistrationLocation, n as navigate, p as setCurrentRouteLocation, r as reconcileRouteMeta, s as saveScrollPosition, u as getWindowHref } from "../navigate-prC5V8XV.js";
-import { n as onRouteChange, t as currentRoute } from "../activity-oy2YFTFF.js";
-import { S as isDeferred, a as resolveRouteRequest, c as Outlet, f as lazy, m as RouteDataLoadError, p as lazyRouteData, s as currentAuth, x as defer } from "../resolution-3DskUkjG.js";
-import { b as getActiveRouteBasePath, o as addRouteBasePath } from "../route-matching-CUzZ31gT.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-CbgNhf67.js";
-import { i as mergeProps } from "../aria-hKjThHcp.js";
-import { t as applyInteractionPolicy } from "../interactions-CTeACdT_.js";
+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-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-BAa2xuJ-.js";
 //#region src/router/route-query.ts
 function getRouteQueryHistoryMode(options) {
 	if (options.history) return options.history;
@@ -34,56 +33,26 @@ function applyRouteQueryUpdates(searchParams, updates) {
 }
 function updateRouteQuery(updates, options = {}) {
 	if (typeof window === "undefined") return;
-	const url = parseTargetUrl(getWindowHref());
+	const url = parseTargetUrl("");
+	url.hash = window.location.hash;
 	applyRouteQueryUpdates(url.searchParams, updates);
 	const href = `${url.pathname}${url.search}${url.hash}`;
 	if (href === getWindowHref()) return;
 	const historyMode = getRouteQueryHistoryMode(options);
 	if (historyMode === "push") saveScrollPosition(getCurrentHref());
 	const state = window.history.state && typeof window.history.state === "object" ? window.history.state : {};
+	const historyIndex = nextHistoryIndex(historyMode);
 	window.history[historyMode === "replace" ? "replaceState" : "pushState"]({
 		...state,
-		path: href
-	}, "", href);
+		path: href,
+		askrIndex: historyIndex
+	}, "", toDocumentUrl(href));
+	commitHistoryIndex(historyIndex);
 	setCurrentRouteLocation(url.pathname, href);
 	for (const app of getRegisteredAppsSnapshot()) syncAppRegistrationLocation(app, url.pathname, href);
 	syncRegisteredRouteSnapshot();
 }
 //#endregion
-//#region src/router/policy.ts
-/** Policy decision: allow the route to render. */
-function allow() {
-	return { kind: "allow" };
-}
-/** Policy decision: redirect the visitor to `to`. */
-function redirect(to, init = {}) {
-	return {
-		kind: "redirect",
-		to,
-		...init.status ? { status: init.status } : {},
-		...init.replace !== void 0 ? { replace: init.replace } : {}
-	};
-}
-/** Policy decision: deny the request with the given HTTP status. */
-function deny(status) {
-	return {
-		kind: "deny",
-		status
-	};
-}
-/** Policy decision: deny with 401 Unauthorized. */
-function unauthorized() {
-	return deny(401);
-}
-/** Policy decision: deny with 403 Forbidden. */
-function forbidden() {
-	return deny(403);
-}
-/** Policy decision: deny with 404 Not Found. */
-function notFound() {
-	return deny(404);
-}
-//#endregion
 //#region src/router/destination.ts
 function routeParameterName(segment) {
 	if (segment === "*") return {
@@ -101,7 +70,7 @@ function routeParameterName(segment) {
 	};
 }
 function encodeParameter(value, splat) {
-	return splat ? value.split("/").map((part) => encodeURIComponent(part)).join("/") : encodeURIComponent(value);
+	return splat ? value.split("/").map(encodePathSegment).join("/") : encodePathSegment(value);
 }
 function buildPath(route, params) {
 	return route.path.split("/").map((segment) => {
@@ -176,18 +145,18 @@ function isSameOriginNavigableHref(href) {
 * - Composable via mergeProps
 */
 function Link({ href: suppliedHref, to, class: className, children, rel, target, "aria-current": ariaCurrent, "aria-label": ariaLabel, onPress, onClick, ...rest }) {
-	const supplied = to?.href ?? suppliedHref;
-	const href = supplied ? addRouteBasePath(supplied, getActiveRouteBasePath()) : supplied;
+	const href = to?.href ?? (suppliedHref ? addLogicalRouteBasePath(suppliedHref, getActiveRouteBasePath()) : suppliedHref);
 	if (!href) throw new Error("Link requires href or to.");
 	if (!isSafeHref(href)) throw new TypeError("Link href uses an unsafe URL scheme.");
+	assertPathHrefStaysOnOrigin(href);
 	const handleNavigation = (e) => {
 		if (e.defaultPrevented) return;
 		const event = e;
 		if ((event.button ?? 0) !== 0 || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) return;
-		if (target || !isSameOriginNavigableHref(href)) return;
+		if (target && target.toLowerCase() !== "_self" || !isSameOriginNavigableHref(href)) return;
 		if (rest.download !== void 0) return;
 		event.preventDefault();
-		navigate(href);
+		navigateToPublicHref(href);
 	};
 	const interaction = applyInteractionPolicy({
 		isNative: true,
@@ -215,4 +184,4 @@ function Link({ href: suppliedHref, to, class: className, children, rel, target,
 	});
 }
 //#endregion
-export { Link, Outlet, Resolve, RouteDataLoadError, allow, createRouteRegistry, currentAuth, currentRoute, defer, deny, fallback, forbidden, group, index, isDeferred, lazy, lazyRouteData, navigate, notFound, onRouteChange, page, reconcileRouteMeta, redirect, resolveDeferredValues, resolveRouteMeta, resolveRouteRequest, route, routeData, serializeRouteMeta, to, unauthorized, updateRouteQuery };
+export { Link, Outlet, Resolve, RouteDataLoadError, allow, createRouteRegistry, currentAuth, currentRoute, defer, deny, fallback, forbidden, group, index, isDeferred, lazy, lazyRouteData, matchRoute, navigate, notFound, onRouteChange, page, reconcileRouteMeta, redirect, resolveDeferredValues, resolveRouteMeta, resolveRouteRequest, route, routeData, serializeRouteMeta, to, unauthorized, updateRouteQuery };

package/dist/scope-ila_zaId.js

@@ -0,0 +1,55 @@
+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-kjLigwDJ.js";
+//#region src/core/api/scope.ts
+/**
+* Lexical scopes. A scope's provider is a component that records its value
+* on its own lifetime; `readScope()` finds the nearest provider by walking up
+* the owner tree from the code that is running.
+*/
+function ScopeProvider(props) {
+	currentComponent()?.provide(props.scopeKey, props.value);
+	if (typeof Node !== "undefined" && props.children instanceof Node) return null;
+	return {
+		$$typeof: ELEMENT_TYPE,
+		type: Fragment,
+		props: { children: props.children },
+		key: null
+	};
+}
+/** Create a scope whose value defaults to `defaultValue`. */
+function defineScope(defaultValue) {
+	const key = Symbol("AskrScope");
+	const scope = (props) => ({
+		$$typeof: ELEMENT_TYPE,
+		type: ScopeProvider,
+		props: {
+			scopeKey: key,
+			value: props.value,
+			children: props.children
+		},
+		key: null
+	});
+	return Object.assign(scope, {
+		key,
+		defaultValue
+	});
+}
+const NOT_FOUND = Symbol("not-found");
+/** Whether `readScope()` can run here (inside a render or owned callback). */
+function isScopeReadable() {
+	return getOwner() !== null;
+}
+/** Read the nearest provided value of `scope`, or its default. */
+function readScope(scope) {
+	const owner = getOwner();
+	if (!owner) throw new Error("readScope() can only be called during component render or async resource execution. Ensure you are calling this from inside your component or resource function.");
+	const value = lookup(owner, scope.key);
+	return value === NOT_FOUND ? scope.defaultValue : value;
+}
+function lookup(owner, key) {
+	for (let o = owner; o; o = o.parent) if (o.context?.has(key)) return o.context.get(key);
+	return NOT_FOUND;
+}
+//#endregion
+export { isScopeReadable as n, readScope as r, defineScope as t };

package/dist/{shared-kU8yvryp.js → shared-O2ZnmYAf.js}

@@ -1,10 +1,4 @@
-import { t as notifyReadableSource } from "./notify-DxxuDPeY.js";
 //#region src/data/shared.ts
-function createReadableSource() {
-	return (() => void 0);
-}
-/** Re-exported so data cells keep their existing name for the shared fan-out. */
-const notifySource = notifyReadableSource;
 function isAbortError(error, signal) {
 	return signal.aborted || error instanceof Error && error.name === "AbortError" || typeof DOMException !== "undefined" && error instanceof DOMException && error.name === "AbortError";
 }
@@ -21,4 +15,4 @@ function normalizeAsyncDataError(error, fallbackMessage) {
 	return new Error(error == null ? fallbackMessage : String(error));
 }
 //#endregion
-export { normalizeAsyncDataError as a, isCurrentAsyncOperation as i, isAbortError as n, notifySource as o, isCurrentAsyncGeneration as r, createReadableSource as t };
+export { normalizeAsyncDataError as i, isCurrentAsyncGeneration as n, isCurrentAsyncOperation as r, isAbortError as t };

package/dist/{snapshot-source-An4iKajG.js → snapshot-Cjx4N988.js}

@@ -1,4 +1,9 @@
-//#region src/runtime/reactivity/snapshot-source.ts
+//#region src/core/api/snapshot.ts
+/**
+* The brand that marks an async snapshot (`resource()`, queries) so
+* `derive(source, map)` can wait for it to settle. The symbol is global so
+* every copy of the package agrees on it.
+*/
 const SNAPSHOT_SOURCE_BRAND = Symbol.for("__ASKR_SNAPSHOT_SOURCE__");
 function brandSnapshotSource(value) {
 	Object.defineProperty(value, SNAPSHOT_SOURCE_BRAND, {