Merge pull request #100 from mbti-nf-team/refactor/fetch-body-type

refactor(@nf-team/fetch): fetch api의 body 제네릭 타입 추가

.changeset/four-pets-hunt.md

@@ -0,0 +1,5 @@
+---
+"@nf-team/fetch": minor
+---
+
+refactor(@nf-team/fetch): fetch api의 body 제네릭 타입 추가

.yarnrc.yml

@@ -4,12 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-supportedArchitectures:
-  os:
-    - darwin
-    - linux
-  cpu:
-    - x64
-    - arm64
-
-yarnPath: .yarn/releases/yarn-4.4.0.cjs
+yarnPath: .yarn/releases/yarn-4.5.0.cjs

package.json

@@ -40,5 +40,5 @@
     "email": "[email protected]",
     "url": "https://github.com/mbti-nf-team/frontend-libraries/issues"
   },
-  "packageManager": "yarn@4.4.0"
+  "packageManager": "yarn@4.5.0"
 }

packages/fetch/src/fetch.test.ts

@@ -45,6 +45,9 @@ describe('fetchApi', () => {
 
   context('fetch가 성공한 경우', () => {
     const defaultUrl = '/test/test';
+    const defaultHeaders = {
+      'Content-Type': 'application/json',
+    };
 
     context('params가 없는 경우', () => {
       (window.fetch as jest.Mock) = jest.fn(() => Promise.resolve({
@@ -60,7 +63,7 @@ describe('fetchApi', () => {
         expect(response).toBe(mockResponse);
         expect(fetch).toBeCalledWith(defaultUrl, {
           body: undefined,
-          headers: undefined,
+          headers: defaultHeaders,
           method: 'GET',
           signal: expect.any(AbortSignal),
         });
@@ -79,7 +82,7 @@ describe('fetchApi', () => {
         expect(response).toBe(mockResponse);
         expect(fetch).toBeCalledWith(`${defaultUrl}?test=test`, {
           body: undefined,
-          headers: undefined,
+          headers: defaultHeaders,
           method: 'GET',
           signal: expect.any(AbortSignal),
         });

packages/fetch/src/fetch.ts

@@ -11,11 +11,11 @@ export class FetchError extends Error {
 
 export type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
 
-export interface FetchApiRequest<K = unknown> {
+export interface FetchApiRequest<K = unknown, B = unknown> {
   url: string;
   params?: K;
   method?: Method;
-  body?: unknown;
+  body?: B;
   timeout?: number;
   config?: Omit<RequestInit, 'method' | 'body'>;
 }
@@ -25,14 +25,18 @@ export const paramsSerializer = <T>(params: T): string => QueryString.stringify(
   indices: false,
 });
 
-async function fetchApi<T, K = unknown>({
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+async function fetchApi<T, K = unknown, B = unknown>({
   url,
   params,
   body,
   config = {},
   timeout = TIME_OUT,
   method = 'GET',
-}: FetchApiRequest<K>): Promise<T> {
+}: FetchApiRequest<K, B>): Promise<T> {
   const controller = new AbortController();
   const id = setTimeout(() => controller.abort(), timeout);
 
@@ -42,10 +46,10 @@ async function fetchApi<T, K = unknown>({
       body: body ? JSON.stringify(body) : undefined,
       method,
       signal: controller.signal,
-      headers: body ? {
-        'Content-Type': 'application/json',
+      headers: {
+        ...defaultHeaders,
         ...config.headers,
-      } : config.headers,
+      },
     });
 
     clearTimeout(id);