@hapaul/api 0.1.4 → 0.1.5

package/dist/index.d.ts

@@ -2236,52 +2236,41 @@ type InitParam<Init> = RequiredKeysOf<Init> extends never ? [(Init & {
   [key: string]: unknown;
 }];
 type Methods = 'get' | 'post' | 'put' | 'patch' | 'delete';
-type RequestParams<T extends PathsWithMethod<paths, M>, M extends Methods> = InitParam<MaybeOptionalInit<paths[T], M>>;
+type RequestParams<T extends PathsWithMethod<paths, M>, M extends Methods, C> = InitParam<MaybeOptionalInit<paths[T], M> & C>;
 type ResponseData<T extends PathsWithMethod<paths, M>, M extends Methods> = ParseAsResponse<SuccessResponse<ResponseObjectMap<paths[T][M]>, `${string}/${string}`>, MaybeOptionalInit<paths[T], M>>;
 type ResponseError<T extends PathsWithMethod<paths, M>, M extends Methods> = ErrorResponse<ResponseObjectMap<paths[T][M]>, `${string}/${string}`>;
-interface ClientConfig<C = {}> {
+type ClientConfig = {
   baseUrl?: string;
-  custom?: C;
-}
-interface RequestConfig<C> extends ClientConfig<C> {}
+};
+type RequestConfig<T extends PathsWithMethod<paths, M>, M extends Methods, C = {}> = ClientConfig & {
+  method: M;
+  path: T;
+} & MaybeOptionalInit<paths[T], M> & C;
 type RequestResponse<T extends PathsWithMethod<paths, M>, M extends Methods> = Promise<{
   data: ResponseData<T, M>;
   error: ResponseError<T, M>;
   response: Response;
 }>;
 interface Middleware<C> {
-  onRequest?: (config: RequestConfig<C>) => RequestConfig<C> | Promise<RequestConfig<C>>;
-  onResponse?: (config: RequestConfig<C>, response: Response) => Response | Promise<Response>;
+  onRequest?: (config: RequestConfig<any, any, C>) => RequestConfig<any, any, C> | Promise<RequestConfig<any, any, C>>;
+  onResponse?: (config: RequestConfig<any, any, C>, response: Response) => Response | Promise<Response>;
 }
 declare class Client<C = {}> {
   private middlewares;
   private baseUrl;
   constructor(config?: ClientConfig);
   use(middleware: Middleware<C>): void;
-  request<T extends PathsWithMethod<paths, M>, M extends Methods>(params: {
-    method: M;
-    path: T;
-  } & RequestParams<T, M>, config?: RequestConfig<C>): RequestResponse<T, M>;
-  get<T extends PathsWithMethod<paths, 'get'>>(params: {
-    path: T;
-  } & RequestParams<T, 'get'>, config?: RequestConfig<C>): RequestResponse<T, 'get'>;
-  post<T extends PathsWithMethod<paths, 'post'>>(params: {
-    path: T;
-  } & RequestParams<T, 'post'>, config?: RequestConfig<C>): RequestResponse<T, 'post'>;
-  put<T extends PathsWithMethod<paths, 'put'>>(params: {
-    path: T;
-  } & RequestParams<T, 'put'>, config?: RequestConfig<C>): RequestResponse<T, 'put'>;
-  patch<T extends PathsWithMethod<paths, 'patch'>>(params: {
-    path: T;
-  } & RequestParams<T, 'patch'>, config?: RequestConfig<C>): RequestResponse<T, 'patch'>;
-  delete<T extends PathsWithMethod<paths, 'delete'>>(params: {
-    path: T;
-  } & RequestParams<T, 'delete'>, config?: RequestConfig<C>): RequestResponse<T, 'delete'>;
+  request<T extends PathsWithMethod<paths, M>, M extends Methods>(method: M, path: T, ...params: RequestParams<T, M, C>): RequestResponse<T, M>;
+  get<T extends PathsWithMethod<paths, 'get'>>(path: T, params: RequestConfig<T, 'get', C>): RequestResponse<T, 'get'>;
+  post<T extends PathsWithMethod<paths, 'post'>>(path: T, params: RequestConfig<T, 'post', C>): RequestResponse<T, 'post'>;
+  patch<T extends PathsWithMethod<paths, 'patch'>>(path: T, params: RequestConfig<T, 'patch', C>): RequestResponse<T, 'patch'>;
+  put<T extends PathsWithMethod<paths, 'put'>>(path: T, params: RequestConfig<T, 'put', C>): RequestResponse<T, 'put'>;
+  delete<T extends PathsWithMethod<paths, 'delete'>>(path: T, params: RequestConfig<T, 'delete', C>): RequestResponse<T, 'delete'>;
   beforeRequest(params: {
-    config: RequestConfig<C>;
-  }): Promise<RequestConfig<C>>;
+    config: any;
+  }): Promise<any>;
   afterResponse(params: {
-    config: ClientConfig<C>;
+    config: any;
     response: Response;
   }): Promise<Response>;
 }

package/dist/index.js

@@ -9,14 +9,21 @@ var Client = class {
 	use(middleware) {
 		this.middlewares.push(middleware);
 	}
-	async request(params, config) {
-		config = await this.beforeRequest({ config });
-		const baseUrl = config.baseUrl ?? this.baseUrl;
-		const url = baseUrl + params.path;
+	async request(method, path, ...params) {
+		let requestConfig = {
+			method,
+			path,
+			...params[0]
+		};
+		requestConfig = await this.beforeRequest({ config: requestConfig });
+		method = requestConfig.method;
+		const baseUrl = requestConfig.baseUrl ?? this.baseUrl;
+		const url = baseUrl + path;
 		try {
-			let response = await fetch(url);
+			const {} = params;
+			let response = await fetch(url, { method: method.toUpperCase() });
 			response = await this.afterResponse({
-				config,
+				config: requestConfig,
 				response
 			});
 			const { status } = response;
@@ -51,35 +58,20 @@ var Client = class {
 			throw error;
 		}
 	}
-	get(params, config) {
-		return this.request({
-			method: "get",
-			...params
-		}, config);
+	get(path, params) {
+		return this.request("get", path, params);
 	}
-	post(params, config) {
-		return this.request({
-			method: "post",
-			...params
-		}, config);
+	post(path, params) {
+		return this.request("post", path, params);
 	}
-	put(params, config) {
-		return this.request({
-			method: "put",
-			...params
-		}, config);
+	patch(path, params) {
+		return this.request("patch", path, params);
 	}
-	patch(params, config) {
-		return this.request({
-			method: "patch",
-			...params
-		}, config);
+	put(path, params) {
+		return this.request("put", path, params);
 	}
-	delete(params, config) {
-		return this.request({
-			method: "delete",
-			...params
-		}, config);
+	delete(path, params) {
+		return this.request("delete", path, params);
 	}
 	async beforeRequest(params) {
 		let config = params.config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hapaul/api",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "",
   "type": "module",
   "files": [