one 1.14.4 → 1.15.0

package/dist/cjs/fork/getPathFromState.test.native.js

@@ -1,124 +1,125 @@
 "use strict";
 
-var import_vitest = require("vitest"),
-  import_getPathFromState = require("./getPathFromState.native.js");
+var import_vitest = require("vitest");
+var import_getPathFromState = require("./getPathFromState.native.js");
 (0, import_vitest.describe)("hash support", function () {
   (0, import_vitest.it)("appends hash to the path", function () {
     var state = {
-        index: 0,
-        key: "key",
-        routes: [{
-          name: "index",
-          path: "/",
-          params: {
-            "#": "hash1"
-          }
-        }],
-        stale: !0,
-        type: "stack"
-      },
-      config = {
-        screens: {
-          index: "",
-          _sitemap: "_sitemap"
+      index: 0,
+      key: "key",
+      routes: [{
+        name: "index",
+        path: "/",
+        params: {
+          "#": "hash1"
         }
-      };
+      }],
+      stale: true,
+      type: "stack"
+    };
+    var config = {
+      screens: {
+        index: "",
+        _sitemap: "_sitemap"
+      }
+    };
     (0, import_vitest.expect)((0, import_getPathFromState.getPathFromState)(state, config)).toBe("/#hash1");
-  }), (0, import_vitest.it)("works with nested state, existing router and path params", function () {
-    var state = {
-        index: 1,
-        key: "key",
-        routeNames: ["index", "[test]", "_sitemap", "+not-found"],
-        routes: [{
-          key: "key",
-          name: "index",
-          params: void 0,
-          path: "/"
-        }, {
-          key: "key",
-          name: "[test]",
-          params: {
-            test: "hello-world",
-            query: "true",
-            "#": "a"
-          },
-          path: void 0
-        }],
-        stale: !1,
-        type: "stack"
-      },
-      config = {
-        screens: {
-          "[test]": ":test",
-          index: "",
-          _sitemap: "_sitemap"
-        }
-      };
-    (0, import_vitest.expect)((0, import_getPathFromState.getPathFromState)(state, config)).toBe("/hello-world?query=true#a");
   });
-});
-import_vitest.it.skip("handles url search params params", function () {
-  var state = {
+  (0, import_vitest.it)("works with nested state, existing router and path params", function () {
+    var state = {
+      index: 1,
+      key: "key",
+      routeNames: ["index", "[test]", "_sitemap", "+not-found"],
       routes: [{
+        key: "key",
         name: "index",
+        params: void 0,
+        path: "/"
+      }, {
+        key: "key",
+        name: "[test]",
         params: {
-          test: "true",
-          hello: "world",
-          array: ["1", "2"]
+          test: "hello-world",
+          query: "true",
+          "#": "a"
         },
-        path: "/?test=true&hello=world&array=1&array=2"
-      }]
-    },
-    config = {
+        path: void 0
+      }],
+      stale: false,
+      type: "stack"
+    };
+    var config = {
       screens: {
+        "[test]": ":test",
         index: "",
         _sitemap: "_sitemap"
       }
     };
+    (0, import_vitest.expect)((0, import_getPathFromState.getPathFromState)(state, config)).toBe("/hello-world?query=true#a");
+  });
+});
+import_vitest.it.skip(`handles url search params params`, function () {
+  var state = {
+    routes: [{
+      name: "index",
+      params: {
+        test: "true",
+        hello: "world",
+        array: ["1", "2"]
+      },
+      path: "/?test=true&hello=world&array=1&array=2"
+    }]
+  };
+  var config = {
+    screens: {
+      index: "",
+      _sitemap: "_sitemap"
+    }
+  };
   (0, import_vitest.expect)((0, import_getPathFromState.getPathFromState)(state, config)).toBe("/?test=true&hello=world&array=1&array=2");
 });
-(0, import_vitest.it)("handles uninitialized state on nested navigation with route params", function () {
+(0, import_vitest.it)(`handles uninitialized state on nested navigation with route params`, function () {
   var config = {
-      screens: {
-        index: "",
-        "[folderSlugL1]": {
-          path: ":folderSlugL1",
-          screens: {
-            "[folderSlugL2]": {
-              path: ":folderSlugL2",
-              screens: {
-                "[folderSlugL3]": {
-                  path: ":folderSlugL3",
-                  screens: {
-                    page: "page"
-                  }
+    screens: {
+      index: "",
+      "[folderSlugL1]": {
+        path: ":folderSlugL1",
+        screens: {
+          "[folderSlugL2]": {
+            path: ":folderSlugL2",
+            screens: {
+              "[folderSlugL3]": {
+                path: ":folderSlugL3",
+                screens: {
+                  page: "page"
                 }
               }
             }
           }
         }
       }
-    },
-    state = {
-      routes: [{
-        name: "[folderSlugL1]",
+    }
+  };
+  var state = {
+    routes: [{
+      name: "[folderSlugL1]",
+      params: {
+        folderSlugL1: "foo",
+        screen: "[folderSlugL2]",
         params: {
           folderSlugL1: "foo",
-          screen: "[folderSlugL2]",
+          folderSlugL2: "bar",
+          screen: "[folderSlugL3]",
           params: {
             folderSlugL1: "foo",
             folderSlugL2: "bar",
-            screen: "[folderSlugL3]",
-            params: {
-              folderSlugL1: "foo",
-              folderSlugL2: "bar",
-              folderSlugL3: "baz",
-              screen: "page"
-            }
+            folderSlugL3: "baz",
+            screen: "page"
           }
         }
-      }]
-    };
+      }
+    }]
+  };
   (0, import_vitest.expect)((0, import_getPathFromState.getPathFromState)(state, config)).toBe("/foo/bar/baz/page");
 });
 //# sourceMappingURL=getPathFromState.test.native.js.map

package/dist/cjs/fork/getPathFromState.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["import_vitest","require","import_getPathFromState","describe","it","state","index","key","routes","name","path","params","stale","type","config","screens","_sitemap","expect","getPathFromState","toBe","routeNames","test","query","skip","hello","array","page","folderSlugL1","screen","folderSlugL2"],"sources":["../../../src/fork/getPathFromState.test.ts"],"sourcesContent":[null],"mappings":"AACA;;AAE6C,IAE7CA,aAAA,GAAAC,OAAA,CAAS;EAAAC,uBAAsB,GAAAD,OAAA;AAC7B,IAAAD,aAAA,CAAAG,QAAG,8BAA4B;EAwB7B,IAAAH,aAAA,CAAAI,EAAA,4BAAO;IAvBO,IACZC,KAAO;QACPC,KAAK;QACLC,GAAA,OAAQ;QAAAC,MACN;UAEEC,IAAA,EAAM;UACNC,IAAA,KAAQ;UAAAC,MACN,EAAK;YACP;UACF;QACF,EACA;QACAC,KAAA,EAAM;QACRC,IAEe;MAAA;MACbC,MAAA,GAAS;QAAAC,OACP,EAAO;UACPT,KAAA;UACFU,QAAA;QAGoC;MACvC;IAqCC,IAAAhB,aAAA,CAAAiB,MAAA,MAAOf,uBAAA,CAAAgB,gBAAA,EAlCOb,KAAA,EAAAS,MAAA,GAAAK,IAAA;EAAA,IACZ,IAAAnB,aAAO,CAAAI,EAAA;IAAA,IACPC,KAAK;QACLC,KAAA;QACAC,GAAA,OAAQ;QAAAa,UACN,UACO,UACC,YACE,cACF;QACRZ,MACA;UAEED,GAAA,OAAM;UACNE,IAAA,SAAQ;UAAAE,MACN,EAAM;UAAAD,IACN;QAAO,GACF;UAEPH,GAAA,OAAM;UACRE,IAAA;UACFE,MAAA;YACAU,IAAO;YACDC,KAAA;YAGO;UACb;UACEZ,IAAA,OAAU;QACV,EAAO;QAETE,KAAA;QAGoCC,IAAE;MACzC;MAAAC,MAAA;QACFC,OAAA;UAGD,UAAG,OAAK;UAsBNT,KAAA;UApBEU,QAAQ;QACN;MAAA;IACQ,IACNhB,aAAQ,CAAAiB,MAAA,MAAAf,uBAAA,CAAAgB,gBAAA,EAAAb,KAAA,EAAAS,MAAA,GAAAK,IAAA;EAAA;AACA;AACCnB,aACP,CAAAI,EAAA,CAAOmB,IAAC,mCAAQ;EAAA,IAAAlB,KAClB;MAAAG,MACA,GACF;QACFC,IAAA;QAGaE,MAAA;UACbU,IAAS;UACPG,KAAO;UACPC,KAAA,EAAU,CACZ,KAG2C;QAG/C;QA8CEf,IAAA;MAtBE;IACE;IAAAI,MACE,GAAM;MAAAC,OACN;QAAQT,KACN;QAAcU,QACd;MAAQ;IACA;EACQ,IAAAhB,aACd,CAAAiB,MAAc,MAAAf,uBAAA,CAAAgB,gBAAA,EAAAb,KAAA,EAAAS,MAAA,GAAAK,IAAA;AAAA;AACN,IAAAnB,aACR,CAAAI,EAAQ;EAAA,IAAAU,MAAA,GACN;MAAcC,OAAA;QACAT,KAAA,IACd;QAAc,gBACN;UAAAI,IACV;UAAAK,OACF;YACF;cACFL,IAAA;cACFK,OAAA;gBA1Ca;kBACJL,IAAA;kBACAK,OAAA;oBACPW,IAAA,EAAkB;kBACV;gBACN;cACE;YAAkB;UACV;QACG;MACW;IACV;IAAArB,KAAA;MACGG,MAAA,GACD;QACRC,IAAA,EACF;QAAAE,MACF;UACFgB,YAAA;UACFC,MAAA;UACFjB,MAAA;YACFgB,YAAA;YA0B2CE,YAAA,OAAmB;YACjED,MAAA","ignoreList":[]}
+{"version":3,"names":["import_vitest","require","import_getPathFromState","describe","it","state","index","key","routes","name","path","params","stale","type","config","screens","_sitemap","expect","getPathFromState","toBe","routeNames","test","query","skip","hello","array","page","folderSlugL1","screen","folderSlugL2","folderSlugL3"],"sources":["../../../src/fork/getPathFromState.test.ts"],"sourcesContent":[null],"mappings":"AACA;;AAEA,IAAAA,aAAA,GAAAC,OAAA,SAA6C;AAAA,IAE7CC,uBAAA,GAASD,OAAA,+BAAsB;AAC7B,IAAAD,aAAA,CAAAG,QAAG,8BAA4B;EAC7B,IAAAH,aAAc,CAAAI,EAAA;IAAA,IACZC,KAAO;MACPC,KAAK;MACLC,GAAA,OAAQ;MAAAC,MACN;QAEEC,IAAA,EAAM;QACNC,IAAA,KAAQ;QAAAC,MACN,EAAK;UACP;QACF;MACF,EACA;MACAC,KAAA,EAAM;MACRC,IAAA;IAEA;IAAe,IACbC,MAAA,GAAS;MAAAC,OACP,EAAO;QACPT,KAAA;QACFU,QAAA;MACF;IAEA;IACD,IAAAhB,aAAA,CAAAiB,MAAA,MAAAf,uBAAA,CAAAgB,gBAAA,EAAAb,KAAA,EAAAS,MAAA,GAAAK,IAAA;EAED;EACE,IAAAnB,aAAc,CAAAI,EAAA;IAAA,IACZC,KAAO;MACPC,KAAK;MACLC,GAAA;MACAa,UAAQ,GACN,iBACO,YACC,cACE;MACFZ,MACR,GACA;QACED,GAAA,EAAK;QACLE,IAAA,EAAM;QACNE,MAAA,EAAQ;QAAAD,IACN;MAAM,GACC;QAETH,GAAA;QACAE,IAAA,EAAM;QACRE,MAAA;UACFU,IAAA;UACAC,KAAO;UACD;QACR;QAEMZ,IAAA,OAAS;MACb,EAAS;MACGE,KACV,OAAO;MAAAC,IACP;IAAU;IAEd,IAAAC,MAAA;MAEAC,OAAA;QACD;QACFT,KAAA;QAGDU,QAAA,EAAG;MACD;IACE;IAAQ,EACN,EAAAhB,aAAA,CAAAiB,MAAA,MAAAf,uBAAA,CAAAgB,gBAAA,EAAAb,KAAA,EAAAS,MAAA,GAAAK,IAAA;EAAA;AACQ;AACEnB,aACN,CAAAI,EAAM,CAAAmB,IAAA;EAAA,IAAAlB,KACN;IAAOG,MACP,GAAgB;MAElBC,IAAA,EAAM;MACRE,MAAA;QACFU,IAAA;QACFG,KAAA;QAEMC,KAAA,EAAS,CACb,GAAS,EACP,GAAO;MAET;MACFf,IAAA;IAEA;EACD;EAGC,IAAAI,MAAM;IACJC,OAAA,EAAS;MACPT,KAAA,EAAO;MACPU,QAAA;IAAkB;EACV;EACG,IAAAhB,aACP,CAAAiB,MAAA,EAAkB,IAAAf,uBAAA,CAAAgB,gBAAA,EAAAb,KAAA,EAAAS,MAAA,GAAAK,IAAA;AAAA;AACV,IAAAnB,aACN,CAAAI,EAAA,EAAS;EAAA,IAAAU,MAAA,GACP;IAAkBC,OAAA;MACVT,KAAA;MACG,gBACP,EAAM;QAAAI,IAAA,iBACR;QAAAK,OACF;UAAA,gBACF;YACFL,IAAA;YACFK,OAAA;cACF;gBACFL,IAAA;gBACFK,OAAA;kBAEcW,IAAA;gBACJ;cACN;YACE;UACA;QAAQ;MACQ;IACN;EACA;EACQ,IAAArB,KAAA,GACd;IAAcG,MAAA,EACd,CAAQ;MACAC,IAAA,EACN,gBAAc;MAAAE,MACd;QAAcgB,YACd,OAAc;QAAAC,MACd,kBAAQ;QAAAjB,MACV;UACFgB,YAAA;UACFE,YAAA;UACFD,MAAA;UACFjB,MAAA;YACFgB,YAAA;YAEAE,YAAA,OAAO;YACRC,YAAA","ignoreList":[]}

package/dist/cjs/fork/getStateFromPath-mods.cjs

@@ -2,33 +2,35 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  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;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var getStateFromPath_mods_exports = {};
 __export(getStateFromPath_mods_exports, {
   appendIsInitial: () => appendIsInitial,
@@ -43,20 +45,27 @@ __export(getStateFromPath_mods_exports, {
   stripBaseUrl: () => stripBaseUrl
 });
 module.exports = __toCommonJS(getStateFromPath_mods_exports);
-var import_escape_string_regexp = __toESM(require("escape-string-regexp"), 1),
-  import_matchers = require("../router/matchers.cjs");
+var import_escape_string_regexp = __toESM(require("escape-string-regexp"), 1);
+var import_matchers = require("../router/matchers.cjs");
 function getUrlWithReactNavigationConcessions(path, baseUrl = process.env.EXPO_BASE_URL) {
   const pathWithoutGroups = (0, import_matchers.stripGroupSegmentsFromPath)(stripBaseUrl(path, baseUrl));
-  let pathname = "",
-    hash = "";
+  let pathname = "";
+  let hash = "";
   try {
-    const hashIndex = path.indexOf("#"),
-      queryIndex = path.indexOf("?");
-    hashIndex >= 0 && (hash = path.slice(hashIndex));
+    const hashIndex = path.indexOf("#");
+    const queryIndex = path.indexOf("?");
+    if (hashIndex >= 0) {
+      hash = path.slice(hashIndex);
+    }
     let end = path.length;
-    if (queryIndex >= 0 && (end = Math.min(end, queryIndex)), hashIndex >= 0 && (end = Math.min(end, hashIndex)), pathname = path.slice(0, end), pathname.startsWith("http://") || pathname.startsWith("https://")) {
+    if (queryIndex >= 0) end = Math.min(end, queryIndex);
+    if (hashIndex >= 0) end = Math.min(end, hashIndex);
+    pathname = path.slice(0, end);
+    if (pathname.startsWith("http://") || pathname.startsWith("https://")) {
       const originEnd = pathname.indexOf("/", pathname.indexOf("//") + 2);
-      originEnd >= 0 && (pathname = pathname.slice(originEnd));
+      if (originEnd >= 0) {
+        pathname = pathname.slice(originEnd);
+      }
     }
   } catch {}
   const withoutBaseUrl = stripBaseUrl(pathname, baseUrl);
@@ -70,13 +79,15 @@ function getUrlWithReactNavigationConcessions(path, baseUrl = process.env.EXPO_B
   };
 }
 function matchForEmptyPath(configs) {
-  const leafNodes = configs.filter(config => !config.hasChildren).map(value => ({
-    ...value,
-    // Collapse all levels of group segments before testing.
-    // This enables `app/(one)/(two)/index.js` to be matched.
-    path: (0, import_matchers.stripGroupSegmentsFromPath)(value.path)
-  }));
-  return leafNodes.find(config =>
+  const leafNodes = configs.filter(config => !config.hasChildren).map(value => {
+    return {
+      ...value,
+      // Collapse all levels of group segments before testing.
+      // This enables `app/(one)/(two)/index.js` to be matched.
+      path: (0, import_matchers.stripGroupSegmentsFromPath)(value.path)
+    };
+  });
+  const match = leafNodes.find(config =>
   // NOTE: Test leaf node index routes that either don't have a regex or match an empty string.
   config.path === "" && (!config.regex || config.regex.test(""))) ?? leafNodes.find(config =>
   // NOTE: Test leaf node dynamic routes that match an empty string.
@@ -84,56 +95,118 @@ function matchForEmptyPath(configs) {
   // NOTE: Test leaf node deep dynamic routes that match a slash.
   // This should be done last to enable dynamic routes having a higher priority.
   leafNodes.find(config => config.path.startsWith("*") && config.regex.test("/"));
+  return match;
 }
 function appendIsInitial(initialRoutes) {
   const resolvedInitialPatterns = initialRoutes.map(route => joinPaths(...route.parentScreens, route.initialRouteName));
-  return config => (config.isInitial = resolvedInitialPatterns.includes(config.routeNames.join("/")), config);
+  return config => {
+    config.isInitial = resolvedInitialPatterns.includes(config.routeNames.join("/"));
+    return config;
+  };
 }
 const joinPaths = (...paths) => [].concat(...paths.map(p => p.split("/"))).filter(Boolean).join("/");
 function getRouteConfigSorter(previousSegments = []) {
-  return function (a, b) {
-    if (a.pattern === b.pattern) return b.routeNames.join(">").localeCompare(a.routeNames.join(">"));
-    if (a.pattern.startsWith(b.pattern) && !b.isIndex) return -1;
-    if (b.pattern.startsWith(a.pattern) && !a.isIndex) return 1;
-    if (a.type === "static" && b.type !== "static") return -1;
-    if (a.type !== "static" && b.type === "static") return 1;
-    if (a.staticPartCount !== b.staticPartCount) return b.staticPartCount - a.staticPartCount;
-    const similarToPreviousA = previousSegments.filter((value, index) => value === a.expandedRouteNames[index] && value.startsWith("(") && value.endsWith(")")),
-      similarToPreviousB = previousSegments.filter((value, index) => value === b.expandedRouteNames[index] && value.startsWith("(") && value.endsWith(")"));
-    if ((similarToPreviousA.length > 0 || similarToPreviousB.length > 0) && similarToPreviousA.length !== similarToPreviousB.length) return similarToPreviousB.length - similarToPreviousA.length;
+  return function sortConfigs(a, b) {
+    if (a.pattern === b.pattern) {
+      return b.routeNames.join(">").localeCompare(a.routeNames.join(">"));
+    }
+    if (a.pattern.startsWith(b.pattern) && !b.isIndex) {
+      return -1;
+    }
+    if (b.pattern.startsWith(a.pattern) && !a.isIndex) {
+      return 1;
+    }
+    if (a.type === "static" && b.type !== "static") {
+      return -1;
+    }
+    if (a.type !== "static" && b.type === "static") {
+      return 1;
+    }
+    if (a.staticPartCount !== b.staticPartCount) {
+      return b.staticPartCount - a.staticPartCount;
+    }
+    const similarToPreviousA = previousSegments.filter((value, index) => {
+      return value === a.expandedRouteNames[index] && value.startsWith("(") && value.endsWith(")");
+    });
+    const similarToPreviousB = previousSegments.filter((value, index) => {
+      return value === b.expandedRouteNames[index] && value.startsWith("(") && value.endsWith(")");
+    });
+    if ((similarToPreviousA.length > 0 || similarToPreviousB.length > 0) && similarToPreviousA.length !== similarToPreviousB.length) {
+      return similarToPreviousB.length - similarToPreviousA.length;
+    }
     for (let i = 0; i < Math.max(a.parts.length, b.parts.length); i++) {
-      if (a.parts[i] == null) return 1;
-      if (b.parts[i] == null) return -1;
-      const aWildCard = a.parts[i].startsWith("*"),
-        bWildCard = b.parts[i].startsWith("*");
+      if (a.parts[i] == null) {
+        return 1;
+      }
+      if (b.parts[i] == null) {
+        return -1;
+      }
+      const aWildCard = a.parts[i].startsWith("*");
+      const bWildCard = b.parts[i].startsWith("*");
       if (aWildCard && bWildCard) {
-        const aNotFound = a.parts[i].match(/^[*]not-found$/),
-          bNotFound = b.parts[i].match(/^[*]not-found$/);
-        if (aNotFound && bNotFound) continue;
-        if (aNotFound) return 1;
-        if (bNotFound) return -1;
+        const aNotFound = a.parts[i].match(/^[*]not-found$/);
+        const bNotFound = b.parts[i].match(/^[*]not-found$/);
+        if (aNotFound && bNotFound) {
+          continue;
+        }
+        if (aNotFound) {
+          return 1;
+        }
+        if (bNotFound) {
+          return -1;
+        }
         continue;
       }
-      if (aWildCard) return 1;
-      if (bWildCard) return -1;
-      const aSlug = a.parts[i].startsWith(":"),
-        bSlug = b.parts[i].startsWith(":");
+      if (aWildCard) {
+        return 1;
+      }
+      if (bWildCard) {
+        return -1;
+      }
+      const aSlug = a.parts[i].startsWith(":");
+      const bSlug = b.parts[i].startsWith(":");
       if (aSlug && bSlug) {
-        const aNotFound = a.parts[i].match(/^[*]not-found$/),
-          bNotFound = b.parts[i].match(/^[*]not-found$/);
-        if (aNotFound && bNotFound) continue;
-        if (aNotFound) return 1;
-        if (bNotFound) return -1;
+        const aNotFound = a.parts[i].match(/^[*]not-found$/);
+        const bNotFound = b.parts[i].match(/^[*]not-found$/);
+        if (aNotFound && bNotFound) {
+          continue;
+        }
+        if (aNotFound) {
+          return 1;
+        }
+        if (bNotFound) {
+          return -1;
+        }
         continue;
       }
-      if (aSlug) return 1;
-      if (bSlug) return -1;
+      if (aSlug) {
+        return 1;
+      }
+      if (bSlug) {
+        return -1;
+      }
+    }
+    if (a.isInitial && !b.isInitial) {
+      return -1;
+    }
+    if (!a.isInitial && b.isInitial) {
+      return 1;
     }
-    return a.isInitial && !b.isInitial ? -1 : !a.isInitial && b.isInitial ? 1 : b.parts.length - a.parts.length;
+    return b.parts.length - a.parts.length;
   };
 }
 function formatRegexPattern(it) {
-  return it = it.replace(/ /g, "%20"), it.startsWith(":") ? `(((?!\\+not-found(?:/|$))[^/]+\\/)${it.endsWith("?") ? "?" : ""})` : it.startsWith("*") ? `((.*\\/)${it.endsWith("?") ? "?" : ""})` : (0, import_matchers.matchGroupName)(it) != null ? `(?:${escape(it)}\\/)?` : (0, import_escape_string_regexp.default)(it) + "\\/";
+  it = it.replace(/ /g, "%20");
+  if (it.startsWith(":")) {
+    return `(((?!\\+not-found(?:/|$))[^/]+\\/)${it.endsWith("?") ? "?" : ""})`;
+  }
+  if (it.startsWith("*")) {
+    return `((.*\\/)${it.endsWith("?") ? "?" : ""})`;
+  }
+  if ((0, import_matchers.matchGroupName)(it) != null) {
+    return `(?:${escape(it)}\\/)?`;
+  }
+  return (0, import_escape_string_regexp.default)(it) + `\\/`;
 }
 function decodeURIComponentSafe(str) {
   try {
@@ -143,47 +216,75 @@ function decodeURIComponentSafe(str) {
   }
 }
 function populateParams(routes, params) {
-  if (!(!routes || !params || Object.keys(params).length === 0)) {
-    for (const route of routes) Object.assign(route, {
+  if (!routes || !params || Object.keys(params).length === 0) return;
+  for (const route of routes) {
+    Object.assign(route, {
       params
     });
-    return routes;
   }
+  return routes;
 }
 function createConfigItemAdditionalProperties(screen, pattern, routeNames, config = {}) {
   const parts = [];
-  let isDynamic = !1,
-    staticPartCount = 0;
+  let isDynamic = false;
+  let staticPartCount = 0;
   const isIndex = screen === "index" || screen.endsWith("/index");
-  for (const part of pattern.split("/")) if (part) {
-    const isDynamicPart = part.startsWith(":") || part.startsWith("*") || part.includes("*not-found");
-    isDynamic ||= isDynamicPart, (0, import_matchers.matchGroupName)(part) || (parts.push(part), isDynamicPart || staticPartCount++);
+  for (const part of pattern.split("/")) {
+    if (part) {
+      const isDynamicPart = part.startsWith(":") || part.startsWith("*") || part.includes("*not-found");
+      isDynamic ||= isDynamicPart;
+      if (!(0, import_matchers.matchGroupName)(part)) {
+        parts.push(part);
+        if (!isDynamicPart) {
+          staticPartCount++;
+        }
+      }
+    }
+  }
+  const hasChildren = config.screens ? !!Object.keys(config.screens)?.length : false;
+  const type = hasChildren ? "layout" : isDynamic ? "dynamic" : "static";
+  if (isIndex) {
+    parts.push("index");
+    staticPartCount++;
   }
-  const hasChildren = config.screens ? !!Object.keys(config.screens)?.length : !1,
-    type = hasChildren ? "layout" : isDynamic ? "dynamic" : "static";
-  return isIndex && (parts.push("index"), staticPartCount++), {
+  return {
     type,
     isIndex,
     hasChildren,
     parts,
     staticPartCount,
     userReadableName: [...routeNames.slice(0, -1), config.path || screen].join("/"),
-    expandedRouteNames: routeNames.flatMap(name => name.split("/"))
+    expandedRouteNames: routeNames.flatMap(name => {
+      return name.split("/");
+    })
   };
 }
 function parseQueryParamsExtended(path, route, parseConfig, hash) {
-  const queryIndex = path.indexOf("?"),
-    hashIndex = path.indexOf("#"),
-    queryEnd = hashIndex >= 0 && hashIndex > queryIndex ? hashIndex : void 0,
-    searchParams = new URLSearchParams(queryIndex >= 0 ? path.slice(queryIndex + 1, queryEnd) : ""),
-    params = /* @__PURE__ */Object.create(null);
-  hash && (params["#"] = hash.slice(1));
-  for (const name of searchParams.keys()) if (route.params?.[name]) process.env.NODE_ENV !== "production" && console.warn(`Route '/${route.name}' with param '${name}' was specified both in the path and as a param, removing from path`);else {
-    const values = parseConfig?.hasOwnProperty(name) ? searchParams.getAll(name).map(value => parseConfig[name](value)) : searchParams.getAll(name);
-    params[name] = values.length === 1 ? values[0] : values;
+  const queryIndex = path.indexOf("?");
+  const hashIndex = path.indexOf("#");
+  const queryEnd = hashIndex >= 0 && hashIndex > queryIndex ? hashIndex : void 0;
+  const searchParams = new URLSearchParams(queryIndex >= 0 ? path.slice(queryIndex + 1, queryEnd) : "");
+  const params = /* @__PURE__ */Object.create(null);
+  if (hash) {
+    params["#"] = hash.slice(1);
+  }
+  for (const name of searchParams.keys()) {
+    if (route.params?.[name]) {
+      if (process.env.NODE_ENV !== "production") {
+        console.warn(`Route '/${route.name}' with param '${name}' was specified both in the path and as a param, removing from path`);
+      }
+    } else {
+      const values = parseConfig?.hasOwnProperty(name) ? searchParams.getAll(name).map(value => parseConfig[name](value)) : searchParams.getAll(name);
+      params[name] = values.length === 1 ? values[0] : values;
+    }
   }
   return Object.keys(params).length ? params : void 0;
 }
 function stripBaseUrl(path, baseUrl = process.env.EXPO_BASE_URL) {
-  return process.env.NODE_ENV !== "development" && baseUrl ? path.replace(/^\/+/g, "/").replace(new RegExp(`^\\/?${escape(baseUrl)}`, "g"), "") : path;
+  if (process.env.NODE_ENV !== "development") {
+    if (baseUrl) {
+      return path.replace(/^\/+/g, "/").replace(new RegExp(`^\\/?${escape(baseUrl)}`, "g"), "");
+    }
+  }
+  return path;
 }