api-def 0.11.1 → 0.12.0-alpha.10

package/cjs/Api.d.ts

@@ -6,26 +6,41 @@ import type RequestBackend from "./backend/RequestBackend";
 export declare const getRequestBackend: () => RequestBackend | null;
 export declare const isRequestBackendDefault: () => boolean;
 export declare const setRequestBackend: (backend: RequestBackend) => void;
-export interface ApiInfo {
+export interface ApiOptions {
     readonly name: string;
     readonly baseUrl: string;
     readonly middleware?: RequestMiddleware[];
+    /** @deprecated use `requestConfig` instead */
     readonly config?: BaseRequestConfig | (() => BaseRequestConfig);
+    readonly requestConfig?: BaseRequestConfig | (() => BaseRequestConfig);
     readonly mocking?: ApiMockingConfig;
     readonly requestBackend?: RequestBackend;
 }
+export type ApiInfo = ApiOptions & Required<Pick<ApiOptions, "middleware" | "requestBackend">>;
 export declare class Api implements ApiInfo {
-    readonly baseUrl: string;
-    readonly name: string;
-    readonly middleware: RequestMiddleware[];
-    readonly config?: BaseRequestConfig | (() => BaseRequestConfig);
-    readonly mocking?: ApiMockingConfig;
-    readonly requestBackend: RequestBackend;
+    private readonly info;
     protected readonly endpoints: Record<string, Endpoint>;
-    constructor(info: ApiInfo);
+    constructor(options: ApiOptions);
+    get requestBackend(): RequestBackend;
+    get baseUrl(): string;
+    /**
+     * @deprecated use `requestConfig` instead
+     */
+    get config(): BaseRequestConfig | (() => BaseRequestConfig) | undefined;
+    get requestConfig(): BaseRequestConfig | (() => BaseRequestConfig) | undefined;
+    get middleware(): RequestMiddleware[];
+    get mocking(): ApiMockingConfig | undefined;
+    get name(): string;
     endpoint(): EndpointBuilder;
+    /**
+     * @deprecated use `requestBackend` instead
+     */
     getRequestBackend(): RequestBackend;
+    /**
+     * @deprecated use `computeRequestConfig()` instead
+     */
     getConfig(): BaseRequestConfig;
+    computeRequestConfig(): BaseRequestConfig;
     private hotRequest;
     get: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
     post: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;

package/cjs/Api.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -75,22 +75,39 @@ var HotRequestHost = /** @class */ (function () {
         configurable: true
     });
     HotRequestHost.prototype.computeConfig = function (config) {
-        var apiDefaults = this.api.getConfig();
-        return (0, RequestConfig_1.computeRequestConfig)([apiDefaults, config]);
+        var apiDefaults = this.api.computeRequestConfig();
+        return (0, RequestConfig_1.processRequestConfigs)([apiDefaults, config]);
     };
     HotRequestHost.prototype.computePath = function (path, config) {
         return path.startsWith("/") ? path : "/".concat(path);
     };
     HotRequestHost.prototype.getRequestBackend = function () {
-        return this.api.getRequestBackend();
+        return this.api.requestBackend;
     };
     return HotRequestHost;
 }());
 var Api = /** @class */ (function () {
-    function Api(info) {
+    function Api(options) {
         var _this = this;
         var _a, _b;
         this.endpoints = {};
+        /*reconfigure(info: Partial<ApiInfo>): void {
+          if (info.requestBackend) {
+            (this as any).requestBackend = info.requestBackend;
+          }
+          if (info.config) {
+            (this as any).config = info.config;
+          }
+          if (info.middleware) {
+            (this as any).middleware = info.middleware;
+          }
+          if (info.mocking) {
+            (this as any).mocking = info.mocking;
+          }
+          if (info.baseUrl) {
+            (this as any).baseUrl = info.baseUrl;
+          }
+        }*/
         this.hotRequest = function (requestMethod) {
             return function (path, config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -104,26 +121,90 @@ var Api = /** @class */ (function () {
         this.put = this.hotRequest(ApiConstants_1.RequestMethod.PUT);
         this.delete = this.hotRequest(ApiConstants_1.RequestMethod.DELETE);
         this.patch = this.hotRequest(ApiConstants_1.RequestMethod.PATCH);
-        this.name = info.name;
-        this.baseUrl = info.baseUrl;
-        this.middleware = info.middleware || [];
-        this.endpoints = {};
-        this.config = info.config;
-        this.mocking = (_a = info.mocking) !== null && _a !== void 0 ? _a : undefined;
-        var requestBackend = (_b = info.requestBackend) !== null && _b !== void 0 ? _b : (0, exports.getRequestBackend)();
+        var requestBackend = (_a = options.requestBackend) !== null && _a !== void 0 ? _a : (0, exports.getRequestBackend)();
         if (!requestBackend) {
             throw new Error("[api-def] No request backend provided in either Api options or globally, use `setRequestBackend()` to set one or pass one via `requestBackend`");
         }
-        this.requestBackend = requestBackend;
+        this.info = {
+            name: options.name,
+            baseUrl: options.baseUrl,
+            middleware: options.middleware || [],
+            config: options.config,
+            requestConfig: options.requestConfig,
+            mocking: (_b = options.mocking) !== null && _b !== void 0 ? _b : undefined,
+            requestBackend: requestBackend,
+        };
+        this.endpoints = {};
     }
+    Object.defineProperty(Api.prototype, "requestBackend", {
+        get: function () {
+            return this.info.requestBackend;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Api.prototype, "baseUrl", {
+        get: function () {
+            return this.info.baseUrl;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Api.prototype, "config", {
+        /**
+         * @deprecated use `requestConfig` instead
+         */
+        get: function () {
+            return this.info.config;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Api.prototype, "requestConfig", {
+        get: function () {
+            return this.info.requestConfig;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Api.prototype, "middleware", {
+        get: function () {
+            return this.info.middleware;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Api.prototype, "mocking", {
+        get: function () {
+            return this.info.mocking;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Api.prototype, "name", {
+        get: function () {
+            return this.info.name;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Api.prototype.endpoint = function () {
         return new EndpointBuilder_1.default(this);
     };
+    /**
+     * @deprecated use `requestBackend` instead
+     */
     Api.prototype.getRequestBackend = function () {
         return this.requestBackend;
     };
+    /**
+     * @deprecated use `computeRequestConfig()` instead
+     */
     Api.prototype.getConfig = function () {
-        return (typeof this.config === "function" ? this.config() : this.config) || {};
+        return this.computeRequestConfig();
+    };
+    Api.prototype.computeRequestConfig = function () {
+        return (typeof this.requestConfig === "function" ? this.requestConfig() : this.requestConfig) || {};
     };
     return Api;
 }());

package/cjs/ApiTypes.d.ts

@@ -43,7 +43,7 @@ export interface BaseRequestConfig {
     queryParser?: QueryStringify;
     queryHandling?: Partial<QueryHandling>;
 }
-export type RequestConfig<TParams extends Params | undefined = Params | undefined, TQuery extends Query | undefined = Query | undefined, TBody extends Body | undefined = Body | undefined, TState extends State = State> = (TParams extends undefined ? {
+export type RequestConfig<TParams extends Params | undefined = Params | undefined, TQuery extends Query | undefined = Query | undefined, TBody extends Body | undefined = Body | undefined, TState extends State = State, TRequestHeaders extends RawHeaders | undefined = RawHeaders | undefined> = (TParams extends undefined ? {
     params?: never;
 } : {
     params: Record<TParams extends Params ? TParams : never, string>;
@@ -59,9 +59,11 @@ export type RequestConfig<TParams extends Params | undefined = Params | undefine
     state?: TState;
 } : {
     state: TState;
-}) & BaseRequestConfig;
+}) & (Omit<BaseRequestConfig, "headers"> & {
+    headers?: TRequestHeaders & RawHeaders;
+});
 export declare const COMPUTED_CONFIG_SYMBOL: unique symbol;
-export type ComputedRequestConfig<TParams extends Params | undefined = Params | undefined, TQuery extends Query | undefined = Query | undefined, TBody extends Body | undefined = Body | undefined, TState extends State = State> = Omit<RequestConfig<TParams, TQuery, TBody, TState>, "queryParser" | "query" | "queryHandling" | "state"> & {
+export type ComputedRequestConfig<TParams extends Params | undefined = Params | undefined, TQuery extends Query | undefined = Query | undefined, TBody extends Body | undefined = Body | undefined, TState extends State = State, TRequestHeaders extends RawHeaders | undefined = RawHeaders | undefined> = Omit<RequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders>, "queryParser" | "query" | "queryHandling" | "state"> & {
     [COMPUTED_CONFIG_SYMBOL]: true;
     state: TState;
     queryObject: Record<string, any> | undefined;
@@ -97,7 +99,7 @@ export interface RequestHost {
     readonly path: string;
     readonly responseType: ResponseType | undefined;
     readonly validation: Validation;
-    computeConfig<TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State>(config: RequestConfig<TParams, TQuery, TBody, TState>): ComputedRequestConfig<TParams, TQuery, TBody, TState>;
+    computeConfig<TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State, TRequestHeaders extends RawHeaders | undefined>(config: RequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders>): ComputedRequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders>;
     computePath(path: string, config: RequestConfig): string;
     getRequestBackend(): RequestBackend;
 }

package/cjs/Endpoint.d.ts

@@ -1,10 +1,10 @@
 import type { Api } from "./Api";
 import type { RequestMethod, ResponseType } from "./ApiConstants";
-import type { ApiResponse, BaseRequestConfig, Body, ComputedRequestConfig, Params, Query, RequestConfig, RequestHost, State } from "./ApiTypes";
+import type { ApiResponse, BaseRequestConfig, Body, ComputedRequestConfig, Params, Query, RawHeaders, RequestConfig, RequestHost, State } from "./ApiTypes";
 import type * as Mocking from "./MockingTypes";
 import type { Validation } from "./Validation";
 import type RequestBackend from "./backend/RequestBackend";
-export interface EndpointConfig<TResult, TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State = State, TPath extends string = string> {
+export interface EndpointOptions<TResult, TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State = State, TPath extends string = string, TRequestHeaders extends RawHeaders | undefined = RawHeaders | undefined, TResponseHeaders extends RawHeaders | undefined = RawHeaders | undefined> {
     readonly id: string;
     readonly method: RequestMethod;
     readonly path: TPath;
@@ -32,21 +32,31 @@ export interface EndpointConfig<TResult, TParams extends Params | undefined, TQu
     readonly mocking?: Mocking.EndpointMockingConfig<TResult, TParams, TQuery, TBody, TState>;
     readonly validation?: Validation<TResult, TParams, TQuery, TBody, TState>;
 }
-export default class Endpoint<TResponse = any, TParams extends Params | undefined = Params | undefined, TQuery extends Query | undefined = Query | undefined, TBody extends Body | undefined = Body | undefined, TState extends State = State> implements EndpointConfig<TResponse, TParams, TQuery, TBody, TState>, RequestHost {
+export type EndpointInfo<TResult, TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State = State, TPath extends string = string, TRequestHeaders extends RawHeaders | undefined = RawHeaders | undefined, TResponseHeaders extends RawHeaders | undefined = RawHeaders | undefined> = EndpointOptions<TResult, TParams, TQuery, TBody, TState, TPath, TRequestHeaders, TResponseHeaders> & Required<Pick<EndpointOptions<TResult, TParams, TQuery, TBody, TState, TPath, TRequestHeaders, TResponseHeaders>, "name" | "validation">>;
+/**
+ * @deprecated Use `EndpointInfo` instead
+ */
+export type EndpointConfig<TResult, TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State = State, TPath extends string = string, TRequestHeaders extends RawHeaders | undefined = RawHeaders | undefined, TResponseHeaders extends RawHeaders | undefined = RawHeaders | undefined> = EndpointInfo<TResult, TParams, TQuery, TBody, TState, TPath>;
+export default class Endpoint<TResponse = any, TParams extends Params | undefined = Params | undefined, TQuery extends Query | undefined = Query | undefined, TBody extends Body | undefined = Body | undefined, TState extends State = State, TPath extends string = string, TRequestHeaders extends RawHeaders | undefined = RawHeaders | undefined, TResponseHeaders extends RawHeaders | undefined = RawHeaders | undefined> implements EndpointInfo<TResponse, TParams, TQuery, TBody, TState, TPath, TRequestHeaders, TResponseHeaders>, RequestHost {
     readonly api: Api;
-    readonly id: string;
-    readonly method: RequestMethod;
-    readonly name: string;
-    readonly description?: string;
-    readonly path: string;
-    readonly config?: BaseRequestConfig;
-    readonly responseType: ResponseType | undefined;
-    readonly mocking?: Mocking.EndpointMockingConfig<TResponse, TParams, TQuery, TBody, TState>;
-    readonly validation: Validation<TResponse, TParams, TQuery, TBody, TState>;
-    constructor(api: Api, info: EndpointConfig<TResponse, TParams, TQuery, TBody, TState>);
-    submit(config: RequestConfig<TParams, TQuery, TBody, TState>): Promise<ApiResponse<TResponse>>;
+    private readonly info;
+    constructor(api: Api, options: EndpointOptions<TResponse, TParams, TQuery, TBody, TState, TPath, TRequestHeaders, TResponseHeaders>);
+    get id(): string;
+    get method(): RequestMethod;
+    get path(): TPath;
+    get name(): string;
+    get description(): string | undefined;
+    get config(): BaseRequestConfig;
+    get responseType(): ResponseType | undefined;
+    get mocking(): Mocking.EndpointMockingConfig<TResponse, TParams, TQuery, TBody, TState> | undefined;
+    get validation(): Validation<TResponse, TParams, TQuery, TBody, TState>;
+    submit(config: RequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders>): Promise<ApiResponse<TResponse>>;
     computePath(path: string, request: RequestConfig): string;
     get baseUrl(): string;
-    computeConfig<TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State>(config: RequestConfig<TParams, TQuery, TBody, TState>): ComputedRequestConfig<TParams, TQuery, TBody, TState>;
+    /**
+     * @deprecated Use `computeRequestConfig` instead
+     */
+    computeConfig<TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State, TRequestHeaders extends RawHeaders | undefined>(config: RequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders>): ComputedRequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders>;
+    computeRequestConfig<TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State, TRequestHeaders extends RawHeaders | undefined>(config: RequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders>): ComputedRequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders>;
     getRequestBackend(): RequestBackend;
 }

package/cjs/Endpoint.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -39,18 +50,73 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var Requester = require("./Requester");
 var RequestConfig_1 = require("./RequestConfig");
 var Endpoint = /** @class */ (function () {
-    function Endpoint(api, info) {
+    function Endpoint(api, options) {
         this.api = api;
-        this.id = info.id;
-        this.method = info.method;
-        this.name = info.name || info.id;
-        this.description = info.description;
-        this.path = info.path;
-        this.config = info.config;
-        this.responseType = info.responseType;
-        this.mocking = info.mocking;
-        this.validation = info.validation || {};
+        this.info = __assign(__assign({}, options), { name: options.name || options.id, validation: options.validation || {} });
     }
+    Object.defineProperty(Endpoint.prototype, "id", {
+        get: function () {
+            return this.info.id;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Endpoint.prototype, "method", {
+        get: function () {
+            return this.info.method;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Endpoint.prototype, "path", {
+        get: function () {
+            return this.info.path;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Endpoint.prototype, "name", {
+        get: function () {
+            return this.info.name;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Endpoint.prototype, "description", {
+        get: function () {
+            return this.info.description;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Endpoint.prototype, "config", {
+        get: function () {
+            return this.info.config || {};
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Endpoint.prototype, "responseType", {
+        get: function () {
+            return this.info.responseType;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Endpoint.prototype, "mocking", {
+        get: function () {
+            return this.info.mocking;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Endpoint.prototype, "validation", {
+        get: function () {
+            return this.info.validation;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Endpoint.prototype.submit = function (config) {
         return __awaiter(this, void 0, void 0, function () {
             var mock, apiMocking, mockingEnabled;
@@ -77,10 +143,11 @@ var Endpoint = /** @class */ (function () {
             var keys = Object.keys(request.params);
             for (var i = 0; i < keys.length; i++) {
                 var argName = keys[i];
-                computedPath = computedPath.replace(":".concat(argName), request.params[argName]);
+                var argValue = request.params[argName];
+                computedPath = computedPath.replace(":".concat(argName), argValue).replace("{".concat(argName, "}"), argValue);
             }
         }
-        if (computedPath.includes(":")) {
+        if (computedPath.includes(":") || computedPath.includes("{")) {
             throw new Error("[api-def] Not all path params have been resolved: '".concat(computedPath, "'"));
         }
         return computedPath;
@@ -92,12 +159,18 @@ var Endpoint = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    /**
+     * @deprecated Use `computeRequestConfig` instead
+     */
     Endpoint.prototype.computeConfig = function (config) {
-        var apiDefaults = this.api.getConfig();
-        return (0, RequestConfig_1.computeRequestConfig)([apiDefaults, this.config, config]);
+        return this.computeRequestConfig(config);
+    };
+    Endpoint.prototype.computeRequestConfig = function (config) {
+        var apiDefaults = this.api.computeRequestConfig();
+        return (0, RequestConfig_1.processRequestConfigs)([apiDefaults, this.config, config]);
     };
     Endpoint.prototype.getRequestBackend = function () {
-        return this.api.getRequestBackend();
+        return this.api.requestBackend;
     };
     return Endpoint;
 }());

package/cjs/EndpointBuilder.d.ts

@@ -1,15 +1,17 @@
 import type * as zod from "zod";
 import type { Api } from "./Api";
-import type { Body, Params, Query, State } from "./ApiTypes";
-import Endpoint, { type EndpointConfig } from "./Endpoint";
-export default class EndpointBuilder<TResponse = any, TParams extends Params | undefined = undefined, TQuery extends Query | undefined = undefined, TBody extends Body | undefined = undefined, TState extends State = State> {
+import type { Body, Params, Query, RawHeaders, State } from "./ApiTypes";
+import Endpoint, { type EndpointOptions } from "./Endpoint";
+export default class EndpointBuilder<TResponse = any, TParams extends Params | undefined = undefined, TQuery extends Query | undefined = undefined, TBody extends Body | undefined = undefined, TState extends State = State, TRequestHeaders extends RawHeaders | undefined = RawHeaders | undefined, TResponseHeaders extends RawHeaders | undefined = RawHeaders | undefined> {
     private api;
     private readonly validation;
     constructor(api: Api);
-    queryOf<TNewQuery extends Query>(schema?: zod.Schema<TNewQuery>): EndpointBuilder<TResponse, TParams, TNewQuery, TBody>;
-    paramsOf<TNewParams extends Params>(): EndpointBuilder<TResponse, TNewParams, TQuery, TBody, TState>;
-    bodyOf<TNewBody extends Body>(schema?: zod.Schema<TNewBody>): EndpointBuilder<TResponse, TParams, TQuery, TNewBody, TState>;
-    responseOf<TNewResponse>(schema?: zod.Schema<TNewResponse>): EndpointBuilder<TNewResponse, TParams, TQuery, TBody, TState>;
-    stateOf<TNewState extends State>(schema?: zod.Schema<TNewState>): EndpointBuilder<TResponse, TParams, TQuery, TBody, TNewState>;
-    build<TPath extends string>(config: Omit<EndpointConfig<TResponse, TParams, TQuery, TBody, TState, TPath>, "validation">): Endpoint<TResponse, TParams, TQuery, TBody, TState>;
+    queryOf<TNewQuery extends Query>(schema?: zod.Schema<TNewQuery>): EndpointBuilder<TResponse, TParams, TNewQuery, TBody, TState, TRequestHeaders, TResponseHeaders>;
+    paramsOf<TNewParams extends Params>(): EndpointBuilder<TResponse, TNewParams, TQuery, TBody, TState, TRequestHeaders, TResponseHeaders>;
+    bodyOf<TNewBody extends Body>(schema?: zod.Schema<TNewBody>): EndpointBuilder<TResponse, TParams, TQuery, TNewBody, TState, TRequestHeaders, TResponseHeaders>;
+    responseOf<TNewResponse>(schema?: zod.Schema<TNewResponse>): EndpointBuilder<TNewResponse, TParams, TQuery, TBody, TState, TRequestHeaders, TResponseHeaders>;
+    stateOf<TNewState extends State>(schema?: zod.Schema<TNewState>): EndpointBuilder<TResponse, TParams, TQuery, TBody, TNewState, TRequestHeaders, TResponseHeaders>;
+    requestHeadersOf<TNewRequestHeaders extends RawHeaders>(): EndpointBuilder<TResponse, TParams, TQuery, TBody, TState, TNewRequestHeaders, TResponseHeaders>;
+    responseHeadersOf<TNewResponseHeaders extends RawHeaders>(): EndpointBuilder<TResponse, TParams, TQuery, TBody, TState, TRequestHeaders, TNewResponseHeaders>;
+    build<TPath extends string>(options: Omit<EndpointOptions<TResponse, TParams, TQuery, TBody, TState, TPath, TRequestHeaders, TResponseHeaders>, "validation">): Endpoint<TResponse, TParams, TQuery, TBody, TState, TPath, TRequestHeaders, TResponseHeaders>;
 }

package/cjs/EndpointBuilder.js

@@ -40,8 +40,14 @@ var EndpointBuilder = /** @class */ (function () {
         this.validation.state = schema;
         return this;
     };
-    EndpointBuilder.prototype.build = function (config) {
-        var endpoint = new Endpoint_1.default(this.api, __assign(__assign({}, config), { validation: this.validation }));
+    EndpointBuilder.prototype.requestHeadersOf = function () {
+        return this;
+    };
+    EndpointBuilder.prototype.responseHeadersOf = function () {
+        return this;
+    };
+    EndpointBuilder.prototype.build = function (options) {
+        var endpoint = new Endpoint_1.default(this.api, __assign(__assign({}, options), { validation: this.validation }));
         this.api.endpoints[endpoint.id] = endpoint;
         return endpoint;
     };

package/cjs/RequestConfig.d.ts

@@ -1,2 +1,2 @@
-import { type BaseRequestConfig, type Body, type ComputedRequestConfig, type Params, type Query, type RequestConfig, type State } from "./ApiTypes";
-export declare const computeRequestConfig: <TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State>(configs: (RequestConfig<TParams, TQuery, TBody, TState> | BaseRequestConfig | undefined)[]) => ComputedRequestConfig<TParams, TQuery, TBody, TState>;
+import { type BaseRequestConfig, type Body, type ComputedRequestConfig, type Params, type Query, type RawHeaders, type RequestConfig, type State } from "./ApiTypes";
+export declare const processRequestConfigs: <TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State, TRequestHeaders extends RawHeaders | undefined>(configs: (RequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders> | BaseRequestConfig | undefined)[]) => ComputedRequestConfig<TParams, TQuery, TBody, TState, TRequestHeaders>;

package/cjs/RequestConfig.js

@@ -9,12 +9,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeRequestConfig = void 0;
+exports.processRequestConfigs = void 0;
 var ApiTypes_1 = require("./ApiTypes");
 var QueryHandling_1 = require("./QueryHandling");
 var Utils = require("./Utils");
 var MERGED_CONFIG_KEYS = ["headers"];
-var computeRequestConfig = function (configs) {
+var processRequestConfigs = function (configs) {
     var _a;
     var _b, _c;
     var computedConfig = Utils.assign.apply(Utils, __spreadArray([(_a = {},
@@ -74,4 +74,4 @@ var computeRequestConfig = function (configs) {
     }
     return computedConfig;
 };
-exports.computeRequestConfig = computeRequestConfig;
+exports.processRequestConfigs = processRequestConfigs;

package/cjs/RequestContext.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/cjs/Requester.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/cjs/backend/AxiosRequestBackend.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -59,10 +59,11 @@ var AxiosRequestBackend = /** @class */ (function () {
     };
     AxiosRequestBackend.prototype.convertResponse = function (context, response) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
+            var _a, _b, _c, _d;
+            return __generator(this, function (_e) {
                 return [2 /*return*/, {
                         method: context.method,
-                        url: response.request.res.responseUrl,
+                        url: (_b = (_a = response.request.res) === null || _a === void 0 ? void 0 : _a.responseUrl) !== null && _b !== void 0 ? _b : (_d = (_c = response.request) === null || _c === void 0 ? void 0 : _c._redirectable) === null || _d === void 0 ? void 0 : _d._currentUrl,
                         data: response.data,
                         headers: response.headers,
                         status: response.status,

package/cjs/backend/FetchRequestBackend.js

@@ -24,8 +24,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/cjs/backend/MockRequestBackend.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/cjs/cache/Caching.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/cjs/cache/LocalStorageCacheBackend.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/cjs/index.d.ts

@@ -3,7 +3,7 @@ export * from "./ApiTypes";
 export * from "./UtilTypes";
 export * from "./ApiConstants";
 export { default as retry } from "./util/retry";
-export { type RetryOptions } from "./util/retry/interfaces";
+export type { RetryOptions } from "./util/retry/interfaces";
 export { isRequestError, type RequestError } from "./RequestError";
 export { default as Endpoint, type EndpointConfig } from "./Endpoint";
 export { clearCache, setCacheBackend } from "./cache/Caching";