one 1.14.4 → 1.15.0

package/dist/esm/router/useViteRoutes.native.js

@@ -1,28 +1,37 @@
 import { hmrImport } from "./hmrImport.native.js";
-var lastVersion = 0,
-  context;
+var lastVersion = 0;
+var context;
 function useViteRoutes(routes, routerRoot, options, version) {
   if (version && version > lastVersion) {
-    context = null, lastVersion = version;
-    var _iteratorNormalCompletion = !0,
-      _didIteratorError = !1,
+    context = null;
+    lastVersion = version;
+    var _iteratorNormalCompletion = true,
+      _didIteratorError = false,
       _iteratorError = void 0;
     try {
-      for (var _iterator = Object.keys(preloadedModules)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+      for (var _iterator = Object.keys(preloadedModules)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
         var key = _step.value;
         delete preloadedModules[key];
       }
     } catch (err) {
-      _didIteratorError = !0, _iteratorError = err;
+      _didIteratorError = true;
+      _iteratorError = err;
     } finally {
       try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
+        }
       } finally {
-        if (_didIteratorError) throw _iteratorError;
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
       }
     }
   }
-  return context || loadRoutes(routes, routerRoot, options), context;
+  if (!context) {
+    loadRoutes(routes, routerRoot, options);
+  }
+  return context;
 }
 var preloadedModules = {};
 function registerPreloadedRoute(key, module) {
@@ -35,142 +44,208 @@ function getPreloadedModuleKeys() {
   return Object.keys(preloadedModules);
 }
 function matchDynamicRoute(routePattern, actualPath) {
-  var routeSegments = routePattern.split("/"),
-    pathSegments = actualPath.split("/"),
-    hasCatchAll = routeSegments.some(function (s) {
+  var routeSegments = routePattern.split("/");
+  var pathSegments = actualPath.split("/");
+  var hasCatchAll = routeSegments.some(function (s) {
+    return s.startsWith("[...");
+  });
+  if (hasCatchAll) {
+    var catchAllIdx = routeSegments.findIndex(function (s) {
       return s.startsWith("[...");
     });
-  if (hasCatchAll) {
-    for (var catchAllIdx = routeSegments.findIndex(function (s) {
-        return s.startsWith("[...");
-      }), i = 0; i < catchAllIdx; i++) if (routeSegments[i] && !routeSegments[i].startsWith("[") && routeSegments[i] !== pathSegments[i]) return !1;
+    for (var i = 0; i < catchAllIdx; i++) {
+      if (!routeSegments[i]) continue;
+      if (routeSegments[i].startsWith("[")) continue;
+      if (routeSegments[i] !== pathSegments[i]) return false;
+    }
     return pathSegments.length >= catchAllIdx;
   }
-  if (routeSegments.length !== pathSegments.length) return !1;
+  if (routeSegments.length !== pathSegments.length) return false;
   for (var i1 = 0; i1 < routeSegments.length; i1++) {
-    var routeSeg = routeSegments[i1],
-      pathSeg = pathSegments[i1];
-    if (!(routeSeg.startsWith("[") && routeSeg.endsWith("]")) && routeSeg !== pathSeg) return !1;
+    var routeSeg = routeSegments[i1];
+    var pathSeg = pathSegments[i1];
+    if (routeSeg.startsWith("[") && routeSeg.endsWith("]")) {
+      continue;
+    }
+    if (routeSeg !== pathSeg) return false;
   }
-  return !0;
+  return true;
 }
 async function preloadRouteModules(href) {
-  var globbed = globalThis.__importMetaGlobbed;
-  if (globbed) {
-    var normalizedHref = href === "/" ? "" : href.replace(/^\//, "").replace(/\/$/, ""),
-      promises = [],
-      _iteratorNormalCompletion = !0,
-      _didIteratorError = !1,
-      _iteratorError = void 0;
+  var globbed = globalThis["__importMetaGlobbed"];
+  if (!globbed) return;
+  var normalizedHref = href === "/" ? "" : href.replace(/^\//, "").replace(/\/$/, "");
+  var promises = [];
+  var _iteratorNormalCompletion = true,
+    _didIteratorError = false,
+    _iteratorError = void 0;
+  try {
+    var _loop = function () {
+      var key = _step.value;
+      var routePath = key.replace(/^\/[^/]+\//, "");
+      routePath = routePath.replace(/\([^)]+\)\//g, "");
+      routePath = routePath.replace(/\/_layout\.tsx$/, "").replace(/\/index(\+[a-z]+)?\.tsx$/, "").replace(/(\+[a-z]+)?\.tsx$/, "");
+      routePath = routePath.replace(/^\//, "");
+      var isStaticMatch = routePath === normalizedHref ||
+      // exact match
+      routePath.startsWith(normalizedHref + "/") ||
+      // child route
+      normalizedHref.startsWith(routePath + "/") ||
+      // parent layout
+      routePath === "" ||
+      // root layout
+      normalizedHref !== "" && routePath === normalizedHref.split("/")[0];
+      var isDynamicMatch = routePath.includes("[") && matchDynamicRoute(routePath, normalizedHref);
+      if ((isStaticMatch || isDynamicMatch) && typeof globbed[key] === "function") {
+        promises.push(globbed[key]().then(function (mod) {
+          preloadedModules[key] = mod;
+        }).catch(function () {}));
+      }
+    };
+    for (var _iterator = Object.keys(globbed)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
     try {
-      for (var _loop = function () {
-          var key = _step.value,
-            routePath = key.replace(/^\/[^/]+\//, "");
-          routePath = routePath.replace(/\([^)]+\)\//g, ""), routePath = routePath.replace(/\/_layout\.tsx$/, "").replace(/\/index(\+[a-z]+)?\.tsx$/, "").replace(/(\+[a-z]+)?\.tsx$/, ""), routePath = routePath.replace(/^\//, "");
-          var isStaticMatch = routePath === normalizedHref ||
-            // exact match
-            routePath.startsWith(normalizedHref + "/") ||
-            // child route
-            normalizedHref.startsWith(routePath + "/") ||
-            // parent layout
-            routePath === "" ||
-            // root layout
-            normalizedHref !== "" && routePath === normalizedHref.split("/")[0],
-            isDynamicMatch = routePath.includes("[") && matchDynamicRoute(routePath, normalizedHref);
-          (isStaticMatch || isDynamicMatch) && typeof globbed[key] == "function" && promises.push(globbed[key]().then(function (mod) {
-            preloadedModules[key] = mod;
-          }).catch(function () {}));
-        }, _iterator = Object.keys(globbed)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
-    } catch (err) {
-      _didIteratorError = !0, _iteratorError = err;
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
     } finally {
-      try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-      } finally {
-        if (_didIteratorError) throw _iteratorError;
+      if (_didIteratorError) {
+        throw _iteratorError;
       }
     }
-    await Promise.all(promises);
   }
+  await Promise.all(promises);
 }
 function loadRoutes(paths, routerRoot, options) {
-  return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, routerRoot, options), context);
+  if (context) return context;
+  globalThis["__importMetaGlobbed"] = paths;
+  context = globbedRoutesToRouteContext(paths, routerRoot, options);
+  return context;
 }
 function globbedRoutesToRouteContext(paths, routerRoot, options) {
-  var routesSync = {},
-    routePaths = {},
-    promises = {},
-    loadedRoutes = {},
-    clears = {};
+  var routesSync = {};
+  var routePaths = {};
+  var promises = {};
+  var loadedRoutes = {};
+  var clears = {};
   Object.keys(paths).forEach(function (path) {
     var _options_routeModes;
     if (!paths[path]) {
       console.error(`Error: Missing route at path ${path}`);
       return;
     }
-    var loadRouteFunction = paths[path],
-      pathWithoutRelative = path.replace(`/${routerRoot}/`, "./"),
-      originalPath = pathWithoutRelative.slice(1).replace(/\.[jt]sx?$/, "");
-    (options == null || (_options_routeModes = options.routeModes) === null || _options_routeModes === void 0 ? void 0 : _options_routeModes[originalPath]) === "spa" ? (console.info(`Spa mode: ${originalPath}`), loadedRoutes[pathWithoutRelative] = function () {
-      return null;
-    }) : (routesSync[pathWithoutRelative] = loadRouteFunction, routePaths[pathWithoutRelative] = path);
-  });
-  var moduleKeys = Object.keys(routesSync),
-    hmrVersion = 0;
-  typeof window < "u" && (window.__oneRouteCache = {
-    clear: function () {
-      hmrVersion++, Object.keys(loadedRoutes).forEach(function (key) {
-        delete loadedRoutes[key];
-      }), Object.keys(promises).forEach(function (key) {
-        delete promises[key];
-      }), Object.keys(preloadedModules).forEach(function (key) {
-        delete preloadedModules[key];
-      });
-    },
-    clearFile: function (file) {
-      hmrVersion++;
-      var normalizedFile = file.replace(/^app\//, "./");
-      Object.keys(loadedRoutes).forEach(function (key) {
-        (key === normalizedFile || key.endsWith(normalizedFile.replace("./", "/"))) && delete loadedRoutes[key];
-      }), Object.keys(promises).forEach(function (key) {
-        (key === normalizedFile || key.endsWith(normalizedFile.replace("./", "/"))) && delete promises[key];
-      }), Object.keys(preloadedModules).forEach(function (key) {
-        key.includes(file) && delete preloadedModules[key];
-      });
-    },
-    getVersion: function () {
-      return hmrVersion;
+    var loadRouteFunction = paths[path];
+    var pathWithoutRelative = path.replace(`/${routerRoot}/`, "./");
+    var originalPath = pathWithoutRelative.slice(1).replace(/\.[jt]sx?$/, "");
+    if ((options === null || options === void 0 ? void 0 : (_options_routeModes = options.routeModes) === null || _options_routeModes === void 0 ? void 0 : _options_routeModes[originalPath]) === "spa") {
+      console.info(`Spa mode: ${originalPath}`);
+      loadedRoutes[pathWithoutRelative] = function () {
+        return null;
+      };
+    } else {
+      routesSync[pathWithoutRelative] = loadRouteFunction;
+      routePaths[pathWithoutRelative] = path;
     }
   });
+  var moduleKeys = Object.keys(routesSync);
+  var hmrVersion = 0;
+  if (typeof window !== "undefined") {
+    ;
+    window.__oneRouteCache = {
+      clear: function () {
+        hmrVersion++;
+        Object.keys(loadedRoutes).forEach(function (key) {
+          delete loadedRoutes[key];
+        });
+        Object.keys(promises).forEach(function (key) {
+          delete promises[key];
+        });
+        Object.keys(preloadedModules).forEach(function (key) {
+          delete preloadedModules[key];
+        });
+      },
+      clearFile: function (file) {
+        hmrVersion++;
+        var normalizedFile = file.replace(/^app\//, "./");
+        Object.keys(loadedRoutes).forEach(function (key) {
+          if (key === normalizedFile || key.endsWith(normalizedFile.replace("./", "/"))) {
+            delete loadedRoutes[key];
+          }
+        });
+        Object.keys(promises).forEach(function (key) {
+          if (key === normalizedFile || key.endsWith(normalizedFile.replace("./", "/"))) {
+            delete promises[key];
+          }
+        });
+        Object.keys(preloadedModules).forEach(function (key) {
+          if (key.includes(file)) {
+            delete preloadedModules[key];
+          }
+        });
+      },
+      getVersion: function () {
+        return hmrVersion;
+      }
+    };
+  }
   function resolve(id) {
-    if (clearTimeout(clears[id]), loadedRoutes[id]) return loadedRoutes[id];
-    var preloadKey = id.replace("./", `/${routerRoot}/`),
-      preloaded = getPreloadedModule(preloadKey);
-    if (preloaded) return loadedRoutes[id] = preloaded, preloaded;
-    if (typeof routesSync[id] != "function") return routesSync[id];
+    clearTimeout(clears[id]);
+    if (loadedRoutes[id]) {
+      return loadedRoutes[id];
+    }
+    var preloadKey = id.replace("./", `/${routerRoot}/`);
+    var preloaded = getPreloadedModule(preloadKey);
+    if (preloaded) {
+      loadedRoutes[id] = preloaded;
+      return preloaded;
+    }
+    if (typeof routesSync[id] !== "function") {
+      return routesSync[id];
+    }
     if (!promises[id]) {
       var importPromise;
-      process.env.NODE_ENV === "development" && hmrVersion > 0 && routePaths[id] ? importPromise = hmrImport(routePaths[id]).catch(function () {
-        return routesSync[id]();
-      }) : importPromise = routesSync[id](), promises[id] = importPromise.then(function (val) {
-        return loadedRoutes[id] = val, delete promises[id], clears[id] = setTimeout(function () {
-          delete loadedRoutes[id];
-        }, 500), val;
+      if (process.env.NODE_ENV === "development" && hmrVersion > 0 && routePaths[id]) {
+        importPromise = hmrImport(routePaths[id]).catch(function () {
+          return routesSync[id]();
+        });
+      } else {
+        importPromise = routesSync[id]();
+      }
+      promises[id] = importPromise.then(function (val) {
+        loadedRoutes[id] = val;
+        delete promises[id];
+        if (process.env.NODE_ENV === "development") {
+          clears[id] = setTimeout(function () {
+            delete loadedRoutes[id];
+          }, 500);
+        }
+        return val;
       }).catch(function (err) {
-        console.error("Error loading route", id, err, new Error().stack), loadedRoutes[id] = {
+        console.error(`Error loading route`, id, err, new Error().stack);
+        loadedRoutes[id] = {
           default: function () {
             return null;
           }
-        }, delete promises[id];
-      }), process.env.NODE_ENV === "development" && (promises[id].stack = new Error().stack);
+        };
+        delete promises[id];
+      });
+      if (process.env.NODE_ENV === "development") {
+        promises[id].stack = new Error().stack;
+      }
     }
     throw promises[id];
   }
-  return resolve.keys = function () {
+  resolve.keys = function () {
     return moduleKeys;
-  }, resolve.id = "", resolve.resolve = function (id) {
+  };
+  resolve.id = "";
+  resolve.resolve = function (id) {
     return id;
-  }, resolve;
+  };
+  return resolve;
 }
 export { getPreloadedModule, getPreloadedModuleKeys, globbedRoutesToRouteContext, loadRoutes, preloadRouteModules, registerPreloadedRoute, useViteRoutes };
 //# sourceMappingURL=useViteRoutes.native.js.map

package/dist/esm/router/useViteRoutes.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["hmrImport","lastVersion","context","useViteRoutes","routes","routerRoot","options","version","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","keys","preloadedModules","Symbol","iterator","_step","next","done","key","value","err","return","loadRoutes","registerPreloadedRoute","module","getPreloadedModule","getPreloadedModuleKeys","matchDynamicRoute","routePattern","actualPath","routeSegments","split","pathSegments","hasCatchAll","some","s","startsWith","catchAllIdx","findIndex","i","length","i1","routeSeg","pathSeg","endsWith","preloadRouteModules","href","globbed","globalThis","__importMetaGlobbed","normalizedHref","replace","promises","_loop","routePath","isStaticMatch","isDynamicMatch","includes","push","then","mod","catch","Promise","all","paths","globbedRoutesToRouteContext","routesSync","routePaths","loadedRoutes","clears","forEach","path","_options_routeModes","console","error","loadRouteFunction","pathWithoutRelative","originalPath","slice","routeModes","info","moduleKeys","hmrVersion","window","__oneRouteCache","clear","clearFile","file","normalizedFile"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["hmrImport","lastVersion","context","useViteRoutes","routes","routerRoot","options","version","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","keys","preloadedModules","Symbol","iterator","_step","next","done","key","value","err","return","loadRoutes","registerPreloadedRoute","module","getPreloadedModule","getPreloadedModuleKeys","matchDynamicRoute","routePattern","actualPath","routeSegments","split","pathSegments","hasCatchAll","some","s","startsWith","catchAllIdx","findIndex","i","length","i1","routeSeg","pathSeg","endsWith","preloadRouteModules","href","globbed","globalThis","normalizedHref","replace","promises","_loop","routePath","isStaticMatch","isDynamicMatch","includes","push","then","mod","catch","Promise","all","paths","globbedRoutesToRouteContext","routesSync","routePaths","loadedRoutes","clears","forEach","path","_options_routeModes","console","error","loadRouteFunction","pathWithoutRelative","originalPath","slice","routeModes","info","moduleKeys","hmrVersion","window","__oneRouteCache","clear","clearFile","file","normalizedFile","getVersion","resolve","id","clearTimeout","preloadKey","preloaded"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/router/utils/getNavigateAction.mjs

@@ -3,28 +3,50 @@ import { setLastAction } from "../lastAction.mjs";
 import { matchDynamicName } from "../matchers.mjs";
 function getNavigateAction(actionState, navigationState, type = "NAVIGATE") {
   let actionStateRoute;
-  for (; actionState && navigationState;) {
+  while (actionState && navigationState) {
     const stateRoute = navigationState.routes[navigationState.index];
     actionStateRoute = actionState.routes[actionState.routes.length - 1];
-    const childState = actionStateRoute.state,
-      nextNavigationState = stateRoute.state,
-      dynamicMatch = matchDynamicName(actionStateRoute.name);
-    if (actionStateRoute.name !== stateRoute.name ||
+    const childState = actionStateRoute.state;
+    const nextNavigationState = stateRoute.state;
+    const dynamicMatch = matchDynamicName(actionStateRoute.name);
+    const didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name ||
     // !deepEqual(actionStateRoute.params, stateRoute.params) ||
-    !childState || !nextNavigationState || dynamicMatch && actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name]) break;
-    actionState = childState, navigationState = nextNavigationState;
+    !childState || !nextNavigationState || dynamicMatch && actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name];
+    if (didActionAndCurrentStateDiverge) {
+      break;
+    }
+    actionState = childState;
+    navigationState = nextNavigationState;
   }
   const rootPayload = {
     params: {}
   };
-  let payload = rootPayload,
-    params = payload.params;
-  for (; actionStateRoute;) Object.assign(params, {
-    ...actionStateRoute.params
-  }), payload.screen = actionStateRoute.name, payload.params = {
-    ...actionStateRoute.params
-  }, actionStateRoute = actionStateRoute.state?.routes[actionStateRoute.state?.routes.length - 1], payload.params ??= {}, payload = payload.params, params = payload;
-  return type === "PUSH" && (setLastAction(), type = "NAVIGATE", navigationState.type === "stack" && (rootPayload.key = `${rootPayload.name}-${nanoid()}`)), type === "REPLACE" && navigationState.type === "tab" && (type = "JUMP_TO"), {
+  let payload = rootPayload;
+  let params = payload.params;
+  while (actionStateRoute) {
+    Object.assign(params, {
+      ...actionStateRoute.params
+    });
+    payload.screen = actionStateRoute.name;
+    payload.params = {
+      ...actionStateRoute.params
+    };
+    actionStateRoute = actionStateRoute.state?.routes[actionStateRoute.state?.routes.length - 1];
+    payload.params ??= {};
+    payload = payload.params;
+    params = payload;
+  }
+  if (type === "PUSH") {
+    setLastAction();
+    type = "NAVIGATE";
+    if (navigationState.type === "stack") {
+      rootPayload.key = `${rootPayload.name}-${nanoid()}`;
+    }
+  }
+  if (type === "REPLACE" && navigationState.type === "tab") {
+    type = "JUMP_TO";
+  }
+  return {
     type,
     target: navigationState.key,
     payload: {

package/dist/esm/router/utils/getNavigateAction.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["nanoid","setLastAction","matchDynamicName","getNavigateAction","actionState","navigationState","type","actionStateRoute","stateRoute","routes","index","length","childState","state","nextNavigationState","dynamicMatch","name","params","rootPayload","payload","Object","assign","screen","key","target"],"sources":["../../../../src/router/utils/getNavigateAction.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,MAAA,QAAc;AAEvB,SAASC,aAAA,QAAqB;AAC9B,SAASC,gBAAA,QAAwB;AAK1B,SAASC,kBAEdC,WAAA,EACAC,eAAA,EACAC,IAAA,GAAO,YACP;EAgBA,IAAIC,gBAAA;EAGJ,OAAOH,WAAA,IAAeC,eAAA,GAAiB;IACrC,MAAMG,UAAA,GAAaH,eAAA,CAAgBI,MAAA,CAAOJ,eAAA,CAAgBK,KAAK;IAE/DH,gBAAA,GAAmBH,WAAA,CAAYK,MAAA,CAAOL,WAAA,CAAYK,MAAA,CAAOE,MAAA,GAAS,CAAC;IAEnE,MAAMC,UAAA,GAAaL,gBAAA,CAAiBM,KAAA;MAC9BC,mBAAA,GAAsBN,UAAA,CAAWK,KAAA;MAEjCE,YAAA,GAAeb,gBAAA,CAAiBK,gBAAA,CAAiBS,IAAI;IAW3D,IARET,gBAAA,CAAiBS,IAAA,KAASR,UAAA,CAAWQ,IAAA;IAAA;IAErC,CAACJ,UAAA,IACD,CAACE,mBAAA,IACAC,YAAA,IACCR,gBAAA,CAAiBU,MAAA,GAASF,YAAA,CAAaC,IAAI,MACzCR,UAAA,CAAWS,MAAA,GAASF,YAAA,CAAaC,IAAI,GAGzC;IAGFZ,WAAA,GAAcQ,UAAA,EACdP,eAAA,GAAkBS,mBAAA;EACpB;EAMA,MAAMI,WAAA,GAAmC;IAAED,MAAA,EAAQ,CAAC;EAAE;EACtD,IAAIE,OAAA,GAAUD,WAAA;IACVD,MAAA,GAASE,OAAA,CAAQF,MAAA;EAGrB,OAAOV,gBAAA,GACLa,MAAA,CAAOC,MAAA,CAAOJ,MAAA,EAAQ;IAAE,GAAGV,gBAAA,CAAiBU;EAAO,CAAC,GACpDE,OAAA,CAAQG,MAAA,GAASf,gBAAA,CAAiBS,IAAA,EAClCG,OAAA,CAAQF,MAAA,GAAS;IAAE,GAAGV,gBAAA,CAAiBU;EAAO,GAE9CV,gBAAA,GACEA,gBAAA,CAAiBM,KAAA,EAAOJ,MAAA,CAAOF,gBAAA,CAAiBM,KAAA,EAAOJ,MAAA,CAAOE,MAAA,GAAS,CAAC,GAE1EQ,OAAA,CAAQF,MAAA,KAAW,CAAC,GACpBE,OAAA,GAAUA,OAAA,CAAQF,MAAA,EAClBA,MAAA,GAASE,OAAA;EAIX,OAAIb,IAAA,KAAS,WACXL,aAAA,CAAc,GAGdK,IAAA,GAAO,YAiBHD,eAAA,CAAgBC,IAAA,KAAS,YAC3BY,WAAA,CAAYK,GAAA,GAAM,GAAGL,WAAA,CAAYF,IAAI,IAAIhB,MAAA,CAAO,CAAC,MAIjDM,IAAA,KAAS,aAAaD,eAAA,CAAgBC,IAAA,KAAS,UACjDA,IAAA,GAAO,YAGF;IACLA,IAAA;IACAkB,MAAA,EAAQnB,eAAA,CAAgBkB,GAAA;IACxBJ,OAAA,EAAS;MACPI,GAAA,EAAKL,WAAA,CAAYK,GAAA;MACjBP,IAAA,EAAME,WAAA,CAAYI,MAAA;MAClBL,MAAA,EAAQC,WAAA,CAAYD;IACtB;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["nanoid","setLastAction","matchDynamicName","getNavigateAction","actionState","navigationState","type","actionStateRoute","stateRoute","routes","index","length","childState","state","nextNavigationState","dynamicMatch","name","didActionAndCurrentStateDiverge","params","rootPayload","payload","Object","assign","screen","key","target"],"sources":["../../../../src/router/utils/getNavigateAction.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,MAAA,QAAc;AAEvB,SAASC,aAAA,QAAqB;AAC9B,SAASC,gBAAA,QAAwB;AAK1B,SAASC,kBAEdC,WAAA,EACAC,eAAA,EACAC,IAAA,GAAO,YACP;EAgBA,IAAIC,gBAAA;EAGJ,OAAOH,WAAA,IAAeC,eAAA,EAAiB;IACrC,MAAMG,UAAA,GAAaH,eAAA,CAAgBI,MAAA,CAAOJ,eAAA,CAAgBK,KAAK;IAE/DH,gBAAA,GAAmBH,WAAA,CAAYK,MAAA,CAAOL,WAAA,CAAYK,MAAA,CAAOE,MAAA,GAAS,CAAC;IAEnE,MAAMC,UAAA,GAAaL,gBAAA,CAAiBM,KAAA;IACpC,MAAMC,mBAAA,GAAsBN,UAAA,CAAWK,KAAA;IAEvC,MAAME,YAAA,GAAeb,gBAAA,CAAiBK,gBAAA,CAAiBS,IAAI;IAE3D,MAAMC,+BAAA,GACJV,gBAAA,CAAiBS,IAAA,KAASR,UAAA,CAAWQ,IAAA;IAAA;IAErC,CAACJ,UAAA,IACD,CAACE,mBAAA,IACAC,YAAA,IACCR,gBAAA,CAAiBW,MAAA,GAASH,YAAA,CAAaC,IAAI,MACzCR,UAAA,CAAWU,MAAA,GAASH,YAAA,CAAaC,IAAI;IAE3C,IAAIC,+BAAA,EAAiC;MACnC;IACF;IAEAb,WAAA,GAAcQ,UAAA;IACdP,eAAA,GAAkBS,mBAAA;EACpB;EAMA,MAAMK,WAAA,GAAmC;IAAED,MAAA,EAAQ,CAAC;EAAE;EACtD,IAAIE,OAAA,GAAUD,WAAA;EACd,IAAID,MAAA,GAASE,OAAA,CAAQF,MAAA;EAGrB,OAAOX,gBAAA,EAAkB;IACvBc,MAAA,CAAOC,MAAA,CAAOJ,MAAA,EAAQ;MAAE,GAAGX,gBAAA,CAAiBW;IAAO,CAAC;IACpDE,OAAA,CAAQG,MAAA,GAAShB,gBAAA,CAAiBS,IAAA;IAClCI,OAAA,CAAQF,MAAA,GAAS;MAAE,GAAGX,gBAAA,CAAiBW;IAAO;IAE9CX,gBAAA,GACEA,gBAAA,CAAiBM,KAAA,EAAOJ,MAAA,CAAOF,gBAAA,CAAiBM,KAAA,EAAOJ,MAAA,CAAOE,MAAA,GAAS,CAAC;IAE1ES,OAAA,CAAQF,MAAA,KAAW,CAAC;IACpBE,OAAA,GAAUA,OAAA,CAAQF,MAAA;IAClBA,MAAA,GAASE,OAAA;EACX;EAGA,IAAId,IAAA,KAAS,QAAQ;IACnBL,aAAA,CAAc;IAGdK,IAAA,GAAO;IAiBP,IAAID,eAAA,CAAgBC,IAAA,KAAS,SAAS;MACpCa,WAAA,CAAYK,GAAA,GAAM,GAAGL,WAAA,CAAYH,IAAI,IAAIhB,MAAA,CAAO,CAAC;IACnD;EACF;EAEA,IAAIM,IAAA,KAAS,aAAaD,eAAA,CAAgBC,IAAA,KAAS,OAAO;IACxDA,IAAA,GAAO;EACT;EAEA,OAAO;IACLA,IAAA;IACAmB,MAAA,EAAQpB,eAAA,CAAgBmB,GAAA;IACxBJ,OAAA,EAAS;MACPI,GAAA,EAAKL,WAAA,CAAYK,GAAA;MACjBR,IAAA,EAAMG,WAAA,CAAYI,MAAA;MAClBL,MAAA,EAAQC,WAAA,CAAYD;IACtB;EACF;AACF","ignoreList":[]}

package/dist/esm/router/utils/getNavigateAction.native.js

@@ -2,31 +2,55 @@ import { nanoid } from "nanoid/non-secure";
 import { setLastAction } from "../lastAction.native.js";
 import { matchDynamicName } from "../matchers.native.js";
 function getNavigateAction(actionState, navigationState) {
-  for (var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "NAVIGATE", actionStateRoute; actionState && navigationState;) {
-    var _actionStateRoute_params,
-      _stateRoute_params,
-      stateRoute = navigationState.routes[navigationState.index];
+  var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "NAVIGATE";
+  var actionStateRoute;
+  while (actionState && navigationState) {
+    var _actionStateRoute_params, _stateRoute_params;
+    var stateRoute = navigationState.routes[navigationState.index];
     actionStateRoute = actionState.routes[actionState.routes.length - 1];
-    var childState = actionStateRoute.state,
-      nextNavigationState = stateRoute.state,
-      dynamicMatch = matchDynamicName(actionStateRoute.name),
-      didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name ||
-      // !deepEqual(actionStateRoute.params, stateRoute.params) ||
-      !childState || !nextNavigationState || dynamicMatch && ((_actionStateRoute_params = actionStateRoute.params) === null || _actionStateRoute_params === void 0 ? void 0 : _actionStateRoute_params[dynamicMatch.name]) !== ((_stateRoute_params = stateRoute.params) === null || _stateRoute_params === void 0 ? void 0 : _stateRoute_params[dynamicMatch.name]);
-    if (didActionAndCurrentStateDiverge) break;
-    actionState = childState, navigationState = nextNavigationState;
+    var childState = actionStateRoute.state;
+    var nextNavigationState = stateRoute.state;
+    var dynamicMatch = matchDynamicName(actionStateRoute.name);
+    var didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name ||
+    // !deepEqual(actionStateRoute.params, stateRoute.params) ||
+    !childState || !nextNavigationState || dynamicMatch && ((_actionStateRoute_params = actionStateRoute.params) === null || _actionStateRoute_params === void 0 ? void 0 : _actionStateRoute_params[dynamicMatch.name]) !== ((_stateRoute_params = stateRoute.params) === null || _stateRoute_params === void 0 ? void 0 : _stateRoute_params[dynamicMatch.name]);
+    if (didActionAndCurrentStateDiverge) {
+      break;
+    }
+    actionState = childState;
+    navigationState = nextNavigationState;
   }
-  for (var rootPayload = {
-      params: {}
-    }, payload = rootPayload, params = payload.params; actionStateRoute;) {
-    var _payload, _params, _actionStateRoute_state, _actionStateRoute_state1;
+  var rootPayload = {
+    params: {}
+  };
+  var payload = rootPayload;
+  var params = payload.params;
+  while (actionStateRoute) {
+    var _payload, _params;
+    var _actionStateRoute_state, _actionStateRoute_state1;
     Object.assign(params, {
       ...actionStateRoute.params
-    }), payload.screen = actionStateRoute.name, payload.params = {
+    });
+    payload.screen = actionStateRoute.name;
+    payload.params = {
       ...actionStateRoute.params
-    }, actionStateRoute = (_actionStateRoute_state1 = actionStateRoute.state) === null || _actionStateRoute_state1 === void 0 ? void 0 : _actionStateRoute_state1.routes[((_actionStateRoute_state = actionStateRoute.state) === null || _actionStateRoute_state === void 0 ? void 0 : _actionStateRoute_state.routes.length) - 1], (_params = (_payload = payload).params) !== null && _params !== void 0 || (_payload.params = {}), payload = payload.params, params = payload;
+    };
+    actionStateRoute = (_actionStateRoute_state1 = actionStateRoute.state) === null || _actionStateRoute_state1 === void 0 ? void 0 : _actionStateRoute_state1.routes[((_actionStateRoute_state = actionStateRoute.state) === null || _actionStateRoute_state === void 0 ? void 0 : _actionStateRoute_state.routes.length) - 1];
+    (_params = (_payload = payload).params) !== null && _params !== void 0 ? _params : _payload.params = {};
+    payload = payload.params;
+    params = payload;
+  }
+  if (type === "PUSH") {
+    setLastAction();
+    type = "NAVIGATE";
+    if (navigationState.type === "stack") {
+      rootPayload.key = `${rootPayload.name}-${nanoid()}`;
+    }
+  }
+  if (type === "REPLACE" && navigationState.type === "tab") {
+    type = "JUMP_TO";
   }
-  return type === "PUSH" && (setLastAction(), type = "NAVIGATE", navigationState.type === "stack" && (rootPayload.key = `${rootPayload.name}-${nanoid()}`)), type === "REPLACE" && navigationState.type === "tab" && (type = "JUMP_TO"), {
+  return {
     type,
     target: navigationState.key,
     payload: {

package/dist/esm/router/utils/getNavigateAction.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["nanoid","setLastAction","matchDynamicName","getNavigateAction","actionState","navigationState","type","arguments","length","actionStateRoute","_actionStateRoute_params","_stateRoute_params","stateRoute","routes","index","childState","state","nextNavigationState","dynamicMatch","name","didActionAndCurrentStateDiverge","params","rootPayload","payload","_payload","_params","_actionStateRoute_state","_actionStateRoute_state1","Object","assign","screen","key","target"],"sources":["../../../../src/router/utils/getNavigateAction.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,MAAA,QAAc;AAEvB,SAASC,aAAA,QAAqB;AAC9B,SAASC,gBAAA,QAAwB;AAK1B,SAASC,kBAEdC,WAAA,EACAC,eAAA,EACA;EAiBA,KAAI,IAAAC,IAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA,kBAAAE,gBAAA,EAAAL,WAAA,IAAAC,eAAA;IAGJ,IAAAK,wBAAsB;MAAAC,kBAAiB;MAAAC,UAAA,GAAAP,eAAA,CAAAQ,MAAA,CAAAR,eAAA,CAAAS,KAAA;IACrCL,gBAAM,GAAaL,WAAA,CAAAS,MAAgB,CAAAT,WAAO,CAAAS,MAAA,CAAAL,MAAqB;IAE/D,IAAAO,UAAA,GAAAN,gBAA+B,CAAAO,KAAO;MAAAC,mBAAmB,GAAAL,UAAU,CAAAI,KAAA;MAAAE,YAAA,GAAAhB,gBAAA,CAAAO,gBAAA,CAAAU,IAAA;MAAAC,+BAAA,GAAAX,gBAAA,CAAAU,IAAA,KAAAP,UAAA,CAAAO,IAAA;MAAA;MAEnE,CAAAJ,UAAM,KAAAE,mBAAa,IAAiBC,YAC9B,MAAAR,wBAAiC,GAEjCD,gBAAe,CAAAY,MAAA,UAAiB,IAAAX,wBAAqB,uBAAAA,wBAAA,CAAAQ,YAAA,CAAAC,IAAA,SAAAR,kBAAA,GAAAC,UAAA,CAAAS,MAAA,cAAAV,kBAAA,uBAAAA,kBAAA,CAAAO,YAAA,CAAAC,IAAA;IAW3D,IAREC,+BAA0B,EAEzB;IAODhB,WAAA,GAAAW,UAAA,EAAAV,eAAA,GAAAY,mBAAA;EAGF;EAEF,SAAAK,WAAA;MAMAD,MAAM;IACN,GAAAE,OAAI,GAAAD,WAAU,EAAAD,MACV,GAAAE,OAAS,CAAAF,MAAQ,EAAAZ,gBAAA;IAGrB,IAAAe,QAAO,EAAAC,OAAA,EAAAC,uBAAA,EAAAC,wBAAA;IACLC,MAAA,CAAOC,MAAA,CAAOR,MAAA,EAAQ;MAaxB,GAAIZ,gBAAS,CAAAY;IA+BX,IAAAE,OAAA,CAAAO,MAAA,GAAArB,gBAAA,CAAAU,IAAA,EAAAI,OAAA,CAAAF,MAAA;MACA,GAAAZ,gBAAQ,CAAAY;IACR,GAAAZ,gBAAS,IAAAkB,wBAAA,GAAAlB,gBAAA,CAAAO,KAAA,cAAAW,wBAAA,uBAAAA,wBAAA,CAAAd,MAAA,GAAAa,uBAAA,GAAAjB,gBAAA,CAAAO,KAAA,cAAAU,uBAAA,uBAAAA,uBAAA,CAAAb,MAAA,CAAAL,MAAA,SAAAiB,OAAA,IAAAD,QAAA,GAAAD,OAAA,EAAAF,MAAA,cAAAI,OAAA,gBAAAD,QAAA,CAAAH,MAAA,QAAAE,OAAA,GAAAA,OAAA,CAAAF,MAAA,EAAAA,MAAA,GAAAE,OAAA;EAAA;EACU,OACjBjB,IAAM,WAAY,KAAAL,aAAA,IAAAK,IAAA,eAAAD,eAAA,CAAAC,IAAA,iBAAAgB,WAAA,CAAAS,GAAA,MAAAT,WAAA,CAAAH,IAAA,IAAAnB,MAAA,QAAAM,IAAA,kBAAAD,eAAA,CAAAC,IAAA,eAAAA,IAAA;IAAAA,IAClB;IACF0B,MAAA,EAAA3B,eAAA,CAAA0B,GAAA;IACFR,OAAA;MACFQ,GAAA,EAAAT,WAAA,CAAAS,GAAA","ignoreList":[]}
+{"version":3,"names":["nanoid","setLastAction","matchDynamicName","getNavigateAction","actionState","navigationState","type","arguments","length","actionStateRoute","_actionStateRoute_params","_stateRoute_params","stateRoute","routes","index","childState","state","nextNavigationState","dynamicMatch","name","didActionAndCurrentStateDiverge","params","rootPayload","payload","_payload","_params","_actionStateRoute_state","_actionStateRoute_state1","Object","assign","screen","key"],"sources":["../../../../src/router/utils/getNavigateAction.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,MAAA,QAAc;AAEvB,SAASC,aAAA,QAAqB;AAC9B,SAASC,gBAAA,QAAwB;AAK1B,SAASC,kBAEdC,WAAA,EACAC,eAAA,EACA;EAiBA,IAAIC,IAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EAGJ,IAAAE,gBAAO;EACL,OAAAL,WAAM,IAAaC,eAAgB;IAEnC,IAAAK,wBAAmB,EAAAC,kBAAmB;IAEtC,IAAAC,UAAM,GAAAP,eAAa,CAAAQ,MAAiB,CAAAR,eAAA,CAAAS,KAAA;IACpCL,gBAAM,GAAAL,WAAsB,CAAAS,MAAA,CAAAT,WAAW,CAAAS,MAAA,CAAAL,MAAA;IAEvC,IAAAO,UAAM,GAAAN,gBAAe,CAAAO,KAAiB;IAEtC,IAAAC,mBAAM,GAAAL,UAAA,CAAAI,KACJ;IAEA,IAACE,YACA,GAAAhB,gBAAA,CAAAO,gBACA,CAAAU,IACC;IAGJ,IAAIC,+BAAA,GAAiCX,gBAAA,CAAAU,IAAA,KAAAP,UAAA,CAAAO,IAAA;IAAA;IACnC,CAAAJ,UAAA,KAAAE,mBAAA,IAAAC,YAAA,MAAAR,wBAAA,GAAAD,gBAAA,CAAAY,MAAA,cAAAX,wBAAA,uBAAAA,wBAAA,CAAAQ,YAAA,CAAAC,IAAA,SAAAR,kBAAA,GAAAC,UAAA,CAAAS,MAAA,cAAAV,kBAAA,uBAAAA,kBAAA,CAAAO,YAAA,CAAAC,IAAA;IACF,IAAAC,+BAAA;MAEA;IACA;IACFhB,WAAA,GAAAW,UAAA;IAMAV,eAAM,GAAmCY,mBAAa;EACtD;EACA,IAAIK,WAAS;IAGbD,MAAO;EACL;EACA,IAAAE,OAAQ,GAAAD,WAAS;EACjB,IAAAD,MAAQ,GAAAE,OAAS,CAAEF,MAAG;EAEtB,OAAAZ,gBACE;IAEF,IAAAe,QAAQ,EAAAC,OAAY;IACpB,IAAAC,uBAAkB,EAAAC,wBAAA;IAClBC,MAAA,CAAAC,MAAS,CAAAR,MAAA;MACX,GAAAZ,gBAAA,CAAAY;IAGA,EAAI;IACFE,OAAA,CAAAO,MAAc,GAAArB,gBAAA,CAAAU,IAAA;IAGdI,OAAO,CAAAF,MAAA;MAiBP,GAAIZ,gBAAgB,CAAAY;IAClB;IACFZ,gBAAA,IAAAkB,wBAAA,GAAAlB,gBAAA,CAAAO,KAAA,cAAAW,wBAAA,uBAAAA,wBAAA,CAAAd,MAAA,GAAAa,uBAAA,GAAAjB,gBAAA,CAAAO,KAAA,cAAAU,uBAAA,uBAAAA,uBAAA,CAAAb,MAAA,CAAAL,MAAA;IACF,CAAAiB,OAAA,IAAAD,QAAA,GAAAD,OAAA,EAAAF,MAAA,cAAAI,OAAA,cAAAA,OAAA,GAAAD,QAAA,CAAAH,MAAA;IAEAE,OAAI,GAAAA,OAAS,CAAAF,MAAa;IACxBA,MAAA,GAAOE,OAAA;EACT;EAEA,IAAAjB,IAAO;IACLL,aAAA;IACAK,IAAA,aAAQ;IACR,IAAAD,eAAS,CAAAC,IAAA;MACPgB,WAAK,CAAAS,GAAA,GAAY,GAAAT,WAAA,CAAAH,IAAA,IAAAnB,MAAA;IAAA;EACC;EACE,IACtBM,IAAA,kBAAAD,eAAA,CAAAC,IAAA;IACFA,IAAA;EACF","ignoreList":[]}