@pyreon/router 0.3.0 → 0.4.0

package/src/types.ts

@@ -6,20 +6,28 @@ export type { ComponentFn }
 
 /**
  * Extracts typed params from a path string at compile time.
+ * Supports optional params via `:param?` — their type is `string | undefined`.
  *
  * @example
  * ExtractParams<'/user/:id/posts/:postId'>
  * // → { id: string; postId: string }
+ *
+ * ExtractParams<'/user/:id?'>
+ * // → { id?: string | undefined }
  */
 export type ExtractParams<T extends string> = T extends `${string}:${infer Param}*/${infer Rest}`
   ? { [K in Param]: string } & ExtractParams<`/${Rest}`>
   : T extends `${string}:${infer Param}*`
     ? { [K in Param]: string }
-    : T extends `${string}:${infer Param}/${infer Rest}`
-      ? { [K in Param]: string } & ExtractParams<`/${Rest}`>
-      : T extends `${string}:${infer Param}`
-        ? { [K in Param]: string }
-        : Record<never, never>
+    : T extends `${string}:${infer Param}?/${infer Rest}`
+      ? { [K in Param]?: string | undefined } & ExtractParams<`/${Rest}`>
+      : T extends `${string}:${infer Param}?`
+        ? { [K in Param]?: string | undefined }
+        : T extends `${string}:${infer Param}/${infer Rest}`
+          ? { [K in Param]: string } & ExtractParams<`/${Rest}`>
+          : T extends `${string}:${infer Param}`
+            ? { [K in Param]: string }
+            : Record<never, never>
 
 // ─── Route meta ───────────────────────────────────────────────────────────────
 
@@ -49,7 +57,7 @@ export interface RouteMeta {
 // ─── Resolved route ───────────────────────────────────────────────────────────
 
 export interface ResolvedRoute<
-  P extends Record<string, string> = Record<string, string>,
+  P extends Record<string, string | undefined> = Record<string, string>,
   Q extends Record<string, string> = Record<string, string>,
 > {
   path: string
@@ -102,6 +110,19 @@ export type NavigationGuard = (
 
 export type AfterEachHook = (to: ResolvedRoute, from: ResolvedRoute) => void
 
+// ─── Navigation blockers ──────────────────────────────────────────────────────
+
+/**
+ * Called before each navigation. Return `true` to block, `false` to allow.
+ * Async blockers are supported (e.g. to show a confirmation dialog).
+ */
+export type BlockerFn = (to: ResolvedRoute, from: ResolvedRoute) => boolean | Promise<boolean>
+
+export interface Blocker {
+  /** Unregister this blocker so future navigations proceed freely. */
+  remove(): void
+}
+
 // ─── Route loaders ────────────────────────────────────────────────────────────
 
 export interface LoaderContext {
@@ -133,6 +154,14 @@ export interface RouteRecord<TPath extends string = string> {
   beforeEnter?: NavigationGuard | NavigationGuard[]
   /** Guard(s) run before leaving this route. Return false to cancel. */
   beforeLeave?: NavigationGuard | NavigationGuard[]
+  /**
+   * Alternative path(s) for this route. Alias paths render the same component
+   * and share guards, loaders, and metadata with the primary path.
+   *
+   * @example
+   * { path: "/user/:id", alias: ["/profile/:id"], component: UserPage }
+   */
+  alias?: string | string[]
   /** Child routes rendered inside this route's component via <RouterView /> */
   children?: RouteRecord[]
   /**
@@ -141,6 +170,12 @@ export interface RouteRecord<TPath extends string = string> {
    * Receives an AbortSignal that fires if a newer navigation supersedes this one.
    */
   loader?: RouteLoaderFn
+  /**
+   * When true, the router shows cached loader data immediately (stale) and
+   * revalidates in the background. The component re-renders once fresh data arrives.
+   * Only applies when navigating to a route that already has cached loader data.
+   */
+  staleWhileRevalidate?: boolean
   /** Component rendered when this route's loader throws an error */
   errorComponent?: ComponentFn
 }
@@ -157,6 +192,13 @@ export interface RouterOptions {
   routes: RouteRecord[]
   /** "hash" (default) uses location.hash; "history" uses pushState */
   mode?: "hash" | "history"
+  /**
+   * Base path for the application. Used when deploying to a sub-path
+   * (e.g. `"/app"` for `https://example.com/app/`).
+   * Only applies in history mode. Must start with `/`.
+   * Default: `""` (no base path).
+   */
+  base?: string
   /**
    * Global scroll behavior. Per-route meta.scrollBehavior takes precedence.
    * Default: "top"
@@ -183,6 +225,13 @@ export interface RouterOptions {
    * Default: 100.
    */
   maxCacheSize?: number
+  /**
+   * Trailing slash handling:
+   *   - `"strip"` — removes trailing slashes before matching (default)
+   *   - `"add"` — ensures paths always end with `/`
+   *   - `"ignore"` — no normalization
+   */
+  trailingSlash?: "strip" | "add" | "ignore"
 }
 
 // ─── Router interface ─────────────────────────────────────────────────────────
@@ -198,8 +247,18 @@ export interface Router {
   }): Promise<void>
   /** Replace current history entry */
   replace(path: string): Promise<void>
-  /** Go back */
+  /** Replace current history entry using a named route */
+  replace(location: {
+    name: string
+    params?: Record<string, string>
+    query?: Record<string, string>
+  }): Promise<void>
+  /** Go back one step in history */
   back(): void
+  /** Go forward one step in history */
+  forward(): void
+  /** Navigate forward or backward by `delta` steps in the history stack */
+  go(delta: number): void
   /** Register a global before-navigation guard. Returns an unregister function. */
   beforeEach(guard: NavigationGuard): () => void
   /** Register a global after-navigation hook. Returns an unregister function. */
@@ -208,6 +267,11 @@ export interface Router {
   readonly currentRoute: () => ResolvedRoute
   /** True while a navigation (guards + loaders) is in flight */
   readonly loading: () => boolean
+  /**
+   * Promise that resolves once the initial navigation is complete.
+   * Useful for SSR and for delaying rendering until the first route is resolved.
+   */
+  isReady(): Promise<void>
   /** Remove all event listeners, clear caches, and abort in-flight navigations. */
   destroy(): void
 }
@@ -219,6 +283,8 @@ import type { Computed, Signal } from "@pyreon/reactivity"
 export interface RouterInstance extends Router {
   routes: RouteRecord[]
   mode: "hash" | "history"
+  /** Normalized base path (e.g. "/app"), empty string if none */
+  _base: string
   _currentPath: Signal<string>
   _currentRoute: Computed<ResolvedRoute>
   _componentCache: Map<RouteRecord, ComponentFn>
@@ -240,4 +306,10 @@ export interface RouterInstance extends Router {
   _loaderData: Map<RouteRecord, unknown>
   /** AbortController for the in-flight loader batch — aborted when a newer navigation starts */
   _abortController: AbortController | null
+  /** Registered navigation blockers */
+  _blockers: Set<BlockerFn>
+  /** Resolves the isReady() promise after initial navigation completes */
+  _readyResolve: (() => void) | null
+  /** The isReady() promise instance */
+  _readyPromise: Promise<void>
 }