one 1.1.546 → 1.1.547-1762235181981

package/src/head/url.tsx

@@ -63,7 +63,7 @@ function throwOrAlert(msg: string) {
   console.warn(`TODO FIX: ${msg}`)
   // // Production apps fatally crash which is often not helpful.
   // if (
-  //   // @ts-ignore: process is defined
+  //   // @ts-expect-error: process is defined
   //   process.env.NODE_ENV === 'production'
   // ) {
   //   console.error(msg)

package/src/hooks.tsx

@@ -1,9 +1,9 @@
-import React, { createContext, useContext, type ReactNode } from 'react'
+import React, { createContext, type ReactNode, useContext } from 'react'
 import type { OneRouter } from './interfaces/router'
 import { router } from './router/imperative-api'
 import { RouteParamsContext, useRouteNode } from './router/Route'
-import { navigationRef, useStoreRootState, useStoreRouteInfo } from './router/router'
 import { RouteInfoContext } from './router/RouteInfoContext'
+import { navigationRef, useStoreRootState, useStoreRouteInfo } from './router/router'
 
 type SearchParams = OneRouter.SearchParams
 
@@ -55,11 +55,7 @@ export function Frozen({ on = false, children }: { on?: boolean; children: React
   return (
     <FrozeContext.Provider value={on}>
       {/* <Freeze freeze={on}> */}
-      <div
-        // @ts-ignore
-        inert
-        style={{ display: 'contents' }}
-      >
+      <div {...(on && { inert: true })} style={{ display: 'contents' }}>
         {children}
       </div>
       {/* </Freeze> */}

package/src/index.ts

@@ -1,75 +1,66 @@
 export { createApp } from './createApp'
 
-export type { OneRouter, One } from './interfaces/router'
+export type { One, OneRouter } from './interfaces/router'
+
 import type { OneRouter } from './interfaces/router'
 
 export type Href = OneRouter.Href
 export type LinkProps<T extends string | object = string> = OneRouter.LinkProps<T>
 
-export type { Endpoint, LoaderProps } from './types'
-
-// base
-export { router } from './router/imperative-api'
-export { createRoute, route } from './router/createRoute'
-export { onClientLoaderResolve } from './clientLoaderResolver'
-
-// middleware
-export { createMiddleware, type Middleware } from './createMiddleware'
-
-// internals
-export { render } from './render'
-export { Root } from './Root'
-export * as routerStore from './router/router'
-
-// components
-export { Stack } from './layouts/Stack'
-export { Tabs } from './layouts/Tabs'
+// hooks
+export { useIsFocused } from '@react-navigation/core'
+// re-export
+export * from '@vxrn/universal-color-scheme'
 // TODO breaking due to react-native-gesture-handler
 // export { Drawer } from './layouts/Drawer'
 // export { Unmatched } from './fallbackViews/Unmatched'
 export { SafeAreaView } from 'react-native-safe-area-context'
-export { Navigator, Slot } from './views/Navigator'
-export { ErrorBoundary } from './views/ErrorBoundary'
-export { ScrollBehavior } from './views/ScrollBehavior'
-export { LoadProgressBar } from './views/LoadProgressBar'
-export { Link } from './link/Link'
-export { Redirect } from './link/Redirect'
-export { Head } from './head'
+export { onClientLoaderResolve } from './clientLoaderResolver'
 
-// hooks
-export { useIsFocused } from '@react-navigation/core'
-export { useLinkTo } from './link/useLinkTo'
-export { useServerHeadInsertion, type ServerHeadInsertionCallback } from './useServerHeadInsertion'
+// middleware
+export { createMiddleware, type Middleware } from './createMiddleware'
+export { getURL } from './getURL'
+export { Head } from './head'
+// for easier expo-router migration
 export {
-  useRouter,
-  useUnstableGlobalHref,
-  usePathname,
+  useActiveParams,
+  useGlobalSearchParams,
+  useLocalSearchParams,
   useNavigationContainerRef,
   useParams,
-  useActiveParams,
-  useSegments,
+  usePathname,
   useRootNavigationState,
+  useRouter,
+  useSegments,
+  useUnstableGlobalHref,
 } from './hooks'
-// for easier expo-router migration
-export {
-  useLocalSearchParams,
-  useGlobalSearchParams,
-} from './hooks'
-
+export { href } from './href'
+// components
+export { Stack } from './layouts/Stack'
+export { Tabs } from './layouts/Tabs'
 // utilities
 export { withLayoutContext } from './layouts/withLayoutContext'
-export { isResponse } from './utils/isResponse'
-export { getURL } from './getURL'
-export { redirect } from './utils/redirect'
-export { href } from './href'
-
-// server
-export { setResponseHeaders, getServerData, setServerData } from './vite/one-server-only'
-
-// re-export
-export * from '@vxrn/universal-color-scheme'
-
+export { Link } from './link/Link'
+export { Redirect } from './link/Redirect'
+export { useLinkTo } from './link/useLinkTo'
+export { Root } from './Root'
+// internals
+export { render } from './render'
+export { createRoute, route } from './router/createRoute'
+// base
+export { router } from './router/imperative-api'
+export * as routerStore from './router/router'
+export { useNavigation } from './router/useNavigation'
+export type { Endpoint, LoaderProps } from './types'
 // React Navigation
 export { useFocusEffect } from './useFocusEffect'
-export { useNavigation } from './router/useNavigation'
 export { useLoader } from './useLoader'
+export { type ServerHeadInsertionCallback, useServerHeadInsertion } from './useServerHeadInsertion'
+export { isResponse } from './utils/isResponse'
+export { redirect } from './utils/redirect'
+export { ErrorBoundary } from './views/ErrorBoundary'
+export { LoadProgressBar } from './views/LoadProgressBar'
+export { Navigator, Slot } from './views/Navigator'
+export { ScrollBehavior } from './views/ScrollBehavior'
+// server
+export { getServerData, setResponseHeaders, setServerData } from './vite/one-server-only'

package/src/interfaces/router.ts

@@ -3,8 +3,8 @@ import type {
   NavigationState,
   PartialState,
 } from '@react-navigation/core'
-import type { ReactNode } from 'react'
-import type { TextProps, GestureResponderEvent, PressableProps } from 'react-native'
+import type { JSX, ReactNode } from 'react'
+import type { GestureResponderEvent, PressableProps, TextProps } from 'react-native'
 
 export namespace OneRouter {
   export interface __routes<T extends string = string> extends Record<string, unknown> {}

package/src/layouts/Drawer.tsx

@@ -1,7 +1,7 @@
 import {
   createDrawerNavigator,
-  type DrawerNavigationOptions,
   type DrawerNavigationEventMap,
+  type DrawerNavigationOptions,
 } from '@react-navigation/drawer'
 import type { DrawerNavigationState, ParamListBase } from '@react-navigation/native'
 

package/src/layouts/Stack.tsx

@@ -1,8 +1,8 @@
 import type { ParamListBase, StackNavigationState } from '@react-navigation/native'
 import {
+  createNativeStackNavigator,
   type NativeStackNavigationEventMap,
   type NativeStackNavigationOptions,
-  createNativeStackNavigator,
 } from '@react-navigation/native-stack'
 
 import { withLayoutContext } from './withLayoutContext'

package/src/layouts/Tabs.tsx

@@ -1,9 +1,9 @@
 import {
-  createBottomTabNavigator,
-  type BottomTabNavigationEventMap,
-  type BottomTabNavigationOptions,
   BottomTabBar,
   type BottomTabBarProps,
+  type BottomTabNavigationEventMap,
+  type BottomTabNavigationOptions,
+  createBottomTabNavigator,
 } from '@react-navigation/bottom-tabs'
 import type { ParamListBase, TabNavigationState } from '@react-navigation/native'
 import { Platform, Pressable } from 'react-native'
@@ -68,11 +68,11 @@ 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'}
-                  // biome-ignore lint/correctness/noChildrenProp: <explanation>
+                  // biome-ignore lint/correctness/noChildrenProp: children prop needed for asChild pattern
                   children={children}
                 />
               )

package/src/layouts/withLayoutContext.tsx

@@ -1,10 +1,10 @@
 import type { EventMapBase, NavigationState } from '@react-navigation/native'
 import React from 'react'
 import { useContextKey } from '../router/Route'
+import { type ScreenProps, useSortedScreens } from '../router/useScreens'
 import type { PickPartial } from '../types'
-import { useSortedScreens, type ScreenProps } from '../router/useScreens'
-import { Screen } from '../views/Screen'
 import { withStaticProperties } from '../utils/withStaticProperties'
+import { Screen } from '../views/Screen'
 
 export function useFilterScreenChildren(
   children: React.ReactNode,
@@ -22,19 +22,28 @@ export function useFilterScreenChildren(
 
     const screens = React.Children.map(children, (child) => {
       if (React.isValidElement(child) && child && child.type === Screen) {
-        if (!child.props.name) {
+        if (
+          typeof child.props === 'object' &&
+          child.props &&
+          'name' in child.props &&
+          !child.props.name
+        ) {
           throw new Error(
             `<Screen /> component in \`default export\` at \`app${contextKey}/_layout\` must have a \`name\` prop when used as a child of a Layout Route.`
           )
         }
         if (process.env.NODE_ENV !== 'production') {
-          if (['children', 'component', 'getComponent'].some((key) => key in child.props)) {
+          if (
+            ['children', 'component', 'getComponent'].some(
+              (key) => child.props && typeof child.props === 'object' && key in child.props
+            )
+          ) {
             throw new Error(
               `<Screen /> component in \`default export\` at \`app${contextKey}/_layout\` must not have a \`children\`, \`component\`, or \`getComponent\` prop when used as a child of a Layout Route`
             )
           }
         }
-        return child.props
+        return child.props as ScreenProps
       }
 
       if (isCustomNavigator) {
@@ -44,6 +53,8 @@ export function useFilterScreenChildren(
           `Layout children must be of type Screen, all other children are ignored. To use custom children, create a custom <Layout />. Update Layout Route at: "app${contextKey}/_layout"`
         )
       }
+
+      return null
     })?.filter(Boolean)
 
     // Add an assertion for development
@@ -83,8 +94,8 @@ export function withLayoutContext<
         contextKey,
       })
 
-      const processed = processor ? processor(screens ?? []) : screens
-      const sorted = useSortedScreens(processed ?? [], {
+      const processed = processor ? processor(screens ?? ([] as any)) : screens
+      const sorted = useSortedScreens((processed ?? []) as any, {
         onlyMatching: true,
       })
 

package/src/link/Link.tsx

@@ -2,7 +2,7 @@
 // `to` / `action` support removed.
 import { Slot } from '@radix-ui/react-slot'
 import * as React from 'react'
-import { Platform, Text, type GestureResponderEvent, type TextProps } from 'react-native'
+import { type GestureResponderEvent, Platform, Text, type TextProps } from 'react-native'
 
 import type { OneRouter } from '../interfaces/router'
 import { resolveHref } from './href'

package/src/link/linking.ts

@@ -5,7 +5,7 @@ import { adjustPathname } from '../fork/extractPathFromURL'
 import { getPathFromState } from '../fork/getPathFromState'
 import { getStateFromPath } from '../fork/getStateFromPath'
 
-// @ts-ignore
+// @ts-expect-error
 const isExpoGo = typeof expo !== 'undefined' && globalThis.expo?.modules?.ExpoGo
 
 // A custom getInitialURL is used on native to ensure the app always starts at

package/src/link/useLinkTo.tsx

@@ -1,9 +1,9 @@
 import type * as React from 'react'
-import { Platform, type GestureResponderEvent } from 'react-native'
+import { type GestureResponderEvent, Platform } from 'react-native'
 
 import { appendBaseUrl } from '../fork/getPathFromState-mods'
-import { useOneRouter } from '../router/router'
 import { stripGroupSegmentsFromPath } from '../router/matchers'
+import { useOneRouter } from '../router/router'
 
 function eventShouldPreventDefault(
   e: React.MouseEvent<HTMLAnchorElement, MouseEvent> | GestureResponderEvent

package/src/link/useLoadedNavigation.ts

@@ -1,4 +1,4 @@
-import { useNavigation, type NavigationProp, type NavigationState } from '@react-navigation/native'
+import { type NavigationProp, type NavigationState, useNavigation } from '@react-navigation/native'
 import { useCallback, useEffect, useRef, useState } from 'react'
 
 import { useOneRouter } from '../router/router'

package/src/metro-config/getViteMetroPluginOptions.ts

@@ -1,8 +1,8 @@
-import type { metroPlugin } from '@vxrn/vite-plugin-metro'
 import module from 'node:module'
 import path from 'node:path'
-import tsconfigPaths from 'tsconfig-paths'
+import type { metroPlugin } from '@vxrn/vite-plugin-metro'
 import mm from 'micromatch'
+import tsconfigPaths from 'tsconfig-paths'
 import {
   API_ROUTE_GLOB_PATTERN,
   ROUTE_NATIVE_EXCLUSION_GLOB_PATTERNS,
@@ -44,6 +44,7 @@ export function getViteMetroPluginOptions({
     ]
 
     const supportedRegexMustStartWith = String.raw`^(?:(?:^|\/|(?:(?:(?!(?:^|\/)\.).)*?)\/)(?!\.)(?=.)[^/]*?`
+    // biome-ignore lint/complexity/noUselessStringRaw: keep original code
     const supportedRegexMustEndWith = String.raw`)$`
 
     const negativeLookaheadGroups = excludeRes.map((re, i) => {
@@ -77,6 +78,7 @@ export function getViteMetroPluginOptions({
         reSource.length - supportedRegexMustEndWith.length
       )
 
+      // biome-ignore lint/complexity/noUselessStringRaw: keep original code
       return String.raw`(?:.*${rePart})`
     })
 

package/src/polyfills-mobile.ts

@@ -6,6 +6,7 @@ globalThis['global'] = globalThis
 // --------------- structuredClone -------------------
 
 import structuredClone from '@ungap/structured-clone'
+
 globalThis['structuredClone'] ||= structuredClone
 
 // --------------- structuredClone -------------------
@@ -31,6 +32,5 @@ import 'core-js/actual/url-search-params'
 // --------------- Promise.withResolver -------------------
 
 import { promiseWithResolvers } from './utils/promiseWithResolvers'
-Promise.withResolvers ||
-  // @ts-ignore
-  (Promise.withResolvers = promiseWithResolvers)
+
+Promise.withResolvers || (Promise.withResolvers = promiseWithResolvers)

package/src/render.tsx

@@ -31,7 +31,6 @@ export function render(element: React.ReactNode) {
             console.error(...args)
             console.groupEnd()
           },
-          // @ts-expect-error
           onUncaughtError(...args) {
             console.error(`[one] onUncaughtError`, ...args)
           },
@@ -43,7 +42,9 @@ export function render(element: React.ReactNode) {
     })
   }
 
-  listeners.forEach((cb) => cb())
+  listeners.forEach((cb) => {
+    cb()
+  })
   didRender = true
 }
 

package/src/router/Route.tsx

@@ -1,4 +1,4 @@
-import React, { createContext, useContext, type ReactNode } from 'react'
+import React, { createContext, type ReactNode, useContext } from 'react'
 import type { ErrorBoundaryProps } from '../views/Try'
 import type { One } from '../vite/types'
 import { getContextKey } from './matchers'

package/src/router/RouteInfoContext.tsx

@@ -1,8 +1,8 @@
+import { useStateForPath } from '@react-navigation/core'
 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)
 
@@ -44,7 +44,7 @@ export function RouteInfoContextProvider({ children }: { children: React.ReactNo
   const lastStateRef = useRef<typeof currentState>(undefined)
   const cachedRouteInfoValueRef = useRef<UrlObject | undefined>(undefined)
 
-  const lazilyCalculatedRouteInfo = useRef<UrlObject | undefined>()
+  const lazilyCalculatedRouteInfo = useRef<UrlObject | undefined>(undefined)
 
   if (currentState && currentStateRef.current !== currentState) {
     lazilyCalculatedRouteInfo.current = makeLazilyCalculatedRouteInfo({

package/src/router/filterRootHTML.ts

@@ -21,7 +21,7 @@ export type FoundRootHTML = {
 
 export function filterRootHTML(el: React.ReactNode): FoundRootHTML {
   let htmlProps: Props | undefined
-  let bodyProps: React.ReactElement | undefined
+  let bodyProps: Props | undefined
   let head: React.ReactElement | undefined
 
   function traverse(element: React.ReactNode) {
@@ -36,9 +36,16 @@ export function filterRootHTML(el: React.ReactNode): FoundRootHTML {
     const { type, props } = reactElement
 
     if (type === 'html') {
-      const { children, ...restProps } = reactElement.props
-      htmlProps = restProps
-      return traverse(children)
+      if (
+        reactElement.props &&
+        typeof reactElement.props === 'object' &&
+        'children' in reactElement.props
+      ) {
+        const { children, ...restProps } = reactElement.props
+        htmlProps = restProps
+        return traverse(children as React.ReactNode)
+      }
+      return null
     }
 
     if (type === 'head') {
@@ -47,9 +54,16 @@ export function filterRootHTML(el: React.ReactNode): FoundRootHTML {
     }
 
     if (type === 'body') {
-      const { children, ...restProps } = reactElement.props
-      bodyProps = restProps
-      return children
+      if (
+        reactElement.props &&
+        typeof reactElement.props === 'object' &&
+        'children' in reactElement.props
+      ) {
+        const { children, ...restProps } = reactElement.props
+        bodyProps = restProps
+        return children as React.ReactNode
+      }
+      return null
     }
 
     if (process.env.TAMAGUI_TARGET === 'native') {

package/src/router/getLinkingConfig.ts

@@ -1,5 +1,4 @@
 import { getActionFromState, type LinkingOptions } from '@react-navigation/native'
-import type { RouteNode } from './Route'
 import type { State } from '../fork/getPathFromState'
 import { getReactNavigationConfig, type Screen } from '../getReactNavigationConfig'
 import {
@@ -8,6 +7,7 @@ import {
   getPathFromState,
   getStateFromPath,
 } from '../link/linking'
+import type { RouteNode } from './Route'
 
 export function getNavigationConfig(
   routes: RouteNode,

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/imperative-api.ts

@@ -1,5 +1,5 @@
-import * as store from './router'
 import type { OneRouter } from '../interfaces/router'
+import * as store from './router'
 
 export const router: OneRouter.Router = {
   navigate: store.navigate,

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/matchers.test.ts

@@ -1,11 +1,11 @@
-import { describe, it, expect } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import {
-  matchDynamicName,
-  matchDeepDynamicRouteName,
   getNameFromFilePath,
+  matchArrayGroupName,
+  matchDeepDynamicRouteName,
+  matchDynamicName,
   matchGroupName,
   stripGroupSegmentsFromPath,
-  matchArrayGroupName,
 } from './matchers'
 
 describe(stripGroupSegmentsFromPath, () => {

package/src/router/matchers.ts

@@ -2,7 +2,7 @@
 export function matchDynamicName(name: string): string | undefined {
   // Don't match `...` or `[` or `]` inside the brackets
   // eslint-disable-next-line no-useless-escape
-  return name.match(/^\[([^[\](?:\.\.\.)]+?)\]$/)?.[1]
+  return name.match(/^\[([^[\](?:...)]+?)\]$/)?.[1]
 }
 
 /** Match `[...page]` -> `page` */
@@ -22,7 +22,7 @@ export function matchGroupName(name: string): string | undefined {
 
 /** Match the first array group name `(a,b,c)/(d,c)` -> `'a,b,c'` */
 export function matchArrayGroupName(name: string) {
-  return name.match(/(?:[^\\(\\)])*?\(?([^\\/\(\)]+,[^\\/\(\)]+)\)?.*?$/)?.[1]
+  return name.match(/(?:[^\\(\\)])*?\(?([^\\/()]+,[^\\/()]+)\)?.*?$/)?.[1]
 }
 
 export function getNameFromFilePath(name: string): string {