@mauroandre/velojs 0.0.31 → 0.0.33

package/dist/client.d.ts

@@ -2,4 +2,7 @@ import type { AppRoutes } from "./types.js";
 export interface StartClientOptions {
     routes: AppRoutes;
 }
+export declare const ClientRoutes: ({ routes }: {
+    routes: AppRoutes;
+}) => import("preact").JSX.Element;
 export declare const startClient: (options: StartClientOptions) => void;

package/dist/client.js

@@ -1,46 +1,53 @@
-import { jsx as e } from "preact/jsx-runtime";
-import { hydrate as p } from "preact";
+import { jsx as n } from "preact/jsx-runtime";
+import { hydrate as m } from "preact";
 import { Router as f, Route as l, Switch as s } from "wouter-preact";
-const u = (r, i = !1) => {
-  const o = [];
-  for (let n = 0; n < r.length; n++) {
-    const t = r[n];
+const p = (o, e) => o.reduceRight((r, i) => /* @__PURE__ */ n(i, { children: r }), e), h = (o, e = [], r = "") => {
+  const i = [];
+  for (let u = 0; u < o.length; u++) {
+    const t = o[u], c = `${r}${u}`;
     if (!t.module) {
-      if (t.children)
-        for (const d of u(t.children, i))
-          o.push(d);
+      t.children && i.push(...h(t.children, e, `${c}-`));
       continue;
     }
-    const c = t.module.Component;
+    const d = t.module.Component;
     if (!t.children) {
-      o.push(
-        /* @__PURE__ */ e(l, { path: t.path || "", children: /* @__PURE__ */ e(c, {}) }, n)
+      i.push(
+        /* @__PURE__ */ n(l, { path: t.path || "", children: p(e, /* @__PURE__ */ n(d, {})) }, c)
       );
       continue;
     }
-    const h = u(t.children, !!t.path);
     if (t.isRoot) {
-      o.push(/* @__PURE__ */ e(s, { children: h }, n));
+      i.push(
+        /* @__PURE__ */ n(s, { children: h(t.children, [], `${c}-`) }, c)
+      );
       continue;
     }
     if (!t.path) {
-      o.push(
-        /* @__PURE__ */ e(c, { children: /* @__PURE__ */ e(s, { children: h }) }, n)
+      i.push(
+        ...h(
+          t.children,
+          [...e, d],
+          `${c}-`
+        )
       );
       continue;
     }
-    o.push(
-      /* @__PURE__ */ e(l, { path: t.path, nest: !0, children: /* @__PURE__ */ e(c, { children: /* @__PURE__ */ e(s, { children: h }) }) }, n)
+    i.push(
+      /* @__PURE__ */ n(l, { path: t.path, nest: !0, children: p(
+        e,
+        /* @__PURE__ */ n(d, { children: /* @__PURE__ */ n(s, { children: h(t.children, [], `${c}-`) }) })
+      ) }, c)
     );
   }
-  return o;
-}, m = ({ routes: r }) => {
-  const i = u(r);
-  return /* @__PURE__ */ e(f, { children: i });
-}, C = (r) => {
-  const { routes: i } = r, o = document.querySelector("body");
-  o && p(/* @__PURE__ */ e(m, { routes: i }), o);
+  return i;
+}, a = ({ routes: o }) => {
+  const e = h(o);
+  return /* @__PURE__ */ n(f, { children: e });
+}, C = (o) => {
+  const { routes: e } = o, r = document.querySelector("body");
+  r && m(/* @__PURE__ */ n(a, { routes: e }), r);
 };
 export {
+  a as ClientRoutes,
   C as startClient
 };

package/dist/init.js

@@ -54,6 +54,7 @@ export default { plugins: [veloPlugin()] };
 
 import * as Root from "./client-root.js";
 import * as Home from "./pages/Home.js";
+import * as NotFound from "./pages/NotFound.js";
 
 export default [
     {
@@ -61,6 +62,8 @@ export default [
         isRoot: true,
         children: [
             { path: "/", module: Home },
+            // Catch-all 404 — keep last. Served via notFound (SSR) / 404.html (SSG).
+            { path: "*", module: NotFound, statusCode: 404 },
         ],
     },
 ] satisfies AppRoutes;
@@ -123,9 +126,19 @@ a:hover {
         </main>
     );
 };
+`,
+  "app/pages/NotFound.tsx": `export const Component = () => {
+    return (
+        <main style={{ maxWidth: 640, margin: "80px auto", padding: "0 20px" }}>
+            <h1>404</h1>
+            <p>Page not found.</p>
+            <a href="/">Go home</a>
+        </main>
+    );
+};
 `
 };
-async function v(o) {
+async function x(o) {
   const e = o ? s.resolve(process.cwd(), o) : process.cwd(), r = s.basename(e);
   t.existsSync(e) ? t.readdirSync(e).filter(
     (n) => !n.startsWith(".") && n !== "node_modules"
@@ -133,10 +146,10 @@ async function v(o) {
     `Error: Directory "${r}" is not empty. Use an empty directory.`
   ), process.exit(1)) : t.mkdirSync(e, { recursive: !0 });
   for (const [a, n] of Object.entries(u)) {
-    const c = s.join(e, a), l = s.dirname(c);
+    const p = s.join(e, a), l = s.dirname(p);
     t.existsSync(l) || t.mkdirSync(l, { recursive: !0 });
-    const p = a === "package.json" ? n.replace("my-velojs-app", r) : n;
-    t.writeFileSync(c, p);
+    const c = a === "package.json" ? n.replace("my-velojs-app", r) : n;
+    t.writeFileSync(p, c);
   }
   console.log(`
 Project created in ${o ? r : "current directory"}!
@@ -145,5 +158,5 @@ Project created in ${o ? r : "current directory"}!
 `);
 }
 export {
-  v as runInit
+  x as runInit
 };

package/dist/server.js

@@ -2,13 +2,13 @@ import { jsx as g } from "preact/jsx-runtime";
 import { Hono as R } from "hono";
 import { logger as T } from "hono/logger";
 import { trimTrailingSlash as j } from "hono/trailing-slash";
-import { render as k } from "preact-render-to-string";
-import { Router as A } from "wouter-preact";
-import { AsyncLocalStorage as C } from "node:async_hooks";
+import { render as A } from "preact-render-to-string";
+import { Router as C } from "wouter-preact";
+import { AsyncLocalStorage as k } from "node:async_hooks";
 import { getAppContext as v } from "./app-context.js";
 import { flushPendingStreamRoutes as $, registerStreamHandler as D } from "./events.js";
 import { registerSocketRoutes as I, injectWebSocketServer as y } from "./sockets.js";
-const S = new C();
+const S = new k();
 globalThis.__veloServerData = S;
 let w = null;
 function Y(e) {
@@ -27,38 +27,38 @@ function P(e) {
 function Z(e) {
   v().pendingRoutes.push(e);
 }
-const N = (e, t, s) => {
-  if (e.req.query("_data") === "1") {
-    const r = globalThis.__veloBuildHash || void 0, i = s ? { ...s, __buildHash: r } : { __buildHash: r };
-    return e.json(i);
+const N = (e, t, s, r) => {
+  if (r && r !== 200 && e.status(r), e.req.query("_data") === "1") {
+    const i = globalThis.__veloBuildHash || void 0, l = s ? { ...s, __buildHash: i } : { __buildHash: i };
+    return e.json(l);
   }
-  const a = e.req.path, o = S.run(
+  const o = e.req.path, n = S.run(
     s ?? {},
-    () => k(/* @__PURE__ */ g(A, { ssrPath: a, children: t }))
+    () => A(/* @__PURE__ */ g(C, { ssrPath: o, children: t }))
   );
   if (e.header("Cache-Control", "no-cache"), !s)
-    return e.html(o);
-  const n = `<script>window.__PAGE_DATA__=${JSON.stringify(
+    return e.html(n);
+  const a = `<script>window.__PAGE_DATA__=${JSON.stringify(
     s
   )}<\/script>`;
-  return e.html(o.replace("</head>", `${n}</head>`));
+  return e.html(n.replace("</head>", `${a}</head>`));
 }, O = async (e, t) => {
-  const s = t.req.param(), a = t.req.query(), o = { params: s, query: a, c: t }, n = await Promise.all(
+  const s = t.req.param(), r = t.req.query(), o = { params: s, query: r, c: t }, n = await Promise.all(
     e.map(async (i) => {
       if (!i.loader) return null;
       const l = await i.loader(o), c = i.metadata?.moduleId;
       return c ? { moduleId: c, loaderData: l } : null;
     })
-  ), r = {
+  ), a = {
     __params: s,
-    __query: a,
+    __query: r,
     __pathname: t.req.path
   };
   for (const i of n)
-    i && (r[i.moduleId] = i.loaderData);
+    i && (a[i.moduleId] = i.loaderData);
   return {
     components: e.map((i) => i.Component),
-    data: r
+    data: a
   };
 }, G = (e) => {
   if (e.length === 0) return null;
@@ -70,19 +70,19 @@ const N = (e, t, s) => {
   }
   const s = t[t.length - 1];
   return t.slice(0, -1).reduceRight((o, n) => /* @__PURE__ */ g(n, { children: o }), /* @__PURE__ */ g(s, {}));
-}, _ = (e, t, s = [], a = []) => {
+}, _ = (e, t, s = [], r = []) => {
   for (const o of t) {
     if (o.handler && !o.module) {
       o.children && _(
         e,
         o.children,
         s,
-        [...a, ...o.middlewares || []]
+        [...r, ...o.middlewares || []]
       );
       continue;
     }
-    const n = o.module ? [...s, o.module] : s, r = [
-      ...a,
+    const n = o.module ? [...s, o.module] : s, a = [
+      ...r,
       ...o.middlewares || []
     ];
     if (o.children)
@@ -90,36 +90,36 @@ const N = (e, t, s) => {
         e,
         o.children,
         n,
-        r
+        a
       );
     else if (o.module) {
-      const i = o.module.metadata?.fullPath;
-      if (!i) {
+      const i = o.path === "*", l = o.statusCode ?? (i ? 404 : void 0), c = o.module.metadata?.fullPath;
+      if (!c && !i) {
         console.warn(
           `Module ${o.module.metadata?.moduleId} has no fullPath`
         );
         continue;
       }
-      const l = async (c) => {
-        const { components: u, data: h } = await O(n, c), d = G(u);
-        return N(c, d, h);
+      const u = async (h) => {
+        const { components: d, data: m } = await O(n, h), f = G(d);
+        return N(h, f, m, l);
       };
-      r.length > 0 ? e.on(["GET"], [i], ...r, l) : e.on(["GET"], [i], l);
+      i ? e.notFound(u) : a.length > 0 ? e.on(["GET"], [c], ...a, u) : e.on(["GET"], [c], u);
     } else
       continue;
   }
 }, b = (e, t, s = []) => {
-  for (const a of t) {
-    const o = a.module?.metadata?.moduleId, n = [
+  for (const r of t) {
+    const o = r.module?.metadata?.moduleId, n = [
       ...s,
-      ...a.middlewares || []
+      ...r.middlewares || []
     ];
-    if (a.module && o) {
-      const r = Object.keys(a.module).filter(
+    if (r.module && o) {
+      const a = Object.keys(r.module).filter(
         (i) => i.startsWith("action_")
       );
-      for (const i of r) {
-        const l = i.replace("action_", ""), c = a.module[i];
+      for (const i of a) {
+        const l = i.replace("action_", ""), c = r.module[i];
         if (typeof c == "function") {
           const u = `/_action/${o}/${l}`, h = async (d) => {
             let m = {};
@@ -150,21 +150,21 @@ const N = (e, t, s) => {
         }
       }
     }
-    a.children && b(e, a.children, n);
+    r.children && b(e, r.children, n);
   }
 }, H = async (e, t, s = []) => {
-  const a = (o, n) => {
-    for (const r of o) {
-      const i = r.module?.metadata?.moduleId, l = [
+  const r = (o, n) => {
+    for (const a of o) {
+      const i = a.module?.metadata?.moduleId, l = [
         ...n,
-        ...r.middlewares || []
+        ...a.middlewares || []
       ];
-      if (r.module && i) {
-        const c = Object.keys(r.module).filter(
+      if (a.module && i) {
+        const c = Object.keys(a.module).filter(
           (u) => u.startsWith("stream_")
         );
         for (const u of c) {
-          const h = u.replace("stream_", ""), d = r.module[u];
+          const h = u.replace("stream_", ""), d = a.module[u];
           if (d?.__isVeloEventStream) {
             const m = `/_event/${i}/${h}`;
             d.__path = m, D(
@@ -176,13 +176,13 @@ const N = (e, t, s) => {
           }
         }
       }
-      r.children && a(r.children, l);
+      a.children && r(a.children, l);
     }
   };
-  a(t, s);
+  r(t, s);
 }, x = (e, t) => t ? t.startsWith("/") ? e + t : e ? e + "/" + t : "/" + t : e || "", V = (e) => {
-  const t = /* @__PURE__ */ new Set(), s = (a) => {
-    for (const o of a) {
+  const t = /* @__PURE__ */ new Set(), s = (r) => {
+    for (const o of r) {
       if (o.module && !o.children) {
         const n = o.module.metadata?.fullPath;
         n && t.add(n);
@@ -191,45 +191,45 @@ const N = (e, t, s) => {
     }
   };
   return s(e), t;
-}, q = (e, t, s, a = "", o = []) => {
+}, q = (e, t, s, r = "", o = []) => {
   for (const n of t) {
-    const r = x(a, n.path), i = [
+    const a = x(r, n.path), i = [
       ...o,
       ...n.middlewares || []
     ], l = !!n.handler, c = !!n.method;
     if (l && !c ? console.warn(
-      `[velojs] invalid route at "${r || "/"}" — "handler" set without "method"; endpoint skipped`
+      `[velojs] invalid route at "${a || "/"}" — "handler" set without "method"; endpoint skipped`
     ) : c && !l ? console.warn(
-      `[velojs] invalid route at "${r || "/"}" — "method" set without "handler"; endpoint skipped`
+      `[velojs] invalid route at "${a || "/"}" — "method" set without "handler"; endpoint skipped`
     ) : l && n.module ? console.warn(
-      `[velojs] ambiguous route at "${r || "/"}" — both "module" and "handler" set; endpoint ignored, page kept`
+      `[velojs] ambiguous route at "${a || "/"}" — both "module" and "handler" set; endpoint ignored, page kept`
     ) : l && n.isRoot && console.warn(
-      `[velojs] "isRoot" has no effect on endpoint at "${r || "/"}"; ignored`
+      `[velojs] "isRoot" has no effect on endpoint at "${a || "/"}"; ignored`
     ), l && c && !n.module) {
       const h = n.method;
-      h === "GET" && s.has(r) && console.warn(
-        `[velojs] path "${r}" has both a page GET and an endpoint GET; endpoint will win. Consider renaming one.`
+      h === "GET" && s.has(a) && console.warn(
+        `[velojs] path "${a}" has both a page GET and an endpoint GET; endpoint will win. Consider renaming one.`
       );
       const d = n.handler, m = async (f) => await d({
         c: f,
         params: f.req.param(),
         query: f.req.query()
       });
-      i.length > 0 ? e.on([h], [r], ...i, m) : e.on([h], [r], m);
+      i.length > 0 ? e.on([h], [a], ...i, m) : e.on([h], [a], m);
     }
     n.children && q(
       e,
       n.children,
       s,
-      r,
+      a,
       i
     );
   }
 }, W = async (e) => {
   const t = new R();
   t.use(j()), process.env.NODE_ENV !== "production" && t.use("*", T());
-  const a = v().pendingRoutes.splice(0);
-  for (const n of a)
+  const r = v().pendingRoutes.splice(0);
+  for (const n of r)
     await n(t);
   _(t, e), b(t, e), await H(t, e);
   const o = V(e);
@@ -239,14 +239,14 @@ const N = (e, t, s) => {
   }
   return t;
 }, ee = async (e) => {
-  const { routes: t } = e, s = Number(process.env.PORT) || e.port || 3e3, a = await W(t);
+  const { routes: t } = e, s = Number(process.env.PORT) || e.port || 3e3, r = await W(t);
   if (process.env.NODE_ENV === "production" && !process.env.VELO_STATIC) {
-    const { serve: o } = await import("@hono/node-server"), { serveStatic: n } = await import("@hono/node-server/serve-static"), { join: r } = await import("node:path"), i = r(process.cwd(), "dist/client");
-    (process.env.STATIC_BASE_URL || "").startsWith("http") || a.use("/*", n({ root: i })), console.log(`Server running on http://localhost:${s}`);
-    const c = o({ fetch: a.fetch, port: s });
-    await y(a, c), P(c);
+    const { serve: o } = await import("@hono/node-server"), { serveStatic: n } = await import("@hono/node-server/serve-static"), { join: a } = await import("node:path"), i = a(process.cwd(), "dist/client");
+    (process.env.STATIC_BASE_URL || "").startsWith("http") || r.use("/*", n({ root: i })), console.log(`Server running on http://localhost:${s}`);
+    const c = o({ fetch: r.fetch, port: s });
+    await y(r, c), P(c);
   }
-  return a;
+  return r;
 };
 export {
   Z as addRoutes,

package/dist/static.js

@@ -1,12 +1,13 @@
 import i from "node:fs";
 import a from "node:path";
-async function d(c, n = "") {
-  const e = [];
+async function h(c, e = "") {
+  const o = [];
   for (const t of c) {
-    const o = t.module?.metadata?.fullPath ?? "";
+    if (t.path === "*") continue;
+    const n = t.module?.metadata?.fullPath ?? "";
     if (t.children) {
-      const s = await d(t.children, o);
-      e.push(...s);
+      const s = await h(t.children, n);
+      o.push(...s);
     } else if (t.module) {
       const s = t.module.metadata?.fullPath;
       if (!s) continue;
@@ -17,60 +18,71 @@ async function d(c, n = "") {
         const l = t.module.staticPaths;
         if (typeof l == "function") {
           const u = await l();
-          for (const h of u) {
+          for (const p of u) {
             let f = s;
-            for (const [p, m] of Object.entries(h))
-              f = f.replace(`:${p}`, m);
-            e.push({ fullPath: f, module: t.module });
+            for (const [m, w] of Object.entries(p))
+              f = f.replace(`:${m}`, w);
+            o.push({ fullPath: f, module: t.module });
           }
         } else
           console.warn(
             `Skipping ${s} — dynamic route without staticPaths export`
           );
       } else
-        e.push({ fullPath: s, module: t.module });
+        o.push({ fullPath: s, module: t.module });
     } else
       continue;
   }
-  return e;
+  return o;
 }
-async function y(c, n, e) {
-  const t = "http://localhost", o = await c.fetch(new Request(`${t}${n}`));
-  if (o.status !== 200) {
-    console.warn(`Skipping ${n} — got status ${o.status}`);
+function d(c) {
+  for (const e of c)
+    if (e.path === "*" && e.module || e.children && d(e.children)) return !0;
+  return !1;
+}
+async function y(c, e, o) {
+  const t = "http://localhost", n = await c.fetch(new Request(`${t}${e}`));
+  if (n.status !== 200) {
+    console.warn(`Skipping ${e} — got status ${n.status}`);
     return;
   }
-  const s = await o.text(), l = await (await c.fetch(
-    new Request(`${t}${n}?_data=1`)
-  )).text(), u = n === "/" ? e : a.join(e, n);
+  const s = await n.text(), l = await (await c.fetch(
+    new Request(`${t}${e}?_data=1`)
+  )).text(), u = e === "/" ? o : a.join(o, e);
   i.mkdirSync(u, { recursive: !0 }), i.writeFileSync(a.join(u, "index.html"), s), i.writeFileSync(a.join(u, "index.json"), l);
 }
-function w(c) {
-  const n = a.resolve(process.cwd(), "public");
-  if (!i.existsSync(n)) return;
-  const e = (t, o) => {
+function g(c) {
+  const e = a.resolve(process.cwd(), "public");
+  if (!i.existsSync(e)) return;
+  const o = (t, n) => {
     if (i.statSync(t).isDirectory()) {
-      i.mkdirSync(o, { recursive: !0 });
+      i.mkdirSync(n, { recursive: !0 });
       for (const r of i.readdirSync(t))
-        e(a.join(t, r), a.join(o, r));
+        o(a.join(t, r), a.join(n, r));
     } else
-      i.copyFileSync(t, o);
+      i.copyFileSync(t, n);
   };
-  e(n, c);
+  o(e, c);
 }
-async function j(c, n) {
-  const e = a.resolve(process.cwd(), "dist");
+async function R(c, e) {
+  const o = a.resolve(process.cwd(), "dist");
   console.log("Generating static pages...");
-  const t = await d(n);
+  const t = await h(e);
   if (t.length === 0) {
     console.warn("No routes found for static generation.");
     return;
   }
-  for (const o of t)
-    await y(c, o.fullPath, e), console.log(`  ✓ ${o.fullPath}`);
-  w(e), console.log(`
+  for (const n of t)
+    await y(c, n.fullPath, o), console.log(`  ✓ ${n.fullPath}`);
+  if (d(e)) {
+    const s = await (await c.fetch(
+      new Request("http://localhost/__velojs_not_found__")
+    )).text();
+    i.writeFileSync(a.join(o, "404.html"), s), console.log("  ✓ /404.html");
+  }
+  g(o), console.log(`
 Generated ${t.length} static pages.`);
 }
 export {
-  j as generateStatic
+  R as generateStatic
 };

package/dist/types.d.ts

@@ -39,5 +39,12 @@ export interface RouteNode {
     children?: RouteNode[];
     middlewares?: MiddlewareHandler[];
     isRoot?: boolean;
+    /**
+     * HTTP status code for the rendered page (default 200). Lets a route
+     * respond with e.g. 404/410/503. The bare catch-all (`path: "*"`) defaults
+     * to 404 and is served via Hono's notFound hook. For conditional status
+     * (resource missing inside a valid route), call `c.status()` in the loader.
+     */
+    statusCode?: number;
 }
 export type AppRoutes = RouteNode[];

package/package.json

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