one 1.19.4 → 1.19.5

package/dist/cjs/hooks.cjs

@@ -52,6 +52,7 @@ var import_react = __toESM(require("react"), 1);
 var import_imperative_api = require("./router/imperative-api.cjs");
 var import_Route = require("./router/Route.cjs");
 var import_params = require("./router/params.cjs");
+var import_path = require("./router/path.cjs");
 var import_RouteInfoContext = require("./router/RouteInfoContext.cjs");
 var import_router = require("./router/router.cjs");
 var import_one_server_only = require("./vite/one-server-only.cjs");
@@ -87,14 +88,11 @@ function usePathname() {
     try {
       const ctx = (0, import_one_server_only.getServerContext)();
       if (ctx?.loaderProps?.path) {
-        return stripTrailingSlash(ctx.loaderProps.path);
+        return (0, import_path.normalizeRoutePathname)(ctx.loaderProps.path);
       }
     } catch {}
   }
-  return stripTrailingSlash(routeInfoPathname);
-}
-function stripTrailingSlash(path) {
-  return path.length > 1 && path.endsWith("/") ? path.slice(0, -1) : path;
+  return (0, import_path.getPathnameWithRecoveredDynamicSegment)(routeInfoPathname);
 }
 function useActiveParams() {
   return useRouteInfo().params;

package/dist/cjs/hooks.native.js

@@ -54,6 +54,7 @@ var import_react = __toESM(require("react"), 1);
 var import_imperative_api = require("./router/imperative-api.native.js");
 var import_Route = require("./router/Route.native.js");
 var import_params = require("./router/params.native.js");
+var import_path = require("./router/path.native.js");
 var import_RouteInfoContext = require("./router/RouteInfoContext.native.js");
 var import_router = require("./router/router.native.js");
 var import_one_server_only = require("./vite/one-server-only.native.js");
@@ -208,14 +209,11 @@ function usePathname() {
       var _ctx_loaderProps;
       var ctx = (0, import_one_server_only.getServerContext)();
       if (ctx === null || ctx === void 0 ? void 0 : (_ctx_loaderProps = ctx.loaderProps) === null || _ctx_loaderProps === void 0 ? void 0 : _ctx_loaderProps.path) {
-        return stripTrailingSlash(ctx.loaderProps.path);
+        return (0, import_path.normalizeRoutePathname)(ctx.loaderProps.path);
       }
     } catch (unused) {}
   }
-  return stripTrailingSlash(routeInfoPathname);
-}
-function stripTrailingSlash(path) {
-  return path.length > 1 && path.endsWith("/") ? path.slice(0, -1) : path;
+  return (0, import_path.getPathnameWithRecoveredDynamicSegment)(routeInfoPathname);
 }
 function useActiveParams() {
   return useRouteInfo().params;

package/dist/cjs/hooks.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","hooks_exports","__export","FrozeContext","useActiveParams","useGlobalSearchParams","useLocalSearchParams","useNavigationContainerRef","useParams","usePathname","useRootNavigationState","useRouteInfo","useRouter","useSearchParams","useSegments","useUnstableGlobalHref","module","exports","import_react","__toESM","require","import_imperative_api","import_Route","import_params","import_RouteInfoContext","import_router","import_one_server_only","import_meta","_assert_this_initialized","self","ReferenceError","_call_super","_this","derived","args","_get_prototype_of","_possible_constructor_return","_is_native_reflect_construct","Reflect","construct","constructor","apply","_class_call_check","instance","Constructor","TypeError","_construct","Parent","Class","Parent2","args2","Class2","a","push","Function","bind","_set_prototype_of","prototype","arguments","_defineProperties","target","props","i","length","descriptor","enumerable","configurable","writable","Object","defineProperty","key","_create_class","protoProps","staticProps","o","setPrototypeOf","getPrototypeOf","o2","__proto__","_inherits","subClass","superClass","create","_is_native_function","fn","toString","call","indexOf","_type_of","p","p2","obj","Symbol","_wrap_native_super","_cache","Map","wrapNativeSuper","has","get","set","Wrapper"],"sources":["../../src/hooks.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","hooks_exports","__export","FrozeContext","useActiveParams","useGlobalSearchParams","useLocalSearchParams","useNavigationContainerRef","useParams","usePathname","useRootNavigationState","useRouteInfo","useRouter","useSearchParams","useSegments","useUnstableGlobalHref","module","exports","import_react","__toESM","require","import_imperative_api","import_Route","import_params","import_path","import_RouteInfoContext","import_router","import_one_server_only","import_meta","_assert_this_initialized","self","ReferenceError","_call_super","_this","derived","args","_get_prototype_of","_possible_constructor_return","_is_native_reflect_construct","Reflect","construct","constructor","apply","_class_call_check","instance","Constructor","TypeError","_construct","Parent","Class","Parent2","args2","Class2","a","push","Function","bind","_set_prototype_of","prototype","arguments","_defineProperties","target","props","i","length","descriptor","enumerable","configurable","writable","Object","defineProperty","key","_create_class","protoProps","staticProps","o","setPrototypeOf","getPrototypeOf","o2","__proto__","_inherits","subClass","superClass","create","_is_native_function","fn","toString","call","indexOf","_type_of","p","p2","obj","Symbol","_wrap_native_super","_cache","Map","wrapNativeSuper","has","get","set","Wrapper"],"sources":["../../src/hooks.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/router/Route.cjs

@@ -44,6 +44,7 @@ var import_findFocusedRoute = require("../fork/findFocusedRoute.cjs");
 var import_linkingConfig = require("./linkingConfig.cjs");
 var import_matchers = require("./matchers.cjs");
 var import_params = require("./params.cjs");
+var import_path = require("./path.cjs");
 var import_router = require("./router.cjs");
 var import_RouteInfoContext = require("./RouteInfoContext.cjs");
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -65,7 +66,7 @@ function useContextKey() {
 function getParamsFromCurrentUrl(route) {
   const linking = (0, import_linkingConfig.getResolvedLinking)();
   if (!linking?.getStateFromPath) return void 0;
-  const path = import_router.routeInfo?.unstable_globalHref || route?.path || (typeof window !== "undefined" && window.location ? window.location.pathname + window.location.search : void 0);
+  const path = (0, import_path.getPathWithRecoveredDynamicSegment)([import_router.routeInfo?.unstable_globalHref, route?.path]);
   if (!path) return void 0;
   const state = linking.getStateFromPath(path, linking.config);
   if (!state) return void 0;

package/dist/cjs/router/Route.native.js

@@ -47,6 +47,7 @@ var import_findFocusedRoute = require("../fork/findFocusedRoute.native.js");
 var import_linkingConfig = require("./linkingConfig.native.js");
 var import_matchers = require("./matchers.native.js");
 var import_params = require("./params.native.js");
+var import_path = require("./path.native.js");
 var import_router = require("./router.native.js");
 var import_RouteInfoContext = require("./RouteInfoContext.native.js");
 var RouteParamsContext = /* @__PURE__ */(0, import_react.createContext)({});
@@ -67,7 +68,7 @@ function useContextKey() {
 function getParamsFromCurrentUrl(route) {
   var linking = (0, import_linkingConfig.getResolvedLinking)();
   if (!(linking === null || linking === void 0 ? void 0 : linking.getStateFromPath)) return void 0;
-  var path = (import_router.routeInfo === null || import_router.routeInfo === void 0 ? void 0 : import_router.routeInfo.unstable_globalHref) || (route === null || route === void 0 ? void 0 : route.path) || (typeof window !== "undefined" && window.location ? window.location.pathname + window.location.search : void 0);
+  var path = (0, import_path.getPathWithRecoveredDynamicSegment)([import_router.routeInfo === null || import_router.routeInfo === void 0 ? void 0 : import_router.routeInfo.unstable_globalHref, route === null || route === void 0 ? void 0 : route.path]);
   if (!path) return void 0;
   var state = linking.getStateFromPath(path, linking.config);
   if (!state) return void 0;

package/dist/cjs/router/Route.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Route_exports","__export","Route","RouteParamsContext","useContextKey","useRouteNode","module","exports","import_jsx_runtime","require","import_react","__toESM","import_findFocusedRoute","import_linkingConfig","import_matchers","import_params","import_router","import_RouteInfoContext","createContext","CurrentRouteContext","default","process","env","NODE_ENV","displayName","useContext","node","Error","getContextKey","contextKey","getParamsFromCurrentUrl","route","linking","getResolvedLinking","getStateFromPath","path","routeInfo","unstable_globalHref","window","location","pathname","search","state","config","focused","findFocusedRoute","params","param","children","parentParams","resolvedParams","useMemo","_node_dynamic","rp","ownParams","dynamic","length","mergeDynamicParams"],"sources":["../../../src/router/Route.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Route_exports","__export","Route","RouteParamsContext","useContextKey","useRouteNode","module","exports","import_jsx_runtime","require","import_react","__toESM","import_findFocusedRoute","import_linkingConfig","import_matchers","import_params","import_path","import_router","import_RouteInfoContext","createContext","CurrentRouteContext","default","process","env","NODE_ENV","displayName","useContext","node","Error","getContextKey","contextKey","getParamsFromCurrentUrl","route","linking","getResolvedLinking","getStateFromPath","path","getPathWithRecoveredDynamicSegment","routeInfo","unstable_globalHref","state","config","focused","findFocusedRoute","params","param","children","parentParams","resolvedParams","useMemo","_node_dynamic","rp","ownParams","dynamic","length","mergeDynamicParams"],"sources":["../../../src/router/Route.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/router/path.cjs

@@ -0,0 +1,73 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+  }
+  return to;
+};
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
+var path_exports = {};
+__export(path_exports, {
+  getPathWithRecoveredDynamicSegment: () => getPathWithRecoveredDynamicSegment,
+  getPathnameWithRecoveredDynamicSegment: () => getPathnameWithRecoveredDynamicSegment,
+  getSafeWindowPath: () => getSafeWindowPath,
+  getSafeWindowPathname: () => getSafeWindowPathname,
+  hasLostDynamicSegment: () => hasLostDynamicSegment,
+  normalizeRoutePathname: () => normalizeRoutePathname,
+  stripTrailingSlash: () => stripTrailingSlash
+});
+module.exports = __toCommonJS(path_exports);
+var import_getStateFromPath_mods = require("../fork/getStateFromPath-mods.cjs");
+function stripPathSuffix(path) {
+  const queryIndex = path.indexOf("?");
+  const hashIndex = path.indexOf("#");
+  let end = path.length;
+  if (queryIndex >= 0) end = Math.min(end, queryIndex);
+  if (hashIndex >= 0) end = Math.min(end, hashIndex);
+  return path.slice(0, end);
+}
+function stripTrailingSlash(pathname) {
+  return pathname.length > 1 && pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
+}
+function normalizeRoutePathname(pathname) {
+  return stripTrailingSlash((0, import_getStateFromPath_mods.stripBaseUrl)(stripPathSuffix(pathname)));
+}
+function hasLostDynamicSegment(path) {
+  return stripPathSuffix(path).split("/").includes("undefined");
+}
+function getSafeWindowPathname() {
+  if (typeof window === "undefined" || !window.location || typeof window.location.pathname !== "string") {
+    return void 0;
+  }
+  return window.location.pathname;
+}
+function getSafeWindowPath() {
+  const pathname = getSafeWindowPathname();
+  if (pathname === void 0) return void 0;
+  return pathname + (window.location.search || "");
+}
+function getPathWithRecoveredDynamicSegment(paths, fallbackPath = getSafeWindowPath()) {
+  for (const path of paths) {
+    if (path !== void 0 && !hasLostDynamicSegment(path)) {
+      return path;
+    }
+  }
+  return fallbackPath;
+}
+function getPathnameWithRecoveredDynamicSegment(pathname, fallbackPath = getSafeWindowPath()) {
+  return normalizeRoutePathname(getPathWithRecoveredDynamicSegment([pathname], fallbackPath) ?? pathname);
+}

package/dist/cjs/router/path.native.js

@@ -0,0 +1,98 @@
+"use strict";
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+  }
+  return to;
+};
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
+var path_exports = {};
+__export(path_exports, {
+  getPathWithRecoveredDynamicSegment: () => getPathWithRecoveredDynamicSegment,
+  getPathnameWithRecoveredDynamicSegment: () => getPathnameWithRecoveredDynamicSegment,
+  getSafeWindowPath: () => getSafeWindowPath,
+  getSafeWindowPathname: () => getSafeWindowPathname,
+  hasLostDynamicSegment: () => hasLostDynamicSegment,
+  normalizeRoutePathname: () => normalizeRoutePathname,
+  stripTrailingSlash: () => stripTrailingSlash
+});
+module.exports = __toCommonJS(path_exports);
+var import_getStateFromPath_mods = require("../fork/getStateFromPath-mods.native.js");
+function stripPathSuffix(path) {
+  var queryIndex = path.indexOf("?");
+  var hashIndex = path.indexOf("#");
+  var end = path.length;
+  if (queryIndex >= 0) end = Math.min(end, queryIndex);
+  if (hashIndex >= 0) end = Math.min(end, hashIndex);
+  return path.slice(0, end);
+}
+function stripTrailingSlash(pathname) {
+  return pathname.length > 1 && pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
+}
+function normalizeRoutePathname(pathname) {
+  return stripTrailingSlash((0, import_getStateFromPath_mods.stripBaseUrl)(stripPathSuffix(pathname)));
+}
+function hasLostDynamicSegment(path) {
+  return stripPathSuffix(path).split("/").includes("undefined");
+}
+function getSafeWindowPathname() {
+  if (typeof window === "undefined" || !window.location || typeof window.location.pathname !== "string") {
+    return void 0;
+  }
+  return window.location.pathname;
+}
+function getSafeWindowPath() {
+  var pathname = getSafeWindowPathname();
+  if (pathname === void 0) return void 0;
+  return pathname + (window.location.search || "");
+}
+function getPathWithRecoveredDynamicSegment(paths) {
+  var fallbackPath = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : getSafeWindowPath();
+  var _iteratorNormalCompletion = true,
+    _didIteratorError = false,
+    _iteratorError = void 0;
+  try {
+    for (var _iterator = paths[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var path = _step.value;
+      if (path !== void 0 && !hasLostDynamicSegment(path)) {
+        return path;
+      }
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+  return fallbackPath;
+}
+function getPathnameWithRecoveredDynamicSegment(pathname) {
+  var fallbackPath = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : getSafeWindowPath();
+  var _getPathWithRecoveredDynamicSegment;
+  return normalizeRoutePathname((_getPathWithRecoveredDynamicSegment = getPathWithRecoveredDynamicSegment([pathname], fallbackPath)) !== null && _getPathWithRecoveredDynamicSegment !== void 0 ? _getPathWithRecoveredDynamicSegment : pathname);
+}
+//# sourceMappingURL=path.native.js.map

package/dist/cjs/router/path.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","path_exports","__export","getPathWithRecoveredDynamicSegment","getPathnameWithRecoveredDynamicSegment","getSafeWindowPath","getSafeWindowPathname","hasLostDynamicSegment","normalizeRoutePathname","stripTrailingSlash","module","exports","import_getStateFromPath_mods","require","stripPathSuffix","path","queryIndex","indexOf","hashIndex","end","length","Math","min","slice","pathname","endsWith","stripBaseUrl","split","includes","window","location","search","paths","fallbackPath","arguments","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","err"],"sources":["../../../src/router/path.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,YAAA;AAAAC,QAAA,CAAAD,YAAA;EAAAE,kCAAA,EAAAA,CAAA,KAAAA,kCAAA;EAAAC,sCAAA,EAAAA,CAAA,KAAAA,sCAAA;EAAAC,iBAAA,EAAAA,CAAA,KAAAA,iBAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,sBAAA,EAAAA,CAAA,KAAAA,sBAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAf,YAAA,CAAAK,YAA6B;AAE7B,IAAAW,4BAA+C,GAAAC,OAAA;AAC7C,SAAMC,eAAaA,CAAAC,IAAK;EACxB,IAAAC,UAAM,GAAAD,IAAY,CAAAE,OAAK,IAAQ,CAAG;EAClC,IAAIC,SAAM,GAAKH,IAAA,CAAAE,OAAA;EAEf,IAAIE,GAAA,GAAAJ,IAAA,CAAAK,MAAiB;EACrB,IAAIJ,UAAA,IAAa,CAAG,EAAAG,GAAA,GAAME,IAAK,CAAAC,GAAI,CAAAH,GAAA,EAAKH,UAAS;EAEjD,IAAAE,SAAY,KAAM,EAAAC,GAAG,GAAGE,IAAA,CAAAC,GAAA,CAAAH,GAAA,EAAAD,SAAA;EAC1B,OAAAH,IAAA,CAAAQ,KAAA,IAAAJ,GAAA;AAEO;AACL,SAAOV,kBAAkBA,CAAAe,QAAK;EAChC,OAAAA,QAAA,CAAAJ,MAAA,QAAAI,QAAA,CAAAC,QAAA,QAAAD,QAAA,CAAAD,KAAA,UAAAC,QAAA;AAEO;AACL,SAAOhB,uBAAmBgB,QAAA;EAC5B,OAAAf,kBAAA,KAAAG,4BAAA,CAAAc,YAAA,EAAAZ,eAAA,CAAAU,QAAA;AAGO;AACL,SAAOjB,qBAAoBA,CAAEQ,IAAA,EAAM;EACrC,OAAAD,eAAA,CAAAC,IAAA,EAAAY,KAAA,MAAAC,QAAA;AAKO;AACL,SACEtB,qBAAkBA,CAAA;EAIlB,WAAOuB,MAAA,qBAAAA,MAAA,CAAAC,QAAA,WAAAD,MAAA,CAAAC,QAAA,CAAAN,QAAA;IACT;EACA;EACF,OAAAK,MAAA,CAAAC,QAAA,CAAAN,QAAA;AAEO;AACL,SAAMnB,iBAAWA,CAAA;EACjB,IAAImB,QAAA,GAAAlB,qBAA+B;EACnC,IAAAkB,QAAO,UAAY,UAAO,KAAS;EACrC,OAAAA,QAAA,IAAAK,MAAA,CAAAC,QAAA,CAAAC,MAAA;AAEO;AAML,SAAA5B,kCAA0BA,CAAA6B,KAAA;EACxB,IAAAC,YAAa,GAAAC,SAAc,CAAAd,MAAA,QAAAc,SAA0B,GAAG,cAAAA,SAAA,MAAA7B,iBAAA;EACtD,IAAA8B,yBAAO;IAAAC,iBAAA;IAAAC,cAAA;EAAA,IACT;IACF,SAAAC,SAAA,GAAAN,KAAA,CAAAO,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MAEA,IAAOpB,IAAA,GAAA0B,KAAA,CAAAzC,KAAA;MACT,IAAAe,IAAA,gBAAAR,qBAAA,CAAAQ,IAAA;QAEO,OAASA,IAAA;MAId;IACE;EACF,SAAA6B,GAAA;IACFR,iBAAA","ignoreList":[]}

package/dist/cjs/router/path.test.cjs

@@ -0,0 +1,62 @@
+var import_vitest = require("vitest");
+var import_path = require("./path.cjs");
+const originalBaseUrl = process.env.EXPO_BASE_URL;
+const originalNodeEnv = process.env.NODE_ENV;
+(0, import_vitest.afterEach)(() => {
+  if (originalBaseUrl === void 0) {
+    delete process.env.EXPO_BASE_URL;
+  } else {
+    process.env.EXPO_BASE_URL = originalBaseUrl;
+  }
+  if (originalNodeEnv === void 0) {
+    delete process.env.NODE_ENV;
+  } else {
+    process.env.NODE_ENV = originalNodeEnv;
+  }
+});
+(0, import_vitest.describe)("hasLostDynamicSegment", () => {
+  (0, import_vitest.it)('detects a literal "undefined" segment', () => {
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/undefined")).toBe(true);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/users/undefined/posts")).toBe(true);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/undefined")).toBe(true);
+  });
+  (0, import_vitest.it)('does not match "undefined" inside another segment', () => {
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/undefined-things")).toBe(false);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/notundefined")).toBe(false);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/foo-undefined-bar")).toBe(false);
+  });
+  (0, import_vitest.it)("ignores search and hash values", () => {
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/undefined?tab=profile")).toBe(true);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/mai1015?x=undefined")).toBe(false);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/mai1015#undefined")).toBe(false);
+  });
+});
+(0, import_vitest.describe)("normalizeRoutePathname", () => {
+  (0, import_vitest.it)("strips search, hash, and trailing slash", () => {
+    (0, import_vitest.expect)((0, import_path.normalizeRoutePathname)("/p/mai1015/?tab=profile#top")).toBe("/p/mai1015");
+    (0, import_vitest.expect)((0, import_path.normalizeRoutePathname)("/")).toBe("/");
+  });
+  (0, import_vitest.it)("strips the production base url", () => {
+    process.env.NODE_ENV = "production";
+    process.env.EXPO_BASE_URL = "/expo/prefix";
+    (0, import_vitest.expect)((0, import_path.normalizeRoutePathname)("/expo/prefix/p/mai1015?tab=profile")).toBe("/p/mai1015");
+  });
+});
+(0, import_vitest.describe)("getPathWithRecoveredDynamicSegment", () => {
+  (0, import_vitest.it)("uses the first uncorrupted candidate path", () => {
+    (0, import_vitest.expect)((0, import_path.getPathWithRecoveredDynamicSegment)(["/p/undefined", "/p/mai1015?tab=profile"], "/p/browser?tab=profile")).toBe("/p/mai1015?tab=profile");
+  });
+  (0, import_vitest.it)("keeps an empty uncorrupted candidate path", () => {
+    (0, import_vitest.expect)((0, import_path.getPathWithRecoveredDynamicSegment)([""], "/browser")).toBe("");
+  });
+  (0, import_vitest.it)("falls back when every candidate path is corrupted", () => {
+    (0, import_vitest.expect)((0, import_path.getPathWithRecoveredDynamicSegment)(["/p/undefined"], "/p/browser?tab=profile")).toBe("/p/browser?tab=profile");
+  });
+});
+(0, import_vitest.describe)("getPathnameWithRecoveredDynamicSegment", () => {
+  (0, import_vitest.it)("normalizes the recovered browser pathname", () => {
+    process.env.NODE_ENV = "production";
+    process.env.EXPO_BASE_URL = "/expo/prefix";
+    (0, import_vitest.expect)((0, import_path.getPathnameWithRecoveredDynamicSegment)("/p/undefined", "/expo/prefix/p/mai1015?tab=profile")).toBe("/p/mai1015");
+  });
+});

package/dist/cjs/router/path.test.native.js

@@ -0,0 +1,65 @@
+"use strict";
+
+var import_vitest = require("vitest");
+var import_path = require("./path.native.js");
+var originalBaseUrl = process.env.EXPO_BASE_URL;
+var originalNodeEnv = process.env.NODE_ENV;
+(0, import_vitest.afterEach)(function () {
+  if (originalBaseUrl === void 0) {
+    delete process.env.EXPO_BASE_URL;
+  } else {
+    process.env.EXPO_BASE_URL = originalBaseUrl;
+  }
+  if (originalNodeEnv === void 0) {
+    delete process.env.NODE_ENV;
+  } else {
+    process.env.NODE_ENV = originalNodeEnv;
+  }
+});
+(0, import_vitest.describe)("hasLostDynamicSegment", function () {
+  (0, import_vitest.it)('detects a literal "undefined" segment', function () {
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/undefined")).toBe(true);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/users/undefined/posts")).toBe(true);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/undefined")).toBe(true);
+  });
+  (0, import_vitest.it)('does not match "undefined" inside another segment', function () {
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/undefined-things")).toBe(false);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/notundefined")).toBe(false);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/foo-undefined-bar")).toBe(false);
+  });
+  (0, import_vitest.it)("ignores search and hash values", function () {
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/undefined?tab=profile")).toBe(true);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/mai1015?x=undefined")).toBe(false);
+    (0, import_vitest.expect)((0, import_path.hasLostDynamicSegment)("/p/mai1015#undefined")).toBe(false);
+  });
+});
+(0, import_vitest.describe)("normalizeRoutePathname", function () {
+  (0, import_vitest.it)("strips search, hash, and trailing slash", function () {
+    (0, import_vitest.expect)((0, import_path.normalizeRoutePathname)("/p/mai1015/?tab=profile#top")).toBe("/p/mai1015");
+    (0, import_vitest.expect)((0, import_path.normalizeRoutePathname)("/")).toBe("/");
+  });
+  (0, import_vitest.it)("strips the production base url", function () {
+    process.env.NODE_ENV = "production";
+    process.env.EXPO_BASE_URL = "/expo/prefix";
+    (0, import_vitest.expect)((0, import_path.normalizeRoutePathname)("/expo/prefix/p/mai1015?tab=profile")).toBe("/p/mai1015");
+  });
+});
+(0, import_vitest.describe)("getPathWithRecoveredDynamicSegment", function () {
+  (0, import_vitest.it)("uses the first uncorrupted candidate path", function () {
+    (0, import_vitest.expect)((0, import_path.getPathWithRecoveredDynamicSegment)(["/p/undefined", "/p/mai1015?tab=profile"], "/p/browser?tab=profile")).toBe("/p/mai1015?tab=profile");
+  });
+  (0, import_vitest.it)("keeps an empty uncorrupted candidate path", function () {
+    (0, import_vitest.expect)((0, import_path.getPathWithRecoveredDynamicSegment)([""], "/browser")).toBe("");
+  });
+  (0, import_vitest.it)("falls back when every candidate path is corrupted", function () {
+    (0, import_vitest.expect)((0, import_path.getPathWithRecoveredDynamicSegment)(["/p/undefined"], "/p/browser?tab=profile")).toBe("/p/browser?tab=profile");
+  });
+});
+(0, import_vitest.describe)("getPathnameWithRecoveredDynamicSegment", function () {
+  (0, import_vitest.it)("normalizes the recovered browser pathname", function () {
+    process.env.NODE_ENV = "production";
+    process.env.EXPO_BASE_URL = "/expo/prefix";
+    (0, import_vitest.expect)((0, import_path.getPathnameWithRecoveredDynamicSegment)("/p/undefined", "/expo/prefix/p/mai1015?tab=profile")).toBe("/p/mai1015");
+  });
+});
+//# sourceMappingURL=path.test.native.js.map

package/dist/cjs/router/path.test.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["import_vitest","require","import_path","originalBaseUrl","process","env","EXPO_BASE_URL","originalNodeEnv","NODE_ENV","afterEach","describe","it","expect","hasLostDynamicSegment","toBe","normalizeRoutePathname","getPathWithRecoveredDynamicSegment","getPathnameWithRecoveredDynamicSegment"],"sources":["../../../src/router/path.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/router/router.cjs

@@ -29,7 +29,7 @@ __export(router_exports, {
   dismiss: () => dismiss,
   dismissAll: () => dismissAll,
   getPreloadHistory: () => getPreloadHistory,
-  getSafeWindowPathname: () => getSafeWindowPathname,
+  getSafeWindowPathname: () => import_path3.getSafeWindowPathname,
   getSortedRoutes: () => getSortedRoutes,
   getValidationState: () => getValidationState,
   goBack: () => goBack,
@@ -91,6 +91,7 @@ var import_getRouteInfo = require("./getRouteInfo.cjs");
 var import_getRoutes = require("./getRoutes.cjs");
 var import_lastAction = require("./lastAction.cjs");
 var import_linkingConfig = require("./linkingConfig.cjs");
+var import_path2 = require("./path.cjs");
 var import_sortRoutes = require("./sortRoutes.cjs");
 var import_useScreens = require("./useScreens.cjs");
 var import_useViteRoutes = require("./useViteRoutes.cjs");
@@ -99,6 +100,7 @@ var import_useMatches = require("../useMatches.cjs");
 var import_interceptRoutes = require("./interceptRoutes.cjs");
 var import_Navigator = require("../views/Navigator.cjs");
 var import_notFoundState = require("../notFoundState.cjs");
+var import_path3 = require("./path.cjs");
 let routeNode = null;
 let rootComponent;
 const protectedRouteRegistry = /* @__PURE__ */new Map();
@@ -228,7 +230,7 @@ function cleanUpState() {
 }
 function setupLinkingAndRouteInfo(initialLocation, linking) {
   initialState = (0, import_linkingConfig.setupLinking)(routeNode, initialLocation, linking);
-  initialPathname = initialLocation?.pathname ?? getSafeWindowPathname();
+  initialPathname = initialLocation?.pathname ?? (0, import_path2.getSafeWindowPathname)();
   if (initialState) {
     rootState = initialState;
     routeInfo = (0, import_getRouteInfo.getRouteInfo)(initialState);
@@ -415,16 +417,9 @@ function rootStateSnapshot() {
 function routeInfoSnapshot() {
   return routeInfo;
 }
-function normalizePathname(pathname) {
-  return pathname.length > 1 && pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
-}
-function getSafeWindowPathname() {
-  if (typeof window === "undefined" || !window.location || typeof window.location.pathname !== "string") return;
-  return window.location.pathname;
-}
 function getBrowserPathname() {
-  const pathname = getSafeWindowPathname();
-  return pathname === void 0 ? void 0 : normalizePathname(pathname);
+  const pathname = (0, import_path2.getSafeWindowPathname)();
+  return pathname === void 0 ? void 0 : (0, import_path2.normalizeRoutePathname)(pathname);
 }
 function shouldKeepPendingNavigationState(currentState) {
   if (!pendingNavigationPathname) return false;
@@ -797,7 +792,7 @@ async function linkTo(href, event, options) {
   const hash = href.indexOf("#");
   if (currentRootState.key && hash > 0) hashes[currentRootState.key] = href.slice(hash);
   nextOptions = options ?? null;
-  pendingNavigationPathname = normalizePathname((0, import_findRouteNode.extractPathnameFromHref)(href));
+  pendingNavigationPathname = (0, import_path2.stripTrailingSlash)((0, import_findRouteNode.extractPathnameFromHref)(href));
   pendingNavigationAction = event === "PUSH" || event === "REPLACE" || event === "NAVIGATE" ? event : void 0;
   lastIntendedPathname = pendingNavigationPathname;
   const freshRootState = navigationRef.getRootState();

package/dist/cjs/router/router.native.js

@@ -31,7 +31,7 @@ __export(router_exports, {
   dismiss: () => dismiss,
   dismissAll: () => dismissAll,
   getPreloadHistory: () => getPreloadHistory,
-  getSafeWindowPathname: () => getSafeWindowPathname,
+  getSafeWindowPathname: () => import_path3.getSafeWindowPathname,
   getSortedRoutes: () => getSortedRoutes,
   getValidationState: () => getValidationState,
   goBack: () => goBack,
@@ -93,6 +93,7 @@ var import_getRouteInfo = require("./getRouteInfo.native.js");
 var import_getRoutes = require("./getRoutes.native.js");
 var import_lastAction = require("./lastAction.native.js");
 var import_linkingConfig = require("./linkingConfig.native.js");
+var import_path2 = require("./path.native.js");
 var import_sortRoutes = require("./sortRoutes.native.js");
 var import_useScreens = require("./useScreens.native.js");
 require("./useViteRoutes.native.js");
@@ -101,6 +102,7 @@ var import_useMatches = require("../useMatches.native.js");
 var import_interceptRoutes = require("./interceptRoutes.native.js");
 var import_Navigator = require("../views/Navigator.native.js");
 var import_notFoundState = require("../notFoundState.native.js");
+var import_path3 = require("./path.native.js");
 function _instanceof(left, right) {
   "@swc/helpers - instanceof";
 
@@ -292,7 +294,7 @@ function cleanUpState() {
 function setupLinkingAndRouteInfo(initialLocation, linking) {
   var _ref;
   initialState = (0, import_linkingConfig.setupLinking)(routeNode, initialLocation, linking);
-  initialPathname = (_ref = initialLocation === null || initialLocation === void 0 ? void 0 : initialLocation.pathname) !== null && _ref !== void 0 ? _ref : getSafeWindowPathname();
+  initialPathname = (_ref = initialLocation === null || initialLocation === void 0 ? void 0 : initialLocation.pathname) !== null && _ref !== void 0 ? _ref : (0, import_path2.getSafeWindowPathname)();
   if (initialState) {
     rootState = initialState;
     routeInfo = (0, import_getRouteInfo.getRouteInfo)(initialState);
@@ -561,16 +563,9 @@ function rootStateSnapshot() {
 function routeInfoSnapshot() {
   return routeInfo;
 }
-function normalizePathname(pathname) {
-  return pathname.length > 1 && pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
-}
-function getSafeWindowPathname() {
-  if (typeof window === "undefined" || !window.location || typeof window.location.pathname !== "string") return;
-  return window.location.pathname;
-}
 function getBrowserPathname() {
-  var pathname = getSafeWindowPathname();
-  return pathname === void 0 ? void 0 : normalizePathname(pathname);
+  var pathname = (0, import_path2.getSafeWindowPathname)();
+  return pathname === void 0 ? void 0 : (0, import_path2.normalizeRoutePathname)(pathname);
 }
 function shouldKeepPendingNavigationState(currentState) {
   if (!pendingNavigationPathname) return false;
@@ -816,7 +811,7 @@ async function linkTo(href, event, options) {
   var hash = href.indexOf("#");
   if (currentRootState.key && hash > 0) hashes[currentRootState.key] = href.slice(hash);
   nextOptions = options !== null && options !== void 0 ? options : null;
-  pendingNavigationPathname = normalizePathname((0, import_findRouteNode.extractPathnameFromHref)(href));
+  pendingNavigationPathname = (0, import_path2.stripTrailingSlash)((0, import_findRouteNode.extractPathnameFromHref)(href));
   pendingNavigationAction = event === "PUSH" || event === "REPLACE" || event === "NAVIGATE" ? event : void 0;
   lastIntendedPathname = pendingNavigationPathname;
   var freshRootState = navigationRef.getRootState();