feat(service): implements service.requests[SERVICE_REQUEST_NAME] to return { invoke, item } API

Author: miguelrk

Diff for: src/service/mod.test.ts

@@ -15,6 +15,7 @@ Deno.test("service", () => {
   assertExists(service.client)
   assertExists(service.requests)
   assertExists(service.item)
+  assertEquals(service.item._id, SERVICE_ID_JSONPLACEHOLDER)
 })
 
 Deno.test("service.client.todos.get()", async () => {
@@ -27,22 +28,32 @@ Deno.test("service.client.todos[1].get()", async () => {
   assertEquals(todo?.id, 1)
 })
 
-Deno.test("service.client.todos.post()", async () => {
-  const todo = await service.client.todos.post({ userId: 1, title: "lorem ipsum", completed: true })
-  assertExists(todo)
-})
+// Deno.test("service.client.todos.post()", async () => {
+//   const todo = await service.client.todos.post({ userId: 1, title: "lorem ipsum", completed: true })
+//   assertExists(todo)
+// })
 
-Deno.test("service.client.todos[1].put()", async () => {
-  const todo = await service.client.todos[1].put({ userId: 1, id: 1, title: "lorem ipsum", completed: true })
-  assertExists(todo)
-})
+// Deno.test("service.client.todos[1].put()", async () => {
+//   const todo = await service.client.todos[1].put({ userId: 1, id: 1, title: "lorem ipsum", completed: true })
+//   assertExists(todo)
+// })
+
+// Deno.test("service.client.todos[1].patch()", async () => {
+//   const todo = await service.client.todos[1].patch({ completed: true })
+//   assertExists(todo)
+// })
 
-Deno.test("service.client.todos[1].patch()", async () => {
-  const todo = await service.client.todos[1].patch({ completed: true })
-  assertExists(todo)
+// Deno.test("service.client.todos[1].delete()", async () => {
+//   const todo = await service.client.todos[1].delete()
+//   assertExists(todo)
+// })
+
+Deno.test("service.requests.getAllTodos.invoke()", async () => {
+  const todos = await service.requests.getAllTodos.invoke()
+  assertEquals(todos?.length, 200)
 })
 
-Deno.test("service.client.todos[1].delete()", async () => {
-  const todo = await service.client.todos[1].delete()
-  assertExists(todo)
+Deno.test("service.requests.getFirstTodo.invoke()", async () => {
+  const todo = await service.requests.getFirstTodo.invoke()
+  assertEquals(todo?.id, 1)
 })

Diff for: src/service/mod.ts

@@ -20,45 +20,32 @@ const getClient = (item: ItemService): Client => {
   }
 }
 
-const createServiceRequests = ({ api, _id, item }: any) => {
-  return (requestItem: ItemServiceRequest, index: number) => {
-    // TODO: reuse existing client (of service) if possible
-    // or at least $fetch/useFetch/unfetch client which supports
-    // entire service request options (for example hooks, etc.)
-    const createInvoke = (item: ItemServiceRequest) => {
-      const { url, method, headers, body } = item
-      return async () => {
-        const response = await fetch(url, {
-          method,
-          headers,
-          // IMPORTANT: Request with GET/HEAD method cannot have body
-          ...(!['GET', 'HEAD'].includes(method) && { body }),
-        })
-        return response.json()
-      }
-    }
-    const proxy = new Proxy((() => { }), {
-      /** Select existing by name: "service.requests('getAllTodos')" */
-      get: (_target, _id): ServiceRequest => {
-        return { invoke: createInvoke(item), item }
-      },
-      /** Creating a new service by passing in options */
-      apply: (_target, _thisArg, args): ServiceRequest => {
-        return { invoke: createInvoke(item), item }
-      }
+const createServiceRequest = (item: ItemServiceRequest): ServiceRequest => {
+  // TODO: reuse existing client (of service) if possible
+  // or at least $fetch/useFetch/unfetch client which supports
+  // entire service request options (for example hooks, etc.)
+  const invoke = async (overrides?: Partial<ItemServiceRequest>) => {
+    const { url, method, headers, body } = { ...item, ...overrides }
+    const response = await fetch(url, {
+      method,
+      headers,
+      // IMPORTANT: Request with GET/HEAD method cannot have body
+      ...(!['GET', 'HEAD'].includes(method) && { body }),
     })
-    return [item.name, proxy]
+    return response.json()
   }
+  return { invoke, item }
 }
 
 export const createService = (api: ClientBuilder) => {
   return async (_id: string) => {
-    const item = await api.services[_id].get()
+    const item = await api.services[_id].get<ItemService>()
     const client = getClient(item)
 
-    const requests = Object.fromEntries(
-      item.requests.map(createServiceRequests({ api, _id, item }))
-    )
+    const requests = item.requests.reduce((previousValue, currentValue) => ({
+      ...previousValue,
+      [currentValue.name]: createServiceRequest(currentValue)
+    }), {} as Record<string, ServiceRequest>)
 
     return { client, requests, item } // see NOTE bellow
   }

Diff for: src/service/types.ts

@@ -7,7 +7,7 @@ export interface Service {
 }
 
 export interface ServiceRequest {
-  invoke: () => Promise<any>;
+  invoke: ((item: ItemServiceRequest) => () => Promise<any>) | any
   item: ItemServiceRequest;
 }
 
@@ -23,7 +23,7 @@ export interface ItemService {
   display: { imageUrl: string };
   type: 'http' | 'sse' | 'websocket';
   client: Record<string, unknown>;
-  requests: ItemServiceRequest;
+  requests: ItemServiceRequest[];
   options: Record<string, unknown>;
   createdAt: string;
   updatedAt: string;