@askrjs/askr 0.2.3 → 0.3.0

package/dist/actions/index.d.ts

@@ -1,2 +1,16 @@
-import { a as action, i as ActionValidationError, n as ActionForm, o as defineAction, r as ActionStatus, t as ActionDescriptor } from "../index-DSqXWc77.js";
-export { ActionDescriptor, ActionForm, ActionStatus, ActionValidationError, action, defineAction };
+import {
+  action,
+  ActionValidationError,
+  ActionForm,
+  defineAction,
+  ActionStatus,
+  ActionDescriptor,
+} from '../core.js';
+export {
+  ActionDescriptor,
+  ActionForm,
+  ActionStatus,
+  ActionValidationError,
+  action,
+  defineAction,
+};

package/dist/actions/index.js

@@ -1,9 +1,9 @@
-import { d as getCurrentAppRenderRuntime } from "../component-scope-4I3yEMkb.js";
+import { d as getCurrentAppRenderRuntime } from "../scope-Cq_iYbTR.js";
 import { r as getCurrentRenderData } from "../render-context-B7ohlh6t.js";
-import { t as state } from "../state-BzhOW2TX.js";
-import { jsx, jsxs } from "../jsx-runtime.js";
-import { c as resolveDataRuntimeState, s as invalidateQueriesForRuntime } from "../data-runtime-7t_Y0iv3.js";
-import { r as isCurrentAsyncGeneration } from "../shared-CGrx2AOL.js";
+import { t as state } from "../state-BXJfudq1.js";
+import { r as jsxs, t as jsx } from "../jsx-runtime-CPJXAOBF.js";
+import { c as resolveDataRuntimeState, s as invalidateQueriesForRuntime } from "../data-runtime-CxoY98lX.js";
+import { r as isCurrentAsyncGeneration } from "../shared-kU8yvryp.js";
 //#region src/actions/runtime.ts
 const emptyFramework = Object.freeze({});
 /** @internal Read Askr-owned state from the current application root. */

package/dist/{activity-ZxJXI9hF.js → activity-oy2YFTFF.js}

@@ -1,9 +1,10 @@
-import { d as getCurrentAppRenderRuntime, f as getCurrentComponentInstance, i as claimHookIndex } from "./component-scope-4I3yEMkb.js";
-import { a as registerCommitOperation } from "./component-internal-Dl02WQKS.js";
-import { l as notifyReadableReaders, o as markReactivePropsDirtySource, s as markReadableDerivedSubscribersDirty, u as recordReadableRead } from "./readable-CEcteIDE.js";
+import { a as registerCommitOperation } from "./instance-VAFYVJOa.js";
+import { d as getCurrentAppRenderRuntime, f as getCurrentComponentInstance, i as claimHookIndex } from "./scope-Cq_iYbTR.js";
+import { a as ownComponentCleanup, i as isServerComponent, n as getComponentLifecycleSlot } from "./capabilities-Bbf0mlp9.js";
+import { t as notifyReadableSource, v as recordReadableRead } from "./notify-DxxuDPeY.js";
 import { n as getActiveRenderContext } from "./render-context-B7ohlh6t.js";
 import { n as syncRouteActivitySnapshot } from "./route-activity-CNJfpwx-.js";
-import { b as getActiveRoutes, c as removeRouteBasePath, d as deepFreeze, f as makeQuery, n as computeMatchesFromRoutes, p as parseLocation, y as getActiveRouteBasePath } from "./route-matching-Bo6UqG-5.js";
+import { b as getActiveRouteBasePath, c as removeRouteBasePath, d as deepFreeze, f as makeQuery, n as computeMatchesFromRoutes, p as parseLocation, x as getActiveRoutes } from "./route-matching-CUzZ31gT.js";
 //#region src/common/app-render-runtime.ts
 const stagedRouteLocations = /* @__PURE__ */ new WeakMap();
 function createAppRenderRuntime(input = {}) {
@@ -39,10 +40,7 @@ function onRouteChange(fn, options = {}) {
 	if (!instance) return;
 	const route = currentRoute();
 	const index = claimHookIndex(instance, "route-change");
-	const slots = instance.lifecycleSlots ??= [];
-	const existing = slots[index];
-	if (existing && existing.kind !== "route-change") throw new Error(`onRouteChange() lifecycle order violation: slot ${index} already belongs to ${existing.kind}(). Keep lifecycle primitives in a stable top-level order.`);
-	const slot = existing ?? {
+	const slot = getComponentLifecycleSlot(instance, index, "route-change", () => ({
 		kind: "route-change",
 		previous: null,
 		pending: null,
@@ -50,14 +48,12 @@ function onRouteChange(fn, options = {}) {
 		cleanupRegistered: false,
 		callback: fn,
 		immediate: options.immediate === true
-	};
-	slots[index] = slot;
+	}), "onRouteChange");
 	slot.pending = route;
 	slot.callback = fn;
 	slot.immediate = options.immediate === true;
 	if (!slot.cleanupRegistered) {
-		instance.cleanupFns ??= [];
-		instance.cleanupFns.push(() => {
+		ownComponentCleanup(instance, () => {
 			slot.cleanup?.();
 			slot.cleanup = null;
 		});
@@ -83,6 +79,14 @@ function onRouteChange(fn, options = {}) {
 	});
 }
 let serverLocation = null;
+function readLocationState() {
+	const historyState = typeof window !== "undefined" && window.history?.state ? window.history.state : null;
+	const hasState = historyState?.askrHasState === true;
+	return {
+		hasState,
+		state: hasState ? historyState.askrState : void 0
+	};
+}
 function logicalRoutePathname(pathname) {
 	const logical = removeRouteBasePath(pathname, getActiveRouteBasePath());
 	return logical === void 0 ? void 0 : parseLocation(logical).pathname;
@@ -111,11 +115,13 @@ function buildRouteSnapshot(pathname, search, hash) {
 	pathname = location.pathname;
 	const query = makeQuery(search);
 	const matches = location.withinBasePath ? computeMatchesFromRoutes(pathname, getActiveRoutes()) : [];
+	const locationState = readLocationState();
 	return Object.freeze({
 		path: pathname,
 		params: deepFreeze({ ...matches[0]?.params }),
 		query,
 		hash: hash || null,
+		...locationState,
 		matches: Object.freeze(matches)
 	});
 }
@@ -123,9 +129,7 @@ function setCurrentRouteSnapshot(pathname, search, hash, activityMatches) {
 	currentRouteSnapshot = buildRouteSnapshot(pathname, search, hash);
 	syncRouteActivitySnapshot(currentRouteSnapshot.path, activityMatches ?? currentRouteSnapshot.matches);
 	const instance = getCurrentComponentInstance();
-	markReadableDerivedSubscribersDirty(currentRouteSource);
-	markReactivePropsDirtySource(currentRouteSource);
-	notifyReadableReaders(currentRouteSource, instance);
+	notifyReadableSource(currentRouteSource, { skipInstance: instance });
 }
 function readCurrentRouteLocation() {
 	const renderContext = getActiveRenderContext();
@@ -172,11 +176,13 @@ function readCurrentRouteSnapshot() {
 	const matches = withinBasePath ? computeMatchesFromRoutes(pathname, getActiveRoutes()) : [];
 	const routeParams = (withinBasePath ? getActiveRenderContext()?.params : void 0) ?? matches[0]?.params ?? {};
 	const params = deepFreeze({ ...routeParams });
+	const locationState = readLocationState();
 	return Object.freeze({
 		path: pathname,
 		params,
 		query,
 		hash: hash || null,
+		...locationState,
 		matches: Object.freeze(matches)
 	});
 }
@@ -184,7 +190,7 @@ function readCurrentRouteSnapshot() {
 function currentRoute() {
 	const instance = getCurrentComponentInstance();
 	if (!instance) throw new Error("currentRoute() can only be called during component render execution. Call currentRoute() from inside your component function.");
-	if (typeof window === "undefined" || instance.ssr) return readCurrentRouteSnapshot();
+	if (typeof window === "undefined" || isServerComponent(instance)) return readCurrentRouteSnapshot();
 	recordReadableRead(currentRouteSource);
 	return readCurrentRouteSnapshot();
 }

package/dist/benchmark.js

@@ -1,10 +1,9 @@
-import { r as flushRuntimeScheduler } from "./access-Rr7CMa06.js";
-import { t as state } from "./state-BzhOW2TX.js";
-import { t as selector } from "./selector-C7rIpOnN.js";
-import { t as installRendererBridge } from "./renderer-BhXofszH.js";
-import { i as For } from "./control-57x3wa4J.js";
-import { jsx, jsxs } from "./jsx-runtime.js";
-import { t as createIsland } from "./boot-D4GaLA0d.js";
+import { r as flushRuntimeScheduler } from "./access-CEA2pOry.js";
+import { t as state } from "./state-BXJfudq1.js";
+import { t as selector } from "./selector-BSPVkjKP.js";
+import { i as For } from "./control-BR_mrX__.js";
+import { r as jsxs, t as jsx } from "./jsx-runtime-CPJXAOBF.js";
+import { r as createIsland, s as installRendererBridge } from "./boot-BMBMWUGI.js";
 //#region src/bench/components/benchmark-row.tsx
 function BenchmarkRow({ item, isSelected, onSelect, onRemove }) {
 	return /* @__PURE__ */ jsxs("tr", {
@@ -63,8 +62,8 @@ function BenchmarkTable({ rows, isSelected, onSelect, onRemove }) {
 installRendererBridge();
 const benchmarkMetadata = {
 	packageName: "@askrjs/askr",
-	packageVersion: "0.2.3",
-	buildLabel: "0.2.3-local"
+	packageVersion: "0.3.0",
+	buildLabel: "0.3.0-local"
 };
 function getBenchmarkMetadata() {
 	return { ...benchmarkMetadata };

package/dist/boot/index.d.ts

@@ -1,11 +1,17 @@
-import { Bt as DataRuntime, dt as RouteAuthOptions, jt as RouteRegistry, sn as ComponentFunction } from "../index-DSqXWc77.js";
-import { a as ScrollRestorationOptions } from "../navigate-wel1e6cU.js";
-//#region src/boot/types.d.ts
+import {
+  RouteAuthOptions,
+  RouteRegistry,
+  ComponentFunction,
+  DataRuntime,
+} from '../core.js';
+import { ScrollRestorationOptions } from '../navigation.js';
 /** Configuration for {@link createIsland}: mounts one component onto existing DOM. */
 type IslandConfig = {
   root: Element | string;
   component: ComponentFunction;
   cspNonce?: string;
+  /** Optional data runtime owned by this island's render and event lifecycle. */
+  dataRuntime?: DataRuntime;
   cleanupStrict?: boolean;
   routes?: never;
 };
@@ -46,8 +52,6 @@ type HydrateSPAConfig = BootRouteSource & {
     skipSelectors?: string[];
   };
 };
-//#endregion
-//#region src/boot/root-lifecycle.d.ts
 /**
  * Tear down the app mounted at `root`: runs its cleanup callbacks, clears
  * route state if it was the last routed root, and removes bookkeeping for
@@ -56,8 +60,6 @@ type HydrateSPAConfig = BootRouteSource & {
 declare function cleanupApp(root: Element | string): void;
 /** Check whether an app instance is currently mounted at `root`. */
 declare function hasApp(root: Element | string): boolean;
-//#endregion
-//#region src/boot/index.d.ts
 /**
  * createIsland: Enhances existing DOM (no router, mounts once)
  */
@@ -81,5 +83,15 @@ declare function createSPA(config: SPAConfig): Promise<void>;
  * hydrateSPA: Hydrate server-rendered HTML with an explicit route registry.
  */
 declare function hydrateSPA(config: HydrateSPAConfig): Promise<void>;
-//#endregion
-export { type HydrateSPAConfig, type IslandConfig, type IslandsConfig, type SPAConfig, cleanupApp, createIsland, createIslands, createSPA, hasApp, hydrateSPA };
+export {
+  type HydrateSPAConfig,
+  type IslandConfig,
+  type IslandsConfig,
+  type SPAConfig,
+  cleanupApp,
+  createIsland,
+  createIslands,
+  createSPA,
+  hasApp,
+  hydrateSPA,
+};

package/dist/boot/index.js

@@ -1,2 +1,2 @@
-import { a as cleanupApp, i as hydrateSPA, n as createIslands, o as hasApp, r as createSPA, t as createIsland } from "../boot-D4GaLA0d.js";
+import { a as cleanupApp, i as createIslands, n as createSPA, o as hasApp, r as createIsland, t as hydrateSPA } from "../boot-BMBMWUGI.js";
 export { cleanupApp, createIsland, createIslands, createSPA, hasApp, hydrateSPA };