one 2.13.2 → 2.13.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/dist/cjs/router/matchers.cjs +9 -0
  2. package/dist/cjs/router/matchers.native.cjs +9 -0
  3. package/dist/cjs/router/matchers.native.js +9 -0
  4. package/dist/cjs/router/matchers.native.js.map +1 -1
  5. package/dist/cjs/router/utils/getNativeStackReplaceAction.cjs +1 -2
  6. package/dist/cjs/router/utils/getNativeStackReplaceAction.native.cjs +1 -3
  7. package/dist/cjs/router/utils/getNativeStackReplaceAction.native.js +1 -3
  8. package/dist/cjs/router/utils/getNativeStackReplaceAction.native.js.map +1 -1
  9. package/dist/cjs/router/utils/getNavigateAction.cjs +1 -2
  10. package/dist/cjs/router/utils/getNavigateAction.native.cjs +1 -3
  11. package/dist/cjs/router/utils/getNavigateAction.native.js +1 -3
  12. package/dist/cjs/router/utils/getNavigateAction.native.js.map +1 -1
  13. package/dist/esm/router/matchers.mjs +9 -1
  14. package/dist/esm/router/matchers.mjs.map +1 -1
  15. package/dist/esm/router/matchers.native.js +9 -1
  16. package/dist/esm/router/matchers.native.js.map +1 -1
  17. package/dist/esm/router/utils/getNativeStackReplaceAction.mjs +2 -3
  18. package/dist/esm/router/utils/getNativeStackReplaceAction.mjs.map +1 -1
  19. package/dist/esm/router/utils/getNativeStackReplaceAction.native.js +2 -4
  20. package/dist/esm/router/utils/getNativeStackReplaceAction.native.js.map +1 -1
  21. package/dist/esm/router/utils/getNavigateAction.mjs +2 -3
  22. package/dist/esm/router/utils/getNavigateAction.mjs.map +1 -1
  23. package/dist/esm/router/utils/getNavigateAction.native.js +2 -4
  24. package/dist/esm/router/utils/getNavigateAction.native.js.map +1 -1
  25. package/nitrogen/generated/android/c++/JAudioPlayOptions.hpp +7 -7
  26. package/nitrogen/generated/android/kotlin/com/margelo/nitro/one/AudioPlayOptions.kt +8 -8
  27. package/nitrogen/generated/ios/swift/AudioPlayOptions.swift +15 -15
  28. package/nitrogen/generated/shared/c++/AudioPlayOptions.hpp +6 -6
  29. package/package.json +16 -16
  30. package/src/platform/specs/OneAudio.nitro.ts +2 -1
  31. package/src/router/matchers.ts +13 -0
  32. package/src/router/utils/getNativeStackReplaceAction.test.ts +61 -0
  33. package/src/router/utils/getNativeStackReplaceAction.ts +2 -4
  34. package/src/router/utils/getNavigateAction.ts +2 -6
  35. package/types/platform/specs/OneAudio.nitro.d.ts +1 -1
  36. package/types/platform/specs/OneAudio.nitro.d.ts.map +1 -1
  37. package/types/router/matchers.d.ts +1 -0
  38. package/types/router/matchers.d.ts.map +1 -1
  39. package/types/router/utils/getNativeStackReplaceAction.d.ts.map +1 -1
  40. package/types/router/utils/getNavigateAction.d.ts.map +1 -1
@@ -20,6 +20,7 @@ var __copyProps = (to, from, except, desc) => {
20
20
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
21
  var matchers_exports = {};
22
22
  __export(matchers_exports, {
23
+ changesDynamicRoute: () => changesDynamicRoute,
23
24
  getContextKey: () => getContextKey,
24
25
  getNameFromFilePath: () => getNameFromFilePath,
25
26
  hasInterceptPrefix: () => hasInterceptPrefix,
@@ -60,6 +61,14 @@ function matchDynamicName(name) {
60
61
  };
61
62
  }
62
63
  }
64
+ function changesDynamicRoute(name, current, target) {
65
+ const currentParams = current;
66
+ const targetParams = target;
67
+ return name.split("/").some((segment) => {
68
+ const match = matchDynamicName(segment);
69
+ return match != null && currentParams?.[match.name] !== targetParams?.[match.name];
70
+ });
71
+ }
63
72
  function matchRoutePattern(pattern, path) {
64
73
  const patternSegments = pattern.split("/").filter(Boolean);
65
74
  if (patternSegments[patternSegments.length - 1] === "index") {
@@ -22,6 +22,7 @@ var __copyProps = (to, from, except, desc) => {
22
22
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
23
23
  var matchers_exports = {};
24
24
  __export(matchers_exports, {
25
+ changesDynamicRoute: () => changesDynamicRoute,
25
26
  getContextKey: () => getContextKey,
26
27
  getNameFromFilePath: () => getNameFromFilePath,
27
28
  hasInterceptPrefix: () => hasInterceptPrefix,
@@ -63,6 +64,14 @@ function matchDynamicName(name) {
63
64
  };
64
65
  }
65
66
  }
67
+ function changesDynamicRoute(name, current, target) {
68
+ var currentParams = current;
69
+ var targetParams = target;
70
+ return name.split("/").some(function(segment) {
71
+ var match = matchDynamicName(segment);
72
+ return match != null && (currentParams === null || currentParams === void 0 ? void 0 : currentParams[match.name]) !== (targetParams === null || targetParams === void 0 ? void 0 : targetParams[match.name]);
73
+ });
74
+ }
66
75
  function matchRoutePattern(pattern, path) {
67
76
  var patternSegments = pattern.split("/").filter(Boolean);
68
77
  if (patternSegments[patternSegments.length - 1] === "index") {
@@ -22,6 +22,7 @@ var __copyProps = (to, from, except, desc) => {
22
22
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
23
23
  var matchers_exports = {};
24
24
  __export(matchers_exports, {
25
+ changesDynamicRoute: () => changesDynamicRoute,
25
26
  getContextKey: () => getContextKey,
26
27
  getNameFromFilePath: () => getNameFromFilePath,
27
28
  hasInterceptPrefix: () => hasInterceptPrefix,
@@ -63,6 +64,14 @@ function matchDynamicName(name) {
63
64
  };
64
65
  }
65
66
  }
67
+ function changesDynamicRoute(name, current, target) {
68
+ var currentParams = current;
69
+ var targetParams = target;
70
+ return name.split("/").some(function(segment) {
71
+ var match = matchDynamicName(segment);
72
+ return match != null && (currentParams === null || currentParams === void 0 ? void 0 : currentParams[match.name]) !== (targetParams === null || targetParams === void 0 ? void 0 : targetParams[match.name]);
73
+ });
74
+ }
66
75
  function matchRoutePattern(pattern, path) {
67
76
  var patternSegments = pattern.split("/").filter(Boolean);
68
77
  if (patternSegments[patternSegments.length - 1] === "index") {
@@ -1 +1 @@
1
- {"version":3,"file":"matchers.native.js","names":[],"sources":["cjs/router/matchers.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar matchers_exports = {};\n__export(matchers_exports, {\n getContextKey: () => getContextKey,\n getNameFromFilePath: () => getNameFromFilePath,\n hasInterceptPrefix: () => hasInterceptPrefix,\n isSlotDirectory: () => isSlotDirectory,\n isTypedRoute: () => isTypedRoute,\n matchArrayGroupName: () => matchArrayGroupName,\n matchDeepDynamicRouteName: () => matchDeepDynamicRouteName,\n matchDirectoryRenderMode: () => matchDirectoryRenderMode,\n matchDynamicName: () => matchDynamicName,\n matchFileRenderMode: () => matchFileRenderMode,\n matchGroupName: () => matchGroupName,\n matchInterceptPrefix: () => matchInterceptPrefix,\n matchRoutePattern: () => matchRoutePattern,\n matchSlotName: () => matchSlotName,\n removeFileSystemDots: () => removeFileSystemDots,\n removeSupportedExtensions: () => removeSupportedExtensions,\n stripGroupSegmentsFromPath: () => stripGroupSegmentsFromPath,\n stripInterceptPrefix: () => stripInterceptPrefix,\n stripInvisibleSegmentsFromPath: () => stripInvisibleSegmentsFromPath,\n stripSlotSegmentsFromPath: () => stripSlotSegmentsFromPath,\n testNotFound: () => testNotFound\n});\nmodule.exports = __toCommonJS(matchers_exports);\nvar dynamicNameRe = /^\\[([^[\\]]+?)\\]$/;\nfunction matchDynamicName(name) {\n var _name_match;\n var paramName = (_name_match = name.match(dynamicNameRe)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n if (paramName == null) {\n return void 0;\n } else if (paramName.startsWith(\"...\")) {\n return {\n name: paramName.slice(3),\n deep: true\n };\n } else {\n return {\n name: paramName,\n deep: false\n };\n }\n}\nfunction matchRoutePattern(pattern, path) {\n var patternSegments = pattern.split(\"/\").filter(Boolean);\n if (patternSegments[patternSegments.length - 1] === \"index\") {\n patternSegments.pop();\n }\n var pathSegments = path.split(\"/\").filter(Boolean);\n var specificity = 0;\n var pi = 0;\n for (var ui = 0; ui < patternSegments.length; ui++) {\n var seg = patternSegments[ui];\n if (seg.startsWith(\"(\") && seg.endsWith(\")\")) continue;\n if (seg.startsWith(\"[...\") && seg.endsWith(\"]\")) {\n return {\n specificity: specificity + (pathSegments.length - pi)\n };\n }\n if (pi >= pathSegments.length) return null;\n if (seg.startsWith(\"[\") && seg.endsWith(\"]\")) {\n specificity += 1;\n pi += 1;\n continue;\n }\n if (seg !== pathSegments[pi]) return null;\n specificity += 2;\n pi += 1;\n }\n return {\n specificity\n };\n}\nfunction matchDeepDynamicRouteName(name) {\n var _name_match;\n return (_name_match = name.match(/^\\[\\.\\.\\.([^/]+?)\\]$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction testNotFound(name) {\n return name.endsWith(\"+not-found\");\n}\nfunction matchGroupName(name) {\n var _name_match;\n return (_name_match = name.match(/^(?:[^\\\\(\\\\)])*?\\(([^\\\\/]+)\\).*?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction matchArrayGroupName(name) {\n var _name_match;\n return (_name_match = name.match(/(?:[^\\\\(\\\\)])*?\\(?([^\\\\/()]+,[^\\\\/()]+)\\)?.*?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction getNameFromFilePath(name) {\n return removeSupportedExtensions(removeFileSystemDots(name));\n}\nfunction getContextKey(name) {\n var normal = \"/\" + getNameFromFilePath(name);\n if (!normal.endsWith(\"_layout\")) {\n return normal;\n }\n return normal.replace(/\\/?_layout$/, \"\");\n}\nfunction removeSupportedExtensions(name) {\n return name.replace(/(\\+(api|spa|ssg|ssr))?\\.[jt]sx?$/g, \"\");\n}\nfunction removeFileSystemDots(filePath) {\n return filePath.replace(/^(?:\\.\\.?\\/)+/g, \"\");\n}\nfunction stripGroupSegmentsFromPath(path) {\n return path.split(\"/\").reduce(function(acc, v) {\n if (matchGroupName(v) == null) {\n acc.push(v);\n }\n return acc;\n }, []).join(\"/\");\n}\nfunction stripInvisibleSegmentsFromPath(path) {\n return stripGroupSegmentsFromPath(path).replace(/\\/?index$/, \"\");\n}\nfunction isTypedRoute(name) {\n return !name.startsWith(\"+\") && !name.endsWith(\".d.ts\") && name.match(/(_layout|[^/]*?\\+[^/]*?)\\.[tj]sx?$/) === null;\n}\nvar directoryRenderModeRe = /^(.+)\\+(api|ssg|ssr|spa)$/;\nfunction matchFileRenderMode(name) {\n var _name_match;\n var mode = (_name_match = name.match(/\\+(api|ssg|ssr|spa)\\.(?:\\w+\\.)?[jt]sx?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n if (mode === \"api\" || mode === \"ssg\" || mode === \"ssr\" || mode === \"spa\") {\n return mode;\n }\n}\nfunction matchDirectoryRenderMode(name) {\n var match = name.match(directoryRenderModeRe);\n if (!match) return void 0;\n return {\n name: match[1],\n renderMode: match[2]\n };\n}\nvar slotPrefixRe = /^@([a-zA-Z][a-zA-Z0-9_-]*)$/;\nfunction matchSlotName(name) {\n var _name_match;\n return (_name_match = name.match(slotPrefixRe)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction isSlotDirectory(name) {\n return slotPrefixRe.test(name);\n}\nfunction matchInterceptPrefix(segment) {\n var match = segment.match(/^((?:\\(\\.{1,3}\\))+)(.+)$/);\n if (!match) return void 0;\n var [, prefixes, targetPath] = match;\n if (prefixes.includes(\"(...)\")) {\n return {\n levels: Infinity,\n targetPath,\n originalSegment: segment\n };\n }\n var doubleDotMatches = prefixes.match(/\\(\\.{2}\\)/g) || [];\n var levels = doubleDotMatches.length;\n return {\n levels,\n targetPath,\n originalSegment: segment\n };\n}\nfunction stripInterceptPrefix(segment) {\n var match = matchInterceptPrefix(segment);\n return match ? match.targetPath : segment;\n}\nfunction hasInterceptPrefix(segment) {\n return /^\\(\\.{1,3}\\)/.test(segment);\n}\nfunction stripSlotSegmentsFromPath(path) {\n return path.split(\"/\").filter(function(segment) {\n return !isSlotDirectory(segment);\n }).join(\"/\");\n}\n//# sourceMappingURL=matchers.js.map\n"],"mappings":"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"}
1
+ {"version":3,"file":"matchers.native.js","names":[],"sources":["cjs/router/matchers.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar matchers_exports = {};\n__export(matchers_exports, {\n changesDynamicRoute: () => changesDynamicRoute,\n getContextKey: () => getContextKey,\n getNameFromFilePath: () => getNameFromFilePath,\n hasInterceptPrefix: () => hasInterceptPrefix,\n isSlotDirectory: () => isSlotDirectory,\n isTypedRoute: () => isTypedRoute,\n matchArrayGroupName: () => matchArrayGroupName,\n matchDeepDynamicRouteName: () => matchDeepDynamicRouteName,\n matchDirectoryRenderMode: () => matchDirectoryRenderMode,\n matchDynamicName: () => matchDynamicName,\n matchFileRenderMode: () => matchFileRenderMode,\n matchGroupName: () => matchGroupName,\n matchInterceptPrefix: () => matchInterceptPrefix,\n matchRoutePattern: () => matchRoutePattern,\n matchSlotName: () => matchSlotName,\n removeFileSystemDots: () => removeFileSystemDots,\n removeSupportedExtensions: () => removeSupportedExtensions,\n stripGroupSegmentsFromPath: () => stripGroupSegmentsFromPath,\n stripInterceptPrefix: () => stripInterceptPrefix,\n stripInvisibleSegmentsFromPath: () => stripInvisibleSegmentsFromPath,\n stripSlotSegmentsFromPath: () => stripSlotSegmentsFromPath,\n testNotFound: () => testNotFound\n});\nmodule.exports = __toCommonJS(matchers_exports);\nvar dynamicNameRe = /^\\[([^[\\]]+?)\\]$/;\nfunction matchDynamicName(name) {\n var _name_match;\n var paramName = (_name_match = name.match(dynamicNameRe)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n if (paramName == null) {\n return void 0;\n } else if (paramName.startsWith(\"...\")) {\n return {\n name: paramName.slice(3),\n deep: true\n };\n } else {\n return {\n name: paramName,\n deep: false\n };\n }\n}\nfunction changesDynamicRoute(name, current, target) {\n var currentParams = current;\n var targetParams = target;\n return name.split(\"/\").some(function(segment) {\n var match = matchDynamicName(segment);\n return match != null && (currentParams === null || currentParams === void 0 ? void 0 : currentParams[match.name]) !== (targetParams === null || targetParams === void 0 ? void 0 : targetParams[match.name]);\n });\n}\nfunction matchRoutePattern(pattern, path) {\n var patternSegments = pattern.split(\"/\").filter(Boolean);\n if (patternSegments[patternSegments.length - 1] === \"index\") {\n patternSegments.pop();\n }\n var pathSegments = path.split(\"/\").filter(Boolean);\n var specificity = 0;\n var pi = 0;\n for (var ui = 0; ui < patternSegments.length; ui++) {\n var seg = patternSegments[ui];\n if (seg.startsWith(\"(\") && seg.endsWith(\")\")) continue;\n if (seg.startsWith(\"[...\") && seg.endsWith(\"]\")) {\n return {\n specificity: specificity + (pathSegments.length - pi)\n };\n }\n if (pi >= pathSegments.length) return null;\n if (seg.startsWith(\"[\") && seg.endsWith(\"]\")) {\n specificity += 1;\n pi += 1;\n continue;\n }\n if (seg !== pathSegments[pi]) return null;\n specificity += 2;\n pi += 1;\n }\n return {\n specificity\n };\n}\nfunction matchDeepDynamicRouteName(name) {\n var _name_match;\n return (_name_match = name.match(/^\\[\\.\\.\\.([^/]+?)\\]$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction testNotFound(name) {\n return name.endsWith(\"+not-found\");\n}\nfunction matchGroupName(name) {\n var _name_match;\n return (_name_match = name.match(/^(?:[^\\\\(\\\\)])*?\\(([^\\\\/]+)\\).*?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction matchArrayGroupName(name) {\n var _name_match;\n return (_name_match = name.match(/(?:[^\\\\(\\\\)])*?\\(?([^\\\\/()]+,[^\\\\/()]+)\\)?.*?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction getNameFromFilePath(name) {\n return removeSupportedExtensions(removeFileSystemDots(name));\n}\nfunction getContextKey(name) {\n var normal = \"/\" + getNameFromFilePath(name);\n if (!normal.endsWith(\"_layout\")) {\n return normal;\n }\n return normal.replace(/\\/?_layout$/, \"\");\n}\nfunction removeSupportedExtensions(name) {\n return name.replace(/(\\+(api|spa|ssg|ssr))?\\.[jt]sx?$/g, \"\");\n}\nfunction removeFileSystemDots(filePath) {\n return filePath.replace(/^(?:\\.\\.?\\/)+/g, \"\");\n}\nfunction stripGroupSegmentsFromPath(path) {\n return path.split(\"/\").reduce(function(acc, v) {\n if (matchGroupName(v) == null) {\n acc.push(v);\n }\n return acc;\n }, []).join(\"/\");\n}\nfunction stripInvisibleSegmentsFromPath(path) {\n return stripGroupSegmentsFromPath(path).replace(/\\/?index$/, \"\");\n}\nfunction isTypedRoute(name) {\n return !name.startsWith(\"+\") && !name.endsWith(\".d.ts\") && name.match(/(_layout|[^/]*?\\+[^/]*?)\\.[tj]sx?$/) === null;\n}\nvar directoryRenderModeRe = /^(.+)\\+(api|ssg|ssr|spa)$/;\nfunction matchFileRenderMode(name) {\n var _name_match;\n var mode = (_name_match = name.match(/\\+(api|ssg|ssr|spa)\\.(?:\\w+\\.)?[jt]sx?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n if (mode === \"api\" || mode === \"ssg\" || mode === \"ssr\" || mode === \"spa\") {\n return mode;\n }\n}\nfunction matchDirectoryRenderMode(name) {\n var match = name.match(directoryRenderModeRe);\n if (!match) return void 0;\n return {\n name: match[1],\n renderMode: match[2]\n };\n}\nvar slotPrefixRe = /^@([a-zA-Z][a-zA-Z0-9_-]*)$/;\nfunction matchSlotName(name) {\n var _name_match;\n return (_name_match = name.match(slotPrefixRe)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction isSlotDirectory(name) {\n return slotPrefixRe.test(name);\n}\nfunction matchInterceptPrefix(segment) {\n var match = segment.match(/^((?:\\(\\.{1,3}\\))+)(.+)$/);\n if (!match) return void 0;\n var [, prefixes, targetPath] = match;\n if (prefixes.includes(\"(...)\")) {\n return {\n levels: Infinity,\n targetPath,\n originalSegment: segment\n };\n }\n var doubleDotMatches = prefixes.match(/\\(\\.{2}\\)/g) || [];\n var levels = doubleDotMatches.length;\n return {\n levels,\n targetPath,\n originalSegment: segment\n };\n}\nfunction stripInterceptPrefix(segment) {\n var match = matchInterceptPrefix(segment);\n return match ? match.targetPath : segment;\n}\nfunction hasInterceptPrefix(segment) {\n return /^\\(\\.{1,3}\\)/.test(segment);\n}\nfunction stripSlotSegmentsFromPath(path) {\n return path.split(\"/\").filter(function(segment) {\n return !isSlotDirectory(segment);\n }).join(\"/\");\n}\n//# sourceMappingURL=matchers.js.map\n"],"mappings":"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"}
@@ -31,8 +31,7 @@ function getNativeStackReplaceAction(actionState, navigationState) {
31
31
  if (currentRoute.name !== targetRoute.name && ((0, import_matchers.matchGroupName)(currentRoute.name) || (0, import_matchers.matchGroupName)(targetRoute.name))) {
32
32
  return null;
33
33
  }
34
- const dynamicMatch = (0, import_matchers.matchDynamicName)(targetRoute.name);
35
- const changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && currentRoute.params?.[dynamicMatch.name] !== targetRoute.params?.[dynamicMatch.name];
34
+ const changesDynamicScreen = currentRoute.name === targetRoute.name && (0, import_matchers.changesDynamicRoute)(targetRoute.name, currentRoute.params, targetRoute.params);
36
35
  if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {
37
36
  if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === "stack" && navigationState.routeNames.includes(targetRoute.name)) {
38
37
  const { payload } = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState, "REPLACE");
@@ -29,14 +29,12 @@ var import_getNavigateAction = require("./getNavigateAction.native.js");
29
29
  function getNativeStackReplaceAction(actionState, navigationState) {
30
30
  while (actionState && navigationState) {
31
31
  var _actionState_index;
32
- var _currentRoute_params, _targetRoute_params;
33
32
  var currentRoute = navigationState.routes[navigationState.index];
34
33
  var targetRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];
35
34
  if (currentRoute.name !== targetRoute.name && ((0, import_matchers.matchGroupName)(currentRoute.name) || (0, import_matchers.matchGroupName)(targetRoute.name))) {
36
35
  return null;
37
36
  }
38
- var dynamicMatch = (0, import_matchers.matchDynamicName)(targetRoute.name);
39
- var changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && ((_currentRoute_params = currentRoute.params) === null || _currentRoute_params === void 0 ? void 0 : _currentRoute_params[dynamicMatch.name]) !== ((_targetRoute_params = targetRoute.params) === null || _targetRoute_params === void 0 ? void 0 : _targetRoute_params[dynamicMatch.name]);
37
+ var changesDynamicScreen = currentRoute.name === targetRoute.name && (0, import_matchers.changesDynamicRoute)(targetRoute.name, currentRoute.params, targetRoute.params);
40
38
  if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {
41
39
  if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === "stack" && navigationState.routeNames.includes(targetRoute.name)) {
42
40
  var { payload } = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState, "REPLACE");
@@ -29,14 +29,12 @@ var import_getNavigateAction = require("./getNavigateAction.native.js");
29
29
  function getNativeStackReplaceAction(actionState, navigationState) {
30
30
  while (actionState && navigationState) {
31
31
  var _actionState_index;
32
- var _currentRoute_params, _targetRoute_params;
33
32
  var currentRoute = navigationState.routes[navigationState.index];
34
33
  var targetRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];
35
34
  if (currentRoute.name !== targetRoute.name && ((0, import_matchers.matchGroupName)(currentRoute.name) || (0, import_matchers.matchGroupName)(targetRoute.name))) {
36
35
  return null;
37
36
  }
38
- var dynamicMatch = (0, import_matchers.matchDynamicName)(targetRoute.name);
39
- var changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && ((_currentRoute_params = currentRoute.params) === null || _currentRoute_params === void 0 ? void 0 : _currentRoute_params[dynamicMatch.name]) !== ((_targetRoute_params = targetRoute.params) === null || _targetRoute_params === void 0 ? void 0 : _targetRoute_params[dynamicMatch.name]);
37
+ var changesDynamicScreen = currentRoute.name === targetRoute.name && (0, import_matchers.changesDynamicRoute)(targetRoute.name, currentRoute.params, targetRoute.params);
40
38
  if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {
41
39
  if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === "stack" && navigationState.routeNames.includes(targetRoute.name)) {
42
40
  var { payload } = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState, "REPLACE");
@@ -1 +1 @@
1
- {"version":3,"file":"getNativeStackReplaceAction.native.js","names":[],"sources":["cjs/router/utils/getNativeStackReplaceAction.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar getNativeStackReplaceAction_exports = {};\n__export(getNativeStackReplaceAction_exports, {\n getNativeStackReplaceAction: () => getNativeStackReplaceAction\n});\nmodule.exports = __toCommonJS(getNativeStackReplaceAction_exports);\nvar import_native = require(\"@react-navigation/native\");\nvar import_matchers = require(\"../matchers\");\nvar import_getNavigateAction = require(\"./getNavigateAction\");\nfunction getNativeStackReplaceAction(actionState, navigationState) {\n while (actionState && navigationState) {\n var _actionState_index;\n var _currentRoute_params, _targetRoute_params;\n var currentRoute = navigationState.routes[navigationState.index];\n var targetRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n if (currentRoute.name !== targetRoute.name && ((0, import_matchers.matchGroupName)(currentRoute.name) || (0, import_matchers.matchGroupName)(targetRoute.name))) {\n return null;\n }\n var dynamicMatch = (0, import_matchers.matchDynamicName)(targetRoute.name);\n var changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && ((_currentRoute_params = currentRoute.params) === null || _currentRoute_params === void 0 ? void 0 : _currentRoute_params[dynamicMatch.name]) !== ((_targetRoute_params = targetRoute.params) === null || _targetRoute_params === void 0 ? void 0 : _targetRoute_params[dynamicMatch.name]);\n if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {\n if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === \"stack\" && navigationState.routeNames.includes(targetRoute.name)) {\n var { payload } = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState, \"REPLACE\");\n return {\n ...import_native.StackActions.replace(payload.name, payload.params),\n target: navigationState.key,\n source: currentRoute.key\n };\n }\n return null;\n }\n if (currentRoute.name !== targetRoute.name) {\n return null;\n }\n actionState = targetRoute.state;\n navigationState = currentRoute.state;\n }\n return null;\n}\n//# sourceMappingURL=getNativeStackReplaceAction.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,sCAAsC,CAAC;AAC3C,SAAS,qCAAqC,EAC5C,mCAAmC,4BACrC,CAAC;AACD,OAAO,UAAU,aAAa,mCAAmC;AACjE,IAAI,gBAAgB,QAAQ,0BAA0B;AACtD,IAAI,kBAAkB,QAAQ,uBAAa;AAC3C,IAAI,2BAA2B,QAAQ,+BAAqB;AAC5D,SAAS,4BAA4B,aAAa,iBAAiB;CACjE,OAAO,eAAe,iBAAiB;EACrC,IAAI;EACJ,IAAI,sBAAsB;EAC1B,IAAI,eAAe,gBAAgB,OAAO,gBAAgB;EAC1D,IAAI,cAAc,YAAY,QAAQ,qBAAqB,YAAY,WAAW,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB,YAAY,OAAO,SAAS;EAC3K,IAAI,aAAa,SAAS,YAAY,UAAU,GAAG,gBAAgB,eAAc,CAAE,aAAa,IAAI,MAAM,GAAG,gBAAgB,eAAc,CAAE,YAAY,IAAI,IAAI;GAC/J,OAAO;EACT;EACA,IAAI,gBAAgB,GAAG,gBAAgB,iBAAgB,CAAE,YAAY,IAAI;EACzE,IAAI,uBAAuB,aAAa,SAAS,YAAY,QAAQ,kBAAkB,uBAAuB,aAAa,YAAY,QAAQ,yBAAyB,KAAK,IAAI,KAAK,IAAI,qBAAqB,aAAa,aAAa,sBAAsB,YAAY,YAAY,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB,aAAa;EAC1W,IAAI,CAAC,aAAa,SAAS,CAAC,YAAY,SAAS,sBAAsB;GACrE,KAAK,aAAa,SAAS,YAAY,QAAQ,yBAAyB,gBAAgB,SAAS,WAAW,gBAAgB,WAAW,SAAS,YAAY,IAAI,GAAG;IACjK,IAAI,EAAE,aAAa,GAAG,yBAAyB,kBAAiB,CAAE,aAAa,iBAAiB,SAAS;IACzG,OAAO;KACL,GAAG,cAAc,aAAa,QAAQ,QAAQ,MAAM,QAAQ,MAAM;KAClE,QAAQ,gBAAgB;KACxB,QAAQ,aAAa;IACvB;GACF;GACA,OAAO;EACT;EACA,IAAI,aAAa,SAAS,YAAY,MAAM;GAC1C,OAAO;EACT;EACA,cAAc,YAAY;EAC1B,kBAAkB,aAAa;CACjC;CACA,OAAO;AACT"}
1
+ {"version":3,"file":"getNativeStackReplaceAction.native.js","names":[],"sources":["cjs/router/utils/getNativeStackReplaceAction.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar getNativeStackReplaceAction_exports = {};\n__export(getNativeStackReplaceAction_exports, {\n getNativeStackReplaceAction: () => getNativeStackReplaceAction\n});\nmodule.exports = __toCommonJS(getNativeStackReplaceAction_exports);\nvar import_native = require(\"@react-navigation/native\");\nvar import_matchers = require(\"../matchers\");\nvar import_getNavigateAction = require(\"./getNavigateAction\");\nfunction getNativeStackReplaceAction(actionState, navigationState) {\n while (actionState && navigationState) {\n var _actionState_index;\n var currentRoute = navigationState.routes[navigationState.index];\n var targetRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n if (currentRoute.name !== targetRoute.name && ((0, import_matchers.matchGroupName)(currentRoute.name) || (0, import_matchers.matchGroupName)(targetRoute.name))) {\n return null;\n }\n var changesDynamicScreen = currentRoute.name === targetRoute.name && (0, import_matchers.changesDynamicRoute)(targetRoute.name, currentRoute.params, targetRoute.params);\n if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {\n if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === \"stack\" && navigationState.routeNames.includes(targetRoute.name)) {\n var { payload } = (0, import_getNavigateAction.getNavigateAction)(actionState, navigationState, \"REPLACE\");\n return {\n ...import_native.StackActions.replace(payload.name, payload.params),\n target: navigationState.key,\n source: currentRoute.key\n };\n }\n return null;\n }\n if (currentRoute.name !== targetRoute.name) {\n return null;\n }\n actionState = targetRoute.state;\n navigationState = currentRoute.state;\n }\n return null;\n}\n//# sourceMappingURL=getNativeStackReplaceAction.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,sCAAsC,CAAC;AAC3C,SAAS,qCAAqC,EAC5C,mCAAmC,4BACrC,CAAC;AACD,OAAO,UAAU,aAAa,mCAAmC;AACjE,IAAI,gBAAgB,QAAQ,0BAA0B;AACtD,IAAI,kBAAkB,QAAQ,uBAAa;AAC3C,IAAI,2BAA2B,QAAQ,+BAAqB;AAC5D,SAAS,4BAA4B,aAAa,iBAAiB;CACjE,OAAO,eAAe,iBAAiB;EACrC,IAAI;EACJ,IAAI,eAAe,gBAAgB,OAAO,gBAAgB;EAC1D,IAAI,cAAc,YAAY,QAAQ,qBAAqB,YAAY,WAAW,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB,YAAY,OAAO,SAAS;EAC3K,IAAI,aAAa,SAAS,YAAY,UAAU,GAAG,gBAAgB,eAAc,CAAE,aAAa,IAAI,MAAM,GAAG,gBAAgB,eAAc,CAAE,YAAY,IAAI,IAAI;GAC/J,OAAO;EACT;EACA,IAAI,uBAAuB,aAAa,SAAS,YAAY,SAAS,GAAG,gBAAgB,oBAAmB,CAAE,YAAY,MAAM,aAAa,QAAQ,YAAY,MAAM;EACvK,IAAI,CAAC,aAAa,SAAS,CAAC,YAAY,SAAS,sBAAsB;GACrE,KAAK,aAAa,SAAS,YAAY,QAAQ,yBAAyB,gBAAgB,SAAS,WAAW,gBAAgB,WAAW,SAAS,YAAY,IAAI,GAAG;IACjK,IAAI,EAAE,aAAa,GAAG,yBAAyB,kBAAiB,CAAE,aAAa,iBAAiB,SAAS;IACzG,OAAO;KACL,GAAG,cAAc,aAAa,QAAQ,QAAQ,MAAM,QAAQ,MAAM;KAClE,QAAQ,gBAAgB;KACxB,QAAQ,aAAa;IACvB;GACF;GACA,OAAO;EACT;EACA,IAAI,aAAa,SAAS,YAAY,MAAM;GAC1C,OAAO;EACT;EACA,cAAc,YAAY;EAC1B,kBAAkB,aAAa;CACjC;CACA,OAAO;AACT"}
@@ -31,8 +31,7 @@ function getNavigateAction(actionState, navigationState, type = "NAVIGATE") {
31
31
  actionStateRoute = actionState.routes[actionState.index ?? actionState.routes.length - 1];
32
32
  const childState = actionStateRoute.state;
33
33
  const nextNavigationState = stateRoute.state;
34
- const dynamicMatch = (0, import_matchers.matchDynamicName)(actionStateRoute.name);
35
- const didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || dynamicMatch && actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name];
34
+ const didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || (0, import_matchers.changesDynamicRoute)(actionStateRoute.name, stateRoute.params, actionStateRoute.params);
36
35
  if (didActionAndCurrentStateDiverge) {
37
36
  break;
38
37
  }
@@ -31,13 +31,11 @@ function getNavigateAction(actionState, navigationState) {
31
31
  var actionStateRoute;
32
32
  while (actionState && navigationState) {
33
33
  var _actionState_index;
34
- var _actionStateRoute_params, _stateRoute_params;
35
34
  var stateRoute = navigationState.routes[navigationState.index];
36
35
  actionStateRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];
37
36
  var childState = actionStateRoute.state;
38
37
  var nextNavigationState = stateRoute.state;
39
- var dynamicMatch = (0, import_matchers.matchDynamicName)(actionStateRoute.name);
40
- var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || dynamicMatch && ((_actionStateRoute_params = actionStateRoute.params) === null || _actionStateRoute_params === void 0 ? void 0 : _actionStateRoute_params[dynamicMatch.name]) !== ((_stateRoute_params = stateRoute.params) === null || _stateRoute_params === void 0 ? void 0 : _stateRoute_params[dynamicMatch.name]);
38
+ var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || (0, import_matchers.changesDynamicRoute)(actionStateRoute.name, stateRoute.params, actionStateRoute.params);
41
39
  if (didActionAndCurrentStateDiverge) {
42
40
  break;
43
41
  }
@@ -31,13 +31,11 @@ function getNavigateAction(actionState, navigationState) {
31
31
  var actionStateRoute;
32
32
  while (actionState && navigationState) {
33
33
  var _actionState_index;
34
- var _actionStateRoute_params, _stateRoute_params;
35
34
  var stateRoute = navigationState.routes[navigationState.index];
36
35
  actionStateRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];
37
36
  var childState = actionStateRoute.state;
38
37
  var nextNavigationState = stateRoute.state;
39
- var dynamicMatch = (0, import_matchers.matchDynamicName)(actionStateRoute.name);
40
- var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || dynamicMatch && ((_actionStateRoute_params = actionStateRoute.params) === null || _actionStateRoute_params === void 0 ? void 0 : _actionStateRoute_params[dynamicMatch.name]) !== ((_stateRoute_params = stateRoute.params) === null || _stateRoute_params === void 0 ? void 0 : _stateRoute_params[dynamicMatch.name]);
38
+ var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || (0, import_matchers.changesDynamicRoute)(actionStateRoute.name, stateRoute.params, actionStateRoute.params);
41
39
  if (didActionAndCurrentStateDiverge) {
42
40
  break;
43
41
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getNavigateAction.native.js","names":[],"sources":["cjs/router/utils/getNavigateAction.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar getNavigateAction_exports = {};\n__export(getNavigateAction_exports, {\n getNavigateAction: () => getNavigateAction\n});\nmodule.exports = __toCommonJS(getNavigateAction_exports);\nvar import_non_secure = require(\"nanoid/non-secure\");\nvar import_lastAction = require(\"../lastAction\");\nvar import_matchers = require(\"../matchers\");\nfunction getNavigateAction(actionState, navigationState) {\n var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : \"NAVIGATE\";\n var actionStateRoute;\n while (actionState && navigationState) {\n var _actionState_index;\n var _actionStateRoute_params, _stateRoute_params;\n var stateRoute = navigationState.routes[navigationState.index];\n actionStateRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n var childState = actionStateRoute.state;\n var nextNavigationState = stateRoute.state;\n var dynamicMatch = (0, import_matchers.matchDynamicName)(actionStateRoute.name);\n var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || // !deepEqual(actionStateRoute.params, stateRoute.params) ||\n !childState || !nextNavigationState || dynamicMatch && ((_actionStateRoute_params = actionStateRoute.params) === null || _actionStateRoute_params === void 0 ? void 0 : _actionStateRoute_params[dynamicMatch.name]) !== ((_stateRoute_params = stateRoute.params) === null || _stateRoute_params === void 0 ? void 0 : _stateRoute_params[dynamicMatch.name]);\n if (didActionAndCurrentStateDiverge) {\n break;\n }\n actionState = childState;\n navigationState = nextNavigationState;\n }\n var rootPayload = {\n params: {}\n };\n var payload = rootPayload;\n var params = payload.params;\n while (actionStateRoute) {\n var _actionStateRoute_state_index, _payload, _params;\n var _actionStateRoute_state;\n Object.assign(params, {\n ...actionStateRoute.params\n });\n payload.screen = actionStateRoute.name;\n payload.params = {\n ...actionStateRoute.params\n };\n actionStateRoute = (_actionStateRoute_state = actionStateRoute.state) === null || _actionStateRoute_state === void 0 ? void 0 : _actionStateRoute_state.routes[(_actionStateRoute_state_index = actionStateRoute.state.index) !== null && _actionStateRoute_state_index !== void 0 ? _actionStateRoute_state_index : actionStateRoute.state.routes.length - 1];\n (_params = (_payload = payload).params) !== null && _params !== void 0 ? _params : _payload.params = {};\n payload = payload.params;\n params = payload;\n }\n if (type === \"PUSH\") {\n (0, import_lastAction.setLastAction)();\n type = \"NAVIGATE\";\n if (navigationState.type === \"stack\") {\n rootPayload.key = `${rootPayload.name}-${(0, import_non_secure.nanoid)()}`;\n }\n }\n if (type === \"REPLACE\" && navigationState.type === \"tab\") {\n type = \"JUMP_TO\";\n }\n return {\n type,\n target: navigationState.key,\n payload: {\n key: rootPayload.key,\n name: rootPayload.screen,\n params: rootPayload.params\n }\n };\n}\n//# sourceMappingURL=getNavigateAction.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,4BAA4B,CAAC;AACjC,SAAS,2BAA2B,EAClC,yBAAyB,kBAC3B,CAAC;AACD,OAAO,UAAU,aAAa,yBAAyB;AACvD,IAAI,oBAAoB,QAAQ,mBAAmB;AACnD,IAAI,oBAAoB,QAAQ,yBAAe;AAC/C,IAAI,kBAAkB,QAAQ,uBAAa;AAC3C,SAAS,kBAAkB,aAAa,iBAAiB;CACvD,IAAI,OAAO,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK;CAC5E,IAAI;CACJ,OAAO,eAAe,iBAAiB;EACrC,IAAI;EACJ,IAAI,0BAA0B;EAC9B,IAAI,aAAa,gBAAgB,OAAO,gBAAgB;EACxD,mBAAmB,YAAY,QAAQ,qBAAqB,YAAY,WAAW,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB,YAAY,OAAO,SAAS;EAC5K,IAAI,aAAa,iBAAiB;EAClC,IAAI,sBAAsB,WAAW;EACrC,IAAI,gBAAgB,GAAG,gBAAgB,iBAAgB,CAAE,iBAAiB,IAAI;EAC9E,IAAI,kCAAkC,iBAAiB,SAAS,WAAW,QAC3E,CAAC,cAAc,CAAC,uBAAuB,kBAAkB,2BAA2B,iBAAiB,YAAY,QAAQ,6BAA6B,KAAK,IAAI,KAAK,IAAI,yBAAyB,aAAa,aAAa,qBAAqB,WAAW,YAAY,QAAQ,uBAAuB,KAAK,IAAI,KAAK,IAAI,mBAAmB,aAAa;EACxV,IAAI,iCAAiC;GACnC;EACF;EACA,cAAc;EACd,kBAAkB;CACpB;CACA,IAAI,cAAc,EAChB,QAAQ,CAAC,EACX;CACA,IAAI,UAAU;CACd,IAAI,SAAS,QAAQ;CACrB,OAAO,kBAAkB;EACvB,IAAI,+BAA+B,UAAU;EAC7C,IAAI;EACJ,OAAO,OAAO,QAAQ,EACpB,GAAG,iBAAiB,OACtB,CAAC;EACD,QAAQ,SAAS,iBAAiB;EAClC,QAAQ,SAAS,EACf,GAAG,iBAAiB,OACtB;EACA,oBAAoB,0BAA0B,iBAAiB,WAAW,QAAQ,4BAA4B,KAAK,IAAI,KAAK,IAAI,wBAAwB,QAAQ,gCAAgC,iBAAiB,MAAM,WAAW,QAAQ,kCAAkC,KAAK,IAAI,gCAAgC,iBAAiB,MAAM,OAAO,SAAS;EAC5V,CAAC,WAAW,WAAW,QAAO,CAAE,YAAY,QAAQ,YAAY,KAAK,IAAI,UAAU,SAAS,SAAS,CAAC;EACtG,UAAU,QAAQ;EAClB,SAAS;CACX;CACA,IAAI,SAAS,QAAQ;EACnB,CAAC,GAAG,kBAAkB,cAAa,CAAE;EACrC,OAAO;EACP,IAAI,gBAAgB,SAAS,SAAS;GACpC,YAAY,MAAM,GAAG,YAAY,KAAK,IAAI,GAAG,kBAAkB,OAAM,CAAE;EACzE;CACF;CACA,IAAI,SAAS,aAAa,gBAAgB,SAAS,OAAO;EACxD,OAAO;CACT;CACA,OAAO;EACL;EACA,QAAQ,gBAAgB;EACxB,SAAS;GACP,KAAK,YAAY;GACjB,MAAM,YAAY;GAClB,QAAQ,YAAY;EACtB;CACF;AACF"}
1
+ {"version":3,"file":"getNavigateAction.native.js","names":[],"sources":["cjs/router/utils/getNavigateAction.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar getNavigateAction_exports = {};\n__export(getNavigateAction_exports, {\n getNavigateAction: () => getNavigateAction\n});\nmodule.exports = __toCommonJS(getNavigateAction_exports);\nvar import_non_secure = require(\"nanoid/non-secure\");\nvar import_lastAction = require(\"../lastAction\");\nvar import_matchers = require(\"../matchers\");\nfunction getNavigateAction(actionState, navigationState) {\n var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : \"NAVIGATE\";\n var actionStateRoute;\n while (actionState && navigationState) {\n var _actionState_index;\n var stateRoute = navigationState.routes[navigationState.index];\n actionStateRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n var childState = actionStateRoute.state;\n var nextNavigationState = stateRoute.state;\n var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || // !deepEqual(actionStateRoute.params, stateRoute.params) ||\n !childState || !nextNavigationState || (0, import_matchers.changesDynamicRoute)(actionStateRoute.name, stateRoute.params, actionStateRoute.params);\n if (didActionAndCurrentStateDiverge) {\n break;\n }\n actionState = childState;\n navigationState = nextNavigationState;\n }\n var rootPayload = {\n params: {}\n };\n var payload = rootPayload;\n var params = payload.params;\n while (actionStateRoute) {\n var _actionStateRoute_state_index, _payload, _params;\n var _actionStateRoute_state;\n Object.assign(params, {\n ...actionStateRoute.params\n });\n payload.screen = actionStateRoute.name;\n payload.params = {\n ...actionStateRoute.params\n };\n actionStateRoute = (_actionStateRoute_state = actionStateRoute.state) === null || _actionStateRoute_state === void 0 ? void 0 : _actionStateRoute_state.routes[(_actionStateRoute_state_index = actionStateRoute.state.index) !== null && _actionStateRoute_state_index !== void 0 ? _actionStateRoute_state_index : actionStateRoute.state.routes.length - 1];\n (_params = (_payload = payload).params) !== null && _params !== void 0 ? _params : _payload.params = {};\n payload = payload.params;\n params = payload;\n }\n if (type === \"PUSH\") {\n (0, import_lastAction.setLastAction)();\n type = \"NAVIGATE\";\n if (navigationState.type === \"stack\") {\n rootPayload.key = `${rootPayload.name}-${(0, import_non_secure.nanoid)()}`;\n }\n }\n if (type === \"REPLACE\" && navigationState.type === \"tab\") {\n type = \"JUMP_TO\";\n }\n return {\n type,\n target: navigationState.key,\n payload: {\n key: rootPayload.key,\n name: rootPayload.screen,\n params: rootPayload.params\n }\n };\n}\n//# sourceMappingURL=getNavigateAction.js.map\n"],"mappings":"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"}
@@ -15,6 +15,14 @@ function matchDynamicName(name) {
15
15
  };
16
16
  }
17
17
  }
18
+ function changesDynamicRoute(name, current, target) {
19
+ const currentParams = current;
20
+ const targetParams = target;
21
+ return name.split("/").some((segment) => {
22
+ const match = matchDynamicName(segment);
23
+ return match != null && currentParams?.[match.name] !== targetParams?.[match.name];
24
+ });
25
+ }
18
26
  function matchRoutePattern(pattern, path) {
19
27
  const patternSegments = pattern.split("/").filter(Boolean);
20
28
  if (patternSegments[patternSegments.length - 1] === "index") {
@@ -135,5 +143,5 @@ function stripSlotSegmentsFromPath(path) {
135
143
  return path.split("/").filter((segment) => !isSlotDirectory(segment)).join("/");
136
144
  }
137
145
 
138
- export { getContextKey, getNameFromFilePath, hasInterceptPrefix, isSlotDirectory, isTypedRoute, matchArrayGroupName, matchDeepDynamicRouteName, matchDirectoryRenderMode, matchDynamicName, matchFileRenderMode, matchGroupName, matchInterceptPrefix, matchRoutePattern, matchSlotName, removeFileSystemDots, removeSupportedExtensions, stripGroupSegmentsFromPath, stripInterceptPrefix, stripInvisibleSegmentsFromPath, stripSlotSegmentsFromPath, testNotFound };
146
+ export { changesDynamicRoute, getContextKey, getNameFromFilePath, hasInterceptPrefix, isSlotDirectory, isTypedRoute, matchArrayGroupName, matchDeepDynamicRouteName, matchDirectoryRenderMode, matchDynamicName, matchFileRenderMode, matchGroupName, matchInterceptPrefix, matchRoutePattern, matchSlotName, removeFileSystemDots, removeSupportedExtensions, stripGroupSegmentsFromPath, stripInterceptPrefix, stripInvisibleSegmentsFromPath, stripSlotSegmentsFromPath, testNotFound };
139
147
  //# sourceMappingURL=matchers.mjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"matchers.js","names":[],"sources":["esm/router/matchers.js"],"sourcesContent":["const dynamicNameRe = /^\\[([^[\\]]+?)\\]$/;\nfunction matchDynamicName(name) {\n const paramName = name.match(dynamicNameRe)?.[1];\n if (paramName == null) {\n return void 0;\n } else if (paramName.startsWith(\"...\")) {\n return { name: paramName.slice(3), deep: true };\n } else {\n return { name: paramName, deep: false };\n }\n}\nfunction matchRoutePattern(pattern, path) {\n const patternSegments = pattern.split(\"/\").filter(Boolean);\n if (patternSegments[patternSegments.length - 1] === \"index\") {\n patternSegments.pop();\n }\n const pathSegments = path.split(\"/\").filter(Boolean);\n let specificity = 0;\n let pi = 0;\n for (let ui = 0; ui < patternSegments.length; ui++) {\n const seg = patternSegments[ui];\n if (seg.startsWith(\"(\") && seg.endsWith(\")\")) continue;\n if (seg.startsWith(\"[...\") && seg.endsWith(\"]\")) {\n return { specificity: specificity + (pathSegments.length - pi) };\n }\n if (pi >= pathSegments.length) return null;\n if (seg.startsWith(\"[\") && seg.endsWith(\"]\")) {\n specificity += 1;\n pi += 1;\n continue;\n }\n if (seg !== pathSegments[pi]) return null;\n specificity += 2;\n pi += 1;\n }\n return { specificity };\n}\nfunction matchDeepDynamicRouteName(name) {\n return name.match(/^\\[\\.\\.\\.([^/]+?)\\]$/)?.[1];\n}\nfunction testNotFound(name) {\n return name.endsWith(\"+not-found\");\n}\nfunction matchGroupName(name) {\n return name.match(/^(?:[^\\\\(\\\\)])*?\\(([^\\\\/]+)\\).*?$/)?.[1];\n}\nfunction matchArrayGroupName(name) {\n return name.match(/(?:[^\\\\(\\\\)])*?\\(?([^\\\\/()]+,[^\\\\/()]+)\\)?.*?$/)?.[1];\n}\nfunction getNameFromFilePath(name) {\n return removeSupportedExtensions(removeFileSystemDots(name));\n}\nfunction getContextKey(name) {\n const normal = \"/\" + getNameFromFilePath(name);\n if (!normal.endsWith(\"_layout\")) {\n return normal;\n }\n return normal.replace(/\\/?_layout$/, \"\");\n}\nfunction removeSupportedExtensions(name) {\n return name.replace(/(\\+(api|spa|ssg|ssr))?\\.[jt]sx?$/g, \"\");\n}\nfunction removeFileSystemDots(filePath) {\n return filePath.replace(/^(?:\\.\\.?\\/)+/g, \"\");\n}\nfunction stripGroupSegmentsFromPath(path) {\n return path.split(\"/\").reduce((acc, v) => {\n if (matchGroupName(v) == null) {\n acc.push(v);\n }\n return acc;\n }, []).join(\"/\");\n}\nfunction stripInvisibleSegmentsFromPath(path) {\n return stripGroupSegmentsFromPath(path).replace(/\\/?index$/, \"\");\n}\nfunction isTypedRoute(name) {\n return !name.startsWith(\"+\") && !name.endsWith(\".d.ts\") && name.match(/(_layout|[^/]*?\\+[^/]*?)\\.[tj]sx?$/) === null;\n}\nconst directoryRenderModeRe = /^(.+)\\+(api|ssg|ssr|spa)$/;\nfunction matchFileRenderMode(name) {\n const mode = name.match(/\\+(api|ssg|ssr|spa)\\.(?:\\w+\\.)?[jt]sx?$/)?.[1];\n if (mode === \"api\" || mode === \"ssg\" || mode === \"ssr\" || mode === \"spa\") {\n return mode;\n }\n}\nfunction matchDirectoryRenderMode(name) {\n const match = name.match(directoryRenderModeRe);\n if (!match) return void 0;\n return {\n name: match[1],\n renderMode: match[2]\n };\n}\nconst slotPrefixRe = /^@([a-zA-Z][a-zA-Z0-9_-]*)$/;\nfunction matchSlotName(name) {\n return name.match(slotPrefixRe)?.[1];\n}\nfunction isSlotDirectory(name) {\n return slotPrefixRe.test(name);\n}\nfunction matchInterceptPrefix(segment) {\n const match = segment.match(/^((?:\\(\\.{1,3}\\))+)(.+)$/);\n if (!match) return void 0;\n const [, prefixes, targetPath] = match;\n if (prefixes.includes(\"(...)\")) {\n return { levels: Infinity, targetPath, originalSegment: segment };\n }\n const doubleDotMatches = prefixes.match(/\\(\\.{2}\\)/g) || [];\n const levels = doubleDotMatches.length;\n return { levels, targetPath, originalSegment: segment };\n}\nfunction stripInterceptPrefix(segment) {\n const match = matchInterceptPrefix(segment);\n return match ? match.targetPath : segment;\n}\nfunction hasInterceptPrefix(segment) {\n return /^\\(\\.{1,3}\\)/.test(segment);\n}\nfunction stripSlotSegmentsFromPath(path) {\n return path.split(\"/\").filter((segment) => !isSlotDirectory(segment)).join(\"/\");\n}\nexport {\n getContextKey,\n getNameFromFilePath,\n hasInterceptPrefix,\n isSlotDirectory,\n isTypedRoute,\n matchArrayGroupName,\n matchDeepDynamicRouteName,\n matchDirectoryRenderMode,\n matchDynamicName,\n matchFileRenderMode,\n matchGroupName,\n matchInterceptPrefix,\n matchRoutePattern,\n matchSlotName,\n removeFileSystemDots,\n removeSupportedExtensions,\n stripGroupSegmentsFromPath,\n stripInterceptPrefix,\n stripInvisibleSegmentsFromPath,\n stripSlotSegmentsFromPath,\n testNotFound\n};\n//# sourceMappingURL=matchers.js.map\n"],"mappings":";AAAA,MAAM,gBAAgB;AACtB,SAAS,iBAAiB,MAAM;CAC9B,MAAM,YAAY,KAAK,MAAM,aAAa,CAAC,GAAG;CAC9C,IAAI,aAAa,MAAM;EACrB,OAAO,KAAK;CACd,OAAO,IAAI,UAAU,WAAW,KAAK,GAAG;EACtC,OAAO;GAAE,MAAM,UAAU,MAAM,CAAC;GAAG,MAAM;EAAK;CAChD,OAAO;EACL,OAAO;GAAE,MAAM;GAAW,MAAM;EAAM;CACxC;AACF;AACA,SAAS,kBAAkB,SAAS,MAAM;CACxC,MAAM,kBAAkB,QAAQ,MAAM,GAAG,CAAC,CAAC,OAAO,OAAO;CACzD,IAAI,gBAAgB,gBAAgB,SAAS,OAAO,SAAS;EAC3D,gBAAgB,IAAI;CACtB;CACA,MAAM,eAAe,KAAK,MAAM,GAAG,CAAC,CAAC,OAAO,OAAO;CACnD,IAAI,cAAc;CAClB,IAAI,KAAK;CACT,KAAK,IAAI,KAAK,GAAG,KAAK,gBAAgB,QAAQ,MAAM;EAClD,MAAM,MAAM,gBAAgB;EAC5B,IAAI,IAAI,WAAW,GAAG,KAAK,IAAI,SAAS,GAAG,GAAG;EAC9C,IAAI,IAAI,WAAW,MAAM,KAAK,IAAI,SAAS,GAAG,GAAG;GAC/C,OAAO,EAAE,aAAa,eAAe,aAAa,SAAS,IAAI;EACjE;EACA,IAAI,MAAM,aAAa,QAAQ,OAAO;EACtC,IAAI,IAAI,WAAW,GAAG,KAAK,IAAI,SAAS,GAAG,GAAG;GAC5C,eAAe;GACf,MAAM;GACN;EACF;EACA,IAAI,QAAQ,aAAa,KAAK,OAAO;EACrC,eAAe;EACf,MAAM;CACR;CACA,OAAO,EAAE,YAAY;AACvB;AACA,SAAS,0BAA0B,MAAM;CACvC,OAAO,KAAK,MAAM,sBAAsB,CAAC,GAAG;AAC9C;AACA,SAAS,aAAa,MAAM;CAC1B,OAAO,KAAK,SAAS,YAAY;AACnC;AACA,SAAS,eAAe,MAAM;CAC5B,OAAO,KAAK,MAAM,mCAAmC,CAAC,GAAG;AAC3D;AACA,SAAS,oBAAoB,MAAM;CACjC,OAAO,KAAK,MAAM,gDAAgD,CAAC,GAAG;AACxE;AACA,SAAS,oBAAoB,MAAM;CACjC,OAAO,0BAA0B,qBAAqB,IAAI,CAAC;AAC7D;AACA,SAAS,cAAc,MAAM;CAC3B,MAAM,SAAS,MAAM,oBAAoB,IAAI;CAC7C,IAAI,CAAC,OAAO,SAAS,SAAS,GAAG;EAC/B,OAAO;CACT;CACA,OAAO,OAAO,QAAQ,eAAe,EAAE;AACzC;AACA,SAAS,0BAA0B,MAAM;CACvC,OAAO,KAAK,QAAQ,qCAAqC,EAAE;AAC7D;AACA,SAAS,qBAAqB,UAAU;CACtC,OAAO,SAAS,QAAQ,kBAAkB,EAAE;AAC9C;AACA,SAAS,2BAA2B,MAAM;CACxC,OAAO,KAAK,MAAM,GAAG,CAAC,CAAC,QAAQ,KAAK,MAAM;EACxC,IAAI,eAAe,CAAC,KAAK,MAAM;GAC7B,IAAI,KAAK,CAAC;EACZ;EACA,OAAO;CACT,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG;AACjB;AACA,SAAS,+BAA+B,MAAM;CAC5C,OAAO,2BAA2B,IAAI,CAAC,CAAC,QAAQ,aAAa,EAAE;AACjE;AACA,SAAS,aAAa,MAAM;CAC1B,OAAO,CAAC,KAAK,WAAW,GAAG,KAAK,CAAC,KAAK,SAAS,OAAO,KAAK,KAAK,MAAM,oCAAoC,MAAM;AAClH;AACA,MAAM,wBAAwB;AAC9B,SAAS,oBAAoB,MAAM;CACjC,MAAM,OAAO,KAAK,MAAM,yCAAyC,CAAC,GAAG;CACrE,IAAI,SAAS,SAAS,SAAS,SAAS,SAAS,SAAS,SAAS,OAAO;EACxE,OAAO;CACT;AACF;AACA,SAAS,yBAAyB,MAAM;CACtC,MAAM,QAAQ,KAAK,MAAM,qBAAqB;CAC9C,IAAI,CAAC,OAAO,OAAO,KAAK;CACxB,OAAO;EACL,MAAM,MAAM;EACZ,YAAY,MAAM;CACpB;AACF;AACA,MAAM,eAAe;AACrB,SAAS,cAAc,MAAM;CAC3B,OAAO,KAAK,MAAM,YAAY,CAAC,GAAG;AACpC;AACA,SAAS,gBAAgB,MAAM;CAC7B,OAAO,aAAa,KAAK,IAAI;AAC/B;AACA,SAAS,qBAAqB,SAAS;CACrC,MAAM,QAAQ,QAAQ,MAAM,0BAA0B;CACtD,IAAI,CAAC,OAAO,OAAO,KAAK;CACxB,MAAM,GAAG,UAAU,cAAc;CACjC,IAAI,SAAS,SAAS,OAAO,GAAG;EAC9B,OAAO;GAAE,QAAQ;GAAU;GAAY,iBAAiB;EAAQ;CAClE;CACA,MAAM,mBAAmB,SAAS,MAAM,YAAY,KAAK,CAAC;CAC1D,MAAM,SAAS,iBAAiB;CAChC,OAAO;EAAE;EAAQ;EAAY,iBAAiB;CAAQ;AACxD;AACA,SAAS,qBAAqB,SAAS;CACrC,MAAM,QAAQ,qBAAqB,OAAO;CAC1C,OAAO,QAAQ,MAAM,aAAa;AACpC;AACA,SAAS,mBAAmB,SAAS;CACnC,OAAO,eAAe,KAAK,OAAO;AACpC;AACA,SAAS,0BAA0B,MAAM;CACvC,OAAO,KAAK,MAAM,GAAG,CAAC,CAAC,QAAQ,YAAY,CAAC,gBAAgB,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG;AAChF"}
1
+ {"version":3,"file":"matchers.js","names":[],"sources":["esm/router/matchers.js"],"sourcesContent":["const dynamicNameRe = /^\\[([^[\\]]+?)\\]$/;\nfunction matchDynamicName(name) {\n const paramName = name.match(dynamicNameRe)?.[1];\n if (paramName == null) {\n return void 0;\n } else if (paramName.startsWith(\"...\")) {\n return { name: paramName.slice(3), deep: true };\n } else {\n return { name: paramName, deep: false };\n }\n}\nfunction changesDynamicRoute(name, current, target) {\n const currentParams = current;\n const targetParams = target;\n return name.split(\"/\").some((segment) => {\n const match = matchDynamicName(segment);\n return match != null && currentParams?.[match.name] !== targetParams?.[match.name];\n });\n}\nfunction matchRoutePattern(pattern, path) {\n const patternSegments = pattern.split(\"/\").filter(Boolean);\n if (patternSegments[patternSegments.length - 1] === \"index\") {\n patternSegments.pop();\n }\n const pathSegments = path.split(\"/\").filter(Boolean);\n let specificity = 0;\n let pi = 0;\n for (let ui = 0; ui < patternSegments.length; ui++) {\n const seg = patternSegments[ui];\n if (seg.startsWith(\"(\") && seg.endsWith(\")\")) continue;\n if (seg.startsWith(\"[...\") && seg.endsWith(\"]\")) {\n return { specificity: specificity + (pathSegments.length - pi) };\n }\n if (pi >= pathSegments.length) return null;\n if (seg.startsWith(\"[\") && seg.endsWith(\"]\")) {\n specificity += 1;\n pi += 1;\n continue;\n }\n if (seg !== pathSegments[pi]) return null;\n specificity += 2;\n pi += 1;\n }\n return { specificity };\n}\nfunction matchDeepDynamicRouteName(name) {\n return name.match(/^\\[\\.\\.\\.([^/]+?)\\]$/)?.[1];\n}\nfunction testNotFound(name) {\n return name.endsWith(\"+not-found\");\n}\nfunction matchGroupName(name) {\n return name.match(/^(?:[^\\\\(\\\\)])*?\\(([^\\\\/]+)\\).*?$/)?.[1];\n}\nfunction matchArrayGroupName(name) {\n return name.match(/(?:[^\\\\(\\\\)])*?\\(?([^\\\\/()]+,[^\\\\/()]+)\\)?.*?$/)?.[1];\n}\nfunction getNameFromFilePath(name) {\n return removeSupportedExtensions(removeFileSystemDots(name));\n}\nfunction getContextKey(name) {\n const normal = \"/\" + getNameFromFilePath(name);\n if (!normal.endsWith(\"_layout\")) {\n return normal;\n }\n return normal.replace(/\\/?_layout$/, \"\");\n}\nfunction removeSupportedExtensions(name) {\n return name.replace(/(\\+(api|spa|ssg|ssr))?\\.[jt]sx?$/g, \"\");\n}\nfunction removeFileSystemDots(filePath) {\n return filePath.replace(/^(?:\\.\\.?\\/)+/g, \"\");\n}\nfunction stripGroupSegmentsFromPath(path) {\n return path.split(\"/\").reduce((acc, v) => {\n if (matchGroupName(v) == null) {\n acc.push(v);\n }\n return acc;\n }, []).join(\"/\");\n}\nfunction stripInvisibleSegmentsFromPath(path) {\n return stripGroupSegmentsFromPath(path).replace(/\\/?index$/, \"\");\n}\nfunction isTypedRoute(name) {\n return !name.startsWith(\"+\") && !name.endsWith(\".d.ts\") && name.match(/(_layout|[^/]*?\\+[^/]*?)\\.[tj]sx?$/) === null;\n}\nconst directoryRenderModeRe = /^(.+)\\+(api|ssg|ssr|spa)$/;\nfunction matchFileRenderMode(name) {\n const mode = name.match(/\\+(api|ssg|ssr|spa)\\.(?:\\w+\\.)?[jt]sx?$/)?.[1];\n if (mode === \"api\" || mode === \"ssg\" || mode === \"ssr\" || mode === \"spa\") {\n return mode;\n }\n}\nfunction matchDirectoryRenderMode(name) {\n const match = name.match(directoryRenderModeRe);\n if (!match) return void 0;\n return {\n name: match[1],\n renderMode: match[2]\n };\n}\nconst slotPrefixRe = /^@([a-zA-Z][a-zA-Z0-9_-]*)$/;\nfunction matchSlotName(name) {\n return name.match(slotPrefixRe)?.[1];\n}\nfunction isSlotDirectory(name) {\n return slotPrefixRe.test(name);\n}\nfunction matchInterceptPrefix(segment) {\n const match = segment.match(/^((?:\\(\\.{1,3}\\))+)(.+)$/);\n if (!match) return void 0;\n const [, prefixes, targetPath] = match;\n if (prefixes.includes(\"(...)\")) {\n return { levels: Infinity, targetPath, originalSegment: segment };\n }\n const doubleDotMatches = prefixes.match(/\\(\\.{2}\\)/g) || [];\n const levels = doubleDotMatches.length;\n return { levels, targetPath, originalSegment: segment };\n}\nfunction stripInterceptPrefix(segment) {\n const match = matchInterceptPrefix(segment);\n return match ? match.targetPath : segment;\n}\nfunction hasInterceptPrefix(segment) {\n return /^\\(\\.{1,3}\\)/.test(segment);\n}\nfunction stripSlotSegmentsFromPath(path) {\n return path.split(\"/\").filter((segment) => !isSlotDirectory(segment)).join(\"/\");\n}\nexport {\n changesDynamicRoute,\n getContextKey,\n getNameFromFilePath,\n hasInterceptPrefix,\n isSlotDirectory,\n isTypedRoute,\n matchArrayGroupName,\n matchDeepDynamicRouteName,\n matchDirectoryRenderMode,\n matchDynamicName,\n matchFileRenderMode,\n matchGroupName,\n matchInterceptPrefix,\n matchRoutePattern,\n matchSlotName,\n removeFileSystemDots,\n removeSupportedExtensions,\n stripGroupSegmentsFromPath,\n stripInterceptPrefix,\n stripInvisibleSegmentsFromPath,\n stripSlotSegmentsFromPath,\n testNotFound\n};\n//# sourceMappingURL=matchers.js.map\n"],"mappings":"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"}
@@ -16,6 +16,14 @@ function matchDynamicName(name) {
16
16
  };
17
17
  }
18
18
  }
19
+ function changesDynamicRoute(name, current, target) {
20
+ var currentParams = current;
21
+ var targetParams = target;
22
+ return name.split("/").some(function(segment) {
23
+ var match = matchDynamicName(segment);
24
+ return match != null && (currentParams === null || currentParams === void 0 ? void 0 : currentParams[match.name]) !== (targetParams === null || targetParams === void 0 ? void 0 : targetParams[match.name]);
25
+ });
26
+ }
19
27
  function matchRoutePattern(pattern, path) {
20
28
  var patternSegments = pattern.split("/").filter(Boolean);
21
29
  if (patternSegments[patternSegments.length - 1] === "index") {
@@ -143,5 +151,5 @@ function stripSlotSegmentsFromPath(path) {
143
151
  }).join("/");
144
152
  }
145
153
 
146
- export { getContextKey, getNameFromFilePath, hasInterceptPrefix, isSlotDirectory, isTypedRoute, matchArrayGroupName, matchDeepDynamicRouteName, matchDirectoryRenderMode, matchDynamicName, matchFileRenderMode, matchGroupName, matchInterceptPrefix, matchRoutePattern, matchSlotName, removeFileSystemDots, removeSupportedExtensions, stripGroupSegmentsFromPath, stripInterceptPrefix, stripInvisibleSegmentsFromPath, stripSlotSegmentsFromPath, testNotFound };
154
+ export { changesDynamicRoute, getContextKey, getNameFromFilePath, hasInterceptPrefix, isSlotDirectory, isTypedRoute, matchArrayGroupName, matchDeepDynamicRouteName, matchDirectoryRenderMode, matchDynamicName, matchFileRenderMode, matchGroupName, matchInterceptPrefix, matchRoutePattern, matchSlotName, removeFileSystemDots, removeSupportedExtensions, stripGroupSegmentsFromPath, stripInterceptPrefix, stripInvisibleSegmentsFromPath, stripSlotSegmentsFromPath, testNotFound };
147
155
  //# sourceMappingURL=matchers.native.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"matchers.native.js","names":[],"sources":["esm/router/matchers.native.js"],"sourcesContent":["var dynamicNameRe = /^\\[([^[\\]]+?)\\]$/;\nfunction matchDynamicName(name) {\n var _name_match;\n var paramName = (_name_match = name.match(dynamicNameRe)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n if (paramName == null) {\n return void 0;\n } else if (paramName.startsWith(\"...\")) {\n return {\n name: paramName.slice(3),\n deep: true\n };\n } else {\n return {\n name: paramName,\n deep: false\n };\n }\n}\nfunction matchRoutePattern(pattern, path) {\n var patternSegments = pattern.split(\"/\").filter(Boolean);\n if (patternSegments[patternSegments.length - 1] === \"index\") {\n patternSegments.pop();\n }\n var pathSegments = path.split(\"/\").filter(Boolean);\n var specificity = 0;\n var pi = 0;\n for (var ui = 0; ui < patternSegments.length; ui++) {\n var seg = patternSegments[ui];\n if (seg.startsWith(\"(\") && seg.endsWith(\")\")) continue;\n if (seg.startsWith(\"[...\") && seg.endsWith(\"]\")) {\n return {\n specificity: specificity + (pathSegments.length - pi)\n };\n }\n if (pi >= pathSegments.length) return null;\n if (seg.startsWith(\"[\") && seg.endsWith(\"]\")) {\n specificity += 1;\n pi += 1;\n continue;\n }\n if (seg !== pathSegments[pi]) return null;\n specificity += 2;\n pi += 1;\n }\n return {\n specificity\n };\n}\nfunction matchDeepDynamicRouteName(name) {\n var _name_match;\n return (_name_match = name.match(/^\\[\\.\\.\\.([^/]+?)\\]$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction testNotFound(name) {\n return name.endsWith(\"+not-found\");\n}\nfunction matchGroupName(name) {\n var _name_match;\n return (_name_match = name.match(/^(?:[^\\\\(\\\\)])*?\\(([^\\\\/]+)\\).*?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction matchArrayGroupName(name) {\n var _name_match;\n return (_name_match = name.match(/(?:[^\\\\(\\\\)])*?\\(?([^\\\\/()]+,[^\\\\/()]+)\\)?.*?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction getNameFromFilePath(name) {\n return removeSupportedExtensions(removeFileSystemDots(name));\n}\nfunction getContextKey(name) {\n var normal = \"/\" + getNameFromFilePath(name);\n if (!normal.endsWith(\"_layout\")) {\n return normal;\n }\n return normal.replace(/\\/?_layout$/, \"\");\n}\nfunction removeSupportedExtensions(name) {\n return name.replace(/(\\+(api|spa|ssg|ssr))?\\.[jt]sx?$/g, \"\");\n}\nfunction removeFileSystemDots(filePath) {\n return filePath.replace(/^(?:\\.\\.?\\/)+/g, \"\");\n}\nfunction stripGroupSegmentsFromPath(path) {\n return path.split(\"/\").reduce(function(acc, v) {\n if (matchGroupName(v) == null) {\n acc.push(v);\n }\n return acc;\n }, []).join(\"/\");\n}\nfunction stripInvisibleSegmentsFromPath(path) {\n return stripGroupSegmentsFromPath(path).replace(/\\/?index$/, \"\");\n}\nfunction isTypedRoute(name) {\n return !name.startsWith(\"+\") && !name.endsWith(\".d.ts\") && name.match(/(_layout|[^/]*?\\+[^/]*?)\\.[tj]sx?$/) === null;\n}\nvar directoryRenderModeRe = /^(.+)\\+(api|ssg|ssr|spa)$/;\nfunction matchFileRenderMode(name) {\n var _name_match;\n var mode = (_name_match = name.match(/\\+(api|ssg|ssr|spa)\\.(?:\\w+\\.)?[jt]sx?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n if (mode === \"api\" || mode === \"ssg\" || mode === \"ssr\" || mode === \"spa\") {\n return mode;\n }\n}\nfunction matchDirectoryRenderMode(name) {\n var match = name.match(directoryRenderModeRe);\n if (!match) return void 0;\n return {\n name: match[1],\n renderMode: match[2]\n };\n}\nvar slotPrefixRe = /^@([a-zA-Z][a-zA-Z0-9_-]*)$/;\nfunction matchSlotName(name) {\n var _name_match;\n return (_name_match = name.match(slotPrefixRe)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction isSlotDirectory(name) {\n return slotPrefixRe.test(name);\n}\nfunction matchInterceptPrefix(segment) {\n var match = segment.match(/^((?:\\(\\.{1,3}\\))+)(.+)$/);\n if (!match) return void 0;\n var [, prefixes, targetPath] = match;\n if (prefixes.includes(\"(...)\")) {\n return {\n levels: Infinity,\n targetPath,\n originalSegment: segment\n };\n }\n var doubleDotMatches = prefixes.match(/\\(\\.{2}\\)/g) || [];\n var levels = doubleDotMatches.length;\n return {\n levels,\n targetPath,\n originalSegment: segment\n };\n}\nfunction stripInterceptPrefix(segment) {\n var match = matchInterceptPrefix(segment);\n return match ? match.targetPath : segment;\n}\nfunction hasInterceptPrefix(segment) {\n return /^\\(\\.{1,3}\\)/.test(segment);\n}\nfunction stripSlotSegmentsFromPath(path) {\n return path.split(\"/\").filter(function(segment) {\n return !isSlotDirectory(segment);\n }).join(\"/\");\n}\nexport {\n getContextKey,\n getNameFromFilePath,\n hasInterceptPrefix,\n isSlotDirectory,\n isTypedRoute,\n matchArrayGroupName,\n matchDeepDynamicRouteName,\n matchDirectoryRenderMode,\n matchDynamicName,\n matchFileRenderMode,\n matchGroupName,\n matchInterceptPrefix,\n matchRoutePattern,\n matchSlotName,\n removeFileSystemDots,\n removeSupportedExtensions,\n stripGroupSegmentsFromPath,\n stripInterceptPrefix,\n stripInvisibleSegmentsFromPath,\n stripSlotSegmentsFromPath,\n testNotFound\n};\n//# sourceMappingURL=matchers.js.map\n"],"mappings":";AAAA,IAAI,gBAAgB;AACpB,SAAS,iBAAiB,MAAM;CAC9B,IAAI;CACJ,IAAI,aAAa,cAAc,KAAK,MAAM,aAAa,OAAO,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;CACpH,IAAI,aAAa,MAAM;EACrB,OAAO,KAAK;CACd,OAAO,IAAI,UAAU,WAAW,KAAK,GAAG;EACtC,OAAO;GACL,MAAM,UAAU,MAAM,CAAC;GACvB,MAAM;EACR;CACF,OAAO;EACL,OAAO;GACL,MAAM;GACN,MAAM;EACR;CACF;AACF;AACA,SAAS,kBAAkB,SAAS,MAAM;CACxC,IAAI,kBAAkB,QAAQ,MAAM,GAAG,CAAC,CAAC,OAAO,OAAO;CACvD,IAAI,gBAAgB,gBAAgB,SAAS,OAAO,SAAS;EAC3D,gBAAgB,IAAI;CACtB;CACA,IAAI,eAAe,KAAK,MAAM,GAAG,CAAC,CAAC,OAAO,OAAO;CACjD,IAAI,cAAc;CAClB,IAAI,KAAK;CACT,KAAK,IAAI,KAAK,GAAG,KAAK,gBAAgB,QAAQ,MAAM;EAClD,IAAI,MAAM,gBAAgB;EAC1B,IAAI,IAAI,WAAW,GAAG,KAAK,IAAI,SAAS,GAAG,GAAG;EAC9C,IAAI,IAAI,WAAW,MAAM,KAAK,IAAI,SAAS,GAAG,GAAG;GAC/C,OAAO,EACL,aAAa,eAAe,aAAa,SAAS,IACpD;EACF;EACA,IAAI,MAAM,aAAa,QAAQ,OAAO;EACtC,IAAI,IAAI,WAAW,GAAG,KAAK,IAAI,SAAS,GAAG,GAAG;GAC5C,eAAe;GACf,MAAM;GACN;EACF;EACA,IAAI,QAAQ,aAAa,KAAK,OAAO;EACrC,eAAe;EACf,MAAM;CACR;CACA,OAAO,EACL,YACF;AACF;AACA,SAAS,0BAA0B,MAAM;CACvC,IAAI;CACJ,QAAQ,cAAc,KAAK,MAAM,sBAAsB,OAAO,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;AACtH;AACA,SAAS,aAAa,MAAM;CAC1B,OAAO,KAAK,SAAS,YAAY;AACnC;AACA,SAAS,eAAe,MAAM;CAC5B,IAAI;CACJ,QAAQ,cAAc,KAAK,MAAM,mCAAmC,OAAO,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;AACnI;AACA,SAAS,oBAAoB,MAAM;CACjC,IAAI;CACJ,QAAQ,cAAc,KAAK,MAAM,gDAAgD,OAAO,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;AAChJ;AACA,SAAS,oBAAoB,MAAM;CACjC,OAAO,0BAA0B,qBAAqB,IAAI,CAAC;AAC7D;AACA,SAAS,cAAc,MAAM;CAC3B,IAAI,SAAS,MAAM,oBAAoB,IAAI;CAC3C,IAAI,CAAC,OAAO,SAAS,SAAS,GAAG;EAC/B,OAAO;CACT;CACA,OAAO,OAAO,QAAQ,eAAe,EAAE;AACzC;AACA,SAAS,0BAA0B,MAAM;CACvC,OAAO,KAAK,QAAQ,qCAAqC,EAAE;AAC7D;AACA,SAAS,qBAAqB,UAAU;CACtC,OAAO,SAAS,QAAQ,kBAAkB,EAAE;AAC9C;AACA,SAAS,2BAA2B,MAAM;CACxC,OAAO,KAAK,MAAM,GAAG,CAAC,CAAC,OAAO,SAAS,KAAK,GAAG;EAC7C,IAAI,eAAe,CAAC,KAAK,MAAM;GAC7B,IAAI,KAAK,CAAC;EACZ;EACA,OAAO;CACT,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG;AACjB;AACA,SAAS,+BAA+B,MAAM;CAC5C,OAAO,2BAA2B,IAAI,CAAC,CAAC,QAAQ,aAAa,EAAE;AACjE;AACA,SAAS,aAAa,MAAM;CAC1B,OAAO,CAAC,KAAK,WAAW,GAAG,KAAK,CAAC,KAAK,SAAS,OAAO,KAAK,KAAK,MAAM,oCAAoC,MAAM;AAClH;AACA,IAAI,wBAAwB;AAC5B,SAAS,oBAAoB,MAAM;CACjC,IAAI;CACJ,IAAI,QAAQ,cAAc,KAAK,MAAM,yCAAyC,OAAO,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;CAC3I,IAAI,SAAS,SAAS,SAAS,SAAS,SAAS,SAAS,SAAS,OAAO;EACxE,OAAO;CACT;AACF;AACA,SAAS,yBAAyB,MAAM;CACtC,IAAI,QAAQ,KAAK,MAAM,qBAAqB;CAC5C,IAAI,CAAC,OAAO,OAAO,KAAK;CACxB,OAAO;EACL,MAAM,MAAM;EACZ,YAAY,MAAM;CACpB;AACF;AACA,IAAI,eAAe;AACnB,SAAS,cAAc,MAAM;CAC3B,IAAI;CACJ,QAAQ,cAAc,KAAK,MAAM,YAAY,OAAO,QAAQ,gBAAgB,KAAK,IAAI,KAAK,IAAI,YAAY;AAC5G;AACA,SAAS,gBAAgB,MAAM;CAC7B,OAAO,aAAa,KAAK,IAAI;AAC/B;AACA,SAAS,qBAAqB,SAAS;CACrC,IAAI,QAAQ,QAAQ,MAAM,0BAA0B;CACpD,IAAI,CAAC,OAAO,OAAO,KAAK;CACxB,IAAI,GAAG,UAAU,cAAc;CAC/B,IAAI,SAAS,SAAS,OAAO,GAAG;EAC9B,OAAO;GACL,QAAQ;GACR;GACA,iBAAiB;EACnB;CACF;CACA,IAAI,mBAAmB,SAAS,MAAM,YAAY,KAAK,CAAC;CACxD,IAAI,SAAS,iBAAiB;CAC9B,OAAO;EACL;EACA;EACA,iBAAiB;CACnB;AACF;AACA,SAAS,qBAAqB,SAAS;CACrC,IAAI,QAAQ,qBAAqB,OAAO;CACxC,OAAO,QAAQ,MAAM,aAAa;AACpC;AACA,SAAS,mBAAmB,SAAS;CACnC,OAAO,eAAe,KAAK,OAAO;AACpC;AACA,SAAS,0BAA0B,MAAM;CACvC,OAAO,KAAK,MAAM,GAAG,CAAC,CAAC,OAAO,SAAS,SAAS;EAC9C,OAAO,CAAC,gBAAgB,OAAO;CACjC,CAAC,CAAC,CAAC,KAAK,GAAG;AACb"}
1
+ {"version":3,"file":"matchers.native.js","names":[],"sources":["esm/router/matchers.native.js"],"sourcesContent":["var dynamicNameRe = /^\\[([^[\\]]+?)\\]$/;\nfunction matchDynamicName(name) {\n var _name_match;\n var paramName = (_name_match = name.match(dynamicNameRe)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n if (paramName == null) {\n return void 0;\n } else if (paramName.startsWith(\"...\")) {\n return {\n name: paramName.slice(3),\n deep: true\n };\n } else {\n return {\n name: paramName,\n deep: false\n };\n }\n}\nfunction changesDynamicRoute(name, current, target) {\n var currentParams = current;\n var targetParams = target;\n return name.split(\"/\").some(function(segment) {\n var match = matchDynamicName(segment);\n return match != null && (currentParams === null || currentParams === void 0 ? void 0 : currentParams[match.name]) !== (targetParams === null || targetParams === void 0 ? void 0 : targetParams[match.name]);\n });\n}\nfunction matchRoutePattern(pattern, path) {\n var patternSegments = pattern.split(\"/\").filter(Boolean);\n if (patternSegments[patternSegments.length - 1] === \"index\") {\n patternSegments.pop();\n }\n var pathSegments = path.split(\"/\").filter(Boolean);\n var specificity = 0;\n var pi = 0;\n for (var ui = 0; ui < patternSegments.length; ui++) {\n var seg = patternSegments[ui];\n if (seg.startsWith(\"(\") && seg.endsWith(\")\")) continue;\n if (seg.startsWith(\"[...\") && seg.endsWith(\"]\")) {\n return {\n specificity: specificity + (pathSegments.length - pi)\n };\n }\n if (pi >= pathSegments.length) return null;\n if (seg.startsWith(\"[\") && seg.endsWith(\"]\")) {\n specificity += 1;\n pi += 1;\n continue;\n }\n if (seg !== pathSegments[pi]) return null;\n specificity += 2;\n pi += 1;\n }\n return {\n specificity\n };\n}\nfunction matchDeepDynamicRouteName(name) {\n var _name_match;\n return (_name_match = name.match(/^\\[\\.\\.\\.([^/]+?)\\]$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction testNotFound(name) {\n return name.endsWith(\"+not-found\");\n}\nfunction matchGroupName(name) {\n var _name_match;\n return (_name_match = name.match(/^(?:[^\\\\(\\\\)])*?\\(([^\\\\/]+)\\).*?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction matchArrayGroupName(name) {\n var _name_match;\n return (_name_match = name.match(/(?:[^\\\\(\\\\)])*?\\(?([^\\\\/()]+,[^\\\\/()]+)\\)?.*?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction getNameFromFilePath(name) {\n return removeSupportedExtensions(removeFileSystemDots(name));\n}\nfunction getContextKey(name) {\n var normal = \"/\" + getNameFromFilePath(name);\n if (!normal.endsWith(\"_layout\")) {\n return normal;\n }\n return normal.replace(/\\/?_layout$/, \"\");\n}\nfunction removeSupportedExtensions(name) {\n return name.replace(/(\\+(api|spa|ssg|ssr))?\\.[jt]sx?$/g, \"\");\n}\nfunction removeFileSystemDots(filePath) {\n return filePath.replace(/^(?:\\.\\.?\\/)+/g, \"\");\n}\nfunction stripGroupSegmentsFromPath(path) {\n return path.split(\"/\").reduce(function(acc, v) {\n if (matchGroupName(v) == null) {\n acc.push(v);\n }\n return acc;\n }, []).join(\"/\");\n}\nfunction stripInvisibleSegmentsFromPath(path) {\n return stripGroupSegmentsFromPath(path).replace(/\\/?index$/, \"\");\n}\nfunction isTypedRoute(name) {\n return !name.startsWith(\"+\") && !name.endsWith(\".d.ts\") && name.match(/(_layout|[^/]*?\\+[^/]*?)\\.[tj]sx?$/) === null;\n}\nvar directoryRenderModeRe = /^(.+)\\+(api|ssg|ssr|spa)$/;\nfunction matchFileRenderMode(name) {\n var _name_match;\n var mode = (_name_match = name.match(/\\+(api|ssg|ssr|spa)\\.(?:\\w+\\.)?[jt]sx?$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n if (mode === \"api\" || mode === \"ssg\" || mode === \"ssr\" || mode === \"spa\") {\n return mode;\n }\n}\nfunction matchDirectoryRenderMode(name) {\n var match = name.match(directoryRenderModeRe);\n if (!match) return void 0;\n return {\n name: match[1],\n renderMode: match[2]\n };\n}\nvar slotPrefixRe = /^@([a-zA-Z][a-zA-Z0-9_-]*)$/;\nfunction matchSlotName(name) {\n var _name_match;\n return (_name_match = name.match(slotPrefixRe)) === null || _name_match === void 0 ? void 0 : _name_match[1];\n}\nfunction isSlotDirectory(name) {\n return slotPrefixRe.test(name);\n}\nfunction matchInterceptPrefix(segment) {\n var match = segment.match(/^((?:\\(\\.{1,3}\\))+)(.+)$/);\n if (!match) return void 0;\n var [, prefixes, targetPath] = match;\n if (prefixes.includes(\"(...)\")) {\n return {\n levels: Infinity,\n targetPath,\n originalSegment: segment\n };\n }\n var doubleDotMatches = prefixes.match(/\\(\\.{2}\\)/g) || [];\n var levels = doubleDotMatches.length;\n return {\n levels,\n targetPath,\n originalSegment: segment\n };\n}\nfunction stripInterceptPrefix(segment) {\n var match = matchInterceptPrefix(segment);\n return match ? match.targetPath : segment;\n}\nfunction hasInterceptPrefix(segment) {\n return /^\\(\\.{1,3}\\)/.test(segment);\n}\nfunction stripSlotSegmentsFromPath(path) {\n return path.split(\"/\").filter(function(segment) {\n return !isSlotDirectory(segment);\n }).join(\"/\");\n}\nexport {\n changesDynamicRoute,\n getContextKey,\n getNameFromFilePath,\n hasInterceptPrefix,\n isSlotDirectory,\n isTypedRoute,\n matchArrayGroupName,\n matchDeepDynamicRouteName,\n matchDirectoryRenderMode,\n matchDynamicName,\n matchFileRenderMode,\n matchGroupName,\n matchInterceptPrefix,\n matchRoutePattern,\n matchSlotName,\n removeFileSystemDots,\n removeSupportedExtensions,\n stripGroupSegmentsFromPath,\n stripInterceptPrefix,\n stripInvisibleSegmentsFromPath,\n stripSlotSegmentsFromPath,\n testNotFound\n};\n//# sourceMappingURL=matchers.js.map\n"],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { StackActions } from "@react-navigation/native";
2
- import { matchDynamicName, matchGroupName } from "../matchers.mjs";
2
+ import { changesDynamicRoute, matchGroupName } from "../matchers.mjs";
3
3
  import { getNavigateAction } from "./getNavigateAction.mjs";
4
4
 
5
5
  function getNativeStackReplaceAction(actionState, navigationState) {
@@ -9,8 +9,7 @@ function getNativeStackReplaceAction(actionState, navigationState) {
9
9
  if (currentRoute.name !== targetRoute.name && (matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))) {
10
10
  return null;
11
11
  }
12
- const dynamicMatch = matchDynamicName(targetRoute.name);
13
- const changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && currentRoute.params?.[dynamicMatch.name] !== targetRoute.params?.[dynamicMatch.name];
12
+ const changesDynamicScreen = currentRoute.name === targetRoute.name && changesDynamicRoute(targetRoute.name, currentRoute.params, targetRoute.params);
14
13
  if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {
15
14
  if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === "stack" && navigationState.routeNames.includes(targetRoute.name)) {
16
15
  const { payload } = getNavigateAction(actionState, navigationState, "REPLACE");
@@ -1 +1 @@
1
- {"version":3,"file":"getNativeStackReplaceAction.js","names":[],"sources":["esm/router/utils/getNativeStackReplaceAction.js"],"sourcesContent":["import { StackActions } from \"@react-navigation/native\";\nimport { matchDynamicName, matchGroupName } from \"../matchers\";\nimport { getNavigateAction } from \"./getNavigateAction\";\nfunction getNativeStackReplaceAction(actionState, navigationState) {\n while (actionState && navigationState) {\n const currentRoute = navigationState.routes[navigationState.index];\n const targetRoute = actionState.routes[actionState.index ?? actionState.routes.length - 1];\n if (currentRoute.name !== targetRoute.name && (matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))) {\n return null;\n }\n const dynamicMatch = matchDynamicName(targetRoute.name);\n const changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && currentRoute.params?.[dynamicMatch.name] !== targetRoute.params?.[dynamicMatch.name];\n if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {\n if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === \"stack\" && navigationState.routeNames.includes(targetRoute.name)) {\n const { payload } = getNavigateAction(actionState, navigationState, \"REPLACE\");\n return {\n ...StackActions.replace(payload.name, payload.params),\n target: navigationState.key,\n source: currentRoute.key\n };\n }\n return null;\n }\n if (currentRoute.name !== targetRoute.name) {\n return null;\n }\n actionState = targetRoute.state;\n navigationState = currentRoute.state;\n }\n return null;\n}\nexport {\n getNativeStackReplaceAction\n};\n//# sourceMappingURL=getNativeStackReplaceAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,4BAA4B,aAAa,iBAAiB;CACjE,OAAO,eAAe,iBAAiB;EACrC,MAAM,eAAe,gBAAgB,OAAO,gBAAgB;EAC5D,MAAM,cAAc,YAAY,OAAO,YAAY,SAAS,YAAY,OAAO,SAAS;EACxF,IAAI,aAAa,SAAS,YAAY,SAAS,eAAe,aAAa,IAAI,KAAK,eAAe,YAAY,IAAI,IAAI;GACrH,OAAO;EACT;EACA,MAAM,eAAe,iBAAiB,YAAY,IAAI;EACtD,MAAM,uBAAuB,aAAa,SAAS,YAAY,QAAQ,gBAAgB,aAAa,SAAS,aAAa,UAAU,YAAY,SAAS,aAAa;EACtK,IAAI,CAAC,aAAa,SAAS,CAAC,YAAY,SAAS,sBAAsB;GACrE,KAAK,aAAa,SAAS,YAAY,QAAQ,yBAAyB,gBAAgB,SAAS,WAAW,gBAAgB,WAAW,SAAS,YAAY,IAAI,GAAG;IACjK,MAAM,EAAE,YAAY,kBAAkB,aAAa,iBAAiB,SAAS;IAC7E,OAAO;KACL,GAAG,aAAa,QAAQ,QAAQ,MAAM,QAAQ,MAAM;KACpD,QAAQ,gBAAgB;KACxB,QAAQ,aAAa;IACvB;GACF;GACA,OAAO;EACT;EACA,IAAI,aAAa,SAAS,YAAY,MAAM;GAC1C,OAAO;EACT;EACA,cAAc,YAAY;EAC1B,kBAAkB,aAAa;CACjC;CACA,OAAO;AACT"}
1
+ {"version":3,"file":"getNativeStackReplaceAction.js","names":[],"sources":["esm/router/utils/getNativeStackReplaceAction.js"],"sourcesContent":["import { StackActions } from \"@react-navigation/native\";\nimport { changesDynamicRoute, matchGroupName } from \"../matchers\";\nimport { getNavigateAction } from \"./getNavigateAction\";\nfunction getNativeStackReplaceAction(actionState, navigationState) {\n while (actionState && navigationState) {\n const currentRoute = navigationState.routes[navigationState.index];\n const targetRoute = actionState.routes[actionState.index ?? actionState.routes.length - 1];\n if (currentRoute.name !== targetRoute.name && (matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))) {\n return null;\n }\n const changesDynamicScreen = currentRoute.name === targetRoute.name && changesDynamicRoute(targetRoute.name, currentRoute.params, targetRoute.params);\n if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {\n if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === \"stack\" && navigationState.routeNames.includes(targetRoute.name)) {\n const { payload } = getNavigateAction(actionState, navigationState, \"REPLACE\");\n return {\n ...StackActions.replace(payload.name, payload.params),\n target: navigationState.key,\n source: currentRoute.key\n };\n }\n return null;\n }\n if (currentRoute.name !== targetRoute.name) {\n return null;\n }\n actionState = targetRoute.state;\n navigationState = currentRoute.state;\n }\n return null;\n}\nexport {\n getNativeStackReplaceAction\n};\n//# sourceMappingURL=getNativeStackReplaceAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,4BAA4B,aAAa,iBAAiB;CACjE,OAAO,eAAe,iBAAiB;EACrC,MAAM,eAAe,gBAAgB,OAAO,gBAAgB;EAC5D,MAAM,cAAc,YAAY,OAAO,YAAY,SAAS,YAAY,OAAO,SAAS;EACxF,IAAI,aAAa,SAAS,YAAY,SAAS,eAAe,aAAa,IAAI,KAAK,eAAe,YAAY,IAAI,IAAI;GACrH,OAAO;EACT;EACA,MAAM,uBAAuB,aAAa,SAAS,YAAY,QAAQ,oBAAoB,YAAY,MAAM,aAAa,QAAQ,YAAY,MAAM;EACpJ,IAAI,CAAC,aAAa,SAAS,CAAC,YAAY,SAAS,sBAAsB;GACrE,KAAK,aAAa,SAAS,YAAY,QAAQ,yBAAyB,gBAAgB,SAAS,WAAW,gBAAgB,WAAW,SAAS,YAAY,IAAI,GAAG;IACjK,MAAM,EAAE,YAAY,kBAAkB,aAAa,iBAAiB,SAAS;IAC7E,OAAO;KACL,GAAG,aAAa,QAAQ,QAAQ,MAAM,QAAQ,MAAM;KACpD,QAAQ,gBAAgB;KACxB,QAAQ,aAAa;IACvB;GACF;GACA,OAAO;EACT;EACA,IAAI,aAAa,SAAS,YAAY,MAAM;GAC1C,OAAO;EACT;EACA,cAAc,YAAY;EAC1B,kBAAkB,aAAa;CACjC;CACA,OAAO;AACT"}
@@ -1,18 +1,16 @@
1
1
  import { StackActions } from "@react-navigation/native";
2
- import { matchDynamicName, matchGroupName } from "../matchers.native.js";
2
+ import { changesDynamicRoute, matchGroupName } from "../matchers.native.js";
3
3
  import { getNavigateAction } from "./getNavigateAction.native.js";
4
4
 
5
5
  function getNativeStackReplaceAction(actionState, navigationState) {
6
6
  while (actionState && navigationState) {
7
7
  var _actionState_index;
8
- var _currentRoute_params, _targetRoute_params;
9
8
  var currentRoute = navigationState.routes[navigationState.index];
10
9
  var targetRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];
11
10
  if (currentRoute.name !== targetRoute.name && (matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))) {
12
11
  return null;
13
12
  }
14
- var dynamicMatch = matchDynamicName(targetRoute.name);
15
- var changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && ((_currentRoute_params = currentRoute.params) === null || _currentRoute_params === void 0 ? void 0 : _currentRoute_params[dynamicMatch.name]) !== ((_targetRoute_params = targetRoute.params) === null || _targetRoute_params === void 0 ? void 0 : _targetRoute_params[dynamicMatch.name]);
13
+ var changesDynamicScreen = currentRoute.name === targetRoute.name && changesDynamicRoute(targetRoute.name, currentRoute.params, targetRoute.params);
16
14
  if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {
17
15
  if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === "stack" && navigationState.routeNames.includes(targetRoute.name)) {
18
16
  var { payload } = getNavigateAction(actionState, navigationState, "REPLACE");
@@ -1 +1 @@
1
- {"version":3,"file":"getNativeStackReplaceAction.native.js","names":[],"sources":["esm/router/utils/getNativeStackReplaceAction.native.js"],"sourcesContent":["import { StackActions } from \"@react-navigation/native\";\nimport { matchDynamicName, matchGroupName } from \"../matchers\";\nimport { getNavigateAction } from \"./getNavigateAction\";\nfunction getNativeStackReplaceAction(actionState, navigationState) {\n while (actionState && navigationState) {\n var _actionState_index;\n var _currentRoute_params, _targetRoute_params;\n var currentRoute = navigationState.routes[navigationState.index];\n var targetRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n if (currentRoute.name !== targetRoute.name && (matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))) {\n return null;\n }\n var dynamicMatch = matchDynamicName(targetRoute.name);\n var changesDynamicScreen = currentRoute.name === targetRoute.name && dynamicMatch && ((_currentRoute_params = currentRoute.params) === null || _currentRoute_params === void 0 ? void 0 : _currentRoute_params[dynamicMatch.name]) !== ((_targetRoute_params = targetRoute.params) === null || _targetRoute_params === void 0 ? void 0 : _targetRoute_params[dynamicMatch.name]);\n if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {\n if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === \"stack\" && navigationState.routeNames.includes(targetRoute.name)) {\n var { payload } = getNavigateAction(actionState, navigationState, \"REPLACE\");\n return {\n ...StackActions.replace(payload.name, payload.params),\n target: navigationState.key,\n source: currentRoute.key\n };\n }\n return null;\n }\n if (currentRoute.name !== targetRoute.name) {\n return null;\n }\n actionState = targetRoute.state;\n navigationState = currentRoute.state;\n }\n return null;\n}\nexport {\n getNativeStackReplaceAction\n};\n//# sourceMappingURL=getNativeStackReplaceAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,4BAA4B,aAAa,iBAAiB;CACjE,OAAO,eAAe,iBAAiB;EACrC,IAAI;EACJ,IAAI,sBAAsB;EAC1B,IAAI,eAAe,gBAAgB,OAAO,gBAAgB;EAC1D,IAAI,cAAc,YAAY,QAAQ,qBAAqB,YAAY,WAAW,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB,YAAY,OAAO,SAAS;EAC3K,IAAI,aAAa,SAAS,YAAY,SAAS,eAAe,aAAa,IAAI,KAAK,eAAe,YAAY,IAAI,IAAI;GACrH,OAAO;EACT;EACA,IAAI,eAAe,iBAAiB,YAAY,IAAI;EACpD,IAAI,uBAAuB,aAAa,SAAS,YAAY,QAAQ,kBAAkB,uBAAuB,aAAa,YAAY,QAAQ,yBAAyB,KAAK,IAAI,KAAK,IAAI,qBAAqB,aAAa,aAAa,sBAAsB,YAAY,YAAY,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB,aAAa;EAC1W,IAAI,CAAC,aAAa,SAAS,CAAC,YAAY,SAAS,sBAAsB;GACrE,KAAK,aAAa,SAAS,YAAY,QAAQ,yBAAyB,gBAAgB,SAAS,WAAW,gBAAgB,WAAW,SAAS,YAAY,IAAI,GAAG;IACjK,IAAI,EAAE,YAAY,kBAAkB,aAAa,iBAAiB,SAAS;IAC3E,OAAO;KACL,GAAG,aAAa,QAAQ,QAAQ,MAAM,QAAQ,MAAM;KACpD,QAAQ,gBAAgB;KACxB,QAAQ,aAAa;IACvB;GACF;GACA,OAAO;EACT;EACA,IAAI,aAAa,SAAS,YAAY,MAAM;GAC1C,OAAO;EACT;EACA,cAAc,YAAY;EAC1B,kBAAkB,aAAa;CACjC;CACA,OAAO;AACT"}
1
+ {"version":3,"file":"getNativeStackReplaceAction.native.js","names":[],"sources":["esm/router/utils/getNativeStackReplaceAction.native.js"],"sourcesContent":["import { StackActions } from \"@react-navigation/native\";\nimport { changesDynamicRoute, matchGroupName } from \"../matchers\";\nimport { getNavigateAction } from \"./getNavigateAction\";\nfunction getNativeStackReplaceAction(actionState, navigationState) {\n while (actionState && navigationState) {\n var _actionState_index;\n var currentRoute = navigationState.routes[navigationState.index];\n var targetRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n if (currentRoute.name !== targetRoute.name && (matchGroupName(currentRoute.name) || matchGroupName(targetRoute.name))) {\n return null;\n }\n var changesDynamicScreen = currentRoute.name === targetRoute.name && changesDynamicRoute(targetRoute.name, currentRoute.params, targetRoute.params);\n if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {\n if ((currentRoute.name !== targetRoute.name || changesDynamicScreen) && navigationState.type === \"stack\" && navigationState.routeNames.includes(targetRoute.name)) {\n var { payload } = getNavigateAction(actionState, navigationState, \"REPLACE\");\n return {\n ...StackActions.replace(payload.name, payload.params),\n target: navigationState.key,\n source: currentRoute.key\n };\n }\n return null;\n }\n if (currentRoute.name !== targetRoute.name) {\n return null;\n }\n actionState = targetRoute.state;\n navigationState = currentRoute.state;\n }\n return null;\n}\nexport {\n getNativeStackReplaceAction\n};\n//# sourceMappingURL=getNativeStackReplaceAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,4BAA4B,aAAa,iBAAiB;CACjE,OAAO,eAAe,iBAAiB;EACrC,IAAI;EACJ,IAAI,eAAe,gBAAgB,OAAO,gBAAgB;EAC1D,IAAI,cAAc,YAAY,QAAQ,qBAAqB,YAAY,WAAW,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB,YAAY,OAAO,SAAS;EAC3K,IAAI,aAAa,SAAS,YAAY,SAAS,eAAe,aAAa,IAAI,KAAK,eAAe,YAAY,IAAI,IAAI;GACrH,OAAO;EACT;EACA,IAAI,uBAAuB,aAAa,SAAS,YAAY,QAAQ,oBAAoB,YAAY,MAAM,aAAa,QAAQ,YAAY,MAAM;EAClJ,IAAI,CAAC,aAAa,SAAS,CAAC,YAAY,SAAS,sBAAsB;GACrE,KAAK,aAAa,SAAS,YAAY,QAAQ,yBAAyB,gBAAgB,SAAS,WAAW,gBAAgB,WAAW,SAAS,YAAY,IAAI,GAAG;IACjK,IAAI,EAAE,YAAY,kBAAkB,aAAa,iBAAiB,SAAS;IAC3E,OAAO;KACL,GAAG,aAAa,QAAQ,QAAQ,MAAM,QAAQ,MAAM;KACpD,QAAQ,gBAAgB;KACxB,QAAQ,aAAa;IACvB;GACF;GACA,OAAO;EACT;EACA,IAAI,aAAa,SAAS,YAAY,MAAM;GAC1C,OAAO;EACT;EACA,cAAc,YAAY;EAC1B,kBAAkB,aAAa;CACjC;CACA,OAAO;AACT"}
@@ -1,6 +1,6 @@
1
1
  import { nanoid } from "nanoid/non-secure";
2
2
  import { setLastAction } from "../lastAction.mjs";
3
- import { matchDynamicName } from "../matchers.mjs";
3
+ import { changesDynamicRoute } from "../matchers.mjs";
4
4
 
5
5
  function getNavigateAction(actionState, navigationState, type = "NAVIGATE") {
6
6
  let actionStateRoute;
@@ -9,8 +9,7 @@ function getNavigateAction(actionState, navigationState, type = "NAVIGATE") {
9
9
  actionStateRoute = actionState.routes[actionState.index ?? actionState.routes.length - 1];
10
10
  const childState = actionStateRoute.state;
11
11
  const nextNavigationState = stateRoute.state;
12
- const dynamicMatch = matchDynamicName(actionStateRoute.name);
13
- const didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || dynamicMatch && actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name];
12
+ const didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || changesDynamicRoute(actionStateRoute.name, stateRoute.params, actionStateRoute.params);
14
13
  if (didActionAndCurrentStateDiverge) {
15
14
  break;
16
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getNavigateAction.js","names":[],"sources":["esm/router/utils/getNavigateAction.js"],"sourcesContent":["import { nanoid } from \"nanoid/non-secure\";\nimport { setLastAction } from \"../lastAction\";\nimport { matchDynamicName } from \"../matchers\";\nfunction getNavigateAction(actionState, navigationState, type = \"NAVIGATE\") {\n let actionStateRoute;\n while (actionState && navigationState) {\n const stateRoute = navigationState.routes[navigationState.index];\n actionStateRoute = actionState.routes[actionState.index ?? actionState.routes.length - 1];\n const childState = actionStateRoute.state;\n const nextNavigationState = stateRoute.state;\n const dynamicMatch = matchDynamicName(actionStateRoute.name);\n const didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || // !deepEqual(actionStateRoute.params, stateRoute.params) ||\n !childState || !nextNavigationState || dynamicMatch && actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name];\n if (didActionAndCurrentStateDiverge) {\n break;\n }\n actionState = childState;\n navigationState = nextNavigationState;\n }\n const rootPayload = { params: {} };\n let payload = rootPayload;\n let params = payload.params;\n while (actionStateRoute) {\n Object.assign(params, { ...actionStateRoute.params });\n payload.screen = actionStateRoute.name;\n payload.params = { ...actionStateRoute.params };\n actionStateRoute = actionStateRoute.state?.routes[actionStateRoute.state.index ?? actionStateRoute.state.routes.length - 1];\n payload.params ??= {};\n payload = payload.params;\n params = payload;\n }\n if (type === \"PUSH\") {\n setLastAction();\n type = \"NAVIGATE\";\n if (navigationState.type === \"stack\") {\n rootPayload.key = `${rootPayload.name}-${nanoid()}`;\n }\n }\n if (type === \"REPLACE\" && navigationState.type === \"tab\") {\n type = \"JUMP_TO\";\n }\n return {\n type,\n target: navigationState.key,\n payload: {\n key: rootPayload.key,\n name: rootPayload.screen,\n params: rootPayload.params\n }\n };\n}\nexport {\n getNavigateAction\n};\n//# sourceMappingURL=getNavigateAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,kBAAkB,aAAa,iBAAiB,OAAO,YAAY;CAC1E,IAAI;CACJ,OAAO,eAAe,iBAAiB;EACrC,MAAM,aAAa,gBAAgB,OAAO,gBAAgB;EAC1D,mBAAmB,YAAY,OAAO,YAAY,SAAS,YAAY,OAAO,SAAS;EACvF,MAAM,aAAa,iBAAiB;EACpC,MAAM,sBAAsB,WAAW;EACvC,MAAM,eAAe,iBAAiB,iBAAiB,IAAI;EAC3D,MAAM,kCAAkC,iBAAiB,SAAS,WAAW,QAC7E,CAAC,cAAc,CAAC,uBAAuB,gBAAgB,iBAAiB,SAAS,aAAa,UAAU,WAAW,SAAS,aAAa;EACzI,IAAI,iCAAiC;GACnC;EACF;EACA,cAAc;EACd,kBAAkB;CACpB;CACA,MAAM,cAAc,EAAE,QAAQ,CAAC,EAAE;CACjC,IAAI,UAAU;CACd,IAAI,SAAS,QAAQ;CACrB,OAAO,kBAAkB;EACvB,OAAO,OAAO,QAAQ,EAAE,GAAG,iBAAiB,OAAO,CAAC;EACpD,QAAQ,SAAS,iBAAiB;EAClC,QAAQ,SAAS,EAAE,GAAG,iBAAiB,OAAO;EAC9C,mBAAmB,iBAAiB,OAAO,OAAO,iBAAiB,MAAM,SAAS,iBAAiB,MAAM,OAAO,SAAS;EACzH,QAAQ,WAAW,CAAC;EACpB,UAAU,QAAQ;EAClB,SAAS;CACX;CACA,IAAI,SAAS,QAAQ;EACnB,cAAc;EACd,OAAO;EACP,IAAI,gBAAgB,SAAS,SAAS;GACpC,YAAY,MAAM,GAAG,YAAY,KAAK,GAAG,OAAO;EAClD;CACF;CACA,IAAI,SAAS,aAAa,gBAAgB,SAAS,OAAO;EACxD,OAAO;CACT;CACA,OAAO;EACL;EACA,QAAQ,gBAAgB;EACxB,SAAS;GACP,KAAK,YAAY;GACjB,MAAM,YAAY;GAClB,QAAQ,YAAY;EACtB;CACF;AACF"}
1
+ {"version":3,"file":"getNavigateAction.js","names":[],"sources":["esm/router/utils/getNavigateAction.js"],"sourcesContent":["import { nanoid } from \"nanoid/non-secure\";\nimport { setLastAction } from \"../lastAction\";\nimport { changesDynamicRoute } from \"../matchers\";\nfunction getNavigateAction(actionState, navigationState, type = \"NAVIGATE\") {\n let actionStateRoute;\n while (actionState && navigationState) {\n const stateRoute = navigationState.routes[navigationState.index];\n actionStateRoute = actionState.routes[actionState.index ?? actionState.routes.length - 1];\n const childState = actionStateRoute.state;\n const nextNavigationState = stateRoute.state;\n const didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || // !deepEqual(actionStateRoute.params, stateRoute.params) ||\n !childState || !nextNavigationState || changesDynamicRoute(actionStateRoute.name, stateRoute.params, actionStateRoute.params);\n if (didActionAndCurrentStateDiverge) {\n break;\n }\n actionState = childState;\n navigationState = nextNavigationState;\n }\n const rootPayload = { params: {} };\n let payload = rootPayload;\n let params = payload.params;\n while (actionStateRoute) {\n Object.assign(params, { ...actionStateRoute.params });\n payload.screen = actionStateRoute.name;\n payload.params = { ...actionStateRoute.params };\n actionStateRoute = actionStateRoute.state?.routes[actionStateRoute.state.index ?? actionStateRoute.state.routes.length - 1];\n payload.params ??= {};\n payload = payload.params;\n params = payload;\n }\n if (type === \"PUSH\") {\n setLastAction();\n type = \"NAVIGATE\";\n if (navigationState.type === \"stack\") {\n rootPayload.key = `${rootPayload.name}-${nanoid()}`;\n }\n }\n if (type === \"REPLACE\" && navigationState.type === \"tab\") {\n type = \"JUMP_TO\";\n }\n return {\n type,\n target: navigationState.key,\n payload: {\n key: rootPayload.key,\n name: rootPayload.screen,\n params: rootPayload.params\n }\n };\n}\nexport {\n getNavigateAction\n};\n//# sourceMappingURL=getNavigateAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,kBAAkB,aAAa,iBAAiB,OAAO,YAAY;CAC1E,IAAI;CACJ,OAAO,eAAe,iBAAiB;EACrC,MAAM,aAAa,gBAAgB,OAAO,gBAAgB;EAC1D,mBAAmB,YAAY,OAAO,YAAY,SAAS,YAAY,OAAO,SAAS;EACvF,MAAM,aAAa,iBAAiB;EACpC,MAAM,sBAAsB,WAAW;EACvC,MAAM,kCAAkC,iBAAiB,SAAS,WAAW,QAC7E,CAAC,cAAc,CAAC,uBAAuB,oBAAoB,iBAAiB,MAAM,WAAW,QAAQ,iBAAiB,MAAM;EAC5H,IAAI,iCAAiC;GACnC;EACF;EACA,cAAc;EACd,kBAAkB;CACpB;CACA,MAAM,cAAc,EAAE,QAAQ,CAAC,EAAE;CACjC,IAAI,UAAU;CACd,IAAI,SAAS,QAAQ;CACrB,OAAO,kBAAkB;EACvB,OAAO,OAAO,QAAQ,EAAE,GAAG,iBAAiB,OAAO,CAAC;EACpD,QAAQ,SAAS,iBAAiB;EAClC,QAAQ,SAAS,EAAE,GAAG,iBAAiB,OAAO;EAC9C,mBAAmB,iBAAiB,OAAO,OAAO,iBAAiB,MAAM,SAAS,iBAAiB,MAAM,OAAO,SAAS;EACzH,QAAQ,WAAW,CAAC;EACpB,UAAU,QAAQ;EAClB,SAAS;CACX;CACA,IAAI,SAAS,QAAQ;EACnB,cAAc;EACd,OAAO;EACP,IAAI,gBAAgB,SAAS,SAAS;GACpC,YAAY,MAAM,GAAG,YAAY,KAAK,GAAG,OAAO;EAClD;CACF;CACA,IAAI,SAAS,aAAa,gBAAgB,SAAS,OAAO;EACxD,OAAO;CACT;CACA,OAAO;EACL;EACA,QAAQ,gBAAgB;EACxB,SAAS;GACP,KAAK,YAAY;GACjB,MAAM,YAAY;GAClB,QAAQ,YAAY;EACtB;CACF;AACF"}
@@ -1,19 +1,17 @@
1
1
  import { nanoid } from "nanoid/non-secure";
2
2
  import { setLastAction } from "../lastAction.native.js";
3
- import { matchDynamicName } from "../matchers.native.js";
3
+ import { changesDynamicRoute } from "../matchers.native.js";
4
4
 
5
5
  function getNavigateAction(actionState, navigationState) {
6
6
  var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "NAVIGATE";
7
7
  var actionStateRoute;
8
8
  while (actionState && navigationState) {
9
9
  var _actionState_index;
10
- var _actionStateRoute_params, _stateRoute_params;
11
10
  var stateRoute = navigationState.routes[navigationState.index];
12
11
  actionStateRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];
13
12
  var childState = actionStateRoute.state;
14
13
  var nextNavigationState = stateRoute.state;
15
- var dynamicMatch = matchDynamicName(actionStateRoute.name);
16
- var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || dynamicMatch && ((_actionStateRoute_params = actionStateRoute.params) === null || _actionStateRoute_params === void 0 ? void 0 : _actionStateRoute_params[dynamicMatch.name]) !== ((_stateRoute_params = stateRoute.params) === null || _stateRoute_params === void 0 ? void 0 : _stateRoute_params[dynamicMatch.name]);
14
+ var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || !childState || !nextNavigationState || changesDynamicRoute(actionStateRoute.name, stateRoute.params, actionStateRoute.params);
17
15
  if (didActionAndCurrentStateDiverge) {
18
16
  break;
19
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getNavigateAction.native.js","names":[],"sources":["esm/router/utils/getNavigateAction.native.js"],"sourcesContent":["import { nanoid } from \"nanoid/non-secure\";\nimport { setLastAction } from \"../lastAction\";\nimport { matchDynamicName } from \"../matchers\";\nfunction getNavigateAction(actionState, navigationState) {\n var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : \"NAVIGATE\";\n var actionStateRoute;\n while (actionState && navigationState) {\n var _actionState_index;\n var _actionStateRoute_params, _stateRoute_params;\n var stateRoute = navigationState.routes[navigationState.index];\n actionStateRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n var childState = actionStateRoute.state;\n var nextNavigationState = stateRoute.state;\n var dynamicMatch = matchDynamicName(actionStateRoute.name);\n var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || // !deepEqual(actionStateRoute.params, stateRoute.params) ||\n !childState || !nextNavigationState || dynamicMatch && ((_actionStateRoute_params = actionStateRoute.params) === null || _actionStateRoute_params === void 0 ? void 0 : _actionStateRoute_params[dynamicMatch.name]) !== ((_stateRoute_params = stateRoute.params) === null || _stateRoute_params === void 0 ? void 0 : _stateRoute_params[dynamicMatch.name]);\n if (didActionAndCurrentStateDiverge) {\n break;\n }\n actionState = childState;\n navigationState = nextNavigationState;\n }\n var rootPayload = {\n params: {}\n };\n var payload = rootPayload;\n var params = payload.params;\n while (actionStateRoute) {\n var _actionStateRoute_state_index, _payload, _params;\n var _actionStateRoute_state;\n Object.assign(params, {\n ...actionStateRoute.params\n });\n payload.screen = actionStateRoute.name;\n payload.params = {\n ...actionStateRoute.params\n };\n actionStateRoute = (_actionStateRoute_state = actionStateRoute.state) === null || _actionStateRoute_state === void 0 ? void 0 : _actionStateRoute_state.routes[(_actionStateRoute_state_index = actionStateRoute.state.index) !== null && _actionStateRoute_state_index !== void 0 ? _actionStateRoute_state_index : actionStateRoute.state.routes.length - 1];\n (_params = (_payload = payload).params) !== null && _params !== void 0 ? _params : _payload.params = {};\n payload = payload.params;\n params = payload;\n }\n if (type === \"PUSH\") {\n setLastAction();\n type = \"NAVIGATE\";\n if (navigationState.type === \"stack\") {\n rootPayload.key = `${rootPayload.name}-${nanoid()}`;\n }\n }\n if (type === \"REPLACE\" && navigationState.type === \"tab\") {\n type = \"JUMP_TO\";\n }\n return {\n type,\n target: navigationState.key,\n payload: {\n key: rootPayload.key,\n name: rootPayload.screen,\n params: rootPayload.params\n }\n };\n}\nexport {\n getNavigateAction\n};\n//# sourceMappingURL=getNavigateAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,kBAAkB,aAAa,iBAAiB;CACvD,IAAI,OAAO,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK;CAC5E,IAAI;CACJ,OAAO,eAAe,iBAAiB;EACrC,IAAI;EACJ,IAAI,0BAA0B;EAC9B,IAAI,aAAa,gBAAgB,OAAO,gBAAgB;EACxD,mBAAmB,YAAY,QAAQ,qBAAqB,YAAY,WAAW,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB,YAAY,OAAO,SAAS;EAC5K,IAAI,aAAa,iBAAiB;EAClC,IAAI,sBAAsB,WAAW;EACrC,IAAI,eAAe,iBAAiB,iBAAiB,IAAI;EACzD,IAAI,kCAAkC,iBAAiB,SAAS,WAAW,QAC3E,CAAC,cAAc,CAAC,uBAAuB,kBAAkB,2BAA2B,iBAAiB,YAAY,QAAQ,6BAA6B,KAAK,IAAI,KAAK,IAAI,yBAAyB,aAAa,aAAa,qBAAqB,WAAW,YAAY,QAAQ,uBAAuB,KAAK,IAAI,KAAK,IAAI,mBAAmB,aAAa;EACxV,IAAI,iCAAiC;GACnC;EACF;EACA,cAAc;EACd,kBAAkB;CACpB;CACA,IAAI,cAAc,EAChB,QAAQ,CAAC,EACX;CACA,IAAI,UAAU;CACd,IAAI,SAAS,QAAQ;CACrB,OAAO,kBAAkB;EACvB,IAAI,+BAA+B,UAAU;EAC7C,IAAI;EACJ,OAAO,OAAO,QAAQ,EACpB,GAAG,iBAAiB,OACtB,CAAC;EACD,QAAQ,SAAS,iBAAiB;EAClC,QAAQ,SAAS,EACf,GAAG,iBAAiB,OACtB;EACA,oBAAoB,0BAA0B,iBAAiB,WAAW,QAAQ,4BAA4B,KAAK,IAAI,KAAK,IAAI,wBAAwB,QAAQ,gCAAgC,iBAAiB,MAAM,WAAW,QAAQ,kCAAkC,KAAK,IAAI,gCAAgC,iBAAiB,MAAM,OAAO,SAAS;EAC5V,CAAC,WAAW,WAAW,QAAO,CAAE,YAAY,QAAQ,YAAY,KAAK,IAAI,UAAU,SAAS,SAAS,CAAC;EACtG,UAAU,QAAQ;EAClB,SAAS;CACX;CACA,IAAI,SAAS,QAAQ;EACnB,cAAc;EACd,OAAO;EACP,IAAI,gBAAgB,SAAS,SAAS;GACpC,YAAY,MAAM,GAAG,YAAY,KAAK,GAAG,OAAO;EAClD;CACF;CACA,IAAI,SAAS,aAAa,gBAAgB,SAAS,OAAO;EACxD,OAAO;CACT;CACA,OAAO;EACL;EACA,QAAQ,gBAAgB;EACxB,SAAS;GACP,KAAK,YAAY;GACjB,MAAM,YAAY;GAClB,QAAQ,YAAY;EACtB;CACF;AACF"}
1
+ {"version":3,"file":"getNavigateAction.native.js","names":[],"sources":["esm/router/utils/getNavigateAction.native.js"],"sourcesContent":["import { nanoid } from \"nanoid/non-secure\";\nimport { setLastAction } from \"../lastAction\";\nimport { changesDynamicRoute } from \"../matchers\";\nfunction getNavigateAction(actionState, navigationState) {\n var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : \"NAVIGATE\";\n var actionStateRoute;\n while (actionState && navigationState) {\n var _actionState_index;\n var stateRoute = navigationState.routes[navigationState.index];\n actionStateRoute = actionState.routes[(_actionState_index = actionState.index) !== null && _actionState_index !== void 0 ? _actionState_index : actionState.routes.length - 1];\n var childState = actionStateRoute.state;\n var nextNavigationState = stateRoute.state;\n var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name || // !deepEqual(actionStateRoute.params, stateRoute.params) ||\n !childState || !nextNavigationState || changesDynamicRoute(actionStateRoute.name, stateRoute.params, actionStateRoute.params);\n if (didActionAndCurrentStateDiverge) {\n break;\n }\n actionState = childState;\n navigationState = nextNavigationState;\n }\n var rootPayload = {\n params: {}\n };\n var payload = rootPayload;\n var params = payload.params;\n while (actionStateRoute) {\n var _actionStateRoute_state_index, _payload, _params;\n var _actionStateRoute_state;\n Object.assign(params, {\n ...actionStateRoute.params\n });\n payload.screen = actionStateRoute.name;\n payload.params = {\n ...actionStateRoute.params\n };\n actionStateRoute = (_actionStateRoute_state = actionStateRoute.state) === null || _actionStateRoute_state === void 0 ? void 0 : _actionStateRoute_state.routes[(_actionStateRoute_state_index = actionStateRoute.state.index) !== null && _actionStateRoute_state_index !== void 0 ? _actionStateRoute_state_index : actionStateRoute.state.routes.length - 1];\n (_params = (_payload = payload).params) !== null && _params !== void 0 ? _params : _payload.params = {};\n payload = payload.params;\n params = payload;\n }\n if (type === \"PUSH\") {\n setLastAction();\n type = \"NAVIGATE\";\n if (navigationState.type === \"stack\") {\n rootPayload.key = `${rootPayload.name}-${nanoid()}`;\n }\n }\n if (type === \"REPLACE\" && navigationState.type === \"tab\") {\n type = \"JUMP_TO\";\n }\n return {\n type,\n target: navigationState.key,\n payload: {\n key: rootPayload.key,\n name: rootPayload.screen,\n params: rootPayload.params\n }\n };\n}\nexport {\n getNavigateAction\n};\n//# sourceMappingURL=getNavigateAction.js.map\n"],"mappings":";;;;;AAGA,SAAS,kBAAkB,aAAa,iBAAiB;CACvD,IAAI,OAAO,UAAU,SAAS,KAAK,UAAU,OAAO,KAAK,IAAI,UAAU,KAAK;CAC5E,IAAI;CACJ,OAAO,eAAe,iBAAiB;EACrC,IAAI;EACJ,IAAI,aAAa,gBAAgB,OAAO,gBAAgB;EACxD,mBAAmB,YAAY,QAAQ,qBAAqB,YAAY,WAAW,QAAQ,uBAAuB,KAAK,IAAI,qBAAqB,YAAY,OAAO,SAAS;EAC5K,IAAI,aAAa,iBAAiB;EAClC,IAAI,sBAAsB,WAAW;EACrC,IAAI,kCAAkC,iBAAiB,SAAS,WAAW,QAC3E,CAAC,cAAc,CAAC,uBAAuB,oBAAoB,iBAAiB,MAAM,WAAW,QAAQ,iBAAiB,MAAM;EAC5H,IAAI,iCAAiC;GACnC;EACF;EACA,cAAc;EACd,kBAAkB;CACpB;CACA,IAAI,cAAc,EAChB,QAAQ,CAAC,EACX;CACA,IAAI,UAAU;CACd,IAAI,SAAS,QAAQ;CACrB,OAAO,kBAAkB;EACvB,IAAI,+BAA+B,UAAU;EAC7C,IAAI;EACJ,OAAO,OAAO,QAAQ,EACpB,GAAG,iBAAiB,OACtB,CAAC;EACD,QAAQ,SAAS,iBAAiB;EAClC,QAAQ,SAAS,EACf,GAAG,iBAAiB,OACtB;EACA,oBAAoB,0BAA0B,iBAAiB,WAAW,QAAQ,4BAA4B,KAAK,IAAI,KAAK,IAAI,wBAAwB,QAAQ,gCAAgC,iBAAiB,MAAM,WAAW,QAAQ,kCAAkC,KAAK,IAAI,gCAAgC,iBAAiB,MAAM,OAAO,SAAS;EAC5V,CAAC,WAAW,WAAW,QAAO,CAAE,YAAY,QAAQ,YAAY,KAAK,IAAI,UAAU,SAAS,SAAS,CAAC;EACtG,UAAU,QAAQ;EAClB,SAAS;CACX;CACA,IAAI,SAAS,QAAQ;EACnB,cAAc;EACd,OAAO;EACP,IAAI,gBAAgB,SAAS,SAAS;GACpC,YAAY,MAAM,GAAG,YAAY,KAAK,GAAG,OAAO;EAClD;CACF;CACA,IAAI,SAAS,aAAa,gBAAgB,SAAS,OAAO;EACxD,OAAO;CACT;CACA,OAAO;EACL;EACA,QAAQ,gBAAgB;EACxB,SAAS;GACP,KAAK,YAAY;GACjB,MAAM,YAAY;GAClB,QAAQ,YAAY;EACtB;CACF;AACF"}
@@ -31,13 +31,13 @@ namespace margelo::nitro::one {
31
31
  [[nodiscard]]
32
32
  AudioPlayOptions toCpp() const {
33
33
  static const auto clazz = javaClassStatic();
34
- static const auto fieldPositionMs = clazz->getField<jni::JDouble>("positionMs");
35
- jni::local_ref<jni::JDouble> positionMs = this->getFieldValue(fieldPositionMs);
36
34
  static const auto fieldPaused = clazz->getField<jni::JBoolean>("paused");
37
35
  jni::local_ref<jni::JBoolean> paused = this->getFieldValue(fieldPaused);
36
+ static const auto fieldPositionMs = clazz->getField<jni::JDouble>("positionMs");
37
+ jni::local_ref<jni::JDouble> positionMs = this->getFieldValue(fieldPositionMs);
38
38
  return AudioPlayOptions(
39
- positionMs != nullptr ? std::make_optional(positionMs->value()) : std::nullopt,
40
- paused != nullptr ? std::make_optional(static_cast<bool>(paused->value())) : std::nullopt
39
+ paused != nullptr ? std::make_optional(static_cast<bool>(paused->value())) : std::nullopt,
40
+ positionMs != nullptr ? std::make_optional(positionMs->value()) : std::nullopt
41
41
  );
42
42
  }
43
43
 
@@ -47,13 +47,13 @@ namespace margelo::nitro::one {
47
47
  */
48
48
  [[maybe_unused]]
49
49
  static jni::local_ref<JAudioPlayOptions::javaobject> fromCpp(const AudioPlayOptions& value) {
50
- using JSignature = JAudioPlayOptions(jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>);
50
+ using JSignature = JAudioPlayOptions(jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>);
51
51
  static const auto clazz = javaClassStatic();
52
52
  static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
53
53
  return create(
54
54
  clazz,
55
- value.positionMs.has_value() ? jni::JDouble::valueOf(value.positionMs.value()) : nullptr,
56
- value.paused.has_value() ? jni::JBoolean::valueOf(value.paused.value()) : nullptr
55
+ value.paused.has_value() ? jni::JBoolean::valueOf(value.paused.value()) : nullptr,
56
+ value.positionMs.has_value() ? jni::JDouble::valueOf(value.positionMs.value()) : nullptr
57
57
  );
58
58
  }
59
59
  };
@@ -20,24 +20,24 @@ import java.util.Objects
20
20
  data class AudioPlayOptions(
21
21
  @DoNotStrip
22
22
  @Keep
23
- val positionMs: Double?,
23
+ val paused: Boolean?,
24
24
  @DoNotStrip
25
25
  @Keep
26
- val paused: Boolean?
26
+ val positionMs: Double?
27
27
  ) {
28
28
  /* primary constructor */
29
29
 
30
30
  override fun equals(other: Any?): Boolean {
31
31
  if (this === other) return true
32
32
  if (other !is AudioPlayOptions) return false
33
- return Objects.deepEquals(this.positionMs, other.positionMs)
34
- && Objects.deepEquals(this.paused, other.paused)
33
+ return Objects.deepEquals(this.paused, other.paused)
34
+ && Objects.deepEquals(this.positionMs, other.positionMs)
35
35
  }
36
36
 
37
37
  override fun hashCode(): Int {
38
38
  return arrayOf<Any?>(
39
- positionMs,
40
- paused
39
+ paused,
40
+ positionMs
41
41
  ).contentDeepHashCode()
42
42
  }
43
43
 
@@ -49,8 +49,8 @@ data class AudioPlayOptions(
49
49
  @Keep
50
50
  @Suppress("unused")
51
51
  @JvmStatic
52
- private fun fromCpp(positionMs: Double?, paused: Boolean?): AudioPlayOptions {
53
- return AudioPlayOptions(positionMs, paused)
52
+ private fun fromCpp(paused: Boolean?, positionMs: Double?): AudioPlayOptions {
53
+ return AudioPlayOptions(paused, positionMs)
54
54
  }
55
55
  }
56
56
  }
@@ -18,16 +18,16 @@ public extension AudioPlayOptions {
18
18
  /**
19
19
  * Create a new instance of `AudioPlayOptions`.
20
20
  */
21
- init(positionMs: Double?, paused: Bool?) {
22
- self.init({ () -> bridge.std__optional_double_ in
23
- if let __unwrappedValue = positionMs {
24
- return bridge.create_std__optional_double_(__unwrappedValue)
21
+ init(paused: Bool?, positionMs: Double?) {
22
+ self.init({ () -> bridge.std__optional_bool_ in
23
+ if let __unwrappedValue = paused {
24
+ return bridge.create_std__optional_bool_(__unwrappedValue)
25
25
  } else {
26
26
  return .init()
27
27
  }
28
- }(), { () -> bridge.std__optional_bool_ in
29
- if let __unwrappedValue = paused {
30
- return bridge.create_std__optional_bool_(__unwrappedValue)
28
+ }(), { () -> bridge.std__optional_double_ in
29
+ if let __unwrappedValue = positionMs {
30
+ return bridge.create_std__optional_double_(__unwrappedValue)
31
31
  } else {
32
32
  return .init()
33
33
  }
@@ -35,10 +35,10 @@ public extension AudioPlayOptions {
35
35
  }
36
36
 
37
37
  @inline(__always)
38
- var positionMs: Double? {
39
- return { () -> Double? in
40
- if bridge.has_value_std__optional_double_(self.__positionMs) {
41
- let __unwrapped = bridge.get_std__optional_double_(self.__positionMs)
38
+ var paused: Bool? {
39
+ return { () -> Bool? in
40
+ if bridge.has_value_std__optional_bool_(self.__paused) {
41
+ let __unwrapped = bridge.get_std__optional_bool_(self.__paused)
42
42
  return __unwrapped
43
43
  } else {
44
44
  return nil
@@ -47,10 +47,10 @@ public extension AudioPlayOptions {
47
47
  }
48
48
 
49
49
  @inline(__always)
50
- var paused: Bool? {
51
- return { () -> Bool? in
52
- if bridge.has_value_std__optional_bool_(self.__paused) {
53
- let __unwrapped = bridge.get_std__optional_bool_(self.__paused)
50
+ var positionMs: Double? {
51
+ return { () -> Double? in
52
+ if bridge.has_value_std__optional_double_(self.__positionMs) {
53
+ let __unwrapped = bridge.get_std__optional_double_(self.__positionMs)
54
54
  return __unwrapped
55
55
  } else {
56
56
  return nil
@@ -39,12 +39,12 @@ namespace margelo::nitro::one {
39
39
  */
40
40
  struct AudioPlayOptions final {
41
41
  public:
42
- std::optional<double> positionMs SWIFT_PRIVATE;
43
42
  std::optional<bool> paused SWIFT_PRIVATE;
43
+ std::optional<double> positionMs SWIFT_PRIVATE;
44
44
 
45
45
  public:
46
46
  AudioPlayOptions() = default;
47
- explicit AudioPlayOptions(std::optional<double> positionMs, std::optional<bool> paused): positionMs(positionMs), paused(paused) {}
47
+ explicit AudioPlayOptions(std::optional<bool> paused, std::optional<double> positionMs): paused(paused), positionMs(positionMs) {}
48
48
 
49
49
  public:
50
50
  friend bool operator==(const AudioPlayOptions& lhs, const AudioPlayOptions& rhs) = default;
@@ -60,14 +60,14 @@ namespace margelo::nitro {
60
60
  static inline margelo::nitro::one::AudioPlayOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
61
61
  jsi::Object obj = arg.asObject(runtime);
62
62
  return margelo::nitro::one::AudioPlayOptions(
63
- JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "positionMs"))),
64
- JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "paused")))
63
+ JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "paused"))),
64
+ JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "positionMs")))
65
65
  );
66
66
  }
67
67
  static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::one::AudioPlayOptions& arg) {
68
68
  jsi::Object obj(runtime);
69
- obj.setProperty(runtime, PropNameIDCache::get(runtime, "positionMs"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.positionMs));
70
69
  obj.setProperty(runtime, PropNameIDCache::get(runtime, "paused"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.paused));
70
+ obj.setProperty(runtime, PropNameIDCache::get(runtime, "positionMs"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.positionMs));
71
71
  return obj;
72
72
  }
73
73
  static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -78,8 +78,8 @@ namespace margelo::nitro {
78
78
  if (!nitro::isPlainObject(runtime, obj)) {
79
79
  return false;
80
80
  }
81
- if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "positionMs")))) return false;
82
81
  if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "paused")))) return false;
82
+ if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "positionMs")))) return false;
83
83
  return true;
84
84
  }
85
85
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "one",
3
- "version": "2.13.2",
3
+ "version": "2.13.4",
4
4
  "description": "One is a React framework for web, iOS, and Android apps.",
5
5
  "license": "BSD-3-Clause",
6
6
  "sideEffects": [
@@ -282,15 +282,15 @@
282
282
  "@react-navigation/routers": "8.0.0-alpha.21",
283
283
  "@rozenite/middleware": "^2.5.0",
284
284
  "@ungap/structured-clone": "^1.2.0",
285
- "@vxrn/color-scheme": "2.13.2",
286
- "@vxrn/compiler": "2.13.2",
287
- "@vxrn/resolve": "2.13.2",
288
- "@vxrn/tslib-lite": "2.13.2",
289
- "@vxrn/use-isomorphic-layout-effect": "2.13.2",
290
- "@vxrn/utils": "2.13.2",
285
+ "@vxrn/color-scheme": "2.13.4",
286
+ "@vxrn/compiler": "2.13.4",
287
+ "@vxrn/resolve": "2.13.4",
288
+ "@vxrn/tslib-lite": "2.13.4",
289
+ "@vxrn/use-isomorphic-layout-effect": "2.13.4",
290
+ "@vxrn/utils": "2.13.4",
291
291
  "citty": "^0.1.6",
292
292
  "core-js": "^3.38.1",
293
- "create-vxrn": "2.13.2",
293
+ "create-vxrn": "2.13.4",
294
294
  "escape-string-regexp": "^5.0.0",
295
295
  "fast-deep-equal": "^3.1.3",
296
296
  "fast-glob": "^3.3.3",
@@ -312,7 +312,7 @@
312
312
  "tsconfig-paths": "^4",
313
313
  "use-latest-callback": "^0.3.5",
314
314
  "vite": "^8.2.2",
315
- "vxrn": "2.13.2",
315
+ "vxrn": "2.13.4",
316
316
  "web-streams-polyfill": "^4.3.0",
317
317
  "ws": "^8.21.0",
318
318
  "xxhashjs": "^0.2.2"
@@ -342,7 +342,7 @@
342
342
  "@babel/types": "^7.28.5",
343
343
  "babel-dead-code-elimination": "1.0.10",
344
344
  "babel-plugin-module-resolver": "^5.0.2",
345
- "@vxrn/vite-plugin-metro": "2.13.2"
345
+ "@vxrn/vite-plugin-metro": "2.13.4"
346
346
  },
347
347
  "peerDependenciesMeta": {
348
348
  "@react-native/babel-preset": {
@@ -404,19 +404,19 @@
404
404
  }
405
405
  },
406
406
  "devDependencies": {
407
- "@tamagui/sheet": "3.1.9",
407
+ "@tamagui/sheet": "3.2.0",
408
408
  "@callstack/liquid-glass": "^0.8.1",
409
409
  "@react-native/babel-plugin-codegen": "0.88.0",
410
410
  "@react-native/codegen": "^0.88.0",
411
411
  "@react-navigation/core": "8.0.0-alpha.41",
412
412
  "@react-navigation/drawer": "8.0.0-alpha.58",
413
413
  "@react-navigation/native": "8.0.0-alpha.51",
414
- "@tamagui/build": "3.1.9",
414
+ "@tamagui/build": "3.2.0",
415
415
  "@types/node": "^24.10.0",
416
416
  "@types/react-dom": "^19.3.0",
417
417
  "@types/react-test-renderer": "^19.1.0",
418
418
  "@types/xxhashjs": "^0.2.4",
419
- "@vxrn/emitter": "2.13.2",
419
+ "@vxrn/emitter": "2.13.4",
420
420
  "depcheck": "^1.4.7",
421
421
  "esbuild": "^0.25.12",
422
422
  "immer": "^10.1.1",
@@ -435,7 +435,7 @@
435
435
  "typescript": "7.0.2",
436
436
  "vitest": "^4.1.0",
437
437
  "yoga-layout": "^3.2.1",
438
- "@tamagui/web": "3.1.9",
438
+ "@tamagui/web": "3.2.0",
439
439
  "@babel/core": "^7.28.5",
440
440
  "@babel/generator": "7.29.7",
441
441
  "@babel/parser": "^7.28.5",
@@ -444,7 +444,7 @@
444
444
  "@babel/types": "^7.28.5",
445
445
  "babel-dead-code-elimination": "1.0.10",
446
446
  "babel-plugin-module-resolver": "^5.0.2",
447
- "@vxrn/vite-plugin-metro": "2.13.2"
447
+ "@vxrn/vite-plugin-metro": "2.13.4"
448
448
  },
449
449
  "publishConfig": {
450
450
  "access": "public"
@@ -612,7 +612,7 @@
612
612
  }
613
613
  }
614
614
  },
615
- "releaseSourceCommit": "2329bf2ffeaed07fe67f1de2575ad6a85e077f73",
615
+ "releaseSourceCommit": "bce5e984e214cdc6aeab893a94c1330470936968",
616
616
  "repository": {
617
617
  "type": "git",
618
618
  "url": "git+https://github.com/onejs/one.git",
@@ -15,8 +15,9 @@ export interface AudioPlaybackStatus {
15
15
  // with either field set, play prepares the item and seeks before any sound,
16
16
  // resolving once it is ready at the position.
17
17
  export interface AudioPlayOptions {
18
- positionMs?: number
18
+ // keep paused first to avoid a Swift C++ interop padding mismatch on iOS.
19
19
  paused?: boolean
20
+ positionMs?: number
20
21
  }
21
22
 
22
23
  export interface AudioRecordingStatus {
@@ -20,6 +20,19 @@ export function matchDynamicName(name: string): DynamicNameMatch | undefined {
20
20
  }
21
21
  }
22
22
 
23
+ export function changesDynamicRoute(
24
+ name: string,
25
+ current: object | undefined,
26
+ target: object | undefined
27
+ ): boolean {
28
+ const currentParams = current as Record<string, unknown> | undefined
29
+ const targetParams = target as Record<string, unknown> | undefined
30
+ return name.split('/').some((segment) => {
31
+ const match = matchDynamicName(segment)
32
+ return match != null && currentParams?.[match.name] !== targetParams?.[match.name]
33
+ })
34
+ }
35
+
23
36
  /**
24
37
  * Match a route pattern against a URL path, segment-by-segment, as a prefix.
25
38
  *
@@ -0,0 +1,61 @@
1
+ import { StackRouter } from '@react-navigation/routers'
2
+ import { describe, expect, it } from 'vitest'
3
+ import { getNativeStackReplaceAction } from './getNativeStackReplaceAction'
4
+
5
+ describe('native stack replace', () => {
6
+ it('replaces a nested dynamic screen without losing the screen beneath it', () => {
7
+ const state = {
8
+ stale: false as const,
9
+ type: 'stack' as const,
10
+ key: 'hymn-stack',
11
+ index: 1,
12
+ routeNames: ['index', 'hymns/[number]'],
13
+ routes: [
14
+ { name: 'index', key: 'index-key' },
15
+ { name: 'hymns/[number]', key: 'hymn-key', params: { number: '8' } },
16
+ ],
17
+ retainedRouteKeys: [],
18
+ }
19
+ const desired = { routes: [{ name: 'hymns/[number]', params: { number: '100' } }] }
20
+ const action = getNativeStackReplaceAction(desired, state)
21
+
22
+ expect(action).toMatchObject({
23
+ type: 'REPLACE',
24
+ source: 'hymn-key',
25
+ target: 'hymn-stack',
26
+ payload: { name: 'hymns/[number]', params: { number: '100' } },
27
+ })
28
+ const next = StackRouter({}).getStateForAction(state, action!, {
29
+ routeNames: state.routeNames,
30
+ routeParamList: {},
31
+ routeGetIdList: {},
32
+ })
33
+ expect(next?.routes.map((route) => route.name)).toEqual(['index', 'hymns/[number]'])
34
+ expect(next?.routes[1].params).toEqual({ number: '100' })
35
+ })
36
+
37
+ it('keeps the changed dynamic parent when the screen contains a nested navigator', () => {
38
+ const state = {
39
+ stale: false as const,
40
+ type: 'stack',
41
+ key: 'outer',
42
+ index: 0,
43
+ routeNames: ['teams/[team]'],
44
+ routes: [{
45
+ name: 'teams/[team]',
46
+ key: 'team-key',
47
+ params: { team: 'old' },
48
+ state: { stale: false as const, type: 'stack', key: 'inner', index: 0, routeNames: ['index'], routes: [{ name: 'index', key: 'child' }] },
49
+ }],
50
+ retainedRouteKeys: [],
51
+ }
52
+ const desired = { routes: [{ name: 'teams/[team]', params: { team: 'new' }, state: { routes: [{ name: 'index' }] } }] }
53
+
54
+ expect(getNativeStackReplaceAction(desired, state)).toMatchObject({
55
+ type: 'REPLACE',
56
+ target: 'outer',
57
+ source: 'team-key',
58
+ payload: { name: 'teams/[team]', params: { team: 'new', screen: 'index' } },
59
+ })
60
+ })
61
+ })
@@ -1,7 +1,7 @@
1
1
  import type { NavigationState } from '@react-navigation/core'
2
2
  import { StackActions } from '@react-navigation/native'
3
3
  import type { OneRouter } from '../../interfaces/router'
4
- import { matchDynamicName, matchGroupName } from '../matchers'
4
+ import { changesDynamicRoute, matchGroupName } from '../matchers'
5
5
  import { getNavigateAction } from './getNavigateAction'
6
6
 
7
7
  export function getNativeStackReplaceAction(
@@ -20,11 +20,9 @@ export function getNativeStackReplaceAction(
20
20
  return null
21
21
  }
22
22
 
23
- const dynamicMatch = matchDynamicName(targetRoute.name)
24
23
  const changesDynamicScreen =
25
24
  currentRoute.name === targetRoute.name &&
26
- dynamicMatch &&
27
- currentRoute.params?.[dynamicMatch.name] !== targetRoute.params?.[dynamicMatch.name]
25
+ changesDynamicRoute(targetRoute.name, currentRoute.params, targetRoute.params)
28
26
 
29
27
  // a new dynamic screen instance can own a nested navigator of its own.
30
28
  if (!currentRoute.state || !targetRoute.state || changesDynamicScreen) {
@@ -2,7 +2,7 @@ import type { NavigationState, PartialRoute } from '@react-navigation/core'
2
2
  import { nanoid } from 'nanoid/non-secure'
3
3
  import type { OneRouter } from '../../interfaces/router'
4
4
  import { setLastAction } from '../lastAction'
5
- import { matchDynamicName } from '../matchers'
5
+ import { changesDynamicRoute } from '../matchers'
6
6
 
7
7
  /**
8
8
  * Generates a navigation action to transition from the current state to the desired state.
@@ -40,16 +40,12 @@ export function getNavigateAction(
40
40
  const childState = actionStateRoute.state
41
41
  const nextNavigationState = stateRoute.state
42
42
 
43
- const dynamicMatch = matchDynamicName(actionStateRoute.name)
44
-
45
43
  const didActionAndCurrentStateDiverge =
46
44
  actionStateRoute.name !== stateRoute.name ||
47
45
  // !deepEqual(actionStateRoute.params, stateRoute.params) ||
48
46
  !childState ||
49
47
  !nextNavigationState ||
50
- (dynamicMatch &&
51
- actionStateRoute.params?.[dynamicMatch.name] !==
52
- stateRoute.params?.[dynamicMatch.name])
48
+ changesDynamicRoute(actionStateRoute.name, stateRoute.params, actionStateRoute.params)
53
49
 
54
50
  if (didActionAndCurrentStateDiverge) {
55
51
  break
@@ -10,8 +10,8 @@ export interface AudioPlaybackStatus {
10
10
  error?: string;
11
11
  }
12
12
  export interface AudioPlayOptions {
13
- positionMs?: number;
14
13
  paused?: boolean;
14
+ positionMs?: number;
15
15
  }
16
16
  export interface AudioRecordingStatus {
17
17
  state: AudioRecordingState;
@@ -1 +1 @@
1
- {"version":3,"file":"OneAudio.nitro.d.ts","sourceRoot":"","sources":["../../../src/platform/specs/OneAudio.nitro.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OneAudio.nitro.d.ts","sourceRoot":"","sources":["../../../src/platform/specs/OneAudio.nitro.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ export interface DynamicNameMatch {
5
5
  }
6
6
  /** Match `[page]` -> `{ name: 'page', deep: false }` or `[...page]` -> `{ name: 'page', deep: true }` */
7
7
  export declare function matchDynamicName(name: string): DynamicNameMatch | undefined;
8
+ export declare function changesDynamicRoute(name: string, current: object | undefined, target: object | undefined): boolean;
8
9
  /**
9
10
  * Match a route pattern against a URL path, segment-by-segment, as a prefix.
10
11
  *
@@ -1 +1 @@
1
- {"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../../src/router/matchers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAKxC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,OAAO,CAAA;CACd;AAED,yGAAyG;AACzG,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAS3E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACX;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAkChC;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,yBAAyB;AACzB,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,sBAE/C;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQlD;AAED,0CAA0C;AAC1C,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAGD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU/D;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,WAMxC;AASD,MAAM,WAAW,wBAAwB;IACvC,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAA;IACZ,yCAAyC;IACzC,UAAU,EAAE,GAAG,CAAC,eAAe,GAAG,KAAK,CAAA;CACxC;AAED,6EAA6E;AAC7E,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,GACX,GAAG,CAAC,eAAe,GAAG,KAAK,GAAG,SAAS,CAKzC;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,GACX,wBAAwB,GAAG,SAAS,CAOtC;AASD,qDAAqD;AACrD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE9D;AAED,oDAAoD;AACpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,MAAM,WAAW,cAAc;IAC7B,wEAAwE;IACxE,MAAM,EAAE,MAAM,CAAA;IACd,6DAA6D;IAC7D,UAAU,EAAE,MAAM,CAAA;IAClB,wDAAwD;IACxD,eAAe,EAAE,MAAM,CAAA;CACxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAiBhF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAG5D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK9D"}
1
+ {"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../../src/router/matchers.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"getNativeStackReplaceAction.d.ts","sourceRoot":"","sources":["../../../src/router/utils/getNativeStackReplaceAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,SAAS,CAAC,WAAW,EAClC,eAAe,EAAE,eAAe;;;;;;;;SA8CjC"}
1
+ {"version":3,"file":"getNativeStackReplaceAction.d.ts","sourceRoot":"","sources":["../../../src/router/utils/getNativeStackReplaceAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,SAAS,CAAC,WAAW,EAClC,eAAe,EAAE,eAAe;;;;;;;;SA4CjC"}
@@ -1 +1 @@
1
- {"version":3,"file":"getNavigateAction.d.ts","sourceRoot":"","sources":["../../../src/router/utils/getNavigateAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgB,MAAM,wBAAwB,CAAA;AAE3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD;;GAEG;AACH,wBAAgB,iBAAiB;AAC/B,oBAAoB;AACpB,WAAW,EAAE,SAAS,CAAC,WAAW,EAClC,eAAe,EAAE,eAAe,EAChC,IAAI,SAAa;;;;QA2Gb,GAAG;QACH,IAAI;QACJ,MAAM;;EAGX"}
1
+ {"version":3,"file":"getNavigateAction.d.ts","sourceRoot":"","sources":["../../../src/router/utils/getNavigateAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgB,MAAM,wBAAwB,CAAA;AAE3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAIxD;;GAEG;AACH,wBAAgB,iBAAiB;AAC/B,oBAAoB;AACpB,WAAW,EAAE,SAAS,CAAC,WAAW,EAClC,eAAe,EAAE,eAAe,EAChC,IAAI,SAAa;;;;QAuGb,GAAG;QACH,IAAI;QACJ,MAAM;;EAGX"}