@mauroandre/velojs 0.0.15 → 0.0.17

package/dist/components.js

@@ -1,48 +1,56 @@
-import { jsx as o, jsxs as p, Fragment as L } from "preact/jsx-runtime";
-import { Link as v } from "wouter-preact";
-import { __veloUpdatePending as E } from "./hooks.js";
-function k({ basePath: e, favicon: t = "/favicon.ico" } = {}) {
+import { jsx as o, jsxs as p, Fragment as $ } from "preact/jsx-runtime";
+import { useRouter as v, Link as E } from "wouter-preact";
+import { __veloUpdatePending as y } from "./hooks.js";
+function O({ basePath: e, favicon: t = "/favicon.ico" } = {}) {
   const n = process.env.NODE_ENV !== "production";
   e = e || process.env.STATIC_BASE_URL || (process.env.VELO_STATIC ? "/client" : "");
   const i = t !== !1 && /* @__PURE__ */ o("link", { rel: "icon", href: `${e}${t}`, type: "image/x-icon" });
   if (n)
-    return /* @__PURE__ */ p(L, { children: [
+    return /* @__PURE__ */ p($, { children: [
       i,
       /* @__PURE__ */ o("script", { type: "module", src: "/@vite/client" }),
       /* @__PURE__ */ o("script", { type: "module", src: "/__velo_client.js" })
     ] });
   const r = typeof __VELO_CLIENT_JS__ < "u" ? __VELO_CLIENT_JS__ : "client.js";
-  return /* @__PURE__ */ p(L, { children: [
+  return /* @__PURE__ */ p($, { children: [
     i,
     /* @__PURE__ */ o("link", { rel: "stylesheet", href: `${e}/${typeof __VELO_CLIENT_CSS__ < "u" ? __VELO_CLIENT_CSS__ : "client.css"}` }),
     /* @__PURE__ */ o("script", { type: "module", src: `${e}/${r}` })
   ] });
 }
-function $(e, t) {
+function h(e, t) {
   let n = e;
   for (const [i, r] of Object.entries(t))
     n = n.replace(`:${i}`, r);
   return n;
 }
-function g({ to: e, params: t, search: n, absolute: i, ...r }) {
-  const c = typeof e != "string", s = c ? (i ? e.metadata?.fullPath : e.metadata?.path) ?? "/" : e, f = t ? $(s, t) : s, m = c && i ? `~${f}` : f, _ = n ? `?${new URLSearchParams(n).toString()}` : "", S = `${m}${_}`;
-  if (typeof window < "u" && E.value) {
-    const u = c ? e.metadata?.fullPath ?? s : s, a = `${t ? $(u, t) : u}${_}`, { onClick: d, ...h } = r;
+function j({ to: e, params: t, search: n, absolute: i, ...r }) {
+  const c = typeof e != "string", u = v(), _ = c ? (i ? e.metadata?.fullPath : e.metadata?.path) ?? "/" : e, l = t ? h(_, t) : _, L = c && i ? `~${l}` : l, a = n ? `?${new URLSearchParams(n).toString()}` : "", m = `${L}${a}`;
+  if (typeof window < "u" && y.value) {
+    let f;
+    if (c) {
+      const s = e.metadata?.fullPath ?? _;
+      f = `${t ? h(s, t) : s}${a}`;
+    } else {
+      const s = l.replace(/^~/, "");
+      f = `${!l.startsWith("~") && u.base ? u.base : ""}${s}${a}`;
+    }
+    const { onClick: d, ...S } = r;
     return /* @__PURE__ */ o(
       "a",
       {
-        href: a,
-        onClick: (l) => {
-          d && d(l), l.defaultPrevented || (l.preventDefault(), window.location.href = a);
+        href: f,
+        onClick: (s) => {
+          d && d(s), s.defaultPrevented || (s.preventDefault(), window.location.href = f);
         },
-        ...h
+        ...S
       }
     );
   }
-  return /* @__PURE__ */ o(v, { to: S, ...r });
+  return /* @__PURE__ */ o(E, { to: m, ...r });
 }
 export {
-  g as Link,
-  k as Scripts,
-  $ as substituteParams
+  j as Link,
+  O as Scripts,
+  h as substituteParams
 };

package/dist/hooks.js

@@ -1,12 +1,12 @@
-import { signal as c, useSignal as v } from "@preact/signals";
-import { useRef as D, useEffect as p } from "preact/hooks";
-import { useLocation as w, useParams as S } from "wouter-preact";
-const y = c(!1);
-function P(e) {
+import { signal as _, useSignal as d } from "@preact/signals";
+import { useRef as g, useEffect as h } from "preact/hooks";
+import { useLocation as v, useParams as D } from "wouter-preact";
+const p = _(!1);
+function m(e) {
   e.value !== null && typeof e.value == "object" && (e.value = { ...e.value });
 }
-function T(e) {
-  const a = c(!1);
+function P(e) {
+  const a = _(!1);
   if (typeof window > "u")
     return { data: {
       get value() {
@@ -14,50 +14,50 @@ function T(e) {
       }
     }, loading: a };
   const t = window.__PAGE_DATA__, n = e && t?.[e] ? t[e] : null;
-  return { data: c(n), loading: a };
+  return { data: _(n), loading: a };
 }
-function E(e, a) {
+function T(e, a) {
   let t, n;
   Array.isArray(e) ? n = e : (t = e, n = a);
   let r = null;
   if (typeof window > "u" && t) {
-    const u = globalThis.__veloServerData?.getStore?.();
-    u?.[t] && (r = u[t]);
+    const c = globalThis.__veloServerData?.getStore?.();
+    c?.[t] && (r = c[t]);
   }
   if (typeof window < "u" && t) {
     const o = window.__PAGE_DATA__;
     o?.[t] && (r = o[t], delete o[t]);
   }
-  const _ = v(r), i = v(!1), f = () => {
+  const u = d(r), i = d(!1), l = () => {
     if (typeof window > "u" || !t) return;
     const o = window.location.pathname;
     i.value = !0;
-    const d = typeof __VELO_STATIC__ < "u" && __VELO_STATIC__ ? `${o === "/" ? "" : o}/index.json` : (() => {
+    const w = typeof __VELO_STATIC__ < "u" && __VELO_STATIC__ ? `${o === "/" ? "" : o}/index.json` : (() => {
       const s = new URLSearchParams(window.location.search);
       return s.set("_data", "1"), `${o}?${s.toString()}`;
-    })(), g = d.includes("?") ? "&" : "?", h = typeof __VELO_BUILD_HASH__ < "u" ? `${g}v=${__VELO_BUILD_HASH__}` : "";
-    fetch(`${d}${h}`).then((s) => s.json()).then((s) => {
-      typeof __VELO_BUILD_HASH__ < "u" && s.__buildHash && s.__buildHash !== __VELO_BUILD_HASH__ && (y.value = !0), _.value = s[t], i.value = !1;
+    })();
+    fetch(w, { cache: "no-cache" }).then((s) => s.json()).then((s) => {
+      typeof __VELO_BUILD_HASH__ < "u" && s.__buildHash && s.__buildHash !== __VELO_BUILD_HASH__ && (p.value = !0), u.value = s[t], i.value = !1;
     }).catch(() => {
       i.value = !1;
     });
-  }, l = D(r !== null);
-  return p(() => {
-    if (l.current) {
-      l.current = !1;
+  }, f = g(r !== null);
+  return h(() => {
+    if (f.current) {
+      f.current = !1;
       return;
     }
-    f();
-  }, n ?? []), { data: _, loading: i, refetch: f };
+    l();
+  }, n ?? []), { data: u, loading: i, refetch: l };
 }
-function H() {
-  const [, e] = w();
+function L() {
+  const [, e] = v();
   return e;
 }
-function b() {
-  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__params ?? {} : S();
+function E() {
+  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__params ?? {} : D();
 }
-function U() {
+function b() {
   if (typeof window > "u")
     return globalThis.__veloServerData?.getStore?.()?.__query ?? {};
   const e = window.__PAGE_DATA__;
@@ -68,16 +68,16 @@ function U() {
     t[r] = n;
   }), t;
 }
-function $() {
-  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__pathname ?? "/" : (w(), window.location.pathname);
+function H() {
+  return typeof window > "u" ? globalThis.__veloServerData?.getStore?.()?.__pathname ?? "/" : (v(), window.location.pathname);
 }
 export {
-  T as Loader,
-  y as __veloUpdatePending,
-  P as touch,
-  E as useLoader,
-  H as useNavigate,
-  b as useParams,
-  $ as usePathname,
-  U as useQuery
+  P as Loader,
+  p as __veloUpdatePending,
+  m as touch,
+  T as useLoader,
+  L as useNavigate,
+  E as useParams,
+  H as usePathname,
+  b as useQuery
 };

package/dist/server.js

@@ -1,15 +1,15 @@
-import { jsx as h } from "preact/jsx-runtime";
-import { Hono as P } from "hono";
-import { logger as T } from "hono/logger";
-import { trimTrailingSlash as D } from "hono/trailing-slash";
-import { render as O } from "preact-render-to-string";
-import { Router as b } from "wouter-preact";
-import { AsyncLocalStorage as I } from "node:async_hooks";
-const v = new I();
+import { jsx as m } from "preact/jsx-runtime";
+import { Hono as T } from "hono";
+import { logger as A } from "hono/logger";
+import { trimTrailingSlash as b } from "hono/trailing-slash";
+import { render as D } from "preact-render-to-string";
+import { Router as R } from "wouter-preact";
+import { AsyncLocalStorage as C } from "node:async_hooks";
+const v = new C();
 globalThis.__veloServerData = v;
 const _ = [];
 let p = null;
-function M(t) {
+function L(t) {
   if (p) {
     t(p);
     return;
@@ -21,18 +21,18 @@ function y(t) {
   for (const e of _) e(t);
   _.length = 0;
 }
-const S = [];
-function G(t) {
-  S.push(t);
+const w = [];
+function U(t) {
+  w.push(t);
 }
-const R = (t, e, o) => {
+const N = (t, e, o) => {
   if (t.req.query("_data") === "1") {
-    const c = typeof __VELO_BUILD_HASH__ < "u" ? __VELO_BUILD_HASH__ : void 0, r = o ? { ...o, __buildHash: c } : { __buildHash: c };
+    const c = globalThis.__veloBuildHash || void 0, r = o ? { ...o, __buildHash: c } : { __buildHash: c };
     return t.json(r);
   }
   const s = t.req.path, n = v.run(
     o ?? {},
-    () => O(/* @__PURE__ */ h(b, { ssrPath: s, children: e }))
+    () => D(/* @__PURE__ */ m(R, { ssrPath: s, children: e }))
   );
   if (t.header("Cache-Control", "no-cache"), !o)
     return t.html(n);
@@ -40,7 +40,7 @@ const R = (t, e, o) => {
     o
   )}<\/script>`;
   return t.html(n.replace("</head>", `${a}</head>`));
-}, C = async (t, e) => {
+}, O = async (t, e) => {
   const o = e.req.param(), s = e.req.query(), n = { params: o, query: s, c: e }, a = await Promise.all(
     t.map(async (r) => {
       if (!r.loader) return null;
@@ -58,24 +58,24 @@ const R = (t, e, o) => {
     components: t.map((r) => r.Component),
     data: c
   };
-}, N = (t) => {
+}, j = (t) => {
   if (t.length === 0) return null;
   const e = t.filter(Boolean);
   if (e.length === 0) return null;
   if (e.length === 1) {
     const n = e[0];
-    return /* @__PURE__ */ h(n, {});
+    return /* @__PURE__ */ m(n, {});
   }
   const o = e[e.length - 1];
-  return e.slice(0, -1).reduceRight((n, a) => /* @__PURE__ */ h(a, { children: n }), /* @__PURE__ */ h(o, {}));
-}, w = (t, e, o = [], s = []) => {
+  return e.slice(0, -1).reduceRight((n, a) => /* @__PURE__ */ m(a, { children: n }), /* @__PURE__ */ m(o, {}));
+}, S = (t, e, o = [], s = []) => {
   for (const n of e) {
     const a = [...o, n.module], c = [
       ...s,
       ...n.middlewares || []
     ];
     if (n.children)
-      w(
+      S(
         t,
         n.children,
         a,
@@ -90,13 +90,13 @@ const R = (t, e, o) => {
         continue;
       }
       const u = async (i) => {
-        const { components: d, data: f } = await C(a, i), l = N(d);
-        return R(i, l, f);
+        const { components: d, data: f } = await O(a, i), l = j(d);
+        return N(i, l, f);
       };
       c.length > 0 ? t.on(["GET"], [r], ...c, u) : t.on(["GET"], [r], u);
     }
   }
-}, E = (t, e, o = []) => {
+}, q = (t, e, o = []) => {
   for (const s of e) {
     const n = s.module.metadata?.moduleId, a = [
       ...o,
@@ -115,18 +115,18 @@ const R = (t, e, o) => {
               g = await l.req.json();
             } catch {
             }
-            const q = {
+            const E = {
               body: g,
               params: l.req.param(),
               query: l.req.query(),
               c: l
             };
             try {
-              const m = await i(q);
-              return l.json(m ?? { ok: !0 });
-            } catch (m) {
-              const A = m instanceof Error ? m.message : "Action failed";
-              return l.json({ error: A }, 500);
+              const h = await i(E);
+              return l.json(h ?? { ok: !0 });
+            } catch (h) {
+              const P = h instanceof Error ? h.message : "Action failed";
+              return l.json({ error: P }, 500);
             }
           };
           a.length > 0 ? t.on(
@@ -138,20 +138,20 @@ const R = (t, e, o) => {
         }
       }
     }
-    s.children && E(t, s.children, a);
+    s.children && q(t, s.children, a);
   }
-}, j = async (t) => {
-  const e = new P();
-  e.use(D()), process.env.NODE_ENV !== "production" && e.use("*", T());
-  for (const o of S)
+}, I = async (t) => {
+  const e = new T();
+  e.use(b()), process.env.NODE_ENV !== "production" && e.use("*", A());
+  for (const o of w)
     await o(e);
-  if (w(e, t), E(e, t), process.env.NODE_ENV !== "production" && !p) {
+  if (S(e, t), q(e, t), process.env.NODE_ENV !== "production" && !p) {
     const o = globalThis.__veloDevServer;
     o && y(o);
   }
   return e;
 }, x = async (t) => {
-  const { routes: e, port: o = Number(process.env.SERVER_PORT) || 3e3 } = t, s = await j(e);
+  const { routes: e, port: o = Number(process.env.SERVER_PORT) || 3e3 } = t, s = await I(e);
   if (process.env.NODE_ENV === "production" && !process.env.VELO_STATIC) {
     const { serve: n } = await import("@hono/node-server"), { serveStatic: a } = await import("@hono/node-server/serve-static"), { join: c } = await import("node:path"), r = c(process.cwd(), "dist/client");
     (process.env.STATIC_BASE_URL || "").startsWith("http") || s.use("/*", a({ root: r })), console.log(`Server running on http://localhost:${o}`);
@@ -161,10 +161,10 @@ const R = (t, e, o) => {
   return s;
 };
 export {
-  G as addRoutes,
-  j as createApp,
-  j as default,
-  M as onServer,
+  U as addRoutes,
+  I as createApp,
+  I as default,
+  L as onServer,
   v as serverDataStorage,
   x as startServer
 };

package/dist/vite.js

@@ -1,12 +1,12 @@
 import d from "node:path";
-import L from "node:fs";
+import _ from "node:fs";
 import C from "@preact/preset-vite";
 import F from "@hono/vite-dev-server";
 import { parse as v } from "@babel/parser";
-import b from "@babel/traverse";
-import j from "@babel/generator";
+import E from "@babel/traverse";
+import b from "@babel/generator";
 import * as e from "@babel/types";
-const m = typeof b == "function" ? b : b.default, S = typeof j == "function" ? j : j.default;
+const m = typeof E == "function" ? E : E.default, S = typeof b == "function" ? b : b.default;
 function w(u, c, r, l) {
   const i = v(u, {
     sourceType: "module",
@@ -241,7 +241,7 @@ function k(u) {
     }
   }), S(c, { retainLines: !0 }).code);
 }
-function _(u) {
+function j(u) {
   const c = v(u, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
@@ -291,7 +291,7 @@ function A(u, c, r) {
   }
 }
 const g = "virtual:velo/server-entry", x = "virtual:velo/client-entry", T = "\0" + g, P = "\0" + x;
-function J(u, c) {
+function B(u, c) {
   let r = d.resolve(process.cwd(), c);
   const l = u.routesFile ?? "routes.tsx", i = /* @__PURE__ */ new Map();
   return {
@@ -302,8 +302,8 @@ function J(u, c) {
     },
     buildStart() {
       const t = d.join(r, l);
-      if (L.existsSync(t)) {
-        const n = L.readFileSync(t, "utf-8"), s = _(n);
+      if (_.existsSync(t)) {
+        const n = _.readFileSync(t, "utf-8"), s = j(n);
         i.clear();
         for (const [o, a] of s)
           i.set(o, a);
@@ -312,7 +312,7 @@ function J(u, c) {
     handleHotUpdate({ file: t, server: n }) {
       const s = d.join(r, l);
       if (t === s) {
-        const o = L.readFileSync(s, "utf-8"), a = _(o);
+        const o = _.readFileSync(s, "utf-8"), a = j(o);
         i.clear();
         for (const [p, f] of a)
           i.set(p, f);
@@ -325,6 +325,7 @@ function J(u, c) {
     load(t) {
       const n = u.routesFile ?? "routes.tsx", s = u.serverInit ?? "server.tsx", o = u.clientInit ?? "client.tsx", a = d.join(r, n).replace(/\.tsx?$/, ".js"), p = d.join(r, s).replace(/\.tsx?$/, ".js"), f = d.join(r, o).replace(/\.tsx?$/, ".js");
       return t === T ? `
+globalThis.__veloBuildHash = __VELO_BUILD_HASH__;
 import "${p}";
 import routes from "${a}";
 import { startServer } from "@mauroandre/velojs/server";
@@ -347,10 +348,10 @@ startClient({ routes });
         t
       ), y = /export\s+(const|function)\s+loader/.test(t), N = /export\s+const\s+action_\w+/.test(t), O = /\bLoader\s*</.test(t) || /\bLoader\s*\(/.test(t), D = /\buseLoader\s*</.test(t) || /\buseLoader\s*\(/.test(t);
       if (!o && f && (a = k(a), p = !0), h || y || N || O || D) {
-        const E = d.relative(r, n).replace(/\.(tsx?|jsx?)$/, "").replace(/\\/g, "/"), I = i.get(E);
-        a = w(a, E, I?.fullPath, I?.path), a = R(a, E), o || (a = V(
+        const L = d.relative(r, n).replace(/\.(tsx?|jsx?)$/, "").replace(/\\/g, "/"), I = i.get(L);
+        a = w(a, L, I?.fullPath, I?.path), a = R(a, L), o || (a = V(
           a,
-          E
+          L
         )), o || (a = $(a)), p = !0;
       }
       return p ? {
@@ -360,7 +361,7 @@ startClient({ routes });
     }
   };
 }
-function M() {
+function J() {
   return {
     name: "velo:config",
     config(u, { mode: c }) {
@@ -368,7 +369,7 @@ function M() {
       let t = "client.js", n = "client.css";
       if (r)
         try {
-          const o = d.resolve(process.cwd(), "dist/client/.vite/manifest.json"), p = JSON.parse(L.readFileSync(o, "utf-8"))[x];
+          const o = d.resolve(process.cwd(), "dist/client/.vite/manifest.json"), p = JSON.parse(_.readFileSync(o, "utf-8"))[x];
           p && (t = p.file || t, p.css?.[0] && (n = p.css[0]));
         } catch {
         }
@@ -412,7 +413,7 @@ function M() {
     }
   };
 }
-function B() {
+function M() {
   return {
     name: "velo:static-url",
     apply: "build",
@@ -431,9 +432,9 @@ function B() {
 function Z(u) {
   const c = u ?? {}, r = c.appDirectory ?? "./app";
   return [
+    J(),
+    B(c, r),
     M(),
-    J(c, r),
-    B(),
     C(),
     F({
       entry: g
@@ -450,7 +451,7 @@ function H() {
   };
 }
 export {
-  _ as buildFullPathMap,
+  j as buildFullPathMap,
   A as collectFullPaths,
   w as injectMetadata,
   $ as removeLoaders,

package/package.json

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