@mittwald/api-client-commons 4.1.2-alpha.4 → 4.1.3-alpha.1

package/dist/index.d.mts

@@ -0,0 +1,45 @@
+import { AxiosInstance, CreateAxiosDefaults, AxiosError, InternalAxiosRequestConfig, AxiosResponse, AxiosRequestConfig } from 'axios';
+export * from 'axios';
+import { R as Response, O as OpenAPIOperation, a as RequestFunction, A as AnyResponse, P as PathParameters, b as RequestObject, c as ResponsePromise } from './shared/api-client-commons.5e434015.mjs';
+export { e as AnyRequest, l as HttpHeaders, j as HttpMediaType, k as HttpMethod, H as HttpPayload, i as HttpStatus, I as InferredRequestType, f as InferredResponseType, Q as QueryParameters, h as RequestData, d as RequestType, g as ResponseData } from './shared/api-client-commons.5e434015.mjs';
+import 'type-fest';
+
+declare function assertStatus<T extends Response, S extends T["status"]>(response: T, expectedStatus: S): asserts response is T & {
+    status: S;
+};
+
+type Simplify<T> = {
+    [KeyType in keyof T]: T[KeyType];
+} & {};
+
+declare abstract class ApiClientBase {
+    axios: AxiosInstance;
+    constructor(axiosConfig?: AxiosInstance | CreateAxiosDefaults);
+    protected requestFunctionFactory<TOp extends OpenAPIOperation>(operation: TOp): RequestFunction<TOp>;
+}
+
+declare class ApiClientError<T = unknown, D = unknown> extends AxiosError<T, D> {
+    constructor(message?: string, code?: string, config?: InternalAxiosRequestConfig<D>, request?: unknown, response?: AxiosResponse<T, D>);
+    static fromResponse(message: string, response: AnyResponse): ApiClientError;
+}
+
+declare class OpenAPIPath {
+    private readonly rawPath;
+    private readonly params?;
+    constructor(rawPath: string, params?: PathParameters);
+    buildUrl(): string;
+    private static setPathParams;
+}
+
+declare class Request<TOp extends OpenAPIOperation> {
+    private readonly operationDescriptor;
+    private readonly requestObject?;
+    readonly requestConfig: AxiosRequestConfig;
+    constructor(operationDescriptor: TOp, requestObject?: RequestObject<TOp>);
+    execute(axios: AxiosInstance): ResponsePromise<TOp>;
+    private buildAxiosConfig;
+    private makeAxiosHeaders;
+    private convertQueryToUrlSearchParams;
+}
+
+export { AnyResponse, ApiClientBase, ApiClientError, OpenAPIOperation, OpenAPIPath, PathParameters, Request, RequestFunction, RequestObject, Response, ResponsePromise, type Simplify, assertStatus };

package/dist/index.d.ts

@@ -0,0 +1,45 @@
+import { AxiosInstance, CreateAxiosDefaults, AxiosError, InternalAxiosRequestConfig, AxiosResponse, AxiosRequestConfig } from 'axios';
+export * from 'axios';
+import { R as Response, O as OpenAPIOperation, a as RequestFunction, A as AnyResponse, P as PathParameters, b as RequestObject, c as ResponsePromise } from './shared/api-client-commons.5e434015.js';
+export { e as AnyRequest, l as HttpHeaders, j as HttpMediaType, k as HttpMethod, H as HttpPayload, i as HttpStatus, I as InferredRequestType, f as InferredResponseType, Q as QueryParameters, h as RequestData, d as RequestType, g as ResponseData } from './shared/api-client-commons.5e434015.js';
+import 'type-fest';
+
+declare function assertStatus<T extends Response, S extends T["status"]>(response: T, expectedStatus: S): asserts response is T & {
+    status: S;
+};
+
+type Simplify<T> = {
+    [KeyType in keyof T]: T[KeyType];
+} & {};
+
+declare abstract class ApiClientBase {
+    axios: AxiosInstance;
+    constructor(axiosConfig?: AxiosInstance | CreateAxiosDefaults);
+    protected requestFunctionFactory<TOp extends OpenAPIOperation>(operation: TOp): RequestFunction<TOp>;
+}
+
+declare class ApiClientError<T = unknown, D = unknown> extends AxiosError<T, D> {
+    constructor(message?: string, code?: string, config?: InternalAxiosRequestConfig<D>, request?: unknown, response?: AxiosResponse<T, D>);
+    static fromResponse(message: string, response: AnyResponse): ApiClientError;
+}
+
+declare class OpenAPIPath {
+    private readonly rawPath;
+    private readonly params?;
+    constructor(rawPath: string, params?: PathParameters);
+    buildUrl(): string;
+    private static setPathParams;
+}
+
+declare class Request<TOp extends OpenAPIOperation> {
+    private readonly operationDescriptor;
+    private readonly requestObject?;
+    readonly requestConfig: AxiosRequestConfig;
+    constructor(operationDescriptor: TOp, requestObject?: RequestObject<TOp>);
+    execute(axios: AxiosInstance): ResponsePromise<TOp>;
+    private buildAxiosConfig;
+    private makeAxiosHeaders;
+    private convertQueryToUrlSearchParams;
+}
+
+export { AnyResponse, ApiClientBase, ApiClientError, OpenAPIOperation, OpenAPIPath, PathParameters, Request, RequestFunction, RequestObject, Response, ResponsePromise, type Simplify, assertStatus };

package/dist/index.mjs

@@ -0,0 +1,22 @@
+import axios__default, { Axios } from 'axios';
+export * from 'axios';
+import { R as Request } from './shared/api-client-commons.2a6e3962.mjs';
+export { A as ApiClientError, O as OpenAPIPath, a as assertStatus } from './shared/api-client-commons.2a6e3962.mjs';
+
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class ApiClientBase {
+  constructor(axiosConfig = axios__default) {
+    __publicField(this, "axios");
+    this.axios = axiosConfig instanceof Axios ? axiosConfig : axios__default.create(axiosConfig);
+  }
+  requestFunctionFactory(operation) {
+    return (conf) => new Request(operation, conf).execute(this.axios);
+  }
+}
+
+export { ApiClientBase, Request };

package/dist/react/index.d.mts

@@ -0,0 +1,19 @@
+import { O as OpenAPIOperation, b as RequestObject, g as ResponseData, a as RequestFunction } from '../shared/api-client-commons.5e434015.mjs';
+import { AsyncResource } from '@mittwald/react-use-promise';
+import 'axios';
+import 'type-fest';
+
+type GetApiResourceFn<TOp extends OpenAPIOperation> = null extends RequestObject<TOp> ? (conf?: RequestObject<TOp>) => AsyncResource<ResponseData<TOp>> : (conf: RequestObject<TOp>) => AsyncResource<ResponseData<TOp>>;
+
+declare class ApiCallAsyncResourceFactory<TOp extends OpenAPIOperation> {
+    private static namespace;
+    private readonly operation;
+    private readonly requestFn;
+    constructor(operation: TOp, requestFn: RequestFunction<TOp>);
+    private getAsyncResourceId;
+    private getAsyncResourceTags;
+    private executeRequest;
+    getApiResource: GetApiResourceFn<TOp>;
+}
+
+export { ApiCallAsyncResourceFactory };

package/dist/react/index.d.ts

@@ -0,0 +1,19 @@
+import { O as OpenAPIOperation, b as RequestObject, g as ResponseData, a as RequestFunction } from '../shared/api-client-commons.5e434015.js';
+import { AsyncResource } from '@mittwald/react-use-promise';
+import 'axios';
+import 'type-fest';
+
+type GetApiResourceFn<TOp extends OpenAPIOperation> = null extends RequestObject<TOp> ? (conf?: RequestObject<TOp>) => AsyncResource<ResponseData<TOp>> : (conf: RequestObject<TOp>) => AsyncResource<ResponseData<TOp>>;
+
+declare class ApiCallAsyncResourceFactory<TOp extends OpenAPIOperation> {
+    private static namespace;
+    private readonly operation;
+    private readonly requestFn;
+    constructor(operation: TOp, requestFn: RequestFunction<TOp>);
+    private getAsyncResourceId;
+    private getAsyncResourceTags;
+    private executeRequest;
+    getApiResource: GetApiResourceFn<TOp>;
+}
+
+export { ApiCallAsyncResourceFactory };

package/dist/react/index.mjs

@@ -0,0 +1,49 @@
+import { getAsyncResource } from '@mittwald/react-use-promise';
+import { R as Request, a as assertStatus } from '../shared/api-client-commons.2a6e3962.mjs';
+import 'axios';
+
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+const _ApiCallAsyncResourceFactory = class _ApiCallAsyncResourceFactory {
+  constructor(operation, requestFn) {
+    __publicField(this, "operation");
+    __publicField(this, "requestFn");
+    __publicField(this, "getApiResource", (requestObj) => {
+      const request = new Request(this.operation, requestObj);
+      return getAsyncResource(
+        (requestObj2) => this.executeRequest(requestObj2),
+        [requestObj],
+        {
+          tags: this.getAsyncResourceTags(request),
+          loaderId: this.getAsyncResourceId()
+        }
+      );
+    });
+    this.operation = operation;
+    this.requestFn = requestFn;
+  }
+  getAsyncResourceId() {
+    return `${_ApiCallAsyncResourceFactory.namespace}/${this.operation.operationId}`;
+  }
+  getAsyncResourceTags(request) {
+    const url = request.requestConfig.url ?? "";
+    return [
+      this.getAsyncResourceId(),
+      `${_ApiCallAsyncResourceFactory.namespace}/${this.operation.method}`,
+      `${_ApiCallAsyncResourceFactory.namespace}/${url}`
+    ];
+  }
+  async executeRequest(requestObj) {
+    const response = await this.requestFn(requestObj);
+    assertStatus(response, 200);
+    return response.data;
+  }
+};
+__publicField(_ApiCallAsyncResourceFactory, "namespace", "@mittwald/api-client");
+let ApiCallAsyncResourceFactory = _ApiCallAsyncResourceFactory;
+
+export { ApiCallAsyncResourceFactory };

package/dist/shared/api-client-commons.2a6e3962.mjs

@@ -0,0 +1,128 @@
+import { AxiosError } from 'axios';
+
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => {
+  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class OpenAPIPath {
+  constructor(rawPath, params) {
+    __publicField$1(this, "rawPath");
+    __publicField$1(this, "params");
+    this.rawPath = rawPath;
+    this.params = params;
+  }
+  buildUrl() {
+    return OpenAPIPath.setPathParams(this.rawPath, this.params);
+  }
+  static setPathParams(path, params) {
+    const asEntries = Object.entries(params ?? {});
+    const finalPath = asEntries.reduce((path2, entry) => {
+      const [key, value] = entry;
+      return path2.replace(`{${key}}`, encodeURIComponent(value));
+    }, path);
+    return finalPath.startsWith("/") ? finalPath.substring(1) : finalPath;
+  }
+}
+
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class Request {
+  constructor(operationDescriptor, requestObject) {
+    __publicField(this, "operationDescriptor");
+    __publicField(this, "requestObject");
+    __publicField(this, "requestConfig");
+    this.operationDescriptor = operationDescriptor;
+    this.requestObject = requestObject;
+    this.requestConfig = Object.freeze(this.buildAxiosConfig());
+  }
+  execute(axios) {
+    return axios.request(this.requestConfig);
+  }
+  buildAxiosConfig() {
+    const { method, path } = this.operationDescriptor;
+    const pathParameters = this.requestObject;
+    const openApiPath = new OpenAPIPath(path, pathParameters);
+    const url = openApiPath.buildUrl();
+    const data = this.requestObject && "data" in this.requestObject ? this.requestObject.data : void 0;
+    const headersConfig = this.requestObject && "headers" in this.requestObject ? this.requestObject.headers : void 0;
+    const headers = headersConfig ? this.makeAxiosHeaders(headersConfig) : void 0;
+    const queryParametersConfig = this.requestObject && "queryParameters" in this.requestObject ? this.requestObject.queryParameters : void 0;
+    const params = this.convertQueryToUrlSearchParams(queryParametersConfig);
+    return {
+      url,
+      method,
+      headers,
+      // Must be a plain object or an URLSearchParams object
+      params,
+      data,
+      validateStatus: () => true
+    };
+  }
+  makeAxiosHeaders(headers) {
+    return Object.fromEntries(
+      Object.entries(headers).map(([key, value]) => [key, value?.toString()])
+    );
+  }
+  convertQueryToUrlSearchParams(query) {
+    if (query === void 0 || query === null) {
+      return void 0;
+    }
+    if (query instanceof URLSearchParams) {
+      return query;
+    }
+    if (typeof query === "string") {
+      return new URLSearchParams(query);
+    }
+    if (typeof query === "object") {
+      const searchParams = new URLSearchParams();
+      for (const [key, value] of Object.entries(query)) {
+        if (Array.isArray(value)) {
+          for (const arrayItem of value) {
+            searchParams.append(key, arrayItem);
+          }
+        } else {
+          searchParams.append(
+            key,
+            typeof value === "string" || typeof value === "number" || typeof value === "boolean" ? value.toString() : JSON.stringify(value)
+          );
+        }
+      }
+      return searchParams;
+    }
+    throw new Error(`Unexpected query parameter type (${typeof query})`);
+  }
+}
+
+class ApiClientError extends AxiosError {
+  constructor(message, code, config, request, response) {
+    super(message, code, config, request, response);
+    Object.setPrototypeOf(this, ApiClientError.prototype);
+    this.name = "ApiClientError";
+  }
+  static fromResponse(message, response) {
+    return new ApiClientError(
+      message,
+      void 0,
+      response.config,
+      response.request,
+      response
+    );
+  }
+}
+
+function assertStatus(response, expectedStatus) {
+  if (response.status !== expectedStatus) {
+    throw ApiClientError.fromResponse(
+      `Unexpected response status (expected ${expectedStatus}, got: ${response.status})`,
+      response
+    );
+  }
+}
+
+export { ApiClientError as A, OpenAPIPath as O, Request as R, assertStatus as a };

package/dist/shared/api-client-commons.5e434015.d.mts

@@ -0,0 +1,71 @@
+import { AxiosResponse } from 'axios';
+import { HasRequiredKeys, PartialOnUndefinedDeep, OmitIndexSignature } from 'type-fest';
+
+type HttpPayload = unknown;
+type HttpStatus = number | "default";
+type HttpMediaType = string;
+type SafeHttpMethod = "GET" | "HEAD" | "OPTIONS";
+type UnsafeHttpMethod = "PUT" | "DELETE" | "POST" | "PATCH";
+type HttpMethod = SafeHttpMethod | UnsafeHttpMethod;
+type HeaderValue = string | number | boolean;
+type HttpHeaders = Partial<{
+    [TKey: string]: HeaderValue | HeaderValue[];
+}>;
+type PathParameters = Record<string, string | number>;
+type QueryParameters = Record<string, unknown>;
+
+type EmptyObject = Record<string, never>;
+type EmptyRequestComponent = EmptyObject | null;
+type RequestWithOptionalHeaders = {
+    headers?: HttpHeaders;
+};
+type RequestWithData<TData> = TData extends EmptyRequestComponent ? RequestWithOptionalHeaders : {
+    data: TData;
+};
+type RequestWithPathParameters<TPathParameters> = TPathParameters extends EmptyRequestComponent ? RequestWithOptionalHeaders : {
+    pathParameters: TPathParameters;
+};
+type RequestWithHeaders<THeaders> = THeaders extends EmptyRequestComponent ? RequestWithOptionalHeaders : {
+    headers: THeaders & HttpHeaders;
+};
+type RequestWithQueryParameters<TQuery> = TQuery extends EmptyRequestComponent ? RequestWithOptionalHeaders : {
+    queryParameters: TQuery & HttpHeaders;
+};
+type RequestType<TData extends HttpPayload = EmptyRequestComponent, TPathParameters extends PathParameters | EmptyRequestComponent = EmptyRequestComponent, TQueryParameters extends QueryParameters | EmptyRequestComponent = EmptyRequestComponent, THeader extends HttpHeaders | EmptyRequestComponent = EmptyRequestComponent> = TData | TPathParameters | THeader | TQueryParameters extends EmptyRequestComponent ? RequestWithOptionalHeaders : RequestWithData<TData> & RequestWithPathParameters<TPathParameters> & RequestWithQueryParameters<TQueryParameters> & RequestWithHeaders<THeader>;
+type AnyRequest = RequestType<any, any, any, any>;
+
+type Response<TContent extends HttpPayload = HttpPayload, TStatus extends HttpStatus = HttpStatus, TMediaType extends HttpMediaType | null = HttpMediaType> = AxiosResponse<TContent> & {
+    status: TStatus;
+    mediaType: TMediaType;
+};
+type AnyResponse = Response<any, any, any>;
+
+interface OpenAPIOperation<TIgnoredRequest extends AnyRequest = RequestType, IgnoredResponse extends AnyResponse = Response> {
+    operationId: string;
+    path: string;
+    method: HttpMethod;
+}
+type InferredRequestType<TOp> = TOp extends OpenAPIOperation<infer TReq> ? TReq : never;
+type InferredResponseType<TOp> = TOp extends OpenAPIOperation<RequestType, infer TRes> ? TRes : never;
+type ResponseData<TOp, TStatus extends HttpStatus = 200> = Extract<InferredResponseType<TOp>, {
+    status: TStatus;
+}>["data"];
+type RequestData<TOp> = TOp extends OpenAPIOperation ? InferredRequestType<TOp> extends {
+    data: infer TData;
+} ? TData : never : never;
+
+type PartialOnNoRequiredKeysDeep<T> = PartialOnUndefinedDeep<OmitIndexSignature<{
+    [TKey in keyof T]: HasRequiredKeys<PartialOnNoRequiredKeysDeep<T[TKey]>> extends true ? T[TKey] : T[TKey] | undefined;
+}>>;
+type NullableOnNoRequiredKeysDeep<T> = HasRequiredKeys<PartialOnNoRequiredKeysDeep<T>> extends true ? PartialOnNoRequiredKeysDeep<T> : PartialOnNoRequiredKeysDeep<T> | null;
+
+type UnboxPathParameters<T> = T extends {
+    pathParameters: infer TPath;
+} ? Omit<T, "pathParameters"> & TPath : T;
+type RequestObject<TOp extends OpenAPIOperation> = NullableOnNoRequiredKeysDeep<UnboxPathParameters<InferredRequestType<TOp>>>;
+type ResponsePromise<TOp extends OpenAPIOperation> = Promise<InferredResponseType<TOp>>;
+type RequestFunctionWithOptionalRequest<TOp extends OpenAPIOperation> = (request?: RequestObject<TOp>) => ResponsePromise<TOp>;
+type RequestFunctionWithRequiredRequest<TOp extends OpenAPIOperation> = (request: RequestObject<TOp>) => ResponsePromise<TOp>;
+type RequestFunction<TOp extends OpenAPIOperation> = null extends RequestObject<TOp> ? RequestFunctionWithOptionalRequest<TOp> : RequestFunctionWithRequiredRequest<TOp>;
+
+export type { AnyResponse as A, HttpPayload as H, InferredRequestType as I, OpenAPIOperation as O, PathParameters as P, QueryParameters as Q, Response as R, RequestFunction as a, RequestObject as b, ResponsePromise as c, RequestType as d, AnyRequest as e, InferredResponseType as f, ResponseData as g, RequestData as h, HttpStatus as i, HttpMediaType as j, HttpMethod as k, HttpHeaders as l };

package/dist/shared/api-client-commons.5e434015.d.ts

@@ -0,0 +1,71 @@
+import { AxiosResponse } from 'axios';
+import { HasRequiredKeys, PartialOnUndefinedDeep, OmitIndexSignature } from 'type-fest';
+
+type HttpPayload = unknown;
+type HttpStatus = number | "default";
+type HttpMediaType = string;
+type SafeHttpMethod = "GET" | "HEAD" | "OPTIONS";
+type UnsafeHttpMethod = "PUT" | "DELETE" | "POST" | "PATCH";
+type HttpMethod = SafeHttpMethod | UnsafeHttpMethod;
+type HeaderValue = string | number | boolean;
+type HttpHeaders = Partial<{
+    [TKey: string]: HeaderValue | HeaderValue[];
+}>;
+type PathParameters = Record<string, string | number>;
+type QueryParameters = Record<string, unknown>;
+
+type EmptyObject = Record<string, never>;
+type EmptyRequestComponent = EmptyObject | null;
+type RequestWithOptionalHeaders = {
+    headers?: HttpHeaders;
+};
+type RequestWithData<TData> = TData extends EmptyRequestComponent ? RequestWithOptionalHeaders : {
+    data: TData;
+};
+type RequestWithPathParameters<TPathParameters> = TPathParameters extends EmptyRequestComponent ? RequestWithOptionalHeaders : {
+    pathParameters: TPathParameters;
+};
+type RequestWithHeaders<THeaders> = THeaders extends EmptyRequestComponent ? RequestWithOptionalHeaders : {
+    headers: THeaders & HttpHeaders;
+};
+type RequestWithQueryParameters<TQuery> = TQuery extends EmptyRequestComponent ? RequestWithOptionalHeaders : {
+    queryParameters: TQuery & HttpHeaders;
+};
+type RequestType<TData extends HttpPayload = EmptyRequestComponent, TPathParameters extends PathParameters | EmptyRequestComponent = EmptyRequestComponent, TQueryParameters extends QueryParameters | EmptyRequestComponent = EmptyRequestComponent, THeader extends HttpHeaders | EmptyRequestComponent = EmptyRequestComponent> = TData | TPathParameters | THeader | TQueryParameters extends EmptyRequestComponent ? RequestWithOptionalHeaders : RequestWithData<TData> & RequestWithPathParameters<TPathParameters> & RequestWithQueryParameters<TQueryParameters> & RequestWithHeaders<THeader>;
+type AnyRequest = RequestType<any, any, any, any>;
+
+type Response<TContent extends HttpPayload = HttpPayload, TStatus extends HttpStatus = HttpStatus, TMediaType extends HttpMediaType | null = HttpMediaType> = AxiosResponse<TContent> & {
+    status: TStatus;
+    mediaType: TMediaType;
+};
+type AnyResponse = Response<any, any, any>;
+
+interface OpenAPIOperation<TIgnoredRequest extends AnyRequest = RequestType, IgnoredResponse extends AnyResponse = Response> {
+    operationId: string;
+    path: string;
+    method: HttpMethod;
+}
+type InferredRequestType<TOp> = TOp extends OpenAPIOperation<infer TReq> ? TReq : never;
+type InferredResponseType<TOp> = TOp extends OpenAPIOperation<RequestType, infer TRes> ? TRes : never;
+type ResponseData<TOp, TStatus extends HttpStatus = 200> = Extract<InferredResponseType<TOp>, {
+    status: TStatus;
+}>["data"];
+type RequestData<TOp> = TOp extends OpenAPIOperation ? InferredRequestType<TOp> extends {
+    data: infer TData;
+} ? TData : never : never;
+
+type PartialOnNoRequiredKeysDeep<T> = PartialOnUndefinedDeep<OmitIndexSignature<{
+    [TKey in keyof T]: HasRequiredKeys<PartialOnNoRequiredKeysDeep<T[TKey]>> extends true ? T[TKey] : T[TKey] | undefined;
+}>>;
+type NullableOnNoRequiredKeysDeep<T> = HasRequiredKeys<PartialOnNoRequiredKeysDeep<T>> extends true ? PartialOnNoRequiredKeysDeep<T> : PartialOnNoRequiredKeysDeep<T> | null;
+
+type UnboxPathParameters<T> = T extends {
+    pathParameters: infer TPath;
+} ? Omit<T, "pathParameters"> & TPath : T;
+type RequestObject<TOp extends OpenAPIOperation> = NullableOnNoRequiredKeysDeep<UnboxPathParameters<InferredRequestType<TOp>>>;
+type ResponsePromise<TOp extends OpenAPIOperation> = Promise<InferredResponseType<TOp>>;
+type RequestFunctionWithOptionalRequest<TOp extends OpenAPIOperation> = (request?: RequestObject<TOp>) => ResponsePromise<TOp>;
+type RequestFunctionWithRequiredRequest<TOp extends OpenAPIOperation> = (request: RequestObject<TOp>) => ResponsePromise<TOp>;
+type RequestFunction<TOp extends OpenAPIOperation> = null extends RequestObject<TOp> ? RequestFunctionWithOptionalRequest<TOp> : RequestFunctionWithRequiredRequest<TOp>;
+
+export type { AnyResponse as A, HttpPayload as H, InferredRequestType as I, OpenAPIOperation as O, PathParameters as P, QueryParameters as Q, Response as R, RequestFunction as a, RequestObject as b, ResponsePromise as c, RequestType as d, AnyRequest as e, InferredResponseType as f, ResponseData as g, RequestData as h, HttpStatus as i, HttpMediaType as j, HttpMethod as k, HttpHeaders as l };

package/package.json

@@ -1,76 +1,70 @@
 {
   "name": "@mittwald/api-client-commons",
-  "version": "4.1.2-alpha.4",
+  "version": "4.1.3-alpha.1",
+  "author": "Mittwald CM Service GmbH & Co. KG <opensource@mittwald.de>",
+  "type": "module",
   "description": "Common types and utilities for mittwald API clients",
-  "license": "MIT",
-  "repository": "https://github.com/mittwald/api-client-js.git",
-  "author": {
-    "name": "Mittwald CM Service GmbH & Co. KG",
-    "email": "opensource@mittwald.de"
-  },
+  "keywords": [
+    "api",
+    "client",
+    "mittwald",
+    "rest",
+    "sdk"
+  ],
   "homepage": "https://developer.mittwald.de",
+  "repository": "https://github.com/mittwald/api-client-js.git",
   "bugs": "https://github.com/mittwald/api-client-js/issues",
-  "main": "dist/cjs/index.js",
-  "type": "module",
+  "license": "MIT",
   "exports": {
-    ".": {
-      "types": {
-        "require": "./dist/cjs/index.d.ts",
-        "default": "./dist/esm/index.d.ts"
-      },
-      "default": {
-        "require": "./dist/cjs/index.js",
-        "default": "./dist/esm/index.js"
-      }
-    },
-    "./react": {
-      "types": {
-        "require": "./dist/cjs/react/index.d.ts",
-        "default": "./dist/esm/react/index.d.ts"
-      },
-      "default": {
-        "require": "./dist/cjs/react/index.js",
-        "default": "./dist/esm/react/index.js"
-      }
-    }
-  },
-  "scripts": {
-    "test": "node --experimental-vm-modules $(yarn bin jest)"
+    ".": "./dist/index.mjs",
+    "./react": "./dist/react/index.mjs"
   },
   "files": [
-    "dist/**/*.{js,d.ts}"
-  ],
-  "keywords": [
-    "mittwald",
-    "api",
-    "client",
-    "sdk",
-    "rest"
+    "dist"
   ],
-  "peerDependencies": {
-    "@mittwald/react-use-promise": "^1.3.2"
-  },
-  "peerDependenciesMeta": {
-    "@mittwald/react-use-promise": {
-      "optional": true
-    }
+  "scripts": {
+    "build": "yarn unbuild",
+    "format": "prettier --write '**/*.{ts,tsx,yaml,yml,json,md,mdx,js}'",
+    "lint": "eslint .",
+    "test": "node --experimental-vm-modules $(yarn bin jest)"
   },
   "dependencies": {
-    "@types/parse-path": "^7.0.0",
-    "axios": "^1.4.0",
+    "@types/parse-path": "^7.0.3",
+    "axios": "^1.6.2",
     "parse-path": "^7.0.0",
     "path-to-regexp": "^6.2.1",
-    "type-fest": "^3.12.0"
+    "type-fest": "^4.8.2"
   },
   "devDependencies": {
-    "@jest/globals": "^29.6.0",
-    "@mittwald/react-use-promise": "^1.3.2",
-    "@types/jest": "^29.5.2",
-    "@yarnpkg/pnpify": "^4.0.0-rc.48",
-    "jest": "^29.6.1",
+    "@jest/globals": "^29.7.0",
+    "@mittwald/react-use-promise": "^2.1.0",
+    "@types/jest": "^29.5.10",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "eslint": "^8.54.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-json": "^3.1.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "jest": "^29.7.0",
+    "prettier": "^3.1.0",
+    "prettier-plugin-jsdoc": "^1.1.1",
+    "prettier-plugin-pkgsort": "^0.2.1",
+    "prettier-plugin-sort-json": "^3.1.0",
     "react": "^18.2.0",
     "ts-jest": "^29.1.1",
-    "tsd": "^0.28.1"
+    "tsd": "^0.29.0",
+    "typescript": "^5.3.2",
+    "unbuild": "^2.0.0"
+  },
+  "peerDependencies": {
+    "@mittwald/react-use-promise": "^2.1.0"
+  },
+  "peerDependenciesMeta": {
+    "@mittwald/react-use-promise": {
+      "optional": true
+    }
   },
-  "types": "dist/cjs/index.d.ts"
+  "unbuild": {
+    "declaration": true
+  }
 }

package/dist/cjs/axios.d.ts

@@ -1 +0,0 @@
-export * from "axios";

package/dist/cjs/axios.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("axios"), exports);

package/dist/cjs/core/ApiClientBase.d.ts

@@ -1,9 +0,0 @@
-import { AxiosInstance, CreateAxiosDefaults } from "axios";
-import { RequestFunction } from "../types/index.js";
-import { OpenAPIOperation } from "../types/index.js";
-export declare abstract class ApiClientBase {
-    axios: AxiosInstance;
-    constructor(axiosConfig?: AxiosInstance | CreateAxiosDefaults);
-    protected requestFunctionFactory<TOp extends OpenAPIOperation>(operation: TOp): RequestFunction<TOp>;
-}
-export default ApiClientBase;