rari 0.2.6 → 0.2.8

package/dist/server.d.ts

@@ -1,3 +1,3 @@
-import { ErrorBoundaryProps, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, Route, RouteComponent, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-P4vvSVPV.js";
-import { FileRouteGenerator, convertFilePatternToRoutePattern, createReactDOMOptimization, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-Ph4oyo0B.js";
-export { ErrorBoundaryProps, FileRouteGenerator, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, RouteComponent as Route, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, Route as RouteType, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createReactDOMOptimization, createRouteManifest, defineRariConfig, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };
+import { ErrorBoundaryProps, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, Route, RouteComponent, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-BEWMJWMx.js";
+import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-MY0-nRif.js";
+export { ErrorBoundaryProps, FileRouteGenerator, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, RouteComponent as Route, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, Route as RouteType, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createRouteManifest, defineRariConfig, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };

package/dist/server.js

@@ -1,5 +1,5 @@
-import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, router_default, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-CcEhh-F7.js";
-import { FileRouteGenerator, convertFilePatternToRoutePattern, createReactDOMOptimization, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-MkYb94pQ.js";
+import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, router_default, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-CC4YQweh.js";
+import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-DeSCwqZZ.js";
 import "./server-build-DaBgiV55.js";
 
-export { FileRouteGenerator, HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, router_default as RouterProvider, Routes, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createReactDOMOptimization, createRouteManifest, defineRariConfig, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };
+export { FileRouteGenerator, HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, router_default as RouterProvider, Routes, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createRouteManifest, defineRariConfig, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rari",
   "type": "module",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
   "author": "Ryan Skinner",
   "license": "MIT",
@@ -78,15 +78,14 @@
   "dependencies": {
     "acorn": "^8.15.0",
     "esbuild": "^0.25.9",
-    "picocolors": "^1.1.1",
-    "rollup-plugin-esbuild": "^6.2.1"
+    "picocolors": "^1.1.1"
   },
   "optionalDependencies": {
-    "rari-darwin-arm64": "0.2.2",
-    "rari-darwin-x64": "0.2.2",
-    "rari-linux-arm64": "0.2.2",
-    "rari-linux-x64": "0.2.2",
-    "rari-win32-x64": "0.2.2"
+    "rari-darwin-arm64": "0.2.7",
+    "rari-darwin-x64": "0.2.7",
+    "rari-linux-arm64": "0.2.7",
+    "rari-linux-x64": "0.2.7",
+    "rari-win32-x64": "0.2.7"
   },
   "devDependencies": {
     "@types/node": "^24.2.1",

package/src/router/index.ts

@@ -1,13 +1,12 @@
 export {
+  Link,
+  Navigate,
   Outlet,
   RouteComponent,
   RouterContext,
   RouteRenderer,
   default as RouterProvider,
   Routes,
-} from './router'
-
-export {
   useNavigation,
   useParams,
   usePathname,
@@ -17,29 +16,24 @@ export {
   withRouter,
 } from './router'
 
-export { Link, Navigate } from './router'
-
 export type * from './types'
 
-export {
-  findMatchingRoute,
-  isDynamicRoute,
-  normalizePathname,
-  parseUrl,
-} from './utils'
-
 export {
   analyzeFilePath,
   buildSearchString,
   buildUrl,
   extractParamNames,
   filePathToRoutePath,
+  findMatchingRoute,
   getParentPath,
   getParentPaths,
+  isDynamicRoute,
   isPathActive,
   joinPaths,
   matchRoute,
+  normalizePathname,
   parseSearchParams,
+  parseUrl,
   routePathsEqual,
   routePathToRegex,
   sortRoutesBySpecificity,

package/src/router/router.tsx

@@ -47,9 +47,10 @@ export function RouterProvider({
     }),
     [config],
   )
+  const [currentRoute, setCurrentRoute] = useState<RouteMatch | null>(null)
 
-  const resolveRoute = useCallback(
-    (url: string): RouteMatch | null => {
+  const updateCurrentRoute = useCallback(
+    (url: string) => {
       const { pathname, search, hash, searchParams } = parseUrl(url)
       const normalizedPathname = normalizePathname(pathname)
 
@@ -63,56 +64,17 @@ export function RouterProvider({
           hash,
         }
 
-        enhancedMatch.childMatch = findDeepestChildMatch(
-          enhancedMatch,
-          normalizedPathname,
-        )
-        return enhancedMatch
-      }
+        enhancedMatch.childMatch = findDeepestChildMatch(enhancedMatch, normalizedPathname)
 
-      return null
+        setCurrentRoute(enhancedMatch)
+      }
+      else {
+        setCurrentRoute(null)
+      }
     },
     [routes],
   )
 
-  const [routerState, setRouterState] = useState<{
-    currentRoute: RouteMatch | null
-    isReady: boolean
-  }>(() => {
-    if (typeof window === 'undefined') {
-      return { currentRoute: null, isReady: false }
-    }
-
-    const url = mergedConfig.useHash
-      ? window.location.hash.slice(1) || '/'
-      : window.location.pathname
-        + window.location.search
-        + window.location.hash
-
-    let initialRoute
-    try {
-      initialRoute = resolveRoute(url)
-    }
-    catch (error) {
-      console.error('Error resolving initial route:', error)
-      initialRoute = null
-    }
-
-    const isReady = true
-    return { currentRoute: initialRoute, isReady }
-  })
-
-  const currentRoute = routerState.currentRoute
-  const isReady = routerState.isReady
-
-  const updateCurrentRoute = useCallback(
-    (url: string) => {
-      const route = resolveRoute(url)
-      setRouterState({ currentRoute: route, isReady: true })
-    },
-    [resolveRoute],
-  )
-
   useEffect(() => {
     const handleLocationChange = () => {
       const url = mergedConfig.useHash
@@ -124,6 +86,8 @@ export function RouterProvider({
       updateCurrentRoute(url)
     }
 
+    handleLocationChange()
+
     const handlePopState = () => {
       handleLocationChange()
     }
@@ -211,8 +175,8 @@ export function RouterProvider({
     [currentRoute],
   )
 
-  const contextValue: IRouterContext = useMemo(() => {
-    return {
+  const contextValue: IRouterContext = useMemo(
+    () => ({
       currentRoute,
       routes,
       navigate,
@@ -221,19 +185,18 @@ export function RouterProvider({
       replace,
       isActive,
       config: mergedConfig,
-      isReady,
-    }
-  }, [
-    currentRoute,
-    routes,
-    navigate,
-    back,
-    forward,
-    replace,
-    isActive,
-    mergedConfig,
-    isReady,
-  ])
+    }),
+    [
+      currentRoute,
+      routes,
+      navigate,
+      back,
+      forward,
+      replace,
+      isActive,
+      mergedConfig,
+    ],
+  )
 
   return <RouterContext value={contextValue}>{children}</RouterContext>
 }
@@ -281,7 +244,8 @@ export function useParams() {
 }
 
 export function useSearchParams() {
-  const { currentRoute, navigate } = useRouter()
+  const { currentRoute } = useRouter()
+  const { navigate } = useRouter()
 
   const searchParams = currentRoute?.searchParams || {}
 
@@ -290,7 +254,7 @@ export function useSearchParams() {
       params:
         | Record<string, string | string[]>
         | ((
-          prev: Record<string, string | string[]>,
+          prev: Record<string, string | string[]>
         ) => Record<string, string | string[]>),
       options: NavigationOptions = DEFAULT_CONFIG,
     ) => {
@@ -393,25 +357,16 @@ export function Outlet() {
     return null
   }
 
-  return (
-    <ChildComponent
-      {...childRoute.params}
-      searchParams={childRoute.searchParams}
-    />
-  )
+  return <ChildComponent {...childRoute.params} searchParams={childRoute.searchParams} />
 }
 
-function findChildRouteForCurrentLevel(
-  currentRoute: RouteMatch,
-): RouteMatch | null {
+function findChildRouteForCurrentLevel(currentRoute: RouteMatch): RouteMatch | null {
   if (currentRoute.childMatch) {
     return currentRoute.childMatch
   }
 
   if (currentRoute.route.children) {
-    const indexRoute = currentRoute.route.children.find(
-      child => child.isIndex,
-    )
+    const indexRoute = currentRoute.route.children.find(child => child.isIndex)
     if (indexRoute) {
       return {
         route: indexRoute,
@@ -430,26 +385,14 @@ function findChildRouteForCurrentLevel(
 export function RouteRenderer({ routeMatch }: { routeMatch: RouteMatch }) {
   if (!routeMatch.layouts || routeMatch.layouts.length === 0) {
     const Component = routeMatch.route.component
-    return Component
-      ? (
-          <Component
-            {...routeMatch.params}
-            searchParams={routeMatch.searchParams}
-          />
-        )
-      : null
+    return Component ? <Component {...routeMatch.params} searchParams={routeMatch.searchParams} /> : null
   }
 
   let rendered: ReactNode = null
   const Component = routeMatch.route.component
 
   if (Component) {
-    rendered = (
-      <Component
-        {...routeMatch.params}
-        searchParams={routeMatch.searchParams}
-      />
-    )
+    rendered = <Component {...routeMatch.params} searchParams={routeMatch.searchParams} />
   }
 
   for (let i = routeMatch.layouts.length - 1; i >= 0; i--) {
@@ -457,9 +400,7 @@ export function RouteRenderer({ routeMatch }: { routeMatch: RouteMatch }) {
     const LayoutComponent = layout.component
 
     if (LayoutComponent) {
-      rendered = (
-        <LayoutComponent route={routeMatch}>{rendered}</LayoutComponent>
-      )
+      rendered = <LayoutComponent route={routeMatch}>{rendered}</LayoutComponent>
     }
   }
 
@@ -487,10 +428,7 @@ export function Navigate({
 export default RouterProvider
 export { RouterContext }
 
-function findDeepestChildMatch(
-  routeMatch: RouteMatch,
-  pathname: string,
-): RouteMatch | null {
+function findDeepestChildMatch(routeMatch: RouteMatch, pathname: string): RouteMatch | null {
   if (!routeMatch.route.children || routeMatch.route.children.length === 0) {
     return null
   }
@@ -548,12 +486,18 @@ export function Link({
   )
 
   const isLinkActive = isActive(to, exact)
-  const finalClassName = [className, isLinkActive && activeClassName]
-    .filter(Boolean)
-    .join(' ')
+  const finalClassName = [
+    className,
+    isLinkActive && activeClassName,
+  ].filter(Boolean).join(' ')
 
   return (
-    <a href={to} className={finalClassName} onClick={handleClick} {...props}>
+    <a
+      href={to}
+      className={finalClassName}
+      onClick={handleClick}
+      {...props}
+    >
       {children}
     </a>
   )

package/src/router/types.ts

@@ -75,7 +75,6 @@ export interface RouterContext {
   replace: (path: string, options?: Omit<NavigationOptions, 'replace'>) => void
   isActive: (path: string, exact?: boolean) => boolean
   config: RouterConfig
-  isReady: boolean
 }
 
 export interface NavigationState {
@@ -123,7 +122,7 @@ export type RouteGenerator = (
   options: RouteGenerationOptions,
 ) => Promise<Route[]>
 
-export interface UseRouterReturn extends RouterContext {}
+export interface UseRouterReturn extends RouterContext { }
 
 export interface UseNavigationReturn extends NavigationState {
   navigate: RouterContext['navigate']

package/src/server.ts

@@ -67,4 +67,4 @@ export { createHttpRuntimeClient, HttpRuntimeClient } from './runtime-client'
 
 export type { RuntimeClient } from './runtime-client'
 
-export { createReactDOMOptimization, defineRariConfig, rari } from './vite'
+export { defineRariConfig, rari } from './vite'