feat: minor cleanup and doc update

README.md

@@ -8,43 +8,43 @@ Relay is a full stack protocol for communicating between client and server. It i
 
 ## Quick Start
 
-Following quick start guide gives a three part setup approach for `Relay`, `RelayAPI`, and `RelayClient`.
+Following quick start guide gives a three part setup approach for `Relay`, `RelayApi`, and `RelayClient`.
 
 ### Relay
 
-First thing we need is a relay instance, this is where our base route configuration is defined. This space should be environment agnostic meaning we should be able to import our relay instance in both back end front end environments.
+First thing we need is a relay instance, this is where our base procedure configuration is defined. This space should be environment agnostic meaning we should be able to import our relay instance in both back end front end environments.
 
 ```ts
-import { Relay } from "@valkyr/relay";
+import { Relay, procedure } from "@valkyr/relay";
 
 export const relay = new Relay([
-  route
-    .post("/users")
-    .body(
+  procedure
+    .method("user:create")
+    .params(
       z.object({
         name: z.string(),
         email: z.string().check(z.email()),
       })
     )
-    .response(z.string()),
+    .result(z.string()),
 ]);
 ```
 
-As we can see in the above example we are defining a new `POST` route with an expected `body` and `response` contracts defined using zod schemas.
+As we can see in the above example we are defining a new `method` procedure with an expected `params` and `result` contracts defined using zod schemas.
 
 ### API
 
-To be able to process relay requests on our server we create a `RelayAPI` instance which consumes our relay routes. We do this by retrieving the route from the relay and attaching a handler to it. When we define new route methods we get a new instance which we apply to the api, this ensures that the changes to the route on the server only affects the relay on the server.
+To be able to process relay requests on our server we create a `RelayApi` instance which consumes our relay routes. We do this by retrieving the procedure from the relay and attaching a handler to it. When we define new procedure methods we get a new instance which we apply to the api, this ensures that the changes to the procedure on the server only affects the relay on the server.
 
 ```ts
-import { RelayAPI, NotFoundError } from "@valkyr/relay";
+import { RelayApi, NotFoundError } from "@valkyr/relay";
 
 import { relay } from "@project/relay";
 
-export const api = new RelayAPI({
+export const api = new RelayApi({
   routes: [
     relay
-      .route("POST", "/users")
+      .method("user:create")
       .handle(async ({ name, email }) => {
         const user = await db.users.insert({ name, email });
         if (user === undefined) {
@@ -56,25 +56,22 @@ export const api = new RelayAPI({
 });
 ```
 
-With the above example we now have a `POST` handler for the `/users` route.
+With the above example we now have a `method` handler for the `user:create` method.
 
 ### Web
 
-Now that we have both our relay and api ready to recieve requests we can trigger a user creation request in our web application by creating a new `RelayClient` instance.
+Now that we have both our relay and api ready to recieve requests we can trigger a user creation request in our web application by creating a new `client` instance.
 
 ```ts
-import { RelayClient } from "@valkyr/relay";
-import { adapter } from "@valkyr/relay/http";
+import { HttpAdapter } from "@valkyr/relay/http";
 
 import { relay } from "@project/relay";
 
-const client = new RelayClient({
-  url: "http://localhost:8080",
-  adapter,
-  routes: relay.routes
+const client = relay.client({
+  adapter: new HttpAdapter("http://localhost:8080")
 })
 
-const userId = await client.post("/users", {
+const userId = await client.user.create({
   name: "John Doe",
   email: "john.doe@fixture.none"
 });

libraries/procedure.ts

@@ -23,9 +23,11 @@ export class Procedure<TState extends State = State> {
    * ```ts
    * relay
    *   .method("user:create")
-   *   .params({
+   *   .params(
+   *     z.object({
    *       bar: z.number()
    *     })
+   *   )
    *   .handle(async ({ bar }) => {
    *     console.log(typeof bar); // => number
    *   });
@@ -46,7 +48,7 @@ export class Procedure<TState extends State = State> {
    * ```ts
    * const hasFooBar = action
    *   .make("hasFooBar")
-   *   .response(z.object({ foobar: z.number() }))
+   *   .output(z.object({ foobar: z.number() }))
    *   .handle(async () => {
    *     return {
    *       foobar: 1,

libraries/relay.ts

@@ -16,15 +16,6 @@ export class Relay<TProcedures extends Procedures, TProcedureIndex = ProcedureIn
     indexProcedures(procedures, this.#index);
   }
 
-  /**
-   * Retrieve a registered procedure registered with the relay instance.
-   *
-   * @param method - Method name assigned to the procedure.
-   */
-  procedure<TMethod extends keyof TProcedureIndex>(method: TMethod): TProcedureIndex[TMethod] {
-    return this.#index.get(method) as TProcedureIndex[TMethod];
-  }
-
   /**
    * Create a new relay client instance from the instance procedures.
    *
@@ -33,6 +24,15 @@ export class Relay<TProcedures extends Procedures, TProcedureIndex = ProcedureIn
   client(config: RelayClientConfig): this["$inferClient"] {
     return makeRelayClient(config, this.procedures) as any;
   }
+
+  /**
+   * Retrieve a registered procedure registered with the relay instance.
+   *
+   * @param method - Method name assigned to the procedure.
+   */
+  method<TMethod extends keyof TProcedureIndex>(method: TMethod): TProcedureIndex[TMethod] {
+    return this.#index.get(method) as TProcedureIndex[TMethod];
+  }
 }
 
 /*

mod.ts

@@ -1,7 +1,6 @@
 export * from "./libraries/action.ts";
 export * from "./libraries/adapter.ts";
 export * from "./libraries/api.ts";
-export * from "./libraries/client.ts";
 export * from "./libraries/errors.ts";
 export * from "./libraries/procedure.ts";
 export * from "./libraries/relay.ts";

tests/mocks/server.ts

@@ -8,19 +8,19 @@ export let users: User[] = [];
 
 export const api = new RelayApi({
   procedures: [
-    relay.procedure("user:create").handle(async ({ name, email }) => {
+    relay.method("user:create").handle(async ({ name, email }) => {
       const id = crypto.randomUUID();
       users.push({ id, name, email, createdAt: new Date() });
       return id;
     }),
-    relay.procedure("user:get").handle(async (userId) => {
+    relay.method("user:get").handle(async (userId) => {
       const user = users.find((user) => user.id === userId);
       if (user === undefined) {
         return new NotFoundError();
       }
       return user;
     }),
-    relay.procedure("user:update").handle(async ([userId, { name, email }]) => {
+    relay.method("user:update").handle(async ([userId, { name, email }]) => {
       for (const user of users) {
         if (user.id === userId) {
           user.name = name ?? user.name;
@@ -29,11 +29,11 @@ export const api = new RelayApi({
         }
       }
     }),
-    relay.procedure("user:delete").handle(async (userId) => {
+    relay.method("user:delete").handle(async (userId) => {
       users = users.filter((user) => user.id !== userId);
     }),
     relay
-      .procedure("number:add")
+      .method("number:add")
       .actions([[addNumbers, (params) => params]])
       .handle(async (_, { sum }) => {
         return sum;