chore: Revert delete method rename

Signed-off-by: Jorgen Ader <[email protected]>
thorgate · Nov 19, 2024 · 08e737c · 08e737c
1 parent 68800c8
commit 08e737c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 87 deletions.
diff --git a/packages/core/src/resource.ts b/packages/core/src/resource.ts
@@ -221,33 +221,14 @@ export abstract class Resource<
         query: Query | null = null,
         attachments: Attachments | null = null,
         requestConfig: RequestConfig | null = null
-    ): Promise<TResponse> =>
-        this.delete<TResponse, TPayload, TParams>(
-            kwargs,
-            data,
-            query,
-            attachments,
-            requestConfig
-        );
-
-    public delete = <
-        TResponse = Record<string, never>,
-        TPayload extends TPostPayload = TPostPayload,
-        TParams extends Params = Params
-    >(
-        kwargs: TParams | null = null,
-        data: TPayload | string | null = null,
-        query: Query | null = null,
-        attachments: Attachments | null = null,
-        requestConfig: RequestConfig | null = null
     ): Promise<TResponse> =>
         this._post<TResponse, TPayload, TParams>(
             kwargs,
             data,
             query,
             attachments,
             requestConfig,
-            'delete'
+            'del'
         );
 
     public renderPath<TParams extends Kwargs | null = Params>(

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -254,13 +254,13 @@ export type Attachments = null | Attachment[];
 
 export type ResourceFetchMethods = 'fetch' | 'get' | 'head' | 'options';
 
-export type ResourcePostMethods = 'post' | 'patch' | 'put' | 'del' | 'delete';
+export type ResourcePostMethods = 'post' | 'patch' | 'put' | 'del';
 
 export type ResourceMethods = ResourceFetchMethods | ResourcePostMethods;
 
 export type AllowedFetchMethods = 'get' | 'head' | 'options';
 
-export type AllowedPostMethods = 'post' | 'patch' | 'put' | 'delete';
+export type AllowedPostMethods = 'post' | 'patch' | 'put' | 'del';
 
 export type AllowedMethods = AllowedFetchMethods | AllowedPostMethods;
 
@@ -384,17 +384,6 @@ export interface ResourceInterface<
         attachments?: Attachments,
         requestConfig?: RequestConfig | null
     ): Promise<TResponse>;
-    delete<
-        TResponse = EmptyPayload,
-        TPayload extends TPostPayload = TPostPayload,
-        TParams extends Params = Params
-    >(
-        kwargs?: TParams | null,
-        data?: TPayload | string | null,
-        query?: Query | null,
-        attachments?: Attachments,
-        requestConfig?: RequestConfig | null
-    ): Promise<TResponse>;
 
     renderPath<TParams extends Params = Params>(
         urlParams?: TParams | null,

diff --git a/packages/core/src/util.ts b/packages/core/src/util.ts
@@ -20,7 +20,7 @@ export const isFetchMethod = (method: string): method is ResourceFetchMethods =>
     ['get', 'fetch', 'head', 'options'].includes(method);
 
 export const isPostMethod = (method: string): method is ResourcePostMethods =>
-    ['post', 'patch', 'put', 'delete', 'del'].includes(method);
+    ['post', 'patch', 'put', 'del'].includes(method);
 
 export function mergeConfig(...config: RequestConfig[]): ConfigType {
     const res: RequestConfig = {};

diff --git a/packages/core/test/createRouter.test.ts b/packages/core/test/createRouter.test.ts
@@ -139,7 +139,7 @@ describe('createRouter :: string map', () => {
         const res = await api.test.del();
         expect(res).toEqual({
             ...defaultResponse,
-            method: 'delete',
+            method: 'del',
             url: '/a/',
             data: {},
         });

diff --git a/packages/saga-router/src/SagaResource.ts b/packages/saga-router/src/SagaResource.ts
@@ -321,25 +321,6 @@ export class SagaResource<
             sagaRequestConfig
         );
 
-    public delete = <
-        TResponse = Record<string, never>,
-        TPayload extends TPostPayload = TPostPayload,
-        TParams extends Params = Params
-    >(
-        kwargs?: TParams | null,
-        data?: TPayload | string | null,
-        query?: Query | null,
-        attachments?: Attachments | null,
-        requestConfig?: RequestConfig | null
-    ) =>
-        this.resource.delete<TResponse, TPayload, TParams>(
-            kwargs,
-            data,
-            query,
-            attachments,
-            requestConfig
-        );
-
     public del = <
         TResponse = Record<string, never>,
         TPayload extends TPostPayload = TPostPayload,
@@ -351,34 +332,14 @@ export class SagaResource<
         attachments?: Attachments | null,
         requestConfig?: RequestConfig | null
     ) =>
-        this.delete<TResponse, TPayload, TParams>(
+        this.resource.del<TResponse, TPayload, TParams>(
             kwargs,
             data,
             query,
             attachments,
             requestConfig
         );
 
-    public deleteEffect = <
-        TResponse = Record<string, never>,
-        TPayload extends TPostPayload = TPostPayload,
-        TParams extends Params = Params
-    >(
-        kwargs?: TParams | null,
-        data?: TPayload | string | null,
-        query?: Query | null,
-        attachments?: Attachments | null,
-        sagaRequestConfig?: SagaRequestConfig | null
-    ) =>
-        this._sagaPost<TResponse, TPayload, TParams>(
-            'delete',
-            kwargs,
-            data,
-            query,
-            attachments,
-            sagaRequestConfig
-        );
-
     public delEffect = <
         TResponse = Record<string, never>,
         TPayload extends TPostPayload = TPostPayload,
@@ -390,7 +351,8 @@ export class SagaResource<
         attachments?: Attachments | null,
         sagaRequestConfig?: SagaRequestConfig | null
     ) =>
-        this.deleteEffect<TResponse, TPayload, TParams>(
+        this._sagaPost<TResponse, TPayload, TParams>(
+            'del',
             kwargs,
             data,
             query,

diff --git a/packages/saga-router/src/types.ts b/packages/saga-router/src/types.ts
@@ -22,7 +22,6 @@ export type SagaResourcePostMethods =
     | 'postEffect'
     | 'patchEffect'
     | 'putEffect'
-    | 'deleteEffect'
     | 'delEffect';
 
 export interface SagaConfigTypeBase {

diff --git a/packages/saga-router/src/utils.ts b/packages/saga-router/src/utils.ts
@@ -10,10 +10,4 @@ export const isSagaFetchMethod = (
 export const isSagaPostMethod = (
     method: string
 ): method is SagaResourcePostMethods =>
-    [
-        'postEffect',
-        'patchEffect',
-        'putEffect',
-        'delEffect',
-        'deleteEffect',
-    ].includes(method);
+    ['postEffect', 'patchEffect', 'putEffect', 'delEffect'].includes(method);
diff --git a/packages/saga-router/test/SagaResource.test.ts b/packages/saga-router/test/SagaResource.test.ts
@@ -251,7 +251,7 @@ describe('createSagaRouter functional', () => {
 
         await expectResponse(
             store.runSaga(
-                api.dogs.details.deleteEffect(
+                api.dogs.details.delEffect(
                     params,
                     null,
                     null,
@@ -281,7 +281,7 @@ describe('createSagaRouter functional', () => {
         error = await getError<InvalidResponseCode>(() =>
             store
                 .runSaga(
-                    api.dogs.details.deleteEffect(
+                    api.dogs.details.delEffect(
                         params,
                         null,
                         null,

diff --git a/packages/tg-resources-fetch/src/resource.ts b/packages/tg-resources-fetch/src/resource.ts
@@ -105,7 +105,7 @@ function parseMethod(method: AllowedMethods) {
         case 'put':
             return 'PUT';
 
-        case 'delete':
+        case 'del':
             return 'DELETE';
 
         default: