one 1.1.390 → 1.1.391
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.
- package/dist/cjs/Root.cjs +6 -17
- package/dist/cjs/Root.js +9 -13
- package/dist/cjs/Root.js.map +1 -1
- package/dist/cjs/Root.native.js +4 -12
- package/dist/cjs/Root.native.js.map +1 -1
- package/dist/cjs/fork/NavigationContainer.cjs +49 -31
- package/dist/cjs/fork/NavigationContainer.js +40 -21
- package/dist/cjs/fork/NavigationContainer.js.map +2 -2
- package/dist/cjs/fork/NavigationContainer.native.js +51 -29
- package/dist/cjs/fork/NavigationContainer.native.js.map +2 -2
- package/dist/cjs/fork/createMemoryHistory.cjs +4 -3
- package/dist/cjs/fork/createMemoryHistory.js +3 -2
- package/dist/cjs/fork/createMemoryHistory.js.map +1 -1
- package/dist/cjs/fork/createMemoryHistory.native.js +8 -4
- package/dist/cjs/fork/createMemoryHistory.native.js.map +2 -2
- package/dist/cjs/fork/extractPathFromURL.cjs +48 -28
- package/dist/cjs/fork/extractPathFromURL.js +44 -21
- package/dist/cjs/fork/extractPathFromURL.js.map +2 -2
- package/dist/cjs/fork/extractPathFromURL.native.js +58 -26
- package/dist/cjs/fork/extractPathFromURL.native.js.map +2 -2
- package/dist/cjs/fork/findFocusedRoute.js.map +1 -1
- package/dist/cjs/fork/findFocusedRoute.native.js.map +1 -1
- package/dist/cjs/fork/getPathFromState-mods.cjs +65 -0
- package/dist/cjs/fork/getPathFromState-mods.js +56 -0
- package/dist/cjs/fork/getPathFromState-mods.js.map +6 -0
- package/dist/cjs/fork/getPathFromState-mods.native.js +70 -0
- package/dist/cjs/fork/getPathFromState-mods.native.js.map +6 -0
- package/dist/cjs/fork/getPathFromState.cjs +75 -224
- package/dist/cjs/fork/getPathFromState.js +68 -223
- package/dist/cjs/fork/getPathFromState.js.map +2 -2
- package/dist/cjs/fork/getPathFromState.native.js +79 -261
- package/dist/cjs/fork/getPathFromState.native.js.map +2 -2
- package/dist/cjs/fork/getStateFromPath-mods.cjs +187 -0
- package/dist/cjs/fork/getStateFromPath-mods.js +199 -0
- package/dist/cjs/fork/getStateFromPath-mods.js.map +6 -0
- package/dist/cjs/fork/getStateFromPath-mods.native.js +284 -0
- package/dist/cjs/fork/getStateFromPath-mods.native.js.map +6 -0
- package/dist/cjs/fork/getStateFromPath.cjs +181 -263
- package/dist/cjs/fork/getStateFromPath.js +148 -264
- package/dist/cjs/fork/getStateFromPath.js.map +2 -2
- package/dist/cjs/fork/getStateFromPath.native.js +164 -304
- package/dist/cjs/fork/getStateFromPath.native.js.map +2 -2
- package/dist/cjs/fork/useBackButton.js.map +1 -1
- package/dist/cjs/fork/useBackButton.native.js.map +1 -1
- package/dist/cjs/fork/useDocumentTitle.js +4 -1
- package/dist/cjs/fork/useDocumentTitle.js.map +1 -1
- package/dist/cjs/fork/useDocumentTitle.native.js +1 -1
- package/dist/cjs/fork/useDocumentTitle.native.js.map +2 -2
- package/dist/cjs/fork/useLinking.cjs +21 -24
- package/dist/cjs/fork/useLinking.js +21 -25
- package/dist/cjs/fork/useLinking.js.map +2 -2
- package/dist/cjs/fork/useLinking.native.js +68 -66
- package/dist/cjs/fork/useLinking.native.js.map +2 -2
- package/dist/cjs/fork/useThenable.js.map +1 -1
- package/dist/cjs/fork/useThenable.native.js.map +1 -1
- package/dist/cjs/fork/validatePathConfig.cjs +32 -11
- package/dist/cjs/fork/validatePathConfig.js +41 -11
- package/dist/cjs/fork/validatePathConfig.js.map +1 -1
- package/dist/cjs/fork/validatePathConfig.native.js +47 -18
- package/dist/cjs/fork/validatePathConfig.native.js.map +2 -2
- package/dist/cjs/layouts/withLayoutContext.cjs +1 -1
- package/dist/cjs/layouts/withLayoutContext.js +1 -1
- package/dist/cjs/layouts/withLayoutContext.js.map +1 -1
- package/dist/cjs/layouts/withLayoutContext.native.js +1 -1
- package/dist/cjs/layouts/withLayoutContext.native.js.map +1 -1
- package/dist/cjs/link/linking.cjs +4 -4
- package/dist/cjs/link/linking.js +3 -3
- package/dist/cjs/link/linking.js.map +2 -2
- package/dist/cjs/link/linking.native.js +3 -3
- package/dist/cjs/link/linking.native.js.map +1 -1
- package/dist/cjs/link/useLinkTo.cjs +2 -2
- package/dist/cjs/link/useLinkTo.js +2 -2
- package/dist/cjs/link/useLinkTo.js.map +1 -1
- package/dist/cjs/link/useLinkTo.native.js +2 -2
- package/dist/cjs/link/useLinkTo.native.js.map +1 -1
- package/dist/cjs/router/getNormalizedStatePath.cjs +2 -2
- package/dist/cjs/router/getNormalizedStatePath.js +2 -2
- package/dist/cjs/router/getNormalizedStatePath.js.map +1 -1
- package/dist/cjs/router/getNormalizedStatePath.native.js +2 -2
- package/dist/cjs/router/getNormalizedStatePath.native.js.map +1 -1
- package/dist/cjs/router/router.cjs +19 -3
- package/dist/cjs/router/router.js +25 -3
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +39 -3
- package/dist/cjs/router/router.native.js.map +2 -2
- package/dist/esm/Root.js +6 -2
- package/dist/esm/Root.js.map +1 -1
- package/dist/esm/Root.mjs +1 -1
- package/dist/esm/Root.mjs.map +1 -1
- package/dist/esm/Root.native.js +1 -1
- package/dist/esm/Root.native.js.map +2 -2
- package/dist/esm/fork/NavigationContainer.js +43 -20
- package/dist/esm/fork/NavigationContainer.js.map +1 -1
- package/dist/esm/fork/NavigationContainer.mjs +42 -24
- package/dist/esm/fork/NavigationContainer.mjs.map +1 -1
- package/dist/esm/fork/NavigationContainer.native.js +44 -24
- package/dist/esm/fork/NavigationContainer.native.js.map +2 -2
- package/dist/esm/fork/createMemoryHistory.js +3 -2
- package/dist/esm/fork/createMemoryHistory.js.map +1 -1
- package/dist/esm/fork/createMemoryHistory.mjs +4 -3
- package/dist/esm/fork/createMemoryHistory.mjs.map +1 -1
- package/dist/esm/fork/createMemoryHistory.native.js +4 -4
- package/dist/esm/fork/createMemoryHistory.native.js.map +2 -2
- package/dist/esm/fork/extractPathFromURL.js +42 -11
- package/dist/esm/fork/extractPathFromURL.js.map +1 -1
- package/dist/esm/fork/extractPathFromURL.mjs +39 -11
- package/dist/esm/fork/extractPathFromURL.mjs.map +1 -1
- package/dist/esm/fork/extractPathFromURL.native.js +52 -15
- package/dist/esm/fork/extractPathFromURL.native.js.map +2 -2
- package/dist/esm/fork/findFocusedRoute.js.map +1 -1
- package/dist/esm/fork/findFocusedRoute.mjs.map +1 -1
- package/dist/esm/fork/findFocusedRoute.native.js.map +1 -1
- package/dist/esm/fork/getPathFromState-mods.js +40 -0
- package/dist/esm/fork/getPathFromState-mods.js.map +6 -0
- package/dist/esm/fork/getPathFromState-mods.mjs +40 -0
- package/dist/esm/fork/getPathFromState-mods.mjs.map +1 -0
- package/dist/esm/fork/getPathFromState-mods.native.js +47 -0
- package/dist/esm/fork/getPathFromState-mods.native.js.map +6 -0
- package/dist/esm/fork/getPathFromState.js +71 -228
- package/dist/esm/fork/getPathFromState.js.map +2 -2
- package/dist/esm/fork/getPathFromState.mjs +73 -221
- package/dist/esm/fork/getPathFromState.mjs.map +1 -1
- package/dist/esm/fork/getPathFromState.native.js +79 -260
- package/dist/esm/fork/getPathFromState.native.js.map +2 -2
- package/dist/esm/fork/getStateFromPath-mods.js +176 -0
- package/dist/esm/fork/getStateFromPath-mods.js.map +6 -0
- package/dist/esm/fork/getStateFromPath-mods.mjs +143 -0
- package/dist/esm/fork/getStateFromPath-mods.mjs.map +1 -0
- package/dist/esm/fork/getStateFromPath-mods.native.js +246 -0
- package/dist/esm/fork/getStateFromPath-mods.native.js.map +6 -0
- package/dist/esm/fork/getStateFromPath.js +160 -265
- package/dist/esm/fork/getStateFromPath.js.map +2 -2
- package/dist/esm/fork/getStateFromPath.mjs +181 -260
- package/dist/esm/fork/getStateFromPath.mjs.map +1 -1
- package/dist/esm/fork/getStateFromPath.native.js +164 -302
- package/dist/esm/fork/getStateFromPath.native.js.map +2 -2
- package/dist/esm/fork/useBackButton.js.map +1 -1
- package/dist/esm/fork/useBackButton.mjs.map +1 -1
- package/dist/esm/fork/useBackButton.native.js.map +1 -1
- package/dist/esm/fork/useDocumentTitle.js +4 -1
- package/dist/esm/fork/useDocumentTitle.js.map +1 -1
- package/dist/esm/fork/useDocumentTitle.mjs.map +1 -1
- package/dist/esm/fork/useDocumentTitle.native.js +1 -1
- package/dist/esm/fork/useDocumentTitle.native.js.map +2 -2
- package/dist/esm/fork/useLinking.js +22 -26
- package/dist/esm/fork/useLinking.js.map +1 -1
- package/dist/esm/fork/useLinking.mjs +20 -23
- package/dist/esm/fork/useLinking.mjs.map +1 -1
- package/dist/esm/fork/useLinking.native.js +65 -67
- package/dist/esm/fork/useLinking.native.js.map +2 -2
- package/dist/esm/fork/useThenable.js.map +1 -1
- package/dist/esm/fork/useThenable.mjs.map +1 -1
- package/dist/esm/fork/useThenable.native.js.map +1 -1
- package/dist/esm/fork/validatePathConfig.js +41 -11
- package/dist/esm/fork/validatePathConfig.js.map +1 -1
- package/dist/esm/fork/validatePathConfig.mjs +32 -11
- package/dist/esm/fork/validatePathConfig.mjs.map +1 -1
- package/dist/esm/fork/validatePathConfig.native.js +43 -18
- package/dist/esm/fork/validatePathConfig.native.js.map +2 -2
- package/dist/esm/layouts/withLayoutContext.js +1 -1
- package/dist/esm/layouts/withLayoutContext.js.map +1 -1
- package/dist/esm/layouts/withLayoutContext.mjs +1 -1
- package/dist/esm/layouts/withLayoutContext.mjs.map +1 -1
- package/dist/esm/layouts/withLayoutContext.native.js +1 -1
- package/dist/esm/layouts/withLayoutContext.native.js.map +1 -1
- package/dist/esm/link/linking.js +2 -2
- package/dist/esm/link/linking.js.map +1 -1
- package/dist/esm/link/linking.mjs +2 -2
- package/dist/esm/link/linking.mjs.map +1 -1
- package/dist/esm/link/linking.native.js +2 -2
- package/dist/esm/link/linking.native.js.map +1 -1
- package/dist/esm/link/useLinkTo.js +1 -1
- package/dist/esm/link/useLinkTo.mjs +1 -1
- package/dist/esm/link/useLinkTo.native.js +1 -1
- package/dist/esm/router/getNormalizedStatePath.js +1 -1
- package/dist/esm/router/getNormalizedStatePath.mjs +1 -1
- package/dist/esm/router/getNormalizedStatePath.native.js +1 -1
- package/dist/esm/router/router.js +24 -2
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +18 -2
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +38 -2
- package/dist/esm/router/router.native.js.map +2 -2
- package/package.json +8 -9
- package/src/Root.tsx +6 -2
- package/src/fork/NavigationContainer.tsx +101 -39
- package/src/fork/createMemoryHistory.tsx +15 -13
- package/src/fork/extractPathFromURL.ts +85 -40
- package/src/fork/findFocusedRoute.tsx +9 -1
- package/src/fork/getPathFromState-mods.ts +142 -0
- package/src/fork/getPathFromState.ts +244 -501
- package/src/fork/getStateFromPath-mods.ts +400 -0
- package/src/fork/getStateFromPath.ts +447 -538
- package/src/fork/useBackButton.native.tsx +16 -2
- package/src/fork/useBackButton.tsx +11 -2
- package/src/fork/useDocumentTitle.native.tsx +9 -4
- package/src/fork/useDocumentTitle.tsx +12 -7
- package/src/fork/useLinking.native.ts +71 -63
- package/src/fork/useLinking.ts +75 -40
- package/src/fork/useThenable.tsx +7 -1
- package/src/fork/validatePathConfig.ts +64 -12
- package/src/layouts/withLayoutContext.tsx +1 -1
- package/src/link/linking.ts +2 -2
- package/src/link/useLinkTo.tsx +1 -1
- package/src/router/getNormalizedStatePath.tsx +1 -1
- package/src/router/router.ts +41 -2
- package/types/Root.d.ts.map +1 -1
- package/types/fork/NavigationContainer.d.ts +19 -8
- package/types/fork/NavigationContainer.d.ts.map +1 -1
- package/types/fork/createMemoryHistory.d.ts +10 -1
- package/types/fork/createMemoryHistory.d.ts.map +1 -1
- package/types/fork/extractPathFromURL.d.ts +7 -1
- package/types/fork/extractPathFromURL.d.ts.map +1 -1
- package/types/fork/findFocusedRoute.d.ts +9 -0
- package/types/fork/findFocusedRoute.d.ts.map +1 -1
- package/types/fork/getPathFromState-mods.d.ts +23 -0
- package/types/fork/getPathFromState-mods.d.ts.map +1 -0
- package/types/fork/getPathFromState.d.ts +15 -14
- package/types/fork/getPathFromState.d.ts.map +1 -1
- package/types/fork/getStateFromPath-mods.d.ts +58 -0
- package/types/fork/getStateFromPath-mods.d.ts.map +1 -0
- package/types/fork/getStateFromPath.d.ts +28 -29
- package/types/fork/getStateFromPath.d.ts.map +1 -1
- package/types/fork/useBackButton.d.ts +6 -0
- package/types/fork/useBackButton.d.ts.map +1 -1
- package/types/fork/useBackButton.native.d.ts +9 -1
- package/types/fork/useBackButton.native.d.ts.map +1 -1
- package/types/fork/useDocumentTitle.d.ts +8 -6
- package/types/fork/useDocumentTitle.d.ts.map +1 -1
- package/types/fork/useDocumentTitle.native.d.ts +5 -2
- package/types/fork/useDocumentTitle.native.d.ts.map +1 -1
- package/types/fork/useLinking.d.ts +8 -1
- package/types/fork/useLinking.d.ts.map +1 -1
- package/types/fork/useLinking.native.d.ts +9 -2
- package/types/fork/useLinking.native.d.ts.map +1 -1
- package/types/fork/useThenable.d.ts +6 -0
- package/types/fork/useThenable.d.ts.map +1 -1
- package/types/fork/validatePathConfig.d.ts +8 -1
- package/types/fork/validatePathConfig.d.ts.map +1 -1
- package/types/link/linking.d.ts +2 -2
- package/types/link/linking.d.ts.map +1 -1
@@ -14,237 +14,82 @@ var __export = (target, all) => {
|
|
14
14
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
15
15
|
var getPathFromState_exports = {};
|
16
16
|
__export(getPathFromState_exports, {
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
getPathDataFromState: () => getPathDataFromState
|
17
|
+
default: () => getPathFromState_default,
|
18
|
+
getPathDataFromState: () => getPathDataFromState,
|
19
|
+
getPathFromState: () => getPathFromState
|
21
20
|
});
|
22
21
|
module.exports = __toCommonJS(getPathFromState_exports);
|
23
|
-
var
|
24
|
-
const
|
22
|
+
var import_getPathFromState_mods = require("./getPathFromState-mods"), import_validatePathConfig = require("./validatePathConfig");
|
23
|
+
const getActiveRoute = (state) => {
|
25
24
|
const route = typeof state.index == "number" ? state.routes[state.index] : state.routes[state.routes.length - 1];
|
26
|
-
return route.state ? getActiveRoute(route.state) : route
|
25
|
+
return route.state ? getActiveRoute(route.state) : route;
|
26
|
+
}, cachedNormalizedConfigs = /* @__PURE__ */ new WeakMap(), getNormalizedConfigs = (options) => {
|
27
|
+
if (!options?.screens) return {};
|
28
|
+
const cached = cachedNormalizedConfigs.get(options?.screens);
|
29
|
+
if (cached) return cached;
|
30
|
+
const normalizedConfigs = createNormalizedConfigs(options.screens);
|
31
|
+
return cachedNormalizedConfigs.set(options.screens, normalizedConfigs), normalizedConfigs;
|
27
32
|
};
|
28
|
-
function
|
29
|
-
return
|
30
|
-
stale: !1,
|
31
|
-
type: "UNKNOWN",
|
32
|
-
key: "UNKNOWN",
|
33
|
-
index: 0,
|
34
|
-
routeNames: [],
|
35
|
-
routes: [
|
36
|
-
{
|
37
|
-
key: "UNKNOWN",
|
38
|
-
name: params.screen,
|
39
|
-
params: params.params,
|
40
|
-
path: params.path
|
41
|
-
}
|
42
|
-
]
|
43
|
-
};
|
44
|
-
}
|
45
|
-
function segmentMatchesConvention(segment) {
|
46
|
-
return segment === "index" || (0, import_matchers.matchDynamicName)(segment) != null || (0, import_matchers.matchGroupName)(segment) != null || (0, import_matchers.matchDeepDynamicRouteName)(segment) != null;
|
33
|
+
function getPathFromState(state, options) {
|
34
|
+
return getPathDataFromState(state, options).path;
|
47
35
|
}
|
48
|
-
function
|
49
|
-
return encodeURIComponent(str).replace(/%5B/g, "[").replace(/%5D/g, "]");
|
50
|
-
}
|
51
|
-
function getPathFromState(state, _options) {
|
52
|
-
return getPathDataFromState(state, _options).path;
|
53
|
-
}
|
54
|
-
function getPathDataFromState(state, _options = { screens: DEFAULT_SCREENS }) {
|
36
|
+
function getPathDataFromState(state, options) {
|
55
37
|
if (state == null)
|
56
38
|
throw Error("Got 'undefined' for the navigation state. You must pass a valid state object.");
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
return getPathFromResolvedState(
|
61
|
-
state,
|
62
|
-
// Create a normalized configs object which will be easier to use
|
63
|
-
createNormalizedConfigs(options.screens),
|
64
|
-
{ preserveGroups, preserveDynamicRoutes }
|
65
|
-
);
|
66
|
-
}
|
67
|
-
function processParamsWithUserSettings(configItem, params) {
|
68
|
-
const stringify = configItem?.stringify;
|
69
|
-
return Object.fromEntries(
|
70
|
-
Object.entries(params).map(([key, value]) => [
|
71
|
-
key,
|
72
|
-
// TODO: Strip nullish values here.
|
73
|
-
stringify?.[key] ? stringify[key](value) : (
|
74
|
-
// Preserve rest params
|
75
|
-
Array.isArray(value) ? value : String(value)
|
76
|
-
)
|
77
|
-
])
|
78
|
-
);
|
79
|
-
}
|
80
|
-
function deepEqual(a, b) {
|
81
|
-
if (a === b)
|
82
|
-
return !0;
|
83
|
-
if (Array.isArray(a) && Array.isArray(b)) {
|
84
|
-
if (a.length !== b.length)
|
85
|
-
return !1;
|
86
|
-
for (let i = 0; i < a.length; i++)
|
87
|
-
if (!deepEqual(a[i], b[i]))
|
88
|
-
return !1;
|
89
|
-
return !0;
|
90
|
-
}
|
91
|
-
if (typeof a == "object" && typeof b == "object") {
|
92
|
-
const keysA = Object.keys(a), keysB = Object.keys(b);
|
93
|
-
if (keysA.length !== keysB.length)
|
94
|
-
return !1;
|
95
|
-
for (const key of keysA)
|
96
|
-
if (!deepEqual(a[key], b[key]))
|
97
|
-
return !1;
|
98
|
-
return !0;
|
99
|
-
}
|
100
|
-
return !1;
|
101
|
-
}
|
102
|
-
function walkConfigItems(route, focusedRoute, configs, {
|
103
|
-
preserveDynamicRoutes
|
104
|
-
}) {
|
105
|
-
!route.state && isInvalidParams(route.params);
|
106
|
-
let pattern = null, focusedParams, hash;
|
107
|
-
const collectedParams = {};
|
108
|
-
for (; route.name in configs; ) {
|
109
|
-
const configItem = configs[route.name], inputPattern = configItem.pattern;
|
110
|
-
if (inputPattern == null)
|
111
|
-
throw new Error("Unexpected: No pattern found for route " + route.name);
|
112
|
-
if (pattern = inputPattern, route.params) {
|
113
|
-
route.params["#"] && (hash = route.params["#"], delete route.params["#"]);
|
114
|
-
const params = processParamsWithUserSettings(configItem, route.params);
|
115
|
-
pattern != null && Object.assign(collectedParams, params), deepEqual(focusedRoute, route) && (preserveDynamicRoutes ? focusedParams = params : focusedParams = getParamsWithConventionsCollapsed({
|
116
|
-
params,
|
117
|
-
pattern,
|
118
|
-
routeName: route.name
|
119
|
-
}));
|
120
|
-
}
|
121
|
-
if (!route.state && isInvalidParams(route.params), !configItem.screens || route.state === void 0) {
|
122
|
-
configItem.initialRouteName && configItem.screens && configItem.initialRouteName in configItem.screens && configItem.screens[configItem.initialRouteName]?.pattern && (pattern = configItem.screens[configItem.initialRouteName].pattern, focusedParams && (preserveDynamicRoutes || (focusedParams = getParamsWithConventionsCollapsed({
|
123
|
-
params: focusedParams,
|
124
|
-
pattern,
|
125
|
-
routeName: route.name
|
126
|
-
}))));
|
127
|
-
break;
|
128
|
-
}
|
129
|
-
const index = route.state.index ?? route.state.routes.length - 1, nextRoute = route.state.routes[index], nestedScreens = configItem.screens;
|
130
|
-
if (nestedScreens && nextRoute.name in nestedScreens)
|
131
|
-
route = nextRoute, configs = nestedScreens;
|
132
|
-
else
|
133
|
-
break;
|
134
|
-
}
|
135
|
-
if (pattern == null)
|
136
|
-
throw new Error(
|
137
|
-
`No pattern found for route "${route.name}". Options are: ${Object.keys(configs).join(", ")}.`
|
138
|
-
);
|
139
|
-
return pattern && !focusedParams && focusedRoute.params && (preserveDynamicRoutes ? focusedParams = focusedRoute.params : focusedParams = getParamsWithConventionsCollapsed({
|
140
|
-
params: focusedRoute.params,
|
141
|
-
pattern,
|
142
|
-
routeName: route.name
|
143
|
-
}), focusedParams = {
|
144
|
-
...focusedParams,
|
145
|
-
...collectedParams
|
146
|
-
}), {
|
147
|
-
pattern,
|
148
|
-
nextRoute: route,
|
149
|
-
focusedParams,
|
150
|
-
hash,
|
151
|
-
params: collectedParams
|
152
|
-
};
|
153
|
-
}
|
154
|
-
function getPathFromResolvedState(state, configs, {
|
155
|
-
preserveGroups,
|
156
|
-
preserveDynamicRoutes
|
157
|
-
}) {
|
158
|
-
let path = "", current = state, hash;
|
39
|
+
options && (0, import_validatePathConfig.validatePathConfig)(options);
|
40
|
+
const configs = getNormalizedConfigs(options);
|
41
|
+
let path = "/", current = state;
|
159
42
|
const allParams = {};
|
160
43
|
for (; current; ) {
|
161
|
-
|
162
|
-
const
|
163
|
-
|
164
|
-
const
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
for (const param in focusedParams)
|
189
|
-
focusedParams[param] === "undefined" && delete focusedParams[param];
|
190
|
-
const query = new URLSearchParams(focusedParams).toString();
|
191
|
-
query && (path += `?${query}`);
|
44
|
+
let index = typeof current.index == "number" ? current.index : 0, route = current.routes[index], pattern, focusedParams;
|
45
|
+
const focusedRoute = getActiveRoute(state);
|
46
|
+
let currentOptions = configs;
|
47
|
+
const nestedRouteNames = [];
|
48
|
+
let hasNext = !0;
|
49
|
+
for (; route.name in currentOptions && hasNext; ) {
|
50
|
+
if (pattern = currentOptions[route.name].pattern, nestedRouteNames.push(route.name), route.params) {
|
51
|
+
const stringify = currentOptions[route.name]?.stringify, currentParams = Object.fromEntries(
|
52
|
+
Object.entries(route.params).flatMap(([key, value]) => key === "screen" || key === "params" ? [] : [
|
53
|
+
[
|
54
|
+
key,
|
55
|
+
stringify?.[key] ? stringify[key](value) : Array.isArray(value) ? value.map(String) : String(value)
|
56
|
+
]
|
57
|
+
])
|
58
|
+
);
|
59
|
+
Object.assign(allParams, currentParams), focusedRoute === route && (focusedParams = { ...currentParams }, pattern?.split("/").filter((p) => p.startsWith(":")).forEach((p) => {
|
60
|
+
const name = getParamName(p);
|
61
|
+
focusedParams && delete focusedParams[name];
|
62
|
+
}));
|
63
|
+
}
|
64
|
+
if (!currentOptions[route.name].screens || route.state === void 0) {
|
65
|
+
const screens = currentOptions[route.name].screens, screen = route.params && "screen" in route.params ? route.params.screen?.toString() : screens ? Object.keys(screens)[0] : void 0;
|
66
|
+
screen && screens && currentOptions[route.name].screens?.[screen] ? (route = { ...screens[screen], name: screen, key: screen }, currentOptions = screens) : hasNext = !1;
|
67
|
+
} else {
|
68
|
+
index = typeof route.state.index == "number" ? route.state.index : route.state.routes.length - 1;
|
69
|
+
const nextRoute = route.state.routes[index], nestedConfig = currentOptions[route.name].screens;
|
70
|
+
nestedConfig && nextRoute.name in nestedConfig ? (route = nextRoute, currentOptions = nestedConfig) : hasNext = !1;
|
192
71
|
}
|
193
|
-
break;
|
194
72
|
}
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
73
|
+
if (currentOptions[route.name] !== void 0 ? (pattern === void 0 && (pattern = nestedRouteNames.join("/")), path += (0, import_getPathFromState_mods.getPathWithConventionsCollapsed)({
|
74
|
+
...options,
|
75
|
+
pattern,
|
76
|
+
route,
|
77
|
+
params: allParams,
|
78
|
+
initialRouteName: configs[route.name]?.initialRouteName
|
79
|
+
})) : route.name.startsWith("+") || (path += encodeURIComponent(route.name)), focusedParams || (focusedParams = focusedRoute.params), route.state)
|
80
|
+
path += "/";
|
81
|
+
else if (focusedParams) {
|
82
|
+
for (const param in focusedParams)
|
83
|
+
focusedParams[param] === "undefined" && delete focusedParams[param];
|
84
|
+
delete focusedParams["#"];
|
85
|
+
const query = new URLSearchParams(focusedParams).toString();
|
86
|
+
query && (path += `?${query}`);
|
207
87
|
}
|
208
|
-
|
209
|
-
}
|
210
|
-
function getPathWithConventionsCollapsed({
|
211
|
-
pattern,
|
212
|
-
routePath,
|
213
|
-
params,
|
214
|
-
preserveGroups,
|
215
|
-
preserveDynamicRoutes,
|
216
|
-
initialRouteName
|
217
|
-
}) {
|
218
|
-
const segments = pattern.split("/");
|
219
|
-
return segments.map((p, i) => {
|
220
|
-
const name = getParamName(p);
|
221
|
-
return p.startsWith("*") ? preserveDynamicRoutes ? name === "not-found" ? "+not-found" : `[...${name}]` : params[name] ? Array.isArray(params[name]) ? params[name].join("/") : params[name] : i === 0 ? routePath : routePath?.split("/").slice(i + 1).join("/") : p.startsWith(":") ? preserveDynamicRoutes ? `[${name}]` : params[name] : !preserveGroups && (0, import_matchers.matchGroupName)(p) != null ? segments.length - 1 === i && initialRouteName ? segmentMatchesConvention(initialRouteName) ? "" : encodeURIComponentPreservingBrackets(initialRouteName) : "" : encodeURIComponentPreservingBrackets(p);
|
222
|
-
}).map((v) => v ?? "").join("/");
|
223
|
-
}
|
224
|
-
function getParamsWithConventionsCollapsed({
|
225
|
-
pattern,
|
226
|
-
routeName,
|
227
|
-
params
|
228
|
-
}) {
|
229
|
-
const processedParams = { ...params }, segments = pattern.split("/");
|
230
|
-
if (segments.filter((segment) => segment.startsWith(":")).forEach((segment) => {
|
231
|
-
const name = getParamName(segment);
|
232
|
-
delete processedParams[name];
|
233
|
-
}), segments.some((segment) => segment.startsWith("*"))) {
|
234
|
-
const name = (0, import_matchers.testNotFound)(routeName) ? "not-found" : (0, import_matchers.matchDeepDynamicRouteName)(routeName) ?? routeName;
|
235
|
-
delete processedParams[name];
|
88
|
+
current = route.state;
|
236
89
|
}
|
237
|
-
return
|
90
|
+
return path = path.replace(/\/+/g, "/"), path = path.length > 1 ? path.replace(/\/$/, "") : path, options?.path && (path = joinPaths(options.path, path)), path = (0, import_getPathFromState_mods.appendBaseUrl)(path), allParams["#"] && (path += `#${allParams["#"]}`), { path, params: allParams };
|
238
91
|
}
|
239
|
-
|
240
|
-
const simplifiedPath = path.replace(/\/+/g, "/");
|
241
|
-
return simplifiedPath.length <= 1 ? simplifiedPath : simplifiedPath.replace(/\/$/, "");
|
242
|
-
}
|
243
|
-
function isInvalidParams(params) {
|
244
|
-
return params ? "params" in params && typeof params.params == "object" && params.params ? !0 : "initial" in params && typeof params.initial == "boolean" && // "path" in params &&
|
245
|
-
"screen" in params : !1;
|
246
|
-
}
|
247
|
-
const getParamName = (pattern) => pattern.replace(/^[:*]/, "").replace(/\?$/, ""), joinPaths = (...paths) => [].concat(...paths.map((p) => p.split("/"))).filter(Boolean).join("/"), createConfigItem = (config, parentPattern) => {
|
92
|
+
const getParamName = (pattern) => pattern.replace(/^:/, "").replace(/\?$/, ""), joinPaths = (...paths) => [].concat(...paths.map((p) => p.split("/"))).filter(Boolean).join("/"), createConfigItem = (config, parentPattern) => {
|
248
93
|
if (typeof config == "string")
|
249
94
|
return { pattern: parentPattern ? joinPaths(parentPattern, config) : config };
|
250
95
|
if (config.exact && config.path === void 0)
|
@@ -256,13 +101,13 @@ const getParamName = (pattern) => pattern.replace(/^[:*]/, "").replace(/\?$/, ""
|
|
256
101
|
// Normalize pattern to remove any leading, trailing slashes, duplicate slashes etc.
|
257
102
|
pattern: pattern?.split("/").filter(Boolean).join("/"),
|
258
103
|
stringify: config.stringify,
|
259
|
-
screens
|
260
|
-
initialRouteName: config.initialRouteName
|
104
|
+
screens
|
261
105
|
};
|
262
106
|
}, createNormalizedConfigs = (options, pattern) => Object.fromEntries(
|
263
|
-
Object.entries(options).map(([name, c]) =>
|
107
|
+
Object.entries(options).map(([name, c]) => {
|
108
|
+
const result = createConfigItem(c, pattern);
|
109
|
+
return [name, result];
|
110
|
+
})
|
264
111
|
);
|
265
|
-
|
266
|
-
return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
|
267
|
-
}
|
112
|
+
var getPathFromState_default = getPathFromState;
|
268
113
|
//# sourceMappingURL=getPathFromState.js.map
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/fork/getPathFromState.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
5
|
-
"names": [
|
4
|
+
"mappings": "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",
|
5
|
+
"names": []
|
6
6
|
}
|