feat: split client to separate class

tests/mocks/relay.ts

@@ -1,11 +1,10 @@
 import z from "zod";
 
-import { adapter } from "../../adapters/http.ts";
 import { Relay } from "../../libraries/relay.ts";
 import { route } from "../../libraries/route.ts";
 import { UserSchema } from "./user.ts";
 
-export const relay = new Relay({ url: "http://localhost:36573", adapter }, [
+export const relay = new Relay([
   route
     .post("/users")
     .body(UserSchema.omit({ id: true, createdAt: true }))
@@ -21,3 +20,5 @@ export const relay = new Relay({ url: "http://localhost:36573", adapter }, [
   route.delete("/users/:userId").params({ userId: z.string().check(z.uuid()) }),
   route.get("/add-two").search({ a: z.coerce.number(), b: z.coerce.number() }).response(z.number()),
 ]);
+
+export type RelayRoutes = typeof relay.$inferRoutes;

tests/mocks/server.ts

@@ -1,4 +1,4 @@
-import { Api } from "../../libraries/api.ts";
+import { RelayAPI } from "../../libraries/api.ts";
 import { NotFoundError } from "../../mod.ts";
 import { addTwoNumbers } from "./actions.ts";
 import { relay } from "./relay.ts";
@@ -6,33 +6,35 @@ import { User } from "./user.ts";
 
 export let users: User[] = [];
 
-export const api = new Api([
-  relay.route("POST", "/users").handle(async ({ name, email }) => {
-    const id = crypto.randomUUID();
-    users.push({ id, name, email, createdAt: new Date() });
-    return id;
-  }),
-  relay.route("GET", "/users/:userId").handle(async ({ userId }) => {
-    const user = users.find((user) => user.id === userId);
-    if (user === undefined) {
-      return new NotFoundError();
-    }
-    return user;
-  }),
-  relay.route("PUT", "/users/:userId").handle(async ({ userId, name, email }) => {
-    for (const user of users) {
-      if (user.id === userId) {
-        user.name = name;
-        user.email = email;
-        break;
+export const api = new RelayAPI({
+  routes: [
+    relay.route("POST", "/users").handle(async ({ name, email }) => {
+      const id = crypto.randomUUID();
+      users.push({ id, name, email, createdAt: new Date() });
+      return id;
+    }),
+    relay.route("GET", "/users/:userId").handle(async ({ userId }) => {
+      const user = users.find((user) => user.id === userId);
+      if (user === undefined) {
+        return new NotFoundError();
       }
-    }
-  }),
-  relay.route("DELETE", "/users/:userId").handle(async ({ userId }) => {
-    users = users.filter((user) => user.id !== userId);
-  }),
-  relay
-    .route("GET", "/add-two")
-    .actions([addTwoNumbers])
-    .handle(async ({ added }) => added),
-]);
+      return user;
+    }),
+    relay.route("PUT", "/users/:userId").handle(async ({ userId, name, email }) => {
+      for (const user of users) {
+        if (user.id === userId) {
+          user.name = name;
+          user.email = email;
+          break;
+        }
+      }
+    }),
+    relay.route("DELETE", "/users/:userId").handle(async ({ userId }) => {
+      users = users.filter((user) => user.id !== userId);
+    }),
+    relay
+      .route("GET", "/add-two")
+      .actions([addTwoNumbers])
+      .handle(async ({ added }) => added),
+  ],
+});

tests/route.test.ts

@@ -3,11 +3,14 @@ import "./mocks/server.ts";
 import { assertEquals, assertObjectMatch, assertRejects } from "@std/assert";
 import { afterAll, beforeAll, describe, it } from "@std/testing/bdd";
 
-import { relay } from "./mocks/relay.ts";
+import { adapter } from "../adapters/http.ts";
+import { RelayClient } from "../libraries/client.ts";
+import { relay, RelayRoutes } from "./mocks/relay.ts";
 import { api, users } from "./mocks/server.ts";
 
 describe("Relay", () => {
   let server: Deno.HttpServer<Deno.NetAddr>;
+  let client: RelayClient<RelayRoutes>;
 
   beforeAll(() => {
     server = Deno.serve(
@@ -20,6 +23,7 @@ describe("Relay", () => {
       },
       async (request) => api.handle(request),
     );
+    client = new RelayClient({ url: "http://localhost:36573", adapter, routes: relay.routes });
   });
 
   afterAll(async () => {
@@ -27,16 +31,16 @@ describe("Relay", () => {
   });
 
   it("should successfully relay users", async () => {
-    const userId = await relay.post("/users", { name: "John Doe", email: "john.doe@fixture.none" });
+    const userId = await client.post("/users", { name: "John Doe", email: "john.doe@fixture.none" });
 
     assertEquals(typeof userId, "string");
     assertEquals(users.length, 1);
 
-    const user = await relay.get("/users/:userId", { userId });
+    const user = await client.get("/users/:userId", { userId });
 
     assertEquals(user.createdAt instanceof Date, true);
 
-    await relay.put("/users/:userId", { userId }, { name: "Jane Doe", email: "jane.doe@fixture.none" });
+    await client.put("/users/:userId", { userId }, { name: "Jane Doe", email: "jane.doe@fixture.none" });
 
     assertEquals(users.length, 1);
     assertObjectMatch(users[0], {
@@ -44,16 +48,16 @@ describe("Relay", () => {
       email: "jane.doe@fixture.none",
     });
 
-    await relay.delete("/users/:userId", { userId });
+    await client.delete("/users/:userId", { userId });
 
     assertEquals(users.length, 0);
   });
 
   it("should successfully run .actions", async () => {
-    assertEquals(await relay.get("/add-two", { a: 1, b: 1 }), 2);
+    assertEquals(await client.get("/add-two", { a: 1, b: 1 }), 2);
   });
 
   it("should reject .actions with error", async () => {
-    await assertRejects(() => relay.get("/add-two", { a: -1, b: 1 }), "Invalid input numbers added");
+    await assertRejects(() => client.get("/add-two", { a: -1, b: 1 }), "Invalid input numbers added");
   });
 });