@pyreon/router 0.11.5 → 0.11.7

package/lib/types/index.d.ts

@@ -35,7 +35,7 @@ interface RouteMeta {
   /** If true, guards can redirect to login */
   requiresAuth?: boolean;
   /** Scroll behavior for this route */
-  scrollBehavior?: "top" | "restore" | "none";
+  scrollBehavior?: 'top' | 'restore' | 'none';
 }
 interface ResolvedRoute<P extends Record<string, string | undefined> = Record<string, string>, Q extends Record<string, string> = Record<string, string>> {
   path: string;
@@ -126,11 +126,11 @@ interface RouteRecord<TPath extends string = string> {
   /** Component rendered when this route's loader throws an error */
   errorComponent?: ComponentFn$1;
 }
-type ScrollBehaviorFn = (to: ResolvedRoute, from: ResolvedRoute, savedPosition: number | null) => "top" | "restore" | "none" | number;
+type ScrollBehaviorFn = (to: ResolvedRoute, from: ResolvedRoute, savedPosition: number | null) => 'top' | 'restore' | 'none' | number;
 interface RouterOptions {
   routes: RouteRecord[];
   /** "hash" (default) uses location.hash; "history" uses pushState */
-  mode?: "hash" | "history";
+  mode?: 'hash' | 'history';
   /**
    * Base path for the application. Used when deploying to a sub-path
    * (e.g. `"/app"` for `https://example.com/app/`).
@@ -142,7 +142,7 @@ interface RouterOptions {
    * Global scroll behavior. Per-route meta.scrollBehavior takes precedence.
    * Default: "top"
    */
-  scrollBehavior?: ScrollBehaviorFn | "top" | "restore" | "none";
+  scrollBehavior?: ScrollBehaviorFn | 'top' | 'restore' | 'none';
   /**
    * Initial URL for SSR. On the server, window.location is unavailable;
    * pass the request URL here so the router resolves the correct route.
@@ -170,7 +170,7 @@ interface RouterOptions {
    *   - `"add"` — ensures paths always end with `/`
    *   - `"ignore"` — no normalization
    */
-  trailingSlash?: "strip" | "add" | "ignore";
+  trailingSlash?: 'strip' | 'add' | 'ignore';
 }
 interface Router {
   /** Navigate to a path */
@@ -213,7 +213,7 @@ interface Router {
 }
 interface RouterInstance extends Router {
   routes: RouteRecord[];
-  mode: "hash" | "history";
+  mode: 'hash' | 'history';
   /** Normalized base path (e.g. "/app"), empty string if none */
   _base: string;
   _currentPath: Signal<string>;
@@ -222,8 +222,8 @@ interface RouterInstance extends Router {
   _loadingSignal: Signal<number>;
   _resolve(rawPath: string): ResolvedRoute;
   _scrollPositions: Map<string, number>;
-  _scrollBehavior: RouterOptions["scrollBehavior"];
-  _onError: RouterOptions["onError"];
+  _scrollBehavior: RouterOptions['scrollBehavior'];
+  _onError: RouterOptions['onError'];
   _maxCacheSize: number;
   /**
    * Current RouterView nesting depth. Incremented by each RouterView as it
@@ -295,7 +295,7 @@ interface RouterLinkProps extends Props {
    *   - "viewport" — prefetch when the link scrolls into the viewport
    *   - "none" — no prefetching
    */
-  prefetch?: "hover" | "viewport" | "none";
+  prefetch?: 'hover' | 'viewport' | 'none';
   children?: VNodeChild | null;
 }
 declare const RouterLink: ComponentFn<RouterLinkProps>;

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@pyreon/router",
-  "version": "0.11.5",
+  "version": "0.11.7",
   "description": "Official router for Pyreon",
+  "homepage": "https://github.com/pyreon/pyreon/tree/main/packages/router#readme",
+  "bugs": {
+    "url": "https://github.com/pyreon/pyreon/issues"
+  },
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/pyreon/pyreon.git",
     "directory": "packages/core/router"
   },
-  "homepage": "https://github.com/pyreon/pyreon/tree/main/packages/router#readme",
-  "bugs": {
-    "url": "https://github.com/pyreon/pyreon/issues"
-  },
   "files": [
     "lib",
     "src",
     "README.md",
     "LICENSE"
   ],
-  "sideEffects": false,
   "type": "module",
+  "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./lib/index.js",
   "types": "./lib/types/index.d.ts",
@@ -30,24 +30,24 @@
       "types": "./lib/types/index.d.ts"
     }
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "vl_rolldown_build",
     "dev": "vl_rolldown_build-watch",
     "test": "vitest run",
     "typecheck": "tsc --noEmit",
-    "lint": "biome check .",
+    "lint": "oxlint .",
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@pyreon/core": "^0.11.5",
-    "@pyreon/reactivity": "^0.11.5",
-    "@pyreon/runtime-dom": "^0.11.5"
+    "@pyreon/core": "^0.11.7",
+    "@pyreon/reactivity": "^0.11.7",
+    "@pyreon/runtime-dom": "^0.11.7"
   },
   "devDependencies": {
     "@happy-dom/global-registrator": "^20.8.3",
     "happy-dom": "^20.8.3"
-  },
-  "publishConfig": {
-    "access": "public"
   }
 }

package/src/components.tsx

@@ -1,8 +1,8 @@
-import type { ComponentFn, Props, VNodeChild } from "@pyreon/core"
-import { createRef, h, onUnmount, provide, useContext } from "@pyreon/core"
-import { LoaderDataContext, prefetchLoaderData } from "./loader"
-import { isLazy, RouterContext, setActiveRouter } from "./router"
-import type { LazyComponent, ResolvedRoute, RouteRecord, Router, RouterInstance } from "./types"
+import type { ComponentFn, Props, VNodeChild } from '@pyreon/core'
+import { createRef, h, onUnmount, provide, useContext } from '@pyreon/core'
+import { LoaderDataContext, prefetchLoaderData } from './loader'
+import { isLazy, RouterContext, setActiveRouter } from './router'
+import type { LazyComponent, ResolvedRoute, RouteRecord, Router, RouterInstance } from './types'
 
 // Track prefetched paths per router to avoid duplicate fetches
 const _prefetched = new WeakMap<RouterInstance, Set<string>>()
@@ -100,7 +100,7 @@ export const RouterView: ComponentFn<RouterViewProps> = (props) => {
     return renderLazyRoute(router, record, raw)
   }
 
-  return h("div", { "data-pyreon-router-view": true }, child as unknown as VNodeChild)
+  return h('div', { 'data-pyreon-router-view': true }, child as unknown as VNodeChild)
 }
 
 // ─── RouterLink ───────────────────────────────────────────────────────────────
@@ -121,13 +121,13 @@ export interface RouterLinkProps extends Props {
    *   - "viewport" — prefetch when the link scrolls into the viewport
    *   - "none" — no prefetching
    */
-  prefetch?: "hover" | "viewport" | "none"
+  prefetch?: 'hover' | 'viewport' | 'none'
   children?: VNodeChild | null
 }
 
 export const RouterLink: ComponentFn<RouterLinkProps> = (props) => {
   const router = useContext(RouterContext)
-  const prefetchMode = props.prefetch ?? "hover"
+  const prefetchMode = props.prefetch ?? 'hover'
 
   const handleClick = (e: MouseEvent) => {
     e.preventDefault()
@@ -140,29 +140,29 @@ export const RouterLink: ComponentFn<RouterLinkProps> = (props) => {
   }
 
   const handleMouseEnter = () => {
-    if (prefetchMode !== "hover" || !router) return
+    if (prefetchMode !== 'hover' || !router) return
     prefetchRoute(router as RouterInstance, props.to)
   }
 
   const inst = router as RouterInstance | null
-  const href = inst?.mode === "history" ? `${inst._base}${props.to}` : `#${props.to}`
+  const href = inst?.mode === 'history' ? `${inst._base}${props.to}` : `#${props.to}`
 
   const activeClass = (): string => {
-    if (!router) return ""
+    if (!router) return ''
     const current = router.currentRoute().path
     const target = props.to
     const isExact = current === target
     const isActive = isExact || (!props.exact && isSegmentPrefix(current, target))
 
     const classes: string[] = []
-    if (isActive) classes.push(props.activeClass ?? "router-link-active")
-    if (isExact) classes.push(props.exactActiveClass ?? "router-link-exact-active")
-    return classes.join(" ").trim()
+    if (isActive) classes.push(props.activeClass ?? 'router-link-active')
+    if (isExact) classes.push(props.exactActiveClass ?? 'router-link-exact-active')
+    return classes.join(' ').trim()
   }
 
   // Viewport prefetching — observe link visibility with IntersectionObserver
   const ref = createRef<Element>()
-  if (prefetchMode === "viewport" && router && typeof IntersectionObserver !== "undefined") {
+  if (prefetchMode === 'viewport' && router && typeof IntersectionObserver !== 'undefined') {
     const observer = new IntersectionObserver((entries) => {
       for (const entry of entries) {
         if (entry.isIntersecting) {
@@ -180,7 +180,7 @@ export const RouterLink: ComponentFn<RouterLinkProps> = (props) => {
   }
 
   return h(
-    "a",
+    'a',
     { ref, href, class: activeClass, onClick: handleClick, onMouseEnter: handleMouseEnter },
     props.children ?? props.to,
   )
@@ -214,7 +214,7 @@ function renderLazyRoute(
     raw
       .loader()
       .then((mod) => {
-        const resolved = typeof mod === "function" ? mod : mod.default
+        const resolved = typeof mod === 'function' ? mod : mod.default
         cacheSet(router, record, resolved)
         router._loadingSignal.update((n) => n + 1)
       })
@@ -224,7 +224,7 @@ function renderLazyRoute(
             tryLoad(attempt + 1),
           )
         }
-        if (typeof window !== "undefined" && isStaleChunk(err)) {
+        if (typeof window !== 'undefined' && isStaleChunk(err)) {
           window.location.reload()
           return
         }
@@ -247,7 +247,7 @@ function renderWithLoader(
   router: RouterInstance,
   record: RouteRecord,
   Comp: ComponentFn,
-  route: Pick<ResolvedRoute, "params" | "query" | "meta">,
+  route: Pick<ResolvedRoute, 'params' | 'query' | 'meta'>,
 ): VNodeChild {
   const routeProps = { params: route.params, query: route.query, meta: route.meta }
   if (!record.loader) {
@@ -285,9 +285,9 @@ function cacheSet(router: RouterInstance, record: RouteRecord, comp: ComponentFn
  * `/admin` is a prefix of `/admin/users` but NOT of `/admin-panel`.
  */
 function isSegmentPrefix(current: string, target: string): boolean {
-  if (target === "/") return false
-  const cs = current.split("/").filter(Boolean)
-  const ts = target.split("/").filter(Boolean)
+  if (target === '/') return false
+  const cs = current.split('/').filter(Boolean)
+  const ts = target.split('/').filter(Boolean)
   if (ts.length > cs.length) return false
   return ts.every((seg, i) => seg === cs[i])
 }
@@ -298,7 +298,7 @@ function isSegmentPrefix(current: string, target: string): boolean {
  * so the user gets the new bundle instead of a broken loading state.
  */
 function isStaleChunk(err: unknown): boolean {
-  if (err instanceof TypeError && String(err.message).includes("Failed to fetch")) return true
+  if (err instanceof TypeError && String(err.message).includes('Failed to fetch')) return true
   if (err instanceof SyntaxError) return true
   return false
 }

package/src/index.ts

@@ -41,10 +41,10 @@
  * router.push({ name: "user", params: { id: "42" } })
  */
 
-export type { RouterLinkProps, RouterProviderProps, RouterViewProps } from "./components"
+export type { RouterLinkProps, RouterProviderProps, RouterViewProps } from './components'
 // Components
-export { RouterLink, RouterProvider, RouterView } from "./components"
-export { hydrateLoaderData, prefetchLoaderData, serializeLoaderData, useLoaderData } from "./loader"
+export { RouterLink, RouterProvider, RouterView } from './components'
+export { hydrateLoaderData, prefetchLoaderData, serializeLoaderData, useLoaderData } from './loader'
 // Match utilities (useful for SSR route pre-fetching)
 export {
   buildPath,
@@ -53,7 +53,7 @@ export {
   parseQueryMulti,
   resolveRoute,
   stringifyQuery,
-} from "./match"
+} from './match'
 // Router factory + hooks
 export {
   createRouter,
@@ -65,7 +65,7 @@ export {
   useRoute,
   useRouter,
   useSearchParams,
-} from "./router"
+} from './router'
 // Types
 // Data loaders
 export type {
@@ -85,6 +85,6 @@ export type {
   Router,
   RouterOptions,
   ScrollBehaviorFn,
-} from "./types"
+} from './types'
 // Lazy helper
-export { lazy } from "./types"
+export { lazy } from './types'

package/src/loader.ts

@@ -1,6 +1,6 @@
-import type { Context } from "@pyreon/core"
-import { createContext, useContext } from "@pyreon/core"
-import type { RouterInstance } from "./types"
+import type { Context } from '@pyreon/core'
+import { createContext, useContext } from '@pyreon/core'
+import type { RouterInstance } from './types'
 
 /**
  * Context frame that holds the loader data for the currently rendered route record.
@@ -87,7 +87,7 @@ export function hydrateLoaderData(
   router: RouterInstance,
   serialized: Record<string, unknown>,
 ): void {
-  if (!serialized || typeof serialized !== "object") return
+  if (!serialized || typeof serialized !== 'object') return
   const route = router._resolve(router.currentRoute().path)
   for (const record of route.matched) {
     if (Object.hasOwn(serialized, record.path)) {

package/src/match.ts

@@ -1,4 +1,4 @@
-import type { ResolvedRoute, RouteMeta, RouteRecord } from "./types"
+import type { ResolvedRoute, RouteMeta, RouteRecord } from './types'
 
 // ─── Query string ─────────────────────────────────────────────────────────────
 
@@ -9,11 +9,11 @@ import type { ResolvedRoute, RouteMeta, RouteRecord } from "./types"
 export function parseQuery(qs: string): Record<string, string> {
   if (!qs) return {}
   const result: Record<string, string> = {}
-  for (const part of qs.split("&")) {
-    const eqIdx = part.indexOf("=")
+  for (const part of qs.split('&')) {
+    const eqIdx = part.indexOf('=')
     if (eqIdx < 0) {
       const key = decodeURIComponent(part)
-      if (key) result[key] = ""
+      if (key) result[key] = ''
     } else {
       const key = decodeURIComponent(part.slice(0, eqIdx))
       const val = decodeURIComponent(part.slice(eqIdx + 1))
@@ -33,13 +33,13 @@ export function parseQuery(qs: string): Record<string, string> {
 export function parseQueryMulti(qs: string): Record<string, string | string[]> {
   if (!qs) return {}
   const result: Record<string, string | string[]> = {}
-  for (const part of qs.split("&")) {
-    const eqIdx = part.indexOf("=")
+  for (const part of qs.split('&')) {
+    const eqIdx = part.indexOf('=')
     let key: string
     let val: string
     if (eqIdx < 0) {
       key = decodeURIComponent(part)
-      val = ""
+      val = ''
     } else {
       key = decodeURIComponent(part.slice(0, eqIdx))
       val = decodeURIComponent(part.slice(eqIdx + 1))
@@ -62,7 +62,7 @@ export function stringifyQuery(query: Record<string, string>): string {
   for (const [k, v] of Object.entries(query)) {
     parts.push(v ? `${encodeURIComponent(k)}=${encodeURIComponent(v)}` : encodeURIComponent(k))
   }
-  return parts.length ? `?${parts.join("&")}` : ""
+  return parts.length ? `?${parts.join('&')}` : ''
 }
 
 // ─── Compiled route structures ───────────────────────────────────────────────
@@ -134,21 +134,21 @@ interface FlattenedRoute {
 const _compiledCache = new WeakMap<RouteRecord[], CompiledRoute[]>()
 
 function compileSegment(raw: string): CompiledSegment {
-  if (raw.endsWith("*") && raw.startsWith(":")) {
+  if (raw.endsWith('*') && raw.startsWith(':')) {
     return { raw, isParam: true, isSplat: true, isOptional: false, paramName: raw.slice(1, -1) }
   }
-  if (raw.endsWith("?") && raw.startsWith(":")) {
+  if (raw.endsWith('?') && raw.startsWith(':')) {
     return { raw, isParam: true, isSplat: false, isOptional: true, paramName: raw.slice(1, -1) }
   }
-  if (raw.startsWith(":")) {
+  if (raw.startsWith(':')) {
     return { raw, isParam: true, isSplat: false, isOptional: false, paramName: raw.slice(1) }
   }
-  return { raw, isParam: false, isSplat: false, isOptional: false, paramName: "" }
+  return { raw, isParam: false, isSplat: false, isOptional: false, paramName: '' }
 }
 
 function compileRoute(route: RouteRecord): CompiledRoute {
   const pattern = route.path
-  const isWildcard = pattern === "(.*)" || pattern === "*"
+  const isWildcard = pattern === '(.*)' || pattern === '*'
 
   if (isWildcard) {
     return {
@@ -163,9 +163,9 @@ function compileRoute(route: RouteRecord): CompiledRoute {
     }
   }
 
-  const segments = pattern.split("/").filter(Boolean).map(compileSegment)
+  const segments = pattern.split('/').filter(Boolean).map(compileSegment)
   const isStatic = segments.every((s) => !s.isParam)
-  const staticPath = isStatic ? `/${segments.map((s) => s.raw).join("/")}` : null
+  const staticPath = isStatic ? `/${segments.map((s) => s.raw).join('/')}` : null
   const first = segments.length > 0 ? segments[0] : undefined
   const firstSegment = first && !first.isParam ? first.raw : null
 
@@ -239,7 +239,7 @@ function makeFlatEntry(
     segmentCount: segments.length,
     matchedChain: chain,
     isStatic,
-    staticPath: isStatic ? `/${segments.map((s) => s.raw).join("/")}` : null,
+    staticPath: isStatic ? `/${segments.map((s) => s.raw).join('/')}` : null,
     meta,
     firstSegment: getFirstSegment(segments),
     hasSplat: segments.some((s) => s.isSplat),
@@ -369,7 +369,7 @@ function buildRouteIndex(routes: RouteRecord[], compiled: CompiledRoute[]): Rout
 /** Split path into segments without allocating a filtered array */
 function splitPath(path: string): string[] {
   // Fast path for common cases
-  if (path === "/") return []
+  if (path === '/') return []
   // Remove leading slash, split, no filter needed if path is clean
   const start = path.charCodeAt(0) === 47 /* / */ ? 1 : 0
   const end = path.length
@@ -390,7 +390,7 @@ function splitPath(path: string): string[] {
 
 /** Decode only if the segment contains a `%` character */
 function decodeSafe(s: string): string {
-  return s.indexOf("%") >= 0 ? decodeURIComponent(s) : s
+  return s.indexOf('%') >= 0 ? decodeURIComponent(s) : s
 }
 
 // ─── Path matching (compiled) ────────────────────────────────────────────────
@@ -411,28 +411,28 @@ function matchPatternSegment(
   params: Record<string, string>,
   pathParts: string[],
   i: number,
-): "splat" | "continue" | "fail" {
-  if (pp.endsWith("*") && pp.startsWith(":")) {
-    params[pp.slice(1, -1)] = pathParts.slice(i).map(decodeURIComponent).join("/")
-    return "splat"
+): 'splat' | 'continue' | 'fail' {
+  if (pp.endsWith('*') && pp.startsWith(':')) {
+    params[pp.slice(1, -1)] = pathParts.slice(i).map(decodeURIComponent).join('/')
+    return 'splat'
   }
-  if (pp.endsWith("?") && pp.startsWith(":")) {
+  if (pp.endsWith('?') && pp.startsWith(':')) {
     if (pt !== undefined) params[pp.slice(1, -1)] = decodeURIComponent(pt)
-    return "continue"
+    return 'continue'
   }
-  if (pt === undefined) return "fail"
-  if (pp.startsWith(":")) {
+  if (pt === undefined) return 'fail'
+  if (pp.startsWith(':')) {
     params[pp.slice(1)] = decodeURIComponent(pt)
-    return "continue"
+    return 'continue'
   }
-  return pp === pt ? "continue" : "fail"
+  return pp === pt ? 'continue' : 'fail'
 }
 
 export function matchPath(pattern: string, path: string): Record<string, string> | null {
-  if (pattern === "(.*)" || pattern === "*") return {}
+  if (pattern === '(.*)' || pattern === '*') return {}
 
-  const patternParts = pattern.split("/").filter(Boolean)
-  const pathParts = path.split("/").filter(Boolean)
+  const patternParts = pattern.split('/').filter(Boolean)
+  const pathParts = path.split('/').filter(Boolean)
 
   const params: Record<string, string> = {}
   for (let i = 0; i < patternParts.length; i++) {
@@ -443,8 +443,8 @@ export function matchPath(pattern: string, path: string): Record<string, string>
       pathParts,
       i,
     )
-    if (result === "splat") return params
-    if (result === "fail") return null
+    if (result === 'splat') return params
+    if (result === 'fail') return null
   }
 
   if (pathParts.length > patternParts.length) return null
@@ -460,7 +460,7 @@ function captureSplat(pathParts: string[], from: number, pathLen: number): strin
     const p = pathParts[j]
     if (p !== undefined) remaining.push(decodeSafe(p))
   }
-  return remaining.join("/")
+  return remaining.join('/')
 }
 
 // ─── Flattened route matching ─────────────────────────────────────────────────
@@ -534,13 +534,13 @@ interface MatchResult {
  * Uses flattened index for O(1) static lookup and first-segment dispatch.
  */
 export function resolveRoute(rawPath: string, routes: RouteRecord[]): ResolvedRoute {
-  const qIdx = rawPath.indexOf("?")
+  const qIdx = rawPath.indexOf('?')
   const pathAndHash = qIdx >= 0 ? rawPath.slice(0, qIdx) : rawPath
-  const queryPart = qIdx >= 0 ? rawPath.slice(qIdx + 1) : ""
+  const queryPart = qIdx >= 0 ? rawPath.slice(qIdx + 1) : ''
 
-  const hIdx = pathAndHash.indexOf("#")
+  const hIdx = pathAndHash.indexOf('#')
   const cleanPath = hIdx >= 0 ? pathAndHash.slice(0, hIdx) : pathAndHash
-  const hash = hIdx >= 0 ? pathAndHash.slice(hIdx + 1) : ""
+  const hash = hIdx >= 0 ? pathAndHash.slice(hIdx + 1) : ''
 
   const query = parseQuery(queryPart)
 
@@ -627,13 +627,13 @@ export function buildPath(pattern: string, params: Record<string, string>): stri
   const built = pattern.replace(/\/:([^/]+)\?/g, (_match, key) => {
     const val = params[key]
     // Optional param — omit the entire segment if no value provided
-    if (!val) return ""
+    if (!val) return ''
     return `/${encodeURIComponent(val)}`
   })
   return built.replace(/:([^/]+)\*?/g, (match, key) => {
-    const val = params[key] ?? ""
+    const val = params[key] ?? ''
     // Splat params contain slashes — don't encode them
-    if (match.endsWith("*")) return val.split("/").map(encodeURIComponent).join("/")
+    if (match.endsWith('*')) return val.split('/').map(encodeURIComponent).join('/')
     return encodeURIComponent(val)
   })
 }