@openapi-qraft/react 2.0.0-next.7 → 2.0.0-next.9

package/src/callbacks/operationInvokeFn.ts

@@ -1,7 +1,10 @@
+import type {
+  OperationSchema,
+  RequestFnResponse,
+  ServiceOperationMutationFn,
+  ServiceOperationQueryFn,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationMutationFn } from '../service-operation/ServiceOperationMutationFn.js';
-import type { ServiceOperationQueryFn } from '../service-operation/ServiceOperationQueryFn.js';
-import { OperationSchema, RequestFnResponse } from '../lib/requestFn.js';
 
 /**
  * Called when <service>.<operation>(...) is invoked.

package/src/callbacks/prefetchInfiniteQuery.ts

@@ -1,5 +1,6 @@
+import type { ServiceOperationFetchInfiniteQuery } from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationFetchInfiniteQuery } from '../service-operation/ServiceOperationFetchInfiniteQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
 export const prefetchInfiniteQuery: <
@@ -13,7 +14,8 @@ export const prefetchInfiniteQuery: <
     ServiceOperationFetchInfiniteQuery<
       TSchema,
       TData,
-      TParams
+      TParams,
+      DefaultError
     >['prefetchInfiniteQuery']
   >
 ) => Promise<TData> = (qraftOptions, schema, args) => {

package/src/callbacks/prefetchQuery.ts

@@ -1,5 +1,6 @@
+import type { ServiceOperationFetchQuery } from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationFetchQuery } from '../service-operation/ServiceOperationFetchQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
 export const prefetchQuery: <
@@ -10,7 +11,12 @@ export const prefetchQuery: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: TSchema,
   args: Parameters<
-    ServiceOperationFetchQuery<TSchema, TData, TParams>['prefetchQuery']
+    ServiceOperationFetchQuery<
+      TSchema,
+      TData,
+      TParams,
+      DefaultError
+    >['prefetchQuery']
   >
 ) => Promise<TData> = (qraftOptions, schema, args) => {
   return callQueryClientMethodWithQueryKey(

package/src/callbacks/refetchQueries.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationRefetchQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationRefetchQueries } from '../service-operation/ServiceOperationRefetchQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function refetchQueries<TData>(
@@ -10,7 +13,8 @@ export function refetchQueries<TData>(
     ServiceOperationRefetchQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['refetchQueries']
   >
 ): Promise<void> {

package/src/callbacks/removeQueries.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationRemoveQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationRemoveQueries } from '../service-operation/ServiceOperationRemoveQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function removeQueries<TData>(
@@ -10,7 +13,8 @@ export function removeQueries<TData>(
     ServiceOperationRemoveQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['removeQueries']
   >
 ): Promise<void> {

package/src/callbacks/resetQueries.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationResetQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationResetQueries } from '../service-operation/ServiceOperationResetQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function resetQueries<TData>(
@@ -10,7 +13,8 @@ export function resetQueries<TData>(
     ServiceOperationResetQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['resetQueries']
   >
 ): Promise<void> {

package/src/callbacks/setInfiniteQueryData.ts

@@ -1,7 +1,9 @@
+import type {
+  OperationSchema,
+  ServiceOperationSetInfiniteQueryData,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { InfiniteData } from '@tanstack/query-core';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetInfiniteQueryData } from '../service-operation/ServiceOperationSetInfiniteQueryData.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function setInfiniteQueryData<TData>(

package/src/callbacks/setQueriesData.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationSetQueriesData,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetQueriesData } from '../service-operation/ServiceOperationSetQueriesData.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function setQueriesData<TData>(
@@ -10,7 +13,8 @@ export function setQueriesData<TData>(
     ServiceOperationSetQueriesData<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['setQueriesData']
   >
 ): TData | undefined {

package/src/callbacks/setQueryData.ts

@@ -1,6 +1,8 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationSetQueryData,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetQueryData } from '../service-operation/ServiceOperationSetQueryData.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function setQueryData<TData>(

package/src/callbacks/useInfiniteQuery.ts

@@ -1,10 +1,12 @@
 'use client';
 
+import type {
+  OperationSchema,
+  ServiceOperationUseInfiniteQuery,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import type { UseInfiniteQueryResult } from '@tanstack/react-query';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useInfiniteQuery as useInfiniteQueryBase } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 
@@ -16,7 +18,12 @@ export const useInfiniteQuery: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<OperationSchema, unknown, unknown>['useInfiniteQuery']
+    ServiceOperationUseInfiniteQuery<
+      OperationSchema,
+      unknown,
+      unknown,
+      DefaultError
+    >['useInfiniteQuery']
   >
 ) => UseInfiniteQueryResult<TData, TError> = (qraftOptions, schema, args) => {
   return useInfiniteQueryBase(

package/src/callbacks/useIsFetching.ts

@@ -1,8 +1,10 @@
 'use client';
 
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationUseIsFetchingQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useIsFetching as useIsFetchingTanstack } from '@tanstack/react-query';
 import { composeQueryFilters } from '../lib/composeQueryFilters.js';
 
@@ -10,7 +12,7 @@ export const useIsFetching: <TVariables = unknown>(
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
+    ServiceOperationUseIsFetchingQueries<
       OperationSchema,
       object | undefined,
       TVariables,

package/src/callbacks/useIsMutating.ts

@@ -1,10 +1,12 @@
 'use client';
 
+import type {
+  OperationSchema,
+  ServiceOperationUseIsMutating,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { DefaultError } from '@tanstack/query-core';
 import type { UseMutationResult } from '@tanstack/react-query';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 import { useIsMutating as useIsMutatingStateTanstack } from '@tanstack/react-query';
 import { composeMutationFilters } from '../lib/composeMutationFilters.js';
 
@@ -17,11 +19,12 @@ export const useIsMutating: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationMutation<
+    ServiceOperationUseIsMutating<
       OperationSchema,
       object | undefined,
       TVariables,
-      TData
+      TData,
+      DefaultError
     >['useIsMutating']
   >
 ) => UseMutationResult<TData, TError, TVariables, TContext> = (

package/src/callbacks/useMutation.ts

@@ -1,11 +1,13 @@
 'use client';
 
+import type {
+  OperationSchema,
+  ServiceOperationMutationKey,
+  ServiceOperationUseMutation,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { DefaultError } from '@tanstack/query-core';
 import type { UseMutationResult } from '@tanstack/react-query';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
-import type { ServiceOperationMutationKey } from '../service-operation/ServiceOperationKey.js';
 import { useMutation as useMutationBase } from '@tanstack/react-query';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
 import { requestFnResponseResolver } from '../lib/requestFnResponseResolver.js';
@@ -19,11 +21,12 @@ export const useMutation: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationMutation<
+    ServiceOperationUseMutation<
       OperationSchema,
       object | undefined,
       TVariables,
-      TData
+      TData,
+      DefaultError
     >['useMutation']
   >
 ) => UseMutationResult<TData, TError, TVariables, TContext> = (

package/src/callbacks/useMutationState.ts

@@ -1,10 +1,12 @@
 'use client';
 
+import type {
+  OperationSchema,
+  ServiceOperationUseMutationState,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { DefaultError } from '@tanstack/query-core';
 import type { UseMutationResult } from '@tanstack/react-query';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 import { useMutationState as useMutationStateTanstack } from '@tanstack/react-query';
 import { composeMutationFilters } from '../lib/composeMutationFilters.js';
 
@@ -17,11 +19,12 @@ export const useMutationState: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationMutation<
+    ServiceOperationUseMutationState<
       OperationSchema,
       object | undefined,
       TVariables,
-      TData
+      TData,
+      DefaultError
     >['useMutationState']
   >
 ) => UseMutationResult<TData, TError, TVariables, TContext> = (

package/src/callbacks/useQueries.ts

@@ -1,9 +1,12 @@
 'use client';
 
+import type {
+  OperationSchema,
+  ServiceOperationUseQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { QueriesResults } from '@tanstack/react-query';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useQueries as useQueriesTanstack } from '@tanstack/react-query';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
 import { requestFnResponseResolver } from '../lib/requestFnResponseResolver.js';
@@ -12,7 +15,12 @@ export const useQueries: (
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<OperationSchema, unknown, unknown>['useQueries']
+    ServiceOperationUseQueries<
+      OperationSchema,
+      unknown,
+      unknown,
+      DefaultError
+    >['useQueries']
   >
 ) => QueriesResults<never> = (qraftOptions, schema, args) => {
   const [options] = args;
@@ -20,6 +28,7 @@ export const useQueries: (
   return useQueriesTanstack(
     {
       ...options,
+      // @ts-expect-error - Too complex to type
       queries: options.queries.map((queryOptions) => {
         const optionsWithQueryKey =
           'parameters' in queryOptions

package/src/callbacks/useQuery.ts

@@ -1,10 +1,12 @@
 'use client';
 
+import type {
+  OperationSchema,
+  ServiceOperationUseQuery,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { DefaultError } from '@tanstack/query-core';
 import type { UseQueryResult } from '@tanstack/react-query';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useQuery as useQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 
@@ -12,7 +14,12 @@ export const useQuery: <TData = unknown, TError = DefaultError>(
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<OperationSchema, unknown, unknown>['useQuery']
+    ServiceOperationUseQuery<
+      OperationSchema,
+      unknown,
+      unknown,
+      DefaultError
+    >['useQuery']
   >
 ) => UseQueryResult<TData, TError> = (qraftOptions, schema, args) => {
   return useQueryTanstack(

package/src/callbacks/useSuspenseInfiniteQuery.ts

@@ -1,10 +1,12 @@
 'use client';
 
+import type {
+  OperationSchema,
+  ServiceOperationUseSuspenseInfiniteQuery,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { DefaultError, InfiniteData } from '@tanstack/query-core';
 import type { UseSuspenseInfiniteQueryResult } from '@tanstack/react-query';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 
@@ -16,10 +18,11 @@ export const useSuspenseInfiniteQuery: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
+    ServiceOperationUseSuspenseInfiniteQuery<
       OperationSchema,
       unknown,
-      unknown
+      unknown,
+      DefaultError
     >['useSuspenseInfiniteQuery']
   >
 ) => UseSuspenseInfiniteQueryResult<TData, TError> = (

package/src/callbacks/useSuspenseQueries.ts

@@ -1,9 +1,12 @@
 'use client';
 
+import type {
+  OperationSchema,
+  ServiceOperationUseSuspenseQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { SuspenseQueriesResults } from '@tanstack/react-query';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useSuspenseQueries as useSuspenseQueriesTanstack } from '@tanstack/react-query';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
 import { requestFnResponseResolver } from '../lib/requestFnResponseResolver.js';
@@ -12,10 +15,11 @@ export const useSuspenseQueries: (
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
+    ServiceOperationUseSuspenseQueries<
       OperationSchema,
       unknown,
-      unknown
+      unknown,
+      DefaultError
     >['useSuspenseQueries']
   >
 ) => SuspenseQueriesResults<never> = (qraftOptions, schema, args) => {
@@ -24,6 +28,7 @@ export const useSuspenseQueries: (
   return useSuspenseQueriesTanstack(
     {
       ...options,
+      // @ts-expect-error - Too complex to type
       queries: options.queries.map((queryOptions) => {
         const optionsWithQueryKey =
           'parameters' in queryOptions

package/src/callbacks/useSuspenseQuery.ts

@@ -1,10 +1,12 @@
 'use client';
 
+import type {
+  OperationSchema,
+  ServiceOperationUseSuspenseQuery,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { DefaultError } from '@tanstack/query-core';
 import type { UseQueryResult } from '@tanstack/react-query';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useSuspenseQuery as useSuspenseQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 
@@ -16,7 +18,12 @@ export const useSuspenseQuery: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<OperationSchema, unknown, unknown>['useSuspenseQuery']
+    ServiceOperationUseSuspenseQuery<
+      OperationSchema,
+      unknown,
+      unknown,
+      DefaultError
+    >['useSuspenseQuery']
   >
 ) => UseQueryResult<TData, TError> = (qraftOptions, schema, args) => {
   return useSuspenseQueryTanstack(

package/src/index.ts

@@ -16,15 +16,11 @@ export {
   urlSerializer,
   bodySerializer,
   mergeHeaders,
+  type RequestFn,
   type RequestFnResponse,
+  type HeadersOptions,
+  type RequestFnOptions,
+  type RequestFnInfo,
+  type OperationSchema,
+  type RequestFnPayload,
 } from './lib/requestFn.js';
-
-export type {
-  RequestFnPayload,
-  RequestFnOptions,
-  HeadersOptions,
-  OperationSchema,
-  RequestFn,
-} from './lib/requestFn.js';
-
-export type * from './service-operation/index.js';

package/src/lib/composeBaseQueryKey.ts

@@ -1,7 +1,7 @@
 import type {
   ServiceOperationInfiniteQueryKey,
   ServiceOperationQueryKey,
-} from '../service-operation/ServiceOperationKey.js';
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { OperationSchema } from './requestFn.js';
 
 export function composeBaseQueryKey<TSchema extends OperationSchema, TParams>(

package/src/lib/composeInfiniteQueryKey.ts

@@ -1,4 +1,4 @@
-import type { ServiceOperationInfiniteQueryKey } from '../service-operation/ServiceOperationKey.js';
+import type { ServiceOperationInfiniteQueryKey } from '@openapi-qraft/tanstack-query-react-types';
 import type { OperationSchema } from './requestFn.js';
 import { composeBaseQueryKey } from './composeBaseQueryKey.js';
 

package/src/lib/composeMutationKey.ts

@@ -1,4 +1,4 @@
-import type { ServiceOperationMutationKey } from '../service-operation/ServiceOperationKey.js';
+import type { ServiceOperationMutationKey } from '@openapi-qraft/tanstack-query-react-types';
 import type { OperationSchema } from './requestFn.js';
 
 /**

package/src/lib/composeQueryKey.ts

@@ -1,4 +1,4 @@
-import type { ServiceOperationQueryKey } from '../service-operation/ServiceOperationKey.js';
+import type { ServiceOperationQueryKey } from '@openapi-qraft/tanstack-query-react-types';
 import type { OperationSchema } from './requestFn.js';
 import { composeBaseQueryKey } from './composeBaseQueryKey.js';