@sokutils/api-kit 0.0.0-beta.0 → 0.0.0-beta.2

package/dist/index.d.ts

@@ -2,7 +2,14 @@ import { ZodMiniType } from "zod/v4-mini";
 
 //#region src/types.d.ts
 type MaybePromise<P> = P | Promise<P>;
-interface ApiKitConfig {
+interface TApiKit<ResponseType> {
+  config: <NextResponseType>(resolver: ApiKitConfigResolver<ResponseType, NextResponseType>) => TApiKit<NextResponseType>;
+  configPerFetchResolver: (resolver: ApiKitConfigPerFetchResolver) => TApiKit<ResponseType>;
+  fetch: () => Promise<ResponseType>;
+}
+type ApiKitConfigResolver<ResponseType, NextResponseType> = (config: ApiKitConfig<ResponseType>) => ApiKitConfig<NextResponseType>;
+type ApiKitConfigPerFetchResolver = (config: ApiKitConfigPerFetch) => ApiKitConfigPerFetch;
+interface ApiKitConfig<ResponseType = any> {
   BaseURL?: string;
   Path?: string;
   Method?: string;
@@ -10,16 +17,19 @@ interface ApiKitConfig {
   Query?: Record<string, any>;
   GetHeaders?: () => MaybePromise<Record<string, any>>;
   ResponseResolver?: (response: Response) => any;
-  ResponseZod?: ZodMiniType;
-  ResponseHandlers?: ApiKitResponseHandler[];
-  ErrorHandlers?: ApiKitResponseHandler[];
+  ResponseZod?: ZodMiniType<ResponseType>;
+  ResponseHandlers?: ApiKitResponseHandler<ResponseType>[];
+  ErrorHandlers?: ApiKitErrorHandler[];
+  Debug?: (...messages: any[]) => void;
 }
-type ApiKitResponseHandler = (response: any) => void;
+type ApiKitConfigPerFetch = Omit<ApiKitConfig<any>, 'ResponseZod'>;
+type ApiKitResponseHandler<ResponseType> = (response: ResponseType) => void;
+type ApiKitErrorHandler = (error: Error) => void;
 //#endregion
 //#region src/core.d.ts
-declare const ApiKit: (originConfig?: ApiKitConfig) => {
-  config: (configResolver: (config?: ApiKitConfig) => ApiKitConfig) => /*elided*/any;
-  fetch: () => Promise<any>;
-};
+declare const ApiKit: <ResponseType = any>(originConfig?: ApiKitConfig<ResponseType>, configPerFetchResolver?: ApiKitConfigPerFetchResolver) => TApiKit<ResponseType>;
+//#endregion
+//#region src/define.d.ts
+declare const ApiKitDefineConfigResolver: <ResponseType, NextResponseType>(resolver: ApiKitConfigResolver<ResponseType, NextResponseType>) => ApiKitConfigResolver<ResponseType, NextResponseType>;
 //#endregion
-export { ApiKit, ApiKitConfig, ApiKitResponseHandler, MaybePromise };
+export { ApiKit, ApiKitConfig, ApiKitConfigPerFetch, ApiKitConfigPerFetchResolver, ApiKitConfigResolver, ApiKitDefineConfigResolver, ApiKitErrorHandler, ApiKitResponseHandler, MaybePromise, TApiKit };

package/dist/index.js

@@ -1 +1 @@
-import{compact as e,toPairs as t}from"es-toolkit/compat";const n=r=>({config:e=>n(e(r)),fetch:async()=>{let n=e([e([r?.BaseURL,r?.Path]).join(`/`),new URLSearchParams(t(r?.Query)).toString()]).join(`?`),i=await r?.GetHeaders?.();return console.log(i,n),fetch(n,{method:r?.Method,body:r?.Body,headers:i}).then(e=>(r?.ResponseResolver||(e=>e.json()))(e)).then(e=>(r?.ResponseHandlers?.map(t=>t(e)),e)).catch(e=>{throw r?.ErrorHandlers?.map(t=>t(e)),e})}});export{n as ApiKit};
+import{compact as e,toPairs as t}from"es-toolkit/compat";import{z as n}from"zod/v4-mini";const r=(i={},a=e=>e)=>({config:e=>r(e(i),a),configPerFetchResolver:e=>r(i,e),fetch:async()=>{let r=a(i),o=e([e([r?.BaseURL,r?.Path]).join(`/`),new URLSearchParams(t(r?.Query)).toString()]).join(`?`),s=await r?.GetHeaders?.();return r?.Debug?.(r,s,o),fetch(o,{method:r?.Method,body:r?.Body,headers:s}).then(async e=>{let t=await(r.ResponseResolver||(e=>e.json()))(e);return(i.ResponseZod||n.any()).parse(t)}).then(e=>(r.ResponseHandlers?.map(t=>t(e)),e)).catch(e=>{throw r.ErrorHandlers?.map(t=>t(e)),e})}}),i=e=>e;export{r as ApiKit,i as ApiKitDefineConfigResolver};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sokutils/api-kit",
-  "version": "0.0.0-beta.0",
+  "version": "0.0.0-beta.2",
   "description": "Api kit",
   "type": "module",
   "types": "dist/index.d.ts",

package/src/core.ts

@@ -1,31 +1,36 @@
-import { compact, merge, toPairs } from 'es-toolkit/compat';
-import { ApiKitConfig } from './types';
-
-export const ApiKit = (originConfig?: ApiKitConfig) => {
+import { compact, toPairs } from 'es-toolkit/compat';
+import { z } from 'zod/v4-mini';
+import { ApiKitConfig, ApiKitConfigPerFetch, ApiKitConfigPerFetchResolver, ApiKitConfigResolver, TApiKit } from './types';
 
+export const ApiKit = <ResponseType = any>(
+  originConfig: ApiKitConfig<ResponseType> = {},
+  configPerFetchResolver: ApiKitConfigPerFetchResolver = c => c,
+): TApiKit<ResponseType> => {
   return {
-    config: (configResolver: (config?: ApiKitConfig) => ApiKitConfig) => {
-      return ApiKit(configResolver(originConfig));
-    },
+    config: (configResolver) => ApiKit(configResolver(originConfig), configPerFetchResolver),
+    configPerFetchResolver: (configResolver) => ApiKit(originConfig, configResolver),
     fetch: async () => {
-      const finalUrl = compact([originConfig?.BaseURL, originConfig?.Path]).join('/');
-      const withQueryUrl = compact([finalUrl, new URLSearchParams(toPairs(originConfig?.Query)).toString()]).join('?');
-      const headers = await originConfig?.GetHeaders?.();
+      const config = configPerFetchResolver(originConfig);
+      const finalUrl = compact([config?.BaseURL, config?.Path]).join('/');
+      const withQueryUrl = compact([finalUrl, new URLSearchParams(toPairs(config?.Query)).toString()]).join('?');
+      const headers = await config?.GetHeaders?.();
 
-      console.log(headers, withQueryUrl);
+      config?.Debug?.(config, headers, withQueryUrl);
 
       return fetch(withQueryUrl, {
-        method: originConfig?.Method,
-        body: originConfig?.Body,
+        method: config?.Method,
+        body: config?.Body,
         headers,
+      }).then(async r => {
+        const handler = config.ResponseResolver || ((r) => r.json());
+        const result = await handler(r);
+        const zod = originConfig.ResponseZod || z.any();
+        return zod.parse(result);
       }).then(r => {
-        const handler = originConfig?.ResponseResolver || ((r) => r.json());
-        return handler(r);
-      }).then(r => {
-        originConfig?.ResponseHandlers?.map(handler => handler(r));
+        config.ResponseHandlers?.map(handler => handler(r));
         return r;
       }).catch(e => {
-        originConfig?.ErrorHandlers?.map(handler => handler(e));
+        config.ErrorHandlers?.map(handler => handler(e));
         throw e;
       });
     },

package/src/define.ts

@@ -0,0 +1,5 @@
+import { ApiKitConfigResolver } from './types';
+
+export const ApiKitDefineConfigResolver = <ResponseType, NextResponseType>(resolver: ApiKitConfigResolver<ResponseType, NextResponseType>) => {
+  return resolver;
+};

package/src/index.ts

@@ -1,2 +1,3 @@
 export * from './core';
 export * from './types';
+export * from './define';

package/src/types.ts

@@ -2,7 +2,16 @@ import { ZodMiniType } from 'zod/v4-mini';
 
 export type MaybePromise<P> = P | Promise<P>
 
-export interface ApiKitConfig {
+export interface TApiKit<ResponseType> {
+  config: <NextResponseType>(resolver: ApiKitConfigResolver<ResponseType, NextResponseType>) => TApiKit<NextResponseType>;
+  configPerFetchResolver: (resolver: ApiKitConfigPerFetchResolver) => TApiKit<ResponseType>;
+  fetch: () => Promise<ResponseType>
+}
+
+export type ApiKitConfigResolver<ResponseType, NextResponseType> = (config: ApiKitConfig<ResponseType>) => ApiKitConfig<NextResponseType>
+export type ApiKitConfigPerFetchResolver = (config: ApiKitConfigPerFetch) => ApiKitConfigPerFetch;
+
+export interface ApiKitConfig<ResponseType = any> {
   BaseURL?: string;
   Path?: string;
   Method?: string;
@@ -10,9 +19,14 @@ export interface ApiKitConfig {
   Query?: Record<string, any>;
   GetHeaders?: () => MaybePromise<Record<string, any>>;
   ResponseResolver?: (response: Response) => any;
-  ResponseZod?: ZodMiniType
-  ResponseHandlers?: ApiKitResponseHandler[];
-  ErrorHandlers?: ApiKitResponseHandler[];
+  ResponseZod?: ZodMiniType<ResponseType>;
+  ResponseHandlers?: ApiKitResponseHandler<ResponseType>[];
+  ErrorHandlers?: ApiKitErrorHandler[];
+
+  Debug?: (...messages: any[]) => void;
 }
 
-export type ApiKitResponseHandler = (response: any) => void
+export type ApiKitConfigPerFetch = Omit<ApiKitConfig<any>, 'ResponseZod'>
+
+export type ApiKitResponseHandler<ResponseType> = (response: ResponseType) => void
+export type ApiKitErrorHandler = (error: Error) => void