sibujs 3.3.2 → 3.4.0

package/dist/plugins.cjs

@@ -1228,7 +1228,7 @@ function forEachSubscriber(signal2, visit) {
 
 // src/reactivity/track.ts
 var _isDev3 = isDev();
-var _runtimeVersion = true ? "3.3.2" : "dev";
+var _runtimeVersion = true ? "3.4.0" : "dev";
 var REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
 function resolveReactiveApi() {
   const g2 = globalThis;
@@ -1983,9 +1983,19 @@ function signal(initial, options) {
   return [get, set];
 }
 
+// src/utils/globalSingleton.ts
+function globalSingleton(key, create) {
+  const g2 = globalThis;
+  return g2[key] ?? (g2[key] = create());
+}
+
 // src/plugins/i18n.ts
-var [currentLocale, setLocaleInternal] = signal("en");
-var locales = {};
+var _i18n = globalSingleton(/* @__PURE__ */ Symbol.for("sibujs.i18n.v1"), () => ({
+  locale: signal("en"),
+  locales: {}
+}));
+var [currentLocale, setLocaleInternal] = _i18n.locale;
+var locales = _i18n.locales;
 function setLocale(locale) {
   setLocaleInternal(locale);
 }
@@ -2212,14 +2222,39 @@ var NavigationController = class {
     return this.currentController !== null;
   }
 };
-var RouteMatcher = class {
+var RouteMatcher = class _RouteMatcher {
   constructor(routes) {
     this.routeTrie = /* @__PURE__ */ new Map();
     this.parentChain = /* @__PURE__ */ new Map();
     this.namedRoutes = /* @__PURE__ */ new Map();
     this.compiledPatterns = new LRUCache(50);
+    // Pattern routes (those with params/wildcards) ordered most-specific-first,
+    // rebuilt lazily after any mutation. Static full paths are served by the
+    // exact-match map and excluded here.
+    this.patternOrder = null;
     this.buildIndex(routes);
   }
+  // Specificity per segment: static (2) > param `:x` (1) > wildcard `*` (0).
+  static specificity(path2) {
+    return path2.split("/").filter(Boolean).map((seg) => seg.startsWith(":") ? 1 : seg.includes("*") ? 0 : 2);
+  }
+  getPatternOrder() {
+    if (this.patternOrder) return this.patternOrder;
+    const patterns = [...this.routeTrie].filter(([p2]) => p2.includes(":") || p2.includes("*"));
+    patterns.sort(([a2], [b2]) => {
+      const ka = _RouteMatcher.specificity(a2);
+      const kb = _RouteMatcher.specificity(b2);
+      const len = Math.max(ka.length, kb.length);
+      for (let i2 = 0; i2 < len; i2++) {
+        const va = ka[i2] ?? -1;
+        const vb = kb[i2] ?? -1;
+        if (va !== vb) return vb - va;
+      }
+      return 0;
+    });
+    this.patternOrder = patterns;
+    return patterns;
+  }
   buildIndex(routes, parentPath = "", ancestors = []) {
     for (const route2 of routes) {
       const fullPath = parentPath + route2.path;
@@ -2246,7 +2281,7 @@ var RouteMatcher = class {
     if (exactMatch) {
       return { route: exactMatch, params: {}, matched: this.parentChain.get(path2) || [exactMatch] };
     }
-    for (const [routePath, route2] of this.routeTrie) {
+    for (const [routePath, route2] of this.getPatternOrder()) {
       const match = this.matchPattern(path2, routePath);
       if (match) {
         return { route: route2, params: match.params, matched: this.parentChain.get(routePath) || [route2] };
@@ -2318,9 +2353,11 @@ var RouteMatcher = class {
     this.parentChain.clear();
     this.namedRoutes.clear();
     this.compiledPatterns.clear();
+    this.patternOrder = null;
     this.buildIndex(routes);
   }
   addRoute(route2, parentPath = "") {
+    this.patternOrder = null;
     const fullPath = parentPath + route2.path;
     const parentAncestors = this.parentChain.get(parentPath) || [];
     const chain = [...parentAncestors, route2];
@@ -2335,6 +2372,7 @@ var RouteMatcher = class {
   }
   removeRoute(path2) {
     this.compiledPatterns.clear();
+    this.patternOrder = null;
     const root = this.routeTrie.get(path2);
     if (!root) return;
     const removed = /* @__PURE__ */ new Set();
@@ -2601,14 +2639,16 @@ var _SibuRouter = class _SibuRouter {
     this.initialize();
   }
   initialize() {
-    if (this.options.mode === "history") {
-      const popstateHandler = () => this.handleLocationChange(true);
-      window.addEventListener("popstate", popstateHandler);
-      this.cleanup.push(() => window.removeEventListener("popstate", popstateHandler));
-    } else {
-      const hashHandler = () => this.handleLocationChange(true);
-      window.addEventListener("hashchange", hashHandler);
-      this.cleanup.push(() => window.removeEventListener("hashchange", hashHandler));
+    if (typeof window !== "undefined") {
+      if (this.options.mode === "history") {
+        const popstateHandler = () => this.handleLocationChange(true);
+        window.addEventListener("popstate", popstateHandler);
+        this.cleanup.push(() => window.removeEventListener("popstate", popstateHandler));
+      } else {
+        const hashHandler = () => this.handleLocationChange(true);
+        window.addEventListener("hashchange", hashHandler);
+        this.cleanup.push(() => window.removeEventListener("hashchange", hashHandler));
+      }
     }
     queueMicrotask(() => {
       this.handleLocationChange(true);
@@ -3149,10 +3189,15 @@ function Route() {
       if (!routeInitialized && anchor.parentNode) wrappedUpdate();
     });
   }
-  routeCleanups.push(() => {
+  let routeTorn = false;
+  const routeCleanup = () => {
+    if (routeTorn) return;
+    routeTorn = true;
     routeTeardown();
     cleanupNodes();
-  });
+  };
+  registerDisposer(anchor, routeCleanup);
+  routeCleanups.push(routeCleanup);
   return anchor;
 }
 function KeepAliveRoute(options) {
@@ -3262,7 +3307,10 @@ function KeepAliveRoute(options) {
       if (!initialized && anchor.parentNode) wrappedUpdate();
     });
   }
-  routeCleanups.push(() => {
+  let kaTorn = false;
+  const kaCleanup = () => {
+    if (kaTorn) return;
+    kaTorn = true;
     kaTeardown();
     for (const node of cache.values()) {
       dispose(node);
@@ -3272,12 +3320,15 @@ function KeepAliveRoute(options) {
     lruOrder.length = 0;
     if (currentNode?.parentNode) currentNode.parentNode.removeChild(currentNode);
     currentNode = null;
-  });
+  };
+  registerDisposer(anchor, kaCleanup);
+  routeCleanups.push(kaCleanup);
   return anchor;
 }
-function RouterLink(props) {
+function RouterLink(props, children) {
   if (!_routerRef.current) throw new Error("Router not initialized. Call createRouter() first.");
   const { to, replace: replace2 = false, activeClass, exactActiveClass, nodes, target, rel, class: classAttr, ...attrs } = props;
+  const content = children !== void 0 ? children : nodes;
   const baseClass = typeof classAttr === "string" ? classAttr : "";
   const routeGetter = _routerRef.current.routeGetter;
   const rawHref = _routerRef.current["resolvePath"](to);
@@ -3327,12 +3378,12 @@ function RouterLink(props) {
       }
     }
   });
-  if (typeof nodes === "string") {
-    link2.textContent = nodes;
-  } else if (nodes instanceof Node) {
-    link2.appendChild(nodes);
-  } else if (Array.isArray(nodes)) {
-    nodes.forEach((child) => {
+  if (typeof content === "string") {
+    link2.textContent = content;
+  } else if (content instanceof Node) {
+    link2.appendChild(content);
+  } else if (Array.isArray(content)) {
+    content.forEach((child) => {
       if (typeof child === "string") {
         link2.appendChild(document.createTextNode(child));
       } else if (child instanceof Node) {
@@ -3527,14 +3578,19 @@ function Outlet() {
       if (anchor.parentNode) update();
     });
   }
-  routeCleanups.push(() => {
+  let outletTorn = false;
+  const outletCleanup = () => {
+    if (outletTorn) return;
+    outletTorn = true;
     outletTeardown();
     if (currentNode) {
       dispose(currentNode);
       if (currentNode.parentNode) currentNode.parentNode.removeChild(currentNode);
       currentNode = null;
     }
-  });
+  };
+  registerDisposer(anchor, outletCleanup);
+  routeCleanups.push(outletCleanup);
   return anchor;
 }
 function addRoute(route2, parentPath) {
@@ -4011,39 +4067,41 @@ function createPluginRegistry() {
   };
   return registry;
 }
-var defaultRegistry = createPluginRegistry();
-var defaultRegistryTouched = false;
+var _defaults = globalSingleton(/* @__PURE__ */ Symbol.for("sibujs.plugins.defaultRegistry.v1"), () => ({
+  registry: createPluginRegistry(),
+  touched: false
+}));
 function createPlugin(name, install) {
   return { name, install };
 }
 function plugin(plugin2, options) {
-  defaultRegistryTouched = true;
-  defaultRegistry.plugin(plugin2, options);
+  _defaults.touched = true;
+  _defaults.registry.plugin(plugin2, options);
 }
 function inject(key, defaultValue) {
-  return defaultRegistry.inject(key, defaultValue);
+  return _defaults.registry.inject(key, defaultValue);
 }
 function triggerPluginMount(element) {
-  defaultRegistry.triggerMount(element);
+  _defaults.registry.triggerMount(element);
 }
 function triggerPluginUnmount(element) {
-  defaultRegistry.triggerUnmount(element);
+  _defaults.registry.triggerUnmount(element);
 }
 function triggerPluginError(error) {
-  defaultRegistry.triggerError(error);
+  _defaults.registry.triggerError(error);
 }
 function resetPlugins() {
-  defaultRegistry.reset();
-  defaultRegistryTouched = false;
+  _defaults.registry.reset();
+  _defaults.touched = false;
 }
 function setDefaultPluginRegistry(registry) {
-  if (defaultRegistryTouched && defaultRegistry.installedPlugins.size > 0) {
+  if (_defaults.touched && _defaults.registry.installedPlugins.size > 0) {
     console.warn(
       "[Plugin] Replacing default plugin registry while plugins are already installed on the singleton. This may indicate mixed singleton/registry usage."
     );
   }
-  defaultRegistry = registry;
-  defaultRegistryTouched = true;
+  _defaults.registry = registry;
+  _defaults.touched = true;
 }
 
 // src/plugins/modular.ts
@@ -4145,9 +4203,7 @@ function lazyModule(loader) {
       return loadedFlag;
     },
     async get() {
-      if (loadedFlag && cached !== void 0) {
-        return cached;
-      }
+      if (loadedFlag) return cached;
       cached = await loader();
       loadedFlag = true;
       return cached;

package/dist/plugins.d.cts

@@ -254,11 +254,12 @@ declare function RouterLink(props: {
     replace?: boolean;
     activeClass?: string;
     exactActiveClass?: string;
+    /** @deprecated Pass children positionally: `RouterLink(props, children)`. */
     nodes?: string | Node | (string | Node)[];
     target?: string;
     rel?: string;
     [key: string]: unknown;
-}): HTMLElement;
+}, children?: string | Node | (string | Node)[]): HTMLElement;
 declare function Suspense(props: {
     fallback?: () => HTMLElement | HTMLElement;
     nodes: () => HTMLElement | Promise<HTMLElement>;

package/dist/plugins.d.ts

@@ -254,11 +254,12 @@ declare function RouterLink(props: {
     replace?: boolean;
     activeClass?: string;
     exactActiveClass?: string;
+    /** @deprecated Pass children positionally: `RouterLink(props, children)`. */
     nodes?: string | Node | (string | Node)[];
     target?: string;
     rel?: string;
     [key: string]: unknown;
-}): HTMLElement;
+}, children?: string | Node | (string | Node)[]): HTMLElement;
 declare function Suspense(props: {
     fallback?: () => HTMLElement | HTMLElement;
     nodes: () => HTMLElement | Promise<HTMLElement>;

package/dist/plugins.js

@@ -18,7 +18,7 @@ import {
   preloadCritical,
   prerenderRoutes,
   satisfies
-} from "./chunk-FJIRS3FM.js";
+} from "./chunk-F7HW2NI5.js";
 import {
   isUnsafeKey
 } from "./chunk-H3SRKIYX.js";
@@ -32,21 +32,20 @@ import {
   triggerPluginError,
   triggerPluginMount,
   triggerPluginUnmount
-} from "./chunk-3JHCYHWN.js";
+} from "./chunk-WWV3SJ3L.js";
 import {
   span
-} from "./chunk-6TCOWMGY.js";
+} from "./chunk-3Z2NGWQI.js";
 import {
   escapeScriptJson,
   isDangerousMetaRefresh,
   renderToString
 } from "./chunk-EX77FXTT.js";
-import "./chunk-ZEUP4TUD.js";
-import "./chunk-QCFBIVIQ.js";
+import "./chunk-JNGGM2XE.js";
+import "./chunk-K35BAR4P.js";
 import {
-  dispose,
-  registerDisposer
-} from "./chunk-5VGSK6D2.js";
+  globalSingleton
+} from "./chunk-7ZHH77QA.js";
 import {
   isUrlAttribute,
   sanitizeCSSValue,
@@ -55,19 +54,27 @@ import {
 } from "./chunk-L3GAGWCC.js";
 import {
   effect
-} from "./chunk-N5TQVEKE.js";
+} from "./chunk-BUKYCWHX.js";
 import "./chunk-S3NFJO6L.js";
+import {
+  dispose,
+  registerDisposer
+} from "./chunk-5VGSK6D2.js";
 import {
   signal
-} from "./chunk-JCQG2I2G.js";
+} from "./chunk-KZBEVFXZ.js";
 import {
   track
-} from "./chunk-4NJEAPLI.js";
+} from "./chunk-OOUQUCNN.js";
 import "./chunk-COY6PUD2.js";
 
 // src/plugins/i18n.ts
-var [currentLocale, setLocaleInternal] = signal("en");
-var locales = {};
+var _i18n = globalSingleton(/* @__PURE__ */ Symbol.for("sibujs.i18n.v1"), () => ({
+  locale: signal("en"),
+  locales: {}
+}));
+var [currentLocale, setLocaleInternal] = _i18n.locale;
+var locales = _i18n.locales;
 function setLocale(locale) {
   setLocaleInternal(locale);
 }
@@ -170,14 +177,39 @@ var NavigationController = class {
     return this.currentController !== null;
   }
 };
-var RouteMatcher = class {
+var RouteMatcher = class _RouteMatcher {
   constructor(routes) {
     this.routeTrie = /* @__PURE__ */ new Map();
     this.parentChain = /* @__PURE__ */ new Map();
     this.namedRoutes = /* @__PURE__ */ new Map();
     this.compiledPatterns = new LRUCache(50);
+    // Pattern routes (those with params/wildcards) ordered most-specific-first,
+    // rebuilt lazily after any mutation. Static full paths are served by the
+    // exact-match map and excluded here.
+    this.patternOrder = null;
     this.buildIndex(routes);
   }
+  // Specificity per segment: static (2) > param `:x` (1) > wildcard `*` (0).
+  static specificity(path) {
+    return path.split("/").filter(Boolean).map((seg) => seg.startsWith(":") ? 1 : seg.includes("*") ? 0 : 2);
+  }
+  getPatternOrder() {
+    if (this.patternOrder) return this.patternOrder;
+    const patterns = [...this.routeTrie].filter(([p]) => p.includes(":") || p.includes("*"));
+    patterns.sort(([a], [b]) => {
+      const ka = _RouteMatcher.specificity(a);
+      const kb = _RouteMatcher.specificity(b);
+      const len = Math.max(ka.length, kb.length);
+      for (let i = 0; i < len; i++) {
+        const va = ka[i] ?? -1;
+        const vb = kb[i] ?? -1;
+        if (va !== vb) return vb - va;
+      }
+      return 0;
+    });
+    this.patternOrder = patterns;
+    return patterns;
+  }
   buildIndex(routes, parentPath = "", ancestors = []) {
     for (const route2 of routes) {
       const fullPath = parentPath + route2.path;
@@ -204,7 +236,7 @@ var RouteMatcher = class {
     if (exactMatch) {
       return { route: exactMatch, params: {}, matched: this.parentChain.get(path) || [exactMatch] };
     }
-    for (const [routePath, route2] of this.routeTrie) {
+    for (const [routePath, route2] of this.getPatternOrder()) {
       const match = this.matchPattern(path, routePath);
       if (match) {
         return { route: route2, params: match.params, matched: this.parentChain.get(routePath) || [route2] };
@@ -276,9 +308,11 @@ var RouteMatcher = class {
     this.parentChain.clear();
     this.namedRoutes.clear();
     this.compiledPatterns.clear();
+    this.patternOrder = null;
     this.buildIndex(routes);
   }
   addRoute(route2, parentPath = "") {
+    this.patternOrder = null;
     const fullPath = parentPath + route2.path;
     const parentAncestors = this.parentChain.get(parentPath) || [];
     const chain = [...parentAncestors, route2];
@@ -293,6 +327,7 @@ var RouteMatcher = class {
   }
   removeRoute(path) {
     this.compiledPatterns.clear();
+    this.patternOrder = null;
     const root = this.routeTrie.get(path);
     if (!root) return;
     const removed = /* @__PURE__ */ new Set();
@@ -559,14 +594,16 @@ var _SibuRouter = class _SibuRouter {
     this.initialize();
   }
   initialize() {
-    if (this.options.mode === "history") {
-      const popstateHandler = () => this.handleLocationChange(true);
-      window.addEventListener("popstate", popstateHandler);
-      this.cleanup.push(() => window.removeEventListener("popstate", popstateHandler));
-    } else {
-      const hashHandler = () => this.handleLocationChange(true);
-      window.addEventListener("hashchange", hashHandler);
-      this.cleanup.push(() => window.removeEventListener("hashchange", hashHandler));
+    if (typeof window !== "undefined") {
+      if (this.options.mode === "history") {
+        const popstateHandler = () => this.handleLocationChange(true);
+        window.addEventListener("popstate", popstateHandler);
+        this.cleanup.push(() => window.removeEventListener("popstate", popstateHandler));
+      } else {
+        const hashHandler = () => this.handleLocationChange(true);
+        window.addEventListener("hashchange", hashHandler);
+        this.cleanup.push(() => window.removeEventListener("hashchange", hashHandler));
+      }
     }
     queueMicrotask(() => {
       this.handleLocationChange(true);
@@ -1107,10 +1144,15 @@ function Route() {
       if (!routeInitialized && anchor.parentNode) wrappedUpdate();
     });
   }
-  routeCleanups.push(() => {
+  let routeTorn = false;
+  const routeCleanup = () => {
+    if (routeTorn) return;
+    routeTorn = true;
     routeTeardown();
     cleanupNodes();
-  });
+  };
+  registerDisposer(anchor, routeCleanup);
+  routeCleanups.push(routeCleanup);
   return anchor;
 }
 function KeepAliveRoute(options) {
@@ -1220,7 +1262,10 @@ function KeepAliveRoute(options) {
       if (!initialized && anchor.parentNode) wrappedUpdate();
     });
   }
-  routeCleanups.push(() => {
+  let kaTorn = false;
+  const kaCleanup = () => {
+    if (kaTorn) return;
+    kaTorn = true;
     kaTeardown();
     for (const node of cache.values()) {
       dispose(node);
@@ -1230,12 +1275,15 @@ function KeepAliveRoute(options) {
     lruOrder.length = 0;
     if (currentNode?.parentNode) currentNode.parentNode.removeChild(currentNode);
     currentNode = null;
-  });
+  };
+  registerDisposer(anchor, kaCleanup);
+  routeCleanups.push(kaCleanup);
   return anchor;
 }
-function RouterLink(props) {
+function RouterLink(props, children) {
   if (!_routerRef.current) throw new Error("Router not initialized. Call createRouter() first.");
   const { to, replace: replace2 = false, activeClass, exactActiveClass, nodes, target, rel, class: classAttr, ...attrs } = props;
+  const content = children !== void 0 ? children : nodes;
   const baseClass = typeof classAttr === "string" ? classAttr : "";
   const routeGetter = _routerRef.current.routeGetter;
   const rawHref = _routerRef.current["resolvePath"](to);
@@ -1285,12 +1333,12 @@ function RouterLink(props) {
       }
     }
   });
-  if (typeof nodes === "string") {
-    link.textContent = nodes;
-  } else if (nodes instanceof Node) {
-    link.appendChild(nodes);
-  } else if (Array.isArray(nodes)) {
-    nodes.forEach((child) => {
+  if (typeof content === "string") {
+    link.textContent = content;
+  } else if (content instanceof Node) {
+    link.appendChild(content);
+  } else if (Array.isArray(content)) {
+    content.forEach((child) => {
       if (typeof child === "string") {
         link.appendChild(document.createTextNode(child));
       } else if (child instanceof Node) {
@@ -1485,14 +1533,19 @@ function Outlet() {
       if (anchor.parentNode) update();
     });
   }
-  routeCleanups.push(() => {
+  let outletTorn = false;
+  const outletCleanup = () => {
+    if (outletTorn) return;
+    outletTorn = true;
     outletTeardown();
     if (currentNode) {
       dispose(currentNode);
       if (currentNode.parentNode) currentNode.parentNode.removeChild(currentNode);
       currentNode = null;
     }
-  });
+  };
+  registerDisposer(anchor, outletCleanup);
+  routeCleanups.push(outletCleanup);
   return anchor;
 }
 function addRoute(route2, parentPath) {