one 1.1.390 → 1.1.391

package/dist/esm/fork/extractPathFromURL.native.js

@@ -1,41 +1,78 @@
-import URL from "url-parse";
+function parsePathAndParamsFromExpoGoLink(url) {
+  var href = parsePathFromExpoGoLink(url), results = href.match(/([^?]*)(\?.*)?/), _results_, _results_1;
+  return {
+    pathname: (_results_ = results?.[1]) !== null && _results_ !== void 0 ? _results_ : "",
+    queryString: (_results_1 = results?.[2]) !== null && _results_1 !== void 0 ? _results_1 : ""
+  };
+}
+function parsePathFromExpoGoLink(url) {
+  var _url_match, _url_match_;
+  return (_url_match_ = (_url_match = url.match(/exps?:\/\/.*?\/--\/(.*)/)) === null || _url_match === void 0 ? void 0 : _url_match[1]) !== null && _url_match_ !== void 0 ? _url_match_ : "";
+}
 function extractExactPathFromURL(url) {
+  var _globalThis_expo_modules, _globalThis_expo;
   if (
     // If a universal link / app link / web URL is used, we should use the path
     // from the URL, while stripping the origin.
     url.match(/^https?:\/\//)
   ) {
-    var { origin, href } = new URL(url);
-    return href.replace(origin, "");
+    var { origin, href, hostname } = new URL(url);
+    return hostname === "exp.host" || hostname === "u.expo.dev" ? "" : href.replace(origin, "");
+  }
+  var isExpoGo = typeof expo < "u" && ((_globalThis_expo = globalThis.expo) === null || _globalThis_expo === void 0 || (_globalThis_expo_modules = _globalThis_expo.modules) === null || _globalThis_expo_modules === void 0 ? void 0 : _globalThis_expo_modules.ExpoGo);
+  if (isExpoGo && // while not exhaustive, `exp` and `exps` are the only two schemes which
+  // are passed through to other apps in Expo Go.
+  url.match(/^exp(s)?:\/\//)) {
+    var _url_match, pathname = parsePathFromExpoGoLink(url);
+    if (pathname)
+      return fromDeepLink("a://" + pathname);
+    var queryParams = (_url_match = url.match(/exps?:\/\/.*\?(.*)/)) === null || _url_match === void 0 ? void 0 : _url_match[1];
+    return queryParams ? fromDeepLink("a://?" + queryParams) : "";
   }
   return fromDeepLink(url);
 }
 function isExpoDevelopmentClient(url) {
-  return !!url.hostname.match(/^expo-development-client$/);
+  return url.hostname === "expo-development-client";
 }
 function fromDeepLink(url) {
-  var res = new URL(url, !0);
+  var res;
+  try {
+    res = new URL(url);
+  } catch {
+    return url.replace(/^[^:]+:\/\//, "");
+  }
   if (isExpoDevelopmentClient(res)) {
-    if (!res.query || !res.query.url)
+    if (!res.searchParams.get("url"))
       return "";
-    var incomingUrl = res.query.url;
+    var incomingUrl = res.searchParams.get("url");
     return extractExactPathFromURL(decodeURI(incomingUrl));
   }
-  var qs = res.query ? Object.entries(res.query).map(function(param) {
-    var [k, v] = param;
-    return `${k}=${decodeURIComponent(v)}`;
-  }).join("&") : "", results = "";
-  return res.host && (results += res.host), res.pathname && (results += res.pathname), qs && (results += "?" + qs), results;
+  var results = "";
+  res.host && (results += res.host), res.pathname && (results += res.pathname);
+  var qs = res.search ? (
+    // @ts-ignore: `entries` is not on `URLSearchParams` in some typechecks.
+    [
+      ...res.searchParams.entries()
+    ].map(function(param) {
+      var [k, v] = param;
+      return `${k}=${decodeURIComponent(v)}`;
+    }).join("&")
+  ) : "";
+  return qs && (results += "?" + qs), results;
 }
-function extractExpoPathFromURL() {
-  var url = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "";
+function extractExpoPathFromURL(_prefixes) {
+  var url = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
   return extractExactPathFromURL(url).replace(/^\//, "");
 }
 function adjustPathname(url) {
   return url.hostname === "exp.host" || url.hostname === "u.expo.dev" ? url.pathname.split("/").slice(2).join("/") : url.pathname;
 }
+var extractPathFromURL = extractExpoPathFromURL;
 export {
   adjustPathname,
-  extractExpoPathFromURL
+  extractExpoPathFromURL,
+  extractPathFromURL,
+  parsePathAndParamsFromExpoGoLink,
+  parsePathFromExpoGoLink
 };
 //# sourceMappingURL=extractPathFromURL.js.map

package/dist/esm/fork/extractPathFromURL.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/fork/Users/n8/one/packages/one/src/fork/extractPathFromURL.ts"],
-  "mappings": "AAAA,OAAOA,SAAS;AAGhB,SAASC,wBAAwBC,KAAW;AAC1C;;;IAGEA,IAAIC,MAAM,cAAA;IACV;AACA,QAAM,EAAEC,QAAQC,KAAI,IAAK,IAAIL,IAAIE,GAAAA;AACjC,WAAOG,KAAKC,QAAQF,QAAQ,EAAA;EAC9B;AA4BA,SAAOG,aAAaL,GAAAA;AACtB;AAGA,SAASM,wBAAwBN,KAA4C;AAC3E,SAAO,CAAC,CAACA,IAAIO,SAASN,MAAM,2BAAA;AAC9B;AAEA,SAASI,aAAaL,KAAW;AAG/B,MAAMQ,MAAM,IAAIV,IAAIE,KAAK,EAAA;AAEzB,MAAIM,wBAAwBE,GAAAA,GAAM;AAChC,QAAI,CAACA,IAAIC,SAAS,CAACD,IAAIC,MAAMT;AAC3B,aAAO;AAET,QAAMU,cAAcF,IAAIC,MAAMT;AAC9B,WAAOD,wBAAwBY,UAAUD,WAAAA,CAAAA;EAC3C;AAEA,MAAME,KAAMJ,IAAIC,QAEZI,OAAOC,QAAQN,IAAIC,KAAK,EACrBM,IAAI,SAAA,OAAA;QAAC,CAACC,GAAGC,CAAAA,IAAE;WAAK,GAAGD,CAAAA,IAAKE,mBAAmBD,CAAAA,CAAAA;KAC3CE,KAAK,GAAA,IAHR,IAKAC,UAAU;AAEd,SAAIZ,IAAIa,SACND,WAAWZ,IAAIa,OAGbb,IAAIc,aACNF,WAAWZ,IAAIc,WAGbV,OACFQ,WAAW,MAAMR,KAGZQ;AACT;AAEO,SAASG,yBAAAA;MAAuBvB,MAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAM;AAE3C,SAAOD,wBAAwBC,GAAAA,EAAKI,QAAQ,OAAO,EAAA;AACrD;AAEO,SAASoB,eAAexB,KAAmD;AAChF,SAAIA,IAAIO,aAAa,cAAcP,IAAIO,aAAa,eAE3CP,IAAIsB,SAASG,MAAM,GAAA,EAAKC,MAAM,CAAA,EAAGP,KAAK,GAAA,IAExCnB,IAAIsB;AACb;",
-  "names": ["URL", "extractExactPathFromURL", "url", "match", "origin", "href", "replace", "fromDeepLink", "isExpoDevelopmentClient", "hostname", "res", "query", "incomingUrl", "decodeURI", "qs", "Object", "entries", "map", "k", "v", "decodeURIComponent", "join", "results", "host", "pathname", "extractExpoPathFromURL", "adjustPathname", "split", "slice"]
+  "mappings": "AAAO,SAASA,iCAAiCC,KAAW;AAO1D,MAAMC,OAAOC,wBAAwBF,GAAAA,GAC/BG,UAAUF,KAAKG,MAAM,gBAAA,GAEfD,WACGA;AAFf,SAAO;IACLE,WAAUF,YAAAA,UAAU,CAAA,OAAE,QAAZA,cAAAA,SAAAA,YAAgB;IAC1BG,cAAaH,aAAAA,UAAU,CAAA,OAAE,QAAZA,eAAAA,SAAAA,aAAgB;EAC/B;AACF;AAEO,SAASD,wBAAwBF,KAAW;MAG1CA,YAAAA;AAAP,UAAOA,eAAAA,aAAAA,IAAII,MAAM,yBAAA,OAAA,QAAVJ,eAAAA,SAAAA,SAAAA,WAAuC,CAAA,OAAE,QAAzCA,gBAAAA,SAAAA,cAA6C;AACtD;AAGA,SAASO,wBAAwBP,KAAW;MAiBMQ,0BAAAA;AAhBhD;;;IAGER,IAAII,MAAM,cAAA;IACV;AACA,QAAM,EAAEK,QAAQR,MAAMS,SAAQ,IAAK,IAAIC,IAAIX,GAAAA;AAE3C,WAAIU,aAAa,cAAcA,aAAa,eAGnC,KAGFT,KAAKW,QAAQH,QAAQ,EAAA;EAC9B;AAEA,MAAMI,WAAW,OAAOC,OAAS,SAAeN,mBAAAA,WAAWM,UAAI,QAAfN,qBAAAA,WAAAA,2BAAAA,iBAAiBO,aAAO,QAAxBP,6BAAAA,SAAAA,SAAAA,yBAA0BQ;AAG1E,MACEH;;EAGAb,IAAII,MAAM,eAAA,GACV;QAMoBJ,YALdK,WAAWH,wBAAwBF,GAAAA;AACzC,QAAIK;AACF,aAAOY,aAAa,SAASZ,QAAAA;AAG/B,QAAMa,eAAclB,aAAAA,IAAII,MAAM,oBAAA,OAAA,QAAVJ,eAAAA,SAAAA,SAAAA,WAAkC,CAAA;AACtD,WAAIkB,cACKD,aAAa,UAAUC,WAAAA,IAGzB;EACT;AAIA,SAAOD,aAAajB,GAAAA;AACtB;AAGA,SAASmB,wBAAwBnB,KAAQ;AACvC,SAAOA,IAAIU,aAAa;AAC1B;AAEA,SAASO,aAAajB,KAAW;AAC/B,MAAIoB;AACJ,MAAI;AAGFA,UAAM,IAAIT,IAAIX,GAAAA;EAChB,QAAQ;AAWN,WAAOA,IAAIY,QAAQ,eAAe,EAAA;EACpC;AAEA,MAAIO,wBAAwBC,GAAAA,GAAM;AAChC,QAAI,CAACA,IAAIC,aAAaC,IAAI,KAAA;AACxB,aAAO;AAET,QAAMC,cAAcH,IAAIC,aAAaC,IAAI,KAAA;AACzC,WAAOf,wBAAwBiB,UAAUD,WAAAA,CAAAA;EAC3C;AAEA,MAAIpB,UAAU;AAEd,EAAIiB,IAAIK,SACNtB,WAAWiB,IAAIK,OAGbL,IAAIf,aACNF,WAAWiB,IAAIf;AAGjB,MAAMqB,KAAMN,IAAIO;;IAGZ;SAAIP,IAAIC,aAAaO,QAAO;MACzBC,IAAI,SAAA,OAAA;UAAC,CAACC,GAAGC,CAAAA,IAAE;aAAK,GAAGD,CAAAA,IAAKE,mBAAmBD,CAAAA,CAAAA;OAC3CE,KAAK,GAAA;MAJR;AAMJ,SAAIP,OACFvB,WAAW,MAAMuB,KAGZvB;AACT;AAEO,SAAS+B,uBAAuBC,WAAmB;MAAEnC,MAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAM;AAChE,SACEO,wBAAwBP,GAAAA,EAErBY,QAAQ,OAAO,EAAA;AAEtB;AAEO,SAASwB,eAAepC,KAAmD;AAChF,SAAIA,IAAIU,aAAa,cAAcV,IAAIU,aAAa,eAE3CV,IAAIK,SAASgC,MAAM,GAAA,EAAKC,MAAM,CAAA,EAAGL,KAAK,GAAA,IAExCjC,IAAIK;AACb;AAEO,IAAMkC,qBAAqBL;",
+  "names": ["parsePathAndParamsFromExpoGoLink", "url", "href", "parsePathFromExpoGoLink", "results", "match", "pathname", "queryString", "extractExactPathFromURL", "globalThis", "origin", "hostname", "URL", "replace", "isExpoGo", "expo", "modules", "ExpoGo", "fromDeepLink", "queryParams", "isExpoDevelopmentClient", "res", "searchParams", "get", "incomingUrl", "decodeURI", "host", "qs", "search", "entries", "map", "k", "v", "decodeURIComponent", "join", "extractExpoPathFromURL", "_prefixes", "adjustPathname", "split", "slice", "extractPathFromURL"]
 }

package/dist/esm/fork/findFocusedRoute.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/fork/findFocusedRoute.tsx"],
-  "mappings": "AAIO,SAAS,iBAAiB,OAAqB;AACpD,MAAI,UAAoC;AAExC,SAAO,SAAS,OAAO,QAAQ,SAAS,CAAC,EAAE,SAAS;AAClD,cAAU,QAAQ,OAAO,QAAQ,SAAS,CAAC,EAAE;AAK/C,SAFc,SAAS,OAAO,SAAS,SAAS,CAAC;AAGnD;",
+  "mappings": "AAYO,SAAS,iBAAiB,OAAqB;AACpD,MAAI,UAAoC;AAExC,SAAO,SAAS,OAAO,QAAQ,SAAS,CAAC,EAAE,SAAS;AAClD,cAAU,QAAQ,OAAO,QAAQ,SAAS,CAAC,EAAE;AAK/C,SAFc,SAAS,OAAO,SAAS,SAAS,CAAC;AAGnD;",
   "names": []
 }

package/dist/esm/fork/findFocusedRoute.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["findFocusedRoute","state","current","routes","index"],"sources":["../../../src/fork/findFocusedRoute.tsx"],"sourcesContent":[null],"mappings":"AAIO,SAASA,iBAAiBC,KAAA,EAAqB;EACpD,IAAIC,OAAA,GAAoCD,KAAA;EAExC,OAAOC,OAAA,EAASC,MAAA,CAAOD,OAAA,CAAQE,KAAA,IAAS,CAAC,EAAEH,KAAA,IAAS,OAClDC,OAAA,GAAUA,OAAA,CAAQC,MAAA,CAAOD,OAAA,CAAQE,KAAA,IAAS,CAAC,EAAEH,KAAA;EAK/C,OAFcC,OAAA,EAASC,MAAA,CAAOD,OAAA,EAASE,KAAA,IAAS,CAAC;AAGnD","ignoreList":[]}
+{"version":3,"names":["findFocusedRoute","state","current","routes","index"],"sources":["../../../src/fork/findFocusedRoute.tsx"],"sourcesContent":[null],"mappings":"AAYO,SAASA,iBAAiBC,KAAA,EAAqB;EACpD,IAAIC,OAAA,GAAoCD,KAAA;EAExC,OAAOC,OAAA,EAASC,MAAA,CAAOD,OAAA,CAAQE,KAAA,IAAS,CAAC,EAAEH,KAAA,IAAS,OAClDC,OAAA,GAAUA,OAAA,CAAQC,MAAA,CAAOD,OAAA,CAAQE,KAAA,IAAS,CAAC,EAAEH,KAAA;EAK/C,OAFcC,OAAA,EAASC,MAAA,CAAOD,OAAA,EAASE,KAAA,IAAS,CAAC;AAGnD","ignoreList":[]}

package/dist/esm/fork/findFocusedRoute.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/fork/Users/n8/one/packages/one/src/fork/findFocusedRoute.tsx"],
-  "mappings": "AAIO,SAASA,iBAAiBC,OAAmB;AAGlD,WAFIC,UAAoCD,OAEjBC,gBAAhBA,SAASC,QAAOD,iBAAAA,QAAQE,WAAK,QAAbF,mBAAAA,SAAAA,iBAAiB,CAAA,EAAGD,SAAS,QAAM;QAC/BC;AAAzBA,cAAUA,QAAQC,QAAOD,kBAAAA,QAAQE,WAAK,QAAbF,oBAAAA,SAAAA,kBAAiB,CAAA,EAAGD;EAC/C;MAE8BC,iBAAxBG,QAAQH,SAASC,QAAOD,kBAAAA,SAASE,WAAK,QAAdF,oBAAAA,SAAAA,kBAAkB,CAAA;AAEhD,SAAOG;AACT;",
+  "mappings": "AAYO,SAASA,iBAAiBC,OAAmB;AAGlD,WAFIC,UAAoCD,OAEjBC,gBAAhBA,SAASC,QAAOD,iBAAAA,QAAQE,WAAK,QAAbF,mBAAAA,SAAAA,iBAAiB,CAAA,EAAGD,SAAS,QAAM;QAC/BC;AAAzBA,cAAUA,QAAQC,QAAOD,kBAAAA,QAAQE,WAAK,QAAbF,oBAAAA,SAAAA,kBAAiB,CAAA,EAAGD;EAC/C;MAE8BC,iBAAxBG,QAAQH,SAASC,QAAOD,kBAAAA,SAASE,WAAK,QAAdF,oBAAAA,SAAAA,kBAAkB,CAAA;AAEhD,SAAOG;AACT;",
   "names": ["findFocusedRoute", "state", "current", "routes", "index", "route"]
 }

package/dist/esm/fork/getPathFromState-mods.js

@@ -0,0 +1,40 @@
+import { matchDeepDynamicRouteName, matchDynamicName, matchGroupName } from "../router/matchers";
+function getPathWithConventionsCollapsed({
+  pattern,
+  route,
+  params,
+  preserveGroups,
+  preserveDynamicRoutes,
+  shouldEncodeURISegment = !0,
+  initialRouteName
+}) {
+  const segments = pattern.split("/");
+  return segments.map((p, i) => {
+    const name = getParamName(p);
+    if (p.startsWith("*"))
+      return preserveDynamicRoutes ? name === "not-found" ? "+not-found" : `[...${name}]` : params[name] ? Array.isArray(params[name]) ? params[name].join("/") : params[name] : route.name.startsWith("[") && route.name.endsWith("]") || p === "*not-found" ? "" : route.name;
+    if (p.startsWith(":")) {
+      if (preserveDynamicRoutes)
+        return `[${name}]`;
+      const value = params[name];
+      return value === void 0 && p.endsWith("?") ? void 0 : (shouldEncodeURISegment ? encodeURISegment(value) : value) ?? "undefined";
+    }
+    return !preserveGroups && matchGroupName(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : shouldEncodeURISegment ? encodeURISegment(initialRouteName, { preserveBrackets: !0 }) : initialRouteName : "" : shouldEncodeURISegment ? encodeURISegment(p, { preserveBrackets: !0 }) : p;
+  }).map((v) => v ?? "").join("/");
+}
+const getParamName = (pattern) => pattern.replace(/^[:*]/, "").replace(/\?$/, "");
+function appendBaseUrl(path, baseUrl = process.env.EXPO_BASE_URL) {
+  return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
+}
+function segmentMatchesConvention(segment) {
+  return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null || matchDeepDynamicRouteName(segment) != null;
+}
+function encodeURISegment(str, { preserveBrackets = !1 } = {}) {
+  return str = String(str).replace(/[^A-Za-z0-9\-._~!$&'()*+,;=:@]/g, (char) => encodeURIComponent(char)), preserveBrackets && (str = str.replace(/%5B/g, "[").replace(/%5D/g, "]")), str;
+}
+export {
+  appendBaseUrl,
+  getParamName,
+  getPathWithConventionsCollapsed
+};
+//# sourceMappingURL=getPathFromState-mods.js.map

package/dist/esm/fork/getPathFromState-mods.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/fork/getPathFromState-mods.ts"],
+  "mappings": "AAQA,SAAS,2BAA2B,kBAAkB,sBAAsB;AAarE,SAAS,gCAAgC;AAAA,EAC9C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,yBAAyB;AAAA,EACzB;AACF,GAKG;AACD,QAAM,WAAW,QAAQ,MAAM,GAAG;AAElC,SAAO,SACJ,IAAI,CAAC,GAAG,MAAM;AACb,UAAM,OAAO,aAAa,CAAC;AAI3B,QAAI,EAAE,WAAW,GAAG;AAClB,aAAI,wBACE,SAAS,cACJ,eAGF,OAAO,IAAI,MAGhB,OAAO,IAAI,IACT,MAAM,QAAQ,OAAO,IAAI,CAAC,IACrB,OAAO,IAAI,EAAE,KAAK,GAAG,IAEvB,OAAO,IAAI,IAGhB,MAAM,KAAK,WAAW,GAAG,KAAK,MAAM,KAAK,SAAS,GAAG,KAIrD,MAAM,eACD,KAGF,MAAM;AAIf,QAAI,EAAE,WAAW,GAAG,GAAG;AACrB,UAAI;AACF,eAAO,IAAI,IAAI;AAGjB,YAAM,QAAQ,OAAO,IAAI;AACzB,aAAI,UAAU,UAAa,EAAE,SAAS,GAAG,IACvC,UAGM,yBAAyB,iBAAiB,KAAK,IAAI,UAAU;AAAA,IACvE;AAEA,WAAI,CAAC,kBAAkB,eAAe,CAAC,KAAK,OAItC,SAAS,SAAS,MAAM,KACtB,mBAEE,yBAAyB,gBAAgB,IACpC,KAEF,yBACH,iBAAiB,kBAAkB,EAAE,kBAAkB,GAAK,CAAC,IAC7D,mBAGD,KAGF,yBAAyB,iBAAiB,GAAG,EAAE,kBAAkB,GAAK,CAAC,IAAI;AAAA,EACpF,CAAC,EACA,IAAI,CAAC,MAAM,KAAK,EAAE,EAClB,KAAK,GAAG;AACb;AAEO,MAAM,eAAe,CAAC,YAAoB,QAAQ,QAAQ,SAAS,EAAE,EAAE,QAAQ,OAAO,EAAE;AAExF,SAAS,cACd,MACA,UAA8B,QAAQ,IAAI,eAC1C;AACA,SAAI,QAAQ,IAAI,aAAa,iBACvB,UACK,IAAI,QAAQ,QAAQ,QAAQ,EAAE,EAAE,QAAQ,OAAO,EAAE,CAAC,GAAG,IAAI,KAG7D;AACT;AAEA,SAAS,yBAAyB,SAA0B;AAC1D,SACE,YAAY,WACZ,iBAAiB,OAAO,KAAK,QAC7B,eAAe,OAAO,KAAK,QAC3B,0BAA0B,OAAO,KAAK;AAE1C;AAEA,SAAS,iBAAiB,KAAa,EAAE,mBAAmB,GAAM,IAAI,CAAC,GAAG;AAGxE,eAAM,OAAO,GAAG,EAAE,QAAQ,mCAAmC,CAAC,SAAS,mBAAmB,IAAI,CAAC,GAE3F,qBAEF,MAAM,IAAI,QAAQ,QAAQ,GAAG,EAAE,QAAQ,QAAQ,GAAG,IAE7C;AACT;",
+  "names": []
+}

package/dist/esm/fork/getPathFromState-mods.mjs

@@ -0,0 +1,40 @@
+import { matchDeepDynamicRouteName, matchDynamicName, matchGroupName } from "../router/matchers.mjs";
+function getPathWithConventionsCollapsed({
+  pattern,
+  route,
+  params,
+  preserveGroups,
+  preserveDynamicRoutes,
+  shouldEncodeURISegment = !0,
+  initialRouteName
+}) {
+  const segments = pattern.split("/");
+  return segments.map((p, i) => {
+    const name = getParamName(p);
+    if (p.startsWith("*")) return preserveDynamicRoutes ? name === "not-found" ? "+not-found" : `[...${name}]` : params[name] ? Array.isArray(params[name]) ? params[name].join("/") : params[name] : route.name.startsWith("[") && route.name.endsWith("]") || p === "*not-found" ? "" : route.name;
+    if (p.startsWith(":")) {
+      if (preserveDynamicRoutes) return `[${name}]`;
+      const value = params[name];
+      return value === void 0 && p.endsWith("?") ? void 0 : (shouldEncodeURISegment ? encodeURISegment(value) : value) ?? "undefined";
+    }
+    return !preserveGroups && matchGroupName(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : shouldEncodeURISegment ? encodeURISegment(initialRouteName, {
+      preserveBrackets: !0
+    }) : initialRouteName : "" : shouldEncodeURISegment ? encodeURISegment(p, {
+      preserveBrackets: !0
+    }) : p;
+  }).map(v => v ?? "").join("/");
+}
+const getParamName = pattern => pattern.replace(/^[:*]/, "").replace(/\?$/, "");
+function appendBaseUrl(path, baseUrl = process.env.EXPO_BASE_URL) {
+  return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
+}
+function segmentMatchesConvention(segment) {
+  return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null || matchDeepDynamicRouteName(segment) != null;
+}
+function encodeURISegment(str, {
+  preserveBrackets = !1
+} = {}) {
+  return str = String(str).replace(/[^A-Za-z0-9\-._~!$&'()*+,;=:@]/g, char => encodeURIComponent(char)), preserveBrackets && (str = str.replace(/%5B/g, "[").replace(/%5D/g, "]")), str;
+}
+export { appendBaseUrl, getParamName, getPathWithConventionsCollapsed };
+//# sourceMappingURL=getPathFromState-mods.mjs.map

package/dist/esm/fork/getPathFromState-mods.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["matchDeepDynamicRouteName","matchDynamicName","matchGroupName","getPathWithConventionsCollapsed","pattern","route","params","preserveGroups","preserveDynamicRoutes","shouldEncodeURISegment","initialRouteName","segments","split","map","p","i","name","getParamName","startsWith","Array","isArray","join","endsWith","value","encodeURISegment","length","segmentMatchesConvention","preserveBrackets","v","replace","appendBaseUrl","path","baseUrl","process","env","EXPO_BASE_URL","NODE_ENV","segment","str","String","char","encodeURIComponent"],"sources":["../../../src/fork/getPathFromState-mods.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/fork/getPathFromState-mods.native.js

@@ -0,0 +1,47 @@
+import { matchDeepDynamicRouteName, matchDynamicName, matchGroupName } from "../router/matchers";
+function getPathWithConventionsCollapsed(param) {
+  var { pattern, route, params, preserveGroups, preserveDynamicRoutes, shouldEncodeURISegment = !0, initialRouteName } = param, segments = pattern.split("/");
+  return segments.map(function(p, i) {
+    var name = getParamName(p);
+    if (p.startsWith("*"))
+      return preserveDynamicRoutes ? name === "not-found" ? "+not-found" : `[...${name}]` : params[name] ? Array.isArray(params[name]) ? params[name].join("/") : params[name] : route.name.startsWith("[") && route.name.endsWith("]") || p === "*not-found" ? "" : route.name;
+    if (p.startsWith(":")) {
+      if (preserveDynamicRoutes)
+        return `[${name}]`;
+      var value = params[name];
+      if (value === void 0 && p.endsWith("?"))
+        return;
+      var _ref;
+      return (_ref = shouldEncodeURISegment ? encodeURISegment(value) : value) !== null && _ref !== void 0 ? _ref : "undefined";
+    }
+    return !preserveGroups && matchGroupName(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : shouldEncodeURISegment ? encodeURISegment(initialRouteName, {
+      preserveBrackets: !0
+    }) : initialRouteName : "" : shouldEncodeURISegment ? encodeURISegment(p, {
+      preserveBrackets: !0
+    }) : p;
+  }).map(function(v) {
+    return v ?? "";
+  }).join("/");
+}
+var getParamName = function(pattern) {
+  return pattern.replace(/^[:*]/, "").replace(/\?$/, "");
+};
+function appendBaseUrl(path) {
+  var baseUrl = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : process.env.EXPO_BASE_URL;
+  return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
+}
+function segmentMatchesConvention(segment) {
+  return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null || matchDeepDynamicRouteName(segment) != null;
+}
+function encodeURISegment(str) {
+  var { preserveBrackets = !1 } = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  return str = String(str).replace(/[^A-Za-z0-9\-._~!$&'()*+,;=:@]/g, function(char) {
+    return encodeURIComponent(char);
+  }), preserveBrackets && (str = str.replace(/%5B/g, "[").replace(/%5D/g, "]")), str;
+}
+export {
+  appendBaseUrl,
+  getParamName,
+  getPathWithConventionsCollapsed
+};
+//# sourceMappingURL=getPathFromState-mods.js.map

package/dist/esm/fork/getPathFromState-mods.native.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/fork/Users/n8/one/packages/one/src/fork/getPathFromState-mods.ts"],
+  "mappings": "AAQA,SAASA,2BAA2BC,kBAAkBC,sBAAsB;AAarE,SAASC,gCAAgC,OAa/C;MAb+C,EAC9CC,SACAC,OACAC,QACAC,gBACAC,uBACAC,yBAAyB,IACzBC,iBAAgB,IAP8B,OAcxCC,WAAWP,QAAQQ,MAAM,GAAA;AAE/B,SAAOD,SACJE,IAAI,SAACC,GAAGC,GAAAA;AACP,QAAMC,OAAOC,aAAaH,CAAAA;AAI1B,QAAIA,EAAEI,WAAW,GAAA;AACf,aAAIV,wBACEQ,SAAS,cACJ,eAGF,OAAOA,IAAAA,MAGZV,OAAOU,IAAAA,IACLG,MAAMC,QAAQd,OAAOU,IAAAA,CAAK,IACrBV,OAAOU,IAAAA,EAAMK,KAAK,GAAA,IAEpBf,OAAOU,IAAAA,IAGZX,MAAMW,KAAKE,WAAW,GAAA,KAAQb,MAAMW,KAAKM,SAAS,GAAA,KAIlDR,MAAM,eACD,KAGFT,MAAMW;AAIf,QAAIF,EAAEI,WAAW,GAAA,GAAM;AACrB,UAAIV;AACF,eAAO,IAAIQ,IAAAA;AAGb,UAAMO,QAAQjB,OAAOU,IAAAA;AACrB,UAAIO,UAAUC,UAAaV,EAAEQ,SAAS,GAAA;AACpC;UAGMb;AAAR,cAAQA,OAAAA,yBAAyBgB,iBAAiBF,KAAAA,IAASA,WAAAA,QAAnDd,SAAAA,SAAAA,OAA6D;IACvE;AAEA,WAAI,CAACF,kBAAkBL,eAAeY,CAAAA,KAAM,OAItCH,SAASe,SAAS,MAAMX,KACtBL,mBAEEiB,yBAAyBjB,gBAAAA,IACpB,KAEFD,yBACHgB,iBAAiBf,kBAAkB;MAAEkB,kBAAkB;IAAK,CAAA,IAC5DlB,mBAGD,KAGFD,yBAAyBgB,iBAAiBX,GAAG;MAAEc,kBAAkB;IAAK,CAAA,IAAKd;EACpF,CAAA,EACCD,IAAI,SAACgB,GAAAA;WAAMA,KAAK;KAChBR,KAAK,GAAA;AACV;AAEO,IAAMJ,eAAe,SAACb,SAAAA;SAAoBA,QAAQ0B,QAAQ,SAAS,EAAA,EAAIA,QAAQ,OAAO,EAAA;;AAEtF,SAASC,cACdC,MAAY;MACZC,UAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAA8BC,QAAQC,IAAIC;AAE1C,SAAIF,QAAQC,IAAIE,aAAa,iBACvBJ,UACK,IAAIA,QAAQH,QAAQ,QAAQ,EAAA,EAAIA,QAAQ,OAAO,EAAA,CAAA,GAAME,IAAAA,KAGzDA;AACT;AAEA,SAASL,yBAAyBW,SAAe;AAC/C,SACEA,YAAY,WACZrC,iBAAiBqC,OAAAA,KAAY,QAC7BpC,eAAeoC,OAAAA,KAAY,QAC3BtC,0BAA0BsC,OAAAA,KAAY;AAE1C;AAEA,SAASb,iBAAiBc,KAAW;MAAE,EAAEX,mBAAmB,GAAK,IAA1B,UAAA,SAAA,KAAA,UAAA,CAAA,MAAA,SAAA,UAAA,CAAA,IAA+B,CAAC;AAGrEW,eAAMC,OAAOD,GAAAA,EAAKT,QAAQ,mCAAmC,SAACW,MAAAA;WAASC,mBAAmBD,IAAAA;MAEtFb,qBAEFW,MAAMA,IAAIT,QAAQ,QAAQ,GAAA,EAAKA,QAAQ,QAAQ,GAAA,IAE1CS;AACT;",
+  "names": ["matchDeepDynamicRouteName", "matchDynamicName", "matchGroupName", "getPathWithConventionsCollapsed", "pattern", "route", "params", "preserveGroups", "preserveDynamicRoutes", "shouldEncodeURISegment", "initialRouteName", "segments", "split", "map", "p", "i", "name", "getParamName", "startsWith", "Array", "isArray", "join", "endsWith", "value", "undefined", "encodeURISegment", "length", "segmentMatchesConvention", "preserveBrackets", "v", "replace", "appendBaseUrl", "path", "baseUrl", "process", "env", "EXPO_BASE_URL", "NODE_ENV", "segment", "str", "String", "char", "encodeURIComponent"]
+}

package/dist/esm/fork/getPathFromState.js

@@ -1,234 +1,78 @@
-import { validatePathConfig } from "@react-navigation/core";
 import {
-  matchDeepDynamicRouteName,
-  matchDynamicName,
-  matchGroupName,
-  testNotFound
-} from "../router/matchers";
-const DEFAULT_SCREENS = {}, getActiveRoute = (state) => {
+  getPathWithConventionsCollapsed,
+  appendBaseUrl
+} from "./getPathFromState-mods";
+import { validatePathConfig } from "./validatePathConfig";
+const getActiveRoute = (state) => {
   const route = typeof state.index == "number" ? state.routes[state.index] : state.routes[state.routes.length - 1];
-  return route.state ? getActiveRoute(route.state) : route && isInvalidParams(route.params) ? getActiveRoute(createFakeState(route.params)) : route;
+  return route.state ? getActiveRoute(route.state) : route;
+}, cachedNormalizedConfigs = /* @__PURE__ */ new WeakMap(), getNormalizedConfigs = (options) => {
+  if (!options?.screens) return {};
+  const cached = cachedNormalizedConfigs.get(options?.screens);
+  if (cached) return cached;
+  const normalizedConfigs = createNormalizedConfigs(options.screens);
+  return cachedNormalizedConfigs.set(options.screens, normalizedConfigs), normalizedConfigs;
 };
-function createFakeState(params) {
-  return {
-    stale: !1,
-    type: "UNKNOWN",
-    key: "UNKNOWN",
-    index: 0,
-    routeNames: [],
-    routes: [
-      {
-        key: "UNKNOWN",
-        name: params.screen,
-        params: params.params,
-        path: params.path
-      }
-    ]
-  };
-}
-function segmentMatchesConvention(segment) {
-  return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null || matchDeepDynamicRouteName(segment) != null;
+function getPathFromState(state, options) {
+  return getPathDataFromState(state, options).path;
 }
-function encodeURIComponentPreservingBrackets(str) {
-  return encodeURIComponent(str).replace(/%5B/g, "[").replace(/%5D/g, "]");
-}
-function getPathFromState(state, _options) {
-  return getPathDataFromState(state, _options).path;
-}
-function getPathDataFromState(state, _options = { screens: DEFAULT_SCREENS }) {
+function getPathDataFromState(state, options) {
   if (state == null)
     throw Error("Got 'undefined' for the navigation state. You must pass a valid state object.");
-  const { preserveGroups, preserveDynamicRoutes, ...options } = _options;
-  if (validatePathConfig(options), Object.is(options.screens, DEFAULT_SCREENS))
-    throw Error("You must pass a 'screens' object to 'getPathFromState' to generate a path.");
-  return getPathFromResolvedState(
-    state,
-    // Create a normalized configs object which will be easier to use
-    createNormalizedConfigs(options.screens),
-    { preserveGroups, preserveDynamicRoutes }
-  );
-}
-function processParamsWithUserSettings(configItem, params) {
-  const stringify = configItem?.stringify;
-  return Object.fromEntries(
-    Object.entries(params).map(([key, value]) => [
-      key,
-      // TODO: Strip nullish values here.
-      stringify?.[key] ? stringify[key](value) : (
-        // Preserve rest params
-        Array.isArray(value) ? value : String(value)
-      )
-    ])
-  );
-}
-function deepEqual(a, b) {
-  if (a === b)
-    return !0;
-  if (Array.isArray(a) && Array.isArray(b)) {
-    if (a.length !== b.length)
-      return !1;
-    for (let i = 0; i < a.length; i++)
-      if (!deepEqual(a[i], b[i]))
-        return !1;
-    return !0;
-  }
-  if (typeof a == "object" && typeof b == "object") {
-    const keysA = Object.keys(a), keysB = Object.keys(b);
-    if (keysA.length !== keysB.length)
-      return !1;
-    for (const key of keysA)
-      if (!deepEqual(a[key], b[key]))
-        return !1;
-    return !0;
-  }
-  return !1;
-}
-function walkConfigItems(route, focusedRoute, configs, {
-  preserveDynamicRoutes
-}) {
-  !route.state && isInvalidParams(route.params);
-  let pattern = null, focusedParams, hash;
-  const collectedParams = {};
-  for (; route.name in configs; ) {
-    const configItem = configs[route.name], inputPattern = configItem.pattern;
-    if (inputPattern == null)
-      throw new Error("Unexpected: No pattern found for route " + route.name);
-    if (pattern = inputPattern, route.params) {
-      route.params["#"] && (hash = route.params["#"], delete route.params["#"]);
-      const params = processParamsWithUserSettings(configItem, route.params);
-      pattern != null && Object.assign(collectedParams, params), deepEqual(focusedRoute, route) && (preserveDynamicRoutes ? focusedParams = params : focusedParams = getParamsWithConventionsCollapsed({
-        params,
-        pattern,
-        routeName: route.name
-      }));
-    }
-    if (!route.state && isInvalidParams(route.params), !configItem.screens || route.state === void 0) {
-      configItem.initialRouteName && configItem.screens && configItem.initialRouteName in configItem.screens && configItem.screens[configItem.initialRouteName]?.pattern && (pattern = configItem.screens[configItem.initialRouteName].pattern, focusedParams && (preserveDynamicRoutes || (focusedParams = getParamsWithConventionsCollapsed({
-        params: focusedParams,
-        pattern,
-        routeName: route.name
-      }))));
-      break;
-    }
-    const index = route.state.index ?? route.state.routes.length - 1, nextRoute = route.state.routes[index], nestedScreens = configItem.screens;
-    if (nestedScreens && nextRoute.name in nestedScreens)
-      route = nextRoute, configs = nestedScreens;
-    else
-      break;
-  }
-  if (pattern == null)
-    throw new Error(
-      `No pattern found for route "${route.name}". Options are: ${Object.keys(configs).join(", ")}.`
-    );
-  return pattern && !focusedParams && focusedRoute.params && (preserveDynamicRoutes ? focusedParams = focusedRoute.params : focusedParams = getParamsWithConventionsCollapsed({
-    params: focusedRoute.params,
-    pattern,
-    routeName: route.name
-  }), focusedParams = {
-    ...focusedParams,
-    ...collectedParams
-  }), {
-    pattern,
-    nextRoute: route,
-    focusedParams,
-    hash,
-    params: collectedParams
-  };
-}
-function getPathFromResolvedState(state, configs, {
-  preserveGroups,
-  preserveDynamicRoutes
-}) {
-  let path = "", current = state, hash;
+  options && validatePathConfig(options);
+  const configs = getNormalizedConfigs(options);
+  let path = "/", current = state;
   const allParams = {};
   for (; current; ) {
-    path += "/";
-    const route = current.routes[current.index ?? 0];
-    !route.state && isInvalidParams(route.params);
-    const {
-      pattern,
-      params: params2,
-      nextRoute,
-      focusedParams,
-      hash: $hash
-    } = walkConfigItems(route, getActiveRoute(current), { ...configs }, { preserveDynamicRoutes });
-    if ($hash && (hash = $hash), Object.assign(allParams, params2), path += getPathWithConventionsCollapsed({
-      pattern,
-      routePath: nextRoute.path,
-      params: allParams,
-      initialRouteName: configs[nextRoute.name]?.initialRouteName,
-      preserveGroups,
-      preserveDynamicRoutes
-    }), nextRoute.state && // NOTE: The upstream implementation allows for sending in synthetic states (states that weren't generated by `getStateFromPath`)
-    // and any invalid routes will simply be ignored.
-    // Because of this, we need to check if the next route is valid before continuing, otherwise our more strict
-    // implementation will throw an error.
-    configs[nextRoute.state.routes?.[nextRoute.state?.index ?? 0]?.name])
-      current = nextRoute.state;
-    else {
-      if (focusedParams && // note: using [...route] is returning an array which shouldn't go on search, this is just
-      // an initial hacky test to work around this as we dont want to pass that to search
-      !Array.isArray(focusedParams)) {
-        for (const param in focusedParams)
-          focusedParams[param] === "undefined" && delete focusedParams[param];
-        const query = new URLSearchParams(focusedParams).toString();
-        query && (path += `?${query}`);
+    let index = typeof current.index == "number" ? current.index : 0, route = current.routes[index], pattern, focusedParams;
+    const focusedRoute = getActiveRoute(state);
+    let currentOptions = configs;
+    const nestedRouteNames = [];
+    let hasNext = !0;
+    for (; route.name in currentOptions && hasNext; ) {
+      if (pattern = currentOptions[route.name].pattern, nestedRouteNames.push(route.name), route.params) {
+        const stringify = currentOptions[route.name]?.stringify, currentParams = Object.fromEntries(
+          Object.entries(route.params).flatMap(([key, value]) => key === "screen" || key === "params" ? [] : [
+            [
+              key,
+              stringify?.[key] ? stringify[key](value) : Array.isArray(value) ? value.map(String) : String(value)
+            ]
+          ])
+        );
+        Object.assign(allParams, currentParams), focusedRoute === route && (focusedParams = { ...currentParams }, pattern?.split("/").filter((p) => p.startsWith(":")).forEach((p) => {
+          const name = getParamName(p);
+          focusedParams && delete focusedParams[name];
+        }));
+      }
+      if (!currentOptions[route.name].screens || route.state === void 0) {
+        const screens = currentOptions[route.name].screens, screen = route.params && "screen" in route.params ? route.params.screen?.toString() : screens ? Object.keys(screens)[0] : void 0;
+        screen && screens && currentOptions[route.name].screens?.[screen] ? (route = { ...screens[screen], name: screen, key: screen }, currentOptions = screens) : hasNext = !1;
+      } else {
+        index = typeof route.state.index == "number" ? route.state.index : route.state.routes.length - 1;
+        const nextRoute = route.state.routes[index], nestedConfig = currentOptions[route.name].screens;
+        nestedConfig && nextRoute.name in nestedConfig ? (route = nextRoute, currentOptions = nestedConfig) : hasNext = !1;
       }
-      break;
     }
-  }
-  hash && (allParams["#"] = hash, path += `#${hash}`);
-  const params = decodeParams(allParams);
-  return { path: appendBaseUrl(basicSanitizePath(path)), params };
-}
-function decodeParams(params) {
-  const parsed = {};
-  for (const [key, value] of Object.entries(params))
-    try {
-      Array.isArray(value) ? parsed[key] = value.map((v) => decodeURIComponent(v)) : parsed[key] = decodeURIComponent(value);
-    } catch {
-      parsed[key] = value;
+    if (currentOptions[route.name] !== void 0 ? (pattern === void 0 && (pattern = nestedRouteNames.join("/")), path += getPathWithConventionsCollapsed({
+      ...options,
+      pattern,
+      route,
+      params: allParams,
+      initialRouteName: configs[route.name]?.initialRouteName
+    })) : route.name.startsWith("+") || (path += encodeURIComponent(route.name)), focusedParams || (focusedParams = focusedRoute.params), route.state)
+      path += "/";
+    else if (focusedParams) {
+      for (const param in focusedParams)
+        focusedParams[param] === "undefined" && delete focusedParams[param];
+      delete focusedParams["#"];
+      const query = new URLSearchParams(focusedParams).toString();
+      query && (path += `?${query}`);
     }
-  return parsed;
-}
-function getPathWithConventionsCollapsed({
-  pattern,
-  routePath,
-  params,
-  preserveGroups,
-  preserveDynamicRoutes,
-  initialRouteName
-}) {
-  const segments = pattern.split("/");
-  return segments.map((p, i) => {
-    const name = getParamName(p);
-    return p.startsWith("*") ? preserveDynamicRoutes ? name === "not-found" ? "+not-found" : `[...${name}]` : params[name] ? Array.isArray(params[name]) ? params[name].join("/") : params[name] : i === 0 ? routePath : routePath?.split("/").slice(i + 1).join("/") : p.startsWith(":") ? preserveDynamicRoutes ? `[${name}]` : params[name] : !preserveGroups && matchGroupName(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : encodeURIComponentPreservingBrackets(initialRouteName) : "" : encodeURIComponentPreservingBrackets(p);
-  }).map((v) => v ?? "").join("/");
-}
-function getParamsWithConventionsCollapsed({
-  pattern,
-  routeName,
-  params
-}) {
-  const processedParams = { ...params }, segments = pattern.split("/");
-  if (segments.filter((segment) => segment.startsWith(":")).forEach((segment) => {
-    const name = getParamName(segment);
-    delete processedParams[name];
-  }), segments.some((segment) => segment.startsWith("*"))) {
-    const name = testNotFound(routeName) ? "not-found" : matchDeepDynamicRouteName(routeName) ?? routeName;
-    delete processedParams[name];
+    current = route.state;
   }
-  return processedParams;
+  return path = path.replace(/\/+/g, "/"), path = path.length > 1 ? path.replace(/\/$/, "") : path, options?.path && (path = joinPaths(options.path, path)), path = appendBaseUrl(path), allParams["#"] && (path += `#${allParams["#"]}`), { path, params: allParams };
 }
-function basicSanitizePath(path) {
-  const simplifiedPath = path.replace(/\/+/g, "/");
-  return simplifiedPath.length <= 1 ? simplifiedPath : simplifiedPath.replace(/\/$/, "");
-}
-function isInvalidParams(params) {
-  return params ? "params" in params && typeof params.params == "object" && params.params ? !0 : "initial" in params && typeof params.initial == "boolean" && // "path" in params &&
-  "screen" in params : !1;
-}
-const getParamName = (pattern) => pattern.replace(/^[:*]/, "").replace(/\?$/, ""), joinPaths = (...paths) => [].concat(...paths.map((p) => p.split("/"))).filter(Boolean).join("/"), createConfigItem = (config, parentPattern) => {
+const getParamName = (pattern) => pattern.replace(/^:/, "").replace(/\?$/, ""), joinPaths = (...paths) => [].concat(...paths.map((p) => p.split("/"))).filter(Boolean).join("/"), createConfigItem = (config, parentPattern) => {
   if (typeof config == "string")
     return { pattern: parentPattern ? joinPaths(parentPattern, config) : config };
   if (config.exact && config.path === void 0)
@@ -240,19 +84,18 @@ const getParamName = (pattern) => pattern.replace(/^[:*]/, "").replace(/\?$/, ""
     // Normalize pattern to remove any leading, trailing slashes, duplicate slashes etc.
     pattern: pattern?.split("/").filter(Boolean).join("/"),
     stringify: config.stringify,
-    screens,
-    initialRouteName: config.initialRouteName
+    screens
   };
 }, createNormalizedConfigs = (options, pattern) => Object.fromEntries(
-  Object.entries(options).map(([name, c]) => [name, createConfigItem(c, pattern)])
+  Object.entries(options).map(([name, c]) => {
+    const result = createConfigItem(c, pattern);
+    return [name, result];
+  })
 );
-function appendBaseUrl(path, baseUrl = process.env.EXPO_BASE_URL) {
-  return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
-}
+var getPathFromState_default = getPathFromState;
 export {
-  appendBaseUrl,
-  deepEqual,
-  getPathFromState as default,
-  getPathDataFromState
+  getPathFromState_default as default,
+  getPathDataFromState,
+  getPathFromState
 };
 //# sourceMappingURL=getPathFromState.js.map