@simonbackx/vue-app-navigation 2.4.1 → 2.4.2

package/dist/index.js

@@ -1817,6 +1817,44 @@ function getCurrentRoutes() {
 function onCheckRoutes(handler) {
   const instance = getCurrentInstance();
   instance._navigationCheckRoutesHandlers = [...instance._navigationCheckRoutes ?? [], handler];
+  addCheckRoutesMountedHandler();
+}
+function onNotCheckRoutes(handler) {
+  const instance = getCurrentInstance();
+  instance._navigationNotCheckRoutesHandlers = [...instance._navigationNotCheckRoutesHandlers ?? [], handler];
+  addCheckRoutesMountedHandler();
+}
+function addCheckRoutesMountedHandler() {
+  const instance = getCurrentInstance();
+  const component = useCurrentComponent();
+  if (instance._didAddCheckRoutesMountedHandler) {
+    return;
+  }
+  instance._didAddCheckRoutesMountedHandler = true;
+  onMounted(async () => {
+    if (component && component.checkRoutes) {
+      component.checkRoutes = false;
+      if ("_navigationCheckRoutesHandlers" in instance && Array.isArray(instance._navigationCheckRoutesHandlers)) {
+        for (const handler of instance._navigationCheckRoutesHandlers) {
+          if (typeof handler === "function") {
+            await handler();
+          } else {
+            console.error("Invalid checkRoutes handler", handler);
+          }
+        }
+      }
+    } else {
+      if ("_navigationNotCheckRoutesHandlers" in instance && Array.isArray(instance._navigationNotCheckRoutesHandlers)) {
+        for (const handler of instance._navigationNotCheckRoutesHandlers) {
+          if (typeof handler === "function") {
+            await handler();
+          } else {
+            console.error("Invalid not checkRoutes handler", handler);
+          }
+        }
+      }
+    }
+  });
 }
 function defineRoutes(routes) {
   const component = useCurrentComponent();
@@ -1887,42 +1925,32 @@ function defineRoutes(routes) {
       }
     }
   };
-  onMounted(async () => {
-    if (component && component.checkRoutes) {
-      component.checkRoutes = false;
-      if ("_navigationCheckRoutesHandlers" in component && Array.isArray(component._navigationCheckRoutesHandlers)) {
-        for (const handler of component._navigationCheckRoutesHandlers) {
-          if (typeof handler === "function") {
-            await handler();
-          } else {
-            console.error("Invalid checkRoutes handler", handler);
-          }
-        }
+  onCheckRoutes(async () => {
+    if (Array.isArray(routes)) {
+      if (await handleRoutes(routes)) {
+        setDefaultHandler();
+        return;
       }
-      if (Array.isArray(routes)) {
-        if (await handleRoutes(routes)) {
+    } else {
+      const extraRoutes = await routes();
+      if (Array.isArray(extraRoutes)) {
+        if (await handleRoutes(extraRoutes)) {
           setDefaultHandler();
           return;
         }
       } else {
-        const extraRoutes = await routes();
-        if (Array.isArray(extraRoutes)) {
-          if (await handleRoutes(extraRoutes)) {
-            setDefaultHandler();
-            return;
-          }
-        } else {
-          if (extraRoutes) {
-            setDefaultHandler();
-            return;
-          }
+        if (extraRoutes) {
+          setDefaultHandler();
+          return;
         }
       }
-    } else {
-      await defaultHandler({ allowDetail: false });
     }
     setDefaultHandler();
   });
+  onNotCheckRoutes(async () => {
+    await defaultHandler({ allowDetail: false });
+    setDefaultHandler();
+  });
 }
 const checkRouteCache = {
   lastUrl: null,
@@ -2915,6 +2943,7 @@ export {
   matchQuery,
   normalizePushOptions,
   onCheckRoutes,
+  onNotCheckRoutes,
   setTitle,
   setTitleSuffix,
   templateToUrl,

package/dist/src/utils/navigationHooks.d.ts

@@ -68,6 +68,7 @@ export declare function useNavigate(): <Params extends Record<string, unknown>>(
 export type DefaultRouteHandler = () => Promise<boolean>;
 export type OnCheckRoutesHandler = () => Promise<void> | void;
 export declare function onCheckRoutes(handler: OnCheckRoutesHandler): void;
+export declare function onNotCheckRoutes(handler: OnCheckRoutesHandler): void;
 export declare function defineRoutes(routes: (Route<any, undefined>[]) | (() => Promise<boolean | (Route<any, undefined>[])>)): void;
 export declare function useCurrentHref(): Ref<string>;
 export declare function useCheckRoute(): <Params extends Record<string, unknown>>(prop1: string | Route<Params, unknown>, prop2?: RouteNavigationOptions<Params>) => boolean;

package/package.json

@@ -2,7 +2,7 @@
     "name": "@simonbackx/vue-app-navigation",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "exports": {
         ".": {
             "import": "./dist/index.js",