@tyndall/react 0.0.1 → 0.0.3

package/dist/route-data.js

@@ -0,0 +1,4 @@
+import React from "react";
+const RouteDataContext = React.createContext({});
+export const RouteDataProvider = RouteDataContext.Provider;
+export const useRouteData = () => React.useContext(RouteDataContext);

package/dist/router.d.ts

@@ -20,9 +20,16 @@ export interface RoutePayload {
     routeId: string;
     appHtml: string;
     propsPayload: string;
+    routeDataPayload?: string;
     head?: HeadDescriptor;
     hydration?: HydrationMode;
 }
+export interface RouteRedirectPayload {
+    kind: "hyper-route-redirect";
+    destination: string;
+    status?: number;
+    replace?: boolean;
+}
 export interface ClientRouteModuleContext {
     href: string;
     pathname: string;
@@ -34,6 +41,8 @@ export interface ClientRouteRenderResult {
     routeId?: string;
     appHtml: string;
     propsPayload?: string;
+    routeDataPayload?: string;
+    routeData?: Record<string, unknown>;
     head?: HeadDescriptor;
     hydration?: HydrationMode;
 }
@@ -50,7 +59,7 @@ export interface ClientRouteModuleResolverContext {
 export type ClientRouteModuleResolver = (ctx: ClientRouteModuleResolverContext) => Promise<ClientRouteModule | null>;
 export type ClientRouteModuleLoader = () => Promise<unknown>;
 export type ClientRouteModuleLoaderMap = Record<string, ClientRouteModuleLoader>;
-export type RoutePayloadResolver = (href: string) => Promise<RoutePayload | null>;
+export type RoutePayloadResolver = (href: string) => Promise<RoutePayload | RouteRedirectPayload | null>;
 export type RoutePayloadApplier = (payload: RoutePayload) => void | Promise<void>;
 export interface RouterOptions {
     routeGraph?: RouteGraph;
@@ -65,15 +74,24 @@ export interface RouterOptions {
     buildMode?: "ssg" | "ssr";
     onWarning?: (message: string) => void;
     fallbackPolicy?: ResolverFallbackPolicy;
+    scrollRestoration?: boolean;
 }
 export interface Router {
     pathname: string;
     query: RouterQuery;
     push: (href: string) => Promise<void>;
     replace: (href: string) => Promise<void>;
+    softReload: () => Promise<void>;
     prefetch: (href: string) => Promise<void>;
     subscribe: (listener: (router: Router) => void) => () => void;
+    block: (blocker: NavigationBlocker) => () => void;
+}
+export interface NavigationBlockContext {
+    href: string;
+    replace: boolean;
+    type: "push" | "replace" | "popstate" | "softReload" | "redirect";
 }
+export type NavigationBlocker = (ctx: NavigationBlockContext) => boolean | string | void;
 export declare const createClientRouteModuleResolver: (loaders: ClientRouteModuleLoaderMap) => ClientRouteModuleResolver;
 export declare const createRouter: (initialHref?: string | RouterOptions, options?: RouterOptions) => Router;
 export declare const getRouter: () => Router;

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}

package/dist/router.js

@@ -1,10 +1,41 @@
-import { evaluateRenderPolicy, shouldForceDynamicFallback, } from "@tyndall/core";
+import { evaluateRenderPolicy, shouldForceDynamicFallback, ROUTE_DATA_SCRIPT_ID, } from "@tyndall/core";
 import { applyHead } from "./head-manager.js";
 import { createReactRouterRouteMatcher } from "./react-router-bridge.js";
 const NAVIGATION_HEADER = "x-hyper-navigation";
 const NAVIGATION_MODE = "csr";
 const ROUTE_PAYLOAD_EVENT = "hyper:route-payload-applied";
+const ROUTE_DATA_EVENT = "hyper:route-data-applied";
+const ROUTE_REDIRECT_KIND = "hyper-route-redirect";
 const inflightPrefetchRequests = new Map();
+const navigationBlockers = new Set();
+const resolveBlockDecision = (result) => {
+    if (typeof result === "string") {
+        if (typeof globalThis !== "undefined" && typeof globalThis.confirm === "function") {
+            return globalThis.confirm(result);
+        }
+        return false;
+    }
+    if (result === false) {
+        return false;
+    }
+    return true;
+};
+const runNavigationBlockers = (ctx) => {
+    if (navigationBlockers.size === 0) {
+        return true;
+    }
+    for (const blocker of navigationBlockers) {
+        const decision = resolveBlockDecision(blocker(ctx));
+        if (!decision) {
+            return false;
+        }
+    }
+    return true;
+};
+if (typeof globalThis !== "undefined") {
+    globalThis
+        .__HYPER_NAVIGATION_GUARD__ = runNavigationBlockers;
+}
 const hasBrowserHistory = () => typeof globalThis !== "undefined" &&
     "history" in globalThis &&
     Boolean(globalThis.history);
@@ -65,6 +96,17 @@ const parseHref = (href, baseUrl) => {
     return { pathname: url.pathname, query };
 };
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const parseJsonPayload = (value) => {
+    if (!value) {
+        return {};
+    }
+    try {
+        return JSON.parse(value);
+    }
+    catch {
+        return {};
+    }
+};
 const isClientRouteRenderResult = (value) => {
     if (!isRecord(value) || typeof value.appHtml !== "string") {
         return false;
@@ -75,6 +117,12 @@ const isClientRouteRenderResult = (value) => {
     if (value.propsPayload !== undefined && typeof value.propsPayload !== "string") {
         return false;
     }
+    if (value.routeDataPayload !== undefined && typeof value.routeDataPayload !== "string") {
+        return false;
+    }
+    if (value.routeData !== undefined && !isRecord(value.routeData)) {
+        return false;
+    }
     if (value.hydration !== undefined &&
         value.hydration !== "full" &&
         value.hydration !== "islands") {
@@ -93,6 +141,9 @@ const isRoutePayload = (value) => {
         typeof payload.propsPayload !== "string") {
         return false;
     }
+    if (payload.routeDataPayload !== undefined && typeof payload.routeDataPayload !== "string") {
+        return false;
+    }
     if (payload.hydration !== undefined &&
         payload.hydration !== "full" &&
         payload.hydration !== "islands") {
@@ -100,6 +151,19 @@ const isRoutePayload = (value) => {
     }
     return true;
 };
+const isRouteRedirectPayload = (value) => {
+    if (!value || typeof value !== "object") {
+        return false;
+    }
+    const payload = value;
+    if (payload.kind !== ROUTE_REDIRECT_KIND) {
+        return false;
+    }
+    if (typeof payload.destination !== "string") {
+        return false;
+    }
+    return true;
+};
 const resolveRoutePayloadFromServer = async (href, baseUrl) => {
     if (typeof fetch === "undefined") {
         return null;
@@ -121,7 +185,13 @@ const resolveRoutePayloadFromServer = async (href, baseUrl) => {
             return null;
         }
         const json = (await response.json());
-        return isRoutePayload(json) ? json : null;
+        if (isRoutePayload(json)) {
+            return json;
+        }
+        if (isRouteRedirectPayload(json)) {
+            return json;
+        }
+        return null;
     }
     catch {
         return null;
@@ -154,6 +224,14 @@ const applyRoutePayloadToDom = (payload) => {
     if (propsScript) {
         propsScript.textContent = payload.propsPayload;
     }
+    const routeDataPayload = typeof payload.routeDataPayload === "string" ? payload.routeDataPayload : "{}";
+    const routeDataScript = document.getElementById(ROUTE_DATA_SCRIPT_ID);
+    if (routeDataScript) {
+        routeDataScript.textContent = routeDataPayload;
+    }
+    const routeData = parseJsonPayload(routeDataPayload);
+    globalThis.__HYPER_ROUTE_DATA__ =
+        routeData;
     if (payload.head) {
         applyHead(payload.head);
     }
@@ -163,19 +241,37 @@ const applyRoutePayloadToDom = (payload) => {
         globalThis.dispatchEvent?.(new CustomEvent(ROUTE_PAYLOAD_EVENT, {
             detail: { routeId: payload.routeId },
         }));
+        globalThis.dispatchEvent?.(new CustomEvent(ROUTE_DATA_EVENT, {
+            detail: { routeId: payload.routeId, routeData },
+        }));
     }
     catch {
         // Keep client navigation flow resilient if event dispatch is unavailable.
     }
 };
-const toRoutePayload = (rendered) => ({
-    kind: "hyper-route-payload",
-    routeId: rendered.routeId,
-    appHtml: rendered.appHtml,
-    propsPayload: rendered.propsPayload ?? "{}",
-    head: rendered.head,
-    hydration: rendered.hydration,
-});
+const toRoutePayload = (rendered) => {
+    let routeDataPayload = "{}";
+    if (typeof rendered.routeDataPayload === "string") {
+        routeDataPayload = rendered.routeDataPayload;
+    }
+    else if (rendered.routeData && typeof rendered.routeData === "object") {
+        try {
+            routeDataPayload = JSON.stringify(rendered.routeData);
+        }
+        catch {
+            routeDataPayload = "{}";
+        }
+    }
+    return {
+        kind: "hyper-route-payload",
+        routeId: rendered.routeId,
+        appHtml: rendered.appHtml,
+        propsPayload: rendered.propsPayload ?? "{}",
+        routeDataPayload,
+        head: rendered.head,
+        hydration: rendered.hydration,
+    };
+};
 const isMetaDefinition = (value) => {
     if (!value || typeof value !== "object") {
         return false;
@@ -232,20 +328,118 @@ export const createRouter = (initialHref, options) => {
     const baseUrl = getBaseUrl();
     const navigationMode = routerOptions.navigationMode ?? "client";
     const clientRenderMode = routerOptions.clientRenderMode ?? "payload";
+    const scrollRestoration = routerOptions.scrollRestoration !== false;
     const fallbackToUrl = routerOptions.fallbackToUrl ?? true;
     const hasCustomRoutePayloadResolver = typeof routerOptions.resolveRoutePayload === "function";
     const resolveRoutePayload = routerOptions.resolveRoutePayload ??
         ((href) => resolveRoutePayloadFromServer(href, baseUrl));
     const applyRoutePayload = routerOptions.applyRoutePayload ?? applyRoutePayloadToDom;
+    const existingScrollPositions = typeof globalThis !== "undefined"
+        ? globalThis.__HYPER_SCROLL_POSITIONS__
+        : undefined;
+    const scrollPositions = existingScrollPositions && typeof existingScrollPositions === "object"
+        ? existingScrollPositions
+        : {};
+    if (typeof globalThis !== "undefined") {
+        globalThis.__HYPER_SCROLL_POSITIONS__ = scrollPositions;
+    }
+    if (scrollRestoration && hasBrowserHistory()) {
+        try {
+            const history = globalThis.history;
+            if (history && "scrollRestoration" in history) {
+                history.scrollRestoration = "manual";
+            }
+        }
+        catch {
+            // Ignore browsers that block scrollRestoration assignment.
+        }
+    }
+    const toScrollKey = (href) => {
+        try {
+            const url = new URL(href, baseUrl);
+            return `${url.pathname}${url.search}`;
+        }
+        catch {
+            return href;
+        }
+    };
+    const saveScrollPosition = (href) => {
+        if (!scrollRestoration) {
+            return;
+        }
+        const key = toScrollKey(href);
+        if (!key) {
+            return;
+        }
+        if (typeof globalThis !== "undefined") {
+            const win = globalThis;
+            scrollPositions[key] = {
+                x: typeof win.scrollX === "number" ? win.scrollX : win.pageXOffset ?? 0,
+                y: typeof win.scrollY === "number" ? win.scrollY : win.pageYOffset ?? 0,
+            };
+        }
+    };
+    const scrollToHash = (href) => {
+        if (typeof document === "undefined") {
+            return false;
+        }
+        try {
+            const url = new URL(href, baseUrl);
+            if (!url.hash) {
+                return false;
+            }
+            const id = url.hash.slice(1);
+            if (!id) {
+                return false;
+            }
+            const node = document.getElementById(id);
+            if (node && typeof node.scrollIntoView === "function") {
+                node.scrollIntoView();
+                return true;
+            }
+        }
+        catch {
+            return false;
+        }
+        return false;
+    };
+    const restoreScrollPosition = (href, fromHistory) => {
+        if (!scrollRestoration || typeof globalThis === "undefined") {
+            return;
+        }
+        if (scrollToHash(href)) {
+            return;
+        }
+        const key = toScrollKey(href);
+        if (fromHistory && key && scrollPositions[key]) {
+            const position = scrollPositions[key];
+            const x = typeof position.x === "number" ? position.x : 0;
+            const y = typeof position.y === "number" ? position.y : 0;
+            globalThis.scrollTo?.(x, y);
+            return;
+        }
+        globalThis.scrollTo?.(0, 0);
+    };
     const listeners = new Set();
     const router = {
         pathname: "/",
         query: {},
         push: async (href) => {
-            await resolveAndNavigate(href, false);
+            await resolveAndNavigate(href, false, { type: "push" });
         },
         replace: async (href) => {
-            await resolveAndNavigate(href, true);
+            await resolveAndNavigate(href, true, { type: "replace" });
+        },
+        softReload: async () => {
+            const href = typeof globalThis !== "undefined" && "location" in globalThis
+                ? globalThis.location.href
+                : currentHref || "/";
+            await resolveAndNavigate(href, true, {
+                skipHistory: true,
+                skipScrollSave: true,
+                skipScrollRestore: true,
+                type: "softReload",
+            });
         },
         prefetch: async (href) => {
             await requestPrefetch(href);
@@ -271,26 +465,34 @@ export const createRouter = (initialHref, options) => {
                 listeners.delete(listener);
             };
         },
+        block: (blocker) => {
+            navigationBlockers.add(blocker);
+            return () => {
+                navigationBlockers.delete(blocker);
+            };
+        },
     };
+    let currentHref = "";
     const updateState = (href) => {
         const next = parseHref(href, baseUrl);
         router.pathname = next.pathname;
         router.query = next.query;
+        currentHref = href;
         for (const listener of listeners) {
             listener(router);
         }
     };
     const matchRouteGraph = (pathname) => routeMatcher?.match(pathname) ?? null;
-    const navigate = async (href, replace) => {
+    const navigate = async (href, replace, options = {}) => {
         // Important: only touch browser history when it exists (SSR-safe).
-        if (hasBrowserHistory()) {
+        if (!options.skipHistory && hasBrowserHistory()) {
             const history = globalThis.history;
             const method = replace ? "replaceState" : "pushState";
             history[method](null, "", href);
         }
         updateState(href);
     };
-    const navigateWithUrl = async (href, replace) => {
+    const navigateWithUrl = async (href, replace, _options = {}) => {
         const location = globalThis.location;
         if (location) {
             if (replace && typeof location.replace === "function") {
@@ -304,20 +506,34 @@ export const createRouter = (initialHref, options) => {
             location.href = href;
             return;
         }
-        await navigate(href, replace);
+        await navigate(href, replace, _options);
     };
-    const navigateWithPayload = async (href, replace) => {
+    const navigateWithPayload = async (href, replace, options = {}) => {
         const payload = await resolveRoutePayload(href);
-        if (payload) {
+        if (payload && payload.kind === ROUTE_REDIRECT_KIND) {
+            const destination = payload.destination;
+            if (destination) {
+                await resolveAndNavigate(destination, Boolean(payload.replace), {
+                    ...options,
+                    type: "redirect",
+                    skipScrollSave: true,
+                });
+                return true;
+            }
+        }
+        if (payload && payload.kind === "hyper-route-payload") {
             await applyRoutePayload(payload);
-            await navigate(href, replace);
+            await navigate(href, replace, options);
+            if (!options.skipScrollRestore) {
+                restoreScrollPosition(href, Boolean(options.fromHistory));
+            }
             return true;
         }
         if (fallbackToUrl) {
-            await navigateWithUrl(href, replace);
+            await navigateWithUrl(href, replace, options);
             return false;
         }
-        await navigate(href, replace);
+        await navigate(href, replace, options);
         return false;
     };
     const resolveClientRouteRender = async (href) => {
@@ -359,36 +575,39 @@ export const createRouter = (initialHref, options) => {
             return null;
         }
     };
-    const navigateWithClientModule = async (href, replace) => {
+    const navigateWithClientModule = async (href, replace, options = {}) => {
         const rendered = await resolveClientRouteRender(href);
         if (!rendered) {
             return false;
         }
         await applyRoutePayload(toRoutePayload(rendered));
-        await navigate(href, replace);
+        await navigate(href, replace, options);
+        if (!options.skipScrollRestore) {
+            restoreScrollPosition(href, Boolean(options.fromHistory));
+        }
         return true;
     };
-    const navigateWithClientRender = async (href, replace) => {
+    const navigateWithClientRender = async (href, replace, options = {}) => {
         if (clientRenderMode === "module") {
-            const moduleApplied = await navigateWithClientModule(href, replace);
+            const moduleApplied = await navigateWithClientModule(href, replace, options);
             if (moduleApplied) {
                 return;
             }
         }
-        await navigateWithPayload(href, replace);
+        await navigateWithPayload(href, replace, options);
     };
-    const navigateByMode = async (href, replace) => {
+    const navigateByMode = async (href, replace, options = {}) => {
         if (navigationMode === "url") {
-            await navigateWithUrl(href, replace);
+            await navigateWithUrl(href, replace, options);
             return;
         }
-        await navigateWithClientRender(href, replace);
+        await navigateWithClientRender(href, replace, options);
     };
-    const resolveDynamicFallback = async (href, replace) => {
+    const resolveDynamicFallback = async (href, replace, options = {}) => {
         const next = parseHref(href, baseUrl);
         const forceDynamic = shouldForceDynamicFallback(next.pathname, routerOptions.fallbackPolicy);
         if (routeMatcher && !forceDynamic && matchRouteGraph(next.pathname)) {
-            await navigateByMode(href, replace);
+            await navigateByMode(href, replace, options);
             return;
         }
         if (routerOptions.resolveDynamicManifest) {
@@ -396,7 +615,7 @@ export const createRouter = (initialHref, options) => {
             if (envelope) {
                 const policy = envelope.policy?.render ?? "auto";
                 if (policy === "redirect" && envelope.policy?.redirect) {
-                    await navigateByMode(envelope.policy.redirect, replace);
+                    await navigateByMode(envelope.policy.redirect, replace, options);
                     return;
                 }
                 let policyRender;
@@ -424,22 +643,30 @@ export const createRouter = (initialHref, options) => {
                     }
                 }
                 if (decision.mode === "ssr") {
-                    await navigateWithUrl(href, replace);
+                    await navigateWithUrl(href, replace, options);
                     return;
                 }
                 const meta = envelope.meta ??
                     (isMetaDefinition(envelope.definition) ? envelope.definition.root : undefined);
                 if (decision.mode === "csr" && meta !== undefined) {
                     await routerOptions.renderDynamic?.(meta, envelope);
-                    await navigateByMode(href, replace);
+                    await navigateByMode(href, replace, options);
                     return;
                 }
             }
         }
-        await navigateByMode(href, replace);
+        await navigateByMode(href, replace, options);
     };
-    const resolveAndNavigate = async (href, replace) => {
-        await resolveDynamicFallback(href, replace);
+    const resolveAndNavigate = async (href, replace, options = {}) => {
+        const navType = options.type ?? (replace ? "replace" : "push");
+        const allow = runNavigationBlockers({ href, replace, type: navType });
+        if (!allow) {
+            return;
+        }
+        if (!options.skipScrollSave) {
+            saveScrollPosition(currentHref || href);
+        }
+        await resolveDynamicFallback(href, replace, options);
     };
     const seed = resolved.initialHref ??
         (typeof globalThis !== "undefined" && "location" in globalThis
@@ -450,9 +677,30 @@ export const createRouter = (initialHref, options) => {
         // Keep router state in sync with back/forward navigation.
         globalThis.addEventListener("popstate", () => {
             const location = globalThis.location;
-            if (location?.href) {
-                updateState(location.href);
+            if (!location?.href) {
+                return;
             }
+            const nextHref = location.href;
+            const allow = runNavigationBlockers({ href: nextHref, replace: true, type: "popstate" });
+            if (!allow) {
+                if (hasBrowserHistory()) {
+                    const history = globalThis.history;
+                    try {
+                        history.pushState(null, "", currentHref);
+                        updateState(currentHref);
+                    }
+                    catch {
+                        // Ignore history reversal failures.
+                    }
+                }
+                return;
+            }
+            saveScrollPosition(currentHref || nextHref);
+            void resolveDynamicFallback(nextHref, true, {
+                fromHistory: true,
+                skipScrollSave: true,
+                type: "popstate",
+            });
         });
     }
     return router;

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { GetServerProps as HyperGetServerProps, GetStaticPaths as HyperGetStaticPaths, GetStaticProps as HyperGetStaticProps, PageContextBase, PageComponent, StaticPropsContext, StaticPropsResult, StaticPathsResult, ServerPropsContext, ServerPropsResult } from "@tyndall/core";
+import type { ErrorDescriptor, GetServerProps as HyperGetServerProps, GetStaticPaths as HyperGetStaticPaths, GetStaticProps as HyperGetStaticProps, GetRouteData as HyperGetRouteData, InitServerHook, PageContextBase, PageComponent, RedirectDescriptor, RouteDataContext as HyperRouteDataContext, RouteDataMap as HyperRouteDataMap, RouteDataResult as HyperRouteDataResult, StaticPropsContext, StaticPropsResult, StaticPathsResult, ServerPropsContext, ServerPropsResult } from "@tyndall/core";
 export type NextPageContext = PageContextBase;
 export type NextPage<Props = Record<string, unknown>> = PageComponent<Props>;
 export type NextStaticPropsContext = StaticPropsContext;
@@ -14,4 +14,18 @@ export type GetStaticPaths = HyperGetStaticPaths;
 export type GetServerSidePropsContext = ServerPropsContext;
 export type GetServerSidePropsResult<Props = Record<string, unknown>> = ServerPropsResult<Props>;
 export type GetServerSideProps<Props = Record<string, unknown>> = HyperGetServerProps<Props>;
+export interface AppProps {
+    Component: PageComponent<Record<string, unknown>>;
+    pageProps: Record<string, unknown>;
+    routeData: HyperRouteDataMap;
+    routeId: string;
+}
+export type AppComponent = (props: AppProps) => unknown;
+export type GetRouteData<Data = unknown> = HyperGetRouteData<Data>;
+export type RouteDataResult<Data = unknown> = HyperRouteDataResult<Data>;
+export type RouteDataContext = HyperRouteDataContext;
+export type RouteDataMap = HyperRouteDataMap;
+export type InitServer = InitServerHook;
+export type RedirectResponse = RedirectDescriptor;
+export type ErrorResponse = ErrorDescriptor;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,EACrC,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,eAAe,GAAG,eAAe,CAAC;AAC9C,MAAM,MAAM,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;AAC7E,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AACxD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAC9F,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,CAAC;AACtD,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AACxD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE9F,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACvD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAC7F,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACrD,MAAM,MAAM,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACzF,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAEjD,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;AAC3D,MAAM,MAAM,wBAAwB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AACjG,MAAM,MAAM,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,EACrC,YAAY,IAAI,iBAAiB,EACjC,cAAc,EACd,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,gBAAgB,IAAI,qBAAqB,EACzC,YAAY,IAAI,iBAAiB,EACjC,eAAe,IAAI,oBAAoB,EACvC,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,eAAe,GAAG,eAAe,CAAC;AAC9C,MAAM,MAAM,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;AAC7E,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AACxD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAC9F,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,CAAC;AACtD,MAAM,MAAM,sBAAsB,GAAG,kBAAkB,CAAC;AACxD,MAAM,MAAM,qBAAqB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE9F,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACvD,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAC7F,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACrD,MAAM,MAAM,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACzF,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAEjD,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;AAC3D,MAAM,MAAM,wBAAwB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AACjG,MAAM,MAAM,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE7F,MAAM,WAAW,QAAQ;IACvB,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC;AAExD,MAAM,MAAM,YAAY,CAAC,IAAI,GAAG,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;AACnE,MAAM,MAAM,eAAe,CAAC,IAAI,GAAG,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;AACzE,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,CAAC;AACrD,MAAM,MAAM,YAAY,GAAG,iBAAiB,CAAC;AAC7C,MAAM,MAAM,UAAU,GAAG,cAAc,CAAC;AACxC,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAClD,MAAM,MAAM,aAAa,GAAG,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tyndall/react",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -10,7 +10,7 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "bun": "./src/index.ts",
+      "bun": "./dist/index.js",
       "default": "./dist/index.js"
     }
   },
@@ -21,8 +21,8 @@
     "build": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@tyndall/core": "workspace:*",
-    "@tyndall/shared": "workspace:*",
+    "@tyndall/core": "^0.0.3",
+    "@tyndall/shared": "^0.0.3",
     "react-router": "^7.13.0"
   },
   "peerDependencies": {