sibujs 1.0.6 → 1.0.7

package/dist/plugins.cjs

@@ -1290,14 +1290,17 @@ var NavigationController = class {
 var RouteMatcher = class {
   constructor(routes) {
     this.routeTrie = /* @__PURE__ */ new Map();
+    this.parentChain = /* @__PURE__ */ new Map();
     this.namedRoutes = /* @__PURE__ */ new Map();
     this.compiledPatterns = new LRUCache(50);
     this.buildIndex(routes);
   }
-  buildIndex(routes, parentPath = "") {
+  buildIndex(routes, parentPath = "", ancestors = []) {
     for (const route2 of routes) {
       const fullPath = parentPath + route2.path;
+      const chain = [...ancestors, route2];
       this.routeTrie.set(fullPath, route2);
+      this.parentChain.set(fullPath, chain);
       if (route2.name) {
         this.namedRoutes.set(route2.name, route2);
       }
@@ -1305,22 +1308,23 @@ var RouteMatcher = class {
         const aliases = Array.isArray(route2.alias) ? route2.alias : [route2.alias];
         for (const alias of aliases) {
           this.routeTrie.set(parentPath + alias, route2);
+          this.parentChain.set(parentPath + alias, chain);
         }
       }
       if (route2.children?.length) {
-        this.buildIndex(route2.children, fullPath);
+        this.buildIndex(route2.children, fullPath, chain);
       }
     }
   }
   match(path2) {
     const exactMatch = this.routeTrie.get(path2);
     if (exactMatch) {
-      return { route: exactMatch, params: {}, matched: [exactMatch] };
+      return { route: exactMatch, params: {}, matched: this.parentChain.get(path2) || [exactMatch] };
     }
     for (const [routePath, route2] of this.routeTrie) {
       const match = this.matchPattern(path2, routePath);
       if (match) {
-        return { route: route2, params: match.params, matched: [route2] };
+        return { route: route2, params: match.params, matched: this.parentChain.get(routePath) || [route2] };
       }
     }
     return null;
@@ -1378,22 +1382,27 @@ var RouteMatcher = class {
   }
   rebuild(routes) {
     this.routeTrie.clear();
+    this.parentChain.clear();
     this.namedRoutes.clear();
     this.compiledPatterns.clear();
     this.buildIndex(routes);
   }
   addRoute(route2, parentPath = "") {
     const fullPath = parentPath + route2.path;
+    const parentAncestors = this.parentChain.get(parentPath) || [];
+    const chain = [...parentAncestors, route2];
     this.routeTrie.set(fullPath, route2);
+    this.parentChain.set(fullPath, chain);
     if (route2.name) {
       this.namedRoutes.set(route2.name, route2);
     }
     if (route2.children?.length) {
-      this.buildIndex(route2.children, fullPath);
+      this.buildIndex(route2.children, fullPath, chain);
     }
   }
   removeRoute(path2) {
     this.routeTrie.delete(path2);
+    this.parentChain.delete(path2);
     this.compiledPatterns.clear();
     for (const [name, route2] of this.namedRoutes) {
       if (route2.path === path2) {
@@ -1631,16 +1640,16 @@ var _SibuRouter = class _SibuRouter {
   }
   initialize() {
     if (this.options.mode === "history") {
-      const popstateHandler = () => this.handleLocationChange();
+      const popstateHandler = () => this.handleLocationChange(true);
       window.addEventListener("popstate", popstateHandler);
       this.cleanup.push(() => window.removeEventListener("popstate", popstateHandler));
     } else {
-      const hashHandler = () => this.handleLocationChange();
+      const hashHandler = () => this.handleLocationChange(true);
       window.addEventListener("hashchange", hashHandler);
       this.cleanup.push(() => window.removeEventListener("hashchange", hashHandler));
     }
     queueMicrotask(() => {
-      this.handleLocationChange();
+      this.handleLocationChange(true);
       this.isReadySetter(true);
     });
   }
@@ -1654,10 +1663,11 @@ var _SibuRouter = class _SibuRouter {
       matched: []
     };
   }
-  handleLocationChange() {
+  handleLocationChange(skipHistory = true) {
     const path2 = this.getCurrentPath();
-    const context = this.createRouteContext(path2);
-    this.currentRouteSetter(context);
+    this.navigate(path2, { replace: true, skipHistory }).catch((err) => {
+      console.error("[Router] Error during location change navigation:", err);
+    });
   }
   getCurrentPath() {
     const { mode, base: base2 } = this.options;
@@ -1677,7 +1687,7 @@ var _SibuRouter = class _SibuRouter {
     const match = this.matcher.match(path2 || "/");
     const params = match?.params || {};
     const meta2 = match?.route.meta || {};
-    const matched = match ? [match.route] : [];
+    const matched = match?.matched || [];
     return {
       path: path2 || "/",
       params,
@@ -1728,16 +1738,18 @@ var _SibuRouter = class _SibuRouter {
     const match = this.matcher.match(to.path);
     if (match) {
       const { route: route2 } = match;
-      if ("beforeEnter" in route2 && route2.beforeEnter) {
-        const guards = Array.isArray(route2.beforeEnter) ? route2.beforeEnter : [route2.beforeEnter];
-        for (const guard of guards) {
-          if (signal2.aborted) throw new Error("Navigation aborted");
-          const result = await guard(to, from);
-          if (result !== true) {
-            if (typeof result === "string") {
-              return this.performNavigation(this.createRouteContext(result), from, options, signal2, depth + 1);
+      for (const matchedRoute of match.matched) {
+        if ("beforeEnter" in matchedRoute && matchedRoute.beforeEnter) {
+          const guards = Array.isArray(matchedRoute.beforeEnter) ? matchedRoute.beforeEnter : [matchedRoute.beforeEnter];
+          for (const guard of guards) {
+            if (signal2.aborted) throw new Error("Navigation aborted");
+            const result = await guard(to, from);
+            if (result !== true) {
+              if (typeof result === "string") {
+                return this.performNavigation(this.createRouteContext(result), from, options, signal2, depth + 1);
+              }
+              throw new NavigationFailureError("aborted", from, to);
             }
-            throw new NavigationFailureError("aborted", from, to);
           }
         }
       }
@@ -1758,7 +1770,9 @@ var _SibuRouter = class _SibuRouter {
       }
       throw new NavigationFailureError("aborted", from, to);
     }
-    this.updateHistory(to, options);
+    if (!options.skipHistory) {
+      this.updateHistory(to, options);
+    }
     this.currentRouteSetter(to);
     this.guards.runAfterEach(to, from);
     this.handleScrollBehavior(to, from);
@@ -1993,6 +2007,7 @@ function Route() {
   let errorNode = null;
   let isUpdating = false;
   let currentPath = "";
+  let currentTopRoute = null;
   const cleanupNodes = () => {
     [currentNode, loadingNode, errorNode].forEach((node) => {
       if (node?.parentNode) {
@@ -2062,16 +2077,22 @@ function Route() {
       return;
     }
     const route2 = globalRouter.currentRoute;
-    if (route2.path === currentPath && currentNode) return;
-    isUpdating = true;
-    currentPath = route2.path;
     try {
       const match = globalRouter["matcher"].match(route2.path);
       if (!match) {
+        currentPath = route2.path;
+        currentTopRoute = null;
         cleanupNodes();
         return;
       }
-      const { route: routeDef } = match;
+      const routeDef = match.matched[0] || match.route;
+      if (routeDef === currentTopRoute && currentNode) {
+        currentPath = route2.path;
+        return;
+      }
+      isUpdating = true;
+      currentPath = route2.path;
+      currentTopRoute = routeDef;
       if ("redirect" in routeDef) {
         const redirectPath = typeof routeDef.redirect === "function" ? routeDef.redirect(route2) : routeDef.redirect;
         queueMicrotask(() => globalRouter?.navigate(redirectPath));
@@ -2422,7 +2443,8 @@ function Outlet() {
     const childRoute = route2.matched[route2.matched.length - 1];
     if (!childRoute || !("component" in childRoute)) return;
     try {
-      const component = await globalRouter.loadComponent(childRoute, route2.path);
+      const cacheKey = `${route2.path}\0${childRoute.path}`;
+      const component = await globalRouter.loadComponent(childRoute, cacheKey);
       const node = component();
       if (node && anchor.parentNode) {
         if (currentNode?.parentNode) {

package/dist/plugins.d.cts

@@ -140,6 +140,7 @@ declare class SibuRouter {
     navigate(to: NavigationTarget, options?: {
         replace?: boolean;
         state?: unknown;
+        skipHistory?: boolean;
     }): Promise<NavigationResult>;
     private static readonly MAX_REDIRECT_DEPTH;
     private performNavigation;

package/dist/plugins.d.ts

@@ -140,6 +140,7 @@ declare class SibuRouter {
     navigate(to: NavigationTarget, options?: {
         replace?: boolean;
         state?: unknown;
+        skipHistory?: boolean;
     }): Promise<NavigationResult>;
     private static readonly MAX_REDIRECT_DEPTH;
     private performNavigation;

package/dist/plugins.js

@@ -154,14 +154,17 @@ var NavigationController = class {
 var RouteMatcher = class {
   constructor(routes) {
     this.routeTrie = /* @__PURE__ */ new Map();
+    this.parentChain = /* @__PURE__ */ new Map();
     this.namedRoutes = /* @__PURE__ */ new Map();
     this.compiledPatterns = new LRUCache(50);
     this.buildIndex(routes);
   }
-  buildIndex(routes, parentPath = "") {
+  buildIndex(routes, parentPath = "", ancestors = []) {
     for (const route2 of routes) {
       const fullPath = parentPath + route2.path;
+      const chain = [...ancestors, route2];
       this.routeTrie.set(fullPath, route2);
+      this.parentChain.set(fullPath, chain);
       if (route2.name) {
         this.namedRoutes.set(route2.name, route2);
       }
@@ -169,22 +172,23 @@ var RouteMatcher = class {
         const aliases = Array.isArray(route2.alias) ? route2.alias : [route2.alias];
         for (const alias of aliases) {
           this.routeTrie.set(parentPath + alias, route2);
+          this.parentChain.set(parentPath + alias, chain);
         }
       }
       if (route2.children?.length) {
-        this.buildIndex(route2.children, fullPath);
+        this.buildIndex(route2.children, fullPath, chain);
       }
     }
   }
   match(path) {
     const exactMatch = this.routeTrie.get(path);
     if (exactMatch) {
-      return { route: exactMatch, params: {}, matched: [exactMatch] };
+      return { route: exactMatch, params: {}, matched: this.parentChain.get(path) || [exactMatch] };
     }
     for (const [routePath, route2] of this.routeTrie) {
       const match = this.matchPattern(path, routePath);
       if (match) {
-        return { route: route2, params: match.params, matched: [route2] };
+        return { route: route2, params: match.params, matched: this.parentChain.get(routePath) || [route2] };
       }
     }
     return null;
@@ -242,22 +246,27 @@ var RouteMatcher = class {
   }
   rebuild(routes) {
     this.routeTrie.clear();
+    this.parentChain.clear();
     this.namedRoutes.clear();
     this.compiledPatterns.clear();
     this.buildIndex(routes);
   }
   addRoute(route2, parentPath = "") {
     const fullPath = parentPath + route2.path;
+    const parentAncestors = this.parentChain.get(parentPath) || [];
+    const chain = [...parentAncestors, route2];
     this.routeTrie.set(fullPath, route2);
+    this.parentChain.set(fullPath, chain);
     if (route2.name) {
       this.namedRoutes.set(route2.name, route2);
     }
     if (route2.children?.length) {
-      this.buildIndex(route2.children, fullPath);
+      this.buildIndex(route2.children, fullPath, chain);
     }
   }
   removeRoute(path) {
     this.routeTrie.delete(path);
+    this.parentChain.delete(path);
     this.compiledPatterns.clear();
     for (const [name, route2] of this.namedRoutes) {
       if (route2.path === path) {
@@ -495,16 +504,16 @@ var _SibuRouter = class _SibuRouter {
   }
   initialize() {
     if (this.options.mode === "history") {
-      const popstateHandler = () => this.handleLocationChange();
+      const popstateHandler = () => this.handleLocationChange(true);
       window.addEventListener("popstate", popstateHandler);
       this.cleanup.push(() => window.removeEventListener("popstate", popstateHandler));
     } else {
-      const hashHandler = () => this.handleLocationChange();
+      const hashHandler = () => this.handleLocationChange(true);
       window.addEventListener("hashchange", hashHandler);
       this.cleanup.push(() => window.removeEventListener("hashchange", hashHandler));
     }
     queueMicrotask(() => {
-      this.handleLocationChange();
+      this.handleLocationChange(true);
       this.isReadySetter(true);
     });
   }
@@ -518,10 +527,11 @@ var _SibuRouter = class _SibuRouter {
       matched: []
     };
   }
-  handleLocationChange() {
+  handleLocationChange(skipHistory = true) {
     const path = this.getCurrentPath();
-    const context = this.createRouteContext(path);
-    this.currentRouteSetter(context);
+    this.navigate(path, { replace: true, skipHistory }).catch((err) => {
+      console.error("[Router] Error during location change navigation:", err);
+    });
   }
   getCurrentPath() {
     const { mode, base } = this.options;
@@ -541,7 +551,7 @@ var _SibuRouter = class _SibuRouter {
     const match = this.matcher.match(path || "/");
     const params = match?.params || {};
     const meta = match?.route.meta || {};
-    const matched = match ? [match.route] : [];
+    const matched = match?.matched || [];
     return {
       path: path || "/",
       params,
@@ -592,16 +602,18 @@ var _SibuRouter = class _SibuRouter {
     const match = this.matcher.match(to.path);
     if (match) {
       const { route: route2 } = match;
-      if ("beforeEnter" in route2 && route2.beforeEnter) {
-        const guards = Array.isArray(route2.beforeEnter) ? route2.beforeEnter : [route2.beforeEnter];
-        for (const guard of guards) {
-          if (signal2.aborted) throw new Error("Navigation aborted");
-          const result = await guard(to, from);
-          if (result !== true) {
-            if (typeof result === "string") {
-              return this.performNavigation(this.createRouteContext(result), from, options, signal2, depth + 1);
+      for (const matchedRoute of match.matched) {
+        if ("beforeEnter" in matchedRoute && matchedRoute.beforeEnter) {
+          const guards = Array.isArray(matchedRoute.beforeEnter) ? matchedRoute.beforeEnter : [matchedRoute.beforeEnter];
+          for (const guard of guards) {
+            if (signal2.aborted) throw new Error("Navigation aborted");
+            const result = await guard(to, from);
+            if (result !== true) {
+              if (typeof result === "string") {
+                return this.performNavigation(this.createRouteContext(result), from, options, signal2, depth + 1);
+              }
+              throw new NavigationFailureError("aborted", from, to);
             }
-            throw new NavigationFailureError("aborted", from, to);
           }
         }
       }
@@ -622,7 +634,9 @@ var _SibuRouter = class _SibuRouter {
       }
       throw new NavigationFailureError("aborted", from, to);
     }
-    this.updateHistory(to, options);
+    if (!options.skipHistory) {
+      this.updateHistory(to, options);
+    }
     this.currentRouteSetter(to);
     this.guards.runAfterEach(to, from);
     this.handleScrollBehavior(to, from);
@@ -857,6 +871,7 @@ function Route() {
   let errorNode = null;
   let isUpdating = false;
   let currentPath = "";
+  let currentTopRoute = null;
   const cleanupNodes = () => {
     [currentNode, loadingNode, errorNode].forEach((node) => {
       if (node?.parentNode) {
@@ -926,16 +941,22 @@ function Route() {
       return;
     }
     const route2 = globalRouter.currentRoute;
-    if (route2.path === currentPath && currentNode) return;
-    isUpdating = true;
-    currentPath = route2.path;
     try {
       const match = globalRouter["matcher"].match(route2.path);
       if (!match) {
+        currentPath = route2.path;
+        currentTopRoute = null;
         cleanupNodes();
         return;
       }
-      const { route: routeDef } = match;
+      const routeDef = match.matched[0] || match.route;
+      if (routeDef === currentTopRoute && currentNode) {
+        currentPath = route2.path;
+        return;
+      }
+      isUpdating = true;
+      currentPath = route2.path;
+      currentTopRoute = routeDef;
       if ("redirect" in routeDef) {
         const redirectPath = typeof routeDef.redirect === "function" ? routeDef.redirect(route2) : routeDef.redirect;
         queueMicrotask(() => globalRouter?.navigate(redirectPath));
@@ -1286,7 +1307,8 @@ function Outlet() {
     const childRoute = route2.matched[route2.matched.length - 1];
     if (!childRoute || !("component" in childRoute)) return;
     try {
-      const component = await globalRouter.loadComponent(childRoute, route2.path);
+      const cacheKey = `${route2.path}\0${childRoute.path}`;
+      const component = await globalRouter.loadComponent(childRoute, cacheKey);
       const node = component();
       if (node && anchor.parentNode) {
         if (currentNode?.parentNode) {

package/dist/ssr-WKUPVSSK.js

@@ -0,0 +1,36 @@
+import {
+  collectStream,
+  deserializeState,
+  hydrate,
+  hydrateIslands,
+  hydrateProgressively,
+  island,
+  renderToDocument,
+  renderToReadableStream,
+  renderToStream,
+  renderToString,
+  renderToSuspenseStream,
+  resetSSRState,
+  serializeState,
+  ssrSuspense,
+  suspenseSwapScript
+} from "./chunk-7TQKR4PP.js";
+import "./chunk-4MYMUBRS.js";
+import "./chunk-MLKGABMK.js";
+export {
+  collectStream,
+  deserializeState,
+  hydrate,
+  hydrateIslands,
+  hydrateProgressively,
+  island,
+  renderToDocument,
+  renderToReadableStream,
+  renderToStream,
+  renderToString,
+  renderToSuspenseStream,
+  resetSSRState,
+  serializeState,
+  ssrSuspense,
+  suspenseSwapScript
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sibujs",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "A lightweight, function-based frontend framework that combines the best of React, Svelte, and Vue — with zero VDOM and maximum simplicity. Designed for developers who want fine-grained reactivity and full control without compilation or magic.",
   "keywords": [
     "frontend",