@data-client/rest 0.1.0 → 0.2.0

package/src/RestEndpoint.js

@@ -18,13 +18,13 @@ export default class RestEndpoint extends Endpoint {
   constructor(options) {
     super(
       options.fetch ??
-        function (...args) {
+        async function (...args) {
           const urlParams =
             this.#hasBody && args.length < 2 ? {} : args[0] || {};
           const body = this.#hasBody ? args[args.length - 1] : undefined;
           return this.fetchResponse(
             this.url(urlParams),
-            this.getRequestInit(body),
+            await this.getRequestInit(body),
           )
             .then(response => this.parseResponse(response))
             .then(res => this.process(res, ...args));
@@ -87,7 +87,7 @@ export default class RestEndpoint extends Endpoint {
   }
 
   /** Init options for fetch - run at fetch */
-  getRequestInit(body) {
+  async getRequestInit(body) {
     const bodyIsPojo = isPojo(body);
     if (bodyIsPojo) {
       body = JSON.stringify(body);
@@ -105,7 +105,7 @@ export default class RestEndpoint extends Endpoint {
         ...init.headers,
       };
     }
-    init.headers = this.getHeaders(init.headers);
+    init.headers = await this.getHeaders(init.headers);
     return init;
   }
 

package/src/__tests__/RestEndpoint.ts

@@ -2,7 +2,6 @@ import { Entity } from '@data-client/endpoint';
 import { useController } from '@data-client/react';
 import { useSuspense } from '@data-client/react';
 import { CacheProvider } from '@data-client/react';
-import { act } from '@testing-library/react-hooks';
 import { Article, CoolerArticle, CoolerArticleResource } from '__tests__/new';
 import nock from 'nock';
 
@@ -733,9 +732,12 @@ describe('RestEndpoint', () => {
         }
       `);
 
-      const newBody = getUser.extend({
-        body: {} as { title: string },
-      });
+      const newBody = getUser
+        .extend({
+          body: {} as { title: string },
+          dataExpiryLength: 0,
+        })
+        .extend({ dataExpiryLength: 5 });
       () => newBody({ group: 'hi', id: 'what' }, { title: 'cool' });
       // @ts-expect-error
       () => newBody({ id: 'what' }, { title: 'cool' });
@@ -746,11 +748,12 @@ describe('RestEndpoint', () => {
       // @ts-expect-error
       () => newBody({ group: 'hi', id: 'what' }, { sdfsd: 'cool' });
 
-      const bodyNoParams = newBody
-        .extend({
-          path: '/',
-        })
-        .extend({ body: {} as { happy: string } });
+      const bodyNoPath = newBody.extend({
+        path: '/',
+      });
+      const bodyNoParams = bodyNoPath.extend({
+        body: {} as { happy: string },
+      });
       () => bodyNoParams({ happy: 'cool' });
       // @ts-expect-error
       () => bodyNoParams({ group: 'hi', id: 'what' }, { happy: 'cool' });
@@ -1015,6 +1018,28 @@ describe('RestEndpoint', () => {
         params.id;
       },
     });
+
+    const endpoint2 = new RestEndpoint({
+      sideEffect: true,
+      path: 'http\\://test.com/article-cooler/:id',
+      body: 0 as any,
+      schema: CoolerArticle,
+      getOptimisticResponse(snap, params, body) {
+        params.id;
+        // @ts-expect-error
+        params.two;
+
+        body.hi;
+      },
+    }).extend({
+      getOptimisticResponse(snap, params, body) {
+        params.id;
+        // @ts-expect-error
+        params.two;
+
+        body.hi;
+      },
+    });
   });
 });
 
@@ -1292,6 +1317,10 @@ describe('RestEndpoint.fetch()', () => {
     });
     expect(res).toEqual({ id, title: 'hi' });
   });
+
+  it('without Collection in schema - endpoint.push schema should be null', () => {
+    expect(getArticleList2.push.schema).toBeFalsy();
+  });
 });
 const proto = Object.prototype;
 const gpo = Object.getPrototypeOf;

package/src/__tests__/createResource.test.ts

@@ -187,7 +187,7 @@ describe('createResource()', () => {
       ...body,
     }));
 
-    const { result, waitForNextUpdate } = renderRestHook(() => {
+    const { result } = renderRestHook(() => {
       return [
         useCache(UserResource.get, { group: 'five', id: '5' }),
         useController(),
@@ -195,8 +195,8 @@ describe('createResource()', () => {
     });
     // eslint-disable-next-line prefer-const
     let [_, controller] = result.current;
-    await act(() => {
-      controller.fetch(
+    await act(async () => {
+      await controller.fetch(
         UserResource.create,
         { group: 'five' },
         {
@@ -205,7 +205,6 @@ describe('createResource()', () => {
         },
       );
     });
-    await waitForNextUpdate();
     const user = result.current[0];
     expect(user).toBeDefined();
     expect(user?.username).toBe('createduser');

package/src/__tests__/hookifyResource.ts

@@ -150,7 +150,7 @@ describe('hookifyResource()', () => {
       const res = await result.current.fetch(result.current.endpoint, {
         id: payload.id,
       });
-      expect(res).toEqual({ id: 5 });
+      expect(res).toEqual(CoolerArticle.fromJS({ id: 5 }));
     });
 
     it('useUpdate', async () => {
@@ -166,7 +166,9 @@ describe('hookifyResource()', () => {
           ...CoolerArticle.fromJS(payload),
         },
       );
-      expect(res).toEqual(putResponseBody);
+      expect(res).toEqual(
+        result.current.endpoint.schema.fromJS(putResponseBody),
+      );
     });
 
     it('usePartialUpdate', async () => {
@@ -180,7 +182,9 @@ describe('hookifyResource()', () => {
         { id },
         patchPayload,
       );
-      expect(res).toEqual(patchResponseBody);
+      expect(res).toEqual(
+        result.current.endpoint.schema.fromJS(patchResponseBody),
+      );
     });
 
     it('should use useFetchInit if defined (in endpoint method)', async () => {