one 1.2.63 → 1.2.65
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/cli/build.cjs +11 -11
- package/dist/cjs/cli/build.js +11 -11
- package/dist/cjs/cli/build.js.map +1 -1
- package/dist/cjs/cli/build.native.js +16 -16
- package/dist/cjs/cli/build.native.js.map +1 -1
- package/dist/cjs/cli/buildPage.cjs +12 -10
- package/dist/cjs/cli/buildPage.js +11 -9
- package/dist/cjs/cli/buildPage.js.map +1 -1
- package/dist/cjs/cli/buildPage.native.js +12 -10
- package/dist/cjs/cli/buildPage.native.js.map +1 -1
- package/dist/cjs/createHandleRequest.cjs +1 -1
- package/dist/cjs/createHandleRequest.js +1 -1
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +1 -1
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/fork/__tests__/getStateFromPath.test.cjs +40 -4
- package/dist/cjs/fork/__tests__/getStateFromPath.test.js +39 -11
- package/dist/cjs/fork/__tests__/getStateFromPath.test.js.map +1 -1
- package/dist/cjs/fork/__tests__/getStateFromPath.test.native.js +40 -4
- package/dist/cjs/fork/__tests__/getStateFromPath.test.native.js.map +1 -1
- package/dist/cjs/fork/getPathFromState.cjs +1 -1
- package/dist/cjs/fork/getPathFromState.js +1 -1
- package/dist/cjs/fork/getPathFromState.js.map +1 -1
- package/dist/cjs/fork/getPathFromState.native.js +1 -1
- package/dist/cjs/fork/getPathFromState.native.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath.cjs +26 -10
- package/dist/cjs/fork/getStateFromPath.js +24 -5
- package/dist/cjs/fork/getStateFromPath.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath.native.js +27 -11
- package/dist/cjs/fork/getStateFromPath.native.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath.test.cjs +26 -12
- package/dist/cjs/fork/getStateFromPath.test.js +24 -12
- package/dist/cjs/fork/getStateFromPath.test.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath.test.native.js +26 -12
- package/dist/cjs/fork/getStateFromPath.test.native.js.map +1 -1
- package/dist/cjs/fork/useLinking.cjs +2 -1
- package/dist/cjs/fork/useLinking.js +2 -2
- package/dist/cjs/fork/useLinking.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +2 -2
- package/dist/cjs/server/oneServe.js +2 -2
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +2 -2
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/views/Navigator.cjs +6 -7
- package/dist/cjs/views/Navigator.js +7 -7
- package/dist/cjs/views/Navigator.js.map +1 -1
- package/dist/cjs/views/Navigator.native.js +4 -5
- package/dist/cjs/views/Navigator.native.js.map +1 -1
- package/dist/esm/cli/build.js +11 -11
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +11 -11
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +16 -16
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/cli/buildPage.js +11 -9
- package/dist/esm/cli/buildPage.js.map +1 -1
- package/dist/esm/cli/buildPage.mjs +12 -10
- package/dist/esm/cli/buildPage.mjs.map +1 -1
- package/dist/esm/cli/buildPage.native.js +12 -10
- package/dist/esm/cli/buildPage.native.js.map +1 -1
- package/dist/esm/createHandleRequest.js +1 -1
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +1 -1
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +1 -1
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/fork/__tests__/getStateFromPath.test.js +39 -11
- package/dist/esm/fork/__tests__/getStateFromPath.test.js.map +1 -1
- package/dist/esm/fork/__tests__/getStateFromPath.test.mjs +40 -4
- package/dist/esm/fork/__tests__/getStateFromPath.test.mjs.map +1 -1
- package/dist/esm/fork/__tests__/getStateFromPath.test.native.js +40 -4
- package/dist/esm/fork/__tests__/getStateFromPath.test.native.js.map +1 -1
- package/dist/esm/fork/getPathFromState.js +1 -1
- package/dist/esm/fork/getPathFromState.js.map +1 -1
- package/dist/esm/fork/getPathFromState.mjs +1 -1
- package/dist/esm/fork/getPathFromState.mjs.map +1 -1
- package/dist/esm/fork/getPathFromState.native.js +1 -1
- package/dist/esm/fork/getPathFromState.native.js.map +1 -1
- package/dist/esm/fork/getStateFromPath.js +24 -5
- package/dist/esm/fork/getStateFromPath.js.map +1 -1
- package/dist/esm/fork/getStateFromPath.mjs +26 -10
- package/dist/esm/fork/getStateFromPath.mjs.map +1 -1
- package/dist/esm/fork/getStateFromPath.native.js +27 -11
- package/dist/esm/fork/getStateFromPath.native.js.map +1 -1
- package/dist/esm/fork/getStateFromPath.test.js +24 -12
- package/dist/esm/fork/getStateFromPath.test.js.map +1 -1
- package/dist/esm/fork/getStateFromPath.test.mjs +26 -12
- package/dist/esm/fork/getStateFromPath.test.mjs.map +1 -1
- package/dist/esm/fork/getStateFromPath.test.native.js +26 -12
- package/dist/esm/fork/getStateFromPath.test.native.js.map +1 -1
- package/dist/esm/fork/useLinking.js +1 -1
- package/dist/esm/fork/useLinking.js.map +1 -1
- package/dist/esm/fork/useLinking.mjs +2 -1
- package/dist/esm/fork/useLinking.mjs.map +1 -1
- package/dist/esm/server/oneServe.js +2 -2
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +2 -2
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +2 -2
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/views/Navigator.js +7 -11
- package/dist/esm/views/Navigator.js.map +1 -1
- package/dist/esm/views/Navigator.mjs +6 -7
- package/dist/esm/views/Navigator.mjs.map +1 -1
- package/dist/esm/views/Navigator.native.js +5 -6
- package/dist/esm/views/Navigator.native.js.map +1 -1
- package/package.json +10 -10
- package/src/cli/build.ts +21 -11
- package/src/cli/buildPage.ts +15 -12
- package/src/createHandleRequest.ts +3 -1
- package/src/fork/__tests__/getStateFromPath.test.tsx +36 -8
- package/src/fork/getPathFromState.ts +3 -1
- package/src/fork/getStateFromPath.test.ts +15 -3
- package/src/fork/getStateFromPath.ts +40 -4
- package/src/fork/useLinking.ts +4 -1
- package/src/server/oneServe.ts +3 -2
- package/src/views/Navigator.tsx +26 -13
- package/types/cli/build.d.ts.map +1 -1
- package/types/cli/buildPage.d.ts.map +1 -1
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/fork/getPathFromState.d.ts.map +1 -1
- package/types/fork/getStateFromPath.d.ts.map +1 -1
- package/types/fork/useLinking.d.ts +2 -1
- package/types/fork/useLinking.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/views/Navigator.d.ts +12 -2
- package/types/views/Navigator.d.ts.map +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/fork/getPathFromState.ts"],
|
|
4
|
-
"mappings": "AAQA,YAAY,oBAAoB;AAEhC;AAAA,EAEE;AAAA,EAEA;AAAA,OACK;AAOP,SAAS,0BAA0B;AAkBnC,MAAM,iBAAiB,CAAC,UAAoD;AAC1E,QAAM,QACJ,OAAO,MAAM,SAAU,WACnB,MAAM,OAAO,MAAM,KAAK,IACxB,MAAM,OAAO,MAAM,OAAO,SAAS,CAAC;AAE1C,SAAI,MAAM,QACD,eAAe,MAAM,KAAK,IAG5B;AACT,GAEM,0BAA0B,oBAAI,QAGlC,GAEI,uBAAuB,CAAC,YAA0B;AACtD,MAAI,CAAC,SAAS,QAAS,QAAO,CAAC;AAE/B,QAAM,SAAS,wBAAwB,IAAI,SAAS,OAAO;AAE3D,MAAI,OAAQ,QAAO;AAEnB,QAAM,oBAAoB,wBAAwB,QAAQ,OAAO;AAEjE,iCAAwB,IAAI,QAAQ,SAAS,iBAAiB,GAEvD;AACT;AAgCO,SAAS,iBACd,OACA,SACQ;AACR,SAAO,qBAAqB,OAAO,OAAO,EAAE;AAC9C;AAEO,SAAS,qBACd,OACA,SACA;AAGA,MAAI,SAAS;AACX,UAAM;AAAA,MACJ;AAAA,IACF;AAGF,EAAI,WACF,mBAAmB,OAAO;AAG5B,QAAM,UAAU,qBAAqB,OAAO;AAE5C,MAAI,OAAO,KACP,UAA6B;AAEjC,QAAM,YAAiC,CAAC;AAExC,SAAO,WAEA,QAAQ,QAAQ,UAFP;AAMd,QAAI,QAAQ,OAAO,QAAQ,SAAU,WAAW,QAAQ,QAAQ,GAE5D,QAAQ,QAAQ,OAAO,KAAK,GAI5B,SAEA;AACJ,UAAM,eAAe,eAAe,KAAK;AACzC,QAAI,iBAAiB;AAGrB,UAAM,mBAA6B,CAAC;AAEpC,QAAI,UAAU;AAEd,WAAO,MAAM,QAAQ,kBAAkB,WAAS;AAK9C,UAJA,UAAU,eAAe,MAAM,IAAI,EAAE,SAErC,iBAAiB,KAAK,MAAM,IAAI,GAE5B,MAAM,QAAQ;AAChB,cAAM,YAAY,eAAe,MAAM,IAAI,GAAG,WAYxC,gBAAgB,OAAO;AAAA,UAC3B,OAAO,QAAQ,MAAM,MAAO,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -35,7 +35,7 @@ function getPathDataFromState(state, options) {
|
|
|
35
35
|
for (; route.name in currentOptions && hasNext;) {
|
|
36
36
|
if (pattern = currentOptions[route.name].pattern, nestedRouteNames.push(route.name), route.params) {
|
|
37
37
|
const stringify = currentOptions[route.name]?.stringify,
|
|
38
|
-
currentParams = Object.fromEntries(Object.entries(route.params).flatMap(([key, value]) => key === "screen" || key === "params" ? [] : [[key, stringify?.[key] ? stringify[key](value) : Array.isArray(value) ? value.map(String) : typeof value > "u" ? value : String(value)]]));
|
|
38
|
+
currentParams = Object.fromEntries(Object.entries(route.params).flatMap(([key, value]) => key === "screen" || key === "params" || key === "key" ? [] : [[key, stringify?.[key] ? stringify[key](value) : Array.isArray(value) ? value.map(String) : typeof value > "u" ? value : String(value)]]));
|
|
39
39
|
Object.assign(allParams, currentParams), focusedRoute === route && (focusedParams = {
|
|
40
40
|
...currentParams
|
|
41
41
|
}, pattern?.split("/").filter(p => sharedModUtils.isDynamicPart(p)).forEach(p => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["sharedModUtils","appendBaseUrl","getPathWithConventionsCollapsed","validatePathConfig","getActiveRoute","state","route","index","routes","length","cachedNormalizedConfigs","WeakMap","getNormalizedConfigs","options","screens","cached","get","normalizedConfigs","createNormalizedConfigs","set","getPathFromState","getPathDataFromState","path","Error","configs","current","allParams","pattern","focusedParams","focusedRoute","currentOptions","nestedRouteNames","hasNext","name","push","params","stringify","currentParams","Object","fromEntries","entries","flatMap","key","value","Array","isArray","map","String","assign","split","filter","p","isDynamicPart","forEach","getParamName","screen","toString","keys","nextRoute","nestedConfig","join","initialRouteName","startsWith","encodeURIComponent","param","query","URLSearchParams","replace","joinPaths","paths","concat","Boolean","createConfigItem","config","parentPattern","exact","c","result","getPathFromState_default"],"sources":["../../../src/fork/getPathFromState.ts"],"sourcesContent":[null],"mappings":"AAQA,YAAYA,cAAA,MAAoB;AAEhC,SAEEC,aAAA,EAEAC,+BAAA,QACK;AAOP,SAASC,kBAAA,QAA0B;AAkBnC,MAAMC,cAAA,GAAkBC,KAAA,IAAoD;IAC1E,MAAMC,KAAA,GACJ,OAAOD,KAAA,CAAME,KAAA,IAAU,WACnBF,KAAA,CAAMG,MAAA,CAAOH,KAAA,CAAME,KAAK,IACxBF,KAAA,CAAMG,MAAA,CAAOH,KAAA,CAAMG,MAAA,CAAOC,MAAA,GAAS,CAAC;IAE1C,OAAIH,KAAA,CAAMD,KAAA,GACDD,cAAA,CAAeE,KAAA,CAAMD,KAAK,IAG5BC,KAAA;EACT;EAEMI,uBAAA,GAA0B,mBAAIC,OAAA,CAGlC;EAEIC,oBAAA,GAAwBC,OAAA,IAA0B;IACtD,IAAI,CAACA,OAAA,EAASC,OAAA,EAAS,OAAO,CAAC;IAE/B,MAAMC,MAAA,GAASL,uBAAA,CAAwBM,GAAA,CAAIH,OAAA,EAASC,OAAO;IAE3D,IAAIC,MAAA,EAAQ,OAAOA,MAAA;IAEnB,MAAME,iBAAA,GAAoBC,uBAAA,CAAwBL,OAAA,CAAQC,OAAO;IAEjE,OAAAJ,uBAAA,CAAwBS,GAAA,CAAIN,OAAA,CAAQC,OAAA,EAASG,iBAAiB,GAEvDA,iBAAA;EACT;AAgCO,SAASG,iBACdf,KAAA,EACAQ,OAAA,EACQ;EACR,OAAOQ,oBAAA,CAAqBhB,KAAA,EAAOQ,OAAO,EAAES,IAAA;AAC9C;AAEO,SAASD,qBACdhB,KAAA,EACAQ,OAAA,EACA;EAGA,IAAIR,KAAA,IAAS,MACX,MAAMkB,KAAA,CACJ,+EACF;EAGEV,OAAA,IACFV,kBAAA,CAAmBU,OAAO;EAG5B,MAAMW,OAAA,GAAUZ,oBAAA,CAAqBC,OAAO;EAE5C,IAAIS,IAAA,GAAO;IACPG,OAAA,GAA6BpB,KAAA;EAEjC,MAAMqB,SAAA,GAAiC,CAAC;EAExC,OAAOD,OAAA,IAEAA,OAAA,CAAQjB,MAAA,EAAQC,MAAA,GAFP;IAMd,IAAIF,KAAA,GAAQ,OAAOkB,OAAA,CAAQlB,KAAA,IAAU,WAAWkB,OAAA,CAAQlB,KAAA,GAAQ;MAE5DD,KAAA,GAAQmB,OAAA,CAAQjB,MAAA,CAAOD,KAAK;MAI5BoB,OAAA;MAEAC,aAAA;IACJ,MAAMC,YAAA,GAAezB,cAAA,CAAeC,KAAK;IACzC,IAAIyB,cAAA,GAAiBN,OAAA;IAGrB,MAAMO,gBAAA,GAA6B,EAAC;IAEpC,IAAIC,OAAA,GAAU;IAEd,OAAO1B,KAAA,CAAM2B,IAAA,IAAQH,cAAA,IAAkBE,OAAA,GAAS;MAK9C,IAJAL,OAAA,GAAUG,cAAA,CAAexB,KAAA,CAAM2B,IAAI,EAAEN,OAAA,EAErCI,gBAAA,CAAiBG,IAAA,CAAK5B,KAAA,CAAM2B,IAAI,GAE5B3B,KAAA,CAAM6B,MAAA,EAAQ;QAChB,MAAMC,SAAA,GAAYN,cAAA,CAAexB,KAAA,CAAM2B,IAAI,GAAGG,SAAA;UAYxCC,aAAA,GAAgBC,MAAA,CAAOC,WAAA,CAC3BD,MAAA,CAAOE,OAAA,CAAQlC,KAAA,CAAM6B,MAAO,EAAEM,OAAA,CAAQ,CAAC,CAACC,GAAA,EAAKC,KAAK,
|
|
1
|
+
{"version":3,"names":["sharedModUtils","appendBaseUrl","getPathWithConventionsCollapsed","validatePathConfig","getActiveRoute","state","route","index","routes","length","cachedNormalizedConfigs","WeakMap","getNormalizedConfigs","options","screens","cached","get","normalizedConfigs","createNormalizedConfigs","set","getPathFromState","getPathDataFromState","path","Error","configs","current","allParams","pattern","focusedParams","focusedRoute","currentOptions","nestedRouteNames","hasNext","name","push","params","stringify","currentParams","Object","fromEntries","entries","flatMap","key","value","Array","isArray","map","String","assign","split","filter","p","isDynamicPart","forEach","getParamName","screen","toString","keys","nextRoute","nestedConfig","join","initialRouteName","startsWith","encodeURIComponent","param","query","URLSearchParams","replace","joinPaths","paths","concat","Boolean","createConfigItem","config","parentPattern","exact","c","result","getPathFromState_default"],"sources":["../../../src/fork/getPathFromState.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -24,7 +24,7 @@ function getPathDataFromState(state, options) {
|
|
|
24
24
|
stringify = (_currentOptions_route_name = currentOptions[route.name]) === null || _currentOptions_route_name === void 0 ? void 0 : _currentOptions_route_name.stringify,
|
|
25
25
|
currentParams = Object.fromEntries(Object.entries(route.params).flatMap(function (param2) {
|
|
26
26
|
var [key, value] = param2;
|
|
27
|
-
return key === "screen" || key === "params" ? [] : [[key, stringify?.[key] ? stringify[key](value) : Array.isArray(value) ? value.map(String) : typeof value > "u" ? value : String(value)]];
|
|
27
|
+
return key === "screen" || key === "params" || key === "key" ? [] : [[key, stringify?.[key] ? stringify[key](value) : Array.isArray(value) ? value.map(String) : typeof value > "u" ? value : String(value)]];
|
|
28
28
|
}));
|
|
29
29
|
Object.assign(allParams, currentParams), focusedRoute === route && (focusedParams = {
|
|
30
30
|
...currentParams
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["sharedModUtils","appendBaseUrl","getPathWithConventionsCollapsed","validatePathConfig","getActiveRoute","state","route","index","routes","length","cachedNormalizedConfigs","WeakMap","getNormalizedConfigs","options","screens","cached","get","normalizedConfigs","createNormalizedConfigs","set","getPathFromState","getPathDataFromState","path","_loop","_loop2","pattern","currentOptions","name","nestedRouteNames","push","params","_currentOptions_route_name","stringify","currentParams","Object","fromEntries","entries","flatMap","param2","key","value","Array","isArray","map","String","assign","allParams","focusedRoute","focusedParams","split","filter","p","isDynamicPart","forEach","getParamName","_route_params_screen","_currentOptions_route_name_screens","screen","toString","keys","_route_params","hasNext","nextRoute","nestedConfig","_current_routes","current","configs","_configs_route_name","join","initialRouteName","startsWith","encodeURIComponent","param","query","URLSearchParams","Error","_ret","replace","joinPaths","_len","arguments","paths","_key","concat","Boolean","createConfigItem","config","parentPattern"],"sources":["../../../src/fork/getPathFromState.ts"],"sourcesContent":[null],"mappings":"AAQA,YAAYA,cAAA,MAAoB;AAEhC,SAAAC,aAAA,EAAAC,+BAAA;AAAA,SAEEC,kBAAA;AAAA,IAEAC,cAAA,YAAAA,CAAAC,KAAA;IAAA,IAAAC,KACK,UAAAD,KAAA,CAAAE,KAAA,eAAAF,KAAA,CAAAG,MAAA,CAAAH,KAAA,CAAAE,KAAA,IAAAF,KAAA,CAAAG,MAAA,CAAAH,KAAA,CAAAG,MAAA,CAAAC,MAAA;IAOP,OAASH,KAAA,CAAAD,KAAA,GAAAD,cAA0B,CAAAE,KAAA,CAAAD,KAAA,IAAAC,KAAA;EAkBnC;EAAAI,uBAAwB,kBAAoD,IAAAC,OAAA;EAAAC,oBAAA,YAAAA,CAAAC,OAAA;IAC1E,KAAAA,OAAM,EACJC,OAAO,SAAM;IAIf,IAAAC,MAAI,GAAML,uBACc,CAAAM,GAAA,CAAAH,OAAW,EAAAC,OAG5B;IACT,IAEMC,MAAA,SAAAA,MAAA;IAMJ,IAAIE,iBAAU,GAASC,uBAAQ,CAAAL,OAAA,CAAAC,OAAA;IAE/B,OAAMJ,uBAAS,CAAAS,GAAA,CAAAN,OAAwB,CAAIC,OAAA,EAASG,iBAAO,GAAAA,iBAAA;EAE3D;AAEA,SAAMG,iBAAAf,KAAoB,EAAAQ,OAAA;EAE1B,OAAAQ,oBAAA,CAAAhB,KAAwB,EAAIQ,OAAA,CAAQ,CAAAS,IAAA;AAGtC;AAgCO,SAASD,oBACdA,CAAAhB,KACA,EAAAQ,OACQ;EACR,IAAAU,KAAO,YAAAA,CAAA;IACT,IAAAC,MAAA,YAAAA,CAAA;QAEO,IAASC,OAAA,GAAAC,cACd,CAAApB,KACA,CAAAqB,IAAA,CACA,CAAAF,OAAA,EAAAG,gBAAA,CAAAC,IAAA,CAAAvB,KAAA,CAAAqB,IAAA,GAAArB,KAAA,CAAAwB,MAAA;UAGI,IAAAC,0BAAS;YAAAC,SAAA,IAAAD,0BAAA,GAAAL,cAAA,CAAApB,KAAA,CAAAqB,IAAA,eAAAI,0BAAA,uBAAAA,0BAAA,CAAAC,SAAA;YAAAC,aAAA,GAAAC,MAAA,CAAAC,WAAA,CAAAD,MAAA,CAAAE,OAAA,CAAA9B,KAAA,CAAAwB,MAAA,EAAAO,OAAA,WAAAC,MAAA;cACL,KAAAC,GAAA,EAAAC,KAAA,IAAAF,MAAA;cACJ,OAAAC,GAAA,iBAAAA,GAAA,
|
|
1
|
+
{"version":3,"names":["sharedModUtils","appendBaseUrl","getPathWithConventionsCollapsed","validatePathConfig","getActiveRoute","state","route","index","routes","length","cachedNormalizedConfigs","WeakMap","getNormalizedConfigs","options","screens","cached","get","normalizedConfigs","createNormalizedConfigs","set","getPathFromState","getPathDataFromState","path","_loop","_loop2","pattern","currentOptions","name","nestedRouteNames","push","params","_currentOptions_route_name","stringify","currentParams","Object","fromEntries","entries","flatMap","param2","key","value","Array","isArray","map","String","assign","allParams","focusedRoute","focusedParams","split","filter","p","isDynamicPart","forEach","getParamName","_route_params_screen","_currentOptions_route_name_screens","screen","toString","keys","_route_params","hasNext","nextRoute","nestedConfig","_current_routes","current","configs","_configs_route_name","join","initialRouteName","startsWith","encodeURIComponent","param","query","URLSearchParams","Error","_ret","replace","joinPaths","_len","arguments","paths","_key","concat","Boolean","createConfigItem","config","parentPattern"],"sources":["../../../src/fork/getPathFromState.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -14,6 +14,9 @@ import {
|
|
|
14
14
|
} from "./getStateFromPath-mods";
|
|
15
15
|
import { validatePathConfig } from "./validatePathConfig";
|
|
16
16
|
function getStateFromPath(path, options) {
|
|
17
|
+
resetRouteKeyCounter(), process.env.ONE_DEBUG_ROUTER && console.info(
|
|
18
|
+
`[one] getStateFromPath called with path=${path}, isServer=${typeof window > "u"}`
|
|
19
|
+
);
|
|
17
20
|
const { initialRoutes, configs, configWithRegexes } = getConfigResources(options), screens = options?.screens, pathData = getUrlWithReactNavigationConcessions(path);
|
|
18
21
|
let remaining = pathData.nonstandardPathname.replace(/\/+/g, "/").replace(/^\//, "").replace(/\?.*$/, "");
|
|
19
22
|
remaining = remaining.endsWith("/") ? remaining : `${remaining}/`;
|
|
@@ -218,16 +221,32 @@ const joinPaths = (...paths) => [].concat(...paths.map((p) => p.split("/"))).fil
|
|
|
218
221
|
if (sameParents)
|
|
219
222
|
return routeName !== config.initialRouteName ? config.initialRouteName : void 0;
|
|
220
223
|
}
|
|
221
|
-
}
|
|
224
|
+
};
|
|
225
|
+
let routeKeyCounter = 0;
|
|
226
|
+
function resetRouteKeyCounter() {
|
|
227
|
+
routeKeyCounter = 0;
|
|
228
|
+
}
|
|
229
|
+
function getRouteWithKey(route) {
|
|
230
|
+
const key = `${route.name}-${routeKeyCounter++}`;
|
|
231
|
+
return process.env.ONE_DEBUG_ROUTER && console.info(`[one] getRouteWithKey: ${route.name} -> key=${key}`), { ...route, key };
|
|
232
|
+
}
|
|
233
|
+
const createStateObject = (initialRoute, route, isEmpty) => isEmpty ? initialRoute ? {
|
|
222
234
|
index: 1,
|
|
223
|
-
|
|
235
|
+
// @modified: add deterministic keys
|
|
236
|
+
routes: [getRouteWithKey({ name: initialRoute }), getRouteWithKey(route)]
|
|
224
237
|
} : {
|
|
225
|
-
|
|
238
|
+
// @modified: add deterministic keys
|
|
239
|
+
routes: [getRouteWithKey(route)]
|
|
226
240
|
} : initialRoute ? {
|
|
227
241
|
index: 1,
|
|
228
|
-
|
|
242
|
+
// @modified: add deterministic keys
|
|
243
|
+
routes: [
|
|
244
|
+
getRouteWithKey({ name: initialRoute }),
|
|
245
|
+
getRouteWithKey({ ...route, state: { routes: [] } })
|
|
246
|
+
]
|
|
229
247
|
} : {
|
|
230
|
-
|
|
248
|
+
// @modified: add deterministic keys
|
|
249
|
+
routes: [getRouteWithKey({ ...route, state: { routes: [] } })]
|
|
231
250
|
}, createNestedStateObject = ({ path, ...restPathData }, routes, initialRoutes, flatConfig) => {
|
|
232
251
|
let route = routes.shift();
|
|
233
252
|
const parentScreens = [];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/fork/getStateFromPath.ts"],
|
|
4
|
-
"mappings": "AAcA,OAAO,YAAY;AAKnB,SAAS,eAAe,eAAe,mBAAmB;AAC1D,SAAS,wBAAwB;AACjC;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,0BAA0B;AAgE5B,SAAS,iBACd,MACA,SACyB;
|
|
4
|
+
"mappings": "AAcA,OAAO,YAAY;AAKnB,SAAS,eAAe,eAAe,mBAAmB;AAC1D,SAAS,wBAAwB;AACjC;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,0BAA0B;AAgE5B,SAAS,iBACd,MACA,SACyB;AAEzB,uBAAqB,GAGjB,QAAQ,IAAI,oBACd,QAAQ;AAAA,IACN,2CAA2C,IAAI,cAAc,OAAO,SAAW,GAAW;AAAA,EAC5F;AAGF,QAAM,EAAE,eAAe,SAAS,kBAAkB,IAAI,mBAAmB,OAAO,GAE1E,UAAU,SAAS,SAGnB,WAAW,qCAAqC,IAAI;AAG1D,MAAI,YAAY,SAAS,oBACtB,QAAQ,QAAQ,GAAG,EACnB,QAAQ,OAAO,EAAE,EACjB,QAAQ,SAAS,EAAE;AAGtB,cAAY,UAAU,SAAS,GAAG,IAAI,YAAY,GAAG,SAAS;AAE9D,QAAM,SAAS,SAAS,MAAM,QAAQ,OAAO,EAAE;AAE/C,MAAI,QAAQ;AAEV,UAAM,mBAAmB,OAAO,SAAS,GAAG,IAAI,SAAS,GAAG,MAAM;AAGlE,QAAI,CAAC,UAAU,WAAW,gBAAgB;AACxC;AAIF,gBAAY,UAAU,QAAQ,kBAAkB,EAAE;AAAA,EACpD;AAEA,MAAI,YAAY,QAAW;AAEzB,UAAMA,UAAS,UACZ,MAAM,GAAG,EACT,OAAO,OAAO,EACd,IAAI,CAAC,aAEG,EAAE,MADI,mBAAmB,OAAO,EACzB,EACf;AAEH,WAAIA,QAAO,SAGF,wBAAwB,UAAUA,SAAQ,eAAe,CAAC,CAAC,IAIpE;AAAA,EACF;AAEA,MAAI,cAAc,KAAK;AAYrB,UAAM,QAAQ,kBAAkB,iBAAiB;AAGjD,WAAI,QACK;AAAA,MACL;AAAA;AAAA,MACA,MAAM,WAAW,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE;AAAA,MACzC;AAAA,MACA;AAAA,IACF,IAGF;AAAA,EACF;AAEA,MAAI,QACA;AAIJ,QAAM,EAAE,QAAQ,cAAc,IAAI,oBAAoB,WAAW,iBAAiB;AAUlF,MARI,WAAW,WAGb,UAAU,wBAAwB,UAAU,QAAQ,eAAe,OAAO,GAC1E,YAAY,eACZ,SAAS,UAGP,aAAW,QAAQ,UAAU;AAIjC,WAAO;AACT;AAKA,MAAM,wBAAwB,oBAAI,QAAsC;AAExE,SAAS,mBACP,SACA;AACA,MAAI,CAAC,QAAS,QAAO,uBAAuB;AAE5C,QAAM,SAAS,sBAAsB,IAAI,OAAO;AAEhD,MAAI,OAAQ,QAAO;AAEnB,QAAM,YAAY,uBAAuB,OAAO;AAEhD,+BAAsB,IAAI,SAAS,SAAS,GAErC;AACT;AAGA,SAAS,uBAAuB,SAAuB,kBAA6B;AAClF,EAAI,WACF,mBAAmB,OAAO;AAG5B,QAAM,gBAAgB,iBAAiB,OAAO,GAGxC,UAAU,qBAAqB,eAAe,SAAS,SAAS,gBAAgB;AAEtF,4BAA0B,OAAO;AAEjC,QAAM,oBAAoB,sBAAsB,OAAO;AAEvD,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;AAEA,SAAS,iBAAiB,SAAuB;AAC/C,QAAM,gBAAsC,CAAC;AAE7C,SAAI,SAAS,oBACX,cAAc,KAAK;AAAA,IACjB,kBAAkB,QAAQ;AAAA,IAC1B,eAAe,CAAC;AAAA,EAClB,CAAC,GAGI;AACT;AAEA,SAAS,qBACP,eACA,UAAiC,CAAC,GAElC,kBAEA;AAEA,SACG,CAAC,EACC;AAAA,IACC,GAAG,OAAO,KAAK,OAAO,EAAE;AAAA,MAAI,CAAC,QAC3B;AAAA,QACE;AAAA,QACA;AAAA,QACA,CAAC;AAAA,QACD;AAAA,QACA,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF,EAoDC,IAAI,gBAAgB,aAAa,CAAC,EAClC,KAAK,qBAAqB,gBAAgB,CAAC;AAGlD;AAEA,SAAS,0BAA0B,SAAwB;AAEzD,UAAQ,OAAoC,CAAC,KAAK,WAAW;AAC3D,QAAI,IAAI,OAAO,OAAO,GAAG;AACvB,YAAM,IAAI,IAAI,OAAO,OAAO,EAAE,YACxB,IAAI,OAAO;AASjB,UAAI,EAJF,EAAE,SAAS,EAAE,SACT,EAAE,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC,MAAM,EAAE,IAC9B,EAAE,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC,MAAM,EAAE;AAGlC,cAAM,IAAI;AAAA,UACR,iEACE,OAAO,OACT,uBAAuB,EAAE,KAAK,KAAK,CAAC,UAAU,EAAE;AAAA,YAC9C;AAAA,UACF,CAAC;AAAA,QACH;AAAA,IAEJ;AAEA,WAAO,OAAO,OAAO,KAAK;AAAA,MACxB,CAAC,OAAO,OAAO,GAAG;AAAA,IACpB,CAAC;AAAA,EACH,GAAG,CAAC,CAAC;AACP;AAEA,SAAS,sBAAsB,SAAwB;AACrD,SAAO,QAAQ,IAAI,CAAC,OAAO;AAAA,IACzB,GAAG;AAAA;AAAA;AAAA;AAAA,IAIH,OAAO,EAAE,UACL,IAAI,OAAO,KAAK,EAAE,QAAQ,MAAM,GAAG,EAAE,IAAI,kBAAkB,EAAE,KAAK,EAAE,CAAC,IAAI,IACzE;AAAA;AAAA,EAEN,EAAE;AACJ;AAEA,MAAM,YAAY,IAAI,UACnB,CAAC,EACC,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,EACxC,OAAO,OAAO,EACd,KAAK,GAAG,GAEP,sBAAsB,CAAC,WAAmB,YAA2B;AACzE,MAAI,QACA,gBAAgB;AAGpB,QAAM,YAAY,uBAAO,OAAO,IAAI;AAIpC,aAAW,UAAU,SAAS;AAC5B,QAAI,CAAC,OAAO;AACV;AAGF,UAAM,QAAQ,cAAc,MAAM,OAAO,KAAK;AAG9C,QAAI,OAAO;AAgCT,YAAM,iBA/Bc,OAAO,SAAS,MAAM,GAAG,EAAE;AAAA,QAI7C,CAAC,KAAK,GAAG,UAAU;AACjB,cAAI,CAAC,cAAc,CAAC;AAClB,mBAAO;AAIT,cAAI,OAAO;AAEX,gBAAM,sBAAsB;AAAA;AAAA;AAAA,YAG1B,OAAQ,IAAI,MAAM,KAAK,CAAC,EAErB,QAAQ,OAAO,EAAE;AAAA,UACtB;AAEA,wBAAO,OAAO,IAAI,eAAe;AAAA,YAC/B,CAAC,CAAC,GAAG,OAAO,OAAO,IAAI,cAAc,CAAC,KAAK,CAAC,GAAG;AAAA,cAC7C,CAAC,KAAK,GAAG;AAAA,YACX,CAAC;AAAA,UACH,CAAC,GAEM;AAAA,QACT;AAAA,QACA,EAAE,KAAK,IAAI,eAAe,CAAC,EAAE;AAAA,MAC/B,GAEkC,iBAAiB,CAAC;AAEpD,eAAS,OAAO,WAAW,IAAI,CAAC,SAAS;AACvC,cAAM,cAAc,QAAQ,KAAK,CAAC,MAEzB,EAAE,WAAW,QAAQ,OAAO,QAAQ,WAAW,EAAE,OAAO,CAChE,GAGK,iBAAiB,aAAa,KAAK,MAAM,GAAG,EAAE,OAAO,OAAO,EAAE,KAAK,GAAG,GAGtE,qBAAqB,aAAa,QAErC,QAAQ,IAAI,OAAO,GAAG,OAAO,cAAe,CAAC,GAAG,GAAG,EAAE,GACpD,MAAM,GAAG,EAAE,QAET,SAAS,gBACX,MAAM,GAAG,EACV,OAAgC,CAAC,KAAK,GAAG,UAAU;AAClD,cAAI,CAAC,cAAc,CAAC;AAClB,mBAAO;AAKT,gBAAM,SAAS,qBAAqB,qBAAqB,IAAI,GAGvD,QAAQ,cAAc,GAAG,cAAc,CAAC,IAAI,QAAQ,MAAM,CAAC;AAGjE,cAAI,OAAO;AAGT,kBAAM,MAAM,YAAY,CAAC;AAEzB,gBAAI,GAAG,IAAI,aAAa,QAAQ,GAAG,IAC/B,YAAY,MAAM,GAAG,EAAE,KAAY,IACnC;AAAA,UACN;AAEA,iBAAO;AAAA,QACT,GAAG,CAAC,CAAC;AAEP,eAAI,UAAU,OAAO,KAAK,MAAM,EAAE,UAChC,OAAO,OAAO,WAAW,MAAM,GACxB,EAAE,MAAM,OAAO,KAGjB,EAAE,KAAK;AAAA,MAChB,CAAC,GAED,gBAAgB,cAAc,QAAQ,MAAM,CAAC,GAAG,EAAE;AAElD;AAAA,IACF;AAAA,EACF;AAGA,wBAAe,QAAQ,SAAS,GAGzB,EAAE,QAAQ,cAAc;AACjC,GAEM,0BAA0B,CAC9B,QACA,aACA,aAAuB,CAAC,GACxB,UACA,eACA,kBACkB;AAClB,QAAM,UAAyB,CAAC;AAEhC,aAAW,KAAK,MAAM,GAEtB,cAAc,KAAK,MAAM;AAEzB,QAAM,SAAS,YAAY,MAAM;AAEjC,MAAI,OAAO,UAAW,UAAU;AAE9B,UAAM,UAAU,gBAAgB,UAAU,eAAe,MAAM,IAAI;AAEnE,YAAQ,KAAK,iBAAiB,QAAQ,YAAY,SAAS,MAAM,CAAC;AAAA,EACpE,WAAW,OAAO,UAAW,UAAU;AACrC,QAAI;AAKJ,QAAI,OAAO,OAAO,QAAS,UAAU;AACnC,UAAI,OAAO,SAAS,OAAO,SAAS;AAClC,cAAM,IAAI;AAAA,UACR;AAAA,QACF;AAGF,gBACE,OAAO,UAAU,KACb,UAAU,iBAAiB,IAAI,OAAO,QAAQ,EAAE,IAChD,OAAO,QAAQ,IAIrB,QAAQ;AAAA,QACN,iBAAiB,QAAQ,YAAY,SAAU,OAAO,MAAM,OAAO,OAAO,MAAM;AAAA,MAClF;AAAA,IAEF;AAEA,IAAI,OAAO,YAEL,OAAO,oBACT,SAAS,KAAK;AAAA,MACZ,kBAAkB,OAAO;AAAA,MACzB;AAAA,IACF,CAAC,GAGH,OAAO,KAAK,OAAO,OAAO,EAAE,QAAQ,CAAC,iBAAiB;AACpD,YAAM,SAAS;AAAA,QACb;AAAA,QACA,OAAO;AAAA,QACP;AAAA,QACA;AAAA,QACA,CAAC,GAAG,aAAa;AAAA,QACjB,WAAW;AAAA,MACb;AAEA,cAAQ,KAAK,GAAG,MAAM;AAAA,IACxB,CAAC;AAAA,EAEL;AAEA,oBAAW,IAAI,GAER;AACT,GAEM,mBAAmB,CACvB,QACA,YACA,SACA,MACA,QAAiC,QAEjC,SAA8B,CAAC,MAEf;AAEhB,YAAU,QAAQ,MAAM,GAAG,EAAE,OAAO,OAAO,EAAE,KAAK,GAAG;AAErD,QAAM,QAAQ,UACV,IAAI;AAAA,IACF,KAAK,QACF,MAAM,GAAG,EACT,IAAI,CAAC,OACA,GAAG,WAAW,GAAG,IACZ,cAAc,GAAG,SAAS,GAAG,IAAI,MAAM,EAAE,MAG3C,GAAG,OAAO,MAAM,OAAO,OAAO,EAAE,CAAC,KACzC,EACA,KAAK,EAAE,CAAC;AAAA,EACb,IACA;AAEJ,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA;AAAA,IAEA,YAAY,CAAC,GAAG,UAAU;AAAA,IAC1B;AAAA;AAAA,IAEA,GAAG,qCAAqC,QAAQ,SAAS,YAAY,MAAM;AAAA;AAAA,EAE7E;AACF,GAEM,0BAA0B,CAC9B,WACA,eAC4B;AAC5B,aAAW,UAAU;AACnB,QAAI,cAAc,OAAO,WAAW,OAAO,WAAW,SAAS,CAAC;AAC9D,aAAO,OAAO;AAKpB,GAGM,mBAAmB,CACvB,WACA,eACA,kBACuB;AACvB,aAAW,UAAU;AACnB,QAAI,cAAc,WAAW,OAAO,cAAc,QAAQ;AACxD,UAAI,cAAc;AAClB,eAAS,IAAI,GAAG,IAAI,cAAc,QAAQ;AACxC,YAAI,cAAc,CAAC,EAAE,cAAc,OAAO,cAAc,CAAC,CAAC,MAAM,GAAG;AACjE,wBAAc;AACd;AAAA,QACF;AAEF,UAAI;AACF,eAAO,cAAc,OAAO,mBAAmB,OAAO,mBAAmB;AAAA,IAE7E;AAGJ;AAKA,IAAI,kBAAkB;AAEtB,SAAS,uBAAuB;AAC9B,oBAAkB;AACpB;AAEA,SAAS,gBAA4C,OAA+B;AAClF,QAAM,MAAM,GAAG,MAAM,IAAI,IAAI,iBAAiB;AAE9C,SAAI,QAAQ,IAAI,oBACd,QAAQ,KAAK,0BAA0B,MAAM,IAAI,WAAW,GAAG,EAAE,GAE5D,EAAE,GAAG,OAAO,IAAI;AACzB;AAKA,MAAM,oBAAoB,CACxB,cACA,OACA,YAEI,UACE,eACK;AAAA,EACL,OAAO;AAAA;AAAA,EAEP,QAAQ,CAAC,gBAAgB,EAAE,MAAM,aAAa,CAAC,GAAG,gBAAgB,KAAK,CAAC;AAC1E,IAEO;AAAA;AAAA,EAEL,QAAQ,CAAC,gBAAgB,KAAK,CAAC;AACjC,IAGE,eACK;AAAA,EACL,OAAO;AAAA;AAAA,EAEP,QAAQ;AAAA,IACN,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAAA,IACtC,gBAAgB,EAAE,GAAG,OAAO,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC;AAAA,EACrD;AACF,IAEO;AAAA;AAAA,EAEL,QAAQ,CAAC,gBAAgB,EAAE,GAAG,OAAO,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;AAC/D,GAKA,0BAA0B,CAG9B,EAAE,MAAM,GAAG,aAAa,GAExB,QACA,eACA,eACG;AACH,MAAI,QAAQ,OAAO,MAAM;AACzB,QAAM,gBAA0B,CAAC;AAEjC,MAAI,eAAe,iBAAiB,MAAM,MAAM,eAAe,aAAa;AAE5E,gBAAc,KAAK,MAAM,IAAI;AAE7B,QAAM,QAAsB,kBAAkB,cAAc,OAAO,OAAO,WAAW,CAAC;AAEtF,MAAI,OAAO,SAAS,GAAG;AACrB,QAAI,cAAc;AAElB,WAAQ,QAAQ,OAAO,MAAM,KAAmB;AAC9C,qBAAe,iBAAiB,MAAM,MAAM,eAAe,aAAa;AAExE,YAAM,mBAAmB,YAAY,SAAS,YAAY,OAAO,SAAS;AAE1E,kBAAY,OAAO,gBAAgB,EAAE,QAAQ;AAAA,QAC3C;AAAA,QACA;AAAA,QACA,OAAO,WAAW;AAAA,MACpB,GAEI,OAAO,SAAS,MAClB,cAAc,YAAY,OAAO,gBAAgB,EAAE,QAGrD,cAAc,KAAK,MAAM,IAAI;AAAA,IAC/B;AAAA,EACF;AAEA,UAAQ,iBAAiB,KAAK,GAG9B,MAAM,OAAO,aAAa;AAQ1B,QAAM,SAAS;AAAA,IACb;AAAA,IACA;AAAA,IACA,aAAa,wBAAwB,MAAM,MAAM,UAAU,IAAI;AAAA,IAC/D,aAAa;AAAA,EACf;AAGA,SAAI,WACF,MAAM,SAAS,EAAE,GAAG,MAAM,QAAQ,GAAG,OAAO,IAGvC;AACT;",
|
|
5
5
|
"names": ["routes"]
|
|
6
6
|
}
|
|
@@ -4,6 +4,7 @@ import { findFocusedRoute } from "./findFocusedRoute.mjs";
|
|
|
4
4
|
import { appendIsInitial, createConfigItemAdditionalProperties, decodeURIComponentSafe, formatRegexPattern, getRouteConfigSorter, getUrlWithReactNavigationConcessions, matchForEmptyPath, parseQueryParamsExtended, populateParams } from "./getStateFromPath-mods.mjs";
|
|
5
5
|
import { validatePathConfig } from "./validatePathConfig.mjs";
|
|
6
6
|
function getStateFromPath(path, options) {
|
|
7
|
+
resetRouteKeyCounter(), process.env.ONE_DEBUG_ROUTER && console.info(`[one] getStateFromPath called with path=${path}, isServer=${typeof window > "u"}`);
|
|
7
8
|
const {
|
|
8
9
|
initialRoutes,
|
|
9
10
|
configs,
|
|
@@ -197,31 +198,46 @@ const joinPaths = (...paths) => [].concat(...paths.map(p => p.split("/"))).filte
|
|
|
197
198
|
}
|
|
198
199
|
if (sameParents) return routeName !== config.initialRouteName ? config.initialRouteName : void 0;
|
|
199
200
|
}
|
|
200
|
-
}
|
|
201
|
-
|
|
201
|
+
};
|
|
202
|
+
let routeKeyCounter = 0;
|
|
203
|
+
function resetRouteKeyCounter() {
|
|
204
|
+
routeKeyCounter = 0;
|
|
205
|
+
}
|
|
206
|
+
function getRouteWithKey(route) {
|
|
207
|
+
const key = `${route.name}-${routeKeyCounter++}`;
|
|
208
|
+
return process.env.ONE_DEBUG_ROUTER && console.info(`[one] getRouteWithKey: ${route.name} -> key=${key}`), {
|
|
209
|
+
...route,
|
|
210
|
+
key
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
const createStateObject = (initialRoute, route, isEmpty) => isEmpty ? initialRoute ? {
|
|
202
214
|
index: 1,
|
|
203
|
-
|
|
215
|
+
// @modified: add deterministic keys
|
|
216
|
+
routes: [getRouteWithKey({
|
|
204
217
|
name: initialRoute
|
|
205
|
-
}, route]
|
|
218
|
+
}), getRouteWithKey(route)]
|
|
206
219
|
} : {
|
|
207
|
-
|
|
220
|
+
// @modified: add deterministic keys
|
|
221
|
+
routes: [getRouteWithKey(route)]
|
|
208
222
|
} : initialRoute ? {
|
|
209
223
|
index: 1,
|
|
210
|
-
|
|
224
|
+
// @modified: add deterministic keys
|
|
225
|
+
routes: [getRouteWithKey({
|
|
211
226
|
name: initialRoute
|
|
212
|
-
}, {
|
|
227
|
+
}), getRouteWithKey({
|
|
213
228
|
...route,
|
|
214
229
|
state: {
|
|
215
230
|
routes: []
|
|
216
231
|
}
|
|
217
|
-
}]
|
|
232
|
+
})]
|
|
218
233
|
} : {
|
|
219
|
-
|
|
234
|
+
// @modified: add deterministic keys
|
|
235
|
+
routes: [getRouteWithKey({
|
|
220
236
|
...route,
|
|
221
237
|
state: {
|
|
222
238
|
routes: []
|
|
223
239
|
}
|
|
224
|
-
}]
|
|
240
|
+
})]
|
|
225
241
|
},
|
|
226
242
|
createNestedStateObject = ({
|
|
227
243
|
path,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["escape","getParamValue","isDynamicPart","replacePart","findFocusedRoute","appendIsInitial","createConfigItemAdditionalProperties","decodeURIComponentSafe","formatRegexPattern","getRouteConfigSorter","getUrlWithReactNavigationConcessions","matchForEmptyPath","parseQueryParamsExtended","populateParams","validatePathConfig","getStateFromPath","path","options","initialRoutes","configs","configWithRegexes","getConfigResources","screens","pathData","remaining","nonstandardPathname","replace","endsWith","prefix","normalizedPrefix","startsWith","routes2","split","filter","Boolean","map","segment","name","decodeURIComponent","length","createNestedStateObject","match","routeNames","result","current","routes","remainingPath","matchAgainstConfigs","cachedConfigResources","WeakMap","prepareConfigResources","cached","get","resources","set","previousSegments","getInitialRoutes","getNormalizedConfigs","checkForDuplicatedConfigs","getConfigsWithRegexes","initialRouteName","push","parentScreens","concat","Object","keys","key","createNormalizedConfigs","sort","reduce","acc","config","pattern","a","b","every","it","i","Error","join","assign","c","regex","RegExp","joinPaths","paths","p","allParams","create","matchedParams","index","pos","decodedParamSegment","routeConfig","find","screen","normalizedPath","numInitialSegments","params","offset","value","parse","initials","parentPattern","createConfigItem","exact","forEach","nestedConfig","pop","findParseConfigForRoute","routeName","flatConfig","findInitialRoute","sameParents","localeCompare","createStateObject","initialRoute","route","isEmpty","state","restPathData","shift","nestedState","nestedStateIndex","pathWithoutGroups","hash"],"sources":["../../../src/fork/getStateFromPath.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["escape","getParamValue","isDynamicPart","replacePart","findFocusedRoute","appendIsInitial","createConfigItemAdditionalProperties","decodeURIComponentSafe","formatRegexPattern","getRouteConfigSorter","getUrlWithReactNavigationConcessions","matchForEmptyPath","parseQueryParamsExtended","populateParams","validatePathConfig","getStateFromPath","path","options","resetRouteKeyCounter","process","env","ONE_DEBUG_ROUTER","console","info","window","initialRoutes","configs","configWithRegexes","getConfigResources","screens","pathData","remaining","nonstandardPathname","replace","endsWith","prefix","normalizedPrefix","startsWith","routes2","split","filter","Boolean","map","segment","name","decodeURIComponent","length","createNestedStateObject","match","routeNames","result","current","routes","remainingPath","matchAgainstConfigs","cachedConfigResources","WeakMap","prepareConfigResources","cached","get","resources","set","previousSegments","getInitialRoutes","getNormalizedConfigs","checkForDuplicatedConfigs","getConfigsWithRegexes","initialRouteName","push","parentScreens","concat","Object","keys","key","createNormalizedConfigs","sort","reduce","acc","config","pattern","a","b","every","it","i","Error","join","assign","c","regex","RegExp","joinPaths","paths","p","allParams","create","matchedParams","index","pos","decodedParamSegment","routeConfig","find","screen","normalizedPath","numInitialSegments","params","offset","value","parse","initials","parentPattern","createConfigItem","exact","forEach","nestedConfig","pop","findParseConfigForRoute","routeName","flatConfig","findInitialRoute","sameParents","localeCompare","routeKeyCounter","getRouteWithKey","route","createStateObject","initialRoute","isEmpty","state","restPathData","shift","nestedState","nestedStateIndex","pathWithoutGroups","hash"],"sources":["../../../src/fork/getStateFromPath.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -9,8 +9,9 @@ function _type_of(obj) {
|
|
|
9
9
|
return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
10
10
|
}
|
|
11
11
|
function getStateFromPath(path, options) {
|
|
12
|
-
var _options_path
|
|
13
|
-
|
|
12
|
+
var _options_path;
|
|
13
|
+
resetRouteKeyCounter(), process.env.ONE_DEBUG_ROUTER && console.info(`[one] getStateFromPath called with path=${path}, isServer=${typeof window > "u"}`);
|
|
14
|
+
var {
|
|
14
15
|
initialRoutes,
|
|
15
16
|
configs,
|
|
16
17
|
configWithRegexes
|
|
@@ -289,31 +290,46 @@ var joinPaths = function () {
|
|
|
289
290
|
}
|
|
290
291
|
}
|
|
291
292
|
},
|
|
292
|
-
|
|
293
|
+
routeKeyCounter = 0;
|
|
294
|
+
function resetRouteKeyCounter() {
|
|
295
|
+
routeKeyCounter = 0;
|
|
296
|
+
}
|
|
297
|
+
function getRouteWithKey(route) {
|
|
298
|
+
var key = `${route.name}-${routeKeyCounter++}`;
|
|
299
|
+
return process.env.ONE_DEBUG_ROUTER && console.info(`[one] getRouteWithKey: ${route.name} -> key=${key}`), {
|
|
300
|
+
...route,
|
|
301
|
+
key
|
|
302
|
+
};
|
|
303
|
+
}
|
|
304
|
+
var createStateObject = function (initialRoute, route, isEmpty) {
|
|
293
305
|
return isEmpty ? initialRoute ? {
|
|
294
306
|
index: 1,
|
|
295
|
-
|
|
307
|
+
// @modified: add deterministic keys
|
|
308
|
+
routes: [getRouteWithKey({
|
|
296
309
|
name: initialRoute
|
|
297
|
-
}, route]
|
|
310
|
+
}), getRouteWithKey(route)]
|
|
298
311
|
} : {
|
|
299
|
-
|
|
312
|
+
// @modified: add deterministic keys
|
|
313
|
+
routes: [getRouteWithKey(route)]
|
|
300
314
|
} : initialRoute ? {
|
|
301
315
|
index: 1,
|
|
302
|
-
|
|
316
|
+
// @modified: add deterministic keys
|
|
317
|
+
routes: [getRouteWithKey({
|
|
303
318
|
name: initialRoute
|
|
304
|
-
}, {
|
|
319
|
+
}), getRouteWithKey({
|
|
305
320
|
...route,
|
|
306
321
|
state: {
|
|
307
322
|
routes: []
|
|
308
323
|
}
|
|
309
|
-
}]
|
|
324
|
+
})]
|
|
310
325
|
} : {
|
|
311
|
-
|
|
326
|
+
// @modified: add deterministic keys
|
|
327
|
+
routes: [getRouteWithKey({
|
|
312
328
|
...route,
|
|
313
329
|
state: {
|
|
314
330
|
routes: []
|
|
315
331
|
}
|
|
316
|
-
}]
|
|
332
|
+
})]
|
|
317
333
|
};
|
|
318
334
|
},
|
|
319
335
|
createNestedStateObject = function (param, routes, initialRoutes, flatConfig) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["escape","getParamValue","isDynamicPart","replacePart","findFocusedRoute","appendIsInitial","createConfigItemAdditionalProperties","decodeURIComponentSafe","formatRegexPattern","getRouteConfigSorter","getUrlWithReactNavigationConcessions","matchForEmptyPath","parseQueryParamsExtended","populateParams","validatePathConfig","_type_of","obj","Symbol","constructor","getStateFromPath","path","options","_options_path","initialRoutes","configs","configWithRegexes","getConfigResources","screens","pathData","remaining","nonstandardPathname","replace","endsWith","prefix","normalizedPrefix","startsWith","routes","split","filter","Boolean","map","segment","name","decodeURIComponent","length","createNestedStateObject","match","routeNames","result","current","routes1","remainingPath","matchAgainstConfigs","cachedConfigResources","WeakMap","prepareConfigResources","cached","get","resources","set","previousSegments","getInitialRoutes","getNormalizedConfigs","checkForDuplicatedConfigs","getConfigsWithRegexes","initialRouteName","push","parentScreens","arguments","concat","Object","keys","key","createNormalizedConfigs","sort","reduce","acc","config","pattern","a","b","intersects","every","it","i","Error","join","assign","c","regex","RegExp","joinPaths","_len","paths","Array","_key","p","allParams","create","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","_step","value","_config_pattern","matchResult","index","pos","decodedParamSegment","matchedParams","_routeConfig_pattern_replace","routeConfig","find","screen","normalizedPath","numInitialSegments","params","_matchedParams_p","offset","_routeConfig_parse","parse","_iterator","iterator","next","done","_ret","err","return","initials","parentPattern","createConfigItem","pattern1","exact","forEach","nestedConfig","pop","findParseConfigForRoute","routeName","flatConfig","findInitialRoute","sameParents","localeCompare"],"sources":["../../../src/fork/getStateFromPath.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["escape","getParamValue","isDynamicPart","replacePart","findFocusedRoute","appendIsInitial","createConfigItemAdditionalProperties","decodeURIComponentSafe","formatRegexPattern","getRouteConfigSorter","getUrlWithReactNavigationConcessions","matchForEmptyPath","parseQueryParamsExtended","populateParams","validatePathConfig","_type_of","obj","Symbol","constructor","getStateFromPath","path","options","_options_path","resetRouteKeyCounter","process","env","ONE_DEBUG_ROUTER","console","info","window","initialRoutes","configs","configWithRegexes","getConfigResources","screens","pathData","remaining","nonstandardPathname","replace","endsWith","prefix","normalizedPrefix","startsWith","routes","split","filter","Boolean","map","segment","name","decodeURIComponent","length","createNestedStateObject","match","routeNames","result","current","routes1","remainingPath","matchAgainstConfigs","cachedConfigResources","WeakMap","prepareConfigResources","cached","get","resources","set","previousSegments","getInitialRoutes","getNormalizedConfigs","checkForDuplicatedConfigs","getConfigsWithRegexes","initialRouteName","push","parentScreens","arguments","concat","Object","keys","key","createNormalizedConfigs","sort","reduce","acc","config","pattern","a","b","intersects","every","it","i","Error","join","assign","c","regex","RegExp","joinPaths","_len","paths","Array","_key","p","allParams","create","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","_step","value","_config_pattern","matchResult","index","pos","decodedParamSegment","matchedParams","_routeConfig_pattern_replace","routeConfig","find","screen","normalizedPath","numInitialSegments","params","_matchedParams_p","offset","_routeConfig_parse","parse","_iterator","iterator","next","done","_ret","err","return","initials","parentPattern","createConfigItem","pattern1","exact","forEach","nestedConfig","pop","findParseConfigForRoute","routeName","flatConfig","findInitialRoute","sameParents","localeCompare","routeKeyCounter"],"sources":["../../../src/fork/getStateFromPath.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -35,7 +35,7 @@ describe("baseUrl", () => {
|
|
|
35
35
|
process.env.EXPO_BASE_URL = "/expo/prefix";
|
|
36
36
|
const path = "/expo/prefix/bar", config = getMockConfig(["_layout.tsx", "bar.tsx", "index.tsx"]);
|
|
37
37
|
expect(getStateFromPath(path, config)).toEqual({
|
|
38
|
-
routes: [{ name: "bar", path: "/bar" }]
|
|
38
|
+
routes: [{ name: "bar", path: "/bar", key: "bar-0" }]
|
|
39
39
|
}), expect(getPathFromState(getStateFromPath(path, config), config)).toBe(
|
|
40
40
|
"/expo/prefix/bar"
|
|
41
41
|
);
|
|
@@ -43,7 +43,7 @@ describe("baseUrl", () => {
|
|
|
43
43
|
process.env.EXPO_BASE_URL = "/expo";
|
|
44
44
|
const path = "/bar", config = getMockConfig(["_layout.tsx", "bar.tsx", "index.tsx"]);
|
|
45
45
|
expect(getStateFromPath(path, config)).toEqual({
|
|
46
|
-
routes: [{ name: "bar", path: "/bar" }]
|
|
46
|
+
routes: [{ name: "bar", path: "/bar", key: "bar-0" }]
|
|
47
47
|
}), expect(getPathFromState(getStateFromPath(path, config), config)).toBe(
|
|
48
48
|
"/expo/bar"
|
|
49
49
|
);
|
|
@@ -91,7 +91,8 @@ describe("hash", () => {
|
|
|
91
91
|
path: "/hello#123",
|
|
92
92
|
params: {
|
|
93
93
|
"#": "123"
|
|
94
|
-
}
|
|
94
|
+
},
|
|
95
|
+
key: "hello-0"
|
|
95
96
|
}
|
|
96
97
|
]
|
|
97
98
|
});
|
|
@@ -104,7 +105,8 @@ describe("hash", () => {
|
|
|
104
105
|
hello: "hello",
|
|
105
106
|
"#": "123"
|
|
106
107
|
},
|
|
107
|
-
path: "/hello#123"
|
|
108
|
+
path: "/hello#123",
|
|
109
|
+
key: "[hello]-0"
|
|
108
110
|
}
|
|
109
111
|
]
|
|
110
112
|
});
|
|
@@ -116,7 +118,8 @@ describe("hash", () => {
|
|
|
116
118
|
path: "/?#123",
|
|
117
119
|
params: {
|
|
118
120
|
"#": "123"
|
|
119
|
-
}
|
|
121
|
+
},
|
|
122
|
+
key: "index-0"
|
|
120
123
|
}
|
|
121
124
|
]
|
|
122
125
|
});
|
|
@@ -133,7 +136,8 @@ it("supports spaces", () => {
|
|
|
133
136
|
routes: [
|
|
134
137
|
{
|
|
135
138
|
name: "hello world",
|
|
136
|
-
path: "/hello%20world"
|
|
139
|
+
path: "/hello%20world",
|
|
140
|
+
key: "hello world-0"
|
|
137
141
|
}
|
|
138
142
|
]
|
|
139
143
|
}), expect(getStateFromPath("/hello%20world", getMockConfig(["[hello world]"]))).toEqual({
|
|
@@ -143,7 +147,8 @@ it("supports spaces", () => {
|
|
|
143
147
|
params: {
|
|
144
148
|
"hello world": "hello world"
|
|
145
149
|
},
|
|
146
|
-
path: "/hello%20world"
|
|
150
|
+
path: "/hello%20world",
|
|
151
|
+
key: "[hello world]-0"
|
|
147
152
|
}
|
|
148
153
|
]
|
|
149
154
|
});
|
|
@@ -205,16 +210,19 @@ it("adds dynamic route params from all levels of the path", () => {
|
|
|
205
210
|
{
|
|
206
211
|
name: "[foo]",
|
|
207
212
|
params: { baz: "baz", foo: "foo" },
|
|
213
|
+
key: "[foo]-0",
|
|
208
214
|
state: {
|
|
209
215
|
routes: [
|
|
210
216
|
{
|
|
211
217
|
name: "bar",
|
|
212
218
|
params: { baz: "baz", foo: "foo" },
|
|
219
|
+
key: "bar-1",
|
|
213
220
|
state: {
|
|
214
221
|
routes: [
|
|
215
222
|
{
|
|
216
223
|
name: "[baz]",
|
|
217
224
|
params: { baz: "baz", foo: "foo" },
|
|
225
|
+
key: "[baz]-2",
|
|
218
226
|
state: {
|
|
219
227
|
routes: [
|
|
220
228
|
{
|
|
@@ -223,7 +231,8 @@ it("adds dynamic route params from all levels of the path", () => {
|
|
|
223
231
|
baz: "baz",
|
|
224
232
|
foo: "foo"
|
|
225
233
|
},
|
|
226
|
-
path: "/foo/bar/baz/other"
|
|
234
|
+
path: "/foo/bar/baz/other",
|
|
235
|
+
key: "other-3"
|
|
227
236
|
}
|
|
228
237
|
]
|
|
229
238
|
}
|
|
@@ -247,7 +256,8 @@ it("handles not-found routes", () => {
|
|
|
247
256
|
params: {
|
|
248
257
|
"not-found": ["missing-page"]
|
|
249
258
|
},
|
|
250
|
-
path: "/missing-page"
|
|
259
|
+
path: "/missing-page",
|
|
260
|
+
key: "+not-found-0"
|
|
251
261
|
}
|
|
252
262
|
]
|
|
253
263
|
});
|
|
@@ -267,12 +277,13 @@ it("handles query params", () => {
|
|
|
267
277
|
hello: "world",
|
|
268
278
|
array: ["1", "2"]
|
|
269
279
|
},
|
|
270
|
-
path: "/?test=true&hello=world&array=1&array=2"
|
|
280
|
+
path: "/?test=true&hello=world&array=1&array=2",
|
|
281
|
+
key: "index-0"
|
|
271
282
|
}
|
|
272
283
|
]
|
|
273
284
|
});
|
|
274
285
|
});
|
|
275
|
-
it("handles query params", () => {
|
|
286
|
+
it("handles query params (duplicate)", () => {
|
|
276
287
|
expect(
|
|
277
288
|
getStateFromPath(
|
|
278
289
|
"/?test=true&hello=world&array=1&array=2",
|
|
@@ -287,7 +298,8 @@ it("handles query params", () => {
|
|
|
287
298
|
hello: "world",
|
|
288
299
|
array: ["1", "2"]
|
|
289
300
|
},
|
|
290
|
-
path: "/?test=true&hello=world&array=1&array=2"
|
|
301
|
+
path: "/?test=true&hello=world&array=1&array=2",
|
|
302
|
+
key: "index-0"
|
|
291
303
|
}
|
|
292
304
|
]
|
|
293
305
|
});
|