Merge pull request #15 from shinzui/body-encoding

Support schemas with body encoding

src/index.test.ts

@@ -204,6 +204,28 @@ describe('post()', () => {
     expect(error).toBe(undefined);
   });
 
+  it('supports sepecifying utf-8 encoding', async () => {
+    const mockData = { message: 'My reply' };
+    const client = createClient<paths>();
+    fetchMocker.mockResponseOnce(() => ({ status: 201, body: JSON.stringify(mockData) }));
+    const { data, error, response } = await client.post('/create-reply', {
+      body: {
+        message: 'My reply',
+        replied_at: new Date('2023-03-31T12:00:00Z').getTime(),
+      },
+    });
+
+    // assert correct URL was called
+    expect(fetchMocker.mock.calls[0][0]).toBe('/create-reply');
+
+    // assert correct data was returned
+    expect(data).toEqual(mockData);
+    expect(response.status).toBe(201);
+
+    // assert error is empty
+    expect(error).toBe(undefined);
+  });
+
   it('supports optional requestBody', async () => {
     const mockData = { status: 'success' };
     const client = createClient<paths>();

src/index.ts

@@ -22,6 +22,8 @@ type Unwrap<T> = T extends {
   content: { 'application/json': any };
 }
   ? T['content']['application/json']
+  : T extends { content: { 'application/json;charset=utf-8': any } }
+  ? T['content']['application/json;charset=utf-8']
   : T extends { content: { '*/*': any } }
   ? T['content']['*/*']
   : T;

test/v1.d.ts

@@ -63,6 +63,15 @@ export interface paths {
       };
     };
   };
+  "/create-reply": {
+    post: {
+      requestBody: components["requestBodies"]["CreateReply"];
+      responses: {
+        201: components["responses"]["CreateReply"];
+        500: components["responses"]["Error"];
+      };
+    };
+  };
   "/self": {
     get: {
       responses: {
@@ -171,6 +180,13 @@ export interface components {
         };
       };
     };
+    CreateReply: {
+      content: {
+        "application/json;charset=utf-8": {
+          message: string;
+        };
+      };
+    };
     Error: {
       content: {
         "application/json": {
@@ -220,6 +236,14 @@ export interface components {
         };
       };
     };
+    CreateReply: {
+      content: {
+        "application/json;charset=utf-8": {
+          message: string;
+          replied_at: number;
+        };
+      };
+    };
   };
   headers: never;
   pathItems: never;

test/v1.yaml

@@ -46,7 +46,15 @@ paths:
           $ref: '#/components/responses/PostDelete'
         500:
           $ref: '#/components/responses/Error'
-
+  /create-reply:
+    post:
+      requestBody:
+        $ref: '#/components/requestBodies/CreateReply'
+      responses:
+        201:
+          $ref: '#/components/responses/CreateReply'
+        500:
+          $ref: '#/components/responses/Error'
   /self:
     get:
       responses:
@@ -184,6 +192,20 @@ components:
             properties:
               description:
                 type: string
+    CreateReply:
+      required: true
+      content:
+        'application/json;charset=utf-8':
+          schema:
+            type: object
+            properties:
+              message:
+                type: string
+              replied_at:
+                type: number
+            required:
+              - message
+              - replied_at
   responses:
     CreatePost:
       content:
@@ -205,6 +227,16 @@ components:
                 type: string
             required:
               - status
+    CreateReply:
+      content:
+        'application/json;charset=utf-8':
+          schema:
+            type: object
+            properties:
+              message:
+                type: string
+            required:
+              - message
     Error:
       content:
         application/json: