Merge pull request #35 from microcmsio/fix-delete-api-response

delete apiはjsonを返さないのでそのように変更
microcmsio · Aug 9, 2022 · 73dd3e6 · 73dd3e6
2 parents 86fd6d6 + 3733f20
commit 73dd3e6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/createClient.ts b/src/createClient.ts
@@ -42,14 +42,14 @@ export const createClient = ({ serviceDomain, apiKey }: MicroCMSClient) => {
   /**
    * Make request
    */
-  const makeRequest = async <T>({
+  const makeRequest = async ({
     endpoint,
     contentId,
     queries = {},
     method,
     customHeaders,
     customBody,
-  }: MakeRequest): Promise<T> => {
+  }: MakeRequest) => {
     const queryString = parseQuery(queries);
 
     const baseHeaders: RequestInit = {
@@ -69,6 +69,8 @@ export const createClient = ({ serviceDomain, apiKey }: MicroCMSClient) => {
         throw new Error(`fetch API response status: ${response.status}`);
       }
 
+      if (method === 'DELETE') return;
+
       return response.json();
     } catch (error) {
       if (error.data) {
@@ -96,7 +98,7 @@ export const createClient = ({ serviceDomain, apiKey }: MicroCMSClient) => {
     if (!endpoint) {
       return Promise.reject(new Error('endpoint is required'));
     }
-    return await makeRequest<T>({ endpoint, contentId, queries });
+    return await makeRequest({ endpoint, contentId, queries });
   };
 
   /**
@@ -109,7 +111,7 @@ export const createClient = ({ serviceDomain, apiKey }: MicroCMSClient) => {
     if (!endpoint) {
       return Promise.reject(new Error('endpoint is required'));
     }
-    return await makeRequest<MicroCMSListResponse<T>>({ endpoint, queries });
+    return await makeRequest({ endpoint, queries });
   };
 
   /**
@@ -123,7 +125,7 @@ export const createClient = ({ serviceDomain, apiKey }: MicroCMSClient) => {
     if (!endpoint) {
       return Promise.reject(new Error('endpoint is required'));
     }
-    return await makeRequest<T & MicroCMSListContent>({
+    return await makeRequest({
       endpoint,
       contentId,
       queries,
@@ -140,7 +142,7 @@ export const createClient = ({ serviceDomain, apiKey }: MicroCMSClient) => {
     if (!endpoint) {
       return Promise.reject(new Error('endpoint is required'));
     }
-    return await makeRequest<T & MicroCMSObjectContent>({
+    return await makeRequest({
       endpoint,
       queries,
     });

diff --git a/tests/write.test.ts b/tests/write.test.ts
@@ -193,7 +193,7 @@ describe('delete', () => {
     server.use(
       rest.delete(`${testBaseUrl}/list-type/foo`, (_, res, ctx) => {
         deleteApiMockFn();
-        return res(ctx.status(202), ctx.json({}));
+        return res(ctx.status(202));
       })
     );
   });