From edc88a64ff64ddb8cc368bdb5a75128f37ec1fa6 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@ideascup.me>
Date: Wed, 23 Dec 2020 00:18:55 +0300
Subject: [PATCH] fix: change default params type to unknown

---
 package.json                  |  2 +-
 src/endpoint.ts               |  4 ++--
 target/endpoint.d.ts          |  4 +++-
 target/lazy-request-hook.d.ts | 13 +++++++------
 target/reducer.d.ts           |  2 ++
 target/request-hook.d.ts      |  8 ++++----
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 03295e1..b1d0cd7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-rest-request",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Minimalistic REST API client for React inspired by Apollo",
   "readme": "README.md",
   "main": "./target/index.js",
diff --git a/src/endpoint.ts b/src/endpoint.ts
index 16570a5..520cf9f 100644
--- a/src/endpoint.ts
+++ b/src/endpoint.ts
@@ -8,7 +8,7 @@ export enum Method {
     DELETE = 'DELETE',
 }
 
-export type Endpoint<R, V, P = never> = Readonly<{
+export type Endpoint<R, V, P = unknown> = Readonly<{
     _?: V; // Temporary hack to extract the type of variables. Do not use it in real endpoints.
     method: Method;
     url: string | ((params: P) => string);
@@ -16,7 +16,7 @@ export type Endpoint<R, V, P = never> = Readonly<{
     transformResponseData?: (data: any) => R;
 }>
 
-export type AnyEndpoint = Endpoint<any, any, any>;
+export type AnyEndpoint = Endpoint<any, any, any>
 
 export type ExtractEndpointResponse<E> = E extends Endpoint<infer R, any, any> ? R : E extends Endpoint<infer R, any> ? R : never;
 export type ExtractEndpointVariables<E> = E extends Endpoint<any, infer V, any> ? V : E extends Endpoint<any, infer V> ? V : never;
diff --git a/target/endpoint.d.ts b/target/endpoint.d.ts
index 3fb8732..54e2b09 100644
--- a/target/endpoint.d.ts
+++ b/target/endpoint.d.ts
@@ -6,12 +6,14 @@ export declare enum Method {
     PATCH = "PATCH",
     DELETE = "DELETE"
 }
-export declare type Endpoint<R, _V, P = never> = Readonly<{
+export declare type Endpoint<R, V, P = unknown> = Readonly<{
+    _?: V;
     method: Method;
     url: string | ((params: P) => string);
     headers?: Record<string, string>;
     transformResponseData?: (data: any) => R;
 }>;
+export declare type AnyEndpoint = Endpoint<any, any, any>;
 export declare type ExtractEndpointResponse<E> = E extends Endpoint<infer R, any, any> ? R : E extends Endpoint<infer R, any> ? R : never;
 export declare type ExtractEndpointVariables<E> = E extends Endpoint<any, infer V, any> ? V : E extends Endpoint<any, infer V> ? V : never;
 export declare type ExtractEndpointParams<E> = E extends Endpoint<any, any, infer P> ? P : never;
diff --git a/target/lazy-request-hook.d.ts b/target/lazy-request-hook.d.ts
index 34e8248..85eb71d 100644
--- a/target/lazy-request-hook.d.ts
+++ b/target/lazy-request-hook.d.ts
@@ -1,19 +1,20 @@
-import { Endpoint, ExtractEndpointParams, ExtractEndpointResponse, ExtractEndpointVariables } from './endpoint';
+import { AnyEndpoint, ExtractEndpointParams, ExtractEndpointResponse, ExtractEndpointVariables } from './endpoint';
 import { PublicRequestState } from './reducer';
 import { ClientResponse } from './client';
-export declare type LazyRequestConfig<R, V, P = never> = Readonly<{
+export declare type LazyRequestConfig<R, V, P> = Readonly<{
     variables?: V;
     params?: P;
     headers?: Record<string, string>;
     onComplete?: (data: R) => unknown;
     onFailure?: (res: ClientResponse<R>) => unknown;
 }>;
-export declare type LazyRequestHandlerConfig<R, V, P> = Readonly<LazyRequestConfig<R, V, P> & {
+export declare type LazyRequestConfigFromEndpoint<E extends AnyEndpoint> = LazyRequestConfig<ExtractEndpointResponse<E>, ExtractEndpointVariables<E>, ExtractEndpointParams<E>>;
+export declare type LazyRequestHandlerConfig<E extends AnyEndpoint> = Readonly<LazyRequestConfigFromEndpoint<E> & {
     force?: boolean;
 }>;
-export declare type RequestHandler<R, V, P> = (config?: LazyRequestHandlerConfig<R, V, P>) => Promise<R | null>;
+export declare type RequestHandler<E extends AnyEndpoint> = (config?: LazyRequestHandlerConfig<E>) => Promise<ExtractEndpointResponse<E> | null>;
 export declare type RefetchRequestHandler = () => void;
-export declare type PublicRequestStateWithRefetch<R> = PublicRequestState<R> & {
+export declare type PublicRequestStateWithRefetch<E extends AnyEndpoint> = PublicRequestState<ExtractEndpointResponse<E>> & {
     refetch: RefetchRequestHandler;
 };
-export declare function useLazyRequest<E extends Endpoint<R, V, P>, R = ExtractEndpointResponse<E>, V = ExtractEndpointVariables<E>, P = ExtractEndpointParams<E>>(endpoint: E, config?: LazyRequestConfig<R, V, P>): [RequestHandler<R, V, P>, PublicRequestStateWithRefetch<R>];
+export declare function useLazyRequest<E extends AnyEndpoint>(endpoint: E, config?: LazyRequestConfigFromEndpoint<E>): [RequestHandler<E>, PublicRequestStateWithRefetch<E>];
diff --git a/target/reducer.d.ts b/target/reducer.d.ts
index 0b0892f..bf94a2c 100644
--- a/target/reducer.d.ts
+++ b/target/reducer.d.ts
@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ClientResponse } from './client';
 export declare type PublicRequestState<R> = Readonly<{
     data: R | null;
@@ -21,6 +22,7 @@ export declare type RequestAction<R> = {
     type: 'failure';
     response: ClientResponse<R>;
 };
+export declare type RequestReducer<R> = React.Reducer<RequestState<R>, RequestAction<R>>;
 export declare function requestReducer<R>(state: RequestState<R>, action: RequestAction<R>): {
     loading: boolean;
     isCalled: boolean;
diff --git a/target/request-hook.d.ts b/target/request-hook.d.ts
index 0644b01..23106ca 100644
--- a/target/request-hook.d.ts
+++ b/target/request-hook.d.ts
@@ -1,6 +1,6 @@
-import { Endpoint, ExtractEndpointParams, ExtractEndpointResponse, ExtractEndpointVariables } from './endpoint';
-import { LazyRequestConfig } from './lazy-request-hook';
-export declare type RequestConfig<R, V, P> = Readonly<LazyRequestConfig<R, V, P> & {
+import { AnyEndpoint } from './endpoint';
+import { LazyRequestConfigFromEndpoint } from './lazy-request-hook';
+export declare type RequestConfigFromEndpoint<E extends AnyEndpoint> = Readonly<LazyRequestConfigFromEndpoint<E> & {
     skip?: boolean;
 }>;
-export declare function useRequest<E extends Endpoint<R, V, P>, R = ExtractEndpointResponse<E>, V = ExtractEndpointVariables<E>, P = ExtractEndpointParams<E>>(endpoint: E, config?: RequestConfig<R, V, P>): import("./lazy-request-hook").PublicRequestStateWithRefetch<R>;
+export declare function useRequest<E extends AnyEndpoint>(endpoint: E, config?: RequestConfigFromEndpoint<E>): import("./lazy-request-hook").PublicRequestStateWithRefetch<E>;