eddev 2.0.0-beta.21 → 2.0.0-beta.211

package/dist/app/lib/routing/context.d.ts

@@ -1,5 +1,9 @@
-import { Context } from "react";
-import { RouterAPI, RouterAPIState } from "./types.js";
-export declare const RouterContext: Context<RouterAPI>;
-export declare const RouterStateContext: Context<RouterAPIState>;
-export declare const RouteItemContext: Context<import("./types.js").TypedRouteState<"_unknown", {}>>;
+import { RouteMetaTag, RouterAPI, RouterAPIState } from "./types.js";
+export declare const RouterContext: import("react").Context<RouterAPI>;
+export declare const RouterStateContext: import("react").Context<RouterAPIState>;
+export declare const RouteItemContext: import("react").Context<import("./types.js").TypedRouteState<"_unknown", {}>>;
+export declare const clientMetaTags: {
+    tags: null | RouteMetaTag[];
+    setMetaTags(tags: RouteMetaTag[]): void;
+};
+//# sourceMappingURL=context.d.ts.map

package/dist/app/lib/routing/context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAc,SAAS,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAkBhF,eAAO,MAAM,aAAa,oCAgBxB,CAAA;AAEF,eAAO,MAAM,kBAAkB,yCAI7B,CAAA;AAEF,eAAO,MAAM,gBAAgB,+EAAwC,CAAA;AAErE,eAAO,MAAM,cAAc;UACX,IAAI,GAAG,YAAY,EAAE;sBACjB,YAAY,EAAE;CAGhC,CAAA"}

package/dist/app/lib/routing/context.js

@@ -1,5 +1,6 @@
 import { createContext } from "react";
 import { RouteLoader } from "./loader.js";
+import { proxy } from "valtio";
 const NOOP_ROUTE = {
     component: () => null,
     id: "initial",
@@ -12,6 +13,7 @@ const NOOP_ROUTE = {
     search: "",
     query: {},
     returnState: undefined,
+    meta: {},
 };
 export const RouterContext = createContext({
     loader: new RouteLoader(),
@@ -25,6 +27,10 @@ export const RouterContext = createContext({
     replaceQuery(query) { },
     handleClickEvent(e, originalHref) { },
     emitEvent(event) { },
+    getState() {
+        return null;
+    },
+    restoreRoute(route) { },
 });
 export const RouterStateContext = createContext({
     history: [NOOP_ROUTE],
@@ -32,98 +38,9 @@ export const RouterStateContext = createContext({
     blockers: [],
 });
 export const RouteItemContext = createContext(NOOP_ROUTE);
-// type StoreHook<State> = <Slice = State>(
-//   selector?: (state: State) => Slice,
-//   areEqual?: (a: Slice, b: Slice) => boolean,
-// ) => Slice
-// type Store<T> = {
-//   subscribe(sub: (value: T) => void): () => void
-//   value: T
-//   update(next: T): void
-// }
-// function createStore<T>(initial: T): Store<T> {
-//   let value = initial
-//   const subscribers = new Set<(value: T) => void>()
-//   return {
-//     subscribe(sub: (value: T) => void) {
-//       subscribers.add(sub)
-//       return () => {
-//         subscribers.delete(sub)
-//       }
-//     },
-//     get value() {
-//       return value
-//     },
-//     update(nextValue: T) {
-//       value = nextValue
-//       if (subscribers.size) {
-//         console.log("UPDATE", value)
-//         startTransition(() => {
-//           for (let sub of subscribers) {
-//             sub(value)
-//           }
-//         })
-//       }
-//     },
-//   }
-// }
-// export function createStoreHook<T>(store: Store<T>): StoreHook<T> {
-//   const hook = (selector: any) => {
-//     const get = () => (selector ? selector(store.value) : store.value)
-//     return useSyncExternalStore(store.subscribe, get, get)
-//   }
-//   return hook as StoreHook<T>
-// }
-// export function createStoreContextHook<T>(ctx: Context<Store<T>>): StoreHook<T> {
-//   const hook = (selector: any) => {
-//     const store = useContext(ctx)
-//     const get = () => (selector ? selector(store.value) : store.value)
-//     return useSyncExternalStore(store.subscribe, get, get)
-//   }
-//   return hook as StoreHook<T>
-// }
-// export const RouterContext = createContext<Store<RouterAPI>>(null!)
-// export const RouterStateContext = createContext<Store<RouterAPIState>>(null!)
-// export const RouteContext = createContext<Store<RouteState>>(null!)
-// const NOOP_ROUTE: RouteState = {
-//   component: () => null,
-//   id: "initial",
-//   hash: "",
-//   key: "initial",
-//   pathname: "",
-//   props: {},
-//   uri: "",
-//   view: "_unknown",
-//   search: "",
-//   query: {},
-//   returnState: undefined,
-// }
-// export const createRouteItemStore = (initial?: RouteState) => {
-//   return createStore<RouteState>(initial ?? NOOP_ROUTE)
-// }
-// export function createRouterAPIStore(initial?: RouterAPI) {
-//   return createStore<RouterAPI>(
-//     initial ?? {
-//       loader: new RouteLoader(),
-//       async navigate(url) {},
-//       async prefetch(url) {},
-//       async preload(url) {},
-//       subscribe(fn) {
-//         return () => {}
-//       },
-//       replaceHash(hash) {},
-//       replaceQuery(query) {},
-//       handleClickEvent(e, originalHref) {},
-//       emitEvent(event) {},
-//     },
-//   )
-// }
-// export function createRouterStateStore(initial?: RouterAPIState) {
-//   return createStore<RouterAPIState>(
-//     initial ?? {
-//       history: [],
-//       activeRoute: NOOP_ROUTE,
-//       blockers: [],
-//     },
-//   )
-// }
+export const clientMetaTags = proxy({
+    tags: null,
+    setMetaTags(tags) {
+        clientMetaTags.tags = tags;
+    },
+});

package/dist/app/lib/routing/hooks/useIsSSR.d.ts

@@ -6,3 +6,4 @@
  * On the client, this hook will return `true` once, after hydration, and then switch to `false`.
  */
 export declare function useIsSSR(): boolean;
+//# sourceMappingURL=useIsSSR.d.ts.map

package/dist/app/lib/routing/hooks/useIsSSR.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useIsSSR.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useIsSSR.tsx"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,wBAAgB,QAAQ,YAavB"}

package/dist/app/lib/routing/hooks/useRestorableState.d.ts

@@ -1,5 +1,7 @@
+import { Dispatch } from "react";
 /**
  * Works exactly like useState, but allows back and forward navigation to restore the previous state.
  * You must pass a unique ID as an additional first parameter to ensure the state is restored correctly.
  */
-export declare function useRestorableState<T>(key: string, fallback?: T): any[];
+export declare function useRestorableState<T>(key: string, fallback: T): [T, Dispatch<T>];
+//# sourceMappingURL=useRestorableState.d.ts.map

package/dist/app/lib/routing/hooks/useRestorableState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRestorableState.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useRestorableState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAY,MAAM,OAAO,CAAA;AAI1C;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAYhF"}

package/dist/app/lib/routing/hooks/useRoute.d.ts

@@ -1,2 +1,18 @@
 import type { RouteState } from "../types.js";
+/**
+ * Returns the current route object.
+ *
+ * In most circumstances, this will be the active top-level route.
+ *
+ * In cases where manual rendering of routes is taking place, such as during page transitions or in some modal cases.
+ *
+ * @returns The current route
+ */
 export declare function useRoute(): RouteState;
+/**
+ * Returns the current route, if it matches the specified view, otherwise null.
+ */
+export declare function useViewRoute<V extends keyof ViewProps>(view: V): Extract<RouteState, {
+    view: V;
+}> | null;
+//# sourceMappingURL=useRoute.d.ts.map

package/dist/app/lib/routing/hooks/useRoute.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRoute.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useRoute.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,IAAI,UAAU,CAErC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,EAAE;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC,GAAG,IAAI,CAOxG"}

package/dist/app/lib/routing/hooks/useRoute.js

@@ -1,5 +1,26 @@
 import { useContext } from "react";
 import { RouteItemContext } from "../context.js";
+/**
+ * Returns the current route object.
+ *
+ * In most circumstances, this will be the active top-level route.
+ *
+ * In cases where manual rendering of routes is taking place, such as during page transitions or in some modal cases.
+ *
+ * @returns The current route
+ */
 export function useRoute() {
     return useContext(RouteItemContext);
 }
+/**
+ * Returns the current route, if it matches the specified view, otherwise null.
+ */
+export function useViewRoute(view) {
+    const route = useContext(RouteItemContext);
+    if (route.view === view) {
+        return route;
+    }
+    else {
+        return null;
+    }
+}

package/dist/app/lib/routing/hooks/useRouteMeta.d.ts

@@ -0,0 +1,6 @@
+import { RouteMeta } from "../types";
+export declare const $routeMetaStore: {
+    data: RouteMeta;
+};
+export declare function useRouteMeta(): RouteMeta;
+//# sourceMappingURL=useRouteMeta.d.ts.map

package/dist/app/lib/routing/hooks/useRouteMeta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRouteMeta.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useRouteMeta.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAEpC,eAAO,MAAM,eAAe;UACd,SAAS;CACrB,CAAA;AAEF,wBAAgB,YAAY,IAGf,SAAS,CACrB"}

package/dist/app/lib/routing/hooks/useRouteMeta.js

@@ -0,0 +1,9 @@
+import { proxy, useSnapshot } from "valtio";
+export const $routeMetaStore = proxy({
+    data: {},
+});
+export function useRouteMeta() {
+    return useSnapshot($routeMetaStore, {
+        sync: true,
+    }).data;
+}

package/dist/app/lib/routing/hooks/useRouteTransition.d.ts

@@ -2,3 +2,4 @@ import type { RouteState } from "../types.js";
 type TransitionFunction = (currentRoute: RouteState, nextRoute: RouteState) => void | Promise<any | void>;
 export declare function useRouteTransition(func: TransitionFunction): void;
 export {};
+//# sourceMappingURL=useRouteTransition.d.ts.map

package/dist/app/lib/routing/hooks/useRouteTransition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRouteTransition.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useRouteTransition.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,KAAK,kBAAkB,GAAG,CAAC,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,KAAK,IAAI,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;AAEzG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,QAe1D"}

package/dist/app/lib/routing/hooks/useRouter.d.ts

@@ -1,2 +1,3 @@
 import { RouterAPI } from "../types.js";
 export declare function useRouter<T = RouterAPI>(selector?: (r: RouterAPI) => T): T;
+//# sourceMappingURL=useRouter.d.ts.map

package/dist/app/lib/routing/hooks/useRouter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRouter.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useRouter.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,wBAAgB,SAAS,CAAC,CAAC,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,CAAC,GAAG,CAAC,CAO1E"}

package/dist/app/lib/routing/hooks/useRouterEvents.d.ts

@@ -1,2 +1,3 @@
 import type { RouterEvent } from "../types.js";
 export declare function useRouterEvents(handler: (event: RouterEvent) => void): void;
+//# sourceMappingURL=useRouterEvents.d.ts.map

package/dist/app/lib/routing/hooks/useRouterEvents.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRouterEvents.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useRouterEvents.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAE9C,wBAAgB,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,QAWpE"}

package/dist/app/lib/routing/hooks/useRouterState.d.ts

@@ -1,2 +1,3 @@
 import { RouterAPIState } from "../types.js";
 export declare function useRouterState<T = RouterAPIState>(selector?: (state: RouterAPIState) => T): T;
+//# sourceMappingURL=useRouterState.d.ts.map

package/dist/app/lib/routing/hooks/useRouterState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRouterState.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useRouterState.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAE5C,wBAAgB,cAAc,CAAC,CAAC,GAAG,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,CAAC,GAAG,CAAC,CAI7F"}

package/dist/app/lib/routing/hooks/useSearchParams.d.ts

@@ -1,10 +1,82 @@
+/**
+ * Search param API object.
+ */
 export type SearchParamAPI<T> = {
-    set<K extends keyof T>(key: K, value: T[K]): void;
-    setAll: (value: T) => void;
-    setter<K extends keyof T>(key: K): (value: T[K]) => void;
+    /**
+     * Set an individual parameter value by key.
+     *
+     * If the value is an array, then one or more `key[]` parameters will be set. Otherwise, a single `key` parameter will be set.
+     *
+     * If the value is `null` or `undefined`, the parameter will be removed from the query string.
+     *
+     * @param key The search parameter name
+     * @param value The value to set
+     */
+    set<K extends keyof T>(key: K, value: T[K] | null | undefined): void;
+    /**
+     * Set all parameters at once, replacing the entire query string. Any parameters not present will be replaced with their default value. Passing an empty object is equivalent to calling `reset()`.
+     *
+     * @param value
+     * @returns
+     */
+    setAll: (value: Partial<T>) => void;
+    /**
+     * Returns a memoized setter function for a specific key.
+     *
+     * This is useful when you want to pass a setter function to a child component, without needing to pass the entire API object.
+     *
+     * For example:
+     * ```tsx
+     * <SearchInput value={params.q} onSearch={api.setter("q")} />
+     * ```
+     *
+     * @param key The search parameter name
+     * @returns (value: T) => void
+     */
+    setter<K extends keyof T>(key: K): (value: T[K] | null | undefined) => void;
+    /**
+     * Reset all parameters to their default values.
+     */
     reset(): void;
+    /**
+     * Gets the current value of a parameter. In most cases, you should use the `params` object returned from `useSearchParams` instead of this method.
+     */
     get<K extends keyof T>(key: K): T[K];
 };
-export declare function useSearchParams<T extends {
-    [K: string]: any;
-}>(defaultValue: T): [T, SearchParamAPI<T>];
+/**
+ * Provides type-safe read/write access to query string parameters, integrating with the routing system.
+ *
+ * - Call `useSearchParams` with a default value object, which defines the expected shape of the query string parameters.
+ * - Only keys that are present in the default value object will be handled, and all others will be ignored.
+ * - Arrays of values are supported, and you should use a default value of `[]` for that key. You may want to cast the default parameter as an array of the expected type (eg. `myValue: [] as string[]`) to ensure that the parameter type is correct.
+ * - This hook returns a tuple with the current query string parameters object, and an API object with methods to interact with the query string. See {@link SearchParamAPI} for more details.
+ *
+ * For example:
+ * ```tsx
+ * const [params, api] = useSearchParams({
+ *  mode: "list" as "list" | "grid",
+ *  page: 1,
+ *  tags: [] as string[],
+ * })
+ *
+ * api.set("mode", "grid")
+ * api.set("tags", ["tag1", "tag2"])
+ * ```
+ *
+ * Note that if a parameter is set back to it's default value, it'll actually be _removed_ from the updated query string, keeping the URL clean when only the default values are set.
+ *
+ * ```tsx
+ * api.set("mode", "grid")
+ *   // url becomes: "/?mode=grid"
+ *   // params.mode === 'grid'
+ *
+ * api.set("mode", "list")
+ *   // url becomes: "/"
+ *   // params.mode === 'list'
+ * ```
+ *
+ * @param defaultValue - The default value object, defining the expected shape of the query string parameters.
+ * @returns A tuple of the resolve parameter object, and a {@link SearchParamAPI} object with methods to interact with the query string.
+ */
+export declare function useSearchParams<T extends object>(defaultValue: T): [T, SearchParamAPI<T>];
+//# sourceMappingURL=useSearchParams.d.ts.map

package/dist/app/lib/routing/hooks/useSearchParams.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSearchParams.d.ts","sourceRoot":"","sources":["../../../../../src/app/lib/routing/hooks/useSearchParams.tsx"],"names":[],"mappings":"AAMA;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;IAC9B;;;;;;;;;OASG;IACH,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CAAA;IACpE;;;;;OAKG;IACH,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;IACnC;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,KAAK,IAAI,CAAA;IAC3E;;OAEG;IACH,KAAK,IAAI,IAAI,CAAA;IACb;;OAEG;IACH,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;CACrC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,YAAY,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CA2DzF"}

package/dist/app/lib/routing/hooks/useSearchParams.js

@@ -1,30 +1,90 @@
-import { useMemo } from "react";
+import { useMemo, useRef, useState } from "react";
 import { useRoute } from "./useRoute.js";
 import { useRouter } from "./useRouter.js";
+import { parseQuery } from "../utils.js";
+import { hash } from "object-code";
+/**
+ * Provides type-safe read/write access to query string parameters, integrating with the routing system.
+ *
+ * - Call `useSearchParams` with a default value object, which defines the expected shape of the query string parameters.
+ * - Only keys that are present in the default value object will be handled, and all others will be ignored.
+ * - Arrays of values are supported, and you should use a default value of `[]` for that key. You may want to cast the default parameter as an array of the expected type (eg. `myValue: [] as string[]`) to ensure that the parameter type is correct.
+ * - This hook returns a tuple with the current query string parameters object, and an API object with methods to interact with the query string. See {@link SearchParamAPI} for more details.
+ *
+ * For example:
+ * ```tsx
+ * const [params, api] = useSearchParams({
+ *  mode: "list" as "list" | "grid",
+ *  page: 1,
+ *  tags: [] as string[],
+ * })
+ *
+ * api.set("mode", "grid")
+ * api.set("tags", ["tag1", "tag2"])
+ * ```
+ *
+ * Note that if a parameter is set back to it's default value, it'll actually be _removed_ from the updated query string, keeping the URL clean when only the default values are set.
+ *
+ * ```tsx
+ * api.set("mode", "grid")
+ *   // url becomes: "/?mode=grid"
+ *   // params.mode === 'grid'
+ *
+ * api.set("mode", "list")
+ *   // url becomes: "/"
+ *   // params.mode === 'list'
+ * ```
+ *
+ * @param defaultValue - The default value object, defining the expected shape of the query string parameters.
+ * @returns A tuple of the resolve parameter object, and a {@link SearchParamAPI} object with methods to interact with the query string.
+ */
 export function useSearchParams(defaultValue) {
-    const route = useRoute();
-    const replaceQuery = useRouter((r) => r.replaceQuery);
-    const result = useMemo(() => ({
+    const [currentQuery, replaceQuery] = env.admin
+        ? useState({})
+        : [useRoute().query, useRouter((r) => r.replaceQuery)];
+    const merged = useMemo(() => ({
         ...defaultValue,
-        ...route.query,
-    }), [route.query]);
+        ...currentQuery,
+    }), [currentQuery]);
+    const values = useRef(merged);
+    values.current = merged;
+    // Memoized setters
+    const setters = useMemo(() => ({}), []);
+    // Gets the current value, directly from the source.
+    function get() {
+        if (env.client) {
+            return { ...defaultValue, ...parseQuery(document.location.search) };
+        }
+        else {
+            return merged;
+        }
+    }
+    // Main update function
     const update = (patch) => {
-        const value = { ...result, ...patch };
+        const value = { ...get(), ...patch };
         for (let key in defaultValue) {
-            if (defaultValue[key] === value[key] || [null, undefined].includes(value[key])) {
+            if (hash(defaultValue[key]) === hash(value[key]) || [null, undefined].includes(value[key])) {
                 delete value[key];
             }
         }
+        values.current = value;
         replaceQuery(value);
     };
     return [
-        result,
-        {
-            set: (key, value) => update({ ...result, [key]: value }),
-            setAll: (value) => update(value),
-            setter: (key) => (value) => update({ ...result, [key]: value }),
+        values.current,
+        useMemo(() => ({
+            set: (key, value) => update({ [key]: value }),
+            setAll: (value) => update({
+                ...defaultValue,
+                ...value,
+            }),
+            setter: (key) => {
+                if (!setters[key])
+                    setters[key] = (value) => update({ [key]: value });
+                return setters[key];
+            },
             reset: () => update({}),
-            get: (key) => result[key],
-        },
+            get: (key) => values.current[key],
+        }), []),
     ];
 }

package/dist/app/lib/routing/index.d.ts

@@ -3,6 +3,8 @@ export * from "./components/Link.js";
 export * from "./components/ScrollRestoration.js";
 export * from "./components/RouteRenderer.js";
 export * from "./components/ClientOnly.js";
+export * from "./components/BackButton.js";
+export * from "./components/NativeLinkHandler.js";
 export * from "./hooks/useRoute.js";
 export * from "./hooks/useRouteTransition.js";
 export * from "./hooks/useRouter.js";
@@ -11,3 +13,4 @@ export * from "./hooks/useRouterState.js";
 export * from "./hooks/useRestorableState.js";
 export * from "./hooks/useIsSSR.js";
 export * from "./hooks/useSearchParams.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/app/lib/routing/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAE1B,cAAc,sBAAsB,CAAA;AACpC,cAAc,mCAAmC,CAAA;AACjD,cAAc,+BAA+B,CAAA;AAC7C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,4BAA4B,CAAA;AAC1C,cAAc,mCAAmC,CAAA;AAEjD,cAAc,qBAAqB,CAAA;AACnC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA;AACpC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,2BAA2B,CAAA;AACzC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,qBAAqB,CAAA;AACnC,cAAc,4BAA4B,CAAA"}

package/dist/app/lib/routing/index.js

@@ -3,6 +3,8 @@ export * from "./components/Link.js";
 export * from "./components/ScrollRestoration.js";
 export * from "./components/RouteRenderer.js";
 export * from "./components/ClientOnly.js";
+export * from "./components/BackButton.js";
+export * from "./components/NativeLinkHandler.js";
 export * from "./hooks/useRoute.js";
 export * from "./hooks/useRouteTransition.js";
 export * from "./hooks/useRouter.js";

package/dist/app/lib/routing/loader.d.ts

@@ -28,3 +28,4 @@ export declare class RouteLoader {
     getRouteComponent<K extends keyof ViewProps>(view: K): DynamicComponent<FunctionComponent<ViewProps[K]>>;
     get appComponent(): DynamicComponent<FunctionComponent<PropsWithChildren<AppData>>>;
 }
+//# sourceMappingURL=loader.d.ts.map

package/dist/app/lib/routing/loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/app/lib/routing/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,SAAS,CAAA;IACf,SAAS,EAAE,iBAAiB,CAAA;CAC7B,CAAA;AAED,qBAAa,UAAW,SAAQ,KAAK;IAE1B,OAAO,EAAE,MAAM;IACf,UAAU,EAAE,MAAM;gBADlB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM;CAI5B;AAED,qBAAa,WAAW;IACtB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAY;IACpD,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAY;IAC1D,OAAO,EAAE,OAAO,CAAQ;IACxB,OAAO,CAAC,SAAS,CAAgD;IACjE,OAAO,CAAC,YAAY,CAA2C;IAE/D,EAAE,SAAgB;IAElB,YAAY,CAAC,IAAI,EAAE,OAAO,KAAK;IAI/B,oBAAoB,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM;IAI5D,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,WAAW;IAyBnB,YAAY,CAAC,QAAQ,EAAE,MAAM;IAKvB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAiD9E,UAAU,CAAC,OAAO,EAAE,OAAO;IAI3B,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS;IAKnD,iBAAiB,CAAC,CAAC,SAAS,MAAM,SAAS,EAAE,IAAI,EAAE,CAAC,GACT,gBAAgB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAG5F,IAAI,YAAY,IAC6B,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAC3G;CACF"}

package/dist/app/lib/routing/loader.js

@@ -56,6 +56,7 @@ export class RouteLoader {
         return this.entries.has(cacheKey);
     }
     async loadRouteData(pathname, withAppData = false) {
+        pathname = withTrailingSlash(pathname);
         const cacheKey = this.getKey(pathname);
         // Cached value?
         if (this.entries.has(cacheKey))
@@ -65,27 +66,35 @@ export class RouteLoader {
             serverless: env.serverless,
             debug: env.dev,
         });
-        const promise = this.fetchImpl(requestUrl, {})
-            .then((response) => response.text())
-            .then((text) => {
+        const promise = this.fetchImpl(requestUrl)
+            .then(async (response) => {
+            if (response.redirected) {
+                return { redirect: response.url };
+            }
+            let text = await response.text();
             if (this.processProps) {
                 text = this.processProps(text);
             }
             try {
-                return JSON.parse(text);
+                const payload = JSON.parse(text);
+                if (!payload.view && !payload.redirect) {
+                    throw new RouteError(`Invalid route data for '${pathname}'`, 500);
+                }
+                return payload;
             }
             catch (err) {
                 throw new RouteError(`JSON parse error for route '${pathname}':\n${err?.message}`, 500);
             }
         })
-            .then((data) => {
+            .then(async (data) => {
             if (data.redirect) {
-                const redirect = data.redirect;
-                data = this.loadRouteData(redirect).then((data) => {
-                    data.canonical = redirect;
-                    return data;
-                });
+                const redirect = parseURL(data.redirect).pathname;
+                data = await this.loadRouteData(redirect);
+                data.canonical = redirect;
             }
+            return data;
+        })
+            .then((data) => {
             this.entries.set(cacheKey, new Promise((resolve) => resolve(data)));
             return data;
         });