@mauroandre/velojs 0.0.55 → 0.0.57

package/dist/server.js

@@ -1,17 +1,19 @@
 import { jsx as w } from "preact/jsx-runtime";
-import { Hono as R } from "hono";
-import { logger as T } from "hono/logger";
-import { trimTrailingSlash as E } from "hono/trailing-slash";
-import { render as C } from "preact-render-to-string";
-import { Router as A } from "wouter-preact";
-import { AsyncLocalStorage as $ } from "node:async_hooks";
+import { Hono as C } from "hono";
+import { logger as E } from "hono/logger";
+import { trimTrailingSlash as T } from "hono/trailing-slash";
+import { render as A } from "preact-render-to-string";
+import { Router as $ } from "wouter-preact";
+import { AsyncLocalStorage as k } from "node:async_hooks";
 import { getAppContext as _ } from "./app-context.js";
-import { flushPendingStreamRoutes as k, registerStreamHandler as D } from "./events.js";
-import { registerSocketRoutes as O, injectWebSocketServer as S } from "./sockets.js";
-const P = new $();
+import { flushPendingStreamRoutes as D, registerStreamHandler as I } from "./events.js";
+import { registerSocketRoutes as N, injectWebSocketServer as S } from "./sockets.js";
+import { inspectChannels as O, registerChannelRoute as H } from "./channels.js";
+import { emit as le, registerChannels as de } from "./channels.js";
+const P = new k();
 globalThis.__veloServerData = P;
 let g = null;
-function ee(e) {
+function re(e) {
   if (g) {
     e(g);
     return;
@@ -21,55 +23,55 @@ function ee(e) {
 function b(e) {
   g = e;
   const t = _();
-  for (const s of t.serverCallbacks) s(e);
+  for (const a of t.serverCallbacks) a(e);
   t.serverCallbacks.length = 0;
 }
-function I(e) {
+function x(e) {
   g === e && (g = null);
 }
-function te(e) {
+function se(e) {
   _().pendingRoutes.push(e);
 }
-const N = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029"), H = (e, t, s, a) => {
-  if (a && a !== 200 && e.status(a), e.req.query("_data") === "1") {
-    const c = globalThis.__veloBuildHash || void 0, r = s ? { ...s, __buildHash: c } : { __buildHash: c };
-    return e.json(r);
+const G = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029"), V = (e, t, a, r) => {
+  if (r && r !== 200 && e.status(r), e.req.query("_data") === "1") {
+    const c = globalThis.__veloBuildHash || void 0, i = a ? { ...a, __buildHash: c } : { __buildHash: c };
+    return e.json(i);
   }
   const o = e.req.path, n = P.run(
-    s ?? {},
-    () => C(/* @__PURE__ */ w(A, { ssrPath: o, children: t }))
+    a ?? {},
+    () => A(/* @__PURE__ */ w($, { ssrPath: o, children: t }))
   );
-  if (e.header("Cache-Control", "no-cache"), !s)
+  if (e.header("Cache-Control", "no-cache"), !a)
     return e.html(n);
-  const i = `<script>window.__PAGE_DATA__=${N(s)}<\/script>`;
-  return e.html(n.replace("</head>", () => `${i}</head>`));
-}, G = async (e, t) => {
-  const s = t.req.param(), a = t.req.query(), o = { params: s, query: a, c: t }, n = await Promise.all(
-    e.map(async (r) => {
-      if (!r.loader) return null;
-      const f = await r.loader(o), l = r.metadata?.moduleId;
+  const s = `<script>window.__PAGE_DATA__=${G(a)}<\/script>`;
+  return e.html(n.replace("</head>", () => `${s}</head>`));
+}, M = async (e, t) => {
+  const a = t.req.param(), r = t.req.query(), o = { params: a, query: r, c: t }, n = await Promise.all(
+    e.map(async (i) => {
+      if (!i.loader) return null;
+      const f = await i.loader(o), l = i.metadata?.moduleId;
       return l ? { moduleId: l, loaderData: f } : null;
     })
   );
-  let i;
-  for (const r of n)
-    if (r && r.loaderData instanceof Response) {
-      i = r.loaderData;
+  let s;
+  for (const i of n)
+    if (i && i.loaderData instanceof Response) {
+      s = i.loaderData;
       break;
     }
   const c = {
-    __params: s,
-    __query: a,
+    __params: a,
+    __query: r,
     __pathname: t.req.path
   };
-  for (const r of n)
-    r && !(r.loaderData instanceof Response) && (c[r.moduleId] = r.loaderData);
+  for (const i of n)
+    i && !(i.loaderData instanceof Response) && (c[i.moduleId] = i.loaderData);
   return {
-    components: e.map((r) => r.Component),
+    components: e.map((i) => i.Component),
     data: c,
-    shortCircuit: i
+    shortCircuit: s
   };
-}, x = (e) => {
+}, W = (e) => {
   if (e.length === 0) return null;
   const t = e.filter(Boolean);
   if (t.length === 0) return null;
@@ -77,21 +79,21 @@ const N = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u00
     const o = t[0];
     return /* @__PURE__ */ w(o, {});
   }
-  const s = t[t.length - 1];
-  return t.slice(0, -1).reduceRight((o, n) => /* @__PURE__ */ w(n, { children: o }), /* @__PURE__ */ w(s, {}));
-}, y = (e, t, s = [], a = []) => {
+  const a = t[t.length - 1];
+  return t.slice(0, -1).reduceRight((o, n) => /* @__PURE__ */ w(n, { children: o }), /* @__PURE__ */ w(a, {}));
+}, y = (e, t, a = [], r = []) => {
   for (const o of t) {
     if (o.handler && !o.module) {
       o.children && y(
         e,
         o.children,
-        s,
-        [...a, ...o.middlewares || []]
+        a,
+        [...r, ...o.middlewares || []]
       );
       continue;
     }
-    const n = o.module ? [...s, o.module] : s, i = [
-      ...a,
+    const n = o.module ? [...a, o.module] : a, s = [
+      ...r,
       ...o.middlewares || []
     ];
     if (o.children)
@@ -99,10 +101,10 @@ const N = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u00
         e,
         o.children,
         n,
-        i
+        s
       );
     else if (o.module) {
-      const c = o.path === "*", r = o.statusCode ?? (c ? 404 : void 0), f = o.module.metadata?.fullPath;
+      const c = o.path === "*", i = o.statusCode ?? (c ? 404 : void 0), f = o.module.metadata?.fullPath;
       if (!f && !c) {
         console.warn(
           `Module ${o.module.metadata?.moduleId} has no fullPath`
@@ -110,32 +112,32 @@ const N = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u00
         continue;
       }
       const l = async (d) => {
-        const { components: u, data: h, shortCircuit: m } = await G(n, d);
+        const { components: u, data: h, shortCircuit: m } = await M(n, d);
         if (m) {
           const v = m.headers.get("Location");
           return d.req.query("_data") === "1" && v && m.status >= 300 && m.status < 400 ? d.json({ __redirect: v }) : m;
         }
-        const p = x(u);
-        return H(d, p, h, r);
+        const p = W(u);
+        return V(d, p, h, i);
       };
-      c ? e.notFound(l) : i.length > 0 ? e.on(["GET"], [f], ...i, l) : e.on(["GET"], [f], l);
+      c ? e.notFound(l) : s.length > 0 ? e.on(["GET"], [f], ...s, l) : e.on(["GET"], [f], l);
     } else
       continue;
   }
-}, q = (e, t, s = []) => {
-  for (const a of t) {
-    const o = a.module?.metadata?.moduleId, n = [
-      ...s,
-      ...a.middlewares || []
+}, R = (e, t, a = []) => {
+  for (const r of t) {
+    const o = r.module?.metadata?.moduleId, n = [
+      ...a,
+      ...r.middlewares || []
     ];
-    if (a.module && o) {
-      const i = Object.keys(a.module).filter(
+    if (r.module && o) {
+      const s = Object.keys(r.module).filter(
         (c) => c.startsWith("action_")
       );
-      for (const c of i) {
-        const r = c.replace("action_", ""), f = a.module[c];
+      for (const c of s) {
+        const i = c.replace("action_", ""), f = r.module[c];
         if (typeof f == "function") {
-          const l = `/_action/${o}/${r}`, d = async (u) => {
+          const l = `/_action/${o}/${i}`, d = async (u) => {
             let h = {};
             try {
               h = await u.req.json();
@@ -164,121 +166,145 @@ const N = (e) => JSON.stringify(e).replace(/</g, "\\u003c").replace(/>/g, "\\u00
         }
       }
     }
-    a.children && q(e, a.children, n);
+    r.children && R(e, r.children, n);
   }
-}, V = async (e, t, s = []) => {
-  const a = (o, n) => {
-    for (const i of o) {
-      const c = i.module?.metadata?.moduleId, r = [
+}, K = async (e, t, a = []) => {
+  const r = (o, n) => {
+    for (const s of o) {
+      const c = s.module?.metadata?.moduleId, i = [
         ...n,
-        ...i.middlewares || []
+        ...s.middlewares || []
       ];
-      if (i.module && c) {
-        const f = Object.keys(i.module).filter(
+      if (s.module && c) {
+        const f = Object.keys(s.module).filter(
           (l) => l.startsWith("stream_")
         );
         for (const l of f) {
-          const d = l.replace("stream_", ""), u = i.module[l];
+          const d = l.replace("stream_", ""), u = s.module[l];
           if (u?.__isVeloEventStream) {
             const h = `/_event/${c}/${d}`;
-            u.__path = h, D(
+            u.__path = h, I(
               e,
               h,
               u,
-              r
+              i
             );
           }
         }
       }
-      i.children && a(i.children, r);
+      s.children && r(s.children, i);
     }
   };
-  a(t, s);
-}, W = (e, t) => t ? t.startsWith("/") ? e + t : e ? e + "/" + t : "/" + t : e || "", K = (e) => {
-  const t = /* @__PURE__ */ new Set(), s = (a) => {
-    for (const o of a) {
+  r(t, a);
+}, j = (e, t, a = []) => {
+  for (const r of t) {
+    const o = r.module?.metadata?.moduleId, n = [
+      ...a,
+      ...r.middlewares || []
+    ];
+    if (r.module && o) {
+      const s = r.module.channels;
+      if (Array.isArray(s))
+        for (const c of s)
+          H(
+            e,
+            `/_channel/${o}/${c}`,
+            c,
+            r.module,
+            o,
+            n
+          );
+    }
+    r.children && j(e, r.children, n);
+  }
+}, L = (e, t) => t ? t.startsWith("/") ? e + t : e ? e + "/" + t : "/" + t : e || "", B = (e) => {
+  const t = /* @__PURE__ */ new Set(), a = (r) => {
+    for (const o of r) {
       if (o.module && !o.children) {
         const n = o.module.metadata?.fullPath;
         n && t.add(n);
       }
-      o.children && s(o.children);
+      o.children && a(o.children);
     }
   };
-  return s(e), t;
-}, j = (e, t, s, a = "", o = []) => {
+  return a(e), t;
+}, q = (e, t, a, r = "", o = []) => {
   for (const n of t) {
-    const i = W(a, n.path), c = [
+    const s = L(r, n.path), c = [
       ...o,
       ...n.middlewares || []
-    ], r = !!n.handler, f = !!n.method;
-    if (r && !f ? console.warn(
-      `[velojs] invalid route at "${i || "/"}" — "handler" set without "method"; endpoint skipped`
-    ) : f && !r ? console.warn(
-      `[velojs] invalid route at "${i || "/"}" — "method" set without "handler"; endpoint skipped`
-    ) : r && n.module ? console.warn(
-      `[velojs] ambiguous route at "${i || "/"}" — both "module" and "handler" set; endpoint ignored, page kept`
-    ) : r && n.isRoot && console.warn(
-      `[velojs] "isRoot" has no effect on endpoint at "${i || "/"}"; ignored`
-    ), r && f && !n.module) {
+    ], i = !!n.handler, f = !!n.method;
+    if (i && !f ? console.warn(
+      `[velojs] invalid route at "${s || "/"}" — "handler" set without "method"; endpoint skipped`
+    ) : f && !i ? console.warn(
+      `[velojs] invalid route at "${s || "/"}" — "method" set without "handler"; endpoint skipped`
+    ) : i && n.module ? console.warn(
+      `[velojs] ambiguous route at "${s || "/"}" — both "module" and "handler" set; endpoint ignored, page kept`
+    ) : i && n.isRoot && console.warn(
+      `[velojs] "isRoot" has no effect on endpoint at "${s || "/"}"; ignored`
+    ), i && f && !n.module) {
       const d = n.method;
-      d === "GET" && s.has(i) && console.warn(
-        `[velojs] path "${i}" has both a page GET and an endpoint GET; the page wins and the endpoint is unreachable. Consider renaming one.`
+      d === "GET" && a.has(s) && console.warn(
+        `[velojs] path "${s}" has both a page GET and an endpoint GET; the page wins and the endpoint is unreachable. Consider renaming one.`
       );
       const u = n.handler, h = async (m) => await u({
         c: m,
         params: m.req.param(),
         query: m.req.query()
       });
-      c.length > 0 ? e.on([d], [i], ...c, h) : e.on([d], [i], h);
+      c.length > 0 ? e.on([d], [s], ...c, h) : e.on([d], [s], h);
     }
-    n.children && j(
+    n.children && q(
       e,
       n.children,
+      a,
       s,
-      i,
       c
     );
   }
-}, L = async (e) => {
-  const t = new R();
-  t.use(E()), process.env.NODE_ENV !== "production" && t.use("*", T());
-  const a = _().pendingRoutes.splice(0);
-  for (const n of a)
+}, F = async (e) => {
+  const t = new C();
+  t.use(T()), process.env.NODE_ENV !== "production" && t.use("*", E());
+  const r = _().pendingRoutes.splice(0);
+  for (const n of r)
     await n(t);
-  y(t, e), q(t, e), await V(t, e);
-  const o = K(e);
-  if (j(t, e, o), await O(t, e), k(t), process.env.NODE_ENV !== "production" && !g) {
+  y(t, e), R(t, e), await K(t, e), j(t, e), process.env.NODE_ENV !== "production" && t.get("/_channel-inspect", (n) => n.json(O()));
+  const o = B(e);
+  if (q(t, e, o), await N(t, e), D(t), process.env.NODE_ENV !== "production" && !g) {
     const n = globalThis.__veloDevServer;
     n && (b(n), await S(t, n));
   }
   return t;
-}, oe = async (e) => {
-  const { routes: t } = e, s = Number(process.env.PORT) || e.port || 3e3, a = process.env.HOST || e.hostname || void 0, o = await L(t);
+}, ae = async (e) => {
+  const { routes: t } = e, a = Number(process.env.PORT) || e.port || 3e3, r = process.env.HOST || e.hostname || void 0, o = await F(t);
   if (process.env.NODE_ENV === "production" && !process.env.VELO_STATIC) {
-    const { serve: n } = await import("@hono/node-server"), { serveStatic: i } = 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") || o.use("/*", i({ root: r }));
-    const l = n({ fetch: o.fetch, port: s, ...a ? { hostname: a } : {} });
+    const { serve: n } = await import("@hono/node-server"), { serveStatic: s } = await import("@hono/node-server/serve-static"), { join: c } = await import("node:path"), i = c(process.cwd(), "dist/client");
+    (process.env.STATIC_BASE_URL || "").startsWith("http") || o.use("/*", s({ root: i }));
+    const l = n({ fetch: o.fetch, port: a, ...r ? { hostname: r } : {} });
     l.listening || await new Promise((u) => l.once("listening", u));
     const d = l.address();
     if (d && typeof d == "object") {
       const h = d.address === "::" || d.address === "0.0.0.0" ? "0.0.0.0 (all interfaces)" : d.address;
       console.log(`Server running on ${h}:${d.port}`);
     } else
-      console.log(`Server running on port ${s}`);
+      console.log(`Server running on port ${a}`);
     await S(o, l), b(l), l.once("close", () => {
-      I(l);
+      x(l);
     });
   }
   return o;
 };
 export {
-  te as addRoutes,
-  I as clearActiveServer,
-  L as createApp,
-  L as default,
+  se as addRoutes,
+  x as clearActiveServer,
+  F as createApp,
+  F as default,
+  le as emit,
   b as flushServerCallbacks,
-  N as jsonForScript,
-  ee as onServer,
+  O as inspectChannels,
+  G as jsonForScript,
+  re as onServer,
+  de as registerChannels,
   P as serverDataStorage,
-  oe as startServer
+  ae as startServer
 };

package/dist/testing/index.d.ts

@@ -15,6 +15,10 @@
  * expect(res.status).toBe(200);
  * await app.close();
  * ```
+ *
+ * The live loader is exercised deterministically with `app.channel(module,
+ * name)`: open a channel connection with a principal, emit and await the next
+ * snapshot — no sleep, no retry.
  */
 export { createTestApp } from "./createTestApp.js";
-export type { TestApp, TestResponse, TestSubscription, CreateTestAppOptions, RequestOptions, BodyRequestOptions, LoaderRequestOptions, SubscribeOptions, NextOptions, MockContextOptions, Cookies, Headers, Query, Params, } from "./types.js";
+export type { TestApp, TestResponse, TestSubscription, TestChannelSubscription, ChannelEvent, ChannelModuleRef, CreateTestAppOptions, RequestOptions, BodyRequestOptions, LoaderRequestOptions, SubscribeOptions, ChannelSubscribeOptions, NextOptions, MockContextOptions, Cookies, Headers, Query, Params, } from "./types.js";