@zenstackhq/tanstack-query 3.0.0-beta.17 → 3.0.0-beta.18

package/dist/react.d.cts

@@ -1,93 +1,10 @@
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { UseQueryOptions, DefaultError, UseQueryResult, QueryKey, UseSuspenseQueryOptions, UseSuspenseQueryResult, UseInfiniteQueryOptions, InfiniteData, UseInfiniteQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
 import * as react from 'react';
-import { FindUniqueArgs, SelectSubset, ModelResult, FindArgs, CreateArgs, CreateManyArgs, BatchResult, CreateManyAndReturnArgs, UpdateArgs, UpdateManyArgs, UpdateManyAndReturnArgs, UpsertArgs, DeleteArgs, DeleteManyArgs, CountArgs, CountResult, AggregateArgs, AggregateResult, GroupByArgs, GroupByResult } from '@zenstackhq/orm';
+import { SelectIncludeOmit, ModelResult, FindUniqueArgs, SelectSubset, FindArgs, CreateArgs, CreateManyArgs, BatchResult, CreateManyAndReturnArgs, UpdateArgs, UpdateManyArgs, UpdateManyAndReturnArgs, UpsertArgs, DeleteArgs, DeleteManyArgs, CountArgs, Subset, CountResult, AggregateArgs, AggregateResult, GroupByArgs, GroupByResult } from '@zenstackhq/orm';
 import { SchemaDef, GetModels } from '@zenstackhq/schema';
-
-/**
- * Function signature for `fetch`.
- */
-type FetchFn = (url: string, options?: RequestInit) => Promise<Response>;
-/**
- * Result of optimistic data provider.
- */
-type OptimisticDataProviderResult = {
-    /**
-     * Kind of the result.
-     *   - Update: use the `data` field to update the query cache.
-     *   - Skip: skip the optimistic update for this query.
-     *   - ProceedDefault: proceed with the default optimistic update.
-     */
-    kind: 'Update' | 'Skip' | 'ProceedDefault';
-    /**
-     * Data to update the query cache. Only applicable if `kind` is 'Update'.
-     *
-     * If the data is an object with fields updated, it should have a `$optimistic`
-     * field set to `true`. If it's an array and an element object is created or updated,
-     * the element should have a `$optimistic` field set to `true`.
-     */
-    data?: any;
-};
-/**
- * Optimistic data provider.
- *
- * @param args Arguments.
- * @param args.queryModel The model of the query.
- * @param args.queryOperation The operation of the query, `findMany`, `count`, etc.
- * @param args.queryArgs The arguments of the query.
- * @param args.currentData The current cache data for the query.
- * @param args.mutationArgs The arguments of the mutation.
- */
-type OptimisticDataProvider = (args: {
-    queryModel: string;
-    queryOperation: string;
-    queryArgs: any;
-    currentData: any;
-    mutationArgs: any;
-}) => OptimisticDataProviderResult | Promise<OptimisticDataProviderResult>;
-/**
- * Extra mutation options.
- */
-type ExtraMutationOptions = {
-    /**
-     * Whether to automatically invalidate queries potentially affected by the mutation. Defaults to `true`.
-     */
-    invalidateQueries?: boolean;
-    /**
-     * Whether to optimistically update queries potentially affected by the mutation. Defaults to `false`.
-     */
-    optimisticUpdate?: boolean;
-    /**
-     * A callback for computing optimistic update data for each query cache entry.
-     */
-    optimisticDataProvider?: OptimisticDataProvider;
-};
-/**
- * Extra query options.
- */
-type ExtraQueryOptions = {
-    /**
-     * Whether to opt-in to optimistic updates for this query. Defaults to `true`.
-     */
-    optimisticUpdate?: boolean;
-};
-/**
- * Context type for configuring the hooks.
- */
-type APIContext = {
-    /**
-     * The endpoint to use for the queries.
-     */
-    endpoint?: string;
-    /**
-     * A custom fetch function for sending the HTTP requests.
-     */
-    fetch?: FetchFn;
-    /**
-     * If logging is enabled.
-     */
-    logging?: boolean;
-};
+import { A as APIContext, E as ExtraQueryOptions, a as ExtraMutationOptions, T as TrimDelegateModelOperations } from './types-BRIDXxNC.cjs';
+export { F as FetchFn } from './types-BRIDXxNC.cjs';
 
 /**
  * The default query endpoint.
@@ -104,7 +21,7 @@ declare const QuerySettingsProvider: react.Provider<APIContext>;
 /**
  * React context provider for configuring query settings.
  *
- * @deprecated Use `QuerySettingsProvider` instead.
+ * @deprecated Use {@link QuerySettingsProvider} instead.
  */
 declare const Provider: react.Provider<APIContext>;
 type ModelQueryOptions<T> = Omit<UseQueryOptions<T, DefaultError>, 'queryKey'> & ExtraQueryOptions;
@@ -125,10 +42,13 @@ type ModelSuspenseInfiniteQueryResult<T> = UseSuspenseInfiniteQueryResult<T, Def
 };
 type ModelMutationOptions<T, TArgs> = Omit<UseMutationOptions<T, DefaultError, TArgs>, 'mutationFn'> & ExtraMutationOptions;
 type ModelMutationResult<T, TArgs> = UseMutationResult<T, DefaultError, TArgs>;
-type SchemaHooks<Schema extends SchemaDef> = {
+type ModelMutationModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, TArgs extends SelectIncludeOmit<Schema, Model, boolean>, Array extends boolean = false> = Omit<ModelMutationResult<ModelResult<Schema, Model, TArgs>, TArgs>, 'mutateAsync'> & {
+    mutateAsync<T extends TArgs>(args: T, options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): Promise<Array extends true ? ModelResult<Schema, Model, T>[] : ModelResult<Schema, Model, T>>;
+};
+type ClientHooks<Schema extends SchemaDef> = {
     [Model in GetModels<Schema> as `${Uncapitalize<Model>}`]: ModelQueryHooks<Schema, Model>;
 };
-type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
+type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Schema>> = TrimDelegateModelOperations<Schema, Model, {
     useFindUnique<T extends FindUniqueArgs<Schema, Model>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>, options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
     useSuspenseFindUnique<T extends FindUniqueArgs<Schema, Model>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>, options?: ModelSuspenseQueryOptions<ModelResult<Schema, Model, T> | null>): ModelSuspenseQueryResult<ModelResult<Schema, Model, T> | null>;
     useFindFirst<T extends FindArgs<Schema, Model, false>>(args?: SelectSubset<T, FindArgs<Schema, Model, false>>, options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
@@ -137,26 +57,26 @@ type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Schema>>
     useSuspenseFindMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>, options?: ModelSuspenseQueryOptions<ModelResult<Schema, Model, T>[]>): ModelSuspenseQueryResult<ModelResult<Schema, Model, T>[]>;
     useInfiniteFindMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>, options?: ModelInfiniteQueryOptions<ModelResult<Schema, Model, T>[]>): ModelInfiniteQueryResult<InfiniteData<ModelResult<Schema, Model, T>[]>>;
     useSuspenseInfiniteFindMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>, options?: ModelSuspenseInfiniteQueryOptions<ModelResult<Schema, Model, T>[]>): ModelSuspenseInfiniteQueryResult<InfiniteData<ModelResult<Schema, Model, T>[]>>;
-    useCreate<T extends CreateArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationResult<ModelResult<Schema, Model, T>, T>;
+    useCreate<T extends CreateArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationModelResult<Schema, Model, T>;
     useCreateMany<T extends CreateManyArgs<Schema, Model>>(options?: ModelMutationOptions<BatchResult, T>): ModelMutationResult<BatchResult, T>;
-    useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>): ModelMutationResult<ModelResult<Schema, Model, T>[], T>;
-    useUpdate<T extends UpdateArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationResult<ModelResult<Schema, Model, T>, T>;
+    useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>): ModelMutationModelResult<Schema, Model, T, true>;
+    useUpdate<T extends UpdateArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationModelResult<Schema, Model, T>;
     useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(options?: ModelMutationOptions<BatchResult, T>): ModelMutationResult<BatchResult, T>;
-    useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>): ModelMutationResult<ModelResult<Schema, Model, T>[], T>;
-    useUpsert<T extends UpsertArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationResult<ModelResult<Schema, Model, T>, T>;
-    useDelete<T extends DeleteArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationResult<ModelResult<Schema, Model, T>, T>;
+    useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>): ModelMutationModelResult<Schema, Model, T, true>;
+    useUpsert<T extends UpsertArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationModelResult<Schema, Model, T>;
+    useDelete<T extends DeleteArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationModelResult<Schema, Model, T>;
     useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(options?: ModelMutationOptions<BatchResult, T>): ModelMutationResult<BatchResult, T>;
-    useCount<T extends CountArgs<Schema, Model>>(options?: ModelQueryOptions<CountResult<Schema, Model, T>>): ModelQueryResult<CountResult<Schema, Model, T>>;
-    useSuspenseCount<T extends CountArgs<Schema, Model>>(options?: ModelSuspenseQueryOptions<CountResult<Schema, Model, T>>): ModelSuspenseQueryResult<CountResult<Schema, Model, T>>;
-    useAggregate<T extends AggregateArgs<Schema, Model>>(options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>): ModelQueryResult<AggregateResult<Schema, Model, T>>;
-    useSuspenseAggregate<T extends AggregateArgs<Schema, Model>>(options?: ModelSuspenseQueryOptions<AggregateResult<Schema, Model, T>>): ModelSuspenseQueryResult<AggregateResult<Schema, Model, T>>;
-    useGroupBy<T extends GroupByArgs<Schema, Model>>(options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>): ModelQueryResult<GroupByResult<Schema, Model, T>>;
-    useSuspenseGroupBy<T extends GroupByArgs<Schema, Model>>(options?: ModelSuspenseQueryOptions<GroupByResult<Schema, Model, T>>): ModelSuspenseQueryResult<GroupByResult<Schema, Model, T>>;
-};
+    useCount<T extends CountArgs<Schema, Model>>(args?: Subset<T, CountArgs<Schema, Model>>, options?: ModelQueryOptions<CountResult<Schema, Model, T>>): ModelQueryResult<CountResult<Schema, Model, T>>;
+    useSuspenseCount<T extends CountArgs<Schema, Model>>(args?: Subset<T, CountArgs<Schema, Model>>, options?: ModelSuspenseQueryOptions<CountResult<Schema, Model, T>>): ModelSuspenseQueryResult<CountResult<Schema, Model, T>>;
+    useAggregate<T extends AggregateArgs<Schema, Model>>(args: Subset<T, AggregateArgs<Schema, Model>>, options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>): ModelQueryResult<AggregateResult<Schema, Model, T>>;
+    useSuspenseAggregate<T extends AggregateArgs<Schema, Model>>(args: Subset<T, AggregateArgs<Schema, Model>>, options?: ModelSuspenseQueryOptions<AggregateResult<Schema, Model, T>>): ModelSuspenseQueryResult<AggregateResult<Schema, Model, T>>;
+    useGroupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>, options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>): ModelQueryResult<GroupByResult<Schema, Model, T>>;
+    useSuspenseGroupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>, options?: ModelSuspenseQueryOptions<GroupByResult<Schema, Model, T>>): ModelSuspenseQueryResult<GroupByResult<Schema, Model, T>>;
+}>;
 /**
  * Gets data query hooks for all models in the schema.
  */
-declare function useClientQueries<Schema extends SchemaDef>(schema: Schema): SchemaHooks<Schema>;
+declare function useClientQueries<Schema extends SchemaDef>(schema: Schema): ClientHooks<Schema>;
 /**
  * Gets data query hooks for a specific model in the schema.
  */
@@ -407,7 +327,7 @@ declare function useInternalSuspenseQuery<TQueryFnData, TData>(_schema: SchemaDe
         optimisticUpdate: boolean;
     }];
 };
-declare function useInternalInfiniteQuery<TQueryFnData, TData>(_schema: SchemaDef, model: string, operation: string, args: unknown, options: Omit<UseInfiniteQueryOptions<TQueryFnData, DefaultError, InfiniteData<TData>>, 'queryKey' | 'initialPageParam'>): {
+declare function useInternalInfiniteQuery<TQueryFnData, TData>(_schema: SchemaDef, model: string, operation: string, args: unknown, options: Omit<UseInfiniteQueryOptions<TQueryFnData, DefaultError, InfiniteData<TData>>, 'queryKey' | 'initialPageParam'> | undefined): {
     data: InfiniteData<TData, unknown>;
     error: Error;
     isError: true;
@@ -691,6 +611,6 @@ declare function useInternalSuspenseInfiniteQuery<TQueryFnData, TData>(_schema:
  * @param options The react-query options.
  * @param checkReadBack Whether to check for read back errors and return undefined if found.
  */
-declare function useInternalMutation<TArgs, R = any, C extends boolean = boolean, Result = C extends true ? R | undefined : R>(schema: SchemaDef, model: string, method: 'POST' | 'PUT' | 'DELETE', operation: string, options?: Omit<UseMutationOptions<Result, DefaultError, TArgs>, 'mutationFn'> & ExtraMutationOptions, checkReadBack?: C): UseMutationResult<Result, Error, TArgs, unknown>;
+declare function useInternalMutation<TArgs, R = any>(schema: SchemaDef, model: string, method: 'POST' | 'PUT' | 'DELETE', operation: string, options?: Omit<UseMutationOptions<R, DefaultError, TArgs>, 'mutationFn'> & ExtraMutationOptions): UseMutationResult<R, Error, TArgs, unknown>;
 
-export { DEFAULT_QUERY_ENDPOINT, type FetchFn, type ModelInfiniteQueryOptions, type ModelInfiniteQueryResult, type ModelMutationOptions, type ModelMutationResult, type ModelQueryHooks, type ModelQueryOptions, type ModelQueryResult, type ModelSuspenseInfiniteQueryOptions, type ModelSuspenseInfiniteQueryResult, type ModelSuspenseQueryOptions, type ModelSuspenseQueryResult, Provider, QuerySettingsContext, QuerySettingsProvider, type SchemaHooks, useClientQueries, useInternalInfiniteQuery, useInternalMutation, useInternalQuery, useInternalSuspenseInfiniteQuery, useInternalSuspenseQuery, useModelQueries };
+export { type ClientHooks, DEFAULT_QUERY_ENDPOINT, type ModelInfiniteQueryOptions, type ModelInfiniteQueryResult, type ModelMutationModelResult, type ModelMutationOptions, type ModelMutationResult, type ModelQueryHooks, type ModelQueryOptions, type ModelQueryResult, type ModelSuspenseInfiniteQueryOptions, type ModelSuspenseInfiniteQueryResult, type ModelSuspenseQueryOptions, type ModelSuspenseQueryResult, Provider, QuerySettingsContext, QuerySettingsProvider, useClientQueries, useInternalInfiniteQuery, useInternalMutation, useInternalQuery, useInternalSuspenseInfiniteQuery, useInternalSuspenseQuery, useModelQueries };

package/dist/react.d.ts

@@ -1,93 +1,10 @@
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { UseQueryOptions, DefaultError, UseQueryResult, QueryKey, UseSuspenseQueryOptions, UseSuspenseQueryResult, UseInfiniteQueryOptions, InfiniteData, UseInfiniteQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
 import * as react from 'react';
-import { FindUniqueArgs, SelectSubset, ModelResult, FindArgs, CreateArgs, CreateManyArgs, BatchResult, CreateManyAndReturnArgs, UpdateArgs, UpdateManyArgs, UpdateManyAndReturnArgs, UpsertArgs, DeleteArgs, DeleteManyArgs, CountArgs, CountResult, AggregateArgs, AggregateResult, GroupByArgs, GroupByResult } from '@zenstackhq/orm';
+import { SelectIncludeOmit, ModelResult, FindUniqueArgs, SelectSubset, FindArgs, CreateArgs, CreateManyArgs, BatchResult, CreateManyAndReturnArgs, UpdateArgs, UpdateManyArgs, UpdateManyAndReturnArgs, UpsertArgs, DeleteArgs, DeleteManyArgs, CountArgs, Subset, CountResult, AggregateArgs, AggregateResult, GroupByArgs, GroupByResult } from '@zenstackhq/orm';
 import { SchemaDef, GetModels } from '@zenstackhq/schema';
-
-/**
- * Function signature for `fetch`.
- */
-type FetchFn = (url: string, options?: RequestInit) => Promise<Response>;
-/**
- * Result of optimistic data provider.
- */
-type OptimisticDataProviderResult = {
-    /**
-     * Kind of the result.
-     *   - Update: use the `data` field to update the query cache.
-     *   - Skip: skip the optimistic update for this query.
-     *   - ProceedDefault: proceed with the default optimistic update.
-     */
-    kind: 'Update' | 'Skip' | 'ProceedDefault';
-    /**
-     * Data to update the query cache. Only applicable if `kind` is 'Update'.
-     *
-     * If the data is an object with fields updated, it should have a `$optimistic`
-     * field set to `true`. If it's an array and an element object is created or updated,
-     * the element should have a `$optimistic` field set to `true`.
-     */
-    data?: any;
-};
-/**
- * Optimistic data provider.
- *
- * @param args Arguments.
- * @param args.queryModel The model of the query.
- * @param args.queryOperation The operation of the query, `findMany`, `count`, etc.
- * @param args.queryArgs The arguments of the query.
- * @param args.currentData The current cache data for the query.
- * @param args.mutationArgs The arguments of the mutation.
- */
-type OptimisticDataProvider = (args: {
-    queryModel: string;
-    queryOperation: string;
-    queryArgs: any;
-    currentData: any;
-    mutationArgs: any;
-}) => OptimisticDataProviderResult | Promise<OptimisticDataProviderResult>;
-/**
- * Extra mutation options.
- */
-type ExtraMutationOptions = {
-    /**
-     * Whether to automatically invalidate queries potentially affected by the mutation. Defaults to `true`.
-     */
-    invalidateQueries?: boolean;
-    /**
-     * Whether to optimistically update queries potentially affected by the mutation. Defaults to `false`.
-     */
-    optimisticUpdate?: boolean;
-    /**
-     * A callback for computing optimistic update data for each query cache entry.
-     */
-    optimisticDataProvider?: OptimisticDataProvider;
-};
-/**
- * Extra query options.
- */
-type ExtraQueryOptions = {
-    /**
-     * Whether to opt-in to optimistic updates for this query. Defaults to `true`.
-     */
-    optimisticUpdate?: boolean;
-};
-/**
- * Context type for configuring the hooks.
- */
-type APIContext = {
-    /**
-     * The endpoint to use for the queries.
-     */
-    endpoint?: string;
-    /**
-     * A custom fetch function for sending the HTTP requests.
-     */
-    fetch?: FetchFn;
-    /**
-     * If logging is enabled.
-     */
-    logging?: boolean;
-};
+import { A as APIContext, E as ExtraQueryOptions, a as ExtraMutationOptions, T as TrimDelegateModelOperations } from './types-BRIDXxNC.js';
+export { F as FetchFn } from './types-BRIDXxNC.js';
 
 /**
  * The default query endpoint.
@@ -104,7 +21,7 @@ declare const QuerySettingsProvider: react.Provider<APIContext>;
 /**
  * React context provider for configuring query settings.
  *
- * @deprecated Use `QuerySettingsProvider` instead.
+ * @deprecated Use {@link QuerySettingsProvider} instead.
  */
 declare const Provider: react.Provider<APIContext>;
 type ModelQueryOptions<T> = Omit<UseQueryOptions<T, DefaultError>, 'queryKey'> & ExtraQueryOptions;
@@ -125,10 +42,13 @@ type ModelSuspenseInfiniteQueryResult<T> = UseSuspenseInfiniteQueryResult<T, Def
 };
 type ModelMutationOptions<T, TArgs> = Omit<UseMutationOptions<T, DefaultError, TArgs>, 'mutationFn'> & ExtraMutationOptions;
 type ModelMutationResult<T, TArgs> = UseMutationResult<T, DefaultError, TArgs>;
-type SchemaHooks<Schema extends SchemaDef> = {
+type ModelMutationModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, TArgs extends SelectIncludeOmit<Schema, Model, boolean>, Array extends boolean = false> = Omit<ModelMutationResult<ModelResult<Schema, Model, TArgs>, TArgs>, 'mutateAsync'> & {
+    mutateAsync<T extends TArgs>(args: T, options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): Promise<Array extends true ? ModelResult<Schema, Model, T>[] : ModelResult<Schema, Model, T>>;
+};
+type ClientHooks<Schema extends SchemaDef> = {
     [Model in GetModels<Schema> as `${Uncapitalize<Model>}`]: ModelQueryHooks<Schema, Model>;
 };
-type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
+type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Schema>> = TrimDelegateModelOperations<Schema, Model, {
     useFindUnique<T extends FindUniqueArgs<Schema, Model>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>, options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
     useSuspenseFindUnique<T extends FindUniqueArgs<Schema, Model>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>, options?: ModelSuspenseQueryOptions<ModelResult<Schema, Model, T> | null>): ModelSuspenseQueryResult<ModelResult<Schema, Model, T> | null>;
     useFindFirst<T extends FindArgs<Schema, Model, false>>(args?: SelectSubset<T, FindArgs<Schema, Model, false>>, options?: ModelQueryOptions<ModelResult<Schema, Model, T> | null>): ModelQueryResult<ModelResult<Schema, Model, T> | null>;
@@ -137,26 +57,26 @@ type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Schema>>
     useSuspenseFindMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>, options?: ModelSuspenseQueryOptions<ModelResult<Schema, Model, T>[]>): ModelSuspenseQueryResult<ModelResult<Schema, Model, T>[]>;
     useInfiniteFindMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>, options?: ModelInfiniteQueryOptions<ModelResult<Schema, Model, T>[]>): ModelInfiniteQueryResult<InfiniteData<ModelResult<Schema, Model, T>[]>>;
     useSuspenseInfiniteFindMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>, options?: ModelSuspenseInfiniteQueryOptions<ModelResult<Schema, Model, T>[]>): ModelSuspenseInfiniteQueryResult<InfiniteData<ModelResult<Schema, Model, T>[]>>;
-    useCreate<T extends CreateArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationResult<ModelResult<Schema, Model, T>, T>;
+    useCreate<T extends CreateArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationModelResult<Schema, Model, T>;
     useCreateMany<T extends CreateManyArgs<Schema, Model>>(options?: ModelMutationOptions<BatchResult, T>): ModelMutationResult<BatchResult, T>;
-    useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>): ModelMutationResult<ModelResult<Schema, Model, T>[], T>;
-    useUpdate<T extends UpdateArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationResult<ModelResult<Schema, Model, T>, T>;
+    useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>): ModelMutationModelResult<Schema, Model, T, true>;
+    useUpdate<T extends UpdateArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationModelResult<Schema, Model, T>;
     useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(options?: ModelMutationOptions<BatchResult, T>): ModelMutationResult<BatchResult, T>;
-    useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>): ModelMutationResult<ModelResult<Schema, Model, T>[], T>;
-    useUpsert<T extends UpsertArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationResult<ModelResult<Schema, Model, T>, T>;
-    useDelete<T extends DeleteArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationResult<ModelResult<Schema, Model, T>, T>;
+    useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>[], T>): ModelMutationModelResult<Schema, Model, T, true>;
+    useUpsert<T extends UpsertArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationModelResult<Schema, Model, T>;
+    useDelete<T extends DeleteArgs<Schema, Model>>(options?: ModelMutationOptions<ModelResult<Schema, Model, T>, T>): ModelMutationModelResult<Schema, Model, T>;
     useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(options?: ModelMutationOptions<BatchResult, T>): ModelMutationResult<BatchResult, T>;
-    useCount<T extends CountArgs<Schema, Model>>(options?: ModelQueryOptions<CountResult<Schema, Model, T>>): ModelQueryResult<CountResult<Schema, Model, T>>;
-    useSuspenseCount<T extends CountArgs<Schema, Model>>(options?: ModelSuspenseQueryOptions<CountResult<Schema, Model, T>>): ModelSuspenseQueryResult<CountResult<Schema, Model, T>>;
-    useAggregate<T extends AggregateArgs<Schema, Model>>(options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>): ModelQueryResult<AggregateResult<Schema, Model, T>>;
-    useSuspenseAggregate<T extends AggregateArgs<Schema, Model>>(options?: ModelSuspenseQueryOptions<AggregateResult<Schema, Model, T>>): ModelSuspenseQueryResult<AggregateResult<Schema, Model, T>>;
-    useGroupBy<T extends GroupByArgs<Schema, Model>>(options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>): ModelQueryResult<GroupByResult<Schema, Model, T>>;
-    useSuspenseGroupBy<T extends GroupByArgs<Schema, Model>>(options?: ModelSuspenseQueryOptions<GroupByResult<Schema, Model, T>>): ModelSuspenseQueryResult<GroupByResult<Schema, Model, T>>;
-};
+    useCount<T extends CountArgs<Schema, Model>>(args?: Subset<T, CountArgs<Schema, Model>>, options?: ModelQueryOptions<CountResult<Schema, Model, T>>): ModelQueryResult<CountResult<Schema, Model, T>>;
+    useSuspenseCount<T extends CountArgs<Schema, Model>>(args?: Subset<T, CountArgs<Schema, Model>>, options?: ModelSuspenseQueryOptions<CountResult<Schema, Model, T>>): ModelSuspenseQueryResult<CountResult<Schema, Model, T>>;
+    useAggregate<T extends AggregateArgs<Schema, Model>>(args: Subset<T, AggregateArgs<Schema, Model>>, options?: ModelQueryOptions<AggregateResult<Schema, Model, T>>): ModelQueryResult<AggregateResult<Schema, Model, T>>;
+    useSuspenseAggregate<T extends AggregateArgs<Schema, Model>>(args: Subset<T, AggregateArgs<Schema, Model>>, options?: ModelSuspenseQueryOptions<AggregateResult<Schema, Model, T>>): ModelSuspenseQueryResult<AggregateResult<Schema, Model, T>>;
+    useGroupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>, options?: ModelQueryOptions<GroupByResult<Schema, Model, T>>): ModelQueryResult<GroupByResult<Schema, Model, T>>;
+    useSuspenseGroupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>, options?: ModelSuspenseQueryOptions<GroupByResult<Schema, Model, T>>): ModelSuspenseQueryResult<GroupByResult<Schema, Model, T>>;
+}>;
 /**
  * Gets data query hooks for all models in the schema.
  */
-declare function useClientQueries<Schema extends SchemaDef>(schema: Schema): SchemaHooks<Schema>;
+declare function useClientQueries<Schema extends SchemaDef>(schema: Schema): ClientHooks<Schema>;
 /**
  * Gets data query hooks for a specific model in the schema.
  */
@@ -407,7 +327,7 @@ declare function useInternalSuspenseQuery<TQueryFnData, TData>(_schema: SchemaDe
         optimisticUpdate: boolean;
     }];
 };
-declare function useInternalInfiniteQuery<TQueryFnData, TData>(_schema: SchemaDef, model: string, operation: string, args: unknown, options: Omit<UseInfiniteQueryOptions<TQueryFnData, DefaultError, InfiniteData<TData>>, 'queryKey' | 'initialPageParam'>): {
+declare function useInternalInfiniteQuery<TQueryFnData, TData>(_schema: SchemaDef, model: string, operation: string, args: unknown, options: Omit<UseInfiniteQueryOptions<TQueryFnData, DefaultError, InfiniteData<TData>>, 'queryKey' | 'initialPageParam'> | undefined): {
     data: InfiniteData<TData, unknown>;
     error: Error;
     isError: true;
@@ -691,6 +611,6 @@ declare function useInternalSuspenseInfiniteQuery<TQueryFnData, TData>(_schema:
  * @param options The react-query options.
  * @param checkReadBack Whether to check for read back errors and return undefined if found.
  */
-declare function useInternalMutation<TArgs, R = any, C extends boolean = boolean, Result = C extends true ? R | undefined : R>(schema: SchemaDef, model: string, method: 'POST' | 'PUT' | 'DELETE', operation: string, options?: Omit<UseMutationOptions<Result, DefaultError, TArgs>, 'mutationFn'> & ExtraMutationOptions, checkReadBack?: C): UseMutationResult<Result, Error, TArgs, unknown>;
+declare function useInternalMutation<TArgs, R = any>(schema: SchemaDef, model: string, method: 'POST' | 'PUT' | 'DELETE', operation: string, options?: Omit<UseMutationOptions<R, DefaultError, TArgs>, 'mutationFn'> & ExtraMutationOptions): UseMutationResult<R, Error, TArgs, unknown>;
 
-export { DEFAULT_QUERY_ENDPOINT, type FetchFn, type ModelInfiniteQueryOptions, type ModelInfiniteQueryResult, type ModelMutationOptions, type ModelMutationResult, type ModelQueryHooks, type ModelQueryOptions, type ModelQueryResult, type ModelSuspenseInfiniteQueryOptions, type ModelSuspenseInfiniteQueryResult, type ModelSuspenseQueryOptions, type ModelSuspenseQueryResult, Provider, QuerySettingsContext, QuerySettingsProvider, type SchemaHooks, useClientQueries, useInternalInfiniteQuery, useInternalMutation, useInternalQuery, useInternalSuspenseInfiniteQuery, useInternalSuspenseQuery, useModelQueries };
+export { type ClientHooks, DEFAULT_QUERY_ENDPOINT, type ModelInfiniteQueryOptions, type ModelInfiniteQueryResult, type ModelMutationModelResult, type ModelMutationOptions, type ModelMutationResult, type ModelQueryHooks, type ModelQueryOptions, type ModelQueryResult, type ModelSuspenseInfiniteQueryOptions, type ModelSuspenseInfiniteQueryResult, type ModelSuspenseQueryOptions, type ModelSuspenseQueryResult, Provider, QuerySettingsContext, QuerySettingsProvider, useClientQueries, useInternalInfiniteQuery, useInternalMutation, useInternalQuery, useInternalSuspenseInfiniteQuery, useInternalSuspenseQuery, useModelQueries };

package/dist/react.js

@@ -753,12 +753,12 @@ __name(deserialize, "deserialize");
 
 // src/utils/common.ts
 var QUERY_KEY_PREFIX = "zenstack";
-async function fetcher(url, options, customFetch, checkReadBack) {
+async function fetcher(url, options, customFetch) {
   const _fetch = customFetch ?? fetch;
   const res = await _fetch(url, options);
   if (!res.ok) {
     const errData = unmarshal(await res.text());
-    if (checkReadBack !== false && errData.error?.rejectedByPolicy && errData.error?.rejectReason === "cannot-read-back") {
+    if (errData.error?.rejectedByPolicy && errData.error?.rejectReason === "cannot-read-back") {
       return void 0;
     }
     const error = new Error("An error occurred while fetching the data.");
@@ -820,8 +820,8 @@ function unmarshal(value) {
   }
 }
 __name(unmarshal, "unmarshal");
-function makeUrl(url, model, operation, args) {
-  const baseUrl = `${url}/${lowerCaseFirst(model)}/${operation}`;
+function makeUrl(endpoint, model, operation, args) {
+  const baseUrl = `${endpoint}/${lowerCaseFirst(model)}/${operation}`;
   if (!args) {
     return baseUrl;
   }
@@ -1006,49 +1006,49 @@ function useModelQueries(schema, model) {
       return useInternalSuspenseInfiniteQuery(schema, modelName, "findMany", args, options);
     }, "useSuspenseInfiniteFindMany"),
     useCreate: /* @__PURE__ */ __name((options) => {
-      return useInternalMutation(schema, modelName, "POST", "create", options, true);
+      return useInternalMutation(schema, modelName, "POST", "create", options);
     }, "useCreate"),
     useCreateMany: /* @__PURE__ */ __name((options) => {
-      return useInternalMutation(schema, modelName, "POST", "createMany", options, false);
+      return useInternalMutation(schema, modelName, "POST", "createMany", options);
     }, "useCreateMany"),
     useCreateManyAndReturn: /* @__PURE__ */ __name((options) => {
-      return useInternalMutation(schema, modelName, "POST", "createManyAndReturn", options, true);
+      return useInternalMutation(schema, modelName, "POST", "createManyAndReturn", options);
     }, "useCreateManyAndReturn"),
     useUpdate: /* @__PURE__ */ __name((options) => {
-      return useInternalMutation(schema, modelName, "PUT", "update", options, true);
+      return useInternalMutation(schema, modelName, "PUT", "update", options);
     }, "useUpdate"),
     useUpdateMany: /* @__PURE__ */ __name((options) => {
-      return useInternalMutation(schema, modelName, "PUT", "updateMany", options, false);
+      return useInternalMutation(schema, modelName, "PUT", "updateMany", options);
     }, "useUpdateMany"),
     useUpdateManyAndReturn: /* @__PURE__ */ __name((options) => {
-      return useInternalMutation(schema, modelName, "PUT", "updateManyAndReturn", options, true);
+      return useInternalMutation(schema, modelName, "PUT", "updateManyAndReturn", options);
     }, "useUpdateManyAndReturn"),
     useUpsert: /* @__PURE__ */ __name((options) => {
-      return useInternalMutation(schema, modelName, "POST", "upsert", options, true);
+      return useInternalMutation(schema, modelName, "POST", "upsert", options);
     }, "useUpsert"),
     useDelete: /* @__PURE__ */ __name((options) => {
-      return useInternalMutation(schema, modelName, "DELETE", "delete", options, true);
+      return useInternalMutation(schema, modelName, "DELETE", "delete", options);
     }, "useDelete"),
     useDeleteMany: /* @__PURE__ */ __name((options) => {
-      return useInternalMutation(schema, modelName, "DELETE", "deleteMany", options, false);
+      return useInternalMutation(schema, modelName, "DELETE", "deleteMany", options);
     }, "useDeleteMany"),
-    useCount: /* @__PURE__ */ __name((options) => {
-      return useInternalQuery(schema, modelName, "count", void 0, options);
+    useCount: /* @__PURE__ */ __name((args, options) => {
+      return useInternalQuery(schema, modelName, "count", args, options);
     }, "useCount"),
-    useSuspenseCount: /* @__PURE__ */ __name((options) => {
-      return useInternalSuspenseQuery(schema, modelName, "count", void 0, options);
+    useSuspenseCount: /* @__PURE__ */ __name((args, options) => {
+      return useInternalSuspenseQuery(schema, modelName, "count", args, options);
     }, "useSuspenseCount"),
-    useAggregate: /* @__PURE__ */ __name((options) => {
-      return useInternalQuery(schema, modelName, "aggregate", void 0, options);
+    useAggregate: /* @__PURE__ */ __name((args, options) => {
+      return useInternalQuery(schema, modelName, "aggregate", args, options);
     }, "useAggregate"),
-    useSuspenseAggregate: /* @__PURE__ */ __name((options) => {
-      return useInternalSuspenseQuery(schema, modelName, "aggregate", void 0, options);
+    useSuspenseAggregate: /* @__PURE__ */ __name((args, options) => {
+      return useInternalSuspenseQuery(schema, modelName, "aggregate", args, options);
     }, "useSuspenseAggregate"),
-    useGroupBy: /* @__PURE__ */ __name((options) => {
-      return useInternalQuery(schema, modelName, "groupBy", void 0, options);
+    useGroupBy: /* @__PURE__ */ __name((args, options) => {
+      return useInternalQuery(schema, modelName, "groupBy", args, options);
     }, "useGroupBy"),
-    useSuspenseGroupBy: /* @__PURE__ */ __name((options) => {
-      return useInternalSuspenseQuery(schema, modelName, "groupBy", void 0, options);
+    useSuspenseGroupBy: /* @__PURE__ */ __name((args, options) => {
+      return useInternalSuspenseQuery(schema, modelName, "groupBy", args, options);
     }, "useSuspenseGroupBy")
   };
 }
@@ -1066,7 +1066,7 @@ function useInternalQuery(_schema, model, operation, args, options) {
       queryKey,
       queryFn: /* @__PURE__ */ __name(({ signal }) => fetcher(reqUrl, {
         signal
-      }, fetch2, false), "queryFn"),
+      }, fetch2), "queryFn"),
       ...options
     })
   };
@@ -1085,13 +1085,16 @@ function useInternalSuspenseQuery(_schema, model, operation, args, options) {
       queryKey,
       queryFn: /* @__PURE__ */ __name(({ signal }) => fetcher(reqUrl, {
         signal
-      }, fetch2, false), "queryFn"),
+      }, fetch2), "queryFn"),
       ...options
     })
   };
 }
 __name(useInternalSuspenseQuery, "useInternalSuspenseQuery");
 function useInternalInfiniteQuery(_schema, model, operation, args, options) {
+  options = options ?? {
+    getNextPageParam: /* @__PURE__ */ __name(() => void 0, "getNextPageParam")
+  };
   const { endpoint, fetch: fetch2 } = useHooksContext();
   const queryKey = getQueryKey(model, operation, args, {
     infinite: true,
@@ -1104,7 +1107,7 @@ function useInternalInfiniteQuery(_schema, model, operation, args, options) {
       queryFn: /* @__PURE__ */ __name(({ pageParam, signal }) => {
         return fetcher(makeUrl(endpoint, model, operation, pageParam ?? args), {
           signal
-        }, fetch2, false);
+        }, fetch2);
       }, "queryFn"),
       initialPageParam: args,
       ...options
@@ -1125,7 +1128,7 @@ function useInternalSuspenseInfiniteQuery(_schema, model, operation, args, optio
       queryFn: /* @__PURE__ */ __name(({ pageParam, signal }) => {
         return fetcher(makeUrl(endpoint, model, operation, pageParam ?? args), {
           signal
-        }, fetch2, false);
+        }, fetch2);
       }, "queryFn"),
       initialPageParam: args,
       ...options
@@ -1133,8 +1136,8 @@ function useInternalSuspenseInfiniteQuery(_schema, model, operation, args, optio
   };
 }
 __name(useInternalSuspenseInfiniteQuery, "useInternalSuspenseInfiniteQuery");
-function useInternalMutation(schema, model, method, operation, options, checkReadBack) {
-  const { endpoint, fetch: fetch2 } = useHooksContext();
+function useInternalMutation(schema, model, method, operation, options) {
+  const { endpoint, fetch: fetch2, logging } = useHooksContext();
   const queryClient = useQueryClient();
   const mutationFn = /* @__PURE__ */ __name((data) => {
     const reqUrl = method === "DELETE" ? makeUrl(endpoint, model, operation, data) : makeUrl(endpoint, model, operation);
@@ -1147,7 +1150,7 @@ function useInternalMutation(schema, model, method, operation, options, checkRea
         body: marshal(data)
       }
     };
-    return fetcher(reqUrl, fetchInit, fetch2, checkReadBack);
+    return fetcher(reqUrl, fetchInit, fetch2);
   }, "mutationFn");
   const finalOptions = {
     ...options,
@@ -1155,7 +1158,6 @@ function useInternalMutation(schema, model, method, operation, options, checkRea
   };
   const invalidateQueries = options?.invalidateQueries !== false;
   const optimisticUpdate2 = !!options?.optimisticUpdate;
-  const { logging } = useContext(QuerySettingsContext);
   if (operation) {
     if (invalidateQueries) {
       setupInvalidation(model, operation, schema, finalOptions, (predicate) => queryClient.invalidateQueries({