toiljs 0.0.15 → 0.0.19

package/src/client/index.ts

@@ -1,89 +1,91 @@
-/**
- * toiljs client runtime, published as `toiljs/client`. Re-exports the router (mount/Router/Link),
- * navigation hooks, prefetching, and the route types consumed by the compiler-generated entry.
- * Zero imports needed in user route files beyond this package.
- *
- * Internals are split by concern: route `types`, history-based `navigation`, the params
- * `params-context` + `hooks`, `lazy` component resolution, the `Link`/`Router` components,
- * `mount`, `match` (pure matcher), `prefetch` (link prefetcher), and `channel` (WebSocket helper).
- */
-
-export { mount } from './routing/mount.js';
-export { Router } from './routing/Router.js';
-export { Link } from './navigation/Link.js';
-export type { LinkProps } from './navigation/Link.js';
-export { NavLink, matchActive } from './navigation/NavLink.js';
-export type { NavLinkProps, NavLinkState } from './navigation/NavLink.js';
-export {
-    navigate,
-    back,
-    forward,
-    refresh,
-    setViewTransitions,
-    setTransitions,
-    href,
-} from './navigation/navigation.js';
-export type { NavigateOptions } from './navigation/navigation.js';
-export {
-    useParams,
-    useNavigate,
-    useLocation,
-    usePathname,
-    useSearchParams,
-    useRouter,
-    useNavigationPending,
-} from './routing/hooks.js';
-export type { RouterInstance } from './routing/hooks.js';
-export { useLoaderData, revalidate, invalidateLoaderData } from './routing/loader.js';
-export type {
-    LoaderArgs,
-    LoaderFunction,
-    LoaderData,
-    Revalidate,
-    StaticParams,
-    GenerateStaticParams,
-} from './routing/loader.js';
-export { useAction } from './routing/action.js';
-export type {
-    UseActionOptions,
-    ActionState,
-    ActionHandle,
-    RevalidateTarget,
-} from './routing/action.js';
-export { prefetch } from './navigation/prefetch.js';
-export type {
-    RouteDef,
-    LayoutLoader,
-    LayoutComponentLoader,
-    NotFoundLoader,
-    RouteErrorProps,
-    Register,
-    RoutePath,
-    Href,
-} from './types.js';
-export { matchRoute } from './routing/match.js';
-export type { RouteParams } from './routing/match.js';
-export { connectChannel, useChannel, resolveChannelUrl } from './channel/channel.js';
-export type { Channel, ChannelOptions, ChannelHook, ChannelData } from './channel/channel.js';
-export { useHead, useTitle, Head, mergeHead } from './head/head.js';
-export type { HeadSpec, MetaTag, LinkTag, ResolvedHead } from './head/head.js';
-export { resolveMetadata, useMetadata, Metadata } from './head/metadata.js';
-export type { GenerateMetadata, GenerateMetadataArgs, OpenGraph } from './head/metadata.js';
-export { searchPages, registerPages, getPages, pagePath } from './search/search.js';
-export type {
-    PageMeta,
-    PageSearchResult,
-    PageSearchOptions,
-    SearchField,
-    SearchHints,
-} from './search/search.js';
-export { usePageSearch } from './search/use-page-search.js';
-export type { PageSearch } from './search/use-page-search.js';
-export { Image } from './components/Image.js';
-export type { ImageProps } from './components/Image.js';
-export { Script } from './components/Script.js';
-export type { ScriptProps, ScriptStrategy } from './components/Script.js';
-export { Form } from './components/Form.js';
-export type { FormProps } from './components/Form.js';
-export { Slot } from './components/Slot.js';
-export type { SlotProps } from './components/Slot.js';
+/**
+ * toiljs client runtime, published as `toiljs/client`. Re-exports the router (mount/Router/Link),
+ * navigation hooks, prefetching, and the route types consumed by the compiler-generated entry.
+ * Zero imports needed in user route files beyond this package.
+ *
+ * Internals are split by concern: route `types`, history-based `navigation`, the params
+ * `params-context` + `hooks`, `lazy` component resolution, the `Link`/`Router` components,
+ * `mount`, `match` (pure matcher), `prefetch` (link prefetcher), and `channel` (WebSocket helper).
+ */
+
+export { mount } from './routing/mount.js';
+export { Router } from './routing/Router.js';
+export { Link } from './navigation/Link.js';
+export type { LinkProps } from './navigation/Link.js';
+export { NavLink, matchActive } from './navigation/NavLink.js';
+export type { NavLinkProps, NavLinkState } from './navigation/NavLink.js';
+export {
+    navigate,
+    back,
+    forward,
+    refresh,
+    setViewTransitions,
+    setTransitions,
+    href,
+} from './navigation/navigation.js';
+export type { NavigateOptions } from './navigation/navigation.js';
+export {
+    useParams,
+    useNavigate,
+    useLocation,
+    usePathname,
+    useSearchParams,
+    useRouter,
+    useNavigationPending,
+} from './routing/hooks.js';
+export type { RouterInstance } from './routing/hooks.js';
+export { useLoaderData, revalidate, invalidateLoaderData } from './routing/loader.js';
+export type {
+    LoaderArgs,
+    LoaderFunction,
+    LoaderData,
+    Revalidate,
+    StaticParams,
+    GenerateStaticParams,
+} from './routing/loader.js';
+export { useAction } from './routing/action.js';
+export type {
+    UseActionOptions,
+    ActionState,
+    ActionHandle,
+    RevalidateTarget,
+} from './routing/action.js';
+export { prefetch } from './navigation/prefetch.js';
+export type {
+    RouteDef,
+    LayoutLoader,
+    LayoutComponentLoader,
+    NotFoundLoader,
+    RouteErrorProps,
+    Register,
+    RoutePath,
+    Href,
+} from './types.js';
+export { matchRoute } from './routing/match.js';
+export type { RouteParams } from './routing/match.js';
+export { connectChannel, useChannel, resolveChannelUrl } from './channel/channel.js';
+export type { Channel, ChannelOptions, ChannelHook, ChannelData } from './channel/channel.js';
+export { useHead, useTitle, Head, mergeHead } from './head/head.js';
+export type { HeadSpec, MetaTag, LinkTag, ResolvedHead } from './head/head.js';
+export { resolveMetadata, useMetadata, Metadata } from './head/metadata.js';
+export type { GenerateMetadata, GenerateMetadataArgs, OpenGraph } from './head/metadata.js';
+export { searchPages, registerPages, getPages, pagePath } from './search/search.js';
+export type {
+    PageMeta,
+    PageSearchResult,
+    PageSearchOptions,
+    SearchField,
+    SearchHints,
+} from './search/search.js';
+export { usePageSearch } from './search/use-page-search.js';
+export type { PageSearch } from './search/use-page-search.js';
+export { Image } from './components/Image.js';
+export type { ImageProps } from './components/Image.js';
+export { Script } from './components/Script.js';
+export type { ScriptProps, ScriptStrategy } from './components/Script.js';
+export { Form } from './components/Form.js';
+export type { FormProps } from './components/Form.js';
+export { Slot } from './components/Slot.js';
+export type { SlotProps } from './components/Slot.js';
+export { Server } from './rpc.js';
+export { parseError } from './errors.js';

package/src/client/navigation/NavLink.tsx

@@ -1,86 +1,86 @@
-import type { CSSProperties, ReactNode } from 'react';
-
-import { useLocation } from '../routing/hooks.js';
-import { Link, type LinkProps } from './Link.js';
-
-/** State passed to `NavLink`'s function-form `className` / `style` / `children`. */
-export interface NavLinkState {
-    readonly isActive: boolean;
-}
-
-/**
- * Props for {@link NavLink}: all {@link LinkProps}, but `className` / `style` / `children` may also
- * be functions of the active state.
- */
-export interface NavLinkProps extends Omit<LinkProps, 'className' | 'style' | 'children'> {
-    className?: string | ((state: NavLinkState) => string | undefined);
-    style?: CSSProperties | ((state: NavLinkState) => CSSProperties | undefined);
-    children?: ReactNode | ((state: NavLinkState) => ReactNode);
-    /** Match `href` exactly; without it, sub-paths are also active. Default `false`. */
-    end?: boolean;
-    /** Class added when active (used with a string `className`). Default `"active"`. */
-    activeClassName?: string;
-}
-
-function normalizePath(p: string): string {
-    return p.length > 1 ? p.replace(/\/+$/, '') : p;
-}
-
-/**
- * Whether a link to `linkPath` is active for `currentPath`. Exact when `end`; otherwise a parent
- * path is active for its sub-paths (and `/` is active everywhere, matching React Router).
- */
-export function matchActive(linkPath: string, currentPath: string, end: boolean): boolean {
-    const link = normalizePath(linkPath);
-    const current = normalizePath(currentPath);
-    if (current === link) return true;
-    if (end) return false;
-    if (link === '/') return true;
-    return current.startsWith(link + '/');
-}
-
-/**
- * A {@link Link} that knows whether it points at the current location. Applies an active class
- * (default `"active"`) and `aria-current="page"` when active; `className` / `style` / `children`
- * may be functions of `{ isActive }`. Inherits Link's full anchor API and prefetching.
- */
-export function NavLink(props: NavLinkProps): ReactNode {
-    const {
-        href,
-        className,
-        style,
-        children,
-        end = false,
-        activeClassName = 'active',
-        ...rest
-    } = props;
-    const pathname = useLocation();
-
-    let linkPath = href;
-    try {
-        linkPath = new URL(href, window.location.href).pathname;
-    } catch {
-        linkPath = href;
-    }
-    const isActive = matchActive(linkPath, pathname, end);
-    const state: NavLinkState = { isActive };
-
-    const resolvedClassName =
-        typeof className === 'function'
-            ? className(state)
-            : [className, isActive ? activeClassName : undefined].filter(Boolean).join(' ') ||
-              undefined;
-    const resolvedStyle = typeof style === 'function' ? style(state) : style;
-    const resolvedChildren = typeof children === 'function' ? children(state) : children;
-
-    return (
-        <Link
-            {...rest}
-            href={href}
-            className={resolvedClassName}
-            style={resolvedStyle}
-            aria-current={isActive ? 'page' : undefined}>
-            {resolvedChildren}
-        </Link>
-    );
-}
+import type { CSSProperties, ReactNode } from 'react';
+
+import { useLocation } from '../routing/hooks.js';
+import { Link, type LinkProps } from './Link.js';
+
+/** State passed to `NavLink`'s function-form `className` / `style` / `children`. */
+export interface NavLinkState {
+    readonly isActive: boolean;
+}
+
+/**
+ * Props for {@link NavLink}: all {@link LinkProps}, but `className` / `style` / `children` may also
+ * be functions of the active state.
+ */
+export interface NavLinkProps extends Omit<LinkProps, 'className' | 'style' | 'children'> {
+    className?: string | ((state: NavLinkState) => string | undefined);
+    style?: CSSProperties | ((state: NavLinkState) => CSSProperties | undefined);
+    children?: ReactNode | ((state: NavLinkState) => ReactNode);
+    /** Match `href` exactly; without it, sub-paths are also active. Default `false`. */
+    end?: boolean;
+    /** Class added when active (used with a string `className`). Default `"active"`. */
+    activeClassName?: string;
+}
+
+function normalizePath(p: string): string {
+    return p.length > 1 ? p.replace(/\/+$/, '') : p;
+}
+
+/**
+ * Whether a link to `linkPath` is active for `currentPath`. Exact when `end`; otherwise a parent
+ * path is active for its sub-paths (and `/` is active everywhere, matching React Router).
+ */
+export function matchActive(linkPath: string, currentPath: string, end: boolean): boolean {
+    const link = normalizePath(linkPath);
+    const current = normalizePath(currentPath);
+    if (current === link) return true;
+    if (end) return false;
+    if (link === '/') return true;
+    return current.startsWith(link + '/');
+}
+
+/**
+ * A {@link Link} that knows whether it points at the current location. Applies an active class
+ * (default `"active"`) and `aria-current="page"` when active; `className` / `style` / `children`
+ * may be functions of `{ isActive }`. Inherits Link's full anchor API and prefetching.
+ */
+export function NavLink(props: NavLinkProps): ReactNode {
+    const {
+        href,
+        className,
+        style,
+        children,
+        end = false,
+        activeClassName = 'active',
+        ...rest
+    } = props;
+    const pathname = useLocation();
+
+    let linkPath = href;
+    try {
+        linkPath = new URL(href, window.location.href).pathname;
+    } catch {
+        linkPath = href;
+    }
+    const isActive = matchActive(linkPath, pathname, end);
+    const state: NavLinkState = { isActive };
+
+    const resolvedClassName =
+        typeof className === 'function'
+            ? className(state)
+            : [className, isActive ? activeClassName : undefined].filter(Boolean).join(' ') ||
+              undefined;
+    const resolvedStyle = typeof style === 'function' ? style(state) : style;
+    const resolvedChildren = typeof children === 'function' ? children(state) : children;
+
+    return (
+        <Link
+            {...rest}
+            href={href}
+            className={resolvedClassName}
+            style={resolvedStyle}
+            aria-current={isActive ? 'page' : undefined}>
+            {resolvedChildren}
+        </Link>
+    );
+}