@spoosh/react 0.4.1 → 0.5.1

package/dist/index.d.mts

@@ -1,27 +1,34 @@
-import * as _spoosh_core from '@spoosh/core';
-import { ReadClient, TagOptions, SpooshResponse, WriteClient, SpooshPlugin, PluginTypeConfig, SpooshOptions, MergePluginResults, StateManager, EventEmitter, PluginExecutor, PluginArray, MergePluginOptions, ResolverContext, ResolveResultTypes, MergePluginInstanceApi } from '@spoosh/core';
+import { ReadClient, TagMode, SpooshResponse, WriteClient, SpooshPlugin, PluginTypeConfig, SpooshOptions, MergePluginResults, StateManager, EventEmitter, PluginExecutor, PluginArray, ResolveTypes, MergePluginOptions, ResolverContext, ResolveResultTypes, MergePluginInstanceApi } from '@spoosh/core';
 
 type PluginHooksConfig<TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = {
     baseUrl: string;
     defaultOptions?: SpooshOptions;
     plugins: TPlugins;
 };
+type TagModeInArray = "all" | "self";
 /**
  * Base options for `useRead` hook.
  */
-type BaseReadOptions = TagOptions & {
+type BaseReadOptions = {
     /** Whether to fetch automatically on mount. Default: true */
     enabled?: boolean;
+    /**
+     * Unified tag option
+     * - String: mode only ('all' | 'self' | 'none')
+     * - Array: custom tags only OR [mode keyword mixed with custom tags]
+     *   - 'all' or 'self' can be used in arrays
+     *   - 'none' should only be used as string (use `tags: 'none'` not in array)
+     */
+    tags?: TagMode | (TagModeInArray | (string & {}))[];
 };
-
 /**
  * Result returned by `useRead` hook.
  *
  * @template TData - The response data type
  * @template TError - The error type
- * @template TPluginResult - Plugin-provided result fields
+ * @template TMeta - Plugin-provided metadata fields
  */
-type BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> = {
+type BaseReadResult<TData, TError, TMeta = Record<string, unknown>> = {
     /** True during the initial load (no data yet) */
     loading: boolean;
     /** True during any fetch operation */
@@ -31,7 +38,7 @@ type BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> = {
     /** Error from the last failed request */
     error: TError | undefined;
     /** Plugin-provided metadata */
-    meta: TPluginResult;
+    meta: TMeta;
     /** Abort the current fetch operation */
     abort: () => void;
     /** Manually trigger a refetch */
@@ -43,9 +50,9 @@ type BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> = {
  * @template TData - The response data type
  * @template TError - The error type
  * @template TOptions - The trigger options type
- * @template TPluginResult - Plugin-provided result fields
+ * @template TMeta - Plugin-provided metadata fields
  */
-type BaseWriteResult<TData, TError, TOptions, TPluginResult = Record<string, unknown>> = {
+type BaseWriteResult<TData, TError, TOptions, TMeta = Record<string, unknown>> = {
     /** Execute the mutation with optional options */
     trigger: (options?: TOptions) => Promise<SpooshResponse<TData, TError>>;
     /** True while the mutation is in progress */
@@ -55,7 +62,7 @@ type BaseWriteResult<TData, TError, TOptions, TPluginResult = Record<string, unk
     /** Error from the last failed request */
     error: TError | undefined;
     /** Plugin-provided metadata */
-    meta: TPluginResult;
+    meta: TMeta;
     /** Reset the state to initial values */
     reset: () => void;
     /** Abort the current mutation */
@@ -80,8 +87,8 @@ type InputFields<TQuery, TBody, TParamNames extends string> = OptionalQueryField
 type WriteResponseInputFields<TQuery, TBody, TParamNames extends string> = [TQuery, TBody, TParamNames] extends [never, never, never] ? object : {
     input: InputFields<TQuery, TBody, TParamNames> | undefined;
 };
-type UseReadResult<TData, TError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = BaseReadResult<TData, TError> & MergePluginResults<TPlugins>["read"];
-type UseWriteResult<TData, TError, TOptions, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = BaseWriteResult<TData, TError, TOptions> & MergePluginResults<TPlugins>["write"];
+type UseReadResult<TData, TError, TMeta, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = BaseReadResult<TData, TError, TMeta> & MergePluginResults<TPlugins>["read"];
+type UseWriteResult<TData, TError, TOptions, TMeta, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = BaseWriteResult<TData, TError, TOptions, TMeta> & MergePluginResults<TPlugins>["write"];
 type ReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
 type WriteApiClient<TSchema, TDefaultError> = WriteClient<TSchema, TDefaultError>;
 type SuccessResponse<T> = Extract<T, {
@@ -177,9 +184,17 @@ type InfinitePrevContext<TData, TRequest> = {
  * @template TItem - The item type after merging all responses
  * @template TRequest - The request options type (query, params, body)
  */
-type BaseInfiniteReadOptions<TData, TItem, TRequest = AnyInfiniteRequestOptions> = TagOptions & {
+type BaseInfiniteReadOptions<TData, TItem, TRequest = AnyInfiniteRequestOptions> = {
     /** Whether to fetch automatically on mount. Default: true */
     enabled?: boolean;
+    /**
+     * Unified tag option
+     * - String: mode only ('all' | 'self' | 'none')
+     * - Array: custom tags only OR [mode keyword mixed with custom tags]
+     *   - 'all' or 'self' can be used in arrays
+     *   - 'none' should only be used as string (use `tags: 'none'` not in array)
+     */
+    tags?: TagMode | (TagModeInArray | (string & {}))[];
     /** Callback to determine if there's a next page to fetch */
     canFetchNext: (ctx: InfiniteNextContext<TData, TRequest>) => boolean;
     /** Callback to build the request options for the next page */
@@ -233,16 +248,21 @@ type UseInfiniteReadResult<TData, TError, TItem, TPlugins extends readonly Spoos
 type InfiniteReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
 
 type InferError<T, TDefaultError> = [T] extends [unknown] ? TDefaultError : T;
-type ExtractParamsRecord<T> = ExtractResponseParamNames<T> extends never ? never : Record<ExtractResponseParamNames<T>, string | number>;
-type ReadResolverContext<TSchema, TReadFn, TDefaultError> = ResolverContext<TSchema, ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractParamsRecord<TReadFn>>;
-type ResolvedReadOptions<TSchema, TPlugins extends PluginArray, TReadFn, TDefaultError> = _spoosh_core.ResolveTypes<MergePluginOptions<TPlugins>["read"], ReadResolverContext<TSchema, TReadFn, TDefaultError>>;
 type WriteResolverContext<TSchema, TMethod, TDefaultError> = ResolverContext<TSchema, ExtractMethodData<TMethod>, InferError<ExtractMethodError<TMethod>, TDefaultError>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>;
-type ResolvedWriteOptions<TSchema, TPlugins extends PluginArray, TMethod, TDefaultError> = _spoosh_core.ResolveTypes<MergePluginOptions<TPlugins>["write"], WriteResolverContext<TSchema, TMethod, TDefaultError>>;
-type UseReadFn<TDefaultError, TSchema, TPlugins extends PluginArray> = <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
-    data?: unknown;
-    error?: unknown;
-}>>(readFn: TReadFn, readOptions?: BaseReadOptions & ResolvedReadOptions<TSchema, TPlugins, TReadFn, TDefaultError>) => BaseReadResult<ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, ResolveResultTypes<MergePluginResults<TPlugins>["read"], BaseReadOptions & ResolvedReadOptions<TSchema, TPlugins, TReadFn, TDefaultError>>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
-type UseWriteFn<TDefaultError, TSchema, TPlugins extends PluginArray> = <TMethod extends (...args: never) => Promise<SpooshResponse<unknown, unknown>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<ExtractMethodData<TMethod>, InferError<ExtractMethodError<TMethod>, TDefaultError>, Parameters<TMethod>[0] & ResolvedWriteOptions<TSchema, TPlugins, TMethod, TDefaultError>, ResolveResultTypes<MergePluginResults<TPlugins>["write"], Parameters<TMethod>[0] & ResolvedWriteOptions<TSchema, TPlugins, TMethod, TDefaultError>>> & WriteResponseInputFields<ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod>>;
+type ResolvedWriteOptions<TSchema, TPlugins extends PluginArray, TMethod, TDefaultError> = ResolveTypes<MergePluginOptions<TPlugins>["write"], WriteResolverContext<TSchema, TMethod, TDefaultError>>;
+type UseReadFn<TDefaultError, TSchema, TPlugins extends PluginArray> = {
+    <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
+        data?: unknown;
+        error?: unknown;
+    }>, TReadOpts>(readFn: TReadFn, readOptions: TReadOpts & BaseReadOptions & ResolveTypes<MergePluginOptions<TPlugins>["read"], ResolverContext<TSchema, ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn> extends never ? never : Record<ExtractResponseParamNames<TReadFn>, string | number>>>): BaseReadResult<ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, ResolveResultTypes<MergePluginResults<TPlugins>["read"], TReadOpts>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+    <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
+        data?: unknown;
+        error?: unknown;
+    }>>(readFn: TReadFn): BaseReadResult<ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, MergePluginResults<TPlugins>["read"]> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+};
+type UseWriteFn<TDefaultError, TSchema, TPlugins extends PluginArray> = {
+    <TMethod extends (...args: never) => Promise<SpooshResponse<unknown, unknown>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod): BaseWriteResult<ExtractMethodData<TMethod>, InferError<ExtractMethodError<TMethod>, TDefaultError>, Parameters<TMethod>[0] & ResolvedWriteOptions<TSchema, TPlugins, TMethod, TDefaultError>, MergePluginResults<TPlugins>["write"]> & WriteResponseInputFields<ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod>>;
+};
 type InfiniteReadResolverContext<TSchema, TData, TError, TRequest> = ResolverContext<TSchema, TData, TError, TRequest extends {
     query: infer Q;
 } ? Q : never, TRequest extends {
@@ -250,7 +270,7 @@ type InfiniteReadResolverContext<TSchema, TData, TError, TRequest> = ResolverCon
 } ? B : never, TRequest extends {
     params: infer P;
 } ? P : never>;
-type ResolvedInfiniteReadOptions<TSchema, TPlugins extends PluginArray, TData, TError, TRequest> = _spoosh_core.ResolveTypes<MergePluginOptions<TPlugins>["infiniteRead"], InfiniteReadResolverContext<TSchema, TData, TError, TRequest>>;
+type ResolvedInfiniteReadOptions<TSchema, TPlugins extends PluginArray, TData, TError, TRequest> = ResolveTypes<MergePluginOptions<TPlugins>["infiniteRead"], InfiniteReadResolverContext<TSchema, TData, TError, TRequest>>;
 type UseInfiniteReadFn<TDefaultError, TSchema, TPlugins extends PluginArray> = <TData, TItem, TError = TDefaultError, TRequest extends AnyInfiniteRequestOptions = AnyInfiniteRequestOptions>(readFn: (api: InfiniteReadApiClient<TSchema, TDefaultError>) => Promise<SpooshResponse<TData, TError>>, readOptions: BaseInfiniteReadOptions<TData, TItem, TRequest> & ResolvedInfiniteReadOptions<TSchema, TPlugins, TData, TError, TRequest>) => BaseInfiniteReadResult<TData, TError, TItem, MergePluginResults<TPlugins>["read"]>;
 /**
  * Spoosh React hooks interface containing useRead, useWrite, and useInfiniteRead.
@@ -358,42 +378,44 @@ type SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins> = {
  */
 declare function createReactSpoosh<TSchema, TDefaultError, TPlugins extends PluginArray, TApi>(instance: SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins>): SpooshReactHooks<TDefaultError, TSchema, TPlugins>;
 
-declare function createUseRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
-    data?: unknown;
-    error?: unknown;
-}>, TReadOpts extends BaseReadOptions & (((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_1;
-} ? R_1 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_1;
-} ? R_1 : object : object : never : never) ? T_4 extends unknown ? (x: T_4) => void : never : never : never) extends (x: infer I) => void ? I : never) = BaseReadOptions & (((TPlugins[number] extends infer T_6 ? T_6 extends TPlugins[number] ? T_6 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_1;
-} ? R_1 : object : object : never : never) extends infer T_7 ? T_7 extends (TPlugins[number] extends infer T_8 ? T_8 extends TPlugins[number] ? T_8 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_1;
-} ? R_1 : object : object : never : never) ? T_7 extends unknown ? (x: T_7) => void : never : never : never) extends (x: infer I) => void ? I : never)>(readFn: TReadFn, readOptions?: TReadOpts) => BaseReadResult<TReadFn extends (...args: unknown[]) => Promise<{
-    data: infer D;
-}> ? D : unknown, [TReadFn extends (...args: unknown[]) => Promise<{
-    error: infer E;
-}> ? E : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: unknown[]) => Promise<{
-    error: infer E;
-}> ? E : unknown, ResolveResultTypes<((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    readResult: infer R;
-} ? R : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    readResult: infer R;
-} ? R : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TReadOpts>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+declare function createUseRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): {
+    <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
+        data?: unknown;
+        error?: unknown;
+    }>, TReadOpts>(readFn: TReadFn, readOptions: TReadOpts & BaseReadOptions & ResolveTypes<((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+        readOptions: infer R;
+    } ? R : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+        readOptions: infer R;
+    } ? R : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, TReadFn extends (...args: unknown[]) => Promise<{
+        data: infer D;
+    }> ? D : unknown, [TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown, ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn> extends never ? never : Record<ExtractResponseParamNames<TReadFn>, string | number>>>): BaseReadResult<TReadFn extends (...args: unknown[]) => Promise<{
+        data: infer D;
+    }> ? D : unknown, [TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown, ResolveResultTypes<MergePluginResults<TPlugins>["read"], TReadOpts>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+    <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
+        data?: unknown;
+        error?: unknown;
+    }>>(readFn: TReadFn): BaseReadResult<TReadFn extends (...args: unknown[]) => Promise<{
+        data: infer D;
+    }> ? D : unknown, [TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown, MergePluginResults<TPlugins>["read"]> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+};
 
-declare function createUseWrite<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TMethod extends (...args: never[]) => Promise<SpooshResponse<unknown, unknown>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodOptions<TMethod> & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+declare function createUseWrite<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TMethod extends (...args: never[]) => Promise<SpooshResponse<unknown, unknown>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodOptions<TMethod> & ResolveTypes<((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
     writeOptions: infer W;
 } ? W : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
     writeOptions: infer W;
-} ? W : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>>, ResolveResultTypes<((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    writeResult: infer W_1;
-} ? W_1 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    writeResult: infer W_1;
-} ? W_1 : object : object : never : never) ? T_4 extends unknown ? (x: T_4) => void : never : never : never) extends (x: infer I) => void ? I : never, ExtractMethodOptions<TMethod> & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T_6 ? T_6 extends TPlugins[number] ? T_6 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    writeOptions: infer W;
-} ? W : object : object : never : never) extends infer T_7 ? T_7 extends (TPlugins[number] extends infer T_8 ? T_8 extends TPlugins[number] ? T_8 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    writeOptions: infer W;
-} ? W : object : object : never : never) ? T_7 extends unknown ? (x: T_7) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>>>> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
+} ? W : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>>, MergePluginResults<TPlugins>["write"]> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
 
 declare function createUseInfiniteRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TData, TItem, TError = TDefaultError, TRequest extends AnyInfiniteRequestOptions = AnyInfiniteRequestOptions>(readFn: (api: InfiniteReadApiClient<TSchema, TDefaultError>) => Promise<SpooshResponse<TData, TError>>, readOptions: BaseInfiniteReadOptions<TData, TItem, TRequest> & (((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
     infiniteReadOptions: infer I_1;

package/dist/index.d.ts

@@ -1,27 +1,34 @@
-import * as _spoosh_core from '@spoosh/core';
-import { ReadClient, TagOptions, SpooshResponse, WriteClient, SpooshPlugin, PluginTypeConfig, SpooshOptions, MergePluginResults, StateManager, EventEmitter, PluginExecutor, PluginArray, MergePluginOptions, ResolverContext, ResolveResultTypes, MergePluginInstanceApi } from '@spoosh/core';
+import { ReadClient, TagMode, SpooshResponse, WriteClient, SpooshPlugin, PluginTypeConfig, SpooshOptions, MergePluginResults, StateManager, EventEmitter, PluginExecutor, PluginArray, ResolveTypes, MergePluginOptions, ResolverContext, ResolveResultTypes, MergePluginInstanceApi } from '@spoosh/core';
 
 type PluginHooksConfig<TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = {
     baseUrl: string;
     defaultOptions?: SpooshOptions;
     plugins: TPlugins;
 };
+type TagModeInArray = "all" | "self";
 /**
  * Base options for `useRead` hook.
  */
-type BaseReadOptions = TagOptions & {
+type BaseReadOptions = {
     /** Whether to fetch automatically on mount. Default: true */
     enabled?: boolean;
+    /**
+     * Unified tag option
+     * - String: mode only ('all' | 'self' | 'none')
+     * - Array: custom tags only OR [mode keyword mixed with custom tags]
+     *   - 'all' or 'self' can be used in arrays
+     *   - 'none' should only be used as string (use `tags: 'none'` not in array)
+     */
+    tags?: TagMode | (TagModeInArray | (string & {}))[];
 };
-
 /**
  * Result returned by `useRead` hook.
  *
  * @template TData - The response data type
  * @template TError - The error type
- * @template TPluginResult - Plugin-provided result fields
+ * @template TMeta - Plugin-provided metadata fields
  */
-type BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> = {
+type BaseReadResult<TData, TError, TMeta = Record<string, unknown>> = {
     /** True during the initial load (no data yet) */
     loading: boolean;
     /** True during any fetch operation */
@@ -31,7 +38,7 @@ type BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> = {
     /** Error from the last failed request */
     error: TError | undefined;
     /** Plugin-provided metadata */
-    meta: TPluginResult;
+    meta: TMeta;
     /** Abort the current fetch operation */
     abort: () => void;
     /** Manually trigger a refetch */
@@ -43,9 +50,9 @@ type BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> = {
  * @template TData - The response data type
  * @template TError - The error type
  * @template TOptions - The trigger options type
- * @template TPluginResult - Plugin-provided result fields
+ * @template TMeta - Plugin-provided metadata fields
  */
-type BaseWriteResult<TData, TError, TOptions, TPluginResult = Record<string, unknown>> = {
+type BaseWriteResult<TData, TError, TOptions, TMeta = Record<string, unknown>> = {
     /** Execute the mutation with optional options */
     trigger: (options?: TOptions) => Promise<SpooshResponse<TData, TError>>;
     /** True while the mutation is in progress */
@@ -55,7 +62,7 @@ type BaseWriteResult<TData, TError, TOptions, TPluginResult = Record<string, unk
     /** Error from the last failed request */
     error: TError | undefined;
     /** Plugin-provided metadata */
-    meta: TPluginResult;
+    meta: TMeta;
     /** Reset the state to initial values */
     reset: () => void;
     /** Abort the current mutation */
@@ -80,8 +87,8 @@ type InputFields<TQuery, TBody, TParamNames extends string> = OptionalQueryField
 type WriteResponseInputFields<TQuery, TBody, TParamNames extends string> = [TQuery, TBody, TParamNames] extends [never, never, never] ? object : {
     input: InputFields<TQuery, TBody, TParamNames> | undefined;
 };
-type UseReadResult<TData, TError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = BaseReadResult<TData, TError> & MergePluginResults<TPlugins>["read"];
-type UseWriteResult<TData, TError, TOptions, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = BaseWriteResult<TData, TError, TOptions> & MergePluginResults<TPlugins>["write"];
+type UseReadResult<TData, TError, TMeta, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = BaseReadResult<TData, TError, TMeta> & MergePluginResults<TPlugins>["read"];
+type UseWriteResult<TData, TError, TOptions, TMeta, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]> = BaseWriteResult<TData, TError, TOptions, TMeta> & MergePluginResults<TPlugins>["write"];
 type ReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
 type WriteApiClient<TSchema, TDefaultError> = WriteClient<TSchema, TDefaultError>;
 type SuccessResponse<T> = Extract<T, {
@@ -177,9 +184,17 @@ type InfinitePrevContext<TData, TRequest> = {
  * @template TItem - The item type after merging all responses
  * @template TRequest - The request options type (query, params, body)
  */
-type BaseInfiniteReadOptions<TData, TItem, TRequest = AnyInfiniteRequestOptions> = TagOptions & {
+type BaseInfiniteReadOptions<TData, TItem, TRequest = AnyInfiniteRequestOptions> = {
     /** Whether to fetch automatically on mount. Default: true */
     enabled?: boolean;
+    /**
+     * Unified tag option
+     * - String: mode only ('all' | 'self' | 'none')
+     * - Array: custom tags only OR [mode keyword mixed with custom tags]
+     *   - 'all' or 'self' can be used in arrays
+     *   - 'none' should only be used as string (use `tags: 'none'` not in array)
+     */
+    tags?: TagMode | (TagModeInArray | (string & {}))[];
     /** Callback to determine if there's a next page to fetch */
     canFetchNext: (ctx: InfiniteNextContext<TData, TRequest>) => boolean;
     /** Callback to build the request options for the next page */
@@ -233,16 +248,21 @@ type UseInfiniteReadResult<TData, TError, TItem, TPlugins extends readonly Spoos
 type InfiniteReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
 
 type InferError<T, TDefaultError> = [T] extends [unknown] ? TDefaultError : T;
-type ExtractParamsRecord<T> = ExtractResponseParamNames<T> extends never ? never : Record<ExtractResponseParamNames<T>, string | number>;
-type ReadResolverContext<TSchema, TReadFn, TDefaultError> = ResolverContext<TSchema, ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractParamsRecord<TReadFn>>;
-type ResolvedReadOptions<TSchema, TPlugins extends PluginArray, TReadFn, TDefaultError> = _spoosh_core.ResolveTypes<MergePluginOptions<TPlugins>["read"], ReadResolverContext<TSchema, TReadFn, TDefaultError>>;
 type WriteResolverContext<TSchema, TMethod, TDefaultError> = ResolverContext<TSchema, ExtractMethodData<TMethod>, InferError<ExtractMethodError<TMethod>, TDefaultError>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>;
-type ResolvedWriteOptions<TSchema, TPlugins extends PluginArray, TMethod, TDefaultError> = _spoosh_core.ResolveTypes<MergePluginOptions<TPlugins>["write"], WriteResolverContext<TSchema, TMethod, TDefaultError>>;
-type UseReadFn<TDefaultError, TSchema, TPlugins extends PluginArray> = <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
-    data?: unknown;
-    error?: unknown;
-}>>(readFn: TReadFn, readOptions?: BaseReadOptions & ResolvedReadOptions<TSchema, TPlugins, TReadFn, TDefaultError>) => BaseReadResult<ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, ResolveResultTypes<MergePluginResults<TPlugins>["read"], BaseReadOptions & ResolvedReadOptions<TSchema, TPlugins, TReadFn, TDefaultError>>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
-type UseWriteFn<TDefaultError, TSchema, TPlugins extends PluginArray> = <TMethod extends (...args: never) => Promise<SpooshResponse<unknown, unknown>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<ExtractMethodData<TMethod>, InferError<ExtractMethodError<TMethod>, TDefaultError>, Parameters<TMethod>[0] & ResolvedWriteOptions<TSchema, TPlugins, TMethod, TDefaultError>, ResolveResultTypes<MergePluginResults<TPlugins>["write"], Parameters<TMethod>[0] & ResolvedWriteOptions<TSchema, TPlugins, TMethod, TDefaultError>>> & WriteResponseInputFields<ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod>>;
+type ResolvedWriteOptions<TSchema, TPlugins extends PluginArray, TMethod, TDefaultError> = ResolveTypes<MergePluginOptions<TPlugins>["write"], WriteResolverContext<TSchema, TMethod, TDefaultError>>;
+type UseReadFn<TDefaultError, TSchema, TPlugins extends PluginArray> = {
+    <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
+        data?: unknown;
+        error?: unknown;
+    }>, TReadOpts>(readFn: TReadFn, readOptions: TReadOpts & BaseReadOptions & ResolveTypes<MergePluginOptions<TPlugins>["read"], ResolverContext<TSchema, ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn> extends never ? never : Record<ExtractResponseParamNames<TReadFn>, string | number>>>): BaseReadResult<ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, ResolveResultTypes<MergePluginResults<TPlugins>["read"], TReadOpts>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+    <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
+        data?: unknown;
+        error?: unknown;
+    }>>(readFn: TReadFn): BaseReadResult<ExtractMethodData<TReadFn>, InferError<ExtractMethodError<TReadFn>, TDefaultError>, MergePluginResults<TPlugins>["read"]> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+};
+type UseWriteFn<TDefaultError, TSchema, TPlugins extends PluginArray> = {
+    <TMethod extends (...args: never) => Promise<SpooshResponse<unknown, unknown>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod): BaseWriteResult<ExtractMethodData<TMethod>, InferError<ExtractMethodError<TMethod>, TDefaultError>, Parameters<TMethod>[0] & ResolvedWriteOptions<TSchema, TPlugins, TMethod, TDefaultError>, MergePluginResults<TPlugins>["write"]> & WriteResponseInputFields<ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod>>;
+};
 type InfiniteReadResolverContext<TSchema, TData, TError, TRequest> = ResolverContext<TSchema, TData, TError, TRequest extends {
     query: infer Q;
 } ? Q : never, TRequest extends {
@@ -250,7 +270,7 @@ type InfiniteReadResolverContext<TSchema, TData, TError, TRequest> = ResolverCon
 } ? B : never, TRequest extends {
     params: infer P;
 } ? P : never>;
-type ResolvedInfiniteReadOptions<TSchema, TPlugins extends PluginArray, TData, TError, TRequest> = _spoosh_core.ResolveTypes<MergePluginOptions<TPlugins>["infiniteRead"], InfiniteReadResolverContext<TSchema, TData, TError, TRequest>>;
+type ResolvedInfiniteReadOptions<TSchema, TPlugins extends PluginArray, TData, TError, TRequest> = ResolveTypes<MergePluginOptions<TPlugins>["infiniteRead"], InfiniteReadResolverContext<TSchema, TData, TError, TRequest>>;
 type UseInfiniteReadFn<TDefaultError, TSchema, TPlugins extends PluginArray> = <TData, TItem, TError = TDefaultError, TRequest extends AnyInfiniteRequestOptions = AnyInfiniteRequestOptions>(readFn: (api: InfiniteReadApiClient<TSchema, TDefaultError>) => Promise<SpooshResponse<TData, TError>>, readOptions: BaseInfiniteReadOptions<TData, TItem, TRequest> & ResolvedInfiniteReadOptions<TSchema, TPlugins, TData, TError, TRequest>) => BaseInfiniteReadResult<TData, TError, TItem, MergePluginResults<TPlugins>["read"]>;
 /**
  * Spoosh React hooks interface containing useRead, useWrite, and useInfiniteRead.
@@ -358,42 +378,44 @@ type SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins> = {
  */
 declare function createReactSpoosh<TSchema, TDefaultError, TPlugins extends PluginArray, TApi>(instance: SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins>): SpooshReactHooks<TDefaultError, TSchema, TPlugins>;
 
-declare function createUseRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
-    data?: unknown;
-    error?: unknown;
-}>, TReadOpts extends BaseReadOptions & (((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_1;
-} ? R_1 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_1;
-} ? R_1 : object : object : never : never) ? T_4 extends unknown ? (x: T_4) => void : never : never : never) extends (x: infer I) => void ? I : never) = BaseReadOptions & (((TPlugins[number] extends infer T_6 ? T_6 extends TPlugins[number] ? T_6 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_1;
-} ? R_1 : object : object : never : never) extends infer T_7 ? T_7 extends (TPlugins[number] extends infer T_8 ? T_8 extends TPlugins[number] ? T_8 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_1;
-} ? R_1 : object : object : never : never) ? T_7 extends unknown ? (x: T_7) => void : never : never : never) extends (x: infer I) => void ? I : never)>(readFn: TReadFn, readOptions?: TReadOpts) => BaseReadResult<TReadFn extends (...args: unknown[]) => Promise<{
-    data: infer D;
-}> ? D : unknown, [TReadFn extends (...args: unknown[]) => Promise<{
-    error: infer E;
-}> ? E : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: unknown[]) => Promise<{
-    error: infer E;
-}> ? E : unknown, ResolveResultTypes<((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    readResult: infer R;
-} ? R : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    readResult: infer R;
-} ? R : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TReadOpts>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+declare function createUseRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): {
+    <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
+        data?: unknown;
+        error?: unknown;
+    }>, TReadOpts>(readFn: TReadFn, readOptions: TReadOpts & BaseReadOptions & ResolveTypes<((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+        readOptions: infer R;
+    } ? R : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+        readOptions: infer R;
+    } ? R : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, TReadFn extends (...args: unknown[]) => Promise<{
+        data: infer D;
+    }> ? D : unknown, [TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown, ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn> extends never ? never : Record<ExtractResponseParamNames<TReadFn>, string | number>>>): BaseReadResult<TReadFn extends (...args: unknown[]) => Promise<{
+        data: infer D;
+    }> ? D : unknown, [TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown, ResolveResultTypes<MergePluginResults<TPlugins>["read"], TReadOpts>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+    <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
+        data?: unknown;
+        error?: unknown;
+    }>>(readFn: TReadFn): BaseReadResult<TReadFn extends (...args: unknown[]) => Promise<{
+        data: infer D;
+    }> ? D : unknown, [TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: unknown[]) => Promise<{
+        error: infer E;
+    }> ? E : unknown, MergePluginResults<TPlugins>["read"]> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+};
 
-declare function createUseWrite<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TMethod extends (...args: never[]) => Promise<SpooshResponse<unknown, unknown>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodOptions<TMethod> & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+declare function createUseWrite<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TMethod extends (...args: never[]) => Promise<SpooshResponse<unknown, unknown>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodOptions<TMethod> & ResolveTypes<((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
     writeOptions: infer W;
 } ? W : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
     writeOptions: infer W;
-} ? W : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>>, ResolveResultTypes<((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    writeResult: infer W_1;
-} ? W_1 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    writeResult: infer W_1;
-} ? W_1 : object : object : never : never) ? T_4 extends unknown ? (x: T_4) => void : never : never : never) extends (x: infer I) => void ? I : never, ExtractMethodOptions<TMethod> & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T_6 ? T_6 extends TPlugins[number] ? T_6 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    writeOptions: infer W;
-} ? W : object : object : never : never) extends infer T_7 ? T_7 extends (TPlugins[number] extends infer T_8 ? T_8 extends TPlugins[number] ? T_8 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    writeOptions: infer W;
-} ? W : object : object : never : never) ? T_7 extends unknown ? (x: T_7) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>>>> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
+} ? W : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, ExtractMethodData<TMethod>, [ExtractMethodError<TMethod>] extends [unknown] ? TDefaultError : ExtractMethodError<TMethod>, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>>, MergePluginResults<TPlugins>["write"]> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
 
 declare function createUseInfiniteRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TData, TItem, TError = TDefaultError, TRequest extends AnyInfiniteRequestOptions = AnyInfiniteRequestOptions>(readFn: (api: InfiniteReadApiClient<TSchema, TDefaultError>) => Promise<SpooshResponse<TData, TError>>, readOptions: BaseInfiniteReadOptions<TData, TItem, TRequest> & (((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
     infiniteReadOptions: infer I_1;

package/dist/index.js

@@ -34,11 +34,10 @@ var import_react = require("react");
 var import_core = require("@spoosh/core");
 function createUseRead(options) {
   const { api, stateManager, eventEmitter, pluginExecutor } = options;
-  return function useRead(readFn, readOptions) {
+  function useRead(readFn, readOptions) {
     const {
       enabled = true,
       tags,
-      additionalTags,
       ...pluginOpts
     } = readOptions ?? {};
     const hookId = (0, import_react.useId)();
@@ -46,8 +45,8 @@ function createUseRead(options) {
       call: null,
       selector: null
     });
-    const selectorProxy = (0, import_core.createSelectorProxy)((result2) => {
-      selectorResultRef.current = result2;
+    const selectorProxy = (0, import_core.createSelectorProxy)((result) => {
+      selectorResultRef.current = result;
     });
     readFn(selectorProxy);
     const capturedCall = selectorResultRef.current.call;
@@ -59,7 +58,7 @@ function createUseRead(options) {
     const requestOptions = capturedCall.options;
     const pathSegments = capturedCall.path.split("/").filter(Boolean);
     const resolvedPath = (0, import_core.resolvePath)(pathSegments, requestOptions?.params);
-    const resolvedTags = (0, import_core.resolveTags)({ tags, additionalTags }, resolvedPath);
+    const resolvedTags = (0, import_core.resolveTags)({ tags }, resolvedPath);
     const queryKey = stateManager.createQueryKey({
       path: pathSegments,
       method: capturedCall.method,
@@ -107,6 +106,7 @@ function createUseRead(options) {
     const abortRef = (0, import_react.useRef)(controller.abort);
     abortRef.current = controller.abort;
     const pluginOptsKey = JSON.stringify(pluginOpts);
+    const tagsKey = JSON.stringify(tags);
     const executeWithTracking = (0, import_react.useCallback)(
       async (force = false) => {
         setRequestState((prev) => ({ ...prev, isPending: true }));
@@ -162,7 +162,7 @@ function createUseRead(options) {
         unsubRefetch();
         unsubInvalidate();
       };
-    }, [queryKey, enabled]);
+    }, [queryKey, enabled, tagsKey]);
     (0, import_react.useEffect)(() => {
       if (!enabled || !lifecycleRef.current.initialized) return;
       const prevContext = controller.getContext();
@@ -191,7 +191,8 @@ function createUseRead(options) {
     const hasData = state.data !== void 0;
     const loading = requestState.isPending && !hasData;
     const fetching = requestState.isPending;
-    const result = {
+    return {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       meta: pluginResultData,
       ...inputField,
       data: state.data,
@@ -201,8 +202,8 @@ function createUseRead(options) {
       abort,
       refetch
     };
-    return result;
-  };
+  }
+  return useRead;
 }
 
 // src/useWrite/index.ts
@@ -210,14 +211,14 @@ var import_react2 = require("react");
 var import_core2 = require("@spoosh/core");
 function createUseWrite(options) {
   const { api, stateManager, pluginExecutor, eventEmitter } = options;
-  return function useWrite(writeFn) {
+  function useWrite(writeFn) {
     const hookId = (0, import_react2.useId)();
     const selectorResultRef = (0, import_react2.useRef)({
       call: null,
       selector: null
     });
-    const selectorProxy = (0, import_core2.createSelectorProxy)((result2) => {
-      selectorResultRef.current = result2;
+    const selectorProxy = (0, import_core2.createSelectorProxy)((result) => {
+      selectorResultRef.current = result;
     });
     writeFn(selectorProxy);
     const selectedEndpoint = selectorResultRef.current.selector;
@@ -308,8 +309,9 @@ function createUseWrite(options) {
     }
     const inputField = Object.keys(inputInner).length > 0 ? { input: inputInner } : {};
     const loading = requestState.isPending;
-    const result = {
+    return {
       trigger,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       meta: pluginResultData,
       ...inputField,
       data: state.data,
@@ -317,9 +319,10 @@ function createUseWrite(options) {
       loading,
       reset,
       abort
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     };
-    return result;
-  };
+  }
+  return useWrite;
 }
 
 // src/useInfiniteRead/index.ts
@@ -331,7 +334,6 @@ function createUseInfiniteRead(options) {
     const {
       enabled = true,
       tags,
-      additionalTags,
       canFetchNext,
       nextPageRequest,
       merger,
@@ -368,7 +370,7 @@ function createUseInfiniteRead(options) {
       body: void 0
     };
     const resolvedPath = (0, import_core3.resolvePath)(pathSegments, requestOptions?.params);
-    const resolvedTags = (0, import_core3.resolveTags)({ tags, additionalTags }, resolvedPath);
+    const resolvedTags = (0, import_core3.resolveTags)({ tags }, resolvedPath);
     const canFetchNextRef = (0, import_react3.useRef)(canFetchNext);
     const canFetchPrevRef = (0, import_react3.useRef)(canFetchPrev);
     const nextPageRequestRef = (0, import_react3.useRef)(nextPageRequest);
@@ -438,6 +440,7 @@ function createUseInfiniteRead(options) {
       initialized: false,
       prevContext: null
     });
+    const tagsKey = JSON.stringify(tags);
     (0, import_react3.useEffect)(() => {
       return () => {
         controllerRef.current?.controller.unmount();
@@ -462,7 +465,7 @@ function createUseInfiniteRead(options) {
       return () => {
         unsubInvalidate();
       };
-    }, []);
+    }, [tagsKey]);
     (0, import_react3.useEffect)(() => {
       if (!lifecycleRef.current.initialized) return;
       if (enabled) {

package/dist/index.mjs

@@ -18,11 +18,10 @@ import {
 } from "@spoosh/core";
 function createUseRead(options) {
   const { api, stateManager, eventEmitter, pluginExecutor } = options;
-  return function useRead(readFn, readOptions) {
+  function useRead(readFn, readOptions) {
     const {
       enabled = true,
       tags,
-      additionalTags,
       ...pluginOpts
     } = readOptions ?? {};
     const hookId = useId();
@@ -30,8 +29,8 @@ function createUseRead(options) {
       call: null,
       selector: null
     });
-    const selectorProxy = createSelectorProxy((result2) => {
-      selectorResultRef.current = result2;
+    const selectorProxy = createSelectorProxy((result) => {
+      selectorResultRef.current = result;
     });
     readFn(selectorProxy);
     const capturedCall = selectorResultRef.current.call;
@@ -43,7 +42,7 @@ function createUseRead(options) {
     const requestOptions = capturedCall.options;
     const pathSegments = capturedCall.path.split("/").filter(Boolean);
     const resolvedPath = resolvePath(pathSegments, requestOptions?.params);
-    const resolvedTags = resolveTags({ tags, additionalTags }, resolvedPath);
+    const resolvedTags = resolveTags({ tags }, resolvedPath);
     const queryKey = stateManager.createQueryKey({
       path: pathSegments,
       method: capturedCall.method,
@@ -91,6 +90,7 @@ function createUseRead(options) {
     const abortRef = useRef(controller.abort);
     abortRef.current = controller.abort;
     const pluginOptsKey = JSON.stringify(pluginOpts);
+    const tagsKey = JSON.stringify(tags);
     const executeWithTracking = useCallback(
       async (force = false) => {
         setRequestState((prev) => ({ ...prev, isPending: true }));
@@ -146,7 +146,7 @@ function createUseRead(options) {
         unsubRefetch();
         unsubInvalidate();
       };
-    }, [queryKey, enabled]);
+    }, [queryKey, enabled, tagsKey]);
     useEffect(() => {
       if (!enabled || !lifecycleRef.current.initialized) return;
       const prevContext = controller.getContext();
@@ -175,7 +175,8 @@ function createUseRead(options) {
     const hasData = state.data !== void 0;
     const loading = requestState.isPending && !hasData;
     const fetching = requestState.isPending;
-    const result = {
+    return {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       meta: pluginResultData,
       ...inputField,
       data: state.data,
@@ -185,8 +186,8 @@ function createUseRead(options) {
       abort,
       refetch
     };
-    return result;
-  };
+  }
+  return useRead;
 }
 
 // src/useWrite/index.ts
@@ -205,14 +206,14 @@ import {
 } from "@spoosh/core";
 function createUseWrite(options) {
   const { api, stateManager, pluginExecutor, eventEmitter } = options;
-  return function useWrite(writeFn) {
+  function useWrite(writeFn) {
     const hookId = useId2();
     const selectorResultRef = useRef2({
       call: null,
       selector: null
     });
-    const selectorProxy = createSelectorProxy2((result2) => {
-      selectorResultRef.current = result2;
+    const selectorProxy = createSelectorProxy2((result) => {
+      selectorResultRef.current = result;
     });
     writeFn(selectorProxy);
     const selectedEndpoint = selectorResultRef.current.selector;
@@ -303,8 +304,9 @@ function createUseWrite(options) {
     }
     const inputField = Object.keys(inputInner).length > 0 ? { input: inputInner } : {};
     const loading = requestState.isPending;
-    const result = {
+    return {
       trigger,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       meta: pluginResultData,
       ...inputField,
       data: state.data,
@@ -312,9 +314,10 @@ function createUseWrite(options) {
       loading,
       reset,
       abort
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
     };
-    return result;
-  };
+  }
+  return useWrite;
 }
 
 // src/useInfiniteRead/index.ts
@@ -337,7 +340,6 @@ function createUseInfiniteRead(options) {
     const {
       enabled = true,
       tags,
-      additionalTags,
       canFetchNext,
       nextPageRequest,
       merger,
@@ -374,7 +376,7 @@ function createUseInfiniteRead(options) {
       body: void 0
     };
     const resolvedPath = resolvePath3(pathSegments, requestOptions?.params);
-    const resolvedTags = resolveTags3({ tags, additionalTags }, resolvedPath);
+    const resolvedTags = resolveTags3({ tags }, resolvedPath);
     const canFetchNextRef = useRef3(canFetchNext);
     const canFetchPrevRef = useRef3(canFetchPrev);
     const nextPageRequestRef = useRef3(nextPageRequest);
@@ -444,6 +446,7 @@ function createUseInfiniteRead(options) {
       initialized: false,
       prevContext: null
     });
+    const tagsKey = JSON.stringify(tags);
     useEffect2(() => {
       return () => {
         controllerRef.current?.controller.unmount();
@@ -468,7 +471,7 @@ function createUseInfiniteRead(options) {
       return () => {
         unsubInvalidate();
       };
-    }, []);
+    }, [tagsKey]);
     useEffect2(() => {
       if (!lifecycleRef.current.initialized) return;
       if (enabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/react",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "license": "MIT",
   "description": "React hooks for Spoosh API client",
   "keywords": [
@@ -34,11 +34,11 @@
     }
   },
   "peerDependencies": {
-    "@spoosh/core": ">=0.6.0",
+    "@spoosh/core": ">=0.7.0",
     "react": "^18 || ^19"
   },
   "devDependencies": {
-    "@spoosh/core": "0.6.0"
+    "@spoosh/core": "0.7.0"
   },
   "scripts": {
     "dev": "tsup --watch",