openapi-typesafe-react-query 0.0.0 → 1.0.0-rc.1

package/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2023 Martin Paucot
+Copyright (c) 2026 Fedor Chishchin and openapi-typesafe contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,3 +1,67 @@
 # openapi-typesafe-react-query
 
-This name is reserved for openapi-typesafe. This version contains no code.
+openapi-typesafe-react-query is a small, type-safe wrapper (about 2.5 kB) around [@tanstack/react-query](https://tanstack.com/query/latest/docs/framework/react/overview) to work with OpenAPI schema.
+
+It works by using [openapi-typesafe-fetch](../openapi-typesafe-fetch) and [openapi-typesafe](../openapi-typesafe) so URLs, parameters, request bodies and responses are checked against your schema, with no manual types,
+no `any` and no `as` assertions.
+
+A maintained, drop-in successor to `openapi-react-query` (see the [repository README](../../README.md)).
+
+> **Status: in development; not published to npm yet.**
+
+## Setup
+
+Install this library along with [openapi-typesafe-fetch](../openapi-typesafe-fetch) and [openapi-typesafe](../openapi-typesafe):
+
+```bash
+npm i openapi-typesafe-react-query openapi-typesafe-fetch
+npm i -D openapi-typesafe typescript
+```
+
+Next, generate TypeScript types from your OpenAPI schema using openapi-typesafe:
+
+```bash
+npx openapi-typesafe ./path/to/api/v1.yaml -o ./src/lib/api/v1.d.ts
+```
+
+## Usage
+
+Once your types have been generated from your schema, you can create a [fetch client](../openapi-typesafe-fetch), a react-query client and start querying your API.
+
+```tsx
+import createFetchClient from "openapi-typesafe-fetch";
+import createClient from "openapi-typesafe-react-query";
+import type { paths } from "./my-openapi-3-schema"; // generated by openapi-typesafe
+
+const fetchClient = createFetchClient<paths>({
+  baseUrl: "https://myapi.dev/v1/",
+});
+const $api = createClient(fetchClient);
+
+const MyComponent = () => {
+  const { data, error, isPending } = $api.useQuery("get", "/blogposts/{post_id}", {
+    params: {
+      path: { post_id: "5" },
+    },
+  });
+
+  if (isPending || !data) return "Loading...";
+
+  if (error) return `An error occurred: ${error.message}`;
+
+  return <div>{data.title}</div>;
+};
+```
+
+> You can find more information about `createFetchClient` in the [openapi-typesafe-fetch documentation](../openapi-typesafe-fetch).
+
+## Migrating from openapi-react-query
+
+```diff
+- import createClient from "openapi-react-query";
++ import createClient from "openapi-typesafe-react-query";
+```
+
+## License
+
+[MIT](./LICENSE)

package/dist/index.cjs

@@ -0,0 +1,79 @@
+'use strict';
+
+const reactQuery = require('@tanstack/react-query');
+
+const INFINITE_QUERY_KEY_MARKER = "infinite";
+function throwIfFailed(result) {
+  if (result.error !== void 0 || !result.response.ok) {
+    throw result.error;
+  }
+}
+const DEFAULT_PAGE_PARAM_NAME = "cursor";
+function pageInit(init, { pageParamName, pageParam, signal }) {
+  const { params, ...rest } = init ?? {};
+  const page = pageParam === void 0 ? {} : { [pageParamName]: pageParam };
+  return { ...rest, signal, params: { ...params, query: { ...params?.query, ...page } } };
+}
+function createClient(client) {
+  const queryFn = async ({
+    queryKey,
+    signal
+  }) => {
+    const [method, path, init] = queryKey;
+    const mth = method.toUpperCase();
+    const fn = client[mth];
+    const result = await fn(path, { signal, ...init });
+    throwIfFailed(result);
+    return result.data ?? null;
+  };
+  const queryOptions = (method, path, ...[init, options]) => ({
+    queryKey: init === void 0 ? [method, path] : [method, path, init],
+    queryFn,
+    ...options
+  });
+  return {
+    queryOptions,
+    useQuery: (method, path, ...[init, options, queryClient]) => reactQuery.useQuery(queryOptions(method, path, init, options), queryClient),
+    useSuspenseQuery: (method, path, ...[init, options, queryClient]) => reactQuery.useSuspenseQuery(queryOptions(method, path, init, options), queryClient),
+    useInfiniteQuery: (method, path, init, options, queryClient) => {
+      const { pageParamName = DEFAULT_PAGE_PARAM_NAME, placeholderData, ...restOptions } = options;
+      const { queryKey } = queryOptions(method, path, init);
+      const mth = method.toUpperCase();
+      const fn = client[mth];
+      return reactQuery.useInfiniteQuery(
+        {
+          queryKey: [...queryKey, INFINITE_QUERY_KEY_MARKER],
+          // The request comes from the arguments; the key only identifies the cache entry.
+          queryFn: async ({ pageParam, signal }) => {
+            const result = await fn(path, pageInit(init, { pageParamName, pageParam, signal }));
+            throwIfFailed(result);
+            return result.data;
+          },
+          ...restOptions,
+          // Typed with an `unknown` page param for the caller (`InfinitePlaceholderData`). TanStack
+          // passes the previous data of this query, with its own page params, and takes it back.
+          placeholderData
+        },
+        queryClient
+      );
+    },
+    useMutation: (method, path, options, queryClient) => reactQuery.useMutation(
+      {
+        mutationKey: [method, path],
+        mutationFn: async (init) => {
+          const mth = method.toUpperCase();
+          const fn = client[mth];
+          const result = await fn(path, init);
+          throwIfFailed(result);
+          const { data } = result;
+          return data;
+        },
+        ...options
+      },
+      queryClient
+    )
+  };
+}
+
+module.exports = createClient;
+//# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sources":["../src/index.ts"],"sourcesContent":["import {\n  type DataTag,\n  type InfiniteData,\n  type QueryClient,\n  type QueryFunctionContext,\n  type SkipToken,\n  type UseInfiniteQueryOptions,\n  type UseInfiniteQueryResult,\n  type UseMutationOptions,\n  type UseMutationResult,\n  type UseQueryOptions,\n  type UseQueryResult,\n  type UseSuspenseQueryOptions,\n  type UseSuspenseQueryResult,\n  useInfiniteQuery,\n  useMutation,\n  useQuery,\n  useSuspenseQuery,\n} from \"@tanstack/react-query\";\nimport type {\n  ClientMethod,\n  DefaultParamsOption,\n  Client as FetchClient,\n  FetchResponse,\n  IsInitOptional,\n  MaybeOptionalInit,\n  PathOperation,\n} from \"openapi-typesafe-fetch\";\nimport type { HttpMethod, MediaType, PathsWithMethod } from \"openapi-typesafe-helpers\";\n\n// Helper type to dynamically infer the type from the `select` property\ntype InferSelectReturnType<TData, TSelect> = TSelect extends (data: TData) => infer R ? R : TData;\n\n/**\n * Query data of a response type: a success without a body is `undefined` in the fetch client and\n * `null` in the query, as `queryFn` resolves it (upstream #2234, #2464).\n */\ntype QueryData<Data> = undefined extends Data ? Exclude<Data, undefined> | null : Data;\n\ntype InitWithUnknowns<Init> = Init & { [key: string]: unknown };\n\n/**\n * The arguments after the path: the init, required when the operation requires a parameter or a\n * body, then `Rest`. `IsInitOptional` keeps the init optional in\n * `Parameters<typeof $api.queryOptions>`, where it is the union of all inits (upstream #2178).\n */\ntype InitArguments<Init, Rest extends unknown[]> =\n  IsInitOptional<Init> extends true ? [InitWithUnknowns<Init>?, ...Rest] : [InitWithUnknowns<Init>, ...Rest];\n\nexport type QueryKey<\n  Paths extends {},\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init = MaybeOptionalInit<Paths[Path], Method>,\n> = Init extends undefined ? readonly [Method, Path] : readonly [Method, Path, Init];\n\n/**\n * The last element of an infinite query's key. `useQuery` and `useInfiniteQuery` cache different\n * data (`TData` and `InfiniteData<TData>`), so the same request must not share one key (upstream\n * #2184, ADR-022). A prefix such as `[method, path]` still matches both. Not exported: a runtime\n * named export next to the default export would change what `require()` returns.\n */\nconst INFINITE_QUERY_KEY_MARKER = \"infinite\";\n\nexport type InfiniteQueryKey<\n  Paths extends {},\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n> = readonly [...QueryKey<Paths, Method, Path>, typeof INFINITE_QUERY_KEY_MARKER];\n\nexport type QueryOptionsFunction<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types\n  Options extends Omit<\n    UseQueryOptions<\n      QueryData<Response[\"data\"]>,\n      Response[\"error\"],\n      InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n      QueryKey<Paths, Method, Path>\n    >,\n    \"queryKey\" | \"queryFn\"\n  >,\n>(\n  method: Method,\n  path: Path,\n  ...[init, options]: InitArguments<Init, [Options?]>\n) => NoInfer<\n  Omit<\n    UseQueryOptions<\n      QueryData<Response[\"data\"]>,\n      Response[\"error\"],\n      InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n      QueryKey<Paths, Method, Path>\n    >,\n    \"queryFn\" | \"queryKey\"\n  > & {\n    queryKey: DataTag<QueryKey<Paths, Method, Path>, QueryData<Response[\"data\"]>, Response[\"error\"]>;\n    queryFn: Exclude<\n      UseQueryOptions<\n        QueryData<Response[\"data\"]>,\n        Response[\"error\"],\n        InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n        QueryKey<Paths, Method, Path>\n      >[\"queryFn\"],\n      SkipToken | undefined\n    >;\n  }\n>;\n\nexport type UseQueryMethod<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types\n  Options extends Omit<\n    UseQueryOptions<\n      QueryData<Response[\"data\"]>,\n      Response[\"error\"],\n      InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n      QueryKey<Paths, Method, Path>\n    >,\n    \"queryKey\" | \"queryFn\"\n  >,\n>(\n  method: Method,\n  url: Path,\n  ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>\n) => UseQueryResult<InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>, Response[\"error\"]>;\n\n/**\n * The type of the page params: the initial one and the ones `getNextPageParam` and\n * `getPreviousPageParam` return (upstream #2458). It was `unknown`. It stays `unknown` when a\n * return type is untyped, so code that compiled still compiles (roadmap §3): TypeScript cannot\n * infer the return type of a callback that computes it from an unannotated `lastPageParam`,\n * whose type depends on that return type, and gives `never` or `unknown`.\n */\ntype PageParam<Initial, Next, Previous> =\n  IsUntyped<Next> extends true\n    ? unknown\n    : [Previous] extends [NoPreviousPageParam]\n      ? NullishToUnknown<Initial | NonNullable<Next>>\n      : IsUntyped<Previous> extends true\n        ? unknown\n        : NullishToUnknown<Initial | NonNullable<Next> | NonNullable<Previous>>;\n\n/** The `Previous` type parameter when the options have no `getPreviousPageParam`. */\ndeclare const NO_PREVIOUS_PAGE_PARAM: unique symbol;\ntype NoPreviousPageParam = typeof NO_PREVIOUS_PAGE_PARAM;\n\ntype IsUntyped<T> = [T] extends [never] ? true : unknown extends T ? true : false;\n\n/** Only `undefined` or `null` names no type: a cursor API's `initialPageParam: undefined`. */\ntype NullishToUnknown<T> = [T] extends [undefined | null] ? unknown : T;\n\n/** Read only for the return type; `never` arguments add no inference for TanStack's page param. */\ntype PageParamFunction<Result> = (...args: never) => Result;\n\n/**\n * Inference sites of the page param types. Intersected before `Options`, so TanStack's own\n * inference in the implementation reads the full signatures of `Options`.\n */\ninterface PageParamSources<Initial, Next, Previous> {\n  initialPageParam: Initial;\n  getNextPageParam: PageParamFunction<Next>;\n  getPreviousPageParam?: PageParamFunction<Previous>;\n}\n\n/**\n * `placeholderData` of `useInfiniteQuery`, with an `unknown` page param as before: TypeScript types\n * a `(previousData) => previousData` callback while it still infers the page param, so it got\n * `unknown` there and failed against the typed page param.\n */\ntype InfinitePlaceholderData<\n  Data,\n  Error,\n  Paths extends {},\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n> = UseInfiniteQueryOptions<\n  Data,\n  Error,\n  InfiniteData<Data, unknown>,\n  InfiniteQueryKey<Paths, Method, Path>,\n  unknown\n>[\"placeholderData\"];\n\nexport type UseInfiniteQueryMethod<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>,\n  Options extends Omit<\n    UseInfiniteQueryOptions<\n      Response[\"data\"],\n      Response[\"error\"],\n      InferSelectReturnType<InfiniteData<Response[\"data\"], PageParam<Initial, Next, Previous>>, Options[\"select\"]>,\n      InfiniteQueryKey<Paths, Method, Path>,\n      PageParam<Initial, Next, Previous>\n    >,\n    \"queryKey\" | \"queryFn\" | \"placeholderData\"\n  > & {\n    placeholderData?: InfinitePlaceholderData<Response[\"data\"], Response[\"error\"], Paths, Method, Path>;\n    pageParamName?: string;\n  },\n  Initial = unknown,\n  Next = never,\n  Previous = NoPreviousPageParam,\n>(\n  method: Method,\n  url: Path,\n  init: InitWithUnknowns<Init>,\n  options: PageParamSources<Initial, Next, Previous> & Options,\n  queryClient?: QueryClient,\n) => UseInfiniteQueryResult<\n  InferSelectReturnType<InfiniteData<Response[\"data\"], PageParam<Initial, Next, Previous>>, Options[\"select\"]>,\n  Response[\"error\"]\n>;\n\nexport type UseSuspenseQueryMethod<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types\n  Options extends Omit<\n    UseSuspenseQueryOptions<\n      QueryData<Response[\"data\"]>,\n      Response[\"error\"],\n      InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n      QueryKey<Paths, Method, Path>\n    >,\n    \"queryKey\" | \"queryFn\"\n  >,\n>(\n  method: Method,\n  url: Path,\n  ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>\n) => UseSuspenseQueryResult<InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>, Response[\"error\"]>;\n\nexport type UseMutationMethod<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types\n  TOnMutateResult = unknown,\n>(\n  method: Method,\n  url: Path,\n  options?: Omit<\n    UseMutationOptions<Response[\"data\"], Response[\"error\"], Init, TOnMutateResult>,\n    \"mutationKey\" | \"mutationFn\"\n  >,\n  queryClient?: QueryClient,\n) => UseMutationResult<Response[\"data\"], Response[\"error\"], Init, TOnMutateResult>;\n\nexport interface OpenapiQueryClient<Paths extends {}, Media extends MediaType = MediaType> {\n  queryOptions: QueryOptionsFunction<Paths, Media>;\n  useQuery: UseQueryMethod<Paths, Media>;\n  useSuspenseQuery: UseSuspenseQueryMethod<Paths, Media>;\n  useInfiniteQuery: UseInfiniteQueryMethod<Paths, Media>;\n  useMutation: UseMutationMethod<Paths, Media>;\n}\n\nexport type MethodResponse<\n  CreatedClient extends OpenapiQueryClient<any, any>,\n  Method extends HttpMethod,\n  Path extends CreatedClient extends OpenapiQueryClient<infer Paths, infer _Media>\n    ? PathsWithMethod<Paths, Method>\n    : never,\n  Options = object,\n> =\n  CreatedClient extends OpenapiQueryClient<infer Paths extends { [key: string]: any }, infer Media extends MediaType>\n    ? NonNullable<FetchResponse<Paths[Path][Method], Options, Media>[\"data\"]>\n    : never;\n\n/**\n * Throw the error of a failed fetch result. `if (error)` missed two failures: a non-OK response with\n * an empty body (`error` is `undefined`, upstream #2070, #2829) and a falsy error body such as `0`.\n */\nfunction throwIfFailed(result: { error?: unknown; response: Response }): void {\n  if (result.error !== undefined || !result.response.ok) {\n    throw result.error;\n  }\n}\n\n/** The query parameter that carries the page param unless `pageParamName` names another. */\nconst DEFAULT_PAGE_PARAM_NAME = \"cursor\";\n\ninterface PageRequest {\n  readonly pageParamName: string;\n  readonly pageParam: unknown;\n  readonly signal: AbortSignal;\n}\n\n/**\n * The request init of one page. An `undefined` page param (the first page with\n * `initialPageParam: undefined`) is left out instead of being sent as `0` (upstream #2715, #2340,\n * ADR-022), so a cursor API gets no cursor on the first page.\n */\nfunction pageInit(init: unknown, { pageParamName, pageParam, signal }: PageRequest) {\n  const { params, ...rest } = (init ?? {}) as { params?: { query?: DefaultParamsOption } };\n  const page = pageParam === undefined ? {} : { [pageParamName]: pageParam };\n  return { ...rest, signal, params: { ...params, query: { ...params?.query, ...page } } };\n}\n\n// TODO: Add the ability to bring queryClient as argument\nexport default function createClient<Paths extends {}, Media extends MediaType = MediaType>(\n  client: FetchClient<Paths, Media>,\n): OpenapiQueryClient<Paths, Media> {\n  const queryFn = async <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>>({\n    queryKey,\n    signal,\n  }: QueryFunctionContext<QueryKey<Paths, Method, Path>>) => {\n    // While `Path` is generic, TypeScript cannot work out that the key is a tuple: the init is a\n    // conditional type per operation (`MaybeOptionalInit`), and the key's type waits for it.\n    const [method, path, init] = queryKey as readonly [Method, Path, unknown?];\n    const mth = method.toUpperCase() as Uppercase<typeof method>;\n    const fn = client[mth] as ClientMethod<Paths, typeof method, Media>;\n    const result = await fn(path, { signal, ...(init as any) }); // TODO: find a way to avoid as any\n    throwIfFailed(result);\n    // TanStack Query rejects `undefined` query data. The fetch client gives `undefined` for every\n    // success without a body: a 204, `Content-Length: 0`, an empty chunked body, a HEAD request\n    // (upstream #2234). A parsed body is never `undefined`, so this changes nothing else.\n    return result.data ?? null;\n  };\n\n  const queryOptions: QueryOptionsFunction<Paths, Media> = (method, path, ...[init, options]) => ({\n    queryKey: (init === undefined ? ([method, path] as const) : ([method, path, init] as const)) as DataTag<\n      QueryKey<Paths, typeof method, typeof path>,\n      any,\n      any\n    >,\n    queryFn,\n    ...options,\n  });\n\n  return {\n    queryOptions,\n    useQuery: (method, path, ...[init, options, queryClient]) =>\n      useQuery(queryOptions(method, path, init as InitWithUnknowns<typeof init>, options), queryClient),\n    useSuspenseQuery: (method, path, ...[init, options, queryClient]) =>\n      useSuspenseQuery(queryOptions(method, path, init as InitWithUnknowns<typeof init>, options), queryClient),\n    useInfiniteQuery: (method, path, init, options, queryClient) => {\n      const { pageParamName = DEFAULT_PAGE_PARAM_NAME, placeholderData, ...restOptions } = options;\n      const { queryKey } = queryOptions(method, path, init);\n      const mth = method.toUpperCase() as Uppercase<typeof method>;\n      const fn = client[mth] as ClientMethod<Paths, typeof method, Media>;\n      return useInfiniteQuery(\n        {\n          queryKey: [...queryKey, INFINITE_QUERY_KEY_MARKER] as const,\n          // The request comes from the arguments; the key only identifies the cache entry.\n          queryFn: async ({ pageParam, signal }) => {\n            const result = await fn(path, pageInit(init, { pageParamName, pageParam, signal }) as any);\n            throwIfFailed(result);\n            // An empty page stays `undefined`, as in upstream: TanStack Query rejects only\n            // `undefined` query data, and the infinite query data is the `{ pages }` object.\n            return result.data;\n          },\n          ...restOptions,\n          // Typed with an `unknown` page param for the caller (`InfinitePlaceholderData`). TanStack\n          // passes the previous data of this query, with its own page params, and takes it back.\n          placeholderData: placeholderData as any,\n        },\n        queryClient,\n      );\n    },\n    useMutation: (method, path, options, queryClient) =>\n      useMutation(\n        {\n          mutationKey: [method, path],\n          mutationFn: async (init) => {\n            const mth = method.toUpperCase() as Uppercase<typeof method>;\n            const fn = client[mth] as ClientMethod<Paths, typeof method, Media>;\n            const result = await fn(path, init as InitWithUnknowns<typeof init>);\n            throwIfFailed(result);\n            // TanStack Query accepts `undefined` mutation data, so a success without a body stays\n            // `undefined`, as in upstream; only query data needs `null` (upstream #2234). The cast\n            // only bridges the generic types: `Response[\"data\"]` still has `undefined` for an\n            // operation with a response without a body.\n            const { data } = result;\n            return data as Exclude<typeof data, undefined>;\n          },\n          ...options,\n        },\n        queryClient,\n      ),\n  };\n}\n"],"names":["useQuery","useSuspenseQuery","useInfiniteQuery","useMutation"],"mappings":"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"}

package/dist/index.d.cts

@@ -0,0 +1,52 @@
+import { UseQueryOptions, DataTag, SkipToken, QueryClient, UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult, UseInfiniteQueryOptions, InfiniteData, UseInfiniteQueryResult, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import { MaybeOptionalInit, FetchResponse, PathOperation, IsInitOptional, Client } from 'openapi-typesafe-fetch';
+import { HttpMethod, PathsWithMethod, MediaType } from 'openapi-typesafe-helpers';
+
+type InferSelectReturnType<TData, TSelect> = TSelect extends (data: TData) => infer R ? R : TData;
+type QueryData<Data> = undefined extends Data ? Exclude<Data, undefined> | null : Data;
+type InitWithUnknowns<Init> = Init & {
+    [key: string]: unknown;
+};
+type InitArguments<Init, Rest extends unknown[]> = IsInitOptional<Init> extends true ? [InitWithUnknowns<Init>?, ...Rest] : [InitWithUnknowns<Init>, ...Rest];
+type QueryKey<Paths extends {}, Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init = MaybeOptionalInit<Paths[Path], Method>> = Init extends undefined ? readonly [Method, Path] : readonly [Method, Path, Init];
+declare const INFINITE_QUERY_KEY_MARKER = "infinite";
+type InfiniteQueryKey<Paths extends {}, Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>> = readonly [...QueryKey<Paths, Method, Path>, typeof INFINITE_QUERY_KEY_MARKER];
+type QueryOptionsFunction<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryKey" | "queryFn">>(method: Method, path: Path, ...[init, options]: InitArguments<Init, [Options?]>) => NoInfer<Omit<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryFn" | "queryKey"> & {
+    queryKey: DataTag<QueryKey<Paths, Method, Path>, QueryData<Response["data"]>, Response["error"]>;
+    queryFn: Exclude<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>["queryFn"], SkipToken | undefined>;
+}>;
+type UseQueryMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryKey" | "queryFn">>(method: Method, url: Path, ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>) => UseQueryResult<InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, Response["error"]>;
+type PageParam<Initial, Next, Previous> = IsUntyped<Next> extends true ? unknown : [Previous] extends [NoPreviousPageParam] ? NullishToUnknown<Initial | NonNullable<Next>> : IsUntyped<Previous> extends true ? unknown : NullishToUnknown<Initial | NonNullable<Next> | NonNullable<Previous>>;
+declare const NO_PREVIOUS_PAGE_PARAM: unique symbol;
+type NoPreviousPageParam = typeof NO_PREVIOUS_PAGE_PARAM;
+type IsUntyped<T> = [T] extends [never] ? true : unknown extends T ? true : false;
+type NullishToUnknown<T> = [T] extends [undefined | null] ? unknown : T;
+type PageParamFunction<Result> = (...args: never) => Result;
+interface PageParamSources<Initial, Next, Previous> {
+    initialPageParam: Initial;
+    getNextPageParam: PageParamFunction<Next>;
+    getPreviousPageParam?: PageParamFunction<Previous>;
+}
+type InfinitePlaceholderData<Data, Error, Paths extends {}, Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>> = UseInfiniteQueryOptions<Data, Error, InfiniteData<Data, unknown>, InfiniteQueryKey<Paths, Method, Path>, unknown>["placeholderData"];
+type UseInfiniteQueryMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseInfiniteQueryOptions<Response["data"], Response["error"], InferSelectReturnType<InfiniteData<Response["data"], PageParam<Initial, Next, Previous>>, Options["select"]>, InfiniteQueryKey<Paths, Method, Path>, PageParam<Initial, Next, Previous>>, "queryKey" | "queryFn" | "placeholderData"> & {
+    placeholderData?: InfinitePlaceholderData<Response["data"], Response["error"], Paths, Method, Path>;
+    pageParamName?: string;
+}, Initial = unknown, Next = never, Previous = NoPreviousPageParam>(method: Method, url: Path, init: InitWithUnknowns<Init>, options: PageParamSources<Initial, Next, Previous> & Options, queryClient?: QueryClient) => UseInfiniteQueryResult<InferSelectReturnType<InfiniteData<Response["data"], PageParam<Initial, Next, Previous>>, Options["select"]>, Response["error"]>;
+type UseSuspenseQueryMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseSuspenseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryKey" | "queryFn">>(method: Method, url: Path, ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>) => UseSuspenseQueryResult<InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, Response["error"]>;
+type UseMutationMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, TOnMutateResult = unknown>(method: Method, url: Path, options?: Omit<UseMutationOptions<Response["data"], Response["error"], Init, TOnMutateResult>, "mutationKey" | "mutationFn">, queryClient?: QueryClient) => UseMutationResult<Response["data"], Response["error"], Init, TOnMutateResult>;
+interface OpenapiQueryClient<Paths extends {}, Media extends MediaType = MediaType> {
+    queryOptions: QueryOptionsFunction<Paths, Media>;
+    useQuery: UseQueryMethod<Paths, Media>;
+    useSuspenseQuery: UseSuspenseQueryMethod<Paths, Media>;
+    useInfiniteQuery: UseInfiniteQueryMethod<Paths, Media>;
+    useMutation: UseMutationMethod<Paths, Media>;
+}
+type MethodResponse<CreatedClient extends OpenapiQueryClient<any, any>, Method extends HttpMethod, Path extends CreatedClient extends OpenapiQueryClient<infer Paths, infer _Media> ? PathsWithMethod<Paths, Method> : never, Options = object> = CreatedClient extends OpenapiQueryClient<infer Paths extends {
+    [key: string]: any;
+}, infer Media extends MediaType> ? NonNullable<FetchResponse<Paths[Path][Method], Options, Media>["data"]> : never;
+declare function createClient<Paths extends {}, Media extends MediaType = MediaType>(client: Client<Paths, Media>): OpenapiQueryClient<Paths, Media>;
+
+declare namespace createClient {
+  export { InfiniteQueryKey, MethodResponse, OpenapiQueryClient, QueryKey, QueryOptionsFunction, UseInfiniteQueryMethod, UseMutationMethod, UseQueryMethod, UseSuspenseQueryMethod };
+}
+export = createClient;

package/dist/index.d.mts

@@ -0,0 +1,50 @@
+import { UseQueryOptions, DataTag, SkipToken, QueryClient, UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult, UseInfiniteQueryOptions, InfiniteData, UseInfiniteQueryResult, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import { MaybeOptionalInit, FetchResponse, PathOperation, IsInitOptional, Client } from 'openapi-typesafe-fetch';
+import { HttpMethod, PathsWithMethod, MediaType } from 'openapi-typesafe-helpers';
+
+type InferSelectReturnType<TData, TSelect> = TSelect extends (data: TData) => infer R ? R : TData;
+type QueryData<Data> = undefined extends Data ? Exclude<Data, undefined> | null : Data;
+type InitWithUnknowns<Init> = Init & {
+    [key: string]: unknown;
+};
+type InitArguments<Init, Rest extends unknown[]> = IsInitOptional<Init> extends true ? [InitWithUnknowns<Init>?, ...Rest] : [InitWithUnknowns<Init>, ...Rest];
+type QueryKey<Paths extends {}, Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init = MaybeOptionalInit<Paths[Path], Method>> = Init extends undefined ? readonly [Method, Path] : readonly [Method, Path, Init];
+declare const INFINITE_QUERY_KEY_MARKER = "infinite";
+type InfiniteQueryKey<Paths extends {}, Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>> = readonly [...QueryKey<Paths, Method, Path>, typeof INFINITE_QUERY_KEY_MARKER];
+type QueryOptionsFunction<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryKey" | "queryFn">>(method: Method, path: Path, ...[init, options]: InitArguments<Init, [Options?]>) => NoInfer<Omit<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryFn" | "queryKey"> & {
+    queryKey: DataTag<QueryKey<Paths, Method, Path>, QueryData<Response["data"]>, Response["error"]>;
+    queryFn: Exclude<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>["queryFn"], SkipToken | undefined>;
+}>;
+type UseQueryMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryKey" | "queryFn">>(method: Method, url: Path, ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>) => UseQueryResult<InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, Response["error"]>;
+type PageParam<Initial, Next, Previous> = IsUntyped<Next> extends true ? unknown : [Previous] extends [NoPreviousPageParam] ? NullishToUnknown<Initial | NonNullable<Next>> : IsUntyped<Previous> extends true ? unknown : NullishToUnknown<Initial | NonNullable<Next> | NonNullable<Previous>>;
+declare const NO_PREVIOUS_PAGE_PARAM: unique symbol;
+type NoPreviousPageParam = typeof NO_PREVIOUS_PAGE_PARAM;
+type IsUntyped<T> = [T] extends [never] ? true : unknown extends T ? true : false;
+type NullishToUnknown<T> = [T] extends [undefined | null] ? unknown : T;
+type PageParamFunction<Result> = (...args: never) => Result;
+interface PageParamSources<Initial, Next, Previous> {
+    initialPageParam: Initial;
+    getNextPageParam: PageParamFunction<Next>;
+    getPreviousPageParam?: PageParamFunction<Previous>;
+}
+type InfinitePlaceholderData<Data, Error, Paths extends {}, Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>> = UseInfiniteQueryOptions<Data, Error, InfiniteData<Data, unknown>, InfiniteQueryKey<Paths, Method, Path>, unknown>["placeholderData"];
+type UseInfiniteQueryMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseInfiniteQueryOptions<Response["data"], Response["error"], InferSelectReturnType<InfiniteData<Response["data"], PageParam<Initial, Next, Previous>>, Options["select"]>, InfiniteQueryKey<Paths, Method, Path>, PageParam<Initial, Next, Previous>>, "queryKey" | "queryFn" | "placeholderData"> & {
+    placeholderData?: InfinitePlaceholderData<Response["data"], Response["error"], Paths, Method, Path>;
+    pageParamName?: string;
+}, Initial = unknown, Next = never, Previous = NoPreviousPageParam>(method: Method, url: Path, init: InitWithUnknowns<Init>, options: PageParamSources<Initial, Next, Previous> & Options, queryClient?: QueryClient) => UseInfiniteQueryResult<InferSelectReturnType<InfiniteData<Response["data"], PageParam<Initial, Next, Previous>>, Options["select"]>, Response["error"]>;
+type UseSuspenseQueryMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseSuspenseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryKey" | "queryFn">>(method: Method, url: Path, ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>) => UseSuspenseQueryResult<InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, Response["error"]>;
+type UseMutationMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, TOnMutateResult = unknown>(method: Method, url: Path, options?: Omit<UseMutationOptions<Response["data"], Response["error"], Init, TOnMutateResult>, "mutationKey" | "mutationFn">, queryClient?: QueryClient) => UseMutationResult<Response["data"], Response["error"], Init, TOnMutateResult>;
+interface OpenapiQueryClient<Paths extends {}, Media extends MediaType = MediaType> {
+    queryOptions: QueryOptionsFunction<Paths, Media>;
+    useQuery: UseQueryMethod<Paths, Media>;
+    useSuspenseQuery: UseSuspenseQueryMethod<Paths, Media>;
+    useInfiniteQuery: UseInfiniteQueryMethod<Paths, Media>;
+    useMutation: UseMutationMethod<Paths, Media>;
+}
+type MethodResponse<CreatedClient extends OpenapiQueryClient<any, any>, Method extends HttpMethod, Path extends CreatedClient extends OpenapiQueryClient<infer Paths, infer _Media> ? PathsWithMethod<Paths, Method> : never, Options = object> = CreatedClient extends OpenapiQueryClient<infer Paths extends {
+    [key: string]: any;
+}, infer Media extends MediaType> ? NonNullable<FetchResponse<Paths[Path][Method], Options, Media>["data"]> : never;
+declare function createClient<Paths extends {}, Media extends MediaType = MediaType>(client: Client<Paths, Media>): OpenapiQueryClient<Paths, Media>;
+
+export { createClient as default };
+export type { InfiniteQueryKey, MethodResponse, OpenapiQueryClient, QueryKey, QueryOptionsFunction, UseInfiniteQueryMethod, UseMutationMethod, UseQueryMethod, UseSuspenseQueryMethod };

package/dist/index.d.ts

@@ -0,0 +1,50 @@
+import { UseQueryOptions, DataTag, SkipToken, QueryClient, UseQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult, UseInfiniteQueryOptions, InfiniteData, UseInfiniteQueryResult, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import { MaybeOptionalInit, FetchResponse, PathOperation, IsInitOptional, Client } from 'openapi-typesafe-fetch';
+import { HttpMethod, PathsWithMethod, MediaType } from 'openapi-typesafe-helpers';
+
+type InferSelectReturnType<TData, TSelect> = TSelect extends (data: TData) => infer R ? R : TData;
+type QueryData<Data> = undefined extends Data ? Exclude<Data, undefined> | null : Data;
+type InitWithUnknowns<Init> = Init & {
+    [key: string]: unknown;
+};
+type InitArguments<Init, Rest extends unknown[]> = IsInitOptional<Init> extends true ? [InitWithUnknowns<Init>?, ...Rest] : [InitWithUnknowns<Init>, ...Rest];
+type QueryKey<Paths extends {}, Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init = MaybeOptionalInit<Paths[Path], Method>> = Init extends undefined ? readonly [Method, Path] : readonly [Method, Path, Init];
+declare const INFINITE_QUERY_KEY_MARKER = "infinite";
+type InfiniteQueryKey<Paths extends {}, Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>> = readonly [...QueryKey<Paths, Method, Path>, typeof INFINITE_QUERY_KEY_MARKER];
+type QueryOptionsFunction<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryKey" | "queryFn">>(method: Method, path: Path, ...[init, options]: InitArguments<Init, [Options?]>) => NoInfer<Omit<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryFn" | "queryKey"> & {
+    queryKey: DataTag<QueryKey<Paths, Method, Path>, QueryData<Response["data"]>, Response["error"]>;
+    queryFn: Exclude<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>["queryFn"], SkipToken | undefined>;
+}>;
+type UseQueryMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryKey" | "queryFn">>(method: Method, url: Path, ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>) => UseQueryResult<InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, Response["error"]>;
+type PageParam<Initial, Next, Previous> = IsUntyped<Next> extends true ? unknown : [Previous] extends [NoPreviousPageParam] ? NullishToUnknown<Initial | NonNullable<Next>> : IsUntyped<Previous> extends true ? unknown : NullishToUnknown<Initial | NonNullable<Next> | NonNullable<Previous>>;
+declare const NO_PREVIOUS_PAGE_PARAM: unique symbol;
+type NoPreviousPageParam = typeof NO_PREVIOUS_PAGE_PARAM;
+type IsUntyped<T> = [T] extends [never] ? true : unknown extends T ? true : false;
+type NullishToUnknown<T> = [T] extends [undefined | null] ? unknown : T;
+type PageParamFunction<Result> = (...args: never) => Result;
+interface PageParamSources<Initial, Next, Previous> {
+    initialPageParam: Initial;
+    getNextPageParam: PageParamFunction<Next>;
+    getPreviousPageParam?: PageParamFunction<Previous>;
+}
+type InfinitePlaceholderData<Data, Error, Paths extends {}, Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>> = UseInfiniteQueryOptions<Data, Error, InfiniteData<Data, unknown>, InfiniteQueryKey<Paths, Method, Path>, unknown>["placeholderData"];
+type UseInfiniteQueryMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseInfiniteQueryOptions<Response["data"], Response["error"], InferSelectReturnType<InfiniteData<Response["data"], PageParam<Initial, Next, Previous>>, Options["select"]>, InfiniteQueryKey<Paths, Method, Path>, PageParam<Initial, Next, Previous>>, "queryKey" | "queryFn" | "placeholderData"> & {
+    placeholderData?: InfinitePlaceholderData<Response["data"], Response["error"], Paths, Method, Path>;
+    pageParamName?: string;
+}, Initial = unknown, Next = never, Previous = NoPreviousPageParam>(method: Method, url: Path, init: InitWithUnknowns<Init>, options: PageParamSources<Initial, Next, Previous> & Options, queryClient?: QueryClient) => UseInfiniteQueryResult<InferSelectReturnType<InfiniteData<Response["data"], PageParam<Initial, Next, Previous>>, Options["select"]>, Response["error"]>;
+type UseSuspenseQueryMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, Options extends Omit<UseSuspenseQueryOptions<QueryData<Response["data"]>, Response["error"], InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, QueryKey<Paths, Method, Path>>, "queryKey" | "queryFn">>(method: Method, url: Path, ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>) => UseSuspenseQueryResult<InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, Response["error"]>;
+type UseMutationMethod<Paths extends {}, Media extends MediaType> = <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>, Init extends MaybeOptionalInit<Paths[Path], Method>, Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, TOnMutateResult = unknown>(method: Method, url: Path, options?: Omit<UseMutationOptions<Response["data"], Response["error"], Init, TOnMutateResult>, "mutationKey" | "mutationFn">, queryClient?: QueryClient) => UseMutationResult<Response["data"], Response["error"], Init, TOnMutateResult>;
+interface OpenapiQueryClient<Paths extends {}, Media extends MediaType = MediaType> {
+    queryOptions: QueryOptionsFunction<Paths, Media>;
+    useQuery: UseQueryMethod<Paths, Media>;
+    useSuspenseQuery: UseSuspenseQueryMethod<Paths, Media>;
+    useInfiniteQuery: UseInfiniteQueryMethod<Paths, Media>;
+    useMutation: UseMutationMethod<Paths, Media>;
+}
+type MethodResponse<CreatedClient extends OpenapiQueryClient<any, any>, Method extends HttpMethod, Path extends CreatedClient extends OpenapiQueryClient<infer Paths, infer _Media> ? PathsWithMethod<Paths, Method> : never, Options = object> = CreatedClient extends OpenapiQueryClient<infer Paths extends {
+    [key: string]: any;
+}, infer Media extends MediaType> ? NonNullable<FetchResponse<Paths[Path][Method], Options, Media>["data"]> : never;
+declare function createClient<Paths extends {}, Media extends MediaType = MediaType>(client: Client<Paths, Media>): OpenapiQueryClient<Paths, Media>;
+
+export { createClient as default };
+export type { InfiniteQueryKey, MethodResponse, OpenapiQueryClient, QueryKey, QueryOptionsFunction, UseInfiniteQueryMethod, UseMutationMethod, UseQueryMethod, UseSuspenseQueryMethod };

package/dist/index.mjs

@@ -0,0 +1,77 @@
+import { useMutation, useInfiniteQuery, useSuspenseQuery, useQuery } from '@tanstack/react-query';
+
+const INFINITE_QUERY_KEY_MARKER = "infinite";
+function throwIfFailed(result) {
+  if (result.error !== void 0 || !result.response.ok) {
+    throw result.error;
+  }
+}
+const DEFAULT_PAGE_PARAM_NAME = "cursor";
+function pageInit(init, { pageParamName, pageParam, signal }) {
+  const { params, ...rest } = init ?? {};
+  const page = pageParam === void 0 ? {} : { [pageParamName]: pageParam };
+  return { ...rest, signal, params: { ...params, query: { ...params?.query, ...page } } };
+}
+function createClient(client) {
+  const queryFn = async ({
+    queryKey,
+    signal
+  }) => {
+    const [method, path, init] = queryKey;
+    const mth = method.toUpperCase();
+    const fn = client[mth];
+    const result = await fn(path, { signal, ...init });
+    throwIfFailed(result);
+    return result.data ?? null;
+  };
+  const queryOptions = (method, path, ...[init, options]) => ({
+    queryKey: init === void 0 ? [method, path] : [method, path, init],
+    queryFn,
+    ...options
+  });
+  return {
+    queryOptions,
+    useQuery: (method, path, ...[init, options, queryClient]) => useQuery(queryOptions(method, path, init, options), queryClient),
+    useSuspenseQuery: (method, path, ...[init, options, queryClient]) => useSuspenseQuery(queryOptions(method, path, init, options), queryClient),
+    useInfiniteQuery: (method, path, init, options, queryClient) => {
+      const { pageParamName = DEFAULT_PAGE_PARAM_NAME, placeholderData, ...restOptions } = options;
+      const { queryKey } = queryOptions(method, path, init);
+      const mth = method.toUpperCase();
+      const fn = client[mth];
+      return useInfiniteQuery(
+        {
+          queryKey: [...queryKey, INFINITE_QUERY_KEY_MARKER],
+          // The request comes from the arguments; the key only identifies the cache entry.
+          queryFn: async ({ pageParam, signal }) => {
+            const result = await fn(path, pageInit(init, { pageParamName, pageParam, signal }));
+            throwIfFailed(result);
+            return result.data;
+          },
+          ...restOptions,
+          // Typed with an `unknown` page param for the caller (`InfinitePlaceholderData`). TanStack
+          // passes the previous data of this query, with its own page params, and takes it back.
+          placeholderData
+        },
+        queryClient
+      );
+    },
+    useMutation: (method, path, options, queryClient) => useMutation(
+      {
+        mutationKey: [method, path],
+        mutationFn: async (init) => {
+          const mth = method.toUpperCase();
+          const fn = client[mth];
+          const result = await fn(path, init);
+          throwIfFailed(result);
+          const { data } = result;
+          return data;
+        },
+        ...options
+      },
+      queryClient
+    )
+  };
+}
+
+export { createClient as default };
+//# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sources":["../src/index.ts"],"sourcesContent":["import {\n  type DataTag,\n  type InfiniteData,\n  type QueryClient,\n  type QueryFunctionContext,\n  type SkipToken,\n  type UseInfiniteQueryOptions,\n  type UseInfiniteQueryResult,\n  type UseMutationOptions,\n  type UseMutationResult,\n  type UseQueryOptions,\n  type UseQueryResult,\n  type UseSuspenseQueryOptions,\n  type UseSuspenseQueryResult,\n  useInfiniteQuery,\n  useMutation,\n  useQuery,\n  useSuspenseQuery,\n} from \"@tanstack/react-query\";\nimport type {\n  ClientMethod,\n  DefaultParamsOption,\n  Client as FetchClient,\n  FetchResponse,\n  IsInitOptional,\n  MaybeOptionalInit,\n  PathOperation,\n} from \"openapi-typesafe-fetch\";\nimport type { HttpMethod, MediaType, PathsWithMethod } from \"openapi-typesafe-helpers\";\n\n// Helper type to dynamically infer the type from the `select` property\ntype InferSelectReturnType<TData, TSelect> = TSelect extends (data: TData) => infer R ? R : TData;\n\n/**\n * Query data of a response type: a success without a body is `undefined` in the fetch client and\n * `null` in the query, as `queryFn` resolves it (upstream #2234, #2464).\n */\ntype QueryData<Data> = undefined extends Data ? Exclude<Data, undefined> | null : Data;\n\ntype InitWithUnknowns<Init> = Init & { [key: string]: unknown };\n\n/**\n * The arguments after the path: the init, required when the operation requires a parameter or a\n * body, then `Rest`. `IsInitOptional` keeps the init optional in\n * `Parameters<typeof $api.queryOptions>`, where it is the union of all inits (upstream #2178).\n */\ntype InitArguments<Init, Rest extends unknown[]> =\n  IsInitOptional<Init> extends true ? [InitWithUnknowns<Init>?, ...Rest] : [InitWithUnknowns<Init>, ...Rest];\n\nexport type QueryKey<\n  Paths extends {},\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init = MaybeOptionalInit<Paths[Path], Method>,\n> = Init extends undefined ? readonly [Method, Path] : readonly [Method, Path, Init];\n\n/**\n * The last element of an infinite query's key. `useQuery` and `useInfiniteQuery` cache different\n * data (`TData` and `InfiniteData<TData>`), so the same request must not share one key (upstream\n * #2184, ADR-022). A prefix such as `[method, path]` still matches both. Not exported: a runtime\n * named export next to the default export would change what `require()` returns.\n */\nconst INFINITE_QUERY_KEY_MARKER = \"infinite\";\n\nexport type InfiniteQueryKey<\n  Paths extends {},\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n> = readonly [...QueryKey<Paths, Method, Path>, typeof INFINITE_QUERY_KEY_MARKER];\n\nexport type QueryOptionsFunction<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types\n  Options extends Omit<\n    UseQueryOptions<\n      QueryData<Response[\"data\"]>,\n      Response[\"error\"],\n      InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n      QueryKey<Paths, Method, Path>\n    >,\n    \"queryKey\" | \"queryFn\"\n  >,\n>(\n  method: Method,\n  path: Path,\n  ...[init, options]: InitArguments<Init, [Options?]>\n) => NoInfer<\n  Omit<\n    UseQueryOptions<\n      QueryData<Response[\"data\"]>,\n      Response[\"error\"],\n      InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n      QueryKey<Paths, Method, Path>\n    >,\n    \"queryFn\" | \"queryKey\"\n  > & {\n    queryKey: DataTag<QueryKey<Paths, Method, Path>, QueryData<Response[\"data\"]>, Response[\"error\"]>;\n    queryFn: Exclude<\n      UseQueryOptions<\n        QueryData<Response[\"data\"]>,\n        Response[\"error\"],\n        InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n        QueryKey<Paths, Method, Path>\n      >[\"queryFn\"],\n      SkipToken | undefined\n    >;\n  }\n>;\n\nexport type UseQueryMethod<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types\n  Options extends Omit<\n    UseQueryOptions<\n      QueryData<Response[\"data\"]>,\n      Response[\"error\"],\n      InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n      QueryKey<Paths, Method, Path>\n    >,\n    \"queryKey\" | \"queryFn\"\n  >,\n>(\n  method: Method,\n  url: Path,\n  ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>\n) => UseQueryResult<InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>, Response[\"error\"]>;\n\n/**\n * The type of the page params: the initial one and the ones `getNextPageParam` and\n * `getPreviousPageParam` return (upstream #2458). It was `unknown`. It stays `unknown` when a\n * return type is untyped, so code that compiled still compiles (roadmap §3): TypeScript cannot\n * infer the return type of a callback that computes it from an unannotated `lastPageParam`,\n * whose type depends on that return type, and gives `never` or `unknown`.\n */\ntype PageParam<Initial, Next, Previous> =\n  IsUntyped<Next> extends true\n    ? unknown\n    : [Previous] extends [NoPreviousPageParam]\n      ? NullishToUnknown<Initial | NonNullable<Next>>\n      : IsUntyped<Previous> extends true\n        ? unknown\n        : NullishToUnknown<Initial | NonNullable<Next> | NonNullable<Previous>>;\n\n/** The `Previous` type parameter when the options have no `getPreviousPageParam`. */\ndeclare const NO_PREVIOUS_PAGE_PARAM: unique symbol;\ntype NoPreviousPageParam = typeof NO_PREVIOUS_PAGE_PARAM;\n\ntype IsUntyped<T> = [T] extends [never] ? true : unknown extends T ? true : false;\n\n/** Only `undefined` or `null` names no type: a cursor API's `initialPageParam: undefined`. */\ntype NullishToUnknown<T> = [T] extends [undefined | null] ? unknown : T;\n\n/** Read only for the return type; `never` arguments add no inference for TanStack's page param. */\ntype PageParamFunction<Result> = (...args: never) => Result;\n\n/**\n * Inference sites of the page param types. Intersected before `Options`, so TanStack's own\n * inference in the implementation reads the full signatures of `Options`.\n */\ninterface PageParamSources<Initial, Next, Previous> {\n  initialPageParam: Initial;\n  getNextPageParam: PageParamFunction<Next>;\n  getPreviousPageParam?: PageParamFunction<Previous>;\n}\n\n/**\n * `placeholderData` of `useInfiniteQuery`, with an `unknown` page param as before: TypeScript types\n * a `(previousData) => previousData` callback while it still infers the page param, so it got\n * `unknown` there and failed against the typed page param.\n */\ntype InfinitePlaceholderData<\n  Data,\n  Error,\n  Paths extends {},\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n> = UseInfiniteQueryOptions<\n  Data,\n  Error,\n  InfiniteData<Data, unknown>,\n  InfiniteQueryKey<Paths, Method, Path>,\n  unknown\n>[\"placeholderData\"];\n\nexport type UseInfiniteQueryMethod<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>,\n  Options extends Omit<\n    UseInfiniteQueryOptions<\n      Response[\"data\"],\n      Response[\"error\"],\n      InferSelectReturnType<InfiniteData<Response[\"data\"], PageParam<Initial, Next, Previous>>, Options[\"select\"]>,\n      InfiniteQueryKey<Paths, Method, Path>,\n      PageParam<Initial, Next, Previous>\n    >,\n    \"queryKey\" | \"queryFn\" | \"placeholderData\"\n  > & {\n    placeholderData?: InfinitePlaceholderData<Response[\"data\"], Response[\"error\"], Paths, Method, Path>;\n    pageParamName?: string;\n  },\n  Initial = unknown,\n  Next = never,\n  Previous = NoPreviousPageParam,\n>(\n  method: Method,\n  url: Path,\n  init: InitWithUnknowns<Init>,\n  options: PageParamSources<Initial, Next, Previous> & Options,\n  queryClient?: QueryClient,\n) => UseInfiniteQueryResult<\n  InferSelectReturnType<InfiniteData<Response[\"data\"], PageParam<Initial, Next, Previous>>, Options[\"select\"]>,\n  Response[\"error\"]\n>;\n\nexport type UseSuspenseQueryMethod<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types\n  Options extends Omit<\n    UseSuspenseQueryOptions<\n      QueryData<Response[\"data\"]>,\n      Response[\"error\"],\n      InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>,\n      QueryKey<Paths, Method, Path>\n    >,\n    \"queryKey\" | \"queryFn\"\n  >,\n>(\n  method: Method,\n  url: Path,\n  ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>\n) => UseSuspenseQueryResult<InferSelectReturnType<QueryData<Response[\"data\"]>, Options[\"select\"]>, Response[\"error\"]>;\n\nexport type UseMutationMethod<Paths extends {}, Media extends MediaType> = <\n  Method extends HttpMethod,\n  Path extends PathsWithMethod<Paths, Method>,\n  Init extends MaybeOptionalInit<Paths[Path], Method>,\n  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types\n  TOnMutateResult = unknown,\n>(\n  method: Method,\n  url: Path,\n  options?: Omit<\n    UseMutationOptions<Response[\"data\"], Response[\"error\"], Init, TOnMutateResult>,\n    \"mutationKey\" | \"mutationFn\"\n  >,\n  queryClient?: QueryClient,\n) => UseMutationResult<Response[\"data\"], Response[\"error\"], Init, TOnMutateResult>;\n\nexport interface OpenapiQueryClient<Paths extends {}, Media extends MediaType = MediaType> {\n  queryOptions: QueryOptionsFunction<Paths, Media>;\n  useQuery: UseQueryMethod<Paths, Media>;\n  useSuspenseQuery: UseSuspenseQueryMethod<Paths, Media>;\n  useInfiniteQuery: UseInfiniteQueryMethod<Paths, Media>;\n  useMutation: UseMutationMethod<Paths, Media>;\n}\n\nexport type MethodResponse<\n  CreatedClient extends OpenapiQueryClient<any, any>,\n  Method extends HttpMethod,\n  Path extends CreatedClient extends OpenapiQueryClient<infer Paths, infer _Media>\n    ? PathsWithMethod<Paths, Method>\n    : never,\n  Options = object,\n> =\n  CreatedClient extends OpenapiQueryClient<infer Paths extends { [key: string]: any }, infer Media extends MediaType>\n    ? NonNullable<FetchResponse<Paths[Path][Method], Options, Media>[\"data\"]>\n    : never;\n\n/**\n * Throw the error of a failed fetch result. `if (error)` missed two failures: a non-OK response with\n * an empty body (`error` is `undefined`, upstream #2070, #2829) and a falsy error body such as `0`.\n */\nfunction throwIfFailed(result: { error?: unknown; response: Response }): void {\n  if (result.error !== undefined || !result.response.ok) {\n    throw result.error;\n  }\n}\n\n/** The query parameter that carries the page param unless `pageParamName` names another. */\nconst DEFAULT_PAGE_PARAM_NAME = \"cursor\";\n\ninterface PageRequest {\n  readonly pageParamName: string;\n  readonly pageParam: unknown;\n  readonly signal: AbortSignal;\n}\n\n/**\n * The request init of one page. An `undefined` page param (the first page with\n * `initialPageParam: undefined`) is left out instead of being sent as `0` (upstream #2715, #2340,\n * ADR-022), so a cursor API gets no cursor on the first page.\n */\nfunction pageInit(init: unknown, { pageParamName, pageParam, signal }: PageRequest) {\n  const { params, ...rest } = (init ?? {}) as { params?: { query?: DefaultParamsOption } };\n  const page = pageParam === undefined ? {} : { [pageParamName]: pageParam };\n  return { ...rest, signal, params: { ...params, query: { ...params?.query, ...page } } };\n}\n\n// TODO: Add the ability to bring queryClient as argument\nexport default function createClient<Paths extends {}, Media extends MediaType = MediaType>(\n  client: FetchClient<Paths, Media>,\n): OpenapiQueryClient<Paths, Media> {\n  const queryFn = async <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>>({\n    queryKey,\n    signal,\n  }: QueryFunctionContext<QueryKey<Paths, Method, Path>>) => {\n    // While `Path` is generic, TypeScript cannot work out that the key is a tuple: the init is a\n    // conditional type per operation (`MaybeOptionalInit`), and the key's type waits for it.\n    const [method, path, init] = queryKey as readonly [Method, Path, unknown?];\n    const mth = method.toUpperCase() as Uppercase<typeof method>;\n    const fn = client[mth] as ClientMethod<Paths, typeof method, Media>;\n    const result = await fn(path, { signal, ...(init as any) }); // TODO: find a way to avoid as any\n    throwIfFailed(result);\n    // TanStack Query rejects `undefined` query data. The fetch client gives `undefined` for every\n    // success without a body: a 204, `Content-Length: 0`, an empty chunked body, a HEAD request\n    // (upstream #2234). A parsed body is never `undefined`, so this changes nothing else.\n    return result.data ?? null;\n  };\n\n  const queryOptions: QueryOptionsFunction<Paths, Media> = (method, path, ...[init, options]) => ({\n    queryKey: (init === undefined ? ([method, path] as const) : ([method, path, init] as const)) as DataTag<\n      QueryKey<Paths, typeof method, typeof path>,\n      any,\n      any\n    >,\n    queryFn,\n    ...options,\n  });\n\n  return {\n    queryOptions,\n    useQuery: (method, path, ...[init, options, queryClient]) =>\n      useQuery(queryOptions(method, path, init as InitWithUnknowns<typeof init>, options), queryClient),\n    useSuspenseQuery: (method, path, ...[init, options, queryClient]) =>\n      useSuspenseQuery(queryOptions(method, path, init as InitWithUnknowns<typeof init>, options), queryClient),\n    useInfiniteQuery: (method, path, init, options, queryClient) => {\n      const { pageParamName = DEFAULT_PAGE_PARAM_NAME, placeholderData, ...restOptions } = options;\n      const { queryKey } = queryOptions(method, path, init);\n      const mth = method.toUpperCase() as Uppercase<typeof method>;\n      const fn = client[mth] as ClientMethod<Paths, typeof method, Media>;\n      return useInfiniteQuery(\n        {\n          queryKey: [...queryKey, INFINITE_QUERY_KEY_MARKER] as const,\n          // The request comes from the arguments; the key only identifies the cache entry.\n          queryFn: async ({ pageParam, signal }) => {\n            const result = await fn(path, pageInit(init, { pageParamName, pageParam, signal }) as any);\n            throwIfFailed(result);\n            // An empty page stays `undefined`, as in upstream: TanStack Query rejects only\n            // `undefined` query data, and the infinite query data is the `{ pages }` object.\n            return result.data;\n          },\n          ...restOptions,\n          // Typed with an `unknown` page param for the caller (`InfinitePlaceholderData`). TanStack\n          // passes the previous data of this query, with its own page params, and takes it back.\n          placeholderData: placeholderData as any,\n        },\n        queryClient,\n      );\n    },\n    useMutation: (method, path, options, queryClient) =>\n      useMutation(\n        {\n          mutationKey: [method, path],\n          mutationFn: async (init) => {\n            const mth = method.toUpperCase() as Uppercase<typeof method>;\n            const fn = client[mth] as ClientMethod<Paths, typeof method, Media>;\n            const result = await fn(path, init as InitWithUnknowns<typeof init>);\n            throwIfFailed(result);\n            // TanStack Query accepts `undefined` mutation data, so a success without a body stays\n            // `undefined`, as in upstream; only query data needs `null` (upstream #2234). The cast\n            // only bridges the generic types: `Response[\"data\"]` still has `undefined` for an\n            // operation with a response without a body.\n            const { data } = result;\n            return data as Exclude<typeof data, undefined>;\n          },\n          ...options,\n        },\n        queryClient,\n      ),\n  };\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,91 @@
 {
   "name": "openapi-typesafe-react-query",
-  "version": "0.0.0",
-  "description": "Reserved for openapi-typesafe. Contains no code.",
-  "license": "MIT"
-}
+  "description": "Fast, type-safe @tanstack/react-query client to work with your OpenAPI schema.",
+  "version": "1.0.0-rc.1",
+  "author": {
+    "name": "Fedor Chishchin",
+    "url": "https://github.com/fedorello"
+  },
+  "contributors": [
+    {
+      "name": "Martin Paucot",
+      "email": "contact@martin-paucot.fr"
+    }
+  ],
+  "license": "MIT",
+  "type": "module",
+  "main": "./dist/index.mjs",
+  "exports": {
+    ".": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.mjs"
+    },
+    "./*": "./*"
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
+  "homepage": "https://github.com/openapi-typesafe/openapi-typesafe#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/openapi-typesafe/openapi-typesafe.git",
+    "directory": "packages/openapi-typesafe-react-query"
+  },
+  "bugs": {
+    "url": "https://github.com/openapi-typesafe/openapi-typesafe/issues"
+  },
+  "keywords": [
+    "openapi",
+    "swagger",
+    "rest",
+    "api",
+    "oapi_3",
+    "oapi_3_1",
+    "typescript",
+    "fetch",
+    "react",
+    "react-query",
+    "tanstack"
+  ],
+  "dependencies": {
+    "openapi-typesafe-helpers": "^1.0.0-rc.1"
+  },
+  "devDependencies": {
+    "@tanstack/react-query": "5.105.1",
+    "@testing-library/react": "16.3.3",
+    "@types/react": "19.3.0",
+    "@types/react-dom": "19.3.0",
+    "@vitejs/plugin-react": "6.1.2",
+    "execa": "^10.2.1",
+    "jsdom": "30.1.3",
+    "msw": "3.0.3",
+    "openapi-typesafe": "^1.0.0-rc.1",
+    "openapi-typesafe-fetch": "^1.0.0-rc.1",
+    "react": "19.3.1",
+    "react-dom": "19.3.1",
+    "react-error-boundary": "6.1.6"
+  },
+  "peerDependencies": {
+    "@tanstack/react-query": "^5.80.0",
+    "openapi-typesafe-fetch": "^1.0.0-rc.1"
+  },
+  "engines": {
+    "node": ">=22"
+  },
+  "scripts": {
+    "build": "unbuild",
+    "dev": "tsc -p tsconfig.build.json --watch",
+    "format": "biome format . --write",
+    "lint": "pnpm run lint:js && pnpm run lint:ts",
+    "lint:js": "biome check .",
+    "lint:ts": "tsc --noEmit",
+    "generate-types": "openapi-typesafe test/fixtures/api.yaml -o test/fixtures/api.d.ts && openapi-typesafe test/fixtures/query.yaml -o test/fixtures/query.d.ts",
+    "test": "pnpm run generate-types && pnpm run test:js && pnpm run test:exports",
+    "test:js": "vitest run",
+    "test:exports": "pnpm run build && ../../scripts/check-exports.sh",
+    "version": "pnpm run prepare && pnpm run build",
+    "test:coverage": "vitest run --coverage"
+  }
+}

package/src/index.ts

@@ -0,0 +1,389 @@
+import {
+  type DataTag,
+  type InfiniteData,
+  type QueryClient,
+  type QueryFunctionContext,
+  type SkipToken,
+  type UseInfiniteQueryOptions,
+  type UseInfiniteQueryResult,
+  type UseMutationOptions,
+  type UseMutationResult,
+  type UseQueryOptions,
+  type UseQueryResult,
+  type UseSuspenseQueryOptions,
+  type UseSuspenseQueryResult,
+  useInfiniteQuery,
+  useMutation,
+  useQuery,
+  useSuspenseQuery,
+} from "@tanstack/react-query";
+import type {
+  ClientMethod,
+  DefaultParamsOption,
+  Client as FetchClient,
+  FetchResponse,
+  IsInitOptional,
+  MaybeOptionalInit,
+  PathOperation,
+} from "openapi-typesafe-fetch";
+import type { HttpMethod, MediaType, PathsWithMethod } from "openapi-typesafe-helpers";
+
+// Helper type to dynamically infer the type from the `select` property
+type InferSelectReturnType<TData, TSelect> = TSelect extends (data: TData) => infer R ? R : TData;
+
+/**
+ * Query data of a response type: a success without a body is `undefined` in the fetch client and
+ * `null` in the query, as `queryFn` resolves it (upstream #2234, #2464).
+ */
+type QueryData<Data> = undefined extends Data ? Exclude<Data, undefined> | null : Data;
+
+type InitWithUnknowns<Init> = Init & { [key: string]: unknown };
+
+/**
+ * The arguments after the path: the init, required when the operation requires a parameter or a
+ * body, then `Rest`. `IsInitOptional` keeps the init optional in
+ * `Parameters<typeof $api.queryOptions>`, where it is the union of all inits (upstream #2178).
+ */
+type InitArguments<Init, Rest extends unknown[]> =
+  IsInitOptional<Init> extends true ? [InitWithUnknowns<Init>?, ...Rest] : [InitWithUnknowns<Init>, ...Rest];
+
+export type QueryKey<
+  Paths extends {},
+  Method extends HttpMethod,
+  Path extends PathsWithMethod<Paths, Method>,
+  Init = MaybeOptionalInit<Paths[Path], Method>,
+> = Init extends undefined ? readonly [Method, Path] : readonly [Method, Path, Init];
+
+/**
+ * The last element of an infinite query's key. `useQuery` and `useInfiniteQuery` cache different
+ * data (`TData` and `InfiniteData<TData>`), so the same request must not share one key (upstream
+ * #2184, ADR-022). A prefix such as `[method, path]` still matches both. Not exported: a runtime
+ * named export next to the default export would change what `require()` returns.
+ */
+const INFINITE_QUERY_KEY_MARKER = "infinite";
+
+export type InfiniteQueryKey<
+  Paths extends {},
+  Method extends HttpMethod,
+  Path extends PathsWithMethod<Paths, Method>,
+> = readonly [...QueryKey<Paths, Method, Path>, typeof INFINITE_QUERY_KEY_MARKER];
+
+export type QueryOptionsFunction<Paths extends {}, Media extends MediaType> = <
+  Method extends HttpMethod,
+  Path extends PathsWithMethod<Paths, Method>,
+  Init extends MaybeOptionalInit<Paths[Path], Method>,
+  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types
+  Options extends Omit<
+    UseQueryOptions<
+      QueryData<Response["data"]>,
+      Response["error"],
+      InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>,
+      QueryKey<Paths, Method, Path>
+    >,
+    "queryKey" | "queryFn"
+  >,
+>(
+  method: Method,
+  path: Path,
+  ...[init, options]: InitArguments<Init, [Options?]>
+) => NoInfer<
+  Omit<
+    UseQueryOptions<
+      QueryData<Response["data"]>,
+      Response["error"],
+      InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>,
+      QueryKey<Paths, Method, Path>
+    >,
+    "queryFn" | "queryKey"
+  > & {
+    queryKey: DataTag<QueryKey<Paths, Method, Path>, QueryData<Response["data"]>, Response["error"]>;
+    queryFn: Exclude<
+      UseQueryOptions<
+        QueryData<Response["data"]>,
+        Response["error"],
+        InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>,
+        QueryKey<Paths, Method, Path>
+      >["queryFn"],
+      SkipToken | undefined
+    >;
+  }
+>;
+
+export type UseQueryMethod<Paths extends {}, Media extends MediaType> = <
+  Method extends HttpMethod,
+  Path extends PathsWithMethod<Paths, Method>,
+  Init extends MaybeOptionalInit<Paths[Path], Method>,
+  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types
+  Options extends Omit<
+    UseQueryOptions<
+      QueryData<Response["data"]>,
+      Response["error"],
+      InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>,
+      QueryKey<Paths, Method, Path>
+    >,
+    "queryKey" | "queryFn"
+  >,
+>(
+  method: Method,
+  url: Path,
+  ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>
+) => UseQueryResult<InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, Response["error"]>;
+
+/**
+ * The type of the page params: the initial one and the ones `getNextPageParam` and
+ * `getPreviousPageParam` return (upstream #2458). It was `unknown`. It stays `unknown` when a
+ * return type is untyped, so code that compiled still compiles (roadmap §3): TypeScript cannot
+ * infer the return type of a callback that computes it from an unannotated `lastPageParam`,
+ * whose type depends on that return type, and gives `never` or `unknown`.
+ */
+type PageParam<Initial, Next, Previous> =
+  IsUntyped<Next> extends true
+    ? unknown
+    : [Previous] extends [NoPreviousPageParam]
+      ? NullishToUnknown<Initial | NonNullable<Next>>
+      : IsUntyped<Previous> extends true
+        ? unknown
+        : NullishToUnknown<Initial | NonNullable<Next> | NonNullable<Previous>>;
+
+/** The `Previous` type parameter when the options have no `getPreviousPageParam`. */
+declare const NO_PREVIOUS_PAGE_PARAM: unique symbol;
+type NoPreviousPageParam = typeof NO_PREVIOUS_PAGE_PARAM;
+
+type IsUntyped<T> = [T] extends [never] ? true : unknown extends T ? true : false;
+
+/** Only `undefined` or `null` names no type: a cursor API's `initialPageParam: undefined`. */
+type NullishToUnknown<T> = [T] extends [undefined | null] ? unknown : T;
+
+/** Read only for the return type; `never` arguments add no inference for TanStack's page param. */
+type PageParamFunction<Result> = (...args: never) => Result;
+
+/**
+ * Inference sites of the page param types. Intersected before `Options`, so TanStack's own
+ * inference in the implementation reads the full signatures of `Options`.
+ */
+interface PageParamSources<Initial, Next, Previous> {
+  initialPageParam: Initial;
+  getNextPageParam: PageParamFunction<Next>;
+  getPreviousPageParam?: PageParamFunction<Previous>;
+}
+
+/**
+ * `placeholderData` of `useInfiniteQuery`, with an `unknown` page param as before: TypeScript types
+ * a `(previousData) => previousData` callback while it still infers the page param, so it got
+ * `unknown` there and failed against the typed page param.
+ */
+type InfinitePlaceholderData<
+  Data,
+  Error,
+  Paths extends {},
+  Method extends HttpMethod,
+  Path extends PathsWithMethod<Paths, Method>,
+> = UseInfiniteQueryOptions<
+  Data,
+  Error,
+  InfiniteData<Data, unknown>,
+  InfiniteQueryKey<Paths, Method, Path>,
+  unknown
+>["placeholderData"];
+
+export type UseInfiniteQueryMethod<Paths extends {}, Media extends MediaType> = <
+  Method extends HttpMethod,
+  Path extends PathsWithMethod<Paths, Method>,
+  Init extends MaybeOptionalInit<Paths[Path], Method>,
+  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>,
+  Options extends Omit<
+    UseInfiniteQueryOptions<
+      Response["data"],
+      Response["error"],
+      InferSelectReturnType<InfiniteData<Response["data"], PageParam<Initial, Next, Previous>>, Options["select"]>,
+      InfiniteQueryKey<Paths, Method, Path>,
+      PageParam<Initial, Next, Previous>
+    >,
+    "queryKey" | "queryFn" | "placeholderData"
+  > & {
+    placeholderData?: InfinitePlaceholderData<Response["data"], Response["error"], Paths, Method, Path>;
+    pageParamName?: string;
+  },
+  Initial = unknown,
+  Next = never,
+  Previous = NoPreviousPageParam,
+>(
+  method: Method,
+  url: Path,
+  init: InitWithUnknowns<Init>,
+  options: PageParamSources<Initial, Next, Previous> & Options,
+  queryClient?: QueryClient,
+) => UseInfiniteQueryResult<
+  InferSelectReturnType<InfiniteData<Response["data"], PageParam<Initial, Next, Previous>>, Options["select"]>,
+  Response["error"]
+>;
+
+export type UseSuspenseQueryMethod<Paths extends {}, Media extends MediaType> = <
+  Method extends HttpMethod,
+  Path extends PathsWithMethod<Paths, Method>,
+  Init extends MaybeOptionalInit<Paths[Path], Method>,
+  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types
+  Options extends Omit<
+    UseSuspenseQueryOptions<
+      QueryData<Response["data"]>,
+      Response["error"],
+      InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>,
+      QueryKey<Paths, Method, Path>
+    >,
+    "queryKey" | "queryFn"
+  >,
+>(
+  method: Method,
+  url: Path,
+  ...[init, options, queryClient]: InitArguments<Init, [Options?, QueryClient?]>
+) => UseSuspenseQueryResult<InferSelectReturnType<QueryData<Response["data"]>, Options["select"]>, Response["error"]>;
+
+export type UseMutationMethod<Paths extends {}, Media extends MediaType> = <
+  Method extends HttpMethod,
+  Path extends PathsWithMethod<Paths, Method>,
+  Init extends MaybeOptionalInit<Paths[Path], Method>,
+  Response extends Required<FetchResponse<PathOperation<Paths, Path, Method>, Init, Media>>, // note: Required is used to avoid repeating NonNullable in UseQuery types
+  TOnMutateResult = unknown,
+>(
+  method: Method,
+  url: Path,
+  options?: Omit<
+    UseMutationOptions<Response["data"], Response["error"], Init, TOnMutateResult>,
+    "mutationKey" | "mutationFn"
+  >,
+  queryClient?: QueryClient,
+) => UseMutationResult<Response["data"], Response["error"], Init, TOnMutateResult>;
+
+export interface OpenapiQueryClient<Paths extends {}, Media extends MediaType = MediaType> {
+  queryOptions: QueryOptionsFunction<Paths, Media>;
+  useQuery: UseQueryMethod<Paths, Media>;
+  useSuspenseQuery: UseSuspenseQueryMethod<Paths, Media>;
+  useInfiniteQuery: UseInfiniteQueryMethod<Paths, Media>;
+  useMutation: UseMutationMethod<Paths, Media>;
+}
+
+export type MethodResponse<
+  CreatedClient extends OpenapiQueryClient<any, any>,
+  Method extends HttpMethod,
+  Path extends CreatedClient extends OpenapiQueryClient<infer Paths, infer _Media>
+    ? PathsWithMethod<Paths, Method>
+    : never,
+  Options = object,
+> =
+  CreatedClient extends OpenapiQueryClient<infer Paths extends { [key: string]: any }, infer Media extends MediaType>
+    ? NonNullable<FetchResponse<Paths[Path][Method], Options, Media>["data"]>
+    : never;
+
+/**
+ * Throw the error of a failed fetch result. `if (error)` missed two failures: a non-OK response with
+ * an empty body (`error` is `undefined`, upstream #2070, #2829) and a falsy error body such as `0`.
+ */
+function throwIfFailed(result: { error?: unknown; response: Response }): void {
+  if (result.error !== undefined || !result.response.ok) {
+    throw result.error;
+  }
+}
+
+/** The query parameter that carries the page param unless `pageParamName` names another. */
+const DEFAULT_PAGE_PARAM_NAME = "cursor";
+
+interface PageRequest {
+  readonly pageParamName: string;
+  readonly pageParam: unknown;
+  readonly signal: AbortSignal;
+}
+
+/**
+ * The request init of one page. An `undefined` page param (the first page with
+ * `initialPageParam: undefined`) is left out instead of being sent as `0` (upstream #2715, #2340,
+ * ADR-022), so a cursor API gets no cursor on the first page.
+ */
+function pageInit(init: unknown, { pageParamName, pageParam, signal }: PageRequest) {
+  const { params, ...rest } = (init ?? {}) as { params?: { query?: DefaultParamsOption } };
+  const page = pageParam === undefined ? {} : { [pageParamName]: pageParam };
+  return { ...rest, signal, params: { ...params, query: { ...params?.query, ...page } } };
+}
+
+// TODO: Add the ability to bring queryClient as argument
+export default function createClient<Paths extends {}, Media extends MediaType = MediaType>(
+  client: FetchClient<Paths, Media>,
+): OpenapiQueryClient<Paths, Media> {
+  const queryFn = async <Method extends HttpMethod, Path extends PathsWithMethod<Paths, Method>>({
+    queryKey,
+    signal,
+  }: QueryFunctionContext<QueryKey<Paths, Method, Path>>) => {
+    // While `Path` is generic, TypeScript cannot work out that the key is a tuple: the init is a
+    // conditional type per operation (`MaybeOptionalInit`), and the key's type waits for it.
+    const [method, path, init] = queryKey as readonly [Method, Path, unknown?];
+    const mth = method.toUpperCase() as Uppercase<typeof method>;
+    const fn = client[mth] as ClientMethod<Paths, typeof method, Media>;
+    const result = await fn(path, { signal, ...(init as any) }); // TODO: find a way to avoid as any
+    throwIfFailed(result);
+    // TanStack Query rejects `undefined` query data. The fetch client gives `undefined` for every
+    // success without a body: a 204, `Content-Length: 0`, an empty chunked body, a HEAD request
+    // (upstream #2234). A parsed body is never `undefined`, so this changes nothing else.
+    return result.data ?? null;
+  };
+
+  const queryOptions: QueryOptionsFunction<Paths, Media> = (method, path, ...[init, options]) => ({
+    queryKey: (init === undefined ? ([method, path] as const) : ([method, path, init] as const)) as DataTag<
+      QueryKey<Paths, typeof method, typeof path>,
+      any,
+      any
+    >,
+    queryFn,
+    ...options,
+  });
+
+  return {
+    queryOptions,
+    useQuery: (method, path, ...[init, options, queryClient]) =>
+      useQuery(queryOptions(method, path, init as InitWithUnknowns<typeof init>, options), queryClient),
+    useSuspenseQuery: (method, path, ...[init, options, queryClient]) =>
+      useSuspenseQuery(queryOptions(method, path, init as InitWithUnknowns<typeof init>, options), queryClient),
+    useInfiniteQuery: (method, path, init, options, queryClient) => {
+      const { pageParamName = DEFAULT_PAGE_PARAM_NAME, placeholderData, ...restOptions } = options;
+      const { queryKey } = queryOptions(method, path, init);
+      const mth = method.toUpperCase() as Uppercase<typeof method>;
+      const fn = client[mth] as ClientMethod<Paths, typeof method, Media>;
+      return useInfiniteQuery(
+        {
+          queryKey: [...queryKey, INFINITE_QUERY_KEY_MARKER] as const,
+          // The request comes from the arguments; the key only identifies the cache entry.
+          queryFn: async ({ pageParam, signal }) => {
+            const result = await fn(path, pageInit(init, { pageParamName, pageParam, signal }) as any);
+            throwIfFailed(result);
+            // An empty page stays `undefined`, as in upstream: TanStack Query rejects only
+            // `undefined` query data, and the infinite query data is the `{ pages }` object.
+            return result.data;
+          },
+          ...restOptions,
+          // Typed with an `unknown` page param for the caller (`InfinitePlaceholderData`). TanStack
+          // passes the previous data of this query, with its own page params, and takes it back.
+          placeholderData: placeholderData as any,
+        },
+        queryClient,
+      );
+    },
+    useMutation: (method, path, options, queryClient) =>
+      useMutation(
+        {
+          mutationKey: [method, path],
+          mutationFn: async (init) => {
+            const mth = method.toUpperCase() as Uppercase<typeof method>;
+            const fn = client[mth] as ClientMethod<Paths, typeof method, Media>;
+            const result = await fn(path, init as InitWithUnknowns<typeof init>);
+            throwIfFailed(result);
+            // TanStack Query accepts `undefined` mutation data, so a success without a body stays
+            // `undefined`, as in upstream; only query data needs `null` (upstream #2234). The cast
+            // only bridges the generic types: `Response["data"]` still has `undefined` for an
+            // operation with a response without a body.
+            const { data } = result;
+            return data as Exclude<typeof data, undefined>;
+          },
+          ...options,
+        },
+        queryClient,
+      ),
+  };
+}