@mauroandre/velojs 0.0.24 → 0.0.26

package/dist/testing/index.js

@@ -4,14 +4,14 @@ function k(e) {
   if (!e) return;
   const r = Object.entries(e);
   if (r.length !== 0)
-    return r.map(([a, u]) => `${encodeURIComponent(a)}=${encodeURIComponent(u)}`).join("; ");
+    return r.map(([u, l]) => `${encodeURIComponent(u)}=${encodeURIComponent(l)}`).join("; ");
 }
 function _(e) {
-  const r = {}, a = e.getSetCookie?.() ?? [];
-  for (const u of a) {
-    const i = u.indexOf(";"), l = i === -1 ? u : u.slice(0, i), h = l.indexOf("=");
+  const r = {}, u = e.getSetCookie?.() ?? [];
+  for (const l of u) {
+    const i = l.indexOf(";"), a = i === -1 ? l : l.slice(0, i), h = a.indexOf("=");
     if (h === -1) continue;
-    const c = l.slice(0, h).trim(), t = l.slice(h + 1).trim();
+    const c = a.slice(0, h).trim(), t = a.slice(h + 1).trim();
     c && (r[c] = decodeURIComponent(t));
   }
   return r;
@@ -19,18 +19,18 @@ function _(e) {
 function x(e) {
   if (!e) return "";
   const r = new URLSearchParams();
-  for (const [u, i] of Object.entries(e))
+  for (const [l, i] of Object.entries(e))
     if (Array.isArray(i))
-      for (const l of i) r.append(u, l);
+      for (const a of i) r.append(l, a);
     else
-      r.set(u, i);
-  const a = r.toString();
-  return a ? `?${a}` : "";
+      r.set(l, i);
+  const u = r.toString();
+  return u ? `?${u}` : "";
 }
 function A(e) {
   const r = {};
-  return e.forEach((a, u) => {
-    r[u] = a;
+  return e.forEach((u, l) => {
+    r[l] = u;
   }), r;
 }
 function P(e) {
@@ -41,18 +41,18 @@ function P(e) {
 }
 const C = "http://velojs.test";
 function S(e, r) {
-  const a = x(r);
-  return e.startsWith("http://") || e.startsWith("https://") ? e + a : (e.startsWith("/") || (e = "/" + e), C + e + a);
+  const u = x(r);
+  return e.startsWith("http://") || e.startsWith("https://") ? e + u : (e.startsWith("/") || (e = "/" + e), C + e + u);
 }
 function I(e) {
-  const r = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map();
-  function u(i) {
-    for (const l of i) {
-      const h = l.module.metadata?.moduleId, c = l.module.metadata?.fullPath;
-      if (h) {
-        for (const o of Object.keys(l.module)) {
+  const r = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Map();
+  function l(i) {
+    for (const a of i) {
+      const h = a.module?.metadata?.moduleId, c = a.module?.metadata?.fullPath;
+      if (a.module && h) {
+        for (const o of Object.keys(a.module)) {
           if (!o.startsWith("action_")) continue;
-          const f = l.module[o];
+          const f = a.module[o];
           if (typeof f != "function") continue;
           const d = o.replace("action_", "");
           r.set(f, {
@@ -62,43 +62,43 @@ function I(e) {
             url: `/_action/${h}/${d}`
           });
         }
-        const t = l.module.loader;
+        const t = a.module.loader;
         if (typeof t == "function" && c) {
-          const o = a.get(t);
-          o ? o.paths.push(c) : a.set(t, {
+          const o = u.get(t);
+          o ? o.paths.push(c) : u.set(t, {
             fn: t,
             moduleId: h,
             paths: [c]
           });
         }
       }
-      l.children && u(l.children);
+      a.children && l(a.children);
     }
   }
-  return u(e), { actions: r, loaders: a };
+  return l(e), { actions: r, loaders: u };
 }
 function q(e, r) {
   if (typeof r == "string") return r;
-  const a = e.actions.get(r);
-  if (!a)
+  const u = e.actions.get(r);
+  if (!u)
     throw new Error(
       `[velojs/testing] action_* function was not found in the route tree.
 Make sure your Vitest config loads the VeloJS Vite plugin so that metadata is injected. See https://github.com/mauro-andre/velojs#testing`
     );
-  return a.url;
+  return u.url;
 }
-function J(e, r, a) {
+function J(e, r, u) {
   if (typeof r == "string") return r;
-  const u = e.loaders.get(r);
-  if (!u)
+  const l = e.loaders.get(r);
+  if (!l)
     throw new Error(
       `[velojs/testing] loader function was not found in the route tree.
 Make sure your Vitest config loads the VeloJS Vite plugin so that metadata is injected.`
     );
-  let i = u.paths[0];
-  if (a)
-    for (const [l, h] of Object.entries(a))
-      i = i.replace(`:${l}`, encodeURIComponent(h));
+  let i = l.paths[0];
+  if (u)
+    for (const [a, h] of Object.entries(u))
+      i = i.replace(`:${a}`, encodeURIComponent(h));
   return i;
 }
 class $ {
@@ -109,36 +109,36 @@ class $ {
   };
   push(r) {
     this.buffer += r;
-    const a = [];
-    let u;
-    for (; (u = this.buffer.indexOf(`
+    const u = [];
+    let l;
+    for (; (l = this.buffer.indexOf(`
 `)) !== -1; ) {
-      const i = this.buffer.slice(0, u);
-      if (this.buffer = this.buffer.slice(u + 1), i === "") {
+      const i = this.buffer.slice(0, l);
+      if (this.buffer = this.buffer.slice(l + 1), i === "") {
         if (this.current.data.length > 0 || this.current.event !== "message") {
           const t = {
             event: this.current.event,
             data: this.current.data.join(`
 `)
           };
-          this.current.id !== void 0 && (t.id = this.current.id), a.push(t);
+          this.current.id !== void 0 && (t.id = this.current.id), u.push(t);
         }
         this.current = { event: "message", data: [] };
         continue;
       }
       if (i.startsWith(":")) continue;
-      const l = i.indexOf(":");
-      if (l === -1) continue;
-      const h = i.slice(0, l);
-      let c = i.slice(l + 1);
+      const a = i.indexOf(":");
+      if (a === -1) continue;
+      const h = i.slice(0, a);
+      let c = i.slice(a + 1);
       c.startsWith(" ") && (c = c.slice(1)), h === "event" ? this.current.event = c : h === "data" ? this.current.data.push(c) : h === "id" && (this.current.id = c);
     }
-    return a;
+    return u;
   }
 }
 async function H(e) {
-  const { response: r } = e, a = r.status, u = [];
-  let i = null, l = !1, h = null;
+  const { response: r } = e, u = r.status, l = [];
+  let i = null, a = !1, h = null;
   const c = [];
   let t = null, o = Promise.resolve(void 0);
   const f = (p) => {
@@ -147,7 +147,7 @@ async function H(e) {
       p ? n.reject(p) : n.reject(new Error("[velojs/testing] subscription closed before next event"));
     }
   };
-  if (a >= 200 && a < 300 && r.body) {
+  if (u >= 200 && u < 300 && r.body) {
     t = r.body.getReader();
     const p = new TextDecoder(), n = new $();
     o = (async () => {
@@ -155,7 +155,7 @@ async function H(e) {
         for (; ; ) {
           const { value: s, done: w } = await t.read();
           if (w) {
-            l || (l = !0), f();
+            a || (a = !0), f();
             return;
           }
           const g = p.decode(s, { stream: !0 }), v = n.push(g);
@@ -169,14 +169,14 @@ async function H(e) {
               continue;
             }
             if (m.event === "close") {
-              l = !0, f(), t.cancel().catch(() => {
+              a = !0, f(), t.cancel().catch(() => {
               });
               return;
             }
             if (m.event !== "heartbeat")
               try {
                 const b = JSON.parse(m.data);
-                u.push(b);
+                l.push(b);
                 const j = c.shift();
                 j && j.resolve(b);
               } catch (b) {
@@ -193,27 +193,27 @@ async function H(e) {
       }
     })();
   } else
-    await r.text().catch(() => ""), l = !0;
+    await r.text().catch(() => ""), a = !0;
   const d = {
     get status() {
-      return a;
+      return u;
     },
     get events() {
-      return u;
+      return l;
     },
     get snapshot() {
       return i;
     },
     get closed() {
-      return l;
+      return a;
     },
     async next({ timeoutMs: p }) {
       if (h) throw h;
-      if (u.length > y) {
-        const n = u[y];
+      if (l.length > y) {
+        const n = l[y];
         return y++, n;
       }
-      if (l)
+      if (a)
         throw new Error("[velojs/testing] subscription is closed");
       return new Promise((n, s) => {
         const w = setTimeout(() => {
@@ -247,7 +247,7 @@ async function H(e) {
           await t.cancel();
         } catch {
         }
-      l = !0, f(), await o.catch(() => {
+      a = !0, f(), await o.catch(() => {
       });
     }
   };
@@ -255,9 +255,9 @@ async function H(e) {
   return d;
 }
 function N(e = {}) {
-  const { user: r, params: a = {}, query: u = {}, body: i, headers: l = {}, cookies: h } = e, c = k(h), t = new Headers(l);
+  const { user: r, params: u = {}, query: l = {}, body: i, headers: a = {}, cookies: h } = e, c = k(h), t = new Headers(a);
   c && !t.has("cookie") && t.set("cookie", c);
-  const o = C + "/_mock" + x(u), f = {
+  const o = C + "/_mock" + x(l), f = {
     method: i == null ? "GET" : "POST",
     headers: t
   };
@@ -269,19 +269,19 @@ function N(e = {}) {
       url: d.url,
       method: d.method,
       param(n) {
-        return n === void 0 ? a : a[n];
+        return n === void 0 ? u : u[n];
       },
       query(n) {
         if (n === void 0) {
           const s = {};
-          for (const [w, g] of Object.entries(u))
+          for (const [w, g] of Object.entries(l))
             s[w] = String(g);
           return s;
         }
-        return u[n];
+        return l[n];
       },
       queries(n) {
-        const s = u[n];
+        const s = l[n];
         if (s !== void 0)
           return Array.isArray(s) ? s : [s];
       },
@@ -350,12 +350,12 @@ async function W(e) {
   const r = E();
   return await R(r, async () => {
     e.bootstrap && await e.bootstrap();
-    const { createApp: a } = await import("../server.js"), u = await a(e.routes), i = I(e.routes);
-    return V(u, r, i, e, void 0);
+    const { createApp: u } = await import("../server.js"), l = await u(e.routes), i = I(e.routes);
+    return V(l, r, i, e, void 0);
   });
 }
-function V(e, r, a, u, i) {
-  async function l(t, o, f = {}) {
+function V(e, r, u, l, i) {
+  async function a(t, o, f = {}) {
     const d = S(o, f.query), y = new Headers(f.headers ?? {}), p = { ...f.cookies ?? {} }, n = k(p);
     n && y.set("cookie", n);
     let s = null;
@@ -380,25 +380,25 @@ function V(e, r, a, u, i) {
   const c = {
     hono: e,
     // HTTP
-    get: (t, o) => l("GET", t, o ?? {}),
-    post: (t, o) => l("POST", t, o ?? {}),
-    put: (t, o) => l("PUT", t, o ?? {}),
-    patch: (t, o) => l("PATCH", t, o ?? {}),
-    delete: (t, o) => l("DELETE", t, o ?? {}),
+    get: (t, o) => a("GET", t, o ?? {}),
+    post: (t, o) => a("POST", t, o ?? {}),
+    put: (t, o) => a("PUT", t, o ?? {}),
+    patch: (t, o) => a("PATCH", t, o ?? {}),
+    delete: (t, o) => a("DELETE", t, o ?? {}),
     async action(t, o = {}) {
-      const f = q(a, t);
-      return await l("POST", f, {
+      const f = q(u, t);
+      return await a("POST", f, {
         ...o,
         body: o.body ?? {}
       });
     },
     async loader(t, o = {}) {
-      const f = J(a, t, o.params), d = await l("GET", f, {
+      const f = J(u, t, o.params), d = await a("GET", f, {
         ...o,
         query: { ...o.query ?? {}, _data: "1" }
       });
       if (d.status >= 300 && d.status < 400 || d.status >= 400) return d;
-      const y = typeof t == "function" ? a.loaders.get(t)?.moduleId : void 0, p = await d.json();
+      const y = typeof t == "function" ? u.loaders.get(t)?.moduleId : void 0, p = await d.json();
       return y && p && typeof p == "object" && y in p ? p[y] : p;
     },
     async subscribe(t, o = {}) {
@@ -406,19 +406,19 @@ function V(e, r, a, u, i) {
       return await H({ response: d });
     },
     async sessionCookies({ user: t }) {
-      if (!u.getSessionCookie)
+      if (!l.getSessionCookie)
         throw new Error(
           "[velojs/testing] sessionCookies/as requires `getSessionCookie` in createTestApp options."
         );
-      return await u.getSessionCookie({ user: t });
+      return await l.getSessionCookie({ user: t });
     },
     as({ user: t }) {
-      if (!u.getSessionCookie)
+      if (!l.getSessionCookie)
         throw new Error(
           "[velojs/testing] app.as() requires `getSessionCookie` in createTestApp options."
         );
       let o = null;
-      const f = () => (o || (o = Promise.resolve(u.getSessionCookie({ user: t }))), o), d = (p) => (async (...n) => {
+      const f = () => (o || (o = Promise.resolve(l.getSessionCookie({ user: t }))), o), d = (p) => (async (...n) => {
         const s = await f(), [w, g] = n, v = {
           ...g ?? {},
           cookies: { ...s, ...g?.cookies ?? {} }

package/dist/types.d.ts

@@ -24,9 +24,18 @@ export interface RouteModule {
     metadata?: Metadata;
     [key: `action_${string}`]: (args: ActionArgs<any>) => Promise<any>;
 }
+export type HTTPMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+export interface EndpointHandlerArgs {
+    c: Context;
+    params: Record<string, string>;
+    query: Record<string, string>;
+}
+export type EndpointHandler = (args: EndpointHandlerArgs) => Response | Promise<Response>;
 export interface RouteNode {
     path?: string;
-    module: RouteModule;
+    module?: RouteModule;
+    method?: HTTPMethod;
+    handler?: EndpointHandler;
     children?: RouteNode[];
     middlewares?: MiddlewareHandler[];
     isRoot?: boolean;

package/dist/vite.d.ts

@@ -14,6 +14,16 @@ export declare function transformActionsForClient(code: string, moduleId: string
 export declare function transformStreamsForClient(code: string, moduleId: string): string;
 export declare function removeLoaders(code: string): string;
 export declare function removeMiddlewares(code: string): string;
+/**
+ * On client builds, strip EndpointRoute objects from the default-export array
+ * of `routes.tsx` so server-only handler code (and its imports) don't ship to
+ * the browser. Mirrors the pattern used by `removeMiddlewares`.
+ *
+ * Detection: any ObjectExpression that has a `handler` property is treated as
+ * an endpoint and removed from its containing array. Imports referenced only
+ * by removed endpoints are dropped afterwards.
+ */
+export declare function removeEndpointRoutes(code: string): string;
 export interface PathInfo {
     fullPath: string;
     path: string;