one 1.2.20 → 1.2.21

package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js

@@ -20,7 +20,8 @@ function _type_of(obj) {
 
   return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-var USE_SERVER_ENV = !1;
+var debugRouter = process.env.ONE_DEBUG_ROUTER,
+  USE_SERVER_ENV = !1;
 //!!process.env.USE_SERVER_ENV
 function createFileSystemRouterPlugin(options) {
   var preloads = ["/@vite/client", virtalEntryIdClient],
@@ -252,7 +253,7 @@ ${stack}
                         params = redirect.source.match(/:\w+/g);
                       return params && params.forEach(function (param2, index) {
                         destination = destination.replace(param2, match[index + 1] || "");
-                      }), console.warn(` [one] redirecting via redirect: ${destination}`), res.writeHead(redirect.permanent ? 301 : 302, {
+                      }), debugRouter && console.info(`[one] \u21AA redirect ${url2.pathname} \u2192 ${destination}`), res.writeHead(redirect.permanent ? 301 : 302, {
                         Location: destination
                       }), res.end(), {
                         v: void 0
@@ -272,9 +273,15 @@ ${stack}
                 }
               }
             }
-            var reply = await handleRequest.handler(await convertIncomingMessageToRequest(req));
+            var reply = await handleRequest.handler(convertIncomingMessageToRequest(req));
             if (!reply) return next();
             if (typeof reply != "string" && isResponse(reply)) {
+              if (debugRouter) {
+                var headers = {};
+                reply.headers.forEach(function (v, k) {
+                  headers[k] = v;
+                }), console.info(`[one] \u{1F4E4} response ${reply.status}`, headers);
+              }
               if (reply.headers.forEach(function (value, key) {
                 if (key === "set-cookie") {
                   var cookies = value.split(", "),
@@ -298,7 +305,7 @@ ${stack}
                 } else res.setHeader(key, value);
               }), isStatusRedirect(reply.status)) {
                 var location = `${reply.headers.get("location") || ""}`;
-                if (console.info(` \u21A6 Redirect ${location}`), location) {
+                if (debugRouter && console.info(`[one] \u21AA response redirect \u2192 ${location}`), location) {
                   res.writeHead(reply.status, {
                     Location: location
                   }), res.end();
@@ -306,9 +313,7 @@ ${stack}
                 }
                 console.error("No location provided to redirected status reply", reply);
               }
-              res.statusCode = reply.status, res.statusMessage = reply.statusText;
-              var outString = "";
-              if (reply.body && reply.body.locked) {
+              if (res.statusCode = reply.status, res.statusMessage = reply.statusText, reply.body && reply.body.locked) {
                 console.warn("Body is locked??", req.url), res.write(""), res.end();
                 return;
               }

package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["join","Readable","debounce","createServerModuleRunner","getSpaHeaderElements","createHandleRequest","getRouterRootFromOneOptions","isResponse","isStatusRedirect","promiseWithResolvers","LoaderDataCache","replaceLoader","setServerContext","virtalEntryIdClient","virtualEntryId","_instanceof","left","right","Symbol","hasInstance","_type_of","obj","constructor","USE_SERVER_ENV","createFileSystemRouterPlugin","options","preloads","runner","server","handleRequest","createRequestHandler","renderPromise","routerRoot","handlePage","param","route","url","loaderProps","console","info","type","isNotFound","file","slice","serverContext","mode","promise","resolve","_globalThis___vxrnresetState","_globalThis","_exported_loader","routeFile","clearCache","globalThis","__vxrnresetState","call","exported","import","loaderData","loader","eval","entry","render","default","is404","html","path","Response","status","headers","err","error","href","title","pathname","message","Error","stack","isDuplicateReactError","test","subMessage","handleLoader","param2","request","route2","url2","loaderProps2","_this","_exported_loader2","routeFile2","transformedJS","transformRequest","code","exported2","loaderData2","platform","searchParams","get","environment","environments","nativeTransformedJS","JSON","stringify","handleAPI","loadMiddleware","contextKey","name","enforce","apply","config","userConfig","_options_optimization","_options_optimization_autoEntriesScanning","setting","optimization","autoEntriesScanning","manifest","pageRoutes","routesAndLayouts","Set","flatMap","_route_layouts","split","filter","x","startsWith","length","layouts","layout","optimizeDeps","entries","configureServer","serverIn","ssr","appDir","process","cwd","fileWatcherChangeListener","watcher","addListener","middlewares","use","req","res","next","_options_web","redirects","web","URL","host","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","regexStr","source","replace","match","RegExp","destination","params","forEach","index","warn","writeHead","permanent","Location","end","v","_iterator","iterator","done","_ret","return"],"sources":["../../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["join","Readable","debounce","createServerModuleRunner","getSpaHeaderElements","createHandleRequest","getRouterRootFromOneOptions","isResponse","isStatusRedirect","promiseWithResolvers","LoaderDataCache","replaceLoader","setServerContext","virtalEntryIdClient","virtualEntryId","_instanceof","left","right","Symbol","hasInstance","_type_of","obj","constructor","debugRouter","process","env","ONE_DEBUG_ROUTER","USE_SERVER_ENV","createFileSystemRouterPlugin","options","preloads","runner","server","handleRequest","createRequestHandler","renderPromise","routerRoot","handlePage","param","route","url","loaderProps","console","info","type","isNotFound","file","slice","serverContext","mode","promise","resolve","_globalThis___vxrnresetState","_globalThis","_exported_loader","routeFile","clearCache","globalThis","__vxrnresetState","call","exported","import","loaderData","loader","eval","entry","render","default","is404","html","path","Response","status","headers","err","error","href","title","pathname","message","Error","stack","isDuplicateReactError","test","subMessage","handleLoader","param2","request","route2","url2","loaderProps2","_this","_exported_loader2","routeFile2","transformedJS","transformRequest","code","exported2","loaderData2","platform","searchParams","get","environment","environments","nativeTransformedJS","JSON","stringify","handleAPI","loadMiddleware","contextKey","name","enforce","apply","config","userConfig","_options_optimization","_options_optimization_autoEntriesScanning","setting","optimization","autoEntriesScanning","manifest","pageRoutes","routesAndLayouts","Set","flatMap","_route_layouts","split","filter","x","startsWith","length","layouts","layout","optimizeDeps","entries","configureServer","serverIn","ssr","appDir","cwd","fileWatcherChangeListener","watcher","addListener","middlewares","use","req","res","next","_options_web","redirects","web","URL","host","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","regexStr","source","replace","match","RegExp","destination","params","forEach","index","writeHead","permanent","Location","end","v","_iterator","iterator","done","_ret","return","reply","handler","convertIncomingMessageToRequest"],"sources":["../../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.2.20",
+  "version": "1.2.21",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -121,17 +121,17 @@
     "@react-navigation/routers": "~7.5.1",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/compiler": "1.2.20",
-    "@vxrn/resolve": "1.2.20",
-    "@vxrn/tslib-lite": "1.2.20",
-    "@vxrn/universal-color-scheme": "1.2.20",
-    "@vxrn/use-isomorphic-layout-effect": "1.2.20",
-    "@vxrn/vite-plugin-metro": "1.2.20",
+    "@vxrn/compiler": "1.2.21",
+    "@vxrn/resolve": "1.2.21",
+    "@vxrn/tslib-lite": "1.2.21",
+    "@vxrn/universal-color-scheme": "1.2.21",
+    "@vxrn/use-isomorphic-layout-effect": "1.2.21",
+    "@vxrn/vite-plugin-metro": "1.2.21",
     "babel-dead-code-elimination": "^1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.2.20",
+    "create-vxrn": "1.2.21",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~8.0.8",
     "expo-modules-core": "~3.0.24",
@@ -157,7 +157,7 @@
     "vite": "^7.1.12",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.1.4",
-    "vxrn": "1.2.20",
+    "vxrn": "1.2.21",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/createHandleRequest.ts

@@ -25,6 +25,8 @@ type RequestHandlerProps<RouteExtraProps extends Object = {}> = {
 
 type RequestHandlerResponse = null | string | Response
 
+const debugRouter = process.env.ONE_DEBUG_ROUTER
+
 export async function runMiddlewares(
   handlers: RequestHandlers,
   request: Request,
@@ -40,6 +42,10 @@ export async function runMiddlewares(
     throw new Error(`No middleware handler configured`)
   }
 
+  if (debugRouter) {
+    console.info(`[one] 🔗 middleware chain (${middlewares.length}) for ${route.page}`)
+  }
+
   const context: MiddlewareContext = {}
 
   async function dispatch(index: number): Promise<Response> {
@@ -47,9 +53,16 @@ export async function runMiddlewares(
 
     // no more middlewares, finish
     if (!middlewareModule) {
+      if (debugRouter) {
+        console.info(`[one] ✓ middleware chain complete`)
+      }
       return await getResponse()
     }
 
+    if (debugRouter) {
+      console.info(`[one]   → middleware[${index}]: ${middlewareModule.contextKey}`)
+    }
+
     const exported = (await handlers.loadMiddleware!(middlewareModule))?.default as
       | Middleware
       | undefined
@@ -67,6 +80,9 @@ export async function runMiddlewares(
     const response = await exported({ request, next, context })
 
     if (response) {
+      if (debugRouter) {
+        console.info(`[one]   ← middleware[${index}] returned early (status: ${response.status})`)
+      }
       return response
     }
 
@@ -87,6 +103,10 @@ export async function resolveAPIRoute(
   const { pathname } = url
   const params = getRouteParams(pathname, route)
 
+  if (debugRouter) {
+    console.info(`[one] 📡 API ${request.method} ${pathname} → ${route.file}`, params)
+  }
+
   try {
     return resolveAPIEndpoint(
       () =>
@@ -128,6 +148,10 @@ export async function resolveLoaderRoute(
   url: URL,
   route: RouteInfoCompiled
 ) {
+  if (debugRouter) {
+    console.info(`[one] 📦 loader ${url.pathname} → ${route.file}`)
+  }
+
   return await runMiddlewares(handlers, request, route, async () => {
     return await resolveResponse(async () => {
       const headers = new Headers()
@@ -171,6 +195,10 @@ export async function resolvePageRoute(
 ) {
   const { pathname, search } = url
 
+  if (debugRouter) {
+    console.info(`[one] 📄 page ${pathname} → ${route.file} (${route.type})`)
+  }
+
   return resolveResponse(async () => {
     const resolved = await runMiddlewares(handlers, request, route, async () => {
       return await handlers.handlePage!({
@@ -241,6 +269,9 @@ export function createHandleRequest(
           return route.compiledRegex.test(pathname)
         })
         if (apiRoute) {
+          if (debugRouter) {
+            console.info(`[one] ⚡ ${pathname} → matched API route: ${apiRoute.page}`)
+          }
           return await resolveAPIRoute(handlers, request, url, apiRoute)
         }
       }
@@ -291,6 +322,9 @@ export function createHandleRequest(
           if (!route.compiledRegex.test(pathname)) {
             continue
           }
+          if (debugRouter) {
+            console.info(`[one] ⚡ ${pathname} → matched page route: ${route.page} (${route.type})`)
+          }
           return resolvePageRoute(handlers, request, url, route)
         }
       }

package/src/fork/NavigationContainer.tsx

@@ -164,6 +164,14 @@ function NavigationContainerInner(
 
   const [isResolved, initialState] = useThenable(getInitialState)
 
+  if (process.env.ONE_DEBUG_ROUTER) {
+    console.info(
+      `[one] 🏠 NavigationContainer isResolved=${isResolved} initialState=`,
+      JSON.stringify(initialState, null, 2)
+    )
+    console.info(`[one] 🏠 NavigationContainer rest.initialState=`, rest.initialState)
+  }
+
   React.useImperativeHandle(ref, () => refContainer.current!)
 
   const isLinkingReady = rest.initialState != null || !isLinkingEnabled || isResolved

package/src/fork/createMemoryHistory.tsx

@@ -82,6 +82,10 @@ export function createMemoryHistory() {
       items.push({ path, state, id })
       index = items.length - 1
 
+      if (process.env.ONE_DEBUG_ROUTER) {
+        console.info(`[one] 📜 history.push path=${path}`)
+      }
+
       // We pass empty string for title because it's ignored in all browsers except safari
       // We don't store state object in history.state because:
       // - browsers have limits on how big it can be, and we don't control the size
@@ -117,6 +121,10 @@ export function createMemoryHistory() {
         items[index] = { path, state, id }
       }
 
+      if (process.env.ONE_DEBUG_ROUTER) {
+        console.info(`[one] 📜 history.replace path=${pathWithHash}`)
+      }
+
       window.history.replaceState({ id }, '', pathWithHash)
     },
 

package/src/fork/extractPathFromURL.ts

@@ -82,6 +82,12 @@ function fromDeepLink(url: string): string {
      * - It has a valid App scheme, but the scheme isn't a valid URL scheme (e.g. `my_app://`)
      */
 
+    // If `url` is already a path (starts with `/`), return it as-is
+    // This prevents incorrect rewrites when URL is in query params (e.g. `/?url=https://example.com`)
+    if (url.startsWith('/')) {
+      return url
+    }
+
     /**
      * App schemes are not valid URL schemes, so they will fail to parse.
      * We need to strip the scheme from these URLs

package/src/fork/getPathFromState-mods.ts

@@ -6,7 +6,7 @@
 
 import type { Route } from '@react-navigation/core'
 
-import { matchDeepDynamicRouteName, matchDynamicName, matchGroupName } from '../router/matchers'
+import { matchDynamicName, matchGroupName } from '../router/matchers'
 import { getParamName } from './_shared'
 
 export type AdditionalOptions = {
@@ -136,12 +136,7 @@ export function appendBaseUrl(
 }
 
 function segmentMatchesConvention(segment: string): boolean {
-  return (
-    segment === 'index' ||
-    matchDynamicName(segment) != null ||
-    matchGroupName(segment) != null ||
-    matchDeepDynamicRouteName(segment) != null
-  )
+  return segment === 'index' || matchDynamicName(segment) != null || matchGroupName(segment) != null
 }
 
 function encodeURISegment(str: string, { preserveBrackets = false } = {}) {

package/src/fork/getStateFromPath-mods.ts

@@ -16,35 +16,44 @@ export type AdditionalRouteConfig = {
   hasChildren: boolean
   expandedRouteNames: string[]
   parts: string[]
+  staticPartCount: number
+}
+
+interface UrlWithReactNavigationConcessions {
+  path: string
+  nonstandardPathname: string
+  hash: string
+  pathWithoutGroups: string
 }
 
 export function getUrlWithReactNavigationConcessions(
   path: string,
   baseUrl: string | undefined = process.env.EXPO_BASE_URL
-) {
-  let parsed: URL
+): UrlWithReactNavigationConcessions {
+  const pathWithoutGroups = stripGroupSegmentsFromPath(stripBaseUrl(path, baseUrl))
+
+  let pathname = ''
+  let hash = ''
   try {
-    parsed = new URL(path, 'https://phony.example')
+    // NOTE: This used to use a dummy base URL for parsing (phony.example)
+    // However, this seems to get flagged since it's preserved 1:1 in the output bytecode by certain scanners
+    // Instead, we use an empty `file:` URL. This will still perform `pathname` normalization, search parameter parsing
+    // encoding, and all other logic, except the logic that applies to hostnames and protocols, and also not leave a
+    // dummy URL in the output bytecode
+    const parsed = new URL(path, 'file:')
+    pathname = parsed.pathname
+    hash = parsed.hash
   } catch {
     // Do nothing with invalid URLs.
-    return {
-      path,
-      cleanUrl: '',
-      nonstandardPathname: '',
-      url: new URL('https://phony.example'),
-    }
   }
 
-  const pathname = parsed.pathname
   const withoutBaseUrl = stripBaseUrl(pathname, baseUrl)
-  const pathWithoutGroups = stripGroupSegmentsFromPath(stripBaseUrl(path, baseUrl))
-
-  // Make sure there is a trailing slash
   return {
-    // The slashes are at the end, not the beginning
     path,
+    // Make sure there is a trailing slash
+    // The slashes are at the end, not the beginning
     nonstandardPathname: withoutBaseUrl.replace(/^\/+/g, '').replace(/\/+$/g, '') + '/',
-    url: parsed,
+    hash,
     pathWithoutGroups,
   }
 }
@@ -145,6 +154,13 @@ export function getRouteConfigSorter(previousSegments: string[] = []) {
       return 1
     }
 
+    /*
+     * If the routes have any static segments, the one with the most static segments should be higher
+     */
+    if (a.staticPartCount !== b.staticPartCount) {
+      return b.staticPartCount - a.staticPartCount
+    }
+
     /*
      * If both are static/dynamic or a layout file, then we check group similarity
      */
@@ -312,15 +328,23 @@ export function createConfigItemAdditionalProperties(
 ): Omit<AdditionalRouteConfig, 'isInitial'> {
   const parts: string[] = []
   let isDynamic = false
+  let staticPartCount = 0
   const isIndex = screen === 'index' || screen.endsWith('/index')
 
   for (const part of pattern.split('/')) {
     if (part) {
       // If any part is dynamic, then the route is dynamic
-      isDynamic ||= part.startsWith(':') || part.startsWith('*') || part.includes('*not-found')
+      const isDynamicPart =
+        part.startsWith(':') || part.startsWith('*') || part.includes('*not-found')
+
+      isDynamic ||= isDynamicPart
 
       if (!matchGroupName(part)) {
         parts.push(part)
+
+        if (!isDynamicPart) {
+          staticPartCount++
+        }
       }
     }
   }
@@ -330,6 +354,7 @@ export function createConfigItemAdditionalProperties(
 
   if (isIndex) {
     parts.push('index')
+    staticPartCount++
   }
 
   return {
@@ -337,6 +362,7 @@ export function createConfigItemAdditionalProperties(
     isIndex,
     hasChildren,
     parts,
+    staticPartCount,
     userReadableName: [...routeNames.slice(0, -1), config.path || screen].join('/'),
     expandedRouteNames: routeNames.flatMap((name) => {
       return name.split('/')
@@ -350,7 +376,7 @@ export function parseQueryParamsExtended(
   parseConfig?: Record<string, (value: string) => any>,
   hash?: string
 ) {
-  const searchParams = new URL(path, 'https://phony.example').searchParams
+  const searchParams = new URL(path, 'file:').searchParams
   const params: Record<string, string | string[]> = Object.create(null)
 
   if (hash) {

package/src/fork/getStateFromPath.ts

@@ -723,7 +723,7 @@ const createNestedStateObject = (
     path,
     route,
     flatConfig ? findParseConfigForRoute(route.name, flatConfig) : undefined,
-    restPathData.url.hash
+    restPathData.hash
   )
   // @modified - end
 

package/src/fork/useLinking.native.ts

@@ -189,7 +189,7 @@ export function useLinking(
         // If the link were handled, it gets cleared in NavigationContainer
         onUnhandledLinking(extractPathFromURL(prefixes, url))
         const rootState = navigation.getRootState()
-        if (state.routes.some((r) => !rootState?.routeNames.includes(r.name))) {
+        if (state.routes.some((r) => !rootState?.routeNames?.includes(r.name))) {
           return
         }
 

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: