one 1.1.392 → 1.1.393

package/dist/cjs/createApp.js

@@ -25,7 +25,7 @@ __export(createApp_exports, {
   createApp: () => createApp
 });
 module.exports = __toCommonJS(createApp_exports);
-var import_setup = require("./setup"), import_react_native = require("react-native-web"), import_Root = require("./Root"), import_clientLoaderResolver = require("./clientLoaderResolver"), import_render = require("./render"), import_server_render = require("./server-render"), import_server = __toESM(require("react-dom/server.browser"), 1), import_serverContext = require("./utils/serverContext"), import_jsx_runtime = require("react/jsx-runtime");
+var import_setup = require("./setup"), import_react_native = require("react-native-web"), import_Root = require("./Root"), import_clientLoaderResolver = require("./clientLoaderResolver"), import_render = require("./render"), import_server_render = require("./server-render"), import_server = __toESM(require("react-dom/server.browser"), 1), import_serverContext = require("./utils/serverContext"), import_ensureExists = require("./utils/ensureExists"), import_useServerHeadInsertion = require("./useServerHeadInsertion"), import_jsx_runtime = require("react/jsx-runtime");
 const import_meta = {};
 function createApp(options) {
   return import_meta.env.SSR ? {
@@ -39,17 +39,34 @@ function createApp(options) {
         mode,
         css
       });
-      const App = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Root.Root, { routes: options.routes, ...props });
+      let renderId;
+      const App = () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        import_Root.Root,
+        {
+          onRenderId: (id) => {
+            renderId = id;
+          },
+          routes: options.routes,
+          ...props
+        }
+      );
       import_react_native.AppRegistry.registerComponent("App", () => App);
       const Application = import_react_native.AppRegistry.getApplication("App", {}), rootElement = Application.element.props.children;
       let html = await (0, import_server_render.renderToString)(rootElement, {
         preloads: props.preloads
       });
       try {
-        const styleTag = Application.getStyleElement({ nonce: process.env.ONE_NONCE });
-        if (styleTag) {
-          const rnwStyleHTML = import_server.default.renderToStaticMarkup(styleTag);
-          rnwStyleHTML && (html = html.replace("</head>", `${rnwStyleHTML}</head>`));
+        const extraHeadElements = [], styleTag = Application.getStyleElement({ nonce: process.env.ONE_NONCE });
+        styleTag && extraHeadElements.push(styleTag), (0, import_ensureExists.ensureExists)(renderId);
+        const insertions = (0, import_useServerHeadInsertion.getServerHeadInsertions)(renderId);
+        if (insertions)
+          for (const insertion of insertions) {
+            const out = insertion();
+            out && extraHeadElements.push(out);
+          }
+        if (extraHeadElements.length) {
+          const extraHeadHTML = import_server.default.renderToStaticMarkup(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: extraHeadElements }));
+          extraHeadHTML && (html = html.replace("</head>", `${extraHeadHTML}</head>`));
         }
       } catch (err) {
         if (!`${err}`.includes("sheet is not defined"))

package/dist/cjs/createApp.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createApp.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAO,oBAEP,sBAA4B,yBAC5B,cAAqB,mBACrB,8BAAoC,mCACpC,gBAAuB,qBACvB,uBAA+B,4BAG/B,gBAA2B,iDAC3B,uBAIO,kCAoBU;AAlCjB;AAkBO,SAAS,UAAU,SAAyB;AACjD,SAAI,YAAY,IAAI,MACX;AAAA,IACL;AAAA,IACA,QAAQ,OAAO,UAA0B;AACvC,UAAI,EAAE,YAAY,aAAa,KAAK,MAAM,iBAAiB,IAAI;AAE/D,iDAAiB;AAAA,QACf,gBAAgB;AAAA,QAChB;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC;AAED,YAAM,MAAM,MACH,4CAAC,oBAAK,QAAQ,QAAQ,QAAS,GAAG,OAAO;AAGlD,sCAAY,kBAAkB,OAAO,MAAM,GAAG;AAG9C,YAAM,cAAc,gCAAY,eAAe,OAAO,CAAC,CAAC,GAGlD,cAAc,YAAY,QAAQ,MAAM;AAE9C,UAAI,OAAO,UAAM,qCAAe,aAAa;AAAA,QAC3C,UAAU,MAAM;AAAA,MAClB,CAAC;AAED,UAAI;AACF,cAAM,WAAW,YAAY,gBAAgB,EAAE,OAAO,QAAQ,IAAI,UAAU,CAAC;AAC7E,YAAI,UAAU;AACZ,gBAAM,eAAe,cAAAA,QAAe,qBAAqB,QAAQ;AACjE,UAAI,iBACF,OAAO,KAAK,QAAQ,WAAW,GAAG,YAAY,SAAS;AAAA,QAE3D;AAAA,MACF,SAAS,KAAK;AAGZ,YAAI,IAAG,GAAG,GAAG,SAAS,sBAAsB;AAG1C,gBAAM;AAAA,MAEV;AAGA,YAAM,iBAAa,uCAAiB,GAAG;AACvC,aAAI,cACmB,OAAO,KAAK,UAAU,EAAE,WAE3C,OAAO,KAAK;AAAA,QACV,KAAK,UAAU,sDAAiC;AAAA,QAChD,KAAK,UAAU,UAAU;AAAA,MAC3B,IAIG;AAAA,IACT;AAAA,EACF,KAIuB,QAAQ,OAAO,kBAAkB,IAAI,GAG3D,KAAK,MAAM;AACV,6DAAoB,uCAAiB,KAAK,CAAC,CAAC,EACzC,KAAK,MAAM;AAEV,gCAAO,4CAAC,oBAAK,UAAQ,IAAC,QAAQ,QAAQ,QAAQ,MAAM,OAAO,SAAS,MAAM,CAAE;AAAA,IAC9E,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,cAAQ,MAAM,iEAAiE,GAAG;AAAA,IACpF,CAAC;AAAA,EACL,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,YAAQ,MAAM,yCAAyC,GAAG;AAAA,EAC5D,CAAC;AACL;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAO,oBAEP,sBAA4B,yBAC5B,cAAqB,mBACrB,8BAAoC,mCACpC,gBAAuB,qBACvB,uBAA+B,4BAG/B,gBAA2B,iDAC3B,uBAIO,kCAEP,sBAA6B,iCAC7B,gCAAwC,qCAuB5B;AAxCZ;AAqBO,SAAS,UAAU,SAAyB;AACjD,SAAI,YAAY,IAAI,MACX;AAAA,IACL;AAAA,IACA,QAAQ,OAAO,UAA0B;AACvC,UAAI,EAAE,YAAY,aAAa,KAAK,MAAM,iBAAiB,IAAI;AAE/D,iDAAiB;AAAA,QACf,gBAAgB;AAAA,QAChB;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC;AAED,UAAI;AAEJ,YAAM,MAAM,MAER;AAAA,QAAC;AAAA;AAAA,UACC,YAAY,CAAC,OAAO;AAClB,uBAAW;AAAA,UACb;AAAA,UACA,QAAQ,QAAQ;AAAA,UACf,GAAG;AAAA;AAAA,MACN;AAIJ,sCAAY,kBAAkB,OAAO,MAAM,GAAG;AAG9C,YAAM,cAAc,gCAAY,eAAe,OAAO,CAAC,CAAC,GAGlD,cAAc,YAAY,QAAQ,MAAM;AAE9C,UAAI,OAAO,UAAM,qCAAe,aAAa;AAAA,QAC3C,UAAU,MAAM;AAAA,MAClB,CAAC;AAED,UAAI;AACF,cAAM,oBAA0C,CAAC,GAE3C,WAAW,YAAY,gBAAgB,EAAE,OAAO,QAAQ,IAAI,UAAU,CAAC;AAC7E,QAAI,YACF,kBAAkB,KAAK,QAAQ,OAGjC,kCAAa,QAAQ;AACrB,cAAM,iBAAa,uDAAwB,QAAQ;AACnD,YAAI;AACF,qBAAW,aAAa,YAAY;AAClC,kBAAM,MAAM,UAAU;AACtB,YAAI,OACF,kBAAkB,KAAK,GAAG;AAAA,UAE9B;AAGF,YAAI,kBAAkB,QAAQ;AAC5B,gBAAM,gBAAgB,cAAAA,QAAe,qBAAqB,2EAAG,6BAAkB,CAAG;AAElF,UAAI,kBACF,OAAO,KAAK,QAAQ,WAAW,GAAG,aAAa,SAAS;AAAA,QAE5D;AAAA,MACF,SAAS,KAAK;AAGZ,YAAI,IAAG,GAAG,GAAG,SAAS,sBAAsB;AAG1C,gBAAM;AAAA,MAEV;AAGA,YAAM,iBAAa,uCAAiB,GAAG;AACvC,aAAI,cACmB,OAAO,KAAK,UAAU,EAAE,WAE3C,OAAO,KAAK;AAAA,QACV,KAAK,UAAU,sDAAiC;AAAA,QAChD,KAAK,UAAU,UAAU;AAAA,MAC3B,IAIG;AAAA,IACT;AAAA,EACF,KAIuB,QAAQ,OAAO,kBAAkB,IAAI,GAG3D,KAAK,MAAM;AACV,6DAAoB,uCAAiB,KAAK,CAAC,CAAC,EACzC,KAAK,MAAM;AAEV,gCAAO,4CAAC,oBAAK,UAAQ,IAAC,QAAQ,QAAQ,QAAQ,MAAM,OAAO,SAAS,MAAM,CAAE;AAAA,IAC9E,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,cAAQ,MAAM,iEAAiE,GAAG;AAAA,IACpF,CAAC;AAAA,EACL,CAAC,EACA,MAAM,CAAC,QAAQ;AACd,YAAQ,MAAM,yCAAyC,GAAG;AAAA,EAC5D,CAAC;AACL;",
   "names": ["ReactDOMServer"]
 }

package/dist/cjs/fork/_shared.cjs

@@ -0,0 +1,42 @@
+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: !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, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+    return to;
+  };
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: !0
+}), mod);
+var shared_exports = {};
+__export(shared_exports, {
+  getParamName: () => getParamName,
+  getParamValue: () => getParamValue,
+  isDynamicPart: () => isDynamicPart,
+  replacePart: () => replacePart
+});
+module.exports = __toCommonJS(shared_exports);
+const getParamName = pattern => pattern.replace(/^[:*]/, "").replace(/\?$/, "");
+function getParamValue(p, value) {
+  if (p.startsWith("*")) {
+    const values = value.split("/").filter(v => v !== "");
+    return values.length === 0 && p.endsWith("?") ? void 0 : values;
+  }
+  return value;
+}
+function isDynamicPart(p) {
+  return p.length > 1 && (p.startsWith(":") || p.startsWith("*"));
+}
+function replacePart(p) {
+  return p.replace(/^[:*]/, "").replace(/\?$/, "");
+}

package/dist/cjs/fork/_shared.js

@@ -0,0 +1,37 @@
+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: !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, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
+var shared_exports = {};
+__export(shared_exports, {
+  getParamName: () => getParamName,
+  getParamValue: () => getParamValue,
+  isDynamicPart: () => isDynamicPart,
+  replacePart: () => replacePart
+});
+module.exports = __toCommonJS(shared_exports);
+const getParamName = (pattern) => pattern.replace(/^[:*]/, "").replace(/\?$/, "");
+function getParamValue(p, value) {
+  if (p.startsWith("*")) {
+    const values = value.split("/").filter((v) => v !== "");
+    return values.length === 0 && p.endsWith("?") ? void 0 : values;
+  }
+  return value;
+}
+function isDynamicPart(p) {
+  return p.length > 1 && (p.startsWith(":") || p.startsWith("*"));
+}
+function replacePart(p) {
+  return p.replace(/^[:*]/, "").replace(/\?$/, "");
+}
+//# sourceMappingURL=_shared.js.map

package/dist/cjs/fork/_shared.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/fork/_shared.ts"],
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIO,MAAM,eAAe,CAAC,YAAoB,QAAQ,QAAQ,SAAS,EAAE,EAAE,QAAQ,OAAO,EAAE;AAExF,SAAS,cAAc,GAAW,OAAe;AACtD,MAAI,EAAE,WAAW,GAAG,GAAG;AACrB,UAAM,SAAS,MAAM,MAAM,GAAG,EAAE,OAAO,CAAC,MAAM,MAAM,EAAE;AACtD,WAAO,OAAO,WAAW,KAAK,EAAE,SAAS,GAAG,IAAI,SAAY;AAAA,EAC9D;AAEA,SAAO;AACT;AAEO,SAAS,cAAc,GAAW;AACvC,SAAO,EAAE,SAAS,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,WAAW,GAAG;AAC/D;AAEO,SAAS,YAAY,GAAW;AACrC,SAAO,EAAE,QAAQ,SAAS,EAAE,EAAE,QAAQ,OAAO,EAAE;AACjD;",
+  "names": []
+}

package/dist/cjs/fork/_shared.native.js

@@ -0,0 +1,49 @@
+"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: !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, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
+var shared_exports = {};
+__export(shared_exports, {
+  getParamName: () => getParamName,
+  getParamValue: () => getParamValue,
+  isDynamicPart: () => isDynamicPart,
+  replacePart: () => replacePart
+});
+module.exports = __toCommonJS(shared_exports);
+var getParamName = function(pattern) {
+  return pattern.replace(/^[:*]/, "").replace(/\?$/, "");
+};
+function getParamValue(p, value) {
+  if (p.startsWith("*")) {
+    var values = value.split("/").filter(function(v) {
+      return v !== "";
+    });
+    return values.length === 0 && p.endsWith("?") ? void 0 : values;
+  }
+  return value;
+}
+function isDynamicPart(p) {
+  return p.length > 1 && (p.startsWith(":") || p.startsWith("*"));
+}
+function replacePart(p) {
+  return p.replace(/^[:*]/, "").replace(/\?$/, "");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getParamName,
+  getParamValue,
+  isDynamicPart,
+  replacePart
+});
+//# sourceMappingURL=_shared.js.map

package/dist/cjs/fork/_shared.native.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/fork/Users/n8/one/packages/one/src/fork/_shared.ts"],
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;;;AAIO,IAAMA,eAAe,SAACC,SAAAA;SAAoBA,QAAQC,QAAQ,SAAS,EAAA,EAAIA,QAAQ,OAAO,EAAA;;AAEtF,SAASC,cAAcC,GAAWC,OAAa;AACpD,MAAID,EAAEE,WAAW,GAAA,GAAM;AACrB,QAAMC,SAASF,MAAMG,MAAM,GAAA,EAAKC,OAAO,SAACC,GAAAA;aAAMA,MAAM;;AACpD,WAAOH,OAAOI,WAAW,KAAKP,EAAEQ,SAAS,GAAA,IAAOC,SAAYN;EAC9D;AAEA,SAAOF;AACT;AAEO,SAASS,cAAcV,GAAS;AACrC,SAAOA,EAAEO,SAAS,MAAMP,EAAEE,WAAW,GAAA,KAAQF,EAAEE,WAAW,GAAA;AAC5D;AAEO,SAASS,YAAYX,GAAS;AACnC,SAAOA,EAAEF,QAAQ,SAAS,EAAA,EAAIA,QAAQ,OAAO,EAAA;AAC/C;",
+  "names": ["getParamName", "pattern", "replace", "getParamValue", "p", "value", "startsWith", "values", "split", "filter", "v", "length", "endsWith", "undefined", "isDynamicPart", "replacePart"]
+}

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

@@ -21,11 +21,11 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 var getPathFromState_mods_exports = {};
 __export(getPathFromState_mods_exports, {
   appendBaseUrl: () => appendBaseUrl,
-  getParamName: () => getParamName,
   getPathWithConventionsCollapsed: () => getPathWithConventionsCollapsed
 });
 module.exports = __toCommonJS(getPathFromState_mods_exports);
-var import_matchers = require("../router/matchers.cjs");
+var import_matchers = require("../router/matchers.cjs"),
+  import_shared = require("./_shared.cjs");
 function getPathWithConventionsCollapsed({
   pattern,
   route,
@@ -37,21 +37,19 @@ function getPathWithConventionsCollapsed({
 }) {
   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;
+    const name = (0, import_shared.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("]") ? "" : i === 0 ? route : p === "*not-found" ? "" : route.name?.split("/").slice(i + 1).join("/");
     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 && (0, import_matchers.matchGroupName)(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : shouldEncodeURISegment ? encodeURISegment(initialRouteName, {
-      preserveBrackets: !0
-    }) : initialRouteName : "" : shouldEncodeURISegment ? encodeURISegment(p, {
-      preserveBrackets: !0
-    }) : p;
+    return !preserveGroups && (0, import_matchers.matchGroupName)(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : shouldEncodeURISegment ? encodeURIComponentPreservingBrackets(initialRouteName) : initialRouteName : "" : shouldEncodeURISegment ? encodeURIComponentPreservingBrackets(p) : p;
   }).map(v => v ?? "").join("/");
 }
-const getParamName = pattern => pattern.replace(/^[:*]/, "").replace(/\?$/, "");
+function encodeURIComponentPreservingBrackets(str) {
+  return encodeURIComponent(str).replace(/%5B/g, "[").replace(/%5D/g, "]");
+}
 function appendBaseUrl(path, baseUrl = process.env.EXPO_BASE_URL) {
   return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
 }

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

@@ -15,11 +15,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0
 var getPathFromState_mods_exports = {};
 __export(getPathFromState_mods_exports, {
   appendBaseUrl: () => appendBaseUrl,
-  getParamName: () => getParamName,
   getPathWithConventionsCollapsed: () => getPathWithConventionsCollapsed
 });
 module.exports = __toCommonJS(getPathFromState_mods_exports);
-var import_matchers = require("../router/matchers");
+var import_matchers = require("../router/matchers"), import_shared = require("./_shared");
 function getPathWithConventionsCollapsed({
   pattern,
   route,
@@ -31,19 +30,21 @@ function getPathWithConventionsCollapsed({
 }) {
   const segments = pattern.split("/");
   return segments.map((p, i) => {
-    const name = getParamName(p);
+    const name = (0, import_shared.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;
+      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("]") ? "" : i === 0 ? route : p === "*not-found" ? "" : route.name?.split("/").slice(i + 1).join("/");
     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 && (0, import_matchers.matchGroupName)(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : shouldEncodeURISegment ? encodeURISegment(initialRouteName, { preserveBrackets: !0 }) : initialRouteName : "" : shouldEncodeURISegment ? encodeURISegment(p, { preserveBrackets: !0 }) : p;
+    return !preserveGroups && (0, import_matchers.matchGroupName)(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : shouldEncodeURISegment ? encodeURIComponentPreservingBrackets(initialRouteName) : initialRouteName : "" : shouldEncodeURISegment ? encodeURIComponentPreservingBrackets(p) : p;
   }).map((v) => v ?? "").join("/");
 }
-const getParamName = (pattern) => pattern.replace(/^[:*]/, "").replace(/\?$/, "");
+function encodeURIComponentPreservingBrackets(str) {
+  return encodeURIComponent(str).replace(/%5B/g, "[").replace(/%5D/g, "]");
+}
 function appendBaseUrl(path, baseUrl = process.env.EXPO_BASE_URL) {
   return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
 }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/fork/getPathFromState-mods.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,sBAA4E;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,sBAAkB,gCAAe,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,eACZ,kCAAiB,OAAO,KAAK,YAC7B,gCAAe,OAAO,KAAK,YAC3B,2CAA0B,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;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,sBAA4E,+BAC5E,gBAA6B;AAatB,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;AAClC,SAAO,SACJ,IAAI,CAAC,GAAG,MAAM;AACb,UAAM,WAAO,4BAAa,CAAC;AAK3B,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,IAChD,KAGL,MAAM,IAED,QAGL,MAAM,eACD,KAKF,MAAM,MACT,MAAM,GAAG,EACV,MAAM,IAAI,CAAC,EACX,KAAK,GAAG;AAIb,QAAI,EAAE,WAAW,GAAG,GAAG;AACrB,UAAI;AACF,eAAO,IAAI,IAAI;AAGjB,YAAM,QAAQ,OAAO,IAAI;AACzB,aAAI,UAAU,UAAa,EAAE,SAAS,GAAG,IACvC,UAIM,yBAAyB,iBAAiB,KAAK,IAAI,UAAU;AAAA,IACvE;AAEA,WAAI,CAAC,sBAAkB,gCAAe,CAAC,KAAK,OAItC,SAAS,SAAS,MAAM,KACtB,mBAEE,yBAAyB,gBAAgB,IACpC,KAGF,yBACH,qCAAqC,gBAAgB,IACrD,mBAGD,KAGF,yBAAyB,qCAAqC,CAAC,IAAI;AAAA,EAC5E,CAAC,EACA,IAAI,CAAC,MAAM,KAAK,EAAE,EAClB,KAAK,GAAG;AACb;AAEA,SAAS,qCAAqC,KAAa;AACzD,SAAO,mBAAmB,GAAG,EAAE,QAAQ,QAAQ,GAAG,EAAE,QAAQ,QAAQ,GAAG;AACzE;AAEO,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,eACZ,kCAAiB,OAAO,KAAK,YAC7B,gCAAe,OAAO,KAAK,YAC3B,2CAA0B,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/cjs/fork/getPathFromState-mods.native.js

@@ -16,17 +16,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0
 var getPathFromState_mods_exports = {};
 __export(getPathFromState_mods_exports, {
   appendBaseUrl: () => appendBaseUrl,
-  getParamName: () => getParamName,
   getPathWithConventionsCollapsed: () => getPathWithConventionsCollapsed
 });
 module.exports = __toCommonJS(getPathFromState_mods_exports);
-var import_matchers = require("../router/matchers");
+var import_matchers = require("../router/matchers"), import_shared = require("./_shared");
 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;
+    var name = (0, import_shared.getParamName)(p);
+    if (p.startsWith("*")) {
+      var _route_name;
+      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("]") ? "" : i === 0 ? route : p === "*not-found" ? "" : (_route_name = route.name) === null || _route_name === void 0 ? void 0 : _route_name.split("/").slice(i + 1).join("/");
+    }
     if (p.startsWith(":")) {
       if (preserveDynamicRoutes)
         return `[${name}]`;
@@ -36,18 +37,14 @@ function getPathWithConventionsCollapsed(param) {
       var _ref;
       return (_ref = shouldEncodeURISegment ? encodeURISegment(value) : value) !== null && _ref !== void 0 ? _ref : "undefined";
     }
-    return !preserveGroups && (0, import_matchers.matchGroupName)(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : shouldEncodeURISegment ? encodeURISegment(initialRouteName, {
-      preserveBrackets: !0
-    }) : initialRouteName : "" : shouldEncodeURISegment ? encodeURISegment(p, {
-      preserveBrackets: !0
-    }) : p;
+    return !preserveGroups && (0, import_matchers.matchGroupName)(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : shouldEncodeURISegment ? encodeURIComponentPreservingBrackets(initialRouteName) : initialRouteName : "" : shouldEncodeURISegment ? encodeURIComponentPreservingBrackets(p) : p;
   }).map(function(v) {
     return v ?? "";
   }).join("/");
 }
-var getParamName = function(pattern) {
-  return pattern.replace(/^[:*]/, "").replace(/\?$/, "");
-};
+function encodeURIComponentPreservingBrackets(str) {
+  return encodeURIComponent(str).replace(/%5B/g, "[").replace(/%5D/g, "]");
+}
 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;
@@ -64,7 +61,6 @@ function encodeURISegment(str) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   appendBaseUrl,
-  getParamName,
   getPathWithConventionsCollapsed
 });
 //# sourceMappingURL=getPathFromState-mods.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/fork/Users/n8/one/packages/one/src/fork/getPathFromState-mods.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;;AAQA,sBAA4E;AAarE,SAASA,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,sBAAkBmB,gCAAeZ,CAAAA,KAAM,OAItCH,SAASgB,SAAS,MAAMZ,KACtBL,mBAEEkB,yBAAyBlB,gBAAAA,IACpB,KAEFD,yBACHgB,iBAAiBf,kBAAkB;MAAEmB,kBAAkB;IAAK,CAAA,IAC5DnB,mBAGD,KAGFD,yBAAyBgB,iBAAiBX,GAAG;MAAEe,kBAAkB;IAAK,CAAA,IAAKf;EACpF,CAAA,EACCD,IAAI,SAACiB,GAAAA;WAAMA,KAAK;KAChBT,KAAK,GAAA;AACV;AAEO,IAAMJ,eAAe,SAACb,SAAAA;SAAoBA,QAAQ2B,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,eACZC,kCAAiBD,OAAAA,KAAY,YAC7Bb,gCAAea,OAAAA,KAAY,YAC3BE,2CAA0BF,OAAAA,KAAY;AAE1C;AAEA,SAASd,iBAAiBiB,KAAW;MAAE,EAAEb,mBAAmB,GAAK,IAA1B,UAAA,SAAA,KAAA,UAAA,CAAA,MAAA,SAAA,UAAA,CAAA,IAA+B,CAAC;AAGrEa,eAAMC,OAAOD,GAAAA,EAAKX,QAAQ,mCAAmC,SAACa,MAAAA;WAASC,mBAAmBD,IAAAA;MAEtFf,qBAEFa,MAAMA,IAAIX,QAAQ,QAAQ,GAAA,EAAKA,QAAQ,QAAQ,GAAA,IAE1CW;AACT;",
-  "names": ["getPathWithConventionsCollapsed", "pattern", "route", "params", "preserveGroups", "preserveDynamicRoutes", "shouldEncodeURISegment", "initialRouteName", "segments", "split", "map", "p", "i", "name", "getParamName", "startsWith", "Array", "isArray", "join", "endsWith", "value", "undefined", "encodeURISegment", "matchGroupName", "length", "segmentMatchesConvention", "preserveBrackets", "v", "replace", "appendBaseUrl", "path", "baseUrl", "process", "env", "EXPO_BASE_URL", "NODE_ENV", "segment", "matchDynamicName", "matchDeepDynamicRouteName", "str", "String", "char", "encodeURIComponent"]
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;AAQA,sBAA4E,+BAC5E,gBAA6B;AAatB,SAASA,gCAAgC,OAa/C;MAb+C,EAC9CC,SACAC,OACAC,QACAC,gBACAC,uBACAC,yBAAyB,IACzBC,iBAAgB,IAP8B,OAcxCC,WAAWP,QAAQQ,MAAM,GAAA;AAC/B,SAAOD,SACJE,IAAI,SAACC,GAAGC,GAAAA;AACP,QAAMC,WAAOC,4BAAaH,CAAAA;AAK1B,QAAIA,EAAEI,WAAW,GAAA,GAAM;UA+Bdb;AA9BP,aAAIG,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,IAC7C,KAGLP,MAAM,IAEDV,QAGLS,MAAM,eACD,MAKFT,cAAAA,MAAMW,UAAI,QAAVX,gBAAAA,SAAAA,SAAAA,YACHO,MAAM,GAAA,EACPW,MAAMR,IAAI,CAAA,EACVM,KAAK,GAAA;IACV;AAGA,QAAIP,EAAEI,WAAW,GAAA,GAAM;AACrB,UAAIV;AACF,eAAO,IAAIQ,IAAAA;AAGb,UAAMQ,QAAQlB,OAAOU,IAAAA;AACrB,UAAIQ,UAAUC,UAAaX,EAAEQ,SAAS,GAAA;AACpC;UAIMb;AAAR,cAAQA,OAAAA,yBAAyBiB,iBAAiBF,KAAAA,IAASA,WAAAA,QAAnDf,SAAAA,SAAAA,OAA6D;IACvE;AAEA,WAAI,CAACF,sBAAkBoB,gCAAeb,CAAAA,KAAM,OAItCH,SAASiB,SAAS,MAAMb,KACtBL,mBAEEmB,yBAAyBnB,gBAAAA,IACpB,KAGFD,yBACHqB,qCAAqCpB,gBAAAA,IACrCA,mBAGD,KAGFD,yBAAyBqB,qCAAqChB,CAAAA,IAAKA;EAC5E,CAAA,EACCD,IAAI,SAACkB,GAAAA;WAAMA,KAAK;KAChBV,KAAK,GAAA;AACV;AAEA,SAASS,qCAAqCE,KAAW;AACvD,SAAOC,mBAAmBD,GAAAA,EAAKE,QAAQ,QAAQ,GAAA,EAAKA,QAAQ,QAAQ,GAAA;AACtE;AAEO,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,SAASP,yBAAyBa,SAAe;AAC/C,SACEA,YAAY,eACZC,kCAAiBD,OAAAA,KAAY,YAC7Bf,gCAAee,OAAAA,KAAY,YAC3BE,2CAA0BF,OAAAA,KAAY;AAE1C;AAEA,SAAShB,iBAAiBM,KAAW;MAAE,EAAEa,mBAAmB,GAAK,IAA1B,UAAA,SAAA,KAAA,UAAA,CAAA,MAAA,SAAA,UAAA,CAAA,IAA+B,CAAC;AAGrEb,eAAMc,OAAOd,GAAAA,EAAKE,QAAQ,mCAAmC,SAACa,MAAAA;WAASd,mBAAmBc,IAAAA;MAEtFF,qBAEFb,MAAMA,IAAIE,QAAQ,QAAQ,GAAA,EAAKA,QAAQ,QAAQ,GAAA,IAE1CF;AACT;",
+  "names": ["getPathWithConventionsCollapsed", "pattern", "route", "params", "preserveGroups", "preserveDynamicRoutes", "shouldEncodeURISegment", "initialRouteName", "segments", "split", "map", "p", "i", "name", "getParamName", "startsWith", "Array", "isArray", "join", "endsWith", "slice", "value", "undefined", "encodeURISegment", "matchGroupName", "length", "segmentMatchesConvention", "encodeURIComponentPreservingBrackets", "v", "str", "encodeURIComponent", "replace", "appendBaseUrl", "path", "baseUrl", "process", "env", "EXPO_BASE_URL", "NODE_ENV", "segment", "matchDynamicName", "matchDeepDynamicRouteName", "preserveBrackets", "String", "char"]
 }

package/dist/cjs/fork/getPathFromState.cjs

@@ -1,7 +1,9 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf,
+  __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
     for (var name in all) __defProp(target, name, {
       get: all[name],
@@ -15,9 +17,18 @@ var __export = (target, all) => {
     });
     return to;
   };
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
-}), mod);
+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);
 var getPathFromState_exports = {};
 __export(getPathFromState_exports, {
   default: () => getPathFromState_default,
@@ -26,6 +37,7 @@ __export(getPathFromState_exports, {
 });
 module.exports = __toCommonJS(getPathFromState_exports);
 var import_getPathFromState_mods = require("./getPathFromState-mods.cjs"),
+  sharedModUtils = __toESM(require("./_shared.cjs"), 1),
   import_validatePathConfig = require("./validatePathConfig.cjs");
 const getActiveRoute = state => {
     const route = typeof state.index == "number" ? state.routes[state.index] : state.routes[state.routes.length - 1];
@@ -64,8 +76,8 @@ function getPathDataFromState(state, options) {
           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);
+        }, pattern?.split("/").filter(p => sharedModUtils.isDynamicPart(p)).forEach(p => {
+          const name = sharedModUtils.getParamName(p);
           focusedParams && delete focusedParams[name];
         }));
       }
@@ -103,8 +115,7 @@ function getPathDataFromState(state, options) {
     params: allParams
   };
 }
-const getParamName = pattern => pattern.replace(/^:/, "").replace(/\?$/, ""),
-  joinPaths = (...paths) => [].concat(...paths.map(p => p.split("/"))).filter(Boolean).join("/"),
+const 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

package/dist/cjs/fork/getPathFromState.js

@@ -1,7 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: !0 });
@@ -11,7 +12,14 @@ var __export = (target, all) => {
       !__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: !0 }), mod);
+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);
 var getPathFromState_exports = {};
 __export(getPathFromState_exports, {
   default: () => getPathFromState_default,
@@ -19,7 +27,7 @@ __export(getPathFromState_exports, {
   getPathFromState: () => getPathFromState
 });
 module.exports = __toCommonJS(getPathFromState_exports);
-var import_getPathFromState_mods = require("./getPathFromState-mods"), import_validatePathConfig = require("./validatePathConfig");
+var import_getPathFromState_mods = require("./getPathFromState-mods"), sharedModUtils = __toESM(require("./_shared"), 1), import_validatePathConfig = require("./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;
@@ -56,8 +64,8 @@ function getPathDataFromState(state, options) {
             ]
           ])
         );
-        Object.assign(allParams, currentParams), focusedRoute === route && (focusedParams = { ...currentParams }, pattern?.split("/").filter((p) => p.startsWith(":")).forEach((p) => {
-          const name = getParamName(p);
+        Object.assign(allParams, currentParams), focusedRoute === route && (focusedParams = { ...currentParams }, pattern?.split("/").filter((p) => sharedModUtils.isDynamicPart(p)).forEach((p) => {
+          const name = sharedModUtils.getParamName(p);
           focusedParams && delete focusedParams[name];
         }));
       }
@@ -89,7 +97,7 @@ function getPathDataFromState(state, options) {
   }
   return path = path.replace(/\/+/g, "/"), path = path.length > 1 ? path.replace(/\/$/, "") : path, options?.path && (path = joinPaths(options.path, path)), path = (0, import_getPathFromState_mods.appendBaseUrl)(path), allParams["#"] && (path += `#${allParams["#"]}`), { path, params: allParams };
 }
-const getParamName = (pattern) => pattern.replace(/^:/, "").replace(/\?$/, ""), joinPaths = (...paths) => [].concat(...paths.map((p) => p.split("/"))).filter(Boolean).join("/"), createConfigItem = (config, parentPattern) => {
+const 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)

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/fork/getPathFromState.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASA,mCAKO,oCAOP,4BAAmC;AAkBnC,MAAM,iBAAiB,CAAC,UAAoD;AAC1E,QAAM,QACJ,OAAO,MAAM,SAAU,WACnB,MAAM,OAAO,MAAM,KAAK,IACxB,MAAM,OAAO,MAAM,OAAO,SAAS,CAAC;AAE1C,SAAI,MAAM,QACD,eAAe,MAAM,KAAK,IAG5B;AACT,GAEM,0BAA0B,oBAAI,QAAuD,GAErF,uBAAuB,CAAC,YAA0B;AACtD,MAAI,CAAC,SAAS,QAAS,QAAO,CAAC;AAE/B,QAAM,SAAS,wBAAwB,IAAI,SAAS,OAAO;AAE3D,MAAI,OAAQ,QAAO;AAEnB,QAAM,oBAAoB,wBAAwB,QAAQ,OAAO;AAEjE,iCAAwB,IAAI,QAAQ,SAAS,iBAAiB,GAEvD;AACT;AAgCO,SAAS,iBACd,OACA,SACQ;AACR,SAAO,qBAAqB,OAAO,OAAO,EAAE;AAC9C;AAEO,SAAS,qBACd,OACA,SACA;AAGA,MAAI,SAAS;AACX,UAAM,MAAM,+EAA+E;AAG7F,EAAI,eACF,8CAAmB,OAAO;AAG5B,QAAM,UAAU,qBAAqB,OAAO;AAE5C,MAAI,OAAO,KACP,UAA6B;AAEjC,QAAM,YAAiC,CAAC;AAExC,SAAO,WAAS;AACd,QAAI,QAAQ,OAAO,QAAQ,SAAU,WAAW,QAAQ,QAAQ,GAC5D,QAAQ,QAAQ,OAAO,KAAK,GAI5B,SAEA;AACJ,UAAM,eAAe,eAAe,KAAK;AACzC,QAAI,iBAAiB;AAGrB,UAAM,mBAA6B,CAAC;AAEpC,QAAI,UAAU;AAEd,WAAO,MAAM,QAAQ,kBAAkB,WAAS;AAK9C,UAJA,UAAU,eAAe,MAAM,IAAI,EAAE,SAErC,iBAAiB,KAAK,MAAM,IAAI,GAE5B,MAAM,QAAQ;AAChB,cAAM,YAAY,eAAe,MAAM,IAAI,GAAG,WAYxC,gBAAgB,OAAO;AAAA,UAC3B,OAAO,QAAQ,MAAM,MAAO,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAC5C,QAAQ,YAAY,QAAQ,WACvB,CAAC,IAGH;AAAA,YACL;AAAA,cACE;AAAA,cACA,YAAY,GAAG,IACX,UAAU,GAAG,EAAE,KAAK,IACpB,MAAM,QAAQ,KAAK,IACjB,MAAM,IAAI,MAAM,IAChB,OAAO,KAAK;AAAA,YACpB;AAAA,UACF,CACD;AAAA,QACH;AAWA,eAAO,OAAO,WAAW,aAAa,GAIlC,iBAAiB,UAGnB,gBAAgB,EAAE,GAAG,cAAc,GAEnC,SACI,MAAM,GAAG,EACV,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,CAAC,EAE/B,QAAQ,CAAC,MAAM;AACd,gBAAM,OAAO,aAAa,CAAC;AAG3B,UAAI,iBAEF,OAAO,cAAc,IAAI;AAAA,QAE7B,CAAC;AAAA,MAEP;AAGA,UAAI,CAAC,eAAe,MAAM,IAAI,EAAE,WAAW,MAAM,UAAU,QAAW;AAOpE,cAAM,UAAU,eAAe,MAAM,IAAI,EAAE,SACrC,SACJ,MAAM,UAAU,YAAY,MAAM,SAC9B,MAAM,OAAO,QAAQ,SAAS,IAC9B,UACE,OAAO,KAAK,OAAO,EAAE,CAAC,IACtB;AAER,QAAI,UAAU,WAAW,eAAe,MAAM,IAAI,EAAE,UAAU,MAAM,KAClE,QAAQ,EAAE,GAAG,QAAQ,MAAM,GAAG,MAAM,QAAQ,KAAK,OAAO,GACxD,iBAAiB,WAEjB,UAAU;AAAA,MAId,OAAO;AACL,gBACE,OAAO,MAAM,MAAM,SAAU,WAAW,MAAM,MAAM,QAAQ,MAAM,MAAM,OAAO,SAAS;AAE1F,cAAM,YAAY,MAAM,MAAM,OAAO,KAAK,GACpC,eAAe,eAAe,MAAM,IAAI,EAAE;AAGhD,QAAI,gBAAgB,UAAU,QAAQ,gBACpC,QAAQ,WACR,iBAAiB,gBAGjB,UAAU;AAAA,MAEd;AAAA,IACF;AA0DA,QAvDI,eAAe,MAAM,IAAI,MAAM,UAiC7B,YAAY,WACd,UAAU,iBAAiB,KAAK,GAAG,IAGrC,YAAQ,8DAAgC;AAAA,MACtC,GAAG;AAAA,MACH;AAAA,MACA;AAAA,MACA,QAAQ;AAAA,MACR,kBAAkB,QAAQ,MAAM,IAAI,GAAG;AAAA,IACzC,CAAC,KAGS,MAAM,KAAK,WAAW,GAAG,MACnC,QAAQ,mBAAmB,MAAM,IAAI,IAIlC,kBACH,gBAAgB,aAAa,SAG3B,MAAM;AACR,cAAQ;AAAA,aACC,eAAe;AACxB,iBAAW,SAAS;AAClB,QAAI,cAAc,KAAK,MAAM,eAE3B,OAAO,cAAc,KAAK;AAK9B,aAAO,cAAc,GAAG;AAKxB,YAAM,QAAQ,IAAI,gBAAgB,aAAa,EAAE,SAAS;AAG1D,MAAI,UACF,QAAQ,IAAI,KAAK;AAAA,IAErB;AAEA,cAAU,MAAM;AAAA,EAClB;AAGA,gBAAO,KAAK,QAAQ,QAAQ,GAAG,GAC/B,OAAO,KAAK,SAAS,IAAI,KAAK,QAAQ,OAAO,EAAE,IAAI,MAG/C,SAAS,SACX,OAAO,UAAU,QAAQ,MAAM,IAAI,IAIrC,WAAO,4CAAc,IAAI,GAIrB,UAAU,GAAG,MACf,QAAQ,IAAI,UAAU,GAAG,CAAC,KAMrB,EAAE,MAAM,QAAQ,UAAU;AAEnC;AAEA,MAAM,eAAe,CAAC,YAAoB,QAAQ,QAAQ,MAAM,EAAE,EAAE,QAAQ,OAAO,EAAE,GAE/E,YAAY,IAAI,UACnB,CAAC,EACC,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,EACxC,OAAO,OAAO,EACd,KAAK,GAAG,GAEP,mBAAmB,CACvB,QACA,kBACe;AACf,MAAI,OAAO,UAAW;AAIpB,WAAO,EAAE,SAFO,gBAAgB,UAAU,eAAe,MAAM,IAAI,OAElD;AAGnB,MAAI,OAAO,SAAS,OAAO,SAAS;AAClC,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAKF,QAAM,UACJ,OAAO,UAAU,KAAO,UAAU,iBAAiB,IAAI,OAAO,QAAQ,EAAE,IAAI,OAAO,QAAQ,IAEvF,UAAU,OAAO,UAAU,wBAAwB,OAAO,SAAS,OAAO,IAAI;AAEpF,SAAO;AAAA;AAAA,IAEL,SAAS,SAAS,MAAM,GAAG,EAAE,OAAO,OAAO,EAAE,KAAK,GAAG;AAAA,IACrD,WAAW,OAAO;AAAA,IAClB;AAAA,EACF;AACF,GAEM,0BAA0B,CAC9B,SACA,YAEA,OAAO;AAAA,EACL,OAAO,QAAQ,OAAO,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM;AACzC,UAAM,SAAS,iBAAiB,GAAG,OAAO;AAE1C,WAAO,CAAC,MAAM,MAAM;AAAA,EACtB,CAAC;AACH;AAGF,IAAO,2BAAQ;",
+  "mappings": "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",
   "names": []
 }

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

@@ -1,8 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: !0 });
@@ -12,7 +13,14 @@ var __export = (target, all) => {
       !__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: !0 }), mod);
+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);
 var getPathFromState_exports = {};
 __export(getPathFromState_exports, {
   default: () => getPathFromState_default,
@@ -20,7 +28,7 @@ __export(getPathFromState_exports, {
   getPathFromState: () => getPathFromState
 });
 module.exports = __toCommonJS(getPathFromState_exports);
-var import_getPathFromState_mods = require("./getPathFromState-mods"), import_validatePathConfig = require("./validatePathConfig"), getActiveRoute = function(state) {
+var import_getPathFromState_mods = require("./getPathFromState-mods"), sharedModUtils = __toESM(require("./_shared"), 1), import_validatePathConfig = require("./validatePathConfig"), getActiveRoute = function(state) {
   var route = typeof state.index == "number" ? state.routes[state.index] : state.routes[state.routes.length - 1];
   return route.state ? getActiveRoute(route.state) : route;
 }, cachedNormalizedConfigs = /* @__PURE__ */ new WeakMap(), getNormalizedConfigs = function(options) {
@@ -49,9 +57,9 @@ function getPathDataFromState(state, options) {
         Object.assign(allParams, currentParams), focusedRoute === route && (focusedParams = {
           ...currentParams
         }, pattern == null || pattern.split("/").filter(function(p) {
-          return p.startsWith(":");
+          return sharedModUtils.isDynamicPart(p);
         }).forEach(function(p) {
-          var name = getParamName(p);
+          var name = sharedModUtils.getParamName(p);
           focusedParams && delete focusedParams[name];
         }));
       }
@@ -99,9 +107,7 @@ function getPathDataFromState(state, options) {
     params: allParams
   };
 }
-var getParamName = function(pattern) {
-  return pattern.replace(/^:/, "").replace(/\?$/, "");
-}, joinPaths = function() {
+var joinPaths = function() {
   for (var _len = arguments.length, paths = new Array(_len), _key = 0; _key < _len; _key++)
     paths[_key] = arguments[_key];
   return [].concat(...paths.map(function(p) {