@openapi-qraft/react 1.14.0-beta.5 → 2.0.0-next.0

package/src/service-operation/ServiceOperationInvalidateQueries.ts

@@ -1,8 +1,4 @@
-import type {
-  DefaultError,
-  InvalidateOptions,
-  QueryClient,
-} from '@tanstack/query-core';
+import type { DefaultError, InvalidateOptions } from '@tanstack/query-core';
 import type {
   QueryFiltersByParameters,
   QueryFiltersByQueryKey,
@@ -28,34 +24,14 @@ export interface ServiceOperationInvalidateQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  invalidateQueries<TInfinite extends boolean>(
-    filters: InvalidateQueryFilters<TSchema, TData, TInfinite, TParams, TError>,
-    options: InvalidateOptions,
-    queryClient: QueryClient
-  ): Promise<void>;
-
-  invalidateQueries<TInfinite extends boolean>(
-    filters: InvalidateQueryFilters<TSchema, TData, TInfinite, TParams, TError>,
-    queryClient: QueryClient
-  ): Promise<void>;
-
-  invalidateQueries(queryClient: QueryClient): Promise<void>;
-}
-
-/**
- * @internal
- */
-export interface ServiceOperationInvalidateQueriesCallback<
-  TSchema extends { url: string; method: string },
-  TData,
-  TParams = {},
-  TError = DefaultError,
-> extends ServiceOperationInvalidateQueries<TSchema, TData, TParams, TError> {
-  invalidateQueries<TInfinite extends boolean>(
-    filters:
-      | InvalidateQueryFilters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryClient,
-    options?: InvalidateOptions | QueryClient,
-    queryClient?: QueryClient
+  invalidateQueries<TInfinite extends boolean = false>(
+    filters?: InvalidateQueryFilters<
+      TSchema,
+      TData,
+      TInfinite,
+      TParams,
+      TError
+    >,
+    options?: InvalidateOptions
   ): Promise<void>;
 }

package/src/service-operation/ServiceOperationIsFetchingQueries.ts

@@ -1,4 +1,4 @@
-import type { DefaultError, QueryClient } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/query-core';
 import type {
   QueryFiltersByParameters,
   QueryFiltersByQueryKey,
@@ -10,30 +10,9 @@ export interface ServiceOperationIsFetchingQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  isFetching<TInfinite extends boolean>(
-    filters:
-      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
-    queryClient: QueryClient
-  ): number;
-
-  isFetching(queryClient: QueryClient): number;
-}
-
-/**
- * @internal
- */
-export interface ServiceOperationIsFetchingQueriesCallback<
-  TSchema extends { url: string; method: string },
-  TData,
-  TParams = {},
-  TError = DefaultError,
-> extends ServiceOperationIsFetchingQueries<TSchema, TData, TParams, TError> {
-  refetchQueries<TInfinite extends boolean>(
-    filters:
+  isFetching<TInfinite extends boolean = false>(
+    filters?:
       | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
       | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
-      | QueryClient,
-    queryClient?: QueryClient
   ): number;
 }

package/src/service-operation/ServiceOperationIsMutatingQueries.ts

@@ -1,4 +1,4 @@
-import type { DefaultError, QueryClient } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/query-core';
 import type {
   MutationFiltersByMutationKey,
   MutationFiltersByParameters,
@@ -12,40 +12,7 @@ export interface ServiceOperationIsMutatingQueries<
   TError = DefaultError,
 > {
   isMutating<TContext>(
-    filters:
-      | MutationFiltersByParameters<TBody, TData, TParams, TError, TContext>
-      | MutationFiltersByMutationKey<
-          TSchema,
-          TBody,
-          TData,
-          TParams,
-          TError,
-          TContext
-        >,
-    queryClient: QueryClient
-  ): number;
-
-  isMutating(queryClient: QueryClient): number;
-}
-
-/**
- * @internal
- */
-export interface ServiceOperationIsMutatingQueriesCallback<
-  TSchema extends { url: string; method: string },
-  TBody,
-  TData,
-  TParams = {},
-  TError = DefaultError,
-> extends ServiceOperationIsMutatingQueries<
-    TSchema,
-    TBody,
-    TData,
-    TParams,
-    TError
-  > {
-  isMutating<TContext>(
-    filters:
+    filters?:
       | MutationFiltersByParameters<TBody, TData, TParams, TError, TContext>
       | MutationFiltersByMutationKey<
           TSchema,
@@ -55,7 +22,5 @@ export interface ServiceOperationIsMutatingQueriesCallback<
           TError,
           TContext
         >
-      | QueryClient,
-    queryClient?: QueryClient
   ): number;
 }

package/src/service-operation/ServiceOperationMutationFn.ts

@@ -1,92 +1,49 @@
+import { AreAllOptional } from '../lib/AreAllOptional.js';
+import { RequestFnResponse } from '../lib/requestFn.js';
+
 interface QueryFnBaseUrlOptions {
   /**
    * Base URL to use for the request
    * @example 'https://api.example.com'
    */
-  baseUrl: string;
-}
-
-interface ServiceOperationMutationFnOptionsBase<TBody, TParams> {
-  parameters: TParams;
-  body: TBody;
+  baseUrl?: string;
 }
 
-interface ServiceOperationMutationFnOptions<TBody, TParams>
-  extends ServiceOperationMutationFnOptionsBase<TBody, TParams> {
-  baseUrl?: never;
-}
-
-interface ServiceOperationMutationFnOptionsWithBaseUrl<TBody, TParams>
-  extends ServiceOperationMutationFnOptionsBase<TBody, TParams>,
-    QueryFnBaseUrlOptions {}
+type ServiceOperationMutationFnOptions<TBody, TParams> =
+  AreAllOptional<TBody> extends true
+    ? AreAllOptional<TParams> extends true
+      ?
+          | void // todo::try to move void to arguments
+          | ({
+              parameters?: TParams;
+              body?: TBody;
+            } & QueryFnBaseUrlOptions)
+      : {
+          parameters: TParams;
+          body?: TBody;
+        } & QueryFnBaseUrlOptions
+    : AreAllOptional<TParams> extends true
+      ? {
+          parameters?: TParams;
+          body: TBody;
+        } & QueryFnBaseUrlOptions
+      : {
+          parameters: TParams;
+          body: TBody;
+        } & QueryFnBaseUrlOptions;
 
 export interface ServiceOperationMutationFn<
   TSchema extends { url: string; method: string },
   TBody,
   TData,
   TParams,
+  TError,
 > {
-  /**
-   * @deprecated Use `<service>.<operation>(...)` instead.
-   */
-  mutationFn(
-    client: (
-      schema: TSchema,
-      options: {
-        parameters: TParams;
-        body: TBody;
-      }
-    ) => TData,
-    options: {
-      parameters: TParams;
-      body: TBody;
-    }
-  ): TData;
-
-  /**
-   * @deprecated Use `<service>.<operation>(...)` instead.
-   */
-  mutationFn(
-    client: (
-      schema: TSchema,
-      options: {
-        parameters: TParams;
-        body: TBody;
-      }
-    ) => Promise<TData>,
-    options: {
-      parameters: TParams;
-      body: TBody;
-    }
-  ): Promise<TData>;
-
-  <TOptions extends ServiceOperationMutationFnOptions<TBody, TParams>>(
-    options: TOptions,
-    client: (schema: TSchema, options: TOptions) => TData
-  ): TData;
-
-  <
-    TOptions extends ServiceOperationMutationFnOptionsWithBaseUrl<
-      TBody,
-      TParams
-    >,
-  >(
-    options: TOptions,
-    client: (schema: TSchema, options: TOptions) => TData
-  ): TData;
-
   <TOptions extends ServiceOperationMutationFnOptions<TBody, TParams>>(
     options: TOptions,
-    client: (schema: TSchema, options: TOptions) => Promise<TData>
-  ): Promise<TData>;
-
-  <
-    TOptions extends ServiceOperationMutationFnOptionsWithBaseUrl<
-      TBody,
-      TParams
-    >,
-  >(
-    options: TOptions,
-    client: (schema: TSchema, options: TOptions) => Promise<TData>
-  ): Promise<TData>;
+    client?: (
+      schema: TSchema,
+      options: TOptions
+    ) => Promise<RequestFnResponse<TData, TError>>
+  ): Promise<RequestFnResponse<TData, TError>>;
 }

package/src/service-operation/ServiceOperationQueryFn.ts

@@ -1,4 +1,6 @@
 import type { ServiceOperationQueryKey } from './ServiceOperationKey.js';
+import { AreAllOptional } from '../lib/AreAllOptional.js';
+import { RequestFnResponse } from '../lib/requestFn.js';
 
 interface QueryFnOptionsBase<
   TMeta extends Record<string, any>,
@@ -12,17 +14,6 @@ interface QueryFnOptionsByParameters<
   TParams,
   TMeta extends Record<string, any>,
   TSignal extends AbortSignal = AbortSignal,
-> extends QueryFnOptionsBase<TMeta, TSignal> {
-  parameters: TParams;
-
-  queryKey?: never;
-  baseUrl?: never;
-}
-
-interface QueryFnOptionsByParametersWithBaseUrl<
-  TParams,
-  TMeta extends Record<string, any>,
-  TSignal extends AbortSignal = AbortSignal,
 > extends QueryFnOptionsBase<TMeta, TSignal>,
     QueryFnBaseUrlOptions {
   parameters: TParams;
@@ -35,18 +26,6 @@ interface QueryFnOptionsByQueryKey<
   TParams,
   TMeta extends Record<string, any>,
   TSignal extends AbortSignal = AbortSignal,
-> extends QueryFnOptionsBase<TMeta, TSignal> {
-  queryKey: ServiceOperationQueryKey<TSchema, TParams>;
-
-  parameters?: never;
-  baseUrl?: never;
-}
-
-interface QueryFnOptionsByQueryKeyWithBaseUrl<
-  TSchema extends { url: string; method: string },
-  TParams,
-  TMeta extends Record<string, any>,
-  TSignal extends AbortSignal = AbortSignal,
 > extends QueryFnOptionsBase<TMeta, TSignal>,
     QueryFnBaseUrlOptions {
   queryKey: ServiceOperationQueryKey<TSchema, TParams>;
@@ -59,119 +38,34 @@ interface QueryFnBaseUrlOptions {
    * Base URL to use for the request
    * @example 'https://api.example.com'
    */
-  baseUrl: string;
+  baseUrl?: string;
 }
 
 export interface ServiceOperationQueryFn<
   TSchema extends { url: string; method: string },
   TData,
   TParams,
+  TError,
 > {
-  /**
-   * @deprecated Use `<service>.<operation>(...)` instead.
-   */
-  queryFn<
-    TMeta extends Record<string, any>,
-    TSignal extends AbortSignal = AbortSignal,
-  >(
-    options:
-      | QueryFnOptionsByParameters<TParams, TMeta, TSignal>
-      | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>,
-    client: (
-      schema: TSchema,
-      options: {
-        parameters: TParams;
-        signal?: TSignal;
-        meta?: TMeta;
-      }
-    ) => TData
-  ): TData;
-
-  /**
-   * @deprecated Use `<service>.<operation>(...)` instead.
-   */
-  queryFn<
-    TMeta extends Record<string, any>,
-    TSignal extends AbortSignal = AbortSignal,
-  >(
-    options:
-      | QueryFnOptionsByParameters<TParams, TMeta, TSignal>
-      | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>,
-    client: (
-      schema: TSchema,
-      options: {
-        parameters: TParams;
-        signal?: TSignal;
-        meta?: TMeta;
-      }
-    ) => Promise<TData>
-  ): Promise<TData>;
-
-  <
-    TMeta extends Record<string, any>,
-    TSignal extends AbortSignal = AbortSignal,
-  >(
-    options:
-      | QueryFnOptionsByParameters<TParams, TMeta, TSignal>
-      | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>,
-    client: (
-      schema: TSchema,
-      options: {
-        parameters: TParams;
-        signal?: TSignal;
-        meta?: TMeta;
-      }
-    ) => TData
-  ): TData;
-
-  <
-    TMeta extends Record<string, any>,
-    TSignal extends AbortSignal = AbortSignal,
-  >(
-    options:
-      | QueryFnOptionsByParametersWithBaseUrl<TParams, TMeta, TSignal>
-      | QueryFnOptionsByQueryKeyWithBaseUrl<TSchema, TParams, TMeta, TSignal>,
-    client: (
-      schema: TSchema,
-      options: {
-        parameters: TParams;
-        signal?: TSignal;
-        meta?: TMeta;
-      } & QueryFnBaseUrlOptions
-    ) => TData
-  ): TData;
-
   <
     TMeta extends Record<string, any>,
     TSignal extends AbortSignal = AbortSignal,
   >(
-    options:
-      | QueryFnOptionsByParameters<TParams, TMeta, TSignal>
-      | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>,
-    client: (
+    options: AreAllOptional<TParams> extends true
+      ?
+          | void
+          | QueryFnOptionsByParameters<TParams, TMeta, TSignal>
+          | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>
+      :
+          | QueryFnOptionsByParameters<TParams, TMeta, TSignal>
+          | QueryFnOptionsByQueryKey<TSchema, TParams, TMeta, TSignal>,
+    client?: (
       schema: TSchema,
       options: {
         parameters: TParams;
         signal?: TSignal;
         meta?: TMeta;
       }
-    ) => Promise<TData>
-  ): Promise<TData>;
-
-  <
-    TMeta extends Record<string, any>,
-    TSignal extends AbortSignal = AbortSignal,
-  >(
-    options:
-      | QueryFnOptionsByParametersWithBaseUrl<TParams, TMeta, TSignal>
-      | QueryFnOptionsByQueryKeyWithBaseUrl<TSchema, TParams, TMeta, TSignal>,
-    client: (
-      schema: TSchema,
-      options: {
-        parameters: TParams;
-        signal?: TSignal;
-        meta?: TMeta;
-      } & QueryFnBaseUrlOptions
-    ) => Promise<TData>
-  ): Promise<TData>;
+    ) => Promise<RequestFnResponse<TData, TError>>
+  ): Promise<RequestFnResponse<TData, TError>>;
 }

package/src/service-operation/ServiceOperationRefetchQueries.ts

@@ -1,14 +1,8 @@
-import type {
-  DefaultError,
-  QueryClient,
-  RefetchOptions,
-  ResetOptions,
-} from '@tanstack/query-core';
+import type { DefaultError, RefetchOptions } from '@tanstack/query-core';
 import type {
   QueryFiltersByParameters,
   QueryFiltersByQueryKey,
 } from './QueryFilters.js';
-import { ServiceOperationResetQueries } from './ServiceOperationResetQueries.js';
 
 export interface ServiceOperationRefetchQueries<
   TSchema extends { url: string; method: string },
@@ -16,58 +10,10 @@ export interface ServiceOperationRefetchQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  refetchQueries<TInfinite extends boolean>(
-    filters:
-      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
-    options: RefetchOptions,
-    queryClient: QueryClient
-  ): Promise<void>;
-
-  refetchQueries<TInfinite extends boolean>(
-    filters:
+  refetchQueries<TInfinite extends boolean = false>(
+    filters?:
       | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
       | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
-    queryClient: QueryClient
-  ): Promise<void>;
-
-  refetchQueries(queryClient: QueryClient): Promise<void>;
-}
-
-/**
- * @internal
- */
-export interface ServiceOperationResetQueriesCallback<
-  TSchema extends { url: string; method: string },
-  TData,
-  TParams = {},
-  TError = DefaultError,
-> extends ServiceOperationResetQueries<TSchema, TData, TParams, TError> {
-  resetQueries<TInfinite extends boolean>(
-    filters:
-      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
-      | QueryClient,
-    options?: ResetOptions | QueryClient,
-    queryClient?: QueryClient
-  ): Promise<void>;
-}
-
-/**
- * @internal
- */
-export interface ServiceOperationRefetchQueriesCallback<
-  TSchema extends { url: string; method: string },
-  TData,
-  TParams = {},
-  TError = DefaultError,
-> extends ServiceOperationRefetchQueries<TSchema, TData, TParams, TError> {
-  refetchQueries<TInfinite extends boolean>(
-    filters:
-      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
-      | QueryClient,
-    options?: RefetchOptions | QueryClient,
-    queryClient?: QueryClient
+    options?: RefetchOptions
   ): Promise<void>;
 }

package/src/service-operation/ServiceOperationRemoveQueries.ts

@@ -1,4 +1,4 @@
-import type { DefaultError, QueryClient } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/query-core';
 import type {
   QueryFiltersByParameters,
   QueryFiltersByQueryKey,
@@ -10,30 +10,9 @@ export interface ServiceOperationRemoveQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  removeQueries<TInfinite extends boolean>(
-    filters:
-      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
-    queryClient: QueryClient
-  ): void;
-
-  removeQueries(queryClient: QueryClient): void;
-}
-
-/**
- * @internal
- */
-export interface ServiceOperationRemoveQueriesCallback<
-  TSchema extends { url: string; method: string },
-  TData,
-  TParams = {},
-  TError = DefaultError,
-> extends ServiceOperationRemoveQueries<TSchema, TData, TParams, TError> {
-  removeQueries<TInfinite extends boolean>(
-    filters:
+  removeQueries<TInfinite extends boolean = false>(
+    filters?:
       | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
       | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
-      | QueryClient,
-    queryClient?: QueryClient
   ): void;
 }

package/src/service-operation/ServiceOperationResetQueries.ts

@@ -1,8 +1,4 @@
-import type {
-  DefaultError,
-  QueryClient,
-  ResetOptions,
-} from '@tanstack/query-core';
+import type { DefaultError, ResetOptions } from '@tanstack/query-core';
 import type {
   QueryFiltersByParameters,
   QueryFiltersByQueryKey,
@@ -14,39 +10,10 @@ export interface ServiceOperationResetQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  resetQueries<TInfinite extends boolean>(
-    filters:
+  resetQueries<TInfinite extends boolean = false>(
+    filters?:
       | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
       | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
-    options: ResetOptions,
-    queryClient: QueryClient
-  ): Promise<void>;
-
-  resetQueries<TInfinite extends boolean>(
-    filters:
-      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
-    queryClient: QueryClient
-  ): Promise<void>;
-
-  resetQueries(queryClient: QueryClient): Promise<void>;
-}
-
-/**
- * @internal
- */
-export interface ServiceOperationResetQueriesCallback<
-  TSchema extends { url: string; method: string },
-  TData,
-  TParams = {},
-  TError = DefaultError,
-> extends ServiceOperationResetQueries<TSchema, TData, TParams, TError> {
-  resetQueries<TInfinite extends boolean>(
-    filters:
-      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
-      | QueryClient,
-    options?: ResetOptions | QueryClient,
-    queryClient?: QueryClient
+    options?: ResetOptions
   ): Promise<void>;
 }

package/src/service-operation/ServiceOperationSetInfiniteQueryData.ts

@@ -1,9 +1,4 @@
-import type {
-  NoInfer,
-  QueryClient,
-  SetDataOptions,
-  Updater,
-} from '@tanstack/query-core';
+import type { NoInfer, SetDataOptions, Updater } from '@tanstack/query-core';
 import type { OperationInfiniteData } from './OperationInfiniteData.js';
 import type { ServiceOperationInfiniteQueryKey } from './ServiceOperationKey.js';
 
@@ -18,7 +13,6 @@ export interface ServiceOperationSetInfiniteQueryData<
       NoInfer<OperationInfiniteData<TData, TParams>> | undefined,
       NoInfer<OperationInfiniteData<TData, TParams>> | undefined
     >,
-    queryClient: QueryClient,
     options?: SetDataOptions
   ): OperationInfiniteData<TData, TParams> | undefined;
 }

package/src/service-operation/ServiceOperationSetQueriesData.ts

@@ -1,7 +1,6 @@
 import type {
   DefaultError,
   NoInfer,
-  QueryClient,
   SetDataOptions,
   Updater,
 } from '@tanstack/query-core';
@@ -13,42 +12,14 @@ import type {
 export interface ServiceOperationSetQueriesData<
   TSchema extends { url: string; method: string },
   TData,
-  TParams = {}, // todo::try to replace `TParams = {}` with `TParams = undefined`
+  TParams,
   TError = DefaultError,
 > {
-  setQueriesData<TInfinite extends boolean>(
+  setQueriesData<TInfinite extends boolean = false>(
     filters:
       | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
       | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     updater: Updater<NoInfer<TData> | undefined, NoInfer<TData> | undefined>,
-    options: SetDataOptions,
-    queryClient: QueryClient
-  ): Array<TData | undefined>;
-
-  setQueriesData<TInfinite extends boolean>(
-    filters:
-      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
-    updater: Updater<NoInfer<TData> | undefined, NoInfer<TData> | undefined>,
-    queryClient: QueryClient
-  ): Array<TData | undefined>;
-}
-
-/**
- * @internal
- */
-export interface ServiceOperationSetQueriesDataCallback<
-  TSchema extends { url: string; method: string },
-  TData,
-  TParams = {},
-  TError = DefaultError,
-> extends ServiceOperationSetQueriesData<TSchema, TData, TParams, TError> {
-  setQueriesData<TInfinite extends boolean>(
-    filters:
-      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
-    updater: Updater<NoInfer<TData> | undefined, NoInfer<TData> | undefined>,
-    options: SetDataOptions | QueryClient,
-    queryClient?: QueryClient
+    options?: SetDataOptions
   ): Array<TData | undefined>;
 }