one 1.2.19 → 1.2.21
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/createHandleRequest.cjs +10 -6
- package/dist/cjs/createHandleRequest.js +10 -6
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +11 -7
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/fork/NavigationContainer.cjs +1 -1
- package/dist/cjs/fork/NavigationContainer.js +4 -1
- package/dist/cjs/fork/NavigationContainer.js.map +1 -1
- package/dist/cjs/fork/NavigationContainer.native.js +1 -1
- package/dist/cjs/fork/NavigationContainer.native.js.map +1 -1
- package/dist/cjs/fork/createMemoryHistory.cjs +2 -2
- package/dist/cjs/fork/createMemoryHistory.js +2 -2
- package/dist/cjs/fork/createMemoryHistory.js.map +1 -1
- package/dist/cjs/fork/createMemoryHistory.native.js +2 -2
- package/dist/cjs/fork/createMemoryHistory.native.js.map +1 -1
- package/dist/cjs/fork/extractPathFromURL.cjs +1 -1
- package/dist/cjs/fork/extractPathFromURL.js +1 -1
- package/dist/cjs/fork/extractPathFromURL.js.map +1 -1
- package/dist/cjs/fork/extractPathFromURL.native.js +1 -1
- package/dist/cjs/fork/extractPathFromURL.native.js.map +1 -1
- package/dist/cjs/fork/getPathFromState-mods.cjs +1 -1
- package/dist/cjs/fork/getPathFromState-mods.js +1 -1
- package/dist/cjs/fork/getPathFromState-mods.js.map +1 -1
- package/dist/cjs/fork/getPathFromState-mods.native.js +1 -1
- package/dist/cjs/fork/getPathFromState-mods.native.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath-mods.cjs +20 -19
- package/dist/cjs/fork/getStateFromPath-mods.js +18 -15
- package/dist/cjs/fork/getStateFromPath-mods.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath-mods.native.js +19 -18
- package/dist/cjs/fork/getStateFromPath-mods.native.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath.cjs +1 -1
- package/dist/cjs/fork/getStateFromPath.js +1 -1
- package/dist/cjs/fork/getStateFromPath.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath.native.js +1 -1
- package/dist/cjs/fork/getStateFromPath.native.js.map +1 -1
- package/dist/cjs/fork/useLinking.cjs +26 -19
- package/dist/cjs/fork/useLinking.js +31 -19
- package/dist/cjs/fork/useLinking.js.map +2 -2
- package/dist/cjs/fork/useLinking.native.js +2 -1
- package/dist/cjs/fork/useLinking.native.js.map +1 -1
- package/dist/cjs/getReactNavigationConfig.cjs +2 -4
- package/dist/cjs/getReactNavigationConfig.js +2 -5
- package/dist/cjs/getReactNavigationConfig.js.map +1 -1
- package/dist/cjs/getReactNavigationConfig.native.js +2 -4
- package/dist/cjs/getReactNavigationConfig.native.js.map +1 -1
- package/dist/cjs/hooks.cjs +1 -1
- package/dist/cjs/hooks.js +1 -1
- package/dist/cjs/hooks.js.map +1 -1
- package/dist/cjs/hooks.native.js +4 -1
- package/dist/cjs/hooks.native.js.map +1 -1
- package/dist/cjs/router/getRoutes.cjs +4 -5
- package/dist/cjs/router/getRoutes.js +2 -2
- package/dist/cjs/router/getRoutes.js.map +1 -1
- package/dist/cjs/router/getRoutes.native.js +4 -5
- package/dist/cjs/router/getRoutes.native.js.map +1 -1
- package/dist/cjs/router/matchers.cjs +9 -1
- package/dist/cjs/router/matchers.js +4 -1
- package/dist/cjs/router/matchers.js.map +1 -1
- package/dist/cjs/router/matchers.native.js +10 -2
- package/dist/cjs/router/matchers.native.js.map +1 -1
- package/dist/cjs/router/matchers.test.cjs +7 -1
- package/dist/cjs/router/matchers.test.js +1 -1
- package/dist/cjs/router/matchers.test.js.map +1 -1
- package/dist/cjs/router/matchers.test.native.js +7 -1
- package/dist/cjs/router/matchers.test.native.js.map +1 -1
- package/dist/cjs/router/router.cjs +35 -5
- package/dist/cjs/router/router.js +26 -5
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +32 -5
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/router/utils/getNavigateAction.cjs +2 -2
- package/dist/cjs/router/utils/getNavigateAction.js +2 -2
- package/dist/cjs/router/utils/getNavigateAction.js.map +1 -1
- package/dist/cjs/router/utils/getNavigateAction.native.js +2 -2
- package/dist/cjs/router/utils/getNavigateAction.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +4 -3
- package/dist/cjs/server/oneServe.js +12 -4
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +5 -4
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/setup.native.js.map +1 -6
- package/dist/cjs/vite/one.cjs +9 -12
- package/dist/cjs/vite/one.js +7 -7
- package/dist/cjs/vite/one.js.map +1 -1
- package/dist/cjs/vite/one.native.js +10 -15
- package/dist/cjs/vite/one.native.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +12 -7
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +11 -7
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +12 -7
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/dist/esm/createHandleRequest.js +10 -6
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +10 -6
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +10 -6
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/fork/NavigationContainer.js +4 -1
- package/dist/esm/fork/NavigationContainer.js.map +1 -1
- package/dist/esm/fork/NavigationContainer.mjs +1 -1
- package/dist/esm/fork/NavigationContainer.mjs.map +1 -1
- package/dist/esm/fork/NavigationContainer.native.js +1 -1
- package/dist/esm/fork/NavigationContainer.native.js.map +1 -1
- package/dist/esm/fork/createMemoryHistory.js +2 -2
- package/dist/esm/fork/createMemoryHistory.js.map +1 -1
- package/dist/esm/fork/createMemoryHistory.mjs +2 -2
- package/dist/esm/fork/createMemoryHistory.mjs.map +1 -1
- package/dist/esm/fork/createMemoryHistory.native.js +2 -2
- package/dist/esm/fork/createMemoryHistory.native.js.map +1 -1
- package/dist/esm/fork/extractPathFromURL.js +1 -1
- package/dist/esm/fork/extractPathFromURL.js.map +1 -1
- package/dist/esm/fork/extractPathFromURL.mjs +1 -1
- package/dist/esm/fork/extractPathFromURL.mjs.map +1 -1
- package/dist/esm/fork/extractPathFromURL.native.js +1 -1
- package/dist/esm/fork/extractPathFromURL.native.js.map +1 -1
- package/dist/esm/fork/getPathFromState-mods.js +2 -2
- package/dist/esm/fork/getPathFromState-mods.js.map +1 -1
- package/dist/esm/fork/getPathFromState-mods.mjs +2 -2
- package/dist/esm/fork/getPathFromState-mods.mjs.map +1 -1
- package/dist/esm/fork/getPathFromState-mods.native.js +2 -2
- package/dist/esm/fork/getPathFromState-mods.native.js.map +1 -1
- package/dist/esm/fork/getStateFromPath-mods.js +18 -15
- package/dist/esm/fork/getStateFromPath-mods.js.map +1 -1
- package/dist/esm/fork/getStateFromPath-mods.mjs +20 -19
- package/dist/esm/fork/getStateFromPath-mods.mjs.map +1 -1
- package/dist/esm/fork/getStateFromPath-mods.native.js +19 -18
- package/dist/esm/fork/getStateFromPath-mods.native.js.map +1 -1
- package/dist/esm/fork/getStateFromPath.js +1 -1
- package/dist/esm/fork/getStateFromPath.js.map +1 -1
- package/dist/esm/fork/getStateFromPath.mjs +1 -1
- package/dist/esm/fork/getStateFromPath.mjs.map +1 -1
- package/dist/esm/fork/getStateFromPath.native.js +1 -1
- package/dist/esm/fork/useLinking.js +31 -18
- package/dist/esm/fork/useLinking.js.map +1 -1
- package/dist/esm/fork/useLinking.mjs +26 -19
- package/dist/esm/fork/useLinking.mjs.map +1 -1
- package/dist/esm/fork/useLinking.native.js +2 -1
- package/dist/esm/fork/useLinking.native.js.map +1 -1
- package/dist/esm/getReactNavigationConfig.js +3 -6
- package/dist/esm/getReactNavigationConfig.js.map +1 -1
- package/dist/esm/getReactNavigationConfig.mjs +3 -5
- package/dist/esm/getReactNavigationConfig.mjs.map +1 -1
- package/dist/esm/getReactNavigationConfig.native.js +3 -5
- package/dist/esm/getReactNavigationConfig.native.js.map +1 -1
- package/dist/esm/hooks.js +1 -1
- package/dist/esm/hooks.js.map +1 -1
- package/dist/esm/hooks.mjs +1 -1
- package/dist/esm/hooks.mjs.map +1 -1
- package/dist/esm/hooks.native.js +4 -1
- package/dist/esm/hooks.native.js.map +1 -1
- package/dist/esm/router/getRoutes.js +2 -3
- package/dist/esm/router/getRoutes.js.map +1 -1
- package/dist/esm/router/getRoutes.mjs +5 -6
- package/dist/esm/router/getRoutes.mjs.map +1 -1
- package/dist/esm/router/getRoutes.native.js +5 -6
- package/dist/esm/router/getRoutes.native.js.map +1 -1
- package/dist/esm/router/matchers.js +4 -1
- package/dist/esm/router/matchers.js.map +1 -1
- package/dist/esm/router/matchers.mjs +9 -1
- package/dist/esm/router/matchers.mjs.map +1 -1
- package/dist/esm/router/matchers.native.js +10 -2
- package/dist/esm/router/matchers.native.js.map +1 -1
- package/dist/esm/router/matchers.test.js +1 -1
- package/dist/esm/router/matchers.test.js.map +1 -1
- package/dist/esm/router/matchers.test.mjs +7 -1
- package/dist/esm/router/matchers.test.mjs.map +1 -1
- package/dist/esm/router/matchers.test.native.js +7 -1
- package/dist/esm/router/matchers.test.native.js.map +1 -1
- package/dist/esm/router/router.js +26 -5
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +35 -5
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +32 -5
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/router/utils/getNavigateAction.js +2 -2
- package/dist/esm/router/utils/getNavigateAction.js.map +1 -1
- package/dist/esm/router/utils/getNavigateAction.mjs +2 -2
- package/dist/esm/router/utils/getNavigateAction.mjs.map +1 -1
- package/dist/esm/router/utils/getNavigateAction.native.js +2 -2
- package/dist/esm/router/utils/getNavigateAction.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +12 -4
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +4 -3
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +4 -3
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/vite/one.js +9 -9
- package/dist/esm/vite/one.js.map +1 -1
- package/dist/esm/vite/one.mjs +9 -12
- package/dist/esm/vite/one.mjs.map +1 -1
- package/dist/esm/vite/one.native.js +10 -15
- package/dist/esm/vite/one.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +11 -7
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +12 -7
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +12 -7
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/package.json +10 -10
- package/src/createHandleRequest.ts +34 -0
- package/src/fork/NavigationContainer.tsx +8 -0
- package/src/fork/createMemoryHistory.tsx +8 -0
- package/src/fork/extractPathFromURL.ts +6 -0
- package/src/fork/getPathFromState-mods.ts +2 -7
- package/src/fork/getStateFromPath-mods.ts +43 -17
- package/src/fork/getStateFromPath.ts +1 -1
- package/src/fork/useLinking.native.ts +1 -1
- package/src/fork/useLinking.ts +80 -5
- package/src/getReactNavigationConfig.ts +7 -9
- package/src/hooks.tsx +21 -19
- package/src/router/getRoutes.ts +3 -6
- package/src/router/matchers.test.ts +2 -2
- package/src/router/matchers.ts +22 -6
- package/src/router/router.ts +45 -0
- package/src/router/utils/getNavigateAction.ts +3 -2
- package/src/server/oneServe.ts +13 -0
- package/src/vite/one.ts +9 -13
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +17 -5
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/fork/NavigationContainer.d.ts.map +1 -1
- package/types/fork/createMemoryHistory.d.ts.map +1 -1
- package/types/fork/extractPathFromURL.d.ts.map +1 -1
- package/types/fork/getStateFromPath-mods.d.ts +7 -10
- package/types/fork/getStateFromPath-mods.d.ts.map +1 -1
- package/types/fork/useLinking.d.ts.map +1 -1
- package/types/getReactNavigationConfig.d.ts.map +1 -1
- package/types/hooks.d.ts.map +1 -1
- package/types/router/getRoutes.d.ts.map +1 -1
- package/types/router/matchers.d.ts +10 -3
- package/types/router/matchers.d.ts.map +1 -1
- package/types/router/router.d.ts.map +1 -1
- package/types/router/utils/getNavigateAction.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/vite/one.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
|
@@ -46,7 +46,7 @@ function createMemoryHistory() {
|
|
|
46
46
|
path,
|
|
47
47
|
state,
|
|
48
48
|
id
|
|
49
|
-
}), index = items.length - 1, window.history.pushState({
|
|
49
|
+
}), index = items.length - 1, process.env.ONE_DEBUG_ROUTER && console.info(`[one] \u{1F4DC} history.push path=${path}`), window.history.pushState({
|
|
50
50
|
id
|
|
51
51
|
}, "", path);
|
|
52
52
|
},
|
|
@@ -71,7 +71,7 @@ function createMemoryHistory() {
|
|
|
71
71
|
path,
|
|
72
72
|
state,
|
|
73
73
|
id
|
|
74
|
-
}), window.history.replaceState({
|
|
74
|
+
}), process.env.ONE_DEBUG_ROUTER && console.info(`[one] \u{1F4DC} history.replace path=${pathWithHash}`), window.history.replaceState({
|
|
75
75
|
id
|
|
76
76
|
}, "", pathWithHash);
|
|
77
77
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","_window_history_state","id","window","state","index1","findIndex","item","get","index2","backIndex","param","path","i","push","slice","length","pushState","replace","_window_history_state_id","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document"],"sources":["../../../src/fork/createMemoryHistory.tsx"],"sourcesContent":[null],"mappings":"AAWA,SAASA,MAAA,QAAc;AAWhB,SAASC,oBAAA,EAAsB;EACpC,IAAIC,KAAA,GAAQ;IACRC,KAAA,GAAyB,EAAC;IAAAC,OAAA;IAAAC,SAAA,YAAAA,CAAA;MAI9BD,OAAM,CAAAE,OAAoE,WAEpEC,EAAA;QAIJ,IAAAC,EAAQ,GAAAD,EAAA,CAAAC,EAAQ;QACdD,EAAA,CAAAC,EAAA,GAAM,YAAQ;UACd,OAAQA,EAAA,GAAM;QACf;MACH;
|
|
1
|
+
{"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","_window_history_state","id","window","state","index1","findIndex","item","get","index2","backIndex","param","path","i","push","slice","length","process","env","ONE_DEBUG_ROUTER","console","info","pushState","replace","_window_history_state_id","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document"],"sources":["../../../src/fork/createMemoryHistory.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -36,7 +36,7 @@ function fromDeepLink(url) {
|
|
|
36
36
|
try {
|
|
37
37
|
res = new URL(url);
|
|
38
38
|
} catch {
|
|
39
|
-
return url.replace(/^[^:]+:\/\//, "");
|
|
39
|
+
return url.startsWith("/") ? url : url.replace(/^[^:]+:\/\//, "");
|
|
40
40
|
}
|
|
41
41
|
if (isExpoDevelopmentClient(res)) {
|
|
42
42
|
if (!res.searchParams.get("url"))
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/fork/extractPathFromURL.ts"],
|
|
4
|
-
"mappings": "AAAO,SAAS,iCAAiC,KAG/C;AAKA,QAAM,UADO,wBAAwB,GAAG,EACnB,MAAM,gBAAgB;AAC3C,SAAO;AAAA,IACL,UAAU,UAAU,CAAC,KAAK;AAAA,IAC1B,aAAa,UAAU,CAAC,KAAK;AAAA,EAC/B;AACF;AAEO,SAAS,wBAAwB,KAAqB;AAG3D,SAAO,IAAI,MAAM,yBAAyB,IAAI,CAAC,KAAK;AACtD;AAGA,SAAS,wBAAwB,KAAqB;AACpD;AAAA;AAAA;AAAA,IAGE,IAAI,MAAM,cAAc;AAAA,IACxB;AACA,UAAM,EAAE,QAAQ,MAAM,SAAS,IAAI,IAAI,IAAI,GAAG;AAE9C,WAAI,aAAa,cAAc,aAAa,eAGnC,KAGF,KAAK,QAAQ,QAAQ,EAAE;AAAA,EAChC;AAKA,MAHiB,OAAO,WAAW,OAAS,OAAe,WAAW,MAAM,SAAS;AAAA;AAAA,EAOnF,IAAI,MAAM,eAAe,GACzB;AACA,UAAM,WAAW,wBAAwB,GAAG;AAC5C,QAAI;AACF,aAAO,aAAa,SAAS,QAAQ;AAGvC,UAAM,cAAc,IAAI,MAAM,oBAAoB,IAAI,CAAC;AACvD,WAAI,cACK,aAAa,UAAU,WAAW,IAGpC;AAAA,EACT;AAIA,SAAO,aAAa,GAAG;AACzB;AAGA,SAAS,wBAAwB,KAAmB;AAClD,SAAO,IAAI,aAAa;AAC1B;AAEA,SAAS,aAAa,KAAqB;AACzC,MAAI;AACJ,MAAI;AAGF,UAAM,IAAI,IAAI,GAAG;AAAA,EACnB,QAAQ;
|
|
4
|
+
"mappings": "AAAO,SAAS,iCAAiC,KAG/C;AAKA,QAAM,UADO,wBAAwB,GAAG,EACnB,MAAM,gBAAgB;AAC3C,SAAO;AAAA,IACL,UAAU,UAAU,CAAC,KAAK;AAAA,IAC1B,aAAa,UAAU,CAAC,KAAK;AAAA,EAC/B;AACF;AAEO,SAAS,wBAAwB,KAAqB;AAG3D,SAAO,IAAI,MAAM,yBAAyB,IAAI,CAAC,KAAK;AACtD;AAGA,SAAS,wBAAwB,KAAqB;AACpD;AAAA;AAAA;AAAA,IAGE,IAAI,MAAM,cAAc;AAAA,IACxB;AACA,UAAM,EAAE,QAAQ,MAAM,SAAS,IAAI,IAAI,IAAI,GAAG;AAE9C,WAAI,aAAa,cAAc,aAAa,eAGnC,KAGF,KAAK,QAAQ,QAAQ,EAAE;AAAA,EAChC;AAKA,MAHiB,OAAO,WAAW,OAAS,OAAe,WAAW,MAAM,SAAS;AAAA;AAAA,EAOnF,IAAI,MAAM,eAAe,GACzB;AACA,UAAM,WAAW,wBAAwB,GAAG;AAC5C,QAAI;AACF,aAAO,aAAa,SAAS,QAAQ;AAGvC,UAAM,cAAc,IAAI,MAAM,oBAAoB,IAAI,CAAC;AACvD,WAAI,cACK,aAAa,UAAU,WAAW,IAGpC;AAAA,EACT;AAIA,SAAO,aAAa,GAAG;AACzB;AAGA,SAAS,wBAAwB,KAAmB;AAClD,SAAO,IAAI,aAAa;AAC1B;AAEA,SAAS,aAAa,KAAqB;AACzC,MAAI;AACJ,MAAI;AAGF,UAAM,IAAI,IAAI,GAAG;AAAA,EACnB,QAAQ;AASN,WAAI,IAAI,WAAW,GAAG,IACb,MAOF,IAAI,QAAQ,eAAe,EAAE;AAAA,EACtC;AAEA,MAAI,wBAAwB,GAAG,GAAG;AAChC,QAAI,CAAC,IAAI,aAAa,IAAI,KAAK;AAC7B,aAAO;AAET,UAAM,cAAc,IAAI,aAAa,IAAI,KAAK;AAC9C,WAAO,wBAAwB,UAAU,WAAW,CAAC;AAAA,EACvD;AAEA,MAAI,UAAU;AAEd,EAAI,IAAI,SACN,WAAW,IAAI,OAGb,IAAI,aACN,WAAW,IAAI;AAGjB,QAAM,KAAM,IAAI;AAAA;AAAA,IAGZ,CAAC,GAAG,IAAI,aAAa,QAAQ,CAAC,EAC3B,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,mBAAmB,CAAC,CAAC,EAAE,EAC/C,KAAK,GAAG;AAAA,MAJX;AAMJ,SAAI,OACF,WAAW,MAAM,KAGZ;AACT;AAEO,SAAS,uBAAuB,WAAqB,MAAM,IAAI;AACpE,SACE,wBAAwB,GAAG,EAExB,QAAQ,OAAO,EAAE;AAExB;AAEO,SAAS,eAAe,KAAqD;AAClF,SAAI,IAAI,aAAa,cAAc,IAAI,aAAa,eAE3C,IAAI,SAAS,MAAM,GAAG,EAAE,MAAM,CAAC,EAAE,KAAK,GAAG,IAE3C,IAAI;AACb;AAEO,MAAM,qBAAqB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -39,7 +39,7 @@ function fromDeepLink(url) {
|
|
|
39
39
|
try {
|
|
40
40
|
res = new URL(url);
|
|
41
41
|
} catch {
|
|
42
|
-
return url.replace(/^[^:]+:\/\//, "");
|
|
42
|
+
return url.startsWith("/") ? url : url.replace(/^[^:]+:\/\//, "");
|
|
43
43
|
}
|
|
44
44
|
if (isExpoDevelopmentClient(res)) {
|
|
45
45
|
if (!res.searchParams.get("url")) return "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["parsePathAndParamsFromExpoGoLink","url","results","parsePathFromExpoGoLink","match","pathname","queryString","extractExactPathFromURL","origin","href","hostname","URL","replace","globalThis","expo","modules","ExpoGo","fromDeepLink","queryParams","isExpoDevelopmentClient","res","searchParams","get","incomingUrl","decodeURI","host","qs","search","entries","map","k","v","decodeURIComponent","join","extractExpoPathFromURL","_prefixes","adjustPathname","split","slice","extractPathFromURL"],"sources":["../../../src/fork/extractPathFromURL.ts"],"sourcesContent":[null],"mappings":"AAAO,SAASA,iCAAiCC,GAAA,EAG/C;EAKA,MAAMC,OAAA,GADOC,uBAAA,CAAwBF,GAAG,EACnBG,KAAA,CAAM,gBAAgB;EAC3C,OAAO;IACLC,QAAA,EAAUH,OAAA,GAAU,CAAC,KAAK;IAC1BI,WAAA,EAAaJ,OAAA,GAAU,CAAC,KAAK;EAC/B;AACF;AAEO,SAASC,wBAAwBF,GAAA,EAAqB;EAG3D,OAAOA,GAAA,CAAIG,KAAA,CAAM,yBAAyB,IAAI,CAAC,KAAK;AACtD;AAGA,SAASG,wBAAwBN,GAAA,EAAqB;EACpD;EAAA;EAAA;EAGEA,GAAA,CAAIG,KAAA,CAAM,cAAc,GACxB;IACA,MAAM;MAAEI,MAAA;MAAQC,IAAA;MAAMC;IAAS,IAAI,IAAIC,GAAA,CAAIV,GAAG;IAE9C,OAAIS,QAAA,KAAa,cAAcA,QAAA,KAAa,eAGnC,KAGFD,IAAA,CAAKG,OAAA,CAAQJ,MAAA,EAAQ,EAAE;EAChC;EAKA,IAHiB,OAAOK,UAAA,CAAWC,IAAA,GAAS,OAAeD,UAAA,CAAWC,IAAA,EAAMC,OAAA,EAASC,MAAA;EAAA;EAAA;EAOnFf,GAAA,CAAIG,KAAA,CAAM,eAAe,GACzB;IACA,MAAMC,QAAA,GAAWF,uBAAA,CAAwBF,GAAG;IAC5C,IAAII,QAAA,EACF,OAAOY,YAAA,CAAa,SAASZ,QAAQ;IAGvC,MAAMa,WAAA,GAAcjB,GAAA,CAAIG,KAAA,CAAM,oBAAoB,IAAI,CAAC;IACvD,OAAIc,WAAA,GACKD,YAAA,CAAa,UAAUC,WAAW,IAGpC;EACT;EAIA,OAAOD,YAAA,CAAahB,GAAG;AACzB;AAGA,SAASkB,wBAAwBlB,GAAA,EAAmB;EAClD,OAAOA,GAAA,CAAIS,QAAA,KAAa;AAC1B;AAEA,SAASO,aAAahB,GAAA,EAAqB;EACzC,IAAImB,GAAA;EACJ,IAAI;IAGFA,GAAA,GAAM,IAAIT,GAAA,CAAIV,GAAG;EACnB,QAAQ;
|
|
1
|
+
{"version":3,"names":["parsePathAndParamsFromExpoGoLink","url","results","parsePathFromExpoGoLink","match","pathname","queryString","extractExactPathFromURL","origin","href","hostname","URL","replace","globalThis","expo","modules","ExpoGo","fromDeepLink","queryParams","isExpoDevelopmentClient","res","startsWith","searchParams","get","incomingUrl","decodeURI","host","qs","search","entries","map","k","v","decodeURIComponent","join","extractExpoPathFromURL","_prefixes","adjustPathname","split","slice","extractPathFromURL"],"sources":["../../../src/fork/extractPathFromURL.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -46,7 +46,7 @@ function fromDeepLink(url) {
|
|
|
46
46
|
try {
|
|
47
47
|
res = new URL(url);
|
|
48
48
|
} catch {
|
|
49
|
-
return url.replace(/^[^:]+:\/\//, "");
|
|
49
|
+
return url.startsWith("/") ? url : url.replace(/^[^:]+:\/\//, "");
|
|
50
50
|
}
|
|
51
51
|
if (isExpoDevelopmentClient(res)) {
|
|
52
52
|
if (!res.searchParams.get("url")) return "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["parsePathAndParamsFromExpoGoLink","url","href","parsePathFromExpoGoLink","results","match","_results_","_results_1","pathname","queryString","_url_match","_url_match_","extractExactPathFromURL","_globalThis_expo_modules","_globalThis_expo","origin","hostname","URL","replace","isExpoGo","globalThis","expo","modules","ExpoGo","fromDeepLink","queryParams","isExpoDevelopmentClient","res","searchParams","get","incomingUrl","decodeURI","host","qs","search","entries","map","param","k","v","decodeURIComponent","join"],"sources":["../../../src/fork/extractPathFromURL.ts"],"sourcesContent":[null],"mappings":"AAAO,SAASA,iCAAiCC,GAAA,EAG/C;EAKA,IAAAC,IAAM,GAAAC,uBADO,CAAAF,GAAA;IAAwBG,OAChB,GAAMF,IAAA,CAAAG,KAAA,iBAAgB;IAAAC,SAAA;IAAAC,UAAA;EAC3C,OAAO;IACLC,QAAA,EAAU,CAAAF,SAAU,GAACF,OAAK,mBAAAE,SAAA,cAAAA,SAAA;IAC1BG,WAAA,EAAa,CAAAF,UAAW,GAAAH,OAAK,mBAAAG,UAAA,cAAAA,UAAA;EAC/B;AACF;AAEO,SAASJ,wBAAwBF,GAAA,EAAqB;EAG3D,IAAAS,UAAW,EAAAC,WAAM;EACnB,QAAAA,WAAA,IAAAD,UAAA,GAAAT,GAAA,CAAAI,KAAA,yCAAAK,UAAA,uBAAAA,UAAA,iBAAAC,WAAA,cAAAA,WAAA;AAGA;AACE,SAAAC,wBAAAX,GAAA;EAAA,IAAAY,wBAAA,EAAAC,gBAAA;EAAA;EAGE;EACA;EACAb,GAAA,CAAAI,KAAQ,eAAc,GAEtB;IAOF;MAAAU,MAAA;MAAAb,IAAA;MAAAc;IAAA,QAAAC,GAAA,CAAAhB,GAAA;IAKA,OAHiBe,QAAO,KAAW,UAAS,IAAeA,QAAA,KAAW,YAAM,GAAS,KAAAd,IAAA,CAAAgB,OAAA,CAAAH,MAAA;EAAA;EAOnF,IAAII,QAAM,UAAAC,UACV,CAAAC,IAAA,YAAAP,gBAAA,GAAAM,UAAA,CAAAC,IAAA,cAAAP,gBAAA,gBAAAD,wBAAA,GAAAC,gBAAA,CAAAQ,OAAA,cAAAT,wBAAA,uBAAAA,wBAAA,CAAAU,MAAA;EACA,IAAAJ,QAAM;EAAA;EACN;EACElB,GAAA,CAAAI,KAAA,gBAAoB;IAGtB,IAAAK,UAAM;MAAAF,QAAkB,GAAAL,uBAA0B,CAAAF,GAAI,CAAC;IACvD,IAAAO,QAAI,EAKN,OAAAgB,YAAA,UAAAhB,QAAA;IAIA,IAAAiB,WAAO,GAAa,CAAAf,UAAG,GAAAT,GAAA,CAAAI,KAAA,oCAAAK,UAAA,uBAAAA,UAAA;IACzB,OAAAe,WAAA,GAAAD,YAAA,WAAAC,WAAA;EAGA;EACE,OAAOD,YAAI,CAAAvB,GAAA,CAAa;AAC1B;AAEA,SAASyB,uBAAkCA,CAAAzB,GAAA;EACzC,OAAIA,GAAA,CAAAe,QAAA;AACJ;AAGE,SAAAQ,YAAiBA,CAAAvB,GAAA;EACnB,IAAA0B,GAAA;
|
|
1
|
+
{"version":3,"names":["parsePathAndParamsFromExpoGoLink","url","href","parsePathFromExpoGoLink","results","match","_results_","_results_1","pathname","queryString","_url_match","_url_match_","extractExactPathFromURL","_globalThis_expo_modules","_globalThis_expo","origin","hostname","URL","replace","isExpoGo","globalThis","expo","modules","ExpoGo","fromDeepLink","queryParams","isExpoDevelopmentClient","res","startsWith","searchParams","get","incomingUrl","decodeURI","host","qs","search","entries","map","param","k","v","decodeURIComponent","join"],"sources":["../../../src/fork/extractPathFromURL.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { matchDynamicName, matchGroupName } from "../router/matchers";
|
|
2
2
|
import { getParamName } from "./_shared";
|
|
3
3
|
function getPathWithConventionsCollapsed({
|
|
4
4
|
pattern,
|
|
@@ -30,7 +30,7 @@ function appendBaseUrl(path, baseUrl = process.env.EXPO_BASE_URL) {
|
|
|
30
30
|
return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
|
|
31
31
|
}
|
|
32
32
|
function segmentMatchesConvention(segment) {
|
|
33
|
-
return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null
|
|
33
|
+
return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null;
|
|
34
34
|
}
|
|
35
35
|
function encodeURISegment(str, { preserveBrackets = !1 } = {}) {
|
|
36
36
|
return str = String(str).replace(/[^A-Za-z0-9\-._~!$&'()*+,;=:@]/g, (char) => encodeURIComponent(char)), preserveBrackets && (str = str.replace(/%5B/g, "[").replace(/%5D/g, "]")), str;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/fork/getPathFromState-mods.ts"],
|
|
4
|
-
"mappings": "AAQA,SAAS,
|
|
4
|
+
"mappings": "AAQA,SAAS,kBAAkB,sBAAsB;AACjD,SAAS,oBAAoB;AAatB,SAAS,gCAAgC;AAAA,EAC9C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,yBAAyB;AAAA,EACzB;AACF,GAKG;AACD,QAAM,WAAW,QAAQ,MAAM,GAAG;AAClC,SAAO,SACJ,IAAI,CAAC,GAAG,MAAM;AACb,UAAM,OAAO,aAAa,CAAC;AAK3B,QAAI,EAAE,WAAW,GAAG;AAClB,aAAI,wBACE,SAAS,cACJ,eAGF,OAAO,IAAI,MAGhB,OAAO,IAAI,IACT,MAAM,QAAQ,OAAO,IAAI,CAAC,IACrB,OAAO,IAAI,EAAE,KAAK,GAAG,IAEvB,OAAO,IAAI,IAGhB,MAAM,KAAK,WAAW,GAAG,KAAK,MAAM,KAAK,SAAS,GAAG,IAChD,KAGL,MAAM,IAED,QAGL,MAAM,eACD,KAKF,MAAM,MACT,MAAM,GAAG,EACV,MAAM,IAAI,CAAC,EACX,KAAK,GAAG;AAIb,QAAI,EAAE,WAAW,GAAG,GAAG;AACrB,UAAI;AACF,eAAO,IAAI,IAAI;AAGjB,YAAM,QAAQ,OAAO,IAAI;AACzB,aAAI,UAAU,UAAa,EAAE,SAAS,GAAG,IACvC,UAIM,yBAAyB,iBAAiB,KAAK,IAAI,UAAU;AAAA,IACvE;AAEA,WAAI,CAAC,kBAAkB,eAAe,CAAC,KAAK,OAItC,SAAS,SAAS,MAAM,KACtB,mBAEE,yBAAyB,gBAAgB,IACpC,KAGF,yBACH,qCAAqC,gBAAgB,IACrD,mBAGD,KAGF,yBAAyB,qCAAqC,CAAC,IAAI;AAAA,EAC5E,CAAC,EACA,IAAI,CAAC,MAAM,KAAK,EAAE,EAClB,KAAK,GAAG;AACb;AAEA,SAAS,qCAAqC,KAAa;AACzD,SAAO,mBAAmB,GAAG,EAAE,QAAQ,QAAQ,GAAG,EAAE,QAAQ,QAAQ,GAAG;AACzE;AAEO,SAAS,cACd,MACA,UAA8B,QAAQ,IAAI,eAC1C;AACA,SAAI,QAAQ,IAAI,aAAa,iBACvB,UACK,IAAI,QAAQ,QAAQ,QAAQ,EAAE,EAAE,QAAQ,OAAO,EAAE,CAAC,GAAG,IAAI,KAG7D;AACT;AAEA,SAAS,yBAAyB,SAA0B;AAC1D,SAAO,YAAY,WAAW,iBAAiB,OAAO,KAAK,QAAQ,eAAe,OAAO,KAAK;AAChG;AAEA,SAAS,iBAAiB,KAAa,EAAE,mBAAmB,GAAM,IAAI,CAAC,GAAG;AAGxE,eAAM,OAAO,GAAG,EAAE,QAAQ,mCAAmC,CAAC,SAAS,mBAAmB,IAAI,CAAC,GAE3F,qBAEF,MAAM,IAAI,QAAQ,QAAQ,GAAG,EAAE,QAAQ,QAAQ,GAAG,IAE7C;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { matchDynamicName, matchGroupName } from "../router/matchers.mjs";
|
|
2
2
|
import { getParamName } from "./_shared.mjs";
|
|
3
3
|
function getPathWithConventionsCollapsed({
|
|
4
4
|
pattern,
|
|
@@ -28,7 +28,7 @@ function appendBaseUrl(path, baseUrl = process.env.EXPO_BASE_URL) {
|
|
|
28
28
|
return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
|
|
29
29
|
}
|
|
30
30
|
function segmentMatchesConvention(segment) {
|
|
31
|
-
return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null
|
|
31
|
+
return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null;
|
|
32
32
|
}
|
|
33
33
|
function encodeURISegment(str, {
|
|
34
34
|
preserveBrackets = !1
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["matchDynamicName","matchGroupName","getParamName","getPathWithConventionsCollapsed","pattern","route","params","preserveGroups","preserveDynamicRoutes","shouldEncodeURISegment","initialRouteName","segments","split","map","p","i","name","startsWith","Array","isArray","join","endsWith","slice","value","encodeURISegment","length","segmentMatchesConvention","encodeURIComponentPreservingBrackets","v","str","encodeURIComponent","replace","appendBaseUrl","path","baseUrl","process","env","EXPO_BASE_URL","NODE_ENV","segment","preserveBrackets","String","char"],"sources":["../../../src/fork/getPathFromState-mods.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { matchDynamicName, matchGroupName } from "../router/matchers.native.js";
|
|
2
2
|
import { getParamName } from "./_shared.native.js";
|
|
3
3
|
function getPathWithConventionsCollapsed(param) {
|
|
4
4
|
var {
|
|
@@ -37,7 +37,7 @@ function appendBaseUrl(path) {
|
|
|
37
37
|
return process.env.NODE_ENV !== "development" && baseUrl ? `/${baseUrl.replace(/^\/+/, "").replace(/\/$/, "")}${path}` : path;
|
|
38
38
|
}
|
|
39
39
|
function segmentMatchesConvention(segment) {
|
|
40
|
-
return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null
|
|
40
|
+
return segment === "index" || matchDynamicName(segment) != null || matchGroupName(segment) != null;
|
|
41
41
|
}
|
|
42
42
|
function encodeURISegment(str) {
|
|
43
43
|
var {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["matchDynamicName","matchGroupName","getParamName","getPathWithConventionsCollapsed","param","pattern","route","params","preserveGroups","preserveDynamicRoutes","shouldEncodeURISegment","initialRouteName","segments","split","map","p","i","name","startsWith","_route_name","Array","isArray","join","endsWith","slice","value","_ref","encodeURISegment","length","segmentMatchesConvention","encodeURIComponentPreservingBrackets","v","str","encodeURIComponent","replace","appendBaseUrl","path","baseUrl","arguments","process","env","EXPO_BASE_URL","NODE_ENV","segment","preserveBrackets","String","char"],"sources":["../../../src/fork/getPathFromState-mods.ts"],"sourcesContent":[null],"mappings":"AAQA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AACjD,SAASC,YAAA,QAAoB;AAatB,SAASC,gCAAgCC,KAAA;EAC9C;MAAAC,OAAA;MAAAC,KAAA;MAAAC,MAAA;MAAAC,cAAA;MAAAC,qBAAA;MAAAC,sBAAA;MAAAC;IAAA,IAAAP,KAAA;IAAAQ,QAAA,GAAAP,OAAA,CAAAQ,KAAA;EACA,OAAAD,QAAA,CAAAE,GAAA,WAAAC,CAAA,EAAAC,CAAA;IACA,IAAAC,IAAA,GAAAf,YAAA,CAAAa,CAAA;IACA,IAAAA,CAAA,CAAAG,UAAA;MACA,IAAAC,WAAA;MACA,OAAAV,qBAAyB,GAAAQ,IAAA,yCAAAA,IAAA,MAAAV,MAAA,CAAAU,IAAA,IAAAG,KAAA,CAAAC,OAAA,CAAAd,MAAA,CAAAU,IAAA,KAAAV,MAAA,CAAAU,IAAA,EAAAK,IAAA,QAAAf,MAAA,CAAAU,IAAA,IAAAX,KAAA,CAAAW,IAAA,CAAAC,UAAA,SAAAZ,KAAA,CAAAW,IAAA,CAAAM,QAAA,aAAAP,CAAA,SAAAV,KAAA,GAAAS,CAAA,0BAAAI,WAAA,GAAAb,KAAA,CAAAW,IAAA,cAAAE,WAAA,uBAAAA,WAAA,CAAAN,KAAA,MAAAW,KAAA,CAAAR,CAAA,MAAAM,IAAA;IACzB;IAMC,IAAAP,CAAA,CAAAG,UAAA;MACD,IAAMT,qBAAmB,EACzB,OAAO,IACJQ,IAAK,GAAG;MACP,IAAMQ,KAAA,GAAOlB,MAAA,CAAAU,IAAA,CAAa;MAK1B,IAAMQ,KAAA,UAAc,KAAAV,CAAA,CAAAQ,QAAA,OAClB;MAqCF,IAAMG,IAAA;MACJ,OAAI,CAAAA,IAAA,GAAAhB,sBAAA,GAAAiB,gBAAA,CAAAF,KAAA,IAAAA,KAAA,cAAAC,IAAA,cAAAA,IAAA;IACF;IAGF,QAAMlB,cAAQ,IAAOP,cAAI,CAAAc,CAAA,YAAAH,QAAA,CAAAgB,MAAA,SAAAZ,CAAA,IAAAL,gBAAA,GAAAkB,wBAAA,CAAAlB,gBAAA,SAAAD,sBAAA,GAAAoB,oCAAA,CAAAnB,gBAAA,IAAAA,gBAAA,QAAAD,sBAAA,GAAAoB,oCAAA,CAAAf,CAAA,IAAAA,CAAA;EACzB,GAAAD,GAAA,WAAIiB,CAAA;IAMN,OAAAA,CAAA;EAEA,GAAAT,IAAA,IAAK;AAmBqE;AAIhF,SAAAQ,qCAAAE,GAAA;EAEA,OAASC,kBAAA,CAAAD,GAAA,EAAAE,OAAA,OAAqC,KAAa,EAAAA,OAAA;AACzD;AACF,SAAAC,cAAAC,IAAA;EAEO,IAAAC,OAAS,GAAAC,SACd,CAAAV,MACA,QAA8BU,SAAQ,EAAI,eAC1CA,SAAA,MAAAC,OAAA,CAAAC,GAAA,CAAAC,aAAA;EACA,OAAIF,OAAA,CAAQC,GAAA,CAAIE,QAAA,KAAa,iBACvBL,OAAA,GACK,IAAIA,OAAA,CAAQH,OAAA,CAAQ,QAAQ,EAAE,EAAEA,OAAA,CAAQ,OAAO,EAAE,CAAC,GAAGE,IAAI,KAG7DA,IAAA;AACT;AAEA,SAASP,yBAAyBc,OAAA,EAA0B;EAC1D,OAAOA,OAAA,KAAY,WAAW3C,gBAAA,CAAiB2C,OAAO,KAAK,QAAQ1C,cAAA,CAAe0C,OAAO,KAAK;AAChG;AAEA,SAAShB,iBAAiBK,GAAA,EAAa;EAGrC;IAAAY,gBAAa,GAAK;EAAA,IAAAN,SAAQ,CAAAV,MAAA,QAAAU,SAAA,GAAmC,KAAC,KAAS,IAAAA,SAAA,MAAmB;EAO5F,OAAAN,GAAA,GAAAa,MAAA,CAAAb,GAAA,EAAAE,OAAA,8CAAAY,IAAA","ignoreList":[]}
|
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
import escape_ from "escape-string-regexp";
|
|
2
2
|
import { matchGroupName, stripGroupSegmentsFromPath } from "../router/matchers";
|
|
3
3
|
function getUrlWithReactNavigationConcessions(path, baseUrl = process.env.EXPO_BASE_URL) {
|
|
4
|
-
|
|
4
|
+
const pathWithoutGroups = stripGroupSegmentsFromPath(stripBaseUrl(path, baseUrl));
|
|
5
|
+
let pathname = "", hash = "";
|
|
5
6
|
try {
|
|
6
|
-
parsed = new URL(path, "
|
|
7
|
+
const parsed = new URL(path, "file:");
|
|
8
|
+
pathname = parsed.pathname, hash = parsed.hash;
|
|
7
9
|
} catch {
|
|
8
|
-
return {
|
|
9
|
-
path,
|
|
10
|
-
cleanUrl: "",
|
|
11
|
-
nonstandardPathname: "",
|
|
12
|
-
url: new URL("https://phony.example")
|
|
13
|
-
};
|
|
14
10
|
}
|
|
15
|
-
const
|
|
11
|
+
const withoutBaseUrl = stripBaseUrl(pathname, baseUrl);
|
|
16
12
|
return {
|
|
17
|
-
// The slashes are at the end, not the beginning
|
|
18
13
|
path,
|
|
14
|
+
// Make sure there is a trailing slash
|
|
15
|
+
// The slashes are at the end, not the beginning
|
|
19
16
|
nonstandardPathname: withoutBaseUrl.replace(/^\/+/g, "").replace(/\/+$/g, "") + "/",
|
|
20
|
-
|
|
17
|
+
hash,
|
|
21
18
|
pathWithoutGroups
|
|
22
19
|
};
|
|
23
20
|
}
|
|
@@ -61,6 +58,8 @@ function getRouteConfigSorter(previousSegments = []) {
|
|
|
61
58
|
return -1;
|
|
62
59
|
if (a.type !== "static" && b.type === "static")
|
|
63
60
|
return 1;
|
|
61
|
+
if (a.staticPartCount !== b.staticPartCount)
|
|
62
|
+
return b.staticPartCount - a.staticPartCount;
|
|
64
63
|
const similarToPreviousA = previousSegments.filter((value, index) => value === a.expandedRouteNames[index] && value.startsWith("(") && value.endsWith(")")), similarToPreviousB = previousSegments.filter((value, index) => value === b.expandedRouteNames[index] && value.startsWith("(") && value.endsWith(")"));
|
|
65
64
|
if ((similarToPreviousA.length > 0 || similarToPreviousB.length > 0) && similarToPreviousA.length !== similarToPreviousB.length)
|
|
66
65
|
return similarToPreviousB.length - similarToPreviousA.length;
|
|
@@ -122,22 +121,26 @@ function populateParams(routes, params) {
|
|
|
122
121
|
}
|
|
123
122
|
function createConfigItemAdditionalProperties(screen, pattern, routeNames, config = {}) {
|
|
124
123
|
const parts = [];
|
|
125
|
-
let isDynamic = !1;
|
|
124
|
+
let isDynamic = !1, staticPartCount = 0;
|
|
126
125
|
const isIndex = screen === "index" || screen.endsWith("/index");
|
|
127
126
|
for (const part of pattern.split("/"))
|
|
128
|
-
|
|
127
|
+
if (part) {
|
|
128
|
+
const isDynamicPart = part.startsWith(":") || part.startsWith("*") || part.includes("*not-found");
|
|
129
|
+
isDynamic ||= isDynamicPart, matchGroupName(part) || (parts.push(part), isDynamicPart || staticPartCount++);
|
|
130
|
+
}
|
|
129
131
|
const hasChildren = config.screens ? !!Object.keys(config.screens)?.length : !1, type = hasChildren ? "layout" : isDynamic ? "dynamic" : "static";
|
|
130
|
-
return isIndex && parts.push("index"), {
|
|
132
|
+
return isIndex && (parts.push("index"), staticPartCount++), {
|
|
131
133
|
type,
|
|
132
134
|
isIndex,
|
|
133
135
|
hasChildren,
|
|
134
136
|
parts,
|
|
137
|
+
staticPartCount,
|
|
135
138
|
userReadableName: [...routeNames.slice(0, -1), config.path || screen].join("/"),
|
|
136
139
|
expandedRouteNames: routeNames.flatMap((name) => name.split("/"))
|
|
137
140
|
};
|
|
138
141
|
}
|
|
139
142
|
function parseQueryParamsExtended(path, route, parseConfig, hash) {
|
|
140
|
-
const searchParams = new URL(path, "
|
|
143
|
+
const searchParams = new URL(path, "file:").searchParams, params = /* @__PURE__ */ Object.create(null);
|
|
141
144
|
hash && (params["#"] = hash.slice(1));
|
|
142
145
|
for (const name of searchParams.keys())
|
|
143
146
|
if (route.params?.[name])
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/fork/getStateFromPath-mods.ts"],
|
|
4
|
-
"mappings": "AAMA,OAAO,aAAa;AACpB,SAAS,gBAAgB,kCAAkC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,25 +1,20 @@
|
|
|
1
1
|
import escape_ from "escape-string-regexp";
|
|
2
2
|
import { matchGroupName, stripGroupSegmentsFromPath } from "../router/matchers.mjs";
|
|
3
3
|
function getUrlWithReactNavigationConcessions(path, baseUrl = process.env.EXPO_BASE_URL) {
|
|
4
|
-
|
|
4
|
+
const pathWithoutGroups = stripGroupSegmentsFromPath(stripBaseUrl(path, baseUrl));
|
|
5
|
+
let pathname = "",
|
|
6
|
+
hash = "";
|
|
5
7
|
try {
|
|
6
|
-
parsed = new URL(path, "
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
cleanUrl: "",
|
|
11
|
-
nonstandardPathname: "",
|
|
12
|
-
url: new URL("https://phony.example")
|
|
13
|
-
};
|
|
14
|
-
}
|
|
15
|
-
const pathname = parsed.pathname,
|
|
16
|
-
withoutBaseUrl = stripBaseUrl(pathname, baseUrl),
|
|
17
|
-
pathWithoutGroups = stripGroupSegmentsFromPath(stripBaseUrl(path, baseUrl));
|
|
8
|
+
const parsed = new URL(path, "file:");
|
|
9
|
+
pathname = parsed.pathname, hash = parsed.hash;
|
|
10
|
+
} catch {}
|
|
11
|
+
const withoutBaseUrl = stripBaseUrl(pathname, baseUrl);
|
|
18
12
|
return {
|
|
19
|
-
// The slashes are at the end, not the beginning
|
|
20
13
|
path,
|
|
14
|
+
// Make sure there is a trailing slash
|
|
15
|
+
// The slashes are at the end, not the beginning
|
|
21
16
|
nonstandardPathname: withoutBaseUrl.replace(/^\/+/g, "").replace(/\/+$/g, "") + "/",
|
|
22
|
-
|
|
17
|
+
hash,
|
|
23
18
|
pathWithoutGroups
|
|
24
19
|
};
|
|
25
20
|
}
|
|
@@ -51,6 +46,7 @@ function getRouteConfigSorter(previousSegments = []) {
|
|
|
51
46
|
if (b.pattern.startsWith(a.pattern) && !a.isIndex) return 1;
|
|
52
47
|
if (a.type === "static" && b.type !== "static") return -1;
|
|
53
48
|
if (a.type !== "static" && b.type === "static") return 1;
|
|
49
|
+
if (a.staticPartCount !== b.staticPartCount) return b.staticPartCount - a.staticPartCount;
|
|
54
50
|
const similarToPreviousA = previousSegments.filter((value, index) => value === a.expandedRouteNames[index] && value.startsWith("(") && value.endsWith(")")),
|
|
55
51
|
similarToPreviousB = previousSegments.filter((value, index) => value === b.expandedRouteNames[index] && value.startsWith("(") && value.endsWith(")"));
|
|
56
52
|
if ((similarToPreviousA.length > 0 || similarToPreviousB.length > 0) && similarToPreviousA.length !== similarToPreviousB.length) return similarToPreviousB.length - similarToPreviousA.length;
|
|
@@ -105,22 +101,27 @@ function populateParams(routes, params) {
|
|
|
105
101
|
}
|
|
106
102
|
function createConfigItemAdditionalProperties(screen, pattern, routeNames, config = {}) {
|
|
107
103
|
const parts = [];
|
|
108
|
-
let isDynamic = !1
|
|
104
|
+
let isDynamic = !1,
|
|
105
|
+
staticPartCount = 0;
|
|
109
106
|
const isIndex = screen === "index" || screen.endsWith("/index");
|
|
110
|
-
for (const part of pattern.split("/"))
|
|
107
|
+
for (const part of pattern.split("/")) if (part) {
|
|
108
|
+
const isDynamicPart = part.startsWith(":") || part.startsWith("*") || part.includes("*not-found");
|
|
109
|
+
isDynamic ||= isDynamicPart, matchGroupName(part) || (parts.push(part), isDynamicPart || staticPartCount++);
|
|
110
|
+
}
|
|
111
111
|
const hasChildren = config.screens ? !!Object.keys(config.screens)?.length : !1,
|
|
112
112
|
type = hasChildren ? "layout" : isDynamic ? "dynamic" : "static";
|
|
113
|
-
return isIndex && parts.push("index"), {
|
|
113
|
+
return isIndex && (parts.push("index"), staticPartCount++), {
|
|
114
114
|
type,
|
|
115
115
|
isIndex,
|
|
116
116
|
hasChildren,
|
|
117
117
|
parts,
|
|
118
|
+
staticPartCount,
|
|
118
119
|
userReadableName: [...routeNames.slice(0, -1), config.path || screen].join("/"),
|
|
119
120
|
expandedRouteNames: routeNames.flatMap(name => name.split("/"))
|
|
120
121
|
};
|
|
121
122
|
}
|
|
122
123
|
function parseQueryParamsExtended(path, route, parseConfig, hash) {
|
|
123
|
-
const searchParams = new URL(path, "
|
|
124
|
+
const searchParams = new URL(path, "file:").searchParams,
|
|
124
125
|
params = /* @__PURE__ */Object.create(null);
|
|
125
126
|
hash && (params["#"] = hash.slice(1));
|
|
126
127
|
for (const name of searchParams.keys()) if (route.params?.[name]) process.env.NODE_ENV !== "production" && console.warn(`Route '/${route.name}' with param '${name}' was specified both in the path and as a param, removing from path`);else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["escape_","matchGroupName","stripGroupSegmentsFromPath","getUrlWithReactNavigationConcessions","path","baseUrl","process","env","EXPO_BASE_URL","
|
|
1
|
+
{"version":3,"names":["escape_","matchGroupName","stripGroupSegmentsFromPath","getUrlWithReactNavigationConcessions","path","baseUrl","process","env","EXPO_BASE_URL","pathWithoutGroups","stripBaseUrl","pathname","hash","parsed","URL","withoutBaseUrl","nonstandardPathname","replace","matchForEmptyPath","configs","leafNodes","filter","config","hasChildren","map","value","find","regex","test","startsWith","appendIsInitial","initialRoutes","resolvedInitialPatterns","route","joinPaths","parentScreens","initialRouteName","isInitial","includes","routeNames","join","paths","concat","p","split","Boolean","getRouteConfigSorter","previousSegments","a","b","pattern","localeCompare","isIndex","type","staticPartCount","similarToPreviousA","index","expandedRouteNames","endsWith","similarToPreviousB","length","i","Math","max","parts","aWildCard","bWildCard","aNotFound","match","bNotFound","aSlug","bSlug","formatRegexPattern","it","escape","decodeURIComponentSafe","str","decodeURIComponent","populateParams","routes","params","Object","keys","assign","createConfigItemAdditionalProperties","screen","isDynamic","part","isDynamicPart","push","screens","userReadableName","slice","flatMap","name","parseQueryParamsExtended","parseConfig","searchParams","create","NODE_ENV","console","warn","values","hasOwnProperty","getAll","RegExp"],"sources":["../../../src/fork/getStateFromPath-mods.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -2,25 +2,20 @@ import escape_ from "escape-string-regexp";
|
|
|
2
2
|
import { matchGroupName, stripGroupSegmentsFromPath } from "../router/matchers.native.js";
|
|
3
3
|
function getUrlWithReactNavigationConcessions(path) {
|
|
4
4
|
var baseUrl = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : process.env.EXPO_BASE_URL,
|
|
5
|
-
|
|
5
|
+
pathWithoutGroups = stripGroupSegmentsFromPath(stripBaseUrl(path, baseUrl)),
|
|
6
|
+
pathname = "",
|
|
7
|
+
hash = "";
|
|
6
8
|
try {
|
|
7
|
-
parsed = new URL(path, "
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
cleanUrl: "",
|
|
12
|
-
nonstandardPathname: "",
|
|
13
|
-
url: new URL("https://phony.example")
|
|
14
|
-
};
|
|
15
|
-
}
|
|
16
|
-
var pathname = parsed.pathname,
|
|
17
|
-
withoutBaseUrl = stripBaseUrl(pathname, baseUrl),
|
|
18
|
-
pathWithoutGroups = stripGroupSegmentsFromPath(stripBaseUrl(path, baseUrl));
|
|
9
|
+
var parsed = new URL(path, "file:");
|
|
10
|
+
pathname = parsed.pathname, hash = parsed.hash;
|
|
11
|
+
} catch {}
|
|
12
|
+
var withoutBaseUrl = stripBaseUrl(pathname, baseUrl);
|
|
19
13
|
return {
|
|
20
|
-
// The slashes are at the end, not the beginning
|
|
21
14
|
path,
|
|
15
|
+
// Make sure there is a trailing slash
|
|
16
|
+
// The slashes are at the end, not the beginning
|
|
22
17
|
nonstandardPathname: withoutBaseUrl.replace(/^\/+/g, "").replace(/\/+$/g, "") + "/",
|
|
23
|
-
|
|
18
|
+
hash,
|
|
24
19
|
pathWithoutGroups
|
|
25
20
|
};
|
|
26
21
|
}
|
|
@@ -77,6 +72,7 @@ function getRouteConfigSorter() {
|
|
|
77
72
|
if (b.pattern.startsWith(a.pattern) && !a.isIndex) return 1;
|
|
78
73
|
if (a.type === "static" && b.type !== "static") return -1;
|
|
79
74
|
if (a.type !== "static" && b.type === "static") return 1;
|
|
75
|
+
if (a.staticPartCount !== b.staticPartCount) return b.staticPartCount - a.staticPartCount;
|
|
80
76
|
var similarToPreviousA = previousSegments.filter(function (value, index) {
|
|
81
77
|
return value === a.expandedRouteNames[index] && value.startsWith("(") && value.endsWith(")");
|
|
82
78
|
}),
|
|
@@ -154,6 +150,7 @@ function createConfigItemAdditionalProperties(screen, pattern, routeNames) {
|
|
|
154
150
|
_Object_keys,
|
|
155
151
|
parts = [],
|
|
156
152
|
isDynamic = !1,
|
|
153
|
+
staticPartCount = 0,
|
|
157
154
|
isIndex = screen === "index" || screen.endsWith("/index"),
|
|
158
155
|
_iteratorNormalCompletion = !0,
|
|
159
156
|
_didIteratorError = !1,
|
|
@@ -161,7 +158,10 @@ function createConfigItemAdditionalProperties(screen, pattern, routeNames) {
|
|
|
161
158
|
try {
|
|
162
159
|
for (var _iterator = pattern.split("/")[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
|
|
163
160
|
var part = _step.value;
|
|
164
|
-
|
|
161
|
+
if (part) {
|
|
162
|
+
var isDynamicPart = part.startsWith(":") || part.startsWith("*") || part.includes("*not-found");
|
|
163
|
+
isDynamic || (isDynamic = isDynamicPart), matchGroupName(part) || (parts.push(part), isDynamicPart || staticPartCount++);
|
|
164
|
+
}
|
|
165
165
|
}
|
|
166
166
|
} catch (err) {
|
|
167
167
|
_didIteratorError = !0, _iteratorError = err;
|
|
@@ -174,11 +174,12 @@ function createConfigItemAdditionalProperties(screen, pattern, routeNames) {
|
|
|
174
174
|
}
|
|
175
175
|
var hasChildren = config.screens ? !!(!((_Object_keys = Object.keys(config.screens)) === null || _Object_keys === void 0) && _Object_keys.length) : !1,
|
|
176
176
|
type = hasChildren ? "layout" : isDynamic ? "dynamic" : "static";
|
|
177
|
-
return isIndex && parts.push("index"), {
|
|
177
|
+
return isIndex && (parts.push("index"), staticPartCount++), {
|
|
178
178
|
type,
|
|
179
179
|
isIndex,
|
|
180
180
|
hasChildren,
|
|
181
181
|
parts,
|
|
182
|
+
staticPartCount,
|
|
182
183
|
userReadableName: [...routeNames.slice(0, -1), config.path || screen].join("/"),
|
|
183
184
|
expandedRouteNames: routeNames.flatMap(function (name) {
|
|
184
185
|
return name.split("/");
|
|
@@ -186,7 +187,7 @@ function createConfigItemAdditionalProperties(screen, pattern, routeNames) {
|
|
|
186
187
|
};
|
|
187
188
|
}
|
|
188
189
|
function parseQueryParamsExtended(path, route, parseConfig, hash) {
|
|
189
|
-
var searchParams = new URL(path, "
|
|
190
|
+
var searchParams = new URL(path, "file:").searchParams,
|
|
190
191
|
params = /* @__PURE__ */Object.create(null);
|
|
191
192
|
hash && (params["#"] = hash.slice(1));
|
|
192
193
|
var _iteratorNormalCompletion = !0,
|