fix:types

BetterTyped · Jul 6, 2024 · 535b4b6 · 535b4b6
1 parent a668b3d
commit 535b4b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/packages/core/src/request/request.ts b/packages/core/src/request/request.ts
@@ -6,7 +6,6 @@ import {
   PayloadType,
   RequestJSON,
   RequestOptionsType,
-  ExtractRouteParams,
   sendRequest,
   RequestConfigurationType,
   PayloadMapperType,
@@ -63,7 +62,7 @@ export class Request<
   headers?: HeadersInit;
   auth: boolean;
   method: ExtractAdapterMethodType<Adapter>;
-  params: ExtractRouteParams<Endpoint> | NegativeTypes;
+  params: ExtractParamsType<this> | NegativeTypes;
   data: PayloadType<Payload>;
   queryParams: QueryParams | NegativeTypes;
   options?: ExtractAdapterOptionsType<Adapter> | undefined;
@@ -180,7 +179,7 @@ export class Request<
     return this.clone({ auth });
   };
 
-  public setParams = <P extends ExtractRouteParams<Endpoint>>(params: P) => {
+  public setParams = <P extends ExtractParamsType<this>>(params: P) => {
     return this.clone<HasData, P extends null ? false : true, HasQuery>({ params });
   };
 
@@ -429,6 +428,7 @@ export class Request<
   >(
     configuration?: RequestConfigurationType<
       Payload,
+      ExtractParamsType<this>,
       QueryParams,
       Endpoint,
       ExtractAdapterOptionsType<Adapter>,
@@ -450,6 +450,7 @@ export class Request<
     const json = this.toJSON();
     const requestJSON: RequestConfigurationType<
       Payload,
+      ExtractParamsType<this>,
       QueryParams,
       Endpoint,
       ExtractAdapterOptionsType<Adapter>,
@@ -564,10 +565,10 @@ export class Request<
    * ```
    */
   public send: RequestSendType<this> = async (options?: RequestSendOptionsType<this>) => {
-    const { dispatcherType, ...rest } = options || {};
+    const { dispatcherType, ...configuration } = options || {};
 
-    const request = this.clone(rest);
-    return sendRequest(request, options);
+    const request = this.clone(configuration);
+    return sendRequest(request as this, options);
   };
 }
 

diff --git a/packages/core/src/request/request.types.ts b/packages/core/src/request/request.types.ts
@@ -178,13 +178,14 @@ export type PayloadType<Payload> = Payload | NegativeTypes;
 
 export type RequestConfigurationType<
   Payload,
+  Params,
   QueryParams,
   GenericEndpoint extends string,
   AdapterOptions extends Record<string, any>,
   MethodsType = HttpMethodsType,
 > = {
   used?: boolean;
-  params?: ExtractRouteParams<GenericEndpoint> | NegativeTypes;
+  params?: Params | NegativeTypes;
   queryParams?: QueryParams | NegativeTypes;
   data?: PayloadType<Payload>;
   headers?: HeadersInit;
@@ -223,7 +224,7 @@ export type FetchQueryParamsType<QueryParams, HasQuery extends true | false = fa
  * If the request endpoint parameters are not filled it will throw an error
  */
 export type FetchParamsType<Params, HasParams extends true | false> = Params extends NegativeTypes
-  ? { params?: NegativeTypes }
+  ? { params?: never }
   : HasParams extends true
     ? { params?: NegativeTypes }
     : { params: Params };