@mauroandre/velojs 0.0.14 → 0.0.16

package/dist/cli.js

@@ -1,15 +1,19 @@
 import { spawnSync as c } from "node:child_process";
 import { resolve as a } from "node:path";
-const t = process.argv.slice(2), r = t[0], l = (e, s = []) => {
-  const o = c(e, s, {
+const o = process.argv.slice(2), r = o[0], l = (e, t = []) => {
+  const s = c(e, t, {
     stdio: "inherit",
     cwd: process.cwd()
   });
-  process.exit(o.status ?? 0);
+  process.exit(s.status ?? 0);
 }, p = () => {
-  l("npx", ["vite", ...t.slice(1)]);
-}, v = (e) => {
-  const s = e ? { ...process.env, VELO_STATIC: "1" } : process.env;
+  l("npx", ["vite", ...o.slice(1)]);
+}, u = (e) => {
+  const t = Date.now().toString(36), s = {
+    ...process.env,
+    VELO_BUILD_HASH: t,
+    ...e ? { VELO_STATIC: "1" } : {}
+  };
   console.log("Building client..."), c("npx", ["vite", "build"], {
     stdio: "inherit",
     cwd: process.cwd(),
@@ -18,13 +22,13 @@ const t = process.argv.slice(2), r = t[0], l = (e, s = []) => {
     stdio: "inherit",
     cwd: process.cwd(),
     env: s
-  }), console.log("Build complete!"), e && u();
-}, u = async () => {
+  }), console.log("Build complete!"), e && v();
+}, v = async () => {
   process.env.NODE_ENV = "production", process.env.VELO_STATIC = "1";
-  const s = await import(a(process.cwd(), "dist/server.js")), o = s.default, i = s.routes;
-  (!o || !i) && (console.error("Failed to load app or routes from dist/server.js"), process.exit(1));
+  const t = await import(a(process.cwd(), "dist/server.js")), s = t.default, i = t.routes;
+  (!s || !i) && (console.error("Failed to load app or routes from dist/server.js"), process.exit(1));
   const { generateStatic: d } = await import("./static.js");
-  await d(o, i);
+  await d(s, i);
 }, m = () => {
   process.env.NODE_ENV = "production";
   const e = a(process.cwd(), "dist/server.js");
@@ -54,15 +58,15 @@ Examples:
 switch (r) {
   case "init": {
     const { runInit: e } = await import("./init.js");
-    await e(t[1]);
+    await e(o[1]);
     break;
   }
   case "dev":
     p();
     break;
   case "build": {
-    const e = t.includes("--static");
-    v(e);
+    const e = o.includes("--static");
+    u(e);
     break;
   }
   case "start":

package/dist/components.js

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

@@ -1,12 +1,12 @@
 import d from "node:path";
-import b from "node:fs";
+import L from "node:fs";
 import C from "@preact/preset-vite";
 import F from "@hono/vite-dev-server";
 import { parse as v } from "@babel/parser";
-import L from "@babel/traverse";
+import b from "@babel/traverse";
 import j from "@babel/generator";
 import * as e from "@babel/types";
-const m = typeof L == "function" ? L : L.default, S = typeof j == "function" ? j : j.default;
+const m = typeof b == "function" ? b : b.default, S = typeof j == "function" ? j : j.default;
 function w(u, c, r, l) {
   const i = v(u, {
     sourceType: "module",
@@ -21,7 +21,7 @@ function w(u, c, r, l) {
         const a = o.declarations[0];
         if (a && e.isIdentifier(a.id, { name: "metadata" }) && e.isObjectExpression(a.init)) {
           t = !0;
-          const p = a.init.properties.filter((y) => e.isObjectProperty(y) && e.isIdentifier(y.key) ? y.key.name !== "moduleId" && y.key.name !== "fullPath" && y.key.name !== "path" : !0), h = [
+          const f = a.init.properties.filter((y) => e.isObjectProperty(y) && e.isIdentifier(y.key) ? y.key.name !== "moduleId" && y.key.name !== "fullPath" && y.key.name !== "path" : !0), h = [
             e.objectProperty(
               e.identifier("moduleId"),
               e.stringLiteral(c)
@@ -37,7 +37,7 @@ function w(u, c, r, l) {
               e.identifier("path"),
               e.stringLiteral(l)
             )
-          ), a.init.properties = [...h, ...p];
+          ), a.init.properties = [...h, ...f];
         }
       }
     }
@@ -80,8 +80,8 @@ function R(u, c) {
     CallExpression(i) {
       const t = i.node.callee, n = e.isIdentifier(t, { name: "Loader" }) || e.isTSInstantiationExpression(t) && e.isIdentifier(t.expression, { name: "Loader" }), s = e.isIdentifier(t, { name: "useLoader" }) || e.isTSInstantiationExpression(t) && e.isIdentifier(t.expression, { name: "useLoader" });
       if (!n && !s) return;
-      const o = i.node.arguments, a = e.stringLiteral(c), f = o[0];
-      e.isStringLiteral(f) && f.value.includes("/") || (i.node.arguments = [a, ...o]);
+      const o = i.node.arguments, a = e.stringLiteral(c), p = o[0];
+      e.isStringLiteral(p) && p.value.includes("/") || (i.node.arguments = [a, ...o]);
     }
   }), S(r, { retainLines: !0 }).code;
 }
@@ -100,12 +100,12 @@ function V(u, c) {
       if (!s.startsWith("action_")) return;
       const o = s.replace("action_", ""), a = n.init;
       if (!e.isArrowFunctionExpression(a) || !a.async) return;
-      const f = a.params, p = W(c, o, f);
-      a.body = e.blockStatement([e.returnStatement(p)]), $(a, f);
+      const p = a.params, f = U(c, o, p);
+      a.body = e.blockStatement([e.returnStatement(f)]), W(a, p);
     }
   }), S(r, { retainLines: !0 }).code;
 }
-function W(u, c, r) {
+function U(u, c, r) {
   const l = `/_action/${u}/${c}`;
   return r.length === 0 ? e.callExpression(
     e.memberExpression(
@@ -175,7 +175,7 @@ function W(u, c, r) {
     ]
   );
 }
-function $(u, c) {
+function W(u, c) {
   if (c.length === 0) return;
   const r = c[0];
   if (e.isObjectPattern(r)) {
@@ -201,7 +201,7 @@ function $(u, c) {
     )), u.params = [t];
   }
 }
-function U(u) {
+function $(u) {
   const c = v(u, {
     sourceType: "module",
     plugins: ["typescript", "jsx"]
@@ -258,7 +258,7 @@ function _(u) {
     ExportDefaultDeclaration(t) {
       const n = t.node.declaration;
       let s = null;
-      e.isArrayExpression(n) ? s = n : e.isTSSatisfiesExpression(n) && e.isArrayExpression(n.expression) && (s = n.expression), s && N(s.elements, "", l);
+      e.isArrayExpression(n) ? s = n : e.isTSSatisfiesExpression(n) && e.isArrayExpression(n.expression) && (s = n.expression), s && A(s.elements, "", l);
     }
   });
   const i = /* @__PURE__ */ new Map();
@@ -271,14 +271,14 @@ function _(u) {
   }
   return i;
 }
-function N(u, c, r) {
+function A(u, c, r) {
   for (const l of u) {
     if (!e.isObjectExpression(l)) continue;
     let i = "", t = c, n = null, s = null;
     for (const o of l.properties) {
       if (!e.isObjectProperty(o)) continue;
-      const a = o.key, f = e.isIdentifier(a) ? a.name : null;
-      f === "path" && e.isStringLiteral(o.value) && (i = o.value.value, i && !i.startsWith("/") ? t = c + "/" + i : t = c + i), f === "module" && e.isIdentifier(o.value) && (n = o.value.name), f === "children" && e.isArrayExpression(o.value) && (s = o.value);
+      const a = o.key, p = e.isIdentifier(a) ? a.name : null;
+      p === "path" && e.isStringLiteral(o.value) && (i = o.value.value, i && !i.startsWith("/") ? t = c + "/" + i : t = c + i), p === "module" && e.isIdentifier(o.value) && (n = o.value.name), p === "children" && e.isArrayExpression(o.value) && (s = o.value);
     }
     if (n) {
       const a = !s && i === "/" ? c || "/" : t;
@@ -287,7 +287,7 @@ function N(u, c, r) {
         path: i
       });
     }
-    s && N(s.elements, t, r);
+    s && A(s.elements, t, r);
   }
 }
 const g = "virtual:velo/server-entry", x = "virtual:velo/client-entry", T = "\0" + g, P = "\0" + x;
@@ -302,8 +302,8 @@ function J(u, c) {
     },
     buildStart() {
       const t = d.join(r, l);
-      if (b.existsSync(t)) {
-        const n = b.readFileSync(t, "utf-8"), s = _(n);
+      if (L.existsSync(t)) {
+        const n = L.readFileSync(t, "utf-8"), s = _(n);
         i.clear();
         for (const [o, a] of s)
           i.set(o, a);
@@ -312,10 +312,10 @@ function J(u, c) {
     handleHotUpdate({ file: t, server: n }) {
       const s = d.join(r, l);
       if (t === s) {
-        const o = b.readFileSync(s, "utf-8"), a = _(o);
+        const o = L.readFileSync(s, "utf-8"), a = _(o);
         i.clear();
-        for (const [f, p] of a)
-          i.set(f, p);
+        for (const [p, f] of a)
+          i.set(p, f);
         return n.ws.send({ type: "full-reload" }), [];
       }
     },
@@ -323,16 +323,16 @@ function J(u, c) {
       return t === g || t.endsWith(g) ? T : t === x || t.endsWith(x) || t === "/__velo_client.js" ? P : null;
     },
     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"), f = d.join(r, s).replace(/\.tsx?$/, ".js"), p = d.join(r, o).replace(/\.tsx?$/, ".js");
+      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 ? `
-import "${f}";
+import "${p}";
 import routes from "${a}";
 import { startServer } from "@mauroandre/velojs/server";
 
 export { routes };
 export default await startServer({ routes });
 ` : t === P ? `
-import "${p}";
+import "${f}";
 import routes from "${a}";
 import { startClient } from "@mauroandre/velojs/client";
 
@@ -342,18 +342,18 @@ startClient({ routes });
     transform(t, n, s) {
       const o = s?.ssr === !0;
       if (n.startsWith("\0") || n.includes("/.velojs/") || !n.endsWith(".tsx") && !n.endsWith(".ts") || !n.startsWith(r)) return null;
-      let a = t, f = !1;
-      const p = /middlewares:\s*\[/.test(t), h = /export\s+(const|function)\s+Component/.test(
+      let a = t, p = !1;
+      const f = /middlewares:\s*\[/.test(t), h = /export\s+(const|function)\s+Component/.test(
         t
-      ), y = /export\s+(const|function)\s+loader/.test(t), A = /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 && p && (a = k(a), f = !0), h || y || A || O || D) {
+      ), 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(
           a,
           E
-        )), o || (a = U(a)), f = !0;
+        )), o || (a = $(a)), p = !0;
       }
-      return f ? {
+      return p ? {
         code: a,
         map: null
       } : null;
@@ -368,8 +368,8 @@ function M() {
       let t = "client.js", n = "client.css";
       if (r)
         try {
-          const o = d.resolve(process.cwd(), "dist/client/.vite/manifest.json"), f = JSON.parse(b.readFileSync(o, "utf-8"))[x];
-          f && (t = f.file || t, f.css?.[0] && (n = f.css[0]));
+          const o = d.resolve(process.cwd(), "dist/client/.vite/manifest.json"), p = JSON.parse(L.readFileSync(o, "utf-8"))[x];
+          p && (t = p.file || t, p.css?.[0] && (n = p.css[0]));
         } catch {
         }
       const s = {
@@ -377,7 +377,7 @@ function M() {
           "process.env.NODE_ENV": JSON.stringify(l ? "development" : "production"),
           "process.env.STATIC_BASE_URL": JSON.stringify(process.env.STATIC_BASE_URL || (i ? "/client" : "")),
           __VELO_STATIC__: JSON.stringify(i),
-          __VELO_BUILD_HASH__: JSON.stringify(Date.now().toString(36)),
+          __VELO_BUILD_HASH__: JSON.stringify(process.env.VELO_BUILD_HASH || Date.now().toString(36)),
           __VELO_CLIENT_JS__: JSON.stringify(t),
           __VELO_CLIENT_CSS__: JSON.stringify(n)
         },
@@ -451,9 +451,9 @@ function H() {
 }
 export {
   _ as buildFullPathMap,
-  N as collectFullPaths,
+  A as collectFullPaths,
   w as injectMetadata,
-  U as removeLoaders,
+  $ as removeLoaders,
   k as removeMiddlewares,
   V as transformActionsForClient,
   R as transformLoaderFunctions,

package/package.json

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