@mauroandre/velojs 0.0.35 → 0.0.36

package/dist/client.js

@@ -1,72 +1,81 @@
 import { jsx as c } from "preact/jsx-runtime";
-import { hydrate as b } from "preact";
-import { Router as j, Route as m, Switch as a } from "wouter-preact";
-const $ = (n, t) => n.reduceRight((e, i) => /* @__PURE__ */ c(i, { children: e }), t), p = (n, t, e) => t ? e && t === "/" ? n || "/" : t.startsWith("/") ? n + t : n + "/" + t : n, x = (n) => n === "" ? "*" : `${n}/*?`, C = (n) => {
-  for (const t of n) {
-    if (t.path === "*" && t.module) return t.module.Component;
-    if (t.children) {
-      const e = C(t.children);
-      if (e) return e;
+import { hydrate as j } from "preact";
+import { Router as x, Route as p, Switch as $ } from "wouter-preact";
+const l = (t, e, n) => e ? n && e === "/" ? t || "/" : e.startsWith("/") ? t + e : t + "/" + e : t, b = (t) => t === "" ? "*" : `${t}/*?`, w = (t) => t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), S = (t) => {
+  let e = !1;
+  t.endsWith("/*?") && (t = t.slice(0, -3), e = !0);
+  const n = t.split("/").map((o) => o.startsWith(":") ? "[^/]+" : w(o)).join("/");
+  return e ? `${n}(?:/.*)?` : n;
+}, a = (t, e) => {
+  if (t.path === "*") return [];
+  if (!t.module) {
+    const o = l(e, t.path, !1);
+    return (t.children ?? []).flatMap((i) => a(i, o));
+  }
+  if (!t.children)
+    return [l(e, t.path, !0) || "/"];
+  if (t.path)
+    return [`${l(e, t.path, !1)}/*?`];
+  const n = l(e, t.path, !1);
+  return (t.children ?? []).flatMap((o) => a(o, n));
+}, W = (t, e) => {
+  const n = a(t, e);
+  return new RegExp(`^(?:${n.map(S).join("|")})$`);
+}, y = (t) => {
+  for (const e of t) {
+    if (e.path === "*" && e.module) return e.module.Component;
+    if (e.children) {
+      const n = y(e.children);
+      if (n) return n;
     }
   }
   return null;
-}, y = (n, t) => t ? [...n, /* @__PURE__ */ c(m, { children: /* @__PURE__ */ c(t, {}) }, "__notfound")] : n, h = (n, t, e, i, R) => {
-  const l = [];
-  for (let u = 0; u < n.length; u++) {
-    const o = n[u], r = `${R}${u}`;
-    if (o.path === "*") continue;
-    if (!o.module) {
-      if (o.children) {
-        const f = p(e, o.path, !1);
-        l.push(
-          ...h(o.children, t, f, i, `${r}-`)
-        );
+}, R = (t, e) => e ? [...t, /* @__PURE__ */ c(p, { children: /* @__PURE__ */ c(e, {}) }, "__notfound")] : t, h = (t, e, n, o) => {
+  const i = [];
+  for (let u = 0; u < t.length; u++) {
+    const r = t[u], s = `${o}${u}`;
+    if (r.path === "*") continue;
+    if (!r.module) {
+      if (r.children) {
+        const f = l(e, r.path, !1);
+        i.push(...h(r.children, f, n, `${s}-`));
       }
       continue;
     }
-    const s = o.module.Component;
-    if (!o.children) {
-      const f = p(e, o.path, !0) || "/";
-      l.push(
-        /* @__PURE__ */ c(m, { path: f, children: $(t, /* @__PURE__ */ c(s, {})) }, r)
-      );
-      continue;
-    }
-    if (o.isRoot) {
-      l.push(
-        /* @__PURE__ */ c(a, { children: y(
-          h(o.children, [], "", i, `${r}-`),
-          i
-        ) }, r)
+    const d = r.module.Component;
+    if (!r.children) {
+      const f = l(e, r.path, !0) || "/";
+      i.push(
+        /* @__PURE__ */ c(p, { path: f, children: /* @__PURE__ */ c(d, {}) }, s)
       );
       continue;
     }
-    const d = p(e, o.path, !1);
-    if (!o.path) {
-      l.push(
-        ...h(o.children, [...t, s], d, i, `${r}-`)
+    if (r.isRoot) {
+      i.push(
+        /* @__PURE__ */ c($, { children: R(
+          h(r.children, "", n, `${s}-`),
+          n
+        ) }, s)
       );
       continue;
     }
-    l.push(
-      /* @__PURE__ */ c(m, { path: x(d), children: $(
-        t,
-        /* @__PURE__ */ c(s, { children: /* @__PURE__ */ c(a, { children: y(
-          h(o.children, [], d, i, `${r}-`),
-          i
-        ) }) })
-      ) }, r)
+    const m = l(e, r.path, !1), C = r.path ? b(m) : W(r, e);
+    i.push(
+      /* @__PURE__ */ c(p, { path: C, children: /* @__PURE__ */ c(d, { children: /* @__PURE__ */ c($, { children: R(
+        h(r.children, m, n, `${s}-`),
+        n
+      ) }) }) }, s)
     );
   }
-  return l;
-}, S = ({ routes: n }) => {
-  const t = C(n), e = h(n, [], "", t, "");
-  return /* @__PURE__ */ c(j, { children: e });
-}, q = (n) => {
-  const { routes: t } = n, e = document.querySelector("body");
-  e && b(/* @__PURE__ */ c(S, { routes: t }), e);
+  return i;
+}, v = ({ routes: t }) => {
+  const e = y(t), n = h(t, "", e, "");
+  return /* @__PURE__ */ c(x, { children: n });
+}, q = (t) => {
+  const { routes: e } = t, n = document.querySelector("body");
+  n && j(/* @__PURE__ */ c(v, { routes: e }), n);
 };
 export {
-  S as ClientRoutes,
+  v as ClientRoutes,
   q as startClient
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mauroandre/velojs",
-    "version": "0.0.35",
+    "version": "0.0.36",
     "type": "module",
     "description": "Fullstack web framework built on Hono + Preact with Vite-powered AST transforms",
     "keywords": [