ranui 0.2.0-alpha.7 → 0.2.1-alpha.3

package/dist/utils/router/index.d.ts

@@ -55,10 +55,19 @@ export interface RouterComponentElement extends HTMLElement {
 export declare function getSSGPath(): string | null;
 export declare function setSSGPath(path: string): void;
 export declare function clearSSGPath(): void;
+/**
+ * Match a route pattern (with `:param` and `*` segments) against a path.
+ * Single source of truth shared by RouterCore and the `<r-route>` element.
+ */
+export declare function matchPath(routePath: string, exact: boolean, path: string): {
+    matched: boolean;
+    params: Record<string, string>;
+};
 export declare class RouterCore {
     private readonly _mode;
     private readonly _base;
     private readonly _routes;
+    private readonly _flatRoutes;
     private readonly _vtMode;
     private readonly _beforeGuards;
     private readonly _afterGuards;
@@ -73,10 +82,11 @@ export declare class RouterCore {
     get base(): string;
     get routes(): RouteConfig[];
     get currentRoute(): RouteLocation | null;
-    private _matchConfigPath;
-    /** Return the first RouteConfig whose path matches the given URL path, or null. */
+    /** Return the first matching route (absolute path, nested-aware), or null. */
     matchRoute(path: string): RouteConfig | null;
-    /** Return all route paths declared in the router config — used to enumerate SSG pages. */
+    /** Extract `:param` values for the first matching route ({} if none). */
+    matchParams(path: string): Record<string, string>;
+    /** All declared route paths (nested flattened) — used to enumerate SSG pages. */
     getStaticPaths(): string[];
     private _enableMpa;
     private _disableMpa;

package/dist/utils/router.js

@@ -1,41 +1,71 @@
-var o = null, r = null, u = null;
-function m() {
-  return u;
+var c = null, r = null, h = null;
+function P() {
+  return h;
 }
-function v(e) {
-  u = e;
+function x(e) {
+  h = e;
 }
-function b() {
-  u = null;
+function E() {
+  h = null;
 }
-function f(e) {
+function m(e) {
   const t = {};
-  return e && new URLSearchParams(e.startsWith("?") ? e.slice(1) : e).forEach((i, n) => {
-    t[n] = i;
+  return e && new URLSearchParams(e.startsWith("?") ? e.slice(1) : e).forEach((n, a) => {
+    t[a] = n;
   }), t;
 }
-function l() {
+function f(e, t, n) {
+  const a = [], s = e.split("/").map((i) => i.startsWith(":") ? (a.push(i.slice(1)), "([^/]+)") : i === "*" ? "(.*)" : i.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("/"), o = t ? new RegExp(`^${s}$`) : new RegExp(`^${s}(?:/.*)?$`), u = n.match(o);
+  if (!u) return {
+    matched: !1,
+    params: {}
+  };
+  const d = {};
+  return a.forEach((i, w) => {
+    d[i] = decodeURIComponent(u[w + 1] ?? "");
+  }), {
+    matched: !0,
+    params: d
+  };
+}
+function g(e, t) {
+  return e ? `${e.replace(/\/$/, "")}/${t.replace(/^\//, "")}` : t;
+}
+function l(e, t = "") {
+  const n = [];
+  for (const a of e) {
+    const s = g(t, a.path);
+    n.push({
+      path: s,
+      exact: a.exact ?? !1,
+      meta: a.meta
+    }), a.children?.length && n.push(...l(a.children, s));
+  }
+  return n;
+}
+function v() {
   return typeof document < "u" && "startViewTransition" in document;
 }
-function _(e) {
-  l() ? document.startViewTransition(e) : e();
+function b(e) {
+  v() ? document.startViewTransition(e) : e();
 }
-function h() {
+function p() {
   typeof document > "u" || r && document.head.contains(r) || (r = document.createElement("style"), r.textContent = "@view-transition { navigation: auto; }", document.head.appendChild(r));
 }
-function d() {
+function _() {
   r?.remove(), r = null;
 }
-function p(e) {
+function y(e) {
   return e === !0 || e === "spa" || e === "both";
 }
-function w(e) {
+function S(e) {
   return e === "mpa" || e === "both";
 }
-var g = class {
+var R = class {
   _mode;
   _base;
   _routes;
+  _flatRoutes;
   _vtMode;
   _beforeGuards = [];
   _afterGuards = [];
@@ -46,7 +76,7 @@ var g = class {
   _current = null;
   _mpaActive = !1;
   constructor(e = {}) {
-    this._mode = e.mode ?? "history", this._base = e.base ?? "", this._routes = e.routes ?? [], this._vtMode = e.viewTransition, w(this._vtMode) && this._enableMpa();
+    this._mode = e.mode ?? "history", this._base = e.base ?? "", this._routes = e.routes ?? [], this._flatRoutes = l(this._routes), this._vtMode = e.viewTransition, S(this._vtMode) && this._enableMpa();
   }
   get mode() {
     return this._mode;
@@ -60,21 +90,29 @@ var g = class {
   get currentRoute() {
     return this._current;
   }
-  _matchConfigPath(e, t) {
-    const i = [], n = t.path.split("/").map((s) => s.startsWith(":") ? (i.push(s.slice(1)), "([^/]+)") : s === "*" ? "(.*)" : s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("/");
-    return (t.exact ? new RegExp(`^${n}$`) : new RegExp(`^${n}(?:/.*)?$`)).test(e);
-  }
   matchRoute(e) {
-    return this._routes.find((t) => this._matchConfigPath(e, t)) ?? null;
+    const t = this._flatRoutes.find((n) => f(n.path, n.exact, e).matched);
+    return t ? {
+      path: t.path,
+      exact: t.exact,
+      meta: t.meta
+    } : null;
+  }
+  matchParams(e) {
+    for (const t of this._flatRoutes) {
+      const n = f(t.path, t.exact, e);
+      if (n.matched) return n.params;
+    }
+    return {};
   }
   getStaticPaths() {
-    return this._routes.map((e) => e.path);
+    return this._flatRoutes.map((e) => e.path);
   }
   _enableMpa() {
-    this._mpaActive || (this._mpaActive = !0, h(), typeof window < "u" && (window.addEventListener("pageswap", this._onPageSwap), window.addEventListener("pagereveal", this._onPageReveal)));
+    this._mpaActive || (this._mpaActive = !0, p(), typeof window < "u" && (window.addEventListener("pageswap", this._onPageSwap), window.addEventListener("pagereveal", this._onPageReveal)));
   }
   _disableMpa() {
-    this._mpaActive && (this._mpaActive = !1, d(), typeof window < "u" && (window.removeEventListener("pageswap", this._onPageSwap), window.removeEventListener("pagereveal", this._onPageReveal)));
+    this._mpaActive && (this._mpaActive = !1, _(), typeof window < "u" && (window.removeEventListener("pageswap", this._onPageSwap), window.removeEventListener("pagereveal", this._onPageReveal)));
   }
   _onPageSwap = (e) => {
     this._pageSwapHandlers.forEach((t) => t(e));
@@ -89,11 +127,11 @@ var g = class {
     this._components.delete(e);
   }
   _buildLocation(e) {
-    const t = e.indexOf("?"), i = t === -1 ? e : e.slice(0, t), n = t === -1 ? "" : e.slice(t + 1);
+    const t = e.indexOf("?"), n = t === -1 ? e : e.slice(0, t), a = t === -1 ? "" : e.slice(t + 1);
     return {
-      path: i || "/",
+      path: n || "/",
       params: {},
-      query: f(n),
+      query: m(a),
       fullPath: e || "/"
     };
   }
@@ -104,21 +142,23 @@ var g = class {
     return (t && e.startsWith(t) ? e.slice(t.length) || "/" : e) + (window.location.search || "");
   }
   _notify() {
-    const e = this._buildLocation(this._getCurrentPath()), t = this._current;
+    const e = this._buildLocation(this._getCurrentPath());
+    e.params = this.matchParams(e.path);
+    const t = this._current;
     this._current = e;
-    const i = () => {
-      this._components.forEach((n) => n._syncRoutes());
+    const n = () => {
+      this._components.forEach((a) => a._syncRoutes());
     };
-    p(this._vtMode) ? _(i) : i(), this._afterGuards.forEach((n) => n(e, t)), this._changeHandlers.forEach((n) => n(e, t));
+    y(this._vtMode) ? b(n) : n(), this._afterGuards.forEach((a) => a(e, t)), this._changeHandlers.forEach((a) => a(e, t));
   }
   async _navigate(e, t) {
-    const i = this._buildLocation(e), n = this._current;
+    const n = this._buildLocation(e), a = this._current;
     for (const s of this._beforeGuards) {
-      const a = await new Promise((c) => {
-        s(i, n, c);
+      const o = await new Promise((u) => {
+        s(n, a, u);
       });
-      if (a === !1) return;
-      if (typeof a == "string") return this._navigate(a, t);
+      if (o === !1) return;
+      if (typeof o == "string") return this._navigate(o, t);
     }
     if (typeof window < "u") {
       const s = this._mode === "hash" ? `#${e}` : this._base + e;
@@ -175,23 +215,24 @@ var g = class {
     };
   }
 };
-function y(e) {
-  o?.destroy();
-  const t = new g(e);
-  return o = t, t;
+function H(e) {
+  c?.destroy();
+  const t = new R(e);
+  return c = t, t;
 }
-function S() {
-  return o;
+function M() {
+  return c;
 }
-function P() {
-  return h(), () => d();
+function G() {
+  return p(), () => _();
 }
 export {
-  g as RouterCore,
-  b as clearSSGPath,
-  y as createRouter,
-  P as enableMpaViewTransitions,
-  m as getSSGPath,
-  v as setSSGPath,
-  S as useRouter
+  R as RouterCore,
+  E as clearSSGPath,
+  H as createRouter,
+  G as enableMpaViewTransitions,
+  P as getSSGPath,
+  f as matchPath,
+  x as setSSGPath,
+  M as useRouter
 };

package/dist/utils/theme.d.ts

@@ -2,7 +2,7 @@ export type RanThemeName = 'light' | 'dark' | 'system';
 export type ThemeTarget = HTMLElement | Document;
 export type ThemeTokenMap = Record<string, string | number | null | undefined>;
 export declare const setTheme: (name: RanThemeName, target?: ThemeTarget) => void;
-export declare const getTheme: (target?: ThemeTarget) => RanThemeName | "";
+export declare const getTheme: (target?: ThemeTarget) => RanThemeName | '';
 export declare const setThemeToken: (name: string, value: string | number, target?: HTMLElement) => void;
 export declare const clearThemeToken: (name: string, target?: HTMLElement) => void;
 export declare const setThemeTokens: (tokens: ThemeTokenMap, target?: HTMLElement) => void;

package/dist/{utils-DBfrRFoE.js → utils-D1iZnChu.js}

@@ -59,29 +59,29 @@ var R = class {
     return t > 1 ? t / 100 : t;
   }
   return Number(e);
-}, O = (e, t = 0, r = 1) => Math.min(r, Math.max(t, e)), C = (e) => typeof e == "function";
+}, B = (e, t = 0, r = 1) => Math.min(r, Math.max(t, e)), C = (e) => typeof e == "function";
 function h(e) {
   return e < 10 ? `0${e}` : e;
 }
-var B = (e) => {
+var O = (e) => {
   if (e === 0) return "00:00";
   if (!e) return "";
   const t = Math.trunc(e / 3600), r = Math.trunc(e % 3600 / 60), a = h(Math.trunc(e - 3600 * t - 60 * r));
   return t === 0 ? `${h(r)}:${a}` : `${h(t)}:${h(r)}:${a}`;
-}, T = () => {
+}, $ = () => {
   if (typeof window < "u") {
     const e = navigator.userAgent.toLowerCase();
     return /ipad|ipod/.test(e) ? "ipad" : /android/.test(e) ? "android" : /iphone/.test(e) ? "iphone" : "pc";
   }
   return "pc";
-}, E = typeof window < "u", U = () => {
+}, E = typeof window < "u", T = () => {
   if (!E) return !1;
   const e = window.navigator.userAgent;
   return !!/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(e);
-}, $ = (e) => {
+}, U = (e) => {
   const t = e.backingStorePixelRatio || e.webkitBackingStorePixelRatio || e.mozBackingStorePixelRatio || e.msBackingStorePixelRatio || e.oBackingStorePixelRatio || 1;
   return (E && window.devicePixelRatio || 1) / t;
-}, M = 12e4, A = "__ranuts_bridge__", q = "default", m = new class {
+}, A = 12e4, M = "__ranuts_bridge__", q = "default", m = new class {
   bridges = /* @__PURE__ */ new Set();
   attachedWindow = null;
   handleMessage = (e) => {
@@ -107,7 +107,7 @@ var B = (e) => {
   post(e, t) {
     const r = {
       ...t,
-      __bridge: A,
+      __bridge: M,
       channel: this.channel,
       senderId: this.senderId
     };
@@ -157,7 +157,7 @@ var B = (e) => {
     return new Promise((a, s) => {
       const o = setTimeout(() => {
         this.pendingRequests.has(r) && (this.pendingRequests.delete(r), s(/* @__PURE__ */ new Error("Request timeout")));
-      }, M), w = (d) => {
+      }, A), w = (d) => {
         clearTimeout(o), s(d);
       };
       this.pendingRequests.set(r, {
@@ -428,7 +428,7 @@ var B = (e) => {
       }, a - (o - e));
     };
   };
-}, g = /* @__PURE__ */ new Map([
+}, f = /* @__PURE__ */ new Map([
   [100, "Continue"],
   [101, "Switching Protocols"],
   [102, "Processing"],
@@ -493,17 +493,17 @@ var B = (e) => {
   [510, "Not Extended"],
   [511, "Network Authentication Required"]
 ]), K = {
-  message: g,
+  message: f,
   code: (function(e) {
     const t = /* @__PURE__ */ new Map();
     for (const [r, a] of e) t.set(a.toLowerCase(), r);
     return t;
-  })(g),
+  })(f),
   codes: (function(e) {
     const t = [];
     for (const [r, a] of e) t.push(r);
     return t;
-  })(g),
+  })(f),
   redirect: {
     300: !0,
     301: !0,
@@ -531,14 +531,14 @@ var B = (e) => {
 ], X = (e) => {
   const t = e.hasAttribute("disabled"), r = e.getAttribute("disabled");
   return !!(t && !k.includes(r));
-}, f = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map(), N = (e, t) => {
+}, g = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map(), N = (e, t) => {
   if (!(typeof document > "u") && t) {
     if (typeof CSSStyleSheet < "u") try {
-      if (!f.has(t)) {
+      if (!g.has(t)) {
         const a = new CSSStyleSheet();
-        a.replaceSync(t), f.set(t, a);
+        a.replaceSync(t), g.set(t, a);
       }
-      const r = f.get(t);
+      const r = g.get(t);
       e.adoptedStyleSheets.includes(r) || (e.adoptedStyleSheets = [...e.adoptedStyleSheets, r]);
       return;
     } catch {
@@ -580,28 +580,35 @@ ${S}` : S), a;
     return;
   }
   e.setAttribute(t, r ?? "");
-}, ee = (e, t, r, a, s) => {
+}, ee = (e, t, r, a = {}) => {
+  if (r) {
+    e.setAttribute(t, ""), a.aria && e.setAttribute(`aria-${a.aria}`, "true");
+    return;
+  }
+  e.removeAttribute(t), a.aria && e.removeAttribute(`aria-${a.aria}`);
+}, te = (e, t, r, a, s) => {
   if (r !== "sheet" || a === s) return;
   const o = e.getAttribute("sheet") || "";
   o && W(t, o);
 };
 export {
-  T as _,
-  ee as a,
-  G as c,
-  $ as d,
-  z as f,
-  V as g,
+  V as _,
+  Z as a,
+  X as c,
+  T as d,
+  U as f,
+  B as g,
   O as h,
-  Z as i,
-  j as l,
-  B as m,
+  ee as i,
+  G as l,
+  L as m,
   Y as n,
-  k as o,
-  L as p,
+  te as o,
+  z as p,
   Q as r,
-  X as s,
+  k as s,
   J as t,
-  U as u,
-  R as v
+  j as u,
+  $ as v,
+  R as y
 };