openapi-ff 0.1.2 → 0.2.1

package/README.md

@@ -2,7 +2,7 @@
 
 openapi-ff is a type-safe tiny wrapper around [effector](https://effector.dev/) and [farfetched](https://ff.effector.dev/) to work with OpenAPI schema.
 
-It works by using [openapi-fetch](../openapi-fetch) and [openapi-typescript](../openapi-typescript).
+It works by using [openapi-fetch](https://openapi-ts.dev/openapi-fetch/) and [openapi-typescript](https://openapi-ts.dev/).
 
 ## Setup
 
@@ -21,17 +21,17 @@ npx openapi-typescript ./path/to/api/v1.yaml -o ./src/shared/api/schema.d.ts
 
 ```ts
 import createFetchClient from "openapi-fetch";
-import { createClient } from "openapi-ff";
+import { createEffectorClient } from "openapi-ff";
 import { createQuery } from "@farfetched/core";
 import type { paths } from "./schema"; // generated by openapi-typescript
 
 export const client = createFetchClient<paths>({
   baseUrl: "https://myapi.dev/v1/",
 });
-export const { createApiEffect } = createClient(client);
+export const { createApiEffect } = createEffectorClient(client);
 
 const blogpostQuery = createQuery({
-  effect: createApiEffect("get", "/blogposts/{post_id}"),
+  ...createApiEffect("get", "/blogposts/{post_id}"),
 });
 ```
 
@@ -60,11 +60,10 @@ import { chainRoute } from "atomic-router";
 import { startChain } from "@farfetched/atomic-router";
 import { isApiError } from "openapi-ff";
 
-const getBlogpostFx = createApiEffect("get", "/blogposts/{post_id}", {
-  mapParams: (args: { postId: string }) => ({ params: { path: { post_id: args.postId } } }),
-});
 const blogpostQuery = createQuery({
-  effect: getBlogpostFx,
+  ...createApiEffect("get", "/blogposts/{post_id}", {
+    mapParams: (args: { postId: string }) => ({ params: { path: { post_id: args.postId } } }),
+  }),
   mapData: ({ result, params }) => ({ ...result, ...params }),
   initialData: { body: "-", title: "-", postId: "0" },
 });
@@ -80,16 +79,31 @@ const apiError = sample({
 });
 ```
 
+Map with source:
+
+```ts
+import { mergeInitHeaders } from 'openapi-ff';
+
+const blogpostQuery = createQuery({
+  ...createApiEffect("get", "/blogposts/{post_id}", {
+    mapParams: {
+      source: $token,
+      fn: (token, init) => mergeInitHeaders(init, { Authorization: token }),
+    },
+  }),
+});
+```
+
 ## Runtime Validation
 
 `openapi-ff` does not handle runtime validation, as `openapi-typescript` [does not support it](https://github.com/openapi-ts/openapi-typescript/issues/1420#issuecomment-1792909086).
 
 > openapi-typescript by its design generates runtime-free static types, and only static types.
 
-However, `openapi-ff` allows adding a contract factory when creating a client and provides a corresponding method, `createApiEffectWithContract`:
+However, `openapi-ff` allows adding a contract factory when creating a client:
 
 ```ts
-const { createApiEffectWithContract } = createClient(fetchClient, {
+const { createApiEffect } = createEffectorClient(fetchClient, {
   createContract(method, path) {
     // ... create your own contract
     return contract; // Contract<unknown, unknown>
@@ -97,7 +111,7 @@ const { createApiEffectWithContract } = createClient(fetchClient, {
 });
 
 const query = createQuery({
-  ...createApiEffectWithContract("get", "/blogposts"),
+  ...createApiEffect("get", "/blogposts"),
 });
 ```
 
@@ -112,10 +126,9 @@ pnpm install zod @farfetched/zod
 import { EndpointByMethod } from "./zod";
 import { zodContract } from "@farfetched/zod";
 
-const { createApiEffectWithContract } = createClient(fetchClient, {
+const { createApiEffect } = createEffectorClient(fetchClient, {
   createContract(method, path) {
-    const endpoints = EndpointByMethod[method] as any;
-    const response = endpoints[path]?.response;
+    const response = (EndpointByMethod as any)[method][path]?.response;
     if (!response) {
       throw new Error(`Response schema for route "${method} ${path}" doesn't exist`);
     }
@@ -124,39 +137,6 @@ const { createApiEffectWithContract } = createClient(fetchClient, {
 });
 
 const query = createQuery({
-  ...createApiEffectWithContract("get", "/blogposts"),
-});
-```
-
-### [orval](https://orval.dev/) example
-
-Alternatively, you can simply add any contract to a query:
-
-```bash
-pnpm install zod @farfetched/zod
-npx orval --input path/to/api.yaml --output src/zod.ts --client zod --mode single
-```
-
-```ts
-import { zodContract } from "@farfetched/zod";
-import { getBlogpostsResponseItem } from "./zod";
-
-const blogpostQuery = createQuery({
-  effect: createApiEffect("get", "/blogposts/{post_id}"),
-  contract: zodContract(getBlogpostsResponseItem),
-});
-```
-
-## TODO
-
-Add `createApiQuery`:
-
-```ts
-createApiQuery({
-  method: "get",
-  path: "/blogposts/{post_id}",
-  mapParams: (args: { postId: string }) => ({ params: { path: { post_id: args.postId } } }),
-  mapData: ({ result, params }) => ({ ...result, ...params }),
-  initialData: { body: "-", title: "-", postId: "0" },
+  ...createApiEffect("get", "/blogposts"),
 });
 ```

package/dist/openapi-ff.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("effector"),l=require("@farfetched/core"),h="API";function C(t){return{...t,errorType:h,explanation:"Request was finished with unsuccessful HTTP code"}}function A(t){var e;return((e=t.error)==null?void 0:e.errorType)===h}function g(t,e={}){const u=(s,a,r)=>{const w=s.toUpperCase(),E=t[w];return p.createEffect(async i=>{var f;const{data:T,error:o,response:n}=await E(a,((f=r==null?void 0:r.mapParams)==null?void 0:f.call(r,i))??i).catch(c=>{throw l.networkError({reason:(c==null?void 0:c.message)??null,cause:c})});if(o!=null&&o!=="")throw C({status:n.status,statusText:n.statusText,response:o});if(!n.ok)throw l.httpError({status:n.status,statusText:n.statusText,response:null});return T})};return{createApiEffect:u,createApiEffectWithContract:(s,a,r)=>{if(e.createContract==null)throw new Error("'createContract' is missing in config");return{effect:u(s,a,r),contract:e.createContract(s,a.toString())}}}}exports.createClient=g;exports.isApiError=A;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("@farfetched/core"),P=require("effector"),I=require("openapi-fetch"),g="API";function p(t){var r;return((r=t.error)==null?void 0:r.errorType)===g}function y(t,r){return{createApiEffect:(f,o,e)=>{var h,E;const w=f.toUpperCase(),x=t[w],A=((h=e==null?void 0:e.mapParams)==null?void 0:h.source)??P.createStore(null),i=!!(e!=null&&e.mapParams),l=!!(e!=null&&e.mapParams.fn),m=i?l?e.mapParams.fn:e.mapParams:null;return{effect:P.attach({source:A,effect:async(T,c)=>{let s=c;i&&(l?s=m(T,c):s=m(c));const{data:q,error:u,response:a}=await x(o,s).catch(n=>{throw d.networkError({reason:(n==null?void 0:n.message)??null,cause:n})});if(u!=null&&u!=="")throw C({status:a.status,statusText:a.statusText,response:u});if(!a.ok)throw d.httpError({status:a.status,statusText:a.statusText,response:null});return q}}),contract:((E=r==null?void 0:r.createContract)==null?void 0:E.call(r,f,o))??F()}}}}function C(t){return{...t,errorType:g,explanation:"Request was finished with unsuccessful API response"}}function S(t,r){return{...t,headers:I.mergeHeaders(t.headers,r)}}function F(){return{isData:t=>!0,getErrorMessages:()=>[]}}exports.createEffectorClient=y;exports.isApiError=p;exports.mergeInitHeaders=S;

package/dist/openapi-ff.d.cts

@@ -1,50 +1,114 @@
+import { BodySerializer } from 'openapi-fetch';
 import { Client } from 'openapi-fetch';
+import { ClientOptions } from 'openapi-fetch';
 import { Contract } from '@farfetched/core';
 import { Effect } from 'effector';
 import { FarfetchedError } from '@farfetched/core';
+import { FetchOptions } from 'openapi-fetch';
 import { FetchResponse } from 'openapi-fetch';
+import { HeadersOptions } from 'openapi-fetch';
 import { HttpError } from '@farfetched/core';
-import { HttpMethod } from 'openapi-typescript-helpers';
 import { MaybeOptionalInit } from 'openapi-fetch';
-import { MediaType } from 'openapi-typescript-helpers';
 import { NetworkError } from '@farfetched/core';
-import { PathsWithMethod } from 'openapi-typescript-helpers';
+import { ParamsOption } from 'openapi-fetch';
+import { ParseAs } from 'openapi-fetch';
+import { QuerySerializer } from 'openapi-fetch';
+import { QuerySerializerOptions } from 'openapi-fetch';
+import { RequestBodyOption } from 'openapi-fetch';
+import { Store } from 'effector';
 
 declare const API = "API";
 
-export declare interface ApiError<Status extends number = number, ApiResponse = unknown> extends FarfetchedError<typeof API> {
-    status: Status;
+declare type ApiError<S extends ErrorStatus, T> = {
+    status: S;
     statusText: string;
-    response: ApiResponse;
-}
+    response: T;
+} & FarfetchedError<typeof API>;
 
-declare type CreateApiEffect<Paths extends Record<string, Record<HttpMethod, {}>>, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, Media>>, Options extends CreateApiEffectOptions<Init> = {}>(method: Method, path: Path, options?: Options) => Effect<Init extends undefined ? void : InitOrPrependInit<Init, Parameters<NonNullable<Options["mapParams"]>>[0], Options>, Response["data"], ApiError<number, Response["error"]> | HttpError | NetworkError>;
+declare type ApiErrors<Responses extends Record<string | number, any>> = {
+    [K in keyof Responses]: K extends ErrorStatus ? Responses[K] extends {
+        content: Record<string, any>;
+    } ? ApiError<K, FilterKeys<Responses[K]['content'], `${string}/json`>> : never : never;
+}[keyof Responses & ErrorStatus];
 
-declare type CreateApiEffectOptions<Init> = {
-    mapParams?: (init: any) => Init;
+declare type CreateApiEffect<Paths extends Record<string, Record<HttpMethod, {}>>> = {
+    <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Operation extends Paths[Path][Method], Responses extends ResponseObjectMap<Operation>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, `${string}/json`>>>(method: Method, path: Path): {
+        effect: Effect<OptionalParams<Init>, Response['data'], ApiErrors<Responses> | HttpError | NetworkError>;
+        contract: Contract<unknown, Response['data']>;
+    };
+    <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Operation extends Paths[Path][Method], Responses extends ResponseObjectMap<Operation>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, `${string}/json`>>, Source, NewInit = Init>(method: Method, path: Path, options: {
+        mapParams: {
+            source: Store<Source>;
+            fn: (source: Source, params: NewInit) => Init;
+        };
+    }): {
+        effect: Effect<OptionalParams<NewInit>, Response['data'], ApiErrors<Responses> | HttpError | NetworkError>;
+        contract: Contract<unknown, Response['data']>;
+    };
+    <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Operation extends Paths[Path][Method], Responses extends ResponseObjectMap<Operation>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, `${string}/json`>>, NewInit>(method: Method, path: Path, options: {
+        mapParams: (params: NewInit) => Init;
+    }): {
+        effect: Effect<OptionalParams<NewInit>, Response['data'], ApiErrors<Responses> | HttpError | NetworkError>;
+        contract: Contract<unknown, Response['data']>;
+    };
 };
 
-declare type CreateApiEffectWithContract<Paths extends Record<string, Record<HttpMethod, {}>>, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, Media>>, Options extends CreateApiEffectOptions<Init> = {}>(method: Method, path: Path, options?: Options) => {
-    effect: Effect<Init extends undefined ? void : InitOrPrependInit<Init, Parameters<NonNullable<Options["mapParams"]>>[0], Options>, Response["data"], ApiError<number, Response["error"]> | HttpError | NetworkError>;
-    contract: Contract<unknown, Response["data"]>;
-};
+export declare function createEffectorClient<Paths extends {}>(client: Client<Paths>, options?: {
+    createContract?: <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>>(method: Method, path: Path) => Contract<unknown, unknown>;
+}): OpenapiEffectorClient<Paths>;
+
+/** 2XX statuses */
+declare type ErrorStatus = 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511 | '5XX' | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 420 | 421 | 422 | 423 | 424 | 425 | 426 | 427 | 428 | 429 | 430 | 431 | 444 | 450 | 451 | 497 | 498 | 499 | '4XX' | "default";
+
+/** Find first match of multiple keys */
+declare type FilterKeys<Obj, Matchers> = Obj[keyof Obj & Matchers];
+
+declare type HasRequiredKeys<T> = {} extends T ? true : false;
 
-export declare function createClient<Paths extends {}, Media extends MediaType = MediaType>(client: Client<Paths, Media>, config?: EffectorClientOptions): OpenapiEffectorClient<Paths, Media>;
+declare type HttpMethod = 'get' | 'put' | 'post' | 'delete' | 'options' | 'head' | 'patch' | 'trace';
+
+export declare function isApiError<S extends ErrorStatus, R>(args: WithError): args is WithError<ApiError<S, R>>;
+
+export declare function mergeInitHeaders<T>(init: FetchOptions<T>, headers: Record<string, any>): ParamsOption<T> & RequestBodyOption<T> & {
+    baseUrl?: string;
+    querySerializer?: QuerySerializerOptions | QuerySerializer<T> | undefined;
+    bodySerializer?: BodySerializer<T> | undefined;
+    parseAs?: ParseAs;
+    fetch?: ClientOptions["fetch"];
+    headers?: HeadersOptions;
+} & {
+    headers: Headers;
+    cache?: RequestCache | undefined;
+    credentials?: RequestCredentials | undefined;
+    integrity?: string | undefined;
+    keepalive?: boolean | undefined;
+    method?: string | undefined;
+    mode?: RequestMode | undefined;
+    priority?: RequestPriority | undefined;
+    redirect?: RequestRedirect | undefined;
+    referrer?: string | undefined;
+    referrerPolicy?: ReferrerPolicy | undefined;
+    signal?: (AbortSignal | null) | undefined;
+    window?: null | undefined;
+};
 
-declare type EffectorClientOptions = {
-    createContract?: (method: HttpMethod, path: string) => Contract<unknown, unknown>;
+declare type OpenapiEffectorClient<Paths extends {}> = {
+    createApiEffect: CreateApiEffect<Paths>;
 };
 
-declare type InitOrPrependInit<Init, PrependInit, Options extends CreateApiEffectOptions<Init>> = Options extends {
-    mapParams: (init: any) => any;
-} ? PrependInit : Init;
+declare type OptionalParams<T> = HasRequiredKeys<T> extends true ? T | void : T;
 
-export declare function isApiError(args: WithError): args is WithError<ApiError>;
+/** Given an OpenAPI **Paths Object**, find all paths that have the given method */
+declare type PathsWithMethod<Paths extends {}, PathnameMethod extends HttpMethod> = {
+    [Pathname in keyof Paths]: Paths[Pathname] extends {
+        [K in PathnameMethod]: any;
+    } ? Pathname : never;
+}[keyof Paths];
 
-declare interface OpenapiEffectorClient<Paths extends {}, Media extends MediaType = MediaType> {
-    createApiEffect: CreateApiEffect<Paths, Media>;
-    createApiEffectWithContract: CreateApiEffectWithContract<Paths, Media>;
-}
+/** Return `responses` for an Operation Object */
+declare type ResponseObjectMap<T> = T extends {
+    responses: any;
+} ? T['responses'] : unknown;
 
 declare type WithError<T = any, P = Record<string, unknown>> = P & {
     error: T;

package/dist/openapi-ff.d.ts

@@ -1,50 +1,114 @@
+import { BodySerializer } from 'openapi-fetch';
 import { Client } from 'openapi-fetch';
+import { ClientOptions } from 'openapi-fetch';
 import { Contract } from '@farfetched/core';
 import { Effect } from 'effector';
 import { FarfetchedError } from '@farfetched/core';
+import { FetchOptions } from 'openapi-fetch';
 import { FetchResponse } from 'openapi-fetch';
+import { HeadersOptions } from 'openapi-fetch';
 import { HttpError } from '@farfetched/core';
-import { HttpMethod } from 'openapi-typescript-helpers';
 import { MaybeOptionalInit } from 'openapi-fetch';
-import { MediaType } from 'openapi-typescript-helpers';
 import { NetworkError } from '@farfetched/core';
-import { PathsWithMethod } from 'openapi-typescript-helpers';
+import { ParamsOption } from 'openapi-fetch';
+import { ParseAs } from 'openapi-fetch';
+import { QuerySerializer } from 'openapi-fetch';
+import { QuerySerializerOptions } from 'openapi-fetch';
+import { RequestBodyOption } from 'openapi-fetch';
+import { Store } from 'effector';
 
 declare const API = "API";
 
-export declare interface ApiError<Status extends number = number, ApiResponse = unknown> extends FarfetchedError<typeof API> {
-    status: Status;
+declare type ApiError<S extends ErrorStatus, T> = {
+    status: S;
     statusText: string;
-    response: ApiResponse;
-}
+    response: T;
+} & FarfetchedError<typeof API>;
 
-declare type CreateApiEffect<Paths extends Record<string, Record<HttpMethod, {}>>, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, Media>>, Options extends CreateApiEffectOptions<Init> = {}>(method: Method, path: Path, options?: Options) => Effect<Init extends undefined ? void : InitOrPrependInit<Init, Parameters<NonNullable<Options["mapParams"]>>[0], Options>, Response["data"], ApiError<number, Response["error"]> | HttpError | NetworkError>;
+declare type ApiErrors<Responses extends Record<string | number, any>> = {
+    [K in keyof Responses]: K extends ErrorStatus ? Responses[K] extends {
+        content: Record<string, any>;
+    } ? ApiError<K, FilterKeys<Responses[K]['content'], `${string}/json`>> : never : never;
+}[keyof Responses & ErrorStatus];
 
-declare type CreateApiEffectOptions<Init> = {
-    mapParams?: (init: any) => Init;
+declare type CreateApiEffect<Paths extends Record<string, Record<HttpMethod, {}>>> = {
+    <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Operation extends Paths[Path][Method], Responses extends ResponseObjectMap<Operation>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, `${string}/json`>>>(method: Method, path: Path): {
+        effect: Effect<OptionalParams<Init>, Response['data'], ApiErrors<Responses> | HttpError | NetworkError>;
+        contract: Contract<unknown, Response['data']>;
+    };
+    <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Operation extends Paths[Path][Method], Responses extends ResponseObjectMap<Operation>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, `${string}/json`>>, Source, NewInit = Init>(method: Method, path: Path, options: {
+        mapParams: {
+            source: Store<Source>;
+            fn: (source: Source, params: NewInit) => Init;
+        };
+    }): {
+        effect: Effect<OptionalParams<NewInit>, Response['data'], ApiErrors<Responses> | HttpError | NetworkError>;
+        contract: Contract<unknown, Response['data']>;
+    };
+    <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Operation extends Paths[Path][Method], Responses extends ResponseObjectMap<Operation>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, `${string}/json`>>, NewInit>(method: Method, path: Path, options: {
+        mapParams: (params: NewInit) => Init;
+    }): {
+        effect: Effect<OptionalParams<NewInit>, Response['data'], ApiErrors<Responses> | HttpError | NetworkError>;
+        contract: Contract<unknown, Response['data']>;
+    };
 };
 
-declare type CreateApiEffectWithContract<Paths extends Record<string, Record<HttpMethod, {}>>, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<Paths[Path][Method], Init, Media>>, Options extends CreateApiEffectOptions<Init> = {}>(method: Method, path: Path, options?: Options) => {
-    effect: Effect<Init extends undefined ? void : InitOrPrependInit<Init, Parameters<NonNullable<Options["mapParams"]>>[0], Options>, Response["data"], ApiError<number, Response["error"]> | HttpError | NetworkError>;
-    contract: Contract<unknown, Response["data"]>;
-};
+export declare function createEffectorClient<Paths extends {}>(client: Client<Paths>, options?: {
+    createContract?: <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>>(method: Method, path: Path) => Contract<unknown, unknown>;
+}): OpenapiEffectorClient<Paths>;
+
+/** 2XX statuses */
+declare type ErrorStatus = 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511 | '5XX' | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 420 | 421 | 422 | 423 | 424 | 425 | 426 | 427 | 428 | 429 | 430 | 431 | 444 | 450 | 451 | 497 | 498 | 499 | '4XX' | "default";
+
+/** Find first match of multiple keys */
+declare type FilterKeys<Obj, Matchers> = Obj[keyof Obj & Matchers];
+
+declare type HasRequiredKeys<T> = {} extends T ? true : false;
 
-export declare function createClient<Paths extends {}, Media extends MediaType = MediaType>(client: Client<Paths, Media>, config?: EffectorClientOptions): OpenapiEffectorClient<Paths, Media>;
+declare type HttpMethod = 'get' | 'put' | 'post' | 'delete' | 'options' | 'head' | 'patch' | 'trace';
+
+export declare function isApiError<S extends ErrorStatus, R>(args: WithError): args is WithError<ApiError<S, R>>;
+
+export declare function mergeInitHeaders<T>(init: FetchOptions<T>, headers: Record<string, any>): ParamsOption<T> & RequestBodyOption<T> & {
+    baseUrl?: string;
+    querySerializer?: QuerySerializerOptions | QuerySerializer<T> | undefined;
+    bodySerializer?: BodySerializer<T> | undefined;
+    parseAs?: ParseAs;
+    fetch?: ClientOptions["fetch"];
+    headers?: HeadersOptions;
+} & {
+    headers: Headers;
+    cache?: RequestCache | undefined;
+    credentials?: RequestCredentials | undefined;
+    integrity?: string | undefined;
+    keepalive?: boolean | undefined;
+    method?: string | undefined;
+    mode?: RequestMode | undefined;
+    priority?: RequestPriority | undefined;
+    redirect?: RequestRedirect | undefined;
+    referrer?: string | undefined;
+    referrerPolicy?: ReferrerPolicy | undefined;
+    signal?: (AbortSignal | null) | undefined;
+    window?: null | undefined;
+};
 
-declare type EffectorClientOptions = {
-    createContract?: (method: HttpMethod, path: string) => Contract<unknown, unknown>;
+declare type OpenapiEffectorClient<Paths extends {}> = {
+    createApiEffect: CreateApiEffect<Paths>;
 };
 
-declare type InitOrPrependInit<Init, PrependInit, Options extends CreateApiEffectOptions<Init>> = Options extends {
-    mapParams: (init: any) => any;
-} ? PrependInit : Init;
+declare type OptionalParams<T> = HasRequiredKeys<T> extends true ? T | void : T;
 
-export declare function isApiError(args: WithError): args is WithError<ApiError>;
+/** Given an OpenAPI **Paths Object**, find all paths that have the given method */
+declare type PathsWithMethod<Paths extends {}, PathnameMethod extends HttpMethod> = {
+    [Pathname in keyof Paths]: Paths[Pathname] extends {
+        [K in PathnameMethod]: any;
+    } ? Pathname : never;
+}[keyof Paths];
 
-declare interface OpenapiEffectorClient<Paths extends {}, Media extends MediaType = MediaType> {
-    createApiEffect: CreateApiEffect<Paths, Media>;
-    createApiEffectWithContract: CreateApiEffectWithContract<Paths, Media>;
-}
+/** Return `responses` for an Operation Object */
+declare type ResponseObjectMap<T> = T extends {
+    responses: any;
+} ? T['responses'] : unknown;
 
 declare type WithError<T = any, P = Record<string, unknown>> = P & {
     error: T;

package/dist/openapi-ff.js

@@ -1,59 +1,67 @@
-import { createEffect as m } from "effector";
-import { networkError as E, httpError as T } from "@farfetched/core";
-const l = "API";
-function x(t) {
+import { networkError as g, httpError as p } from "@farfetched/core";
+import { createStore as I, attach as C } from "effector";
+import { mergeHeaders as q } from "openapi-fetch";
+const x = "API";
+function R(t) {
+  var e;
+  return ((e = t.error) == null ? void 0 : e.errorType) === x;
+}
+function U(t, e) {
+  return { createApiEffect: (f, m, r) => {
+    var h, w;
+    const E = f.toUpperCase(), P = t[E], d = ((h = r == null ? void 0 : r.mapParams) == null ? void 0 : h.source) ?? I(null), o = !!(r != null && r.mapParams), l = !!(r != null && r.mapParams.fn), i = o ? l ? r.mapParams.fn : r.mapParams : null;
+    return {
+      effect: C({
+        source: d,
+        effect: async (A, s) => {
+          let c = s;
+          o && (l ? c = i(A, s) : c = i(s));
+          const { data: T, error: u, response: a } = await P(m, c).catch((n) => {
+            throw g({
+              reason: (n == null ? void 0 : n.message) ?? null,
+              cause: n
+            });
+          });
+          if (u != null && u !== "")
+            throw y({
+              status: a.status,
+              statusText: a.statusText,
+              response: u
+            });
+          if (!a.ok)
+            throw p({
+              status: a.status,
+              statusText: a.statusText,
+              response: null
+            });
+          return T;
+        }
+      }),
+      contract: ((w = e == null ? void 0 : e.createContract) == null ? void 0 : w.call(e, f, m)) ?? k()
+    };
+  } };
+}
+function y(t) {
   return {
     ...t,
-    errorType: l,
-    explanation: "Request was finished with unsuccessful HTTP code"
+    errorType: x,
+    explanation: "Request was finished with unsuccessful API response"
   };
 }
-function P(t) {
-  var e;
-  return ((e = t.error) == null ? void 0 : e.errorType) === l;
-}
-function g(t, e = {}) {
-  const f = (a, s, r) => {
-    const h = a.toUpperCase(), p = t[h];
-    return m(async (u) => {
-      var i;
-      const { data: w, error: o, response: n } = await p(
-        s,
-        ((i = r == null ? void 0 : r.mapParams) == null ? void 0 : i.call(r, u)) ?? u
-      ).catch((c) => {
-        throw E({
-          reason: (c == null ? void 0 : c.message) ?? null,
-          cause: c
-        });
-      });
-      if (o != null && o !== "")
-        throw x({
-          status: n.status,
-          statusText: n.statusText,
-          response: o
-        });
-      if (!n.ok)
-        throw T({
-          status: n.status,
-          statusText: n.statusText,
-          response: null
-        });
-      return w;
-    });
+function _(t, e) {
+  return {
+    ...t,
+    headers: q(t.headers, e)
   };
+}
+function k() {
   return {
-    createApiEffect: f,
-    createApiEffectWithContract: (a, s, r) => {
-      if (e.createContract == null)
-        throw new Error("'createContract' is missing in config");
-      return {
-        effect: f(a, s, r),
-        contract: e.createContract(a, s.toString())
-      };
-    }
+    isData: (t) => !0,
+    getErrorMessages: () => []
   };
 }
 export {
-  g as createClient,
-  P as isApiError
+  U as createEffectorClient,
+  R as isApiError,
+  _ as mergeInitHeaders
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ff",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "license": "MIT",
   "scripts": {
     "test": "vitest run --typecheck",
@@ -31,7 +31,7 @@
     "@biomejs/biome": "^1.9.4",
     "@farfetched/zod": "^0.12.8",
     "@types/node": "^20.12.7",
-    "typescript": "5.1.6",
+    "typescript": "5.8.3",
     "undici": "^6.21.0",
     "vite": "5",
     "vite-plugin-dts": "^3.8.3",
@@ -44,7 +44,6 @@
     "effector": "^23.2.3"
   },
   "dependencies": {
-    "openapi-fetch": "^0.13.0",
-    "openapi-typescript-helpers": "^0.0.15"
+    "openapi-fetch": "^0.14.0"
   }
 }