one 1.2.19 → 1.2.21

package/src/fork/useLinking.ts

@@ -22,6 +22,7 @@ import isEqual from 'fast-deep-equal'
 import * as React from 'react'
 // @modified - start
 // import { ServerContext } from '@react-navigation/web';
+import { rootState as routerRootState } from '../router/router'
 import { ServerLocationContext } from '../router/serverLocationContext'
 import { createMemoryHistory } from './createMemoryHistory'
 import { appendBaseUrl } from './getPathFromState-mods'
@@ -158,7 +159,7 @@ export function useLinking(
       const rootState = navigation?.getRootState()
       // Make sure that the routes in the state exist in the root navigator
       // Otherwise there's an error in the linking configuration
-      return state?.routes.some((r) => !rootState?.routeNames.includes(r.name))
+      return state?.routes.some((r) => !rootState?.routeNames?.includes(r.name))
     },
     [ref]
   )
@@ -180,8 +181,15 @@ export function useLinking(
 
       const path = location ? location.pathname + location.search : undefined
 
+      if (process.env.ONE_DEBUG_ROUTER) {
+        console.info(`[one] 🔍 getInitialState path=${path}`)
+      }
+
       if (path) {
         value = getStateFromPathRef.current(path, configRef.current)
+        if (process.env.ONE_DEBUG_ROUTER) {
+          console.info(`[one] 🔍 getInitialState result:`, JSON.stringify(value, null, 2))
+        }
       }
 
       // If the link were handled, it gets cleared in NavigationContainer
@@ -223,6 +231,12 @@ export function useLinking(
 
       const previousIndex = previousIndexRef.current ?? 0
 
+      if (process.env.ONE_DEBUG_ROUTER) {
+        console.info(
+          `[one] 📜 history.listen path=${path} index=${index} prevIndex=${previousIndex}`
+        )
+      }
+
       previousIndexRef.current = index
       pendingPopStatePathRef.current = path
 
@@ -232,12 +246,19 @@ export function useLinking(
       const record = history.get(index)
 
       if (record?.path === path && record?.state) {
+        if (process.env.ONE_DEBUG_ROUTER) {
+          console.info(`[one] 📜 history record found, resetRoot to:`, record.state)
+        }
         navigation.resetRoot(record.state)
         return
       }
 
       const state = getStateFromPathRef.current(path, configRef.current)
 
+      if (process.env.ONE_DEBUG_ROUTER) {
+        console.info(`[one] 📜 getStateFromPath result:`, state)
+      }
+
       // We should only dispatch an action when going forward
       // Otherwise the action will likely add items to history, which would mess things up
       if (state) {
@@ -246,6 +267,9 @@ export function useLinking(
         // Make sure that the routes in the state exist in the root navigator
         // Otherwise there's an error in the linking configuration
         if (validateRoutesNotExistInRootState(state)) {
+          if (process.env.ONE_DEBUG_ROUTER) {
+            console.info(`[one] 📜 routes not in root state, skipping`)
+          }
           return
         }
 
@@ -256,6 +280,10 @@ export function useLinking(
         ) {
           const action = getActionFromStateRef.current(state, configRef.current)
 
+          if (process.env.ONE_DEBUG_ROUTER) {
+            console.info(`[one] 📜 dispatching action:`, action)
+          }
+
           if (action !== undefined) {
             try {
               navigation.dispatch(action)
@@ -269,13 +297,22 @@ export function useLinking(
               )
             }
           } else {
+            if (process.env.ONE_DEBUG_ROUTER) {
+              console.info(`[one] 📜 no action, resetRoot`)
+            }
             navigation.resetRoot(state)
           }
         } else {
+          if (process.env.ONE_DEBUG_ROUTER) {
+            console.info(`[one] 📜 going back, resetRoot`)
+          }
           navigation.resetRoot(state)
         }
       } else {
         // if current path didn't return any state, we should revert to initial state
+        if (process.env.ONE_DEBUG_ROUTER) {
+          console.info(`[one] 📜 no state for path, resetRoot to undefined`)
+        }
         navigation.resetRoot(state)
       }
     })
@@ -292,6 +329,11 @@ export function useLinking(
     ): string => {
       let path
 
+      if (process.env.ONE_DEBUG_ROUTER) {
+        console.info(`[one] 📜 getPathForRoute - route:`, route)
+        console.info(`[one] 📜 getPathForRoute - state:`, JSON.stringify(state, null, 2))
+      }
+
       // If the `route` object contains a `path`, use that path as long as `route.name` and `params` still match
       // This makes sure that we preserve the original URL for wildcard routes
       if (route?.path) {
@@ -315,6 +357,9 @@ export function useLinking(
 
       if (path == null) {
         path = getPathFromStateRef.current(state, configRef.current)
+        if (process.env.ONE_DEBUG_ROUTER) {
+          console.info(`[one] 📜 getPathForRoute - computed from state:`, path)
+        }
       }
 
       // @modified - start: One will handle hashes itself, so these lines are not needed
@@ -340,14 +385,41 @@ export function useLinking(
     if (ref.current) {
       // We need to record the current metadata on the first render if they aren't set
       // This will allow the initial state to be in the history entry
-      const state = ref.current.getRootState()
+      // @modified - start: Use routerRootState instead of getRootState() to avoid stale state
+      // getRootState() can return incomplete state during initial render before children mount
+      // routerRootState is updated via navigation listener callbacks which only fire with complete state
+      const refState = ref.current.getRootState()
+      const state = (routerRootState || refState) as NavigationState | undefined
+
+      if (process.env.ONE_DEBUG_ROUTER) {
+        console.info(
+          `[one] 📜 useEffect initial state check - refState:`,
+          JSON.stringify(refState, null, 2)
+        )
+        console.info(
+          `[one] 📜 useEffect initial state check - routerRootState:`,
+          JSON.stringify(routerRootState, null, 2)
+        )
+      }
+      // @modified - end
 
       if (state) {
         const route = findFocusedRoute(state)
+
+        if (process.env.ONE_DEBUG_ROUTER) {
+          console.info(`[one] 📜 useEffect focused route:`, route)
+        }
+
         const path = getPathForRoute(route, state)
 
+        if (process.env.ONE_DEBUG_ROUTER) {
+          console.info(`[one] 📜 initial history.replace - state:`, JSON.stringify(state, null, 2))
+          console.info(`[one] 📜 initial history.replace - focusedRoute:`, route)
+          console.info(`[one] 📜 initial history.replace - computed path:`, path)
+        }
+
         if (previousStateRef.current === undefined) {
-          previousStateRef.current = state
+          previousStateRef.current = refState
         }
 
         history.replace({ path, state })
@@ -362,7 +434,10 @@ export function useLinking(
       }
 
       const previousState = previousStateRef.current
-      const state = navigation.getRootState()
+      // @modified - start: Use routerRootState for path calculation, refState for comparison
+      const refState = navigation.getRootState()
+      const state = (routerRootState || refState) as NavigationState | undefined
+      // @modified - end
 
       // root state may not available, for example when root navigators switch inside the container
       if (!state) {
@@ -373,7 +448,7 @@ export function useLinking(
       const route = findFocusedRoute(state)
       const path = getPathForRoute(route, state)
 
-      previousStateRef.current = state
+      previousStateRef.current = refState
       pendingPopStatePathRef.current = undefined
 
       // To detect the kind of state change, we need to:

package/src/getReactNavigationConfig.ts

@@ -1,4 +1,4 @@
-import { matchDeepDynamicRouteName, matchDynamicName } from './router/matchers'
+import { matchDynamicName } from './router/matchers'
 import type { RouteNode } from './router/Route'
 
 export type Screen =
@@ -22,14 +22,12 @@ function convertDynamicRouteToReactNavigation(segment: string): string {
     return '*not-found'
   }
 
-  const rest = matchDeepDynamicRouteName(segment)
-  if (typeof rest === 'string') {
-    return '*' + rest
-  }
-
-  const dynamicName = matchDynamicName(segment)
-  if (typeof dynamicName === 'string') {
-    return `:${dynamicName}`
+  const dynamicMatch = matchDynamicName(segment)
+  if (dynamicMatch) {
+    if (dynamicMatch.deep) {
+      return '*' + dynamicMatch.name
+    }
+    return `:${dynamicMatch.name}`
   }
 
   return segment

package/src/hooks.tsx

@@ -133,24 +133,26 @@ export function useParams<TParams extends Object = SearchParams>(): Partial<TPar
   const params = React.useContext(RouteParamsContext) ?? {}
 
   return Object.fromEntries(
-    Object.entries(params).map(([key, value]) => {
-      if (Array.isArray(value)) {
-        return [
-          key,
-          value.map((v) => {
-            try {
-              return decodeURIComponent(v)
-            } catch {
-              return v
-            }
-          }),
-        ]
-      }
-      try {
-        return [key, decodeURIComponent(value as string)]
-      } catch {
-        return [key, value]
-      }
-    })
+    Object.entries(params)
+      .filter(([_, value]) => value !== undefined)
+      .map(([key, value]) => {
+        if (Array.isArray(value)) {
+          return [
+            key,
+            value.map((v) => {
+              try {
+                return decodeURIComponent(v)
+              } catch {
+                return v
+              }
+            }),
+          ]
+        }
+        try {
+          return [key, decodeURIComponent(value as string)]
+        } catch {
+          return [key, value]
+        }
+      })
   ) as TParams
 }

package/src/router/getRoutes.ts

@@ -3,7 +3,6 @@ import { getPageExport } from '../utils/getPageExport'
 import type { One } from '../vite/types'
 import {
   matchArrayGroupName,
-  matchDeepDynamicRouteName,
   matchDynamicName,
   matchGroupName,
   removeSupportedExtensions,
@@ -479,11 +478,9 @@ export function generateDynamic(path: string): DynamicConvention[] | null {
         }
       }
 
-      const deepDynamicName = matchDeepDynamicRouteName(part)
-      const dynamicName = deepDynamicName ?? matchDynamicName(part)
-
-      if (!dynamicName) return null
-      return { name: dynamicName, deep: !!deepDynamicName }
+      const dynamicMatch = matchDynamicName(part)
+      if (!dynamicMatch) return null
+      return { name: dynamicMatch.name, deep: dynamicMatch.deep }
     })
     .filter((part): part is DynamicConvention => !!part)
 

package/src/router/matchers.test.ts

@@ -46,8 +46,8 @@ describe(matchDynamicName, () => {
   it(`matches`, () => {
     expect(matchDynamicName('[[...foobar]]')).toEqual(undefined)
     expect(matchDynamicName('[[foobar]]')).toEqual(undefined)
-    expect(matchDynamicName('[...foobar]')).toEqual(undefined)
-    expect(matchDynamicName('[foobar]')).toEqual('foobar')
+    expect(matchDynamicName('[...foobar]')).toEqual({ name: 'foobar', deep: true })
+    expect(matchDynamicName('[foobar]')).toEqual({ name: 'foobar', deep: false })
     expect(matchDynamicName('foobar')).toEqual(undefined)
   })
 })

package/src/router/matchers.ts

@@ -1,11 +1,27 @@
-/** Match `[page]` -> `page` */
-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]
+/** Match `[page]` -> `page` or `[...page]` -> `page` with deep flag */
+const dynamicNameRe = /^\[([^[\]]+?)\]$/
+
+export interface DynamicNameMatch {
+  name: string
+  deep: boolean
+}
+
+/** Match `[page]` -> `{ name: 'page', deep: false }` or `[...page]` -> `{ name: 'page', deep: true }` */
+export function matchDynamicName(name: string): DynamicNameMatch | undefined {
+  const paramName = name.match(dynamicNameRe)?.[1]
+  if (paramName == null) {
+    return undefined
+  } else if (paramName.startsWith('...')) {
+    return { name: paramName.slice(3), deep: true }
+  } else {
+    return { name: paramName, deep: false }
+  }
 }
 
-/** Match `[...page]` -> `page` */
+/**
+ * Match `[...page]` -> `page`
+ * @deprecated Use matchDynamicName instead which returns {name, deep}
+ */
 export function matchDeepDynamicRouteName(name: string): string | undefined {
   return name.match(/^\[\.\.\.([^/]+?)\]$/)?.[1]
 }

package/src/router/router.ts

@@ -65,6 +65,30 @@ export function initialize(
     throw new Error('No routes found')
   }
 
+  if (process.env.ONE_DEBUG_ROUTER && routeNode) {
+    const formatRouteTree = (node: RouteNode, indent = '', isLast = true): string => {
+      const prefix = indent + (isLast ? '└─ ' : '├─ ')
+      const childIndent = indent + (isLast ? '   ' : '│  ')
+
+      const dynamicBadge = node.dynamic ? ` [${node.dynamic.map((d) => d.name).join(', ')}]` : ''
+      const typeBadge = node.type !== 'layout' ? ` (${node.type})` : ''
+      const routeName = node.route || '/'
+
+      let line = `${prefix}${routeName}${dynamicBadge}${typeBadge}`
+
+      const visibleChildren = node.children.filter((child) => !child.internal)
+      for (let i = 0; i < visibleChildren.length; i++) {
+        const child = visibleChildren[i]
+        const childIsLast = i === visibleChildren.length - 1
+        line += '\n' + formatRouteTree(child, childIndent, childIsLast)
+      }
+
+      return line
+    }
+
+    console.info(`[one] 📍 Route structure:\n${formatRouteTree(routeNode)}`)
+  }
+
   navigationRef = ref
   setupLinkingAndRouteInfo(initialLocation)
   subscribeToNavigationChanges()
@@ -156,6 +180,9 @@ export function push(url: OneRouter.Href, options?: OneRouter.LinkToOptions) {
 }
 
 export function dismiss(count?: number) {
+  if (process.env.ONE_DEBUG_ROUTER) {
+    console.info(`[one] 🔙 dismiss${count ? ` (${count})` : ''}`)
+  }
   navigationRef?.dispatch(StackActions.pop(count))
 }
 
@@ -172,10 +199,16 @@ export function setParams(params: OneRouter.InpurRouteParamsGeneric = {}) {
 }
 
 export function dismissAll() {
+  if (process.env.ONE_DEBUG_ROUTER) {
+    console.info(`[one] 🔙 dismissAll`)
+  }
   navigationRef?.dispatch(StackActions.popToTop())
 }
 
 export function goBack() {
+  if (process.env.ONE_DEBUG_ROUTER) {
+    console.info(`[one] 🔙 goBack`)
+  }
   assertIsReady(navigationRef)
   navigationRef?.current?.goBack()
 }
@@ -217,6 +250,14 @@ export function updateState(state: OneRouter.ResultState, nextStateParam = state
   const nextRouteInfo = getRouteInfo(state)
 
   if (!deepEqual(routeInfo, nextRouteInfo)) {
+    if (process.env.ONE_DEBUG_ROUTER) {
+      const from = routeInfo?.pathname || '(initial)'
+      const to = nextRouteInfo.pathname
+      const params = Object.keys(nextRouteInfo.params || {}).length
+        ? nextRouteInfo.params
+        : undefined
+      console.info(`[one] 🧭 ${from} → ${to}`, params ? { params } : '')
+    }
     routeInfo = nextRouteInfo
   }
 }
@@ -361,6 +402,10 @@ export function preloadRoute(href: string) {
 }
 
 export async function linkTo(href: string, event?: string, options?: OneRouter.LinkToOptions) {
+  if (process.env.ONE_DEBUG_ROUTER) {
+    console.info(`[one] 🔗 ${event || 'NAVIGATE'} ${href}`)
+  }
+
   if (href[0] === '#') {
     // this is just linking to a section of the current page on web
     return

package/src/router/utils/getNavigateAction.ts

@@ -39,14 +39,15 @@ export function getNavigateAction(
     const childState = actionStateRoute.state
     const nextNavigationState = stateRoute.state
 
-    const dynamicName = matchDynamicName(actionStateRoute.name)
+    const dynamicMatch = matchDynamicName(actionStateRoute.name)
 
     const didActionAndCurrentStateDiverge =
       actionStateRoute.name !== stateRoute.name ||
       // !deepEqual(actionStateRoute.params, stateRoute.params) ||
       !childState ||
       !nextNavigationState ||
-      (dynamicName && actionStateRoute.params?.[dynamicName] !== stateRoute.params?.[dynamicName])
+      (dynamicMatch &&
+        actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name])
 
     if (didActionAndCurrentStateDiverge) {
       break

package/src/server/oneServe.ts

@@ -18,6 +18,8 @@ import { toAbsolute } from '../utils/toAbsolute'
 import type { One } from '../vite/types'
 import type { RouteInfoCompiled } from './createRoutesManifest'
 
+const debugRouter = process.env.ONE_DEBUG_ROUTER
+
 export async function oneServe(oneOptions: One.PluginOptions, buildInfo: One.BuildInfo, app: Hono) {
   const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import(
     '../createHandleRequest'
@@ -36,6 +38,9 @@ export async function oneServe(oneOptions: One.PluginOptions, buildInfo: One.Bui
           const paramName = param.substring(1)
           return context.req.param(paramName) || ''
         })
+        if (debugRouter) {
+          console.info(`[one] ↪ redirect ${context.req.path} → ${destinationUrl}`)
+        }
         return context.redirect(destinationUrl, redirect.permanent ? 301 : 302)
       })
     }
@@ -180,11 +185,19 @@ url: ${url}`)
 
           switch (route.type) {
             case 'api': {
+              if (debugRouter) {
+                console.info(`[one] ⚡ ${url.pathname} → matched API route: ${route.page}`)
+              }
               return resolveAPIRoute(requestHandlers, request, url, route)
             }
             case 'ssg':
             case 'spa':
             case 'ssr': {
+              if (debugRouter) {
+                console.info(
+                  `[one] ⚡ ${url.pathname} → matched page route: ${route.page} (${route.type})`
+                )
+              }
               return resolvePageRoute(requestHandlers, request, url, route)
             }
           }

package/src/vite/one.ts

@@ -1,15 +1,15 @@
-import events from 'node:events'
-import path from 'node:path'
 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 } from 'vite'
 import { barrel } from 'vite-plugin-barrel'
 import tsconfigPaths from 'vite-tsconfig-paths'
-import { autoDepOptimizePlugin, getOptimizeDeps, getOptionsFilled, loadEnv } from 'vxrn'
+import { autoDepOptimizePlugin, getOptionsFilled, loadEnv } from 'vxrn'
 import vxrnVitePlugin from 'vxrn/vite-plugin'
 import { CACHE_KEY } from '../constants'
 import { getViteMetroPluginOptions } from '../metro-config/getViteMetroPluginOptions'
@@ -121,15 +121,6 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     void ensureTSConfig()
   }
 
-  // build is superset for now
-  const { optimizeDeps } = getOptimizeDeps('build')
-  const optimizeIds = optimizeDeps.include
-  const optimizeIdRegex = new RegExp(
-    // santize ids for regex
-    // https://stackoverflow.com/questions/6300183/sanitize-string-of-regex-characters-before-regexp-build
-    `${optimizeIds.map((id) => id.replace(/[#-.]|[[-^]|[?|{}]/g, '\\$&')).join('|')}`
-  )
-
   let tsConfigPathsPlugin: Plugin | null = null
 
   const vxrnOptions = getOptionsFilled()
@@ -167,7 +158,12 @@ export function one(options: One.PluginOptions = {}): PluginOption {
           userConfig?.envPrefix
         )
         return {
-          define: clientEnvDefine,
+          define: {
+            ...clientEnvDefine,
+            ...(process.env.ONE_DEBUG_ROUTER && {
+              'process.env.ONE_DEBUG_ROUTER': JSON.stringify(process.env.ONE_DEBUG_ROUTER),
+            }),
+          },
         }
       },
     },

package/src/vite/plugins/fileSystemRouterPlugin.tsx

@@ -17,6 +17,8 @@ import type { One } from '../../vite/types'
 import { setServerContext } from '../one-server-only'
 import { virtalEntryIdClient, virtualEntryId } from './virtualEntryConstants'
 
+const debugRouter = process.env.ONE_DEBUG_ROUTER
+
 // server needs better dep optimization
 const USE_SERVER_ENV = false //!!process.env.USE_SERVER_ENV
 
@@ -329,7 +331,9 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
                     })
                   }
 
-                  console.warn(` [one] redirecting via redirect: ${destination}`)
+                  if (debugRouter) {
+                    console.info(`[one] ↪ redirect ${url.pathname} → ${destination}`)
+                  }
 
                   res.writeHead(redirect.permanent ? 301 : 302, { Location: destination })
                   res.end()
@@ -338,13 +342,21 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
               }
             }
 
-            const reply = await handleRequest.handler(await convertIncomingMessageToRequest(req))
+            const reply = await handleRequest.handler(convertIncomingMessageToRequest(req))
 
             if (!reply) {
               return next()
             }
 
             if (typeof reply !== 'string' && isResponse(reply)) {
+              if (debugRouter) {
+                const headers: Record<string, string> = {}
+                reply.headers.forEach((v, k) => {
+                  headers[k] = v
+                })
+                console.info(`[one] 📤 response ${reply.status}`, headers)
+              }
+
               reply.headers.forEach((value, key) => {
                 if (key === 'set-cookie') {
                   // for some reason it wasnt doing working without this?
@@ -359,7 +371,9 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
 
               if (isStatusRedirect(reply.status)) {
                 const location = `${reply.headers.get('location') || ''}`
-                console.info(` ↦ Redirect ${location}`)
+                if (debugRouter) {
+                  console.info(`[one] ↪ response redirect → ${location}`)
+                }
                 if (location) {
                   res.writeHead(reply.status, {
                     Location: location,
@@ -373,8 +387,6 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
               res.statusCode = reply.status
               res.statusMessage = reply.statusText
 
-              let outString = ''
-
               if (reply.body) {
                 if (reply.body.locked) {
                   console.warn(`Body is locked??`, req.url)

package/types/createHandleRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAK1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACzD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpD,CAAA;AAED,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEtD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GACnC,OAAO,CAAC,QAAQ,CAAC,CA8CnB;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAsCzB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAmCzB;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAqBzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,OAMpD;AASD,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAAC,SAAS,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAC9F,UAAU,EAAE,iBAAiB,EAAE,CAAA;IAC/B,SAAS,EAAE,iBAAiB,EAAE,CAAA;CAC/B,CAKA;AAGD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE;;uBAUW,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAsE3F"}
+{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAK1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACzD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpD,CAAA;AAED,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAItD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GACnC,OAAO,CAAC,QAAQ,CAAC,CA4DnB;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBA0CzB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAuCzB;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAyBzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,OAMpD;AASD,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAAC,SAAS,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAC9F,UAAU,EAAE,iBAAiB,EAAE,CAAA;IAC/B,SAAS,EAAE,iBAAiB,EAAE,CAAA;CAC/B,CAKA;AAGD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE;;uBAUW,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EA4E3F"}

package/types/fork/NavigationContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NavigationContainer.d.ts","sourceRoot":"","sources":["../../src/fork/NavigationContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAKL,KAAK,wBAAwB,EAC7B,KAAK,sBAAsB,EAK5B,MAAM,wBAAwB,CAAA;AAO/B,OAAO,EAEL,KAAK,oBAAoB,EAEzB,KAAK,cAAc,EAEnB,KAAK,eAAe,EAErB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAS9B,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,yBAAyB,EAAE,OAAO,CACpC,sBAAsB,CAAC,GAAG,CAAC,EAC3B;QAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,CAAA;KAAE,CAC1C,CAAA;CACF;AAID,KAAK,KAAK,CAAC,SAAS,SAAS,EAAE,IAAI,wBAAwB,GAAG;IAC5D,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,OAAO,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,CAAA;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,aAAa,CAAC,EAAE,oBAAoB,CAAA;CACrC,CAAA;AAuID,eAAO,MAAM,mBAAmB,EAAiD,CAC/E,aAAa,SAAS,EAAE,GAAG,eAAe,CAAC,aAAa,EAExD,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG;IAC5B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAA;CACvD,KACE,KAAK,CAAC,YAAY,CAAA"}
+{"version":3,"file":"NavigationContainer.d.ts","sourceRoot":"","sources":["../../src/fork/NavigationContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAKL,KAAK,wBAAwB,EAC7B,KAAK,sBAAsB,EAK5B,MAAM,wBAAwB,CAAA;AAO/B,OAAO,EAEL,KAAK,oBAAoB,EAEzB,KAAK,cAAc,EAEnB,KAAK,eAAe,EAErB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAS9B,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,yBAAyB,EAAE,OAAO,CACpC,sBAAsB,CAAC,GAAG,CAAC,EAC3B;QAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,CAAA;KAAE,CAC1C,CAAA;CACF;AAID,KAAK,KAAK,CAAC,SAAS,SAAS,EAAE,IAAI,wBAAwB,GAAG;IAC5D,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,OAAO,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,CAAA;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,aAAa,CAAC,EAAE,oBAAoB,CAAA;CACrC,CAAA;AA+ID,eAAO,MAAM,mBAAmB,EAAiD,CAC/E,aAAa,SAAS,EAAE,GAAG,eAAe,CAAC,aAAa,EAExD,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG;IAC5B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAA;CACvD,KACE,KAAK,CAAC,YAAY,CAAA"}

package/types/fork/createMemoryHistory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createMemoryHistory.d.ts","sourceRoot":"","sources":["../../src/fork/createMemoryHistory.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAG7D,KAAK,aAAa,GAAG;IAEnB,EAAE,EAAE,MAAM,CAAA;IAEV,KAAK,EAAE,eAAe,CAAA;IAEtB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,wBAAgB,mBAAmB;oBAmBlB,MAAM;eAcR,MAAM;wBAIG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;0BAad;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;6BAmBrC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;UAoC3D,MAAM;qBA2FK,MAAM,IAAI;EAiB9B"}
+{"version":3,"file":"createMemoryHistory.d.ts","sourceRoot":"","sources":["../../src/fork/createMemoryHistory.tsx"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAG7D,KAAK,aAAa,GAAG;IAEnB,EAAE,EAAE,MAAM,CAAA;IAEV,KAAK,EAAE,eAAe,CAAA;IAEtB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,wBAAgB,mBAAmB;oBAmBlB,MAAM;eAcR,MAAM;wBAIG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;0BAad;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;6BAuBrC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;UAwC3D,MAAM;qBA2FK,MAAM,IAAI;EAiB9B"}

package/types/fork/extractPathFromURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractPathFromURL.d.ts","sourceRoot":"","sources":["../../src/fork/extractPathFromURL.ts"],"names":[],"mappings":"AAAA,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,MAAM,GAAG;IAC7D,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;CACpB,CAUA;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI3D;AAwGD,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,SAAK,UAMnE;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,UAMjF;AAED,eAAO,MAAM,kBAAkB,+BAAyB,CAAA"}
+{"version":3,"file":"extractPathFromURL.d.ts","sourceRoot":"","sources":["../../src/fork/extractPathFromURL.ts"],"names":[],"mappings":"AAAA,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,MAAM,GAAG;IAC7D,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;CACpB,CAUA;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI3D;AA8GD,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,GAAG,SAAK,UAMnE;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,UAMjF;AAED,eAAO,MAAM,kBAAkB,+BAAyB,CAAA"}

package/types/fork/getStateFromPath-mods.d.ts

@@ -12,20 +12,15 @@ export type AdditionalRouteConfig = {
     hasChildren: boolean;
     expandedRouteNames: string[];
     parts: string[];
+    staticPartCount: number;
 };
-export declare function getUrlWithReactNavigationConcessions(path: string, baseUrl?: string | undefined): {
+interface UrlWithReactNavigationConcessions {
     path: string;
-    cleanUrl: string;
     nonstandardPathname: string;
-    url: URL;
-    pathWithoutGroups?: undefined;
-} | {
-    path: string;
-    nonstandardPathname: string;
-    url: URL;
+    hash: string;
     pathWithoutGroups: string;
-    cleanUrl?: undefined;
-};
+}
+export declare function getUrlWithReactNavigationConcessions(path: string, baseUrl?: string | undefined): UrlWithReactNavigationConcessions;
 export declare function matchForEmptyPath(configs: RouteConfig[]): {
     path: string;
     screen: string;
@@ -42,6 +37,7 @@ export declare function matchForEmptyPath(configs: RouteConfig[]): {
     hasChildren: boolean;
     expandedRouteNames: string[];
     parts: string[];
+    staticPartCount: number;
 } | undefined;
 export declare function appendIsInitial(initialRoutes: InitialRouteConfig[]): (config: RouteConfig) => RouteConfig;
 export declare function getRouteConfigSorter(previousSegments?: string[]): (a: RouteConfig, b: RouteConfig) => number;
@@ -54,4 +50,5 @@ export declare function populateParams(routes?: ParsedRoute[], params?: Record<s
 export declare function createConfigItemAdditionalProperties(screen: string, pattern: string, routeNames: string[], config?: Record<string, any>): Omit<AdditionalRouteConfig, 'isInitial'>;
 export declare function parseQueryParamsExtended(path: string, route: ParsedRoute, parseConfig?: Record<string, (value: string) => any>, hash?: string): Record<string, string | string[]> | undefined;
 export declare function stripBaseUrl(path: string, baseUrl?: string | undefined): string;
+export {};
 //# sourceMappingURL=getStateFromPath-mods.d.ts.map