@hapaul/api 0.1.2 → 0.1.3

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { MaybeOptionalInit, ParseAsResponse } from "openapi-fetch";
-import { PathsWithMethod, ResponseObjectMap, SuccessResponse } from "openapi-typescript-helpers";
+import { MaybeOptionalInit, Middleware, ParseAsResponse } from "openapi-fetch";
+import { ErrorResponse, PathsWithMethod, ResponseObjectMap, SuccessResponse } from "openapi-typescript-helpers";
 
 //#region schema.d.ts
 
@@ -2199,47 +2199,44 @@ type InitParam<Init> = RequiredKeysOf<Init> extends never ? [(Init & {
 })?] : [Init & {
   [key: string]: unknown;
 }];
-type GetPaths = PathsWithMethod<paths, 'get'>;
-type PostPaths = PathsWithMethod<paths, 'post'>;
-type PutPaths = PathsWithMethod<paths, 'put'>;
-type PatchPaths = PathsWithMethod<paths, 'patch'>;
-type DeletePaths = PathsWithMethod<paths, 'delete'>;
-type GetParams<T extends GetPaths> = InitParam<MaybeOptionalInit<paths[T], 'get'>>;
-type PostParams<T extends PostPaths> = InitParam<MaybeOptionalInit<paths[T], 'post'>>;
-type PutParams<T extends PutPaths> = InitParam<MaybeOptionalInit<paths[T], 'put'>>;
-type PatchParams<T extends PatchPaths> = InitParam<MaybeOptionalInit<paths[T], 'patch'>>;
-type DeleteParams<T extends DeletePaths> = InitParam<MaybeOptionalInit<paths[T], 'delete'>>;
-type ResponseData<T extends keyof paths, M extends 'get' | 'post' | 'put' | 'patch' | 'delete'> = ParseAsResponse<SuccessResponse<ResponseObjectMap<paths[T][M]>, `${string}/${string}`>, MaybeOptionalInit<paths[T], M>>;
-interface ApiError {
-  status: number;
-  code: string;
-  message: string;
-}
-interface IClientConfig {
+type Methods = 'get' | 'post' | 'put' | 'patch' | 'delete';
+type RequestParams<T extends PathsWithMethod<paths, M>, M extends Methods> = InitParam<MaybeOptionalInit<paths[T], M>>;
+type ResponseData<T extends PathsWithMethod<paths, M>, M extends Methods> = ParseAsResponse<SuccessResponse<ResponseObjectMap<paths[T][M]>, `${string}/${string}`>, MaybeOptionalInit<paths[T], M>>;
+type ErrorResponseData<T extends PathsWithMethod<paths, M>, M extends Methods> = ErrorResponse<ResponseObjectMap<paths[T][M]>, `${string}/${string}`>;
+interface ClientConfig {
   baseUrl?: string;
-  showLoading?: boolean;
-  showMessage?: boolean;
-  handleMessage?: (error: ApiError) => string;
+  custom?: any;
+}
+interface RequestConfig<T extends PathsWithMethod<paths, M>, M extends Methods> extends ClientConfig {}
+interface ApiClientInstance<T extends PathsWithMethod<paths, M>, M extends Methods> {
+  send: (config?: RequestConfig<T, M>) => Promise<{
+    data: ResponseData<T, M>;
+    error: ErrorResponseData<T, M>;
+  }>;
 }
 declare class ApiClient {
   private client;
   private baseUrl;
-  private showLoading;
-  private showMessage;
-  private handleMessage;
-  constructor(config?: IClientConfig);
-  config(config: IClientConfig): ApiClient;
-  get<T extends GetPaths>(path: T, ...params: GetParams<T>): Promise<ResponseData<T, 'get'>>;
-  post<T extends PostPaths>(path: T, ...params: PostParams<T>): Promise<ResponseData<T, 'post'>>;
-  put<T extends PutPaths>(path: T, ...params: PutParams<T>): Promise<ResponseData<T, 'put'>>;
-  patch<T extends PatchPaths>(path: T, ...params: PatchParams<T>): Promise<ResponseData<T, 'patch'>>;
-  delete<T extends DeletePaths>(path: T, ...params: DeleteParams<T>): Promise<ResponseData<T, 'delete'>>;
-  handleResponse<D extends {
-    data: unknown;
-  } | {
-    code: string;
-    message: string;
-  } | any, U>(data: D, error: U): Promise<D>;
+  constructor(config?: ClientConfig);
+  config(config?: ClientConfig): ApiClient;
+  use(middleware: Middleware): void;
+  request<T extends PathsWithMethod<paths, M>, M extends Methods>(method: M, path: T, ...params: RequestParams<T, M>): ApiClientInstance<T, M>;
+  get<T extends PathsWithMethod<paths, 'get'>>(path: T, ...params: RequestParams<T, 'get'>): ApiClientInstance<T, 'get'>;
+  post<T extends PathsWithMethod<paths, 'post'>>(path: T, ...params: RequestParams<T, 'post'>): ApiClientInstance<T, 'post'>;
+  put<T extends PathsWithMethod<paths, 'put'>>(path: T, ...params: RequestParams<T, 'put'>): ApiClientInstance<T, 'put'>;
+  patch<T extends PathsWithMethod<paths, 'patch'>>(path: T, ...params: RequestParams<T, 'patch'>): ApiClientInstance<T, 'patch'>;
+  delete<T extends PathsWithMethod<paths, 'delete'>>(path: T, ...params: RequestParams<T, 'delete'>): ApiClientInstance<T, 'delete'>;
+  beforeRequest<T extends PathsWithMethod<paths, M>, M extends Methods>(params: {
+    config: RequestConfig<T, M>;
+  }): Promise<void>;
+  afterResponse<D, U>(params: {
+    config: ClientConfig;
+    data: D;
+    error: U;
+  }): Promise<{
+    data: D;
+    error: U;
+  }>;
 }
 //#endregion
-export { ApiClient, ApiError, IClientConfig };
+export { ApiClient, ApiClientInstance, ClientConfig, RequestConfig };

package/dist/index.js

@@ -372,14 +372,8 @@ function removeTrailingSlash(url) {
 var ApiClient = class ApiClient {
 	client;
 	baseUrl;
-	showLoading;
-	showMessage;
-	handleMessage;
 	constructor(config) {
 		this.baseUrl = config?.baseUrl ?? "";
-		this.showLoading = config?.showLoading ?? true;
-		this.showMessage = config?.showMessage ?? true;
-		this.handleMessage = config?.handleMessage ?? ((error) => error.message);
 		this.client = createClient({ baseUrl: this.baseUrl });
 	}
 	config(config) {
@@ -389,32 +383,41 @@ var ApiClient = class ApiClient {
 		};
 		return new ApiClient(newConfig);
 	}
-	async get(path, ...params) {
-		const { data, error } = await this.client.GET(path, ...params);
-		return this.handleResponse(data, error);
+	use(middleware) {
+		this.client.use(middleware);
 	}
-	async post(path, ...params) {
-		const { data, error } = await this.client.POST(path, ...params);
-		return this.handleResponse(data, error);
+	request(method, path, ...params) {
+		return { send: async (config) => {
+			await this.beforeRequest({ config });
+			const { data, error } = await this.client.request(method, path, ...params);
+			return this.afterResponse({
+				config,
+				data,
+				error
+			});
+		} };
+	}
+	get(path, ...params) {
+		return this.request("get", path, ...params);
+	}
+	post(path, ...params) {
+		return this.request("post", path, ...params);
 	}
-	async put(path, ...params) {
-		const { data, error } = await this.client.PUT(path, ...params);
-		return this.handleResponse(data, error);
+	put(path, ...params) {
+		return this.request("put", path, ...params);
 	}
-	async patch(path, ...params) {
-		const { data, error } = await this.client.PATCH(path, ...params);
-		return this.handleResponse(data, error);
+	patch(path, ...params) {
+		return this.request("patch", path, ...params);
 	}
-	async delete(path, ...params) {
-		const { data, error } = await this.client.DELETE(path, ...params);
-		return this.handleResponse(data, error);
+	delete(path, ...params) {
+		return this.request("delete", path, ...params);
 	}
-	async handleResponse(data, error) {
-		if (error) return Promise.reject(error);
-		if (typeof data === "object") if (data) if ("code" in data) return Promise.reject(data);
-		else return Promise.resolve(data);
-		else return Promise.reject(error);
-		else return Promise.resolve(data);
+	async beforeRequest(params) {}
+	async afterResponse(params) {
+		return {
+			data: params.data,
+			error: params.error
+		};
 	}
 };
 

package/package.json

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