feat!: support latest openapi-typescript output

Author: mnorlin

src/openapi-typescript/fetch-factory.ts

@@ -4,6 +4,7 @@ import {
   AllFetchOptions,
   OpenapiPaths,
   FetchOptions,
+  FetchMethods,
 } from "./types/fetch-options";
 import { queryBuilder } from "./query-builder";
 import { pathBuilder } from "./path-builder";
@@ -24,10 +25,12 @@ function fetchFactory<Paths>(options?: InitParameters) {
 
   async function fetcher<
     Path extends keyof Paths,
-    Method extends keyof Paths[Path],
+    Method extends FetchMethods<Paths[Path]>,
     Operation extends Paths[Path][Method],
   >(input: Path, init: { method: Method } & FetchOptions<Operation>) {
-    const options = init as unknown as { method: Method } & AllFetchOptions;
+    const options = init as unknown as {
+      method: Method;
+    } & AllFetchOptions;
 
     const qBuilder = queryBuilder({
       style: serialization?.query?.style ?? "form",

src/openapi-typescript/types/fetch-options.ts

@@ -35,6 +35,13 @@ export type OpenapiPaths<Paths> = {
   };
 };
 
+/**
+ * Extracts the available HTTP methods
+ */
+export type FetchMethods<T> = {
+  [K in keyof T & HttpMethod]: T[K] extends never | undefined ? never : K;
+}[keyof T & HttpMethod];
+
 /**
  * Extract available paths from openapi-typescript paths type.
  */

src/openapi-typescript/types/request-body.ts

@@ -4,8 +4,10 @@
 export type OperationRequestBody<
   Operation,
   ContentType extends string = string,
-> = Operation extends {
-  requestBody?: { content: { [key in ContentType]: infer RequestBody } };
-}
-  ? RequestBody
-  : never;
+> = [Operation] extends [{ requestBody?: never }]
+  ? never
+  : Operation extends {
+        requestBody?: { content: { [key in ContentType]: infer RequestBody } };
+      }
+    ? RequestBody
+    : never;

src/openapi-typescript/types/request-parameters.ts

@@ -28,12 +28,10 @@ export type OperationHttpHeaders<Operation> = OperationParameters<
 type OperationParameters<
   Operation,
   ParameterType extends "path" | "query" | "header",
-> = Operation extends {
-  parameters?: infer AllParameters;
-}
-  ? AllParameters extends {
-      [key in ParameterType]?: infer PathParameters;
-    }
-    ? PathParameters
+> = Operation extends { parameters?: infer AllParameters }
+  ? AllParameters extends { [key in ParameterType]?: infer Param }
+    ? [Param] extends [never] | [undefined]
+      ? never
+      : Param
     : never
   : never;

src/types/common.ts

@@ -29,4 +29,5 @@ export type HttpMethod =
   | "patch"
   | "delete"
   | "head"
-  | "options";
+  | "options"
+  | "trace";

test/openapi-typescript/fetch-factory.test.ts

@@ -1,4 +1,4 @@
-import createFetch from "../../src/openapi-typescript";
+import createFetch, { FetchMethods } from "../../src/openapi-typescript";
 import { paths, components } from "./test-data/petstore-openapi3";
 import { IsEqual } from "../test-tools";