one 1.1.545 → 1.1.547-1762219526973

package/src/fork/extractPathFromURL.ts

@@ -37,7 +37,7 @@ function extractExactPathFromURL(url: string): string {
     return href.replace(origin, '')
   }
 
-  const isExpoGo = typeof expo !== 'undefined' && globalThis.expo?.modules?.ExpoGo
+  const isExpoGo = typeof globalThis.expo !== 'undefined' && globalThis.expo?.modules?.ExpoGo
 
   // Handle special URLs used in Expo Go: `/--/pathname` -> `pathname`
   if (

package/src/layouts/Tabs.tsx

@@ -68,7 +68,7 @@ export const Tabs = withLayoutContext<
                 Platform.OS === 'web' ? props.children : <Pressable>{props.children}</Pressable>
               return (
                 <Link
-                  {...props}
+                  {...(props as any)}
                   style={[{ display: 'flex' }, props.style]}
                   href={href}
                   asChild={Platform.OS !== 'web'}

package/src/router/RouteInfoContext.tsx

@@ -2,7 +2,7 @@ import type React from 'react'
 import { createContext, useRef } from 'react'
 import type { UrlObject } from './getNormalizedStatePath'
 import { useStateForPath } from '@react-navigation/core'
-import { getRouteInfo } from './router'
+import { getRouteInfo } from './getRouteInfo'
 
 export const RouteInfoContext = createContext<UrlObject | undefined>(undefined)
 

package/src/router/getRouteInfo.ts

@@ -0,0 +1,37 @@
+import type { getPathFromState as originalGetPathFromState } from '@react-navigation/core'
+import { getPathDataFromState, type State } from '../fork/getPathFromState'
+import { stripBaseUrl } from '../fork/getStateFromPath-mods'
+import type { OneRouter } from '../interfaces/router'
+import { getNormalizedStatePath, type UrlObject } from './getNormalizedStatePath'
+import { isIndexPath } from './isIndexPath'
+import { getLinking } from './linkingConfig'
+
+export function getRouteInfo(state: OneRouter.ResultState) {
+  return getRouteInfoFromState(
+    (state: Parameters<typeof originalGetPathFromState>[0], asPath: boolean) => {
+      return getPathDataFromState(state, {
+        screens: [],
+        ...getLinking()?.config,
+        preserveDynamicRoutes: asPath,
+        preserveGroups: asPath,
+      })
+    },
+    state
+  )
+}
+
+function getRouteInfoFromState(
+  getPathFromState: (state: State, asPath: boolean) => { path: string; params: any },
+  state: State,
+  baseUrl?: string
+): UrlObject {
+  const { path } = getPathFromState(state, false)
+  const qualified = getPathFromState(state, true)
+
+  return {
+    unstable_globalHref: path,
+    pathname: stripBaseUrl(path, baseUrl).split('?')[0],
+    isIndex: isIndexPath(state),
+    ...getNormalizedStatePath(qualified, baseUrl),
+  }
+}

package/src/router/isIndexPath.ts

@@ -0,0 +1,33 @@
+import type { State } from '../fork/getPathFromState'
+
+type RouteLikeTree = { name: string; state?: { routes?: RouteLikeTree[] } }
+
+export function isIndexPath(state: State) {
+  const route = getActualLastRoute(state.routes[state.index ?? state.routes.length - 1])
+
+  if (route.state) {
+    return isIndexPath(route.state)
+  }
+
+  if (route.name === 'index') {
+    return true
+  }
+
+  if (route.params && 'screen' in route.params) {
+    return route.params.screen === 'index'
+  }
+
+  if (route.name.match(/.+\/index$/)) {
+    return true
+  }
+
+  return false
+}
+
+function getActualLastRoute<A extends RouteLikeTree>(routeLike: A): A {
+  if (routeLike.name[0] === '(' && routeLike.state?.routes) {
+    const routes = routeLike.state.routes
+    return getActualLastRoute(routes[routes.length - 1]) as any
+  }
+  return routeLike
+}

package/src/router/linkingConfig.ts

@@ -0,0 +1,38 @@
+import type { OneRouter } from '../interfaces/router'
+import { getLinkingConfig as createLinkingConfig, type OneLinkingOptions } from './getLinkingConfig'
+import type { RouteNode } from './Route'
+
+let linkingConfig: OneLinkingOptions | undefined
+
+export function getLinking() {
+  return linkingConfig
+}
+
+export function setLinking(_: OneLinkingOptions) {
+  linkingConfig = _
+}
+
+export function resetLinking() {
+  linkingConfig = undefined
+}
+
+export function setupLinking(
+  routeNode: RouteNode | null,
+  initialLocation?: URL
+): OneRouter.ResultState | undefined {
+  let initialState: OneRouter.ResultState | undefined
+
+  if (routeNode) {
+    linkingConfig = createLinkingConfig(routeNode)
+
+    if (initialLocation) {
+      linkingConfig.getInitialURL = () => initialLocation.toString()
+      initialState = linkingConfig.getStateFromPath?.(
+        initialLocation.pathname + (initialLocation.search || ''),
+        linkingConfig.config
+      )
+    }
+  }
+
+  return initialState
+}

package/src/router/router.ts

@@ -1,14 +1,13 @@
-import {
-  StackActions,
-  type NavigationContainerRefWithCurrent,
-  type getPathFromState as originalGetPathFromState,
-} from '@react-navigation/native'
+/**
+ * Note: this entire module is exported as an interface router.*
+ * We need to treat exports as an API and not change them, maybe not
+ * the best decision.
+ */
+
+import { StackActions, type NavigationContainerRefWithCurrent } from '@react-navigation/native'
 import * as Linking from 'expo-linking'
-import { Fragment, startTransition, type ComponentType, useSyncExternalStore } from 'react'
+import { Fragment, startTransition, useSyncExternalStore, type ComponentType } from 'react'
 import { Platform } from 'react-native'
-import type { State } from '../fork/getPathFromState'
-import { getPathDataFromState } from '../fork/getPathFromState'
-import { stripBaseUrl } from '../fork/getStateFromPath-mods'
 import type { OneRouter } from '../interfaces/router'
 import { resolveHref } from '../link/href'
 import { resolve } from '../link/path'
@@ -17,10 +16,11 @@ import { getLoaderPath, getPreloadPath } from '../utils/cleanUrl'
 import { dynamicImport } from '../utils/dynamicImport'
 import { shouldLinkExternally } from '../utils/url'
 import type { One } from '../vite/types'
-import { getLinkingConfig, type OneLinkingOptions } from './getLinkingConfig'
-import { getNormalizedStatePath, type UrlObject } from './getNormalizedStatePath'
+import type { UrlObject } from './getNormalizedStatePath'
+import { getRouteInfo } from './getRouteInfo'
 import { getRoutes } from './getRoutes'
 import { setLastAction } from './lastAction'
+import { getLinking, resetLinking, setupLinking } from './linkingConfig'
 import type { RouteNode } from './Route'
 import { sortRoutes } from './sortRoutes'
 import { getQualifiedRouteComponent } from './useScreens'
@@ -29,7 +29,6 @@ import { getNavigateAction } from './utils/getNavigateAction'
 // Module-scoped variables
 export let routeNode: RouteNode | null = null
 export let rootComponent: ComponentType
-export let linking: OneLinkingOptions | undefined
 
 export let hasAttemptedToHideSplash = false
 export let initialState: OneRouter.ResultState | undefined
@@ -67,7 +66,7 @@ export function initialize(
   }
 
   navigationRef = ref
-  setupLinking(initialLocation)
+  setupLinkingAndRouteInfo(initialLocation)
   subscribeToNavigationChanges()
 }
 
@@ -76,24 +75,14 @@ function cleanUpState() {
   rootState = undefined
   nextState = undefined
   routeInfo = undefined
-  linking = undefined
+  resetLinking()
   navigationRefSubscription?.()
   rootStateSubscribers.clear()
   storeSubscribers.clear()
 }
 
-function setupLinking(initialLocation?: URL) {
-  if (routeNode) {
-    linking = getLinkingConfig(routeNode)
-
-    if (initialLocation) {
-      linking.getInitialURL = () => initialLocation.toString()
-      initialState = linking.getStateFromPath?.(
-        initialLocation.pathname + (initialLocation.search || ''),
-        linking.config
-      )
-    }
-  }
+function setupLinkingAndRouteInfo(initialLocation?: URL) {
+  initialState = setupLinking(routeNode, initialLocation)
 
   if (initialState) {
     rootState = initialState
@@ -232,36 +221,6 @@ export function updateState(state: OneRouter.ResultState, nextStateParam = state
   }
 }
 
-export function getRouteInfo(state: OneRouter.ResultState) {
-  return getRouteInfoFromState(
-    (state: Parameters<typeof originalGetPathFromState>[0], asPath: boolean) => {
-      return getPathDataFromState(state, {
-        screens: [],
-        ...linking?.config,
-        preserveDynamicRoutes: asPath,
-        preserveGroups: asPath,
-      })
-    },
-    state
-  )
-}
-
-function getRouteInfoFromState(
-  getPathFromState: (state: State, asPath: boolean) => { path: string; params: any },
-  state: State,
-  baseUrl?: string
-): UrlObject {
-  const { path } = getPathFromState(state, false)
-  const qualified = getPathFromState(state, true)
-
-  return {
-    unstable_globalHref: path,
-    pathname: stripBaseUrl(path, baseUrl).split('?')[0],
-    isIndex: isIndexPath(state),
-    ...getNormalizedStatePath(qualified, baseUrl),
-  }
-}
-
 // Subscription functions
 export function subscribeToRootState(subscriber: OneRouter.RootStateListener) {
   rootStateSubscribers.add(subscriber)
@@ -310,7 +269,7 @@ function getSnapshot() {
     linkTo,
     routeNode,
     rootComponent,
-    linking,
+    linking: getLinking(),
     hasAttemptedToHideSplash,
     initialState,
     rootState,
@@ -359,39 +318,6 @@ export function useStoreRouteInfo() {
   return useSyncExternalStore(subscribeToRootState, routeInfoSnapshot, routeInfoSnapshot)
 }
 
-// Utility functions
-function isIndexPath(state: State) {
-  const route = getActualLastRoute(state.routes[state.index ?? state.routes.length - 1])
-
-  if (route.state) {
-    return isIndexPath(route.state)
-  }
-
-  if (route.name === 'index') {
-    return true
-  }
-
-  if (route.params && 'screen' in route.params) {
-    return route.params.screen === 'index'
-  }
-
-  if (route.name.match(/.+\/index$/)) {
-    return true
-  }
-
-  return false
-}
-
-type RouteLikeTree = { name: string; state?: { routes?: RouteLikeTree[] } }
-
-function getActualLastRoute<A extends RouteLikeTree>(routeLike: A): A {
-  if (routeLike.name[0] === '(' && routeLike.state?.routes) {
-    const routes = routeLike.state.routes
-    return getActualLastRoute(routes[routes.length - 1]) as any
-  }
-  return routeLike
-}
-
 // Cleanup function
 export function cleanup() {
   if (splashScreenAnimationFrame) {
@@ -454,6 +380,8 @@ export async function linkTo(href: string, event?: string, options?: OneRouter.L
     )
   }
 
+  const linking = getLinking()
+
   if (!linking) {
     throw new Error('Attempted to link to route when no routes are present')
   }

package/src/setup.ts

@@ -13,4 +13,5 @@
 // fixes bad import error in expo-modules-core
 // without this you run into error loading web immediately
 // where globalThis.expo is not defined
-import 'expo-modules-core/src/web/index.web.ts'
+// @zetavg: the actual thing we need to do is maybe import and call `installExpoGlobalPolyfill`. This is currently the file that does it, so we import it.
+// import 'expo-modules-core/src/polyfill/index.web.ts'

package/src/vite/one.ts

@@ -1,13 +1,18 @@
-import { clearCompilerCache, configureVXRNCompilerPlugin } from '@vxrn/compiler'
+import { configureVXRNCompilerPlugin } from '@vxrn/compiler'
 import { resolvePath } from '@vxrn/resolve'
+import type {
+  ExpoManifestRequestHandlerPluginPluginOptions,
+  MetroPluginOptions,
+} from '@vxrn/vite-plugin-metro'
 import events from 'node:events'
 import path from 'node:path'
-import type { Plugin, PluginOption, UserConfig } from 'vite'
+import type { Plugin, PluginOption } from 'vite'
 import { barrel } from 'vite-plugin-barrel'
 import tsconfigPaths from 'vite-tsconfig-paths'
 import { autoDepOptimizePlugin, getOptimizeDeps, getOptionsFilled, loadEnv } from 'vxrn'
 import vxrnVitePlugin from 'vxrn/vite-plugin'
 import { CACHE_KEY } from '../constants'
+import { getViteMetroPluginOptions } from '../metro-config/getViteMetroPluginOptions'
 import '../polyfills-server'
 import { getRouterRootFromOneOptions } from '../utils/getRouterRootFromOneOptions'
 import { ensureTSConfig } from './ensureTsConfig'
@@ -20,11 +25,6 @@ import { SSRCSSPlugin } from './plugins/SSRCSSPlugin'
 import { virtualEntryId } from './plugins/virtualEntryConstants'
 import { createVirtualEntry } from './plugins/virtualEntryPlugin'
 import type { One } from './types'
-import type {
-  ExpoManifestRequestHandlerPluginPluginOptions,
-  MetroPluginOptions,
-} from '@vxrn/vite-plugin-metro'
-import { getViteMetroPluginOptions } from '../metro-config/getViteMetroPluginOptions'
 
 type MetroOptions = MetroPluginOptions
 
@@ -116,8 +116,6 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     }
   }
 
-  clearCompilerCache()
-
   // ensure tsconfig
   if (options.config?.ensureTSConfig !== false) {
     void ensureTSConfig()

package/types/Root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Root.d.ts","sourceRoot":"","sources":["../src/Root.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAQL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AAQd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAKlD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;IAC7C,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAA;CAClB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAA;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC,CAAA;IACpD,wBAAwB,CAAC,EAAE,wBAAwB,GAAG;QACpD,KAAK,CAAC,EAAE;YACN,IAAI,EAAE,OAAO,CAAA;YACb,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAA;gBACf,UAAU,EAAE,MAAM,CAAA;gBAClB,IAAI,EAAE,MAAM,CAAA;gBACZ,IAAI,EAAE,MAAM,CAAA;gBACZ,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;aACrB,CAAA;SACF,CAAA;KACF,CAAA;CACF,CAAA;AAOD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,kDA6FpC"}
+{"version":3,"file":"Root.d.ts","sourceRoot":"","sources":["../src/Root.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAOL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AASd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAKlD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;IAC7C,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAA;CAClB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAA;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC,CAAA;IACpD,wBAAwB,CAAC,EAAE,wBAAwB,GAAG;QACpD,KAAK,CAAC,EAAE;YACN,IAAI,EAAE,OAAO,CAAA;YACb,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAA;gBACf,UAAU,EAAE,MAAM,CAAA;gBAClB,IAAI,EAAE,MAAM,CAAA;gBACZ,IAAI,EAAE,MAAM,CAAA;gBACZ,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;aACrB,CAAA;SACF,CAAA;KACF,CAAA;CACF,CAAA;AAOD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,kDA6FpC"}

package/types/layouts/Drawer.d.ts

@@ -1,6 +1,6 @@
 import { type DrawerNavigationOptions, type DrawerNavigationEventMap } from '@react-navigation/drawer';
 import type { DrawerNavigationState, ParamListBase } from '@react-navigation/native';
-export declare const Drawer: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/drawer").DrawerNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
+export declare const Drawer: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/drawer").DrawerNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
     children: React.ReactNode;
     layout?: ((props: {
         state: DrawerNavigationState<ParamListBase>;
@@ -39,21 +39,17 @@ export declare const Drawer: import("react").ForwardRefExoticComponent<Omit<Omit
         navigation: import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, undefined>;
         theme: ReactNavigation.Theme;
     }) => DrawerNavigationOptions) | undefined;
-    screenLayout?: ((props: {
-        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
-        navigation: import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, undefined>;
-        theme: ReactNavigation.Theme;
-        children: React.ReactElement;
-    }) => React.ReactElement) | undefined;
+    screenLayout?: ((props: import("@react-navigation/core").ScreenLayoutArgs<ParamListBase, string, DrawerNavigationOptions, import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, undefined>>) => React.ReactElement) | undefined;
     UNSTABLE_router?: (<Action extends Readonly<{
         type: string;
         payload?: object;
         source?: string;
         target?: string;
     }>>(original: import("@react-navigation/routers").Router<DrawerNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<DrawerNavigationState<ParamListBase>, Action>>) | undefined;
+    UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & {
     id?: undefined;
-}, "children"> & Partial<Pick<Omit<import("@react-navigation/drawer").DrawerNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
+}, "children"> & Partial<Pick<Omit<import("@react-navigation/drawer").DrawerNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
     children: React.ReactNode;
     layout?: ((props: {
         state: DrawerNavigationState<ParamListBase>;
@@ -92,18 +88,14 @@ export declare const Drawer: import("react").ForwardRefExoticComponent<Omit<Omit
         navigation: import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, undefined>;
         theme: ReactNavigation.Theme;
     }) => DrawerNavigationOptions) | undefined;
-    screenLayout?: ((props: {
-        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
-        navigation: import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, undefined>;
-        theme: ReactNavigation.Theme;
-        children: React.ReactElement;
-    }) => React.ReactElement) | undefined;
+    screenLayout?: ((props: import("@react-navigation/core").ScreenLayoutArgs<ParamListBase, string, DrawerNavigationOptions, import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, undefined>>) => React.ReactElement) | undefined;
     UNSTABLE_router?: (<Action extends Readonly<{
         type: string;
         payload?: object;
         source?: string;
         target?: string;
     }>>(original: import("@react-navigation/routers").Router<DrawerNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<DrawerNavigationState<ParamListBase>, Action>>) | undefined;
+    UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & {
     id?: undefined;
 }, "children">> & import("react").RefAttributes<unknown>> & {

package/types/layouts/Drawer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Drawer.d.ts","sourceRoot":"","sources":["../../src/layouts/Drawer.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAMpF,eAAO,MAAM,MAAM;cAQ2Q,MAAO,SAAS;;;;;kBAAmb,MAAO,SAAS;UAAW,MAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAod,gBAAiB,KAAK;;;;;eAAiO,gBAAiB,KAAK;kBAAmB,MAAO,YAAY;UAAW,MAAO,YAAY;;;;;;;;;;cAAtxC,MAAO,SAAS;;;;;kBAAmb,MAAO,SAAS;UAAW,MAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAod,gBAAiB,KAAK;;;;;eAAiO,gBAAiB,KAAK;kBAAmB,MAAO,YAAY;UAAW,MAAO,YAAY;;;;;;;;;;;CAHliD,CAAA;AAElB,eAAe,MAAM,CAAA"}
+{"version":3,"file":"Drawer.d.ts","sourceRoot":"","sources":["../../src/layouts/Drawer.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAMpF,eAAO,MAAM,MAAM;cAQ2Q,MAAO,SAAS;;;;;kBAAmb,MAAO,SAAS;UAAW,MAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAod,gBAAiB,KAAK;;6NAAsM,MAAO,YAAY;;;;;;;;;;;cAAprC,MAAO,SAAS;;;;;kBAAmb,MAAO,SAAS;UAAW,MAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAod,gBAAiB,KAAK;;6NAAsM,MAAO,YAAY;;;;;;;;;;;;CAHh8C,CAAA;AAElB,eAAe,MAAM,CAAA"}

package/types/layouts/Stack.d.ts

@@ -1,6 +1,6 @@
 import type { ParamListBase, StackNavigationState } from '@react-navigation/native';
 import { type NativeStackNavigationEventMap, type NativeStackNavigationOptions } from '@react-navigation/native-stack';
-export declare const Stack: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/native-stack").NativeStackNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
+export declare const Stack: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/native-stack").NativeStackNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
     children: React.ReactNode;
     layout?: ((props: {
         state: StackNavigationState<ParamListBase>;
@@ -35,21 +35,17 @@ export declare const Stack: import("react").ForwardRefExoticComponent<Omit<Omit<
         navigation: import("@react-navigation/native-stack").NativeStackNavigationProp<ParamListBase, string, undefined>;
         theme: ReactNavigation.Theme;
     }) => NativeStackNavigationOptions) | undefined;
-    screenLayout?: ((props: {
-        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
-        navigation: import("@react-navigation/native-stack").NativeStackNavigationProp<ParamListBase, string, undefined>;
-        theme: ReactNavigation.Theme;
-        children: React.ReactElement;
-    }) => React.ReactElement) | undefined;
+    screenLayout?: ((props: import("@react-navigation/core").ScreenLayoutArgs<ParamListBase, string, NativeStackNavigationOptions, import("@react-navigation/native-stack").NativeStackNavigationProp<ParamListBase, string, undefined>>) => React.ReactElement) | undefined;
     UNSTABLE_router?: (<Action extends Readonly<{
         type: string;
         payload?: object;
         source?: string;
         target?: string;
     }>>(original: import("@react-navigation/routers").Router<StackNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<StackNavigationState<ParamListBase>, Action>>) | undefined;
+    UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & {
     id?: undefined;
-}, "children"> & Partial<Pick<Omit<import("@react-navigation/native-stack").NativeStackNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
+}, "children"> & Partial<Pick<Omit<import("@react-navigation/native-stack").NativeStackNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
     children: React.ReactNode;
     layout?: ((props: {
         state: StackNavigationState<ParamListBase>;
@@ -84,18 +80,14 @@ export declare const Stack: import("react").ForwardRefExoticComponent<Omit<Omit<
         navigation: import("@react-navigation/native-stack").NativeStackNavigationProp<ParamListBase, string, undefined>;
         theme: ReactNavigation.Theme;
     }) => NativeStackNavigationOptions) | undefined;
-    screenLayout?: ((props: {
-        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
-        navigation: import("@react-navigation/native-stack").NativeStackNavigationProp<ParamListBase, string, undefined>;
-        theme: ReactNavigation.Theme;
-        children: React.ReactElement;
-    }) => React.ReactElement) | undefined;
+    screenLayout?: ((props: import("@react-navigation/core").ScreenLayoutArgs<ParamListBase, string, NativeStackNavigationOptions, import("@react-navigation/native-stack").NativeStackNavigationProp<ParamListBase, string, undefined>>) => React.ReactElement) | undefined;
     UNSTABLE_router?: (<Action extends Readonly<{
         type: string;
         payload?: object;
         source?: string;
         target?: string;
     }>>(original: import("@react-navigation/routers").Router<StackNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<StackNavigationState<ParamListBase>, Action>>) | undefined;
+    UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & {
     id?: undefined;
 }, "children">> & import("react").RefAttributes<unknown>> & {

package/types/layouts/Stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Stack.d.ts","sourceRoot":"","sources":["../../src/layouts/Stack.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AACnF,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,4BAA4B,EAElC,MAAM,gCAAgC,CAAA;AAMvC,eAAO,MAAM,KAAK;cAQ6N,MAAO,SAAS;;;;;kBAAmb,MAAO,SAAS;UAAW,MAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;eAAod,gBAAiB,KAAK;;;;;eAAiO,gBAAiB,KAAK;kBAAmB,MAAO,YAAY;UAAW,MAAO,YAAY;;;;;;;;;;cAAtxC,MAAO,SAAS;;;;;kBAAmb,MAAO,SAAS;UAAW,MAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;eAAod,gBAAiB,KAAK;;;;;eAAiO,gBAAiB,KAAK;kBAAmB,MAAO,YAAY;UAAW,MAAO,YAAY;;;;;;;;;;;CAH9+C,CAAA;AAEvB,eAAe,KAAK,CAAA"}
+{"version":3,"file":"Stack.d.ts","sourceRoot":"","sources":["../../src/layouts/Stack.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AACnF,OAAO,EACL,KAAK,6BAA6B,EAClC,KAAK,4BAA4B,EAElC,MAAM,gCAAgC,CAAA;AAMvC,eAAO,MAAM,KAAK;cAQ6N,MAAO,SAAS;;;;;kBAAmb,MAAO,SAAS;UAAW,MAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;eAAod,gBAAiB,KAAK;;6OAAsM,MAAO,YAAY;;;;;;;;;;;cAAprC,MAAO,SAAS;;;;;kBAAmb,MAAO,SAAS;UAAW,MAAO,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;eAAod,gBAAiB,KAAK;;6OAAsM,MAAO,YAAY;;;;;;;;;;;;CAH54C,CAAA;AAEvB,eAAe,KAAK,CAAA"}

package/types/layouts/Tabs.d.ts

@@ -1,6 +1,6 @@
 import { type BottomTabNavigationEventMap, type BottomTabNavigationOptions } from '@react-navigation/bottom-tabs';
 import type { ParamListBase, TabNavigationState } from '@react-navigation/native';
-export declare const Tabs: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
+export declare const Tabs: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
     children: React.ReactNode;
     layout?: ((props: {
         state: TabNavigationState<ParamListBase>;
@@ -35,21 +35,17 @@ export declare const Tabs: import("react").ForwardRefExoticComponent<Omit<Omit<i
         navigation: import("@react-navigation/bottom-tabs").BottomTabNavigationProp<ParamListBase, string, undefined>;
         theme: ReactNavigation.Theme;
     }) => BottomTabNavigationOptions) | undefined;
-    screenLayout?: ((props: {
-        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
-        navigation: import("@react-navigation/bottom-tabs").BottomTabNavigationProp<ParamListBase, string, undefined>;
-        theme: ReactNavigation.Theme;
-        children: React.ReactElement;
-    }) => React.ReactElement) | undefined;
+    screenLayout?: ((props: import("@react-navigation/core").ScreenLayoutArgs<ParamListBase, string, BottomTabNavigationOptions, import("@react-navigation/bottom-tabs").BottomTabNavigationProp<ParamListBase, string, undefined>>) => React.ReactElement) | undefined;
     UNSTABLE_router?: (<Action extends Readonly<{
         type: string;
         payload?: object;
         source?: string;
         target?: string;
     }>>(original: import("@react-navigation/routers").Router<TabNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<TabNavigationState<ParamListBase>, Action>>) | undefined;
+    UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & {
     id?: undefined;
-}, "children"> & Partial<Pick<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
+}, "children"> & Partial<Pick<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
     children: React.ReactNode;
     layout?: ((props: {
         state: TabNavigationState<ParamListBase>;
@@ -84,18 +80,14 @@ export declare const Tabs: import("react").ForwardRefExoticComponent<Omit<Omit<i
         navigation: import("@react-navigation/bottom-tabs").BottomTabNavigationProp<ParamListBase, string, undefined>;
         theme: ReactNavigation.Theme;
     }) => BottomTabNavigationOptions) | undefined;
-    screenLayout?: ((props: {
-        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
-        navigation: import("@react-navigation/bottom-tabs").BottomTabNavigationProp<ParamListBase, string, undefined>;
-        theme: ReactNavigation.Theme;
-        children: React.ReactElement;
-    }) => React.ReactElement) | undefined;
+    screenLayout?: ((props: import("@react-navigation/core").ScreenLayoutArgs<ParamListBase, string, BottomTabNavigationOptions, import("@react-navigation/bottom-tabs").BottomTabNavigationProp<ParamListBase, string, undefined>>) => React.ReactElement) | undefined;
     UNSTABLE_router?: (<Action extends Readonly<{
         type: string;
         payload?: object;
         source?: string;
         target?: string;
     }>>(original: import("@react-navigation/routers").Router<TabNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<TabNavigationState<ParamListBase>, Action>>) | undefined;
+    UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & {
     id?: undefined;
 }, "children">> & import("react").RefAttributes<unknown>> & {

package/types/layouts/Tabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tabs.d.ts","sourceRoot":"","sources":["../../src/layouts/Tabs.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAGhC,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAoCjF,eAAO,MAAM,IAAI;cAtBM,MAAM,SAAS;;;;;kBAmBV,MAG3B,SAAS;UAAW,MAAO,YAC3B;;;;;;;;;;;;;;;;;;;;;;;;;;eAYsC,gBAAiB,KAAK;;;;;eAU/C,gBAAG,KAAK;kBACN,MAAC,YAAY;UAAW,MAAO,YAAY;;;;;;;;;;cA9CpC,MAAM,SAAS;;;;;kBAmBV,MAG3B,SAAS;UAAW,MAAO,YAC3B;;;;;;;;;;;;;;;;;;;;;;;;;;eAYsC,gBAAiB,KAAK;;;;;eAU/C,gBAAG,KAAK;kBACN,MAAC,YAAY;UAAW,MAAO,YAAY;;;;;;;;;;;CAmB1D,CAAA;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"Tabs.d.ts","sourceRoot":"","sources":["../../src/layouts/Tabs.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAGhC,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAoCjF,eAAO,MAAM,IAAI;cAtBM,MAAM,SAAS;;;;;kBAmBV,MAG3B,SAAS;UAAW,MAAO,YAC3B;;;;;;;;;;;;;;;;;;;;;;;;;;eAYsC,gBAAiB,KAAK;;wOAQ5C,MAAO,YAChB;;;;;;;;;;;cA5Ce,MAAM,SAAS;;;;;kBAmBV,MAG3B,SAAS;UAAW,MAAO,YAC3B;;;;;;;;;;;;;;;;;;;;;;;;;;eAYsC,gBAAiB,KAAK;;wOAQ5C,MAAO,YAChB;;;;;;;;;;;;CAqBP,CAAA;AAED,eAAe,IAAI,CAAA"}

package/types/router/getRouteInfo.d.ts

@@ -0,0 +1,4 @@
+import type { OneRouter } from '../interfaces/router';
+import { type UrlObject } from './getNormalizedStatePath';
+export declare function getRouteInfo(state: OneRouter.ResultState): UrlObject;
+//# sourceMappingURL=getRouteInfo.d.ts.map

package/types/router/getRouteInfo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getRouteInfo.d.ts","sourceRoot":"","sources":["../../src/router/getRouteInfo.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAIjF,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,WAAW,aAYxD"}

package/types/router/isIndexPath.d.ts

@@ -0,0 +1,3 @@
+import type { State } from '../fork/getPathFromState';
+export declare function isIndexPath(state: State): boolean;
+//# sourceMappingURL=isIndexPath.d.ts.map

package/types/router/isIndexPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isIndexPath.d.ts","sourceRoot":"","sources":["../../src/router/isIndexPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAA;AAIrD,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,WAoBvC"}

package/types/router/linkingConfig.d.ts

@@ -0,0 +1,8 @@
+import type { OneRouter } from '../interfaces/router';
+import { type OneLinkingOptions } from './getLinkingConfig';
+import type { RouteNode } from './Route';
+export declare function getLinking(): OneLinkingOptions | undefined;
+export declare function setLinking(_: OneLinkingOptions): void;
+export declare function resetLinking(): void;
+export declare function setupLinking(routeNode: RouteNode | null, initialLocation?: URL): OneRouter.ResultState | undefined;
+//# sourceMappingURL=linkingConfig.d.ts.map

package/types/router/linkingConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"linkingConfig.d.ts","sourceRoot":"","sources":["../../src/router/linkingConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAA2C,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAIxC,wBAAgB,UAAU,kCAEzB;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,iBAAiB,QAE9C;AAED,wBAAgB,YAAY,SAE3B;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,eAAe,CAAC,EAAE,GAAG,GACpB,SAAS,CAAC,WAAW,GAAG,SAAS,CAgBnC"}

package/types/router/router.d.ts

@@ -1,13 +1,16 @@
+/**
+ * Note: this entire module is exported as an interface router.*
+ * We need to treat exports as an API and not change them, maybe not
+ * the best decision.
+ */
 import { type NavigationContainerRefWithCurrent } from '@react-navigation/native';
 import { type ComponentType } from 'react';
 import type { OneRouter } from '../interfaces/router';
 import type { One } from '../vite/types';
-import { type OneLinkingOptions } from './getLinkingConfig';
-import { type UrlObject } from './getNormalizedStatePath';
+import type { UrlObject } from './getNormalizedStatePath';
 import type { RouteNode } from './Route';
 export declare let routeNode: RouteNode | null;
 export declare let rootComponent: ComponentType;
-export declare let linking: OneLinkingOptions | undefined;
 export declare let hasAttemptedToHideSplash: boolean;
 export declare let initialState: OneRouter.ResultState | undefined;
 export declare let rootState: OneRouter.ResultState | undefined;
@@ -25,7 +28,6 @@ export declare function canGoBack(): boolean;
 export declare function canDismiss(): boolean;
 export declare function getSortedRoutes(): RouteNode[];
 export declare function updateState(state: OneRouter.ResultState, nextStateParam?: OneRouter.ResultState): void;
-export declare function getRouteInfo(state: OneRouter.ResultState): UrlObject;
 export declare function subscribeToRootState(subscriber: OneRouter.RootStateListener): () => void;
 export declare function subscribeToStore(subscriber: () => void): () => void;
 export declare function subscribeToLoadingState(subscriber: OneRouter.LoadingStateListener): () => void;
@@ -34,7 +36,7 @@ export declare function snapshot(): {
     linkTo: typeof linkTo;
     routeNode: RouteNode | null;
     rootComponent: ComponentType;
-    linking: OneLinkingOptions | undefined;
+    linking: import("./getLinkingConfig").OneLinkingOptions | undefined;
     hasAttemptedToHideSplash: boolean;
     initialState: OneRouter.ResultState | undefined;
     rootState: OneRouter.ResultState | undefined;
@@ -52,7 +54,7 @@ export declare function useOneRouter(): {
     linkTo: typeof linkTo;
     routeNode: RouteNode | null;
     rootComponent: ComponentType;
-    linking: OneLinkingOptions | undefined;
+    linking: import("./getLinkingConfig").OneLinkingOptions | undefined;
     hasAttemptedToHideSplash: boolean;
     initialState: OneRouter.ResultState | undefined;
     rootState: OneRouter.ResultState | undefined;