@spoosh/core 0.6.0 → 0.8.0

package/dist/index.d.mts

@@ -287,9 +287,10 @@ type PluginHandler<TData = unknown, TError = unknown> = (context: PluginContext<
 type PluginUpdateHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, previousContext: PluginContext<TData, TError>) => void | Promise<void>;
 /**
  * Handler called after every response, regardless of early returns from middleware.
- * Use this for post-response logic like scheduling polls or emitting events.
+ * Can return a new response to transform it, or void for side effects only.
+ * Returned responses are chained through plugins in order.
  */
-type PluginResponseHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, response: SpooshResponse<TData, TError>) => void | Promise<void>;
+type PluginResponseHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, response: SpooshResponse<TData, TError>) => SpooshResponse<TData, TError> | void | Promise<SpooshResponse<TData, TError> | void>;
 type PluginLifecycle<TData = unknown, TError = unknown> = {
     /** Called on component mount */
     onMount?: PluginHandler<TData, TError>;
@@ -333,7 +334,7 @@ type PluginTypeConfig = {
  *
  * Plugins can implement:
  * - `middleware`: Wraps the fetch flow for full control (intercept, retry, transform)
- * - `onResponse`: Called after every response, regardless of early returns
+ * - `afterResponse`: Called after every response, regardless of early returns
  * - `lifecycle`: Component lifecycle hooks (onMount, onUpdate, onUnmount)
  * - `exports`: Functions/variables accessible to other plugins
  *
@@ -353,7 +354,7 @@ type PluginTypeConfig = {
  *       const result = await next();
  *       return result;
  *     },
- *     onResponse(context, response) {
+ *     afterResponse(context, response) {
  *       // Always runs after response
  *     },
  *     lifecycle: {
@@ -370,8 +371,11 @@ interface SpooshPlugin<T extends PluginTypeConfig = PluginTypeConfig> {
     operations: OperationType[];
     /** Middleware for controlling the fetch flow. Called in plugin order, composing a chain. */
     middleware?: PluginMiddleware;
-    /** Called after every response, regardless of early returns from middleware. */
-    onResponse?: PluginResponseHandler;
+    /**
+     * Called after middleware chain completes, regardless of early returns.
+     * Return a new response to transform it, or void for side effects only.
+     */
+    afterResponse?: PluginResponseHandler;
     /** Component lifecycle hooks (setup, cleanup, option changes) */
     lifecycle?: PluginLifecycle;
     /** Expose functions/variables for other plugins to access via `context.plugins.get(name)` */
@@ -568,7 +572,7 @@ type PluginExecutor = {
     executeLifecycle: <TData, TError>(phase: "onMount" | "onUnmount", operationType: OperationType, context: PluginContext<TData, TError>) => Promise<void>;
     /** Execute onUpdate lifecycle with previous context */
     executeUpdateLifecycle: <TData, TError>(operationType: OperationType, context: PluginContext<TData, TError>, previousContext: PluginContext<TData, TError>) => Promise<void>;
-    /** Execute middleware chain with a core fetch function, then run onResponse handlers */
+    /** Execute middleware chain with a core fetch function, then run afterResponse handlers */
     executeMiddleware: <TData, TError>(operationType: OperationType, context: PluginContext<TData, TError>, coreFetch: () => Promise<SpooshResponse<TData, TError>>) => Promise<SpooshResponse<TData, TError>>;
     getPlugins: () => readonly SpooshPlugin[];
     /** Creates a full PluginContext with plugins accessor injected */
@@ -1360,14 +1364,21 @@ declare function objectToUrlEncoded(obj: Record<string, unknown>): string;
 
 declare function sortObjectKeys(obj: unknown, seen?: WeakSet<object>): unknown;
 
+type TagMode = "all" | "self" | "none";
+type TagModeInArray = "all" | "self";
 /**
  * Common tag options used across plugins and operations.
  */
 type TagOptions = {
-    /** Custom tags to use instead of auto-generated path-based tags */
-    tags?: string[];
-    /** Additional tags to append to auto-generated or custom tags */
-    additionalTags?: string[];
+    /**
+     * Unified tag option (follows invalidation pattern)
+     * - String: mode only ('all' | 'self' | 'none')
+     * - Array: custom tags only OR [mode keyword mixed with custom tags]
+     *   - If array contains 'all' or 'self', it's treated as mode + tags
+     *   - Otherwise, it's custom tags only (replaces auto-generated tags)
+     *   - 'none' keyword should NOT be used in arrays (use string 'none' instead)
+     */
+    tags?: TagMode | (TagModeInArray | (string & {}))[];
 };
 declare function resolveTags(options: TagOptions | undefined, resolvedPath: string[]): string[];
 declare function resolvePath(path: string[], params: Record<string, string | number> | undefined): string[];
@@ -1597,4 +1608,4 @@ type CreateInfiniteReadOptions<TData, TItem, TError, TRequest> = {
 };
 declare function createInfiniteReadController<TData, TItem, TError, TRequest extends InfiniteRequestOptions = InfiniteRequestOptions>(options: CreateInfiniteReadOptions<TData, TItem, TError, TRequest>): InfiniteReadController<TData, TItem, TError>;
 
-export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, type SpooshClientConfig as ClientConfig, type ComputeRequestOptions, type CoreRequestOptionsBase, type CreateInfiniteReadOptions, type CreateOperationOptions, type DataAwareCallback, type DataAwareTransform, type EventEmitter, type ExtractBody$1 as ExtractBody, type ExtractData, type ExtractError, type ExtractMethodOptions, type ExtractParamNames, type ExtractQuery$1 as ExtractQuery, type FetchDirection, type FetchExecutor, type FindMatchingKey, HTTP_METHODS, type HasParams, type HeadersInitOrGetter, type HttpMethod, type HttpMethodKey, type InfiniteReadController, type InfiniteReadState, type InfiniteRequestOptions, type InstanceApiContext, type InstanceApiResolvers, type InstancePluginExecutor, type LifecyclePhase, type MergePluginInstanceApi, type MergePluginOptions, type MergePluginResults, type MethodOptionsMap, type MiddlewareContext, type MiddlewareHandler, type MiddlewarePhase, type MutationSchemaHelper, type OperationController, type OperationState, type OperationType, type PageContext, type PluginAccessor, type PluginArray, type PluginContext, type PluginContextInput, type PluginExecutor, type PluginExportsRegistry, type PluginFactory, type PluginHandler, type PluginLifecycle, type PluginMiddleware, type PluginRegistry, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type QuerySchemaHelper, type ReadClient, type RefetchEvent, type RequestOptions$1 as RequestOptions, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type RetryConfig, type RouteToPath, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, Spoosh, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshMiddleware, type SpooshOptions, type SpooshOptionsExtra, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StateManager, type TagOptions, type WriteClient, applyMiddlewares, buildUrl, composeMiddlewares, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createMiddleware, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, executeFetch, extractMethodFromSelector, extractPathFromSelector, generateTags, getContentType, isJsonBody, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveTags, setHeaders, sortObjectKeys };
+export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, type SpooshClientConfig as ClientConfig, type ComputeRequestOptions, type CoreRequestOptionsBase, type CreateInfiniteReadOptions, type CreateOperationOptions, type DataAwareCallback, type DataAwareTransform, type EventEmitter, type ExtractBody$1 as ExtractBody, type ExtractData, type ExtractError, type ExtractMethodOptions, type ExtractParamNames, type ExtractQuery$1 as ExtractQuery, type FetchDirection, type FetchExecutor, type FindMatchingKey, HTTP_METHODS, type HasParams, type HeadersInitOrGetter, type HttpMethod, type HttpMethodKey, type InfiniteReadController, type InfiniteReadState, type InfiniteRequestOptions, type InstanceApiContext, type InstanceApiResolvers, type InstancePluginExecutor, type LifecyclePhase, type MergePluginInstanceApi, type MergePluginOptions, type MergePluginResults, type MethodOptionsMap, type MiddlewareContext, type MiddlewareHandler, type MiddlewarePhase, type MutationSchemaHelper, type OperationController, type OperationState, type OperationType, type PageContext, type PluginAccessor, type PluginArray, type PluginContext, type PluginContextInput, type PluginExecutor, type PluginExportsRegistry, type PluginFactory, type PluginHandler, type PluginLifecycle, type PluginMiddleware, type PluginRegistry, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type QuerySchemaHelper, type ReadClient, type RefetchEvent, type RequestOptions$1 as RequestOptions, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type RetryConfig, type RouteToPath, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, Spoosh, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshMiddleware, type SpooshOptions, type SpooshOptionsExtra, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StateManager, type TagMode, type TagOptions, type WriteClient, applyMiddlewares, buildUrl, composeMiddlewares, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createMiddleware, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, executeFetch, extractMethodFromSelector, extractPathFromSelector, generateTags, getContentType, isJsonBody, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveTags, setHeaders, sortObjectKeys };

package/dist/index.d.ts

@@ -287,9 +287,10 @@ type PluginHandler<TData = unknown, TError = unknown> = (context: PluginContext<
 type PluginUpdateHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, previousContext: PluginContext<TData, TError>) => void | Promise<void>;
 /**
  * Handler called after every response, regardless of early returns from middleware.
- * Use this for post-response logic like scheduling polls or emitting events.
+ * Can return a new response to transform it, or void for side effects only.
+ * Returned responses are chained through plugins in order.
  */
-type PluginResponseHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, response: SpooshResponse<TData, TError>) => void | Promise<void>;
+type PluginResponseHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, response: SpooshResponse<TData, TError>) => SpooshResponse<TData, TError> | void | Promise<SpooshResponse<TData, TError> | void>;
 type PluginLifecycle<TData = unknown, TError = unknown> = {
     /** Called on component mount */
     onMount?: PluginHandler<TData, TError>;
@@ -333,7 +334,7 @@ type PluginTypeConfig = {
  *
  * Plugins can implement:
  * - `middleware`: Wraps the fetch flow for full control (intercept, retry, transform)
- * - `onResponse`: Called after every response, regardless of early returns
+ * - `afterResponse`: Called after every response, regardless of early returns
  * - `lifecycle`: Component lifecycle hooks (onMount, onUpdate, onUnmount)
  * - `exports`: Functions/variables accessible to other plugins
  *
@@ -353,7 +354,7 @@ type PluginTypeConfig = {
  *       const result = await next();
  *       return result;
  *     },
- *     onResponse(context, response) {
+ *     afterResponse(context, response) {
  *       // Always runs after response
  *     },
  *     lifecycle: {
@@ -370,8 +371,11 @@ interface SpooshPlugin<T extends PluginTypeConfig = PluginTypeConfig> {
     operations: OperationType[];
     /** Middleware for controlling the fetch flow. Called in plugin order, composing a chain. */
     middleware?: PluginMiddleware;
-    /** Called after every response, regardless of early returns from middleware. */
-    onResponse?: PluginResponseHandler;
+    /**
+     * Called after middleware chain completes, regardless of early returns.
+     * Return a new response to transform it, or void for side effects only.
+     */
+    afterResponse?: PluginResponseHandler;
     /** Component lifecycle hooks (setup, cleanup, option changes) */
     lifecycle?: PluginLifecycle;
     /** Expose functions/variables for other plugins to access via `context.plugins.get(name)` */
@@ -568,7 +572,7 @@ type PluginExecutor = {
     executeLifecycle: <TData, TError>(phase: "onMount" | "onUnmount", operationType: OperationType, context: PluginContext<TData, TError>) => Promise<void>;
     /** Execute onUpdate lifecycle with previous context */
     executeUpdateLifecycle: <TData, TError>(operationType: OperationType, context: PluginContext<TData, TError>, previousContext: PluginContext<TData, TError>) => Promise<void>;
-    /** Execute middleware chain with a core fetch function, then run onResponse handlers */
+    /** Execute middleware chain with a core fetch function, then run afterResponse handlers */
     executeMiddleware: <TData, TError>(operationType: OperationType, context: PluginContext<TData, TError>, coreFetch: () => Promise<SpooshResponse<TData, TError>>) => Promise<SpooshResponse<TData, TError>>;
     getPlugins: () => readonly SpooshPlugin[];
     /** Creates a full PluginContext with plugins accessor injected */
@@ -1360,14 +1364,21 @@ declare function objectToUrlEncoded(obj: Record<string, unknown>): string;
 
 declare function sortObjectKeys(obj: unknown, seen?: WeakSet<object>): unknown;
 
+type TagMode = "all" | "self" | "none";
+type TagModeInArray = "all" | "self";
 /**
  * Common tag options used across plugins and operations.
  */
 type TagOptions = {
-    /** Custom tags to use instead of auto-generated path-based tags */
-    tags?: string[];
-    /** Additional tags to append to auto-generated or custom tags */
-    additionalTags?: string[];
+    /**
+     * Unified tag option (follows invalidation pattern)
+     * - String: mode only ('all' | 'self' | 'none')
+     * - Array: custom tags only OR [mode keyword mixed with custom tags]
+     *   - If array contains 'all' or 'self', it's treated as mode + tags
+     *   - Otherwise, it's custom tags only (replaces auto-generated tags)
+     *   - 'none' keyword should NOT be used in arrays (use string 'none' instead)
+     */
+    tags?: TagMode | (TagModeInArray | (string & {}))[];
 };
 declare function resolveTags(options: TagOptions | undefined, resolvedPath: string[]): string[];
 declare function resolvePath(path: string[], params: Record<string, string | number> | undefined): string[];
@@ -1597,4 +1608,4 @@ type CreateInfiniteReadOptions<TData, TItem, TError, TRequest> = {
 };
 declare function createInfiniteReadController<TData, TItem, TError, TRequest extends InfiniteRequestOptions = InfiniteRequestOptions>(options: CreateInfiniteReadOptions<TData, TItem, TError, TRequest>): InfiniteReadController<TData, TItem, TError>;
 
-export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, type SpooshClientConfig as ClientConfig, type ComputeRequestOptions, type CoreRequestOptionsBase, type CreateInfiniteReadOptions, type CreateOperationOptions, type DataAwareCallback, type DataAwareTransform, type EventEmitter, type ExtractBody$1 as ExtractBody, type ExtractData, type ExtractError, type ExtractMethodOptions, type ExtractParamNames, type ExtractQuery$1 as ExtractQuery, type FetchDirection, type FetchExecutor, type FindMatchingKey, HTTP_METHODS, type HasParams, type HeadersInitOrGetter, type HttpMethod, type HttpMethodKey, type InfiniteReadController, type InfiniteReadState, type InfiniteRequestOptions, type InstanceApiContext, type InstanceApiResolvers, type InstancePluginExecutor, type LifecyclePhase, type MergePluginInstanceApi, type MergePluginOptions, type MergePluginResults, type MethodOptionsMap, type MiddlewareContext, type MiddlewareHandler, type MiddlewarePhase, type MutationSchemaHelper, type OperationController, type OperationState, type OperationType, type PageContext, type PluginAccessor, type PluginArray, type PluginContext, type PluginContextInput, type PluginExecutor, type PluginExportsRegistry, type PluginFactory, type PluginHandler, type PluginLifecycle, type PluginMiddleware, type PluginRegistry, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type QuerySchemaHelper, type ReadClient, type RefetchEvent, type RequestOptions$1 as RequestOptions, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type RetryConfig, type RouteToPath, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, Spoosh, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshMiddleware, type SpooshOptions, type SpooshOptionsExtra, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StateManager, type TagOptions, type WriteClient, applyMiddlewares, buildUrl, composeMiddlewares, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createMiddleware, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, executeFetch, extractMethodFromSelector, extractPathFromSelector, generateTags, getContentType, isJsonBody, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveTags, setHeaders, sortObjectKeys };
+export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, type SpooshClientConfig as ClientConfig, type ComputeRequestOptions, type CoreRequestOptionsBase, type CreateInfiniteReadOptions, type CreateOperationOptions, type DataAwareCallback, type DataAwareTransform, type EventEmitter, type ExtractBody$1 as ExtractBody, type ExtractData, type ExtractError, type ExtractMethodOptions, type ExtractParamNames, type ExtractQuery$1 as ExtractQuery, type FetchDirection, type FetchExecutor, type FindMatchingKey, HTTP_METHODS, type HasParams, type HeadersInitOrGetter, type HttpMethod, type HttpMethodKey, type InfiniteReadController, type InfiniteReadState, type InfiniteRequestOptions, type InstanceApiContext, type InstanceApiResolvers, type InstancePluginExecutor, type LifecyclePhase, type MergePluginInstanceApi, type MergePluginOptions, type MergePluginResults, type MethodOptionsMap, type MiddlewareContext, type MiddlewareHandler, type MiddlewarePhase, type MutationSchemaHelper, type OperationController, type OperationState, type OperationType, type PageContext, type PluginAccessor, type PluginArray, type PluginContext, type PluginContextInput, type PluginExecutor, type PluginExportsRegistry, type PluginFactory, type PluginHandler, type PluginLifecycle, type PluginMiddleware, type PluginRegistry, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type QuerySchemaHelper, type ReadClient, type RefetchEvent, type RequestOptions$1 as RequestOptions, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type RetryConfig, type RouteToPath, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, Spoosh, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshMiddleware, type SpooshOptions, type SpooshOptionsExtra, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StateManager, type TagMode, type TagOptions, type WriteClient, applyMiddlewares, buildUrl, composeMiddlewares, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createMiddleware, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, executeFetch, extractMethodFromSelector, extractPathFromSelector, generateTags, getContentType, isJsonBody, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveTags, setHeaders, sortObjectKeys };

package/dist/index.js

@@ -247,11 +247,40 @@ function sortObjectKeys(obj, seen = /* @__PURE__ */ new WeakSet()) {
 }
 
 // src/utils/path-utils.ts
+function resolveTagMode(mode, path) {
+  switch (mode) {
+    case "all":
+      return generateTags(path);
+    case "self":
+      return [path.join("/")];
+    case "none":
+      return [];
+  }
+}
 function resolveTags(options, resolvedPath) {
-  const customTags = options?.tags;
-  const additionalTags = options?.additionalTags ?? [];
-  const baseTags = customTags ?? generateTags(resolvedPath);
-  return [...baseTags, ...additionalTags];
+  const tagsOption = options?.tags;
+  if (!tagsOption) {
+    return generateTags(resolvedPath);
+  }
+  if (typeof tagsOption === "string") {
+    return resolveTagMode(tagsOption, resolvedPath);
+  }
+  if (Array.isArray(tagsOption)) {
+    const tags = [];
+    let mode = null;
+    for (const item of tagsOption) {
+      if (item === "all" || item === "self") {
+        mode = item;
+      } else if (typeof item === "string") {
+        tags.push(item);
+      }
+    }
+    if (mode) {
+      tags.push(...resolveTagMode(mode, resolvedPath));
+    }
+    return [...new Set(tags)];
+  }
+  return generateTags(resolvedPath);
 }
 function resolvePath(path, params) {
   if (!params) return path;
@@ -807,11 +836,14 @@ function createPluginExecutor(initialPlugins = []) {
         response = await chain();
       }
       for (const plugin of applicablePlugins) {
-        if (plugin.onResponse) {
-          await plugin.onResponse(
+        if (plugin.afterResponse) {
+          const newResponse = await plugin.afterResponse(
             context,
             response
           );
+          if (newResponse) {
+            response = newResponse;
+          }
         }
       }
       return response;
@@ -1146,13 +1178,6 @@ function createOperationController(options) {
           try {
             const response = await fetchFn(context.requestOptions);
             context.response = response;
-            if (response.data !== void 0 && !response.error) {
-              updateState({
-                data: response.data,
-                error: void 0,
-                timestamp: Date.now()
-              });
-            }
             return response;
           } catch (err) {
             const errorResponse = {
@@ -1170,11 +1195,19 @@ function createOperationController(options) {
         });
         return fetchPromise;
       };
-      return pluginExecutor.executeMiddleware(
+      const finalResponse = await pluginExecutor.executeMiddleware(
         operationType,
         context,
         coreFetch
       );
+      if (finalResponse.data !== void 0 && !finalResponse.error) {
+        updateState({
+          data: finalResponse.data,
+          error: void 0,
+          timestamp: Date.now()
+        });
+      }
+      return finalResponse;
     },
     getState() {
       const cached = stateManager.getCache(queryKey);
@@ -1433,34 +1466,6 @@ function createInfiniteReadController(options) {
               aborted: true
             };
           }
-          if (response.data !== void 0 && !response.error) {
-            pageRequests.set(pageKey, mergedRequest);
-            if (direction === "next") {
-              if (!pageKeys.includes(pageKey)) {
-                pageKeys = [...pageKeys, pageKey];
-              }
-            } else {
-              if (!pageKeys.includes(pageKey)) {
-                pageKeys = [pageKey, ...pageKeys];
-              }
-            }
-            saveToTracker();
-            subscribeToPages();
-            stateManager.setCache(pageKey, {
-              state: {
-                data: response.data,
-                error: void 0,
-                timestamp: Date.now()
-              },
-              tags,
-              stale: false
-            });
-          }
-          if (response.data !== void 0 && !response.error) {
-            latestError = void 0;
-          } else if (response.error) {
-            latestError = response.error;
-          }
           return response;
         } catch (err) {
           if (signal.aborted) {
@@ -1488,7 +1493,37 @@ function createInfiniteReadController(options) {
       stateManager.setPendingPromise(pageKey, fetchPromise);
       return fetchPromise;
     };
-    await pluginExecutor.executeMiddleware("infiniteRead", context, coreFetch);
+    const finalResponse = await pluginExecutor.executeMiddleware(
+      "infiniteRead",
+      context,
+      coreFetch
+    );
+    if (finalResponse.data !== void 0 && !finalResponse.error) {
+      pageRequests.set(pageKey, mergedRequest);
+      if (direction === "next") {
+        if (!pageKeys.includes(pageKey)) {
+          pageKeys = [...pageKeys, pageKey];
+        }
+      } else {
+        if (!pageKeys.includes(pageKey)) {
+          pageKeys = [pageKey, ...pageKeys];
+        }
+      }
+      saveToTracker();
+      subscribeToPages();
+      stateManager.setCache(pageKey, {
+        state: {
+          data: finalResponse.data,
+          error: void 0,
+          timestamp: Date.now()
+        },
+        tags,
+        stale: false
+      });
+      latestError = void 0;
+    } else if (finalResponse.error) {
+      latestError = finalResponse.error;
+    }
   };
   const controller = {
     getState() {

package/dist/index.mjs

@@ -191,11 +191,40 @@ function sortObjectKeys(obj, seen = /* @__PURE__ */ new WeakSet()) {
 }
 
 // src/utils/path-utils.ts
+function resolveTagMode(mode, path) {
+  switch (mode) {
+    case "all":
+      return generateTags(path);
+    case "self":
+      return [path.join("/")];
+    case "none":
+      return [];
+  }
+}
 function resolveTags(options, resolvedPath) {
-  const customTags = options?.tags;
-  const additionalTags = options?.additionalTags ?? [];
-  const baseTags = customTags ?? generateTags(resolvedPath);
-  return [...baseTags, ...additionalTags];
+  const tagsOption = options?.tags;
+  if (!tagsOption) {
+    return generateTags(resolvedPath);
+  }
+  if (typeof tagsOption === "string") {
+    return resolveTagMode(tagsOption, resolvedPath);
+  }
+  if (Array.isArray(tagsOption)) {
+    const tags = [];
+    let mode = null;
+    for (const item of tagsOption) {
+      if (item === "all" || item === "self") {
+        mode = item;
+      } else if (typeof item === "string") {
+        tags.push(item);
+      }
+    }
+    if (mode) {
+      tags.push(...resolveTagMode(mode, resolvedPath));
+    }
+    return [...new Set(tags)];
+  }
+  return generateTags(resolvedPath);
 }
 function resolvePath(path, params) {
   if (!params) return path;
@@ -751,11 +780,14 @@ function createPluginExecutor(initialPlugins = []) {
         response = await chain();
       }
       for (const plugin of applicablePlugins) {
-        if (plugin.onResponse) {
-          await plugin.onResponse(
+        if (plugin.afterResponse) {
+          const newResponse = await plugin.afterResponse(
             context,
             response
           );
+          if (newResponse) {
+            response = newResponse;
+          }
         }
       }
       return response;
@@ -1090,13 +1122,6 @@ function createOperationController(options) {
           try {
             const response = await fetchFn(context.requestOptions);
             context.response = response;
-            if (response.data !== void 0 && !response.error) {
-              updateState({
-                data: response.data,
-                error: void 0,
-                timestamp: Date.now()
-              });
-            }
             return response;
           } catch (err) {
             const errorResponse = {
@@ -1114,11 +1139,19 @@ function createOperationController(options) {
         });
         return fetchPromise;
       };
-      return pluginExecutor.executeMiddleware(
+      const finalResponse = await pluginExecutor.executeMiddleware(
         operationType,
         context,
         coreFetch
       );
+      if (finalResponse.data !== void 0 && !finalResponse.error) {
+        updateState({
+          data: finalResponse.data,
+          error: void 0,
+          timestamp: Date.now()
+        });
+      }
+      return finalResponse;
     },
     getState() {
       const cached = stateManager.getCache(queryKey);
@@ -1377,34 +1410,6 @@ function createInfiniteReadController(options) {
               aborted: true
             };
           }
-          if (response.data !== void 0 && !response.error) {
-            pageRequests.set(pageKey, mergedRequest);
-            if (direction === "next") {
-              if (!pageKeys.includes(pageKey)) {
-                pageKeys = [...pageKeys, pageKey];
-              }
-            } else {
-              if (!pageKeys.includes(pageKey)) {
-                pageKeys = [pageKey, ...pageKeys];
-              }
-            }
-            saveToTracker();
-            subscribeToPages();
-            stateManager.setCache(pageKey, {
-              state: {
-                data: response.data,
-                error: void 0,
-                timestamp: Date.now()
-              },
-              tags,
-              stale: false
-            });
-          }
-          if (response.data !== void 0 && !response.error) {
-            latestError = void 0;
-          } else if (response.error) {
-            latestError = response.error;
-          }
           return response;
         } catch (err) {
           if (signal.aborted) {
@@ -1432,7 +1437,37 @@ function createInfiniteReadController(options) {
       stateManager.setPendingPromise(pageKey, fetchPromise);
       return fetchPromise;
     };
-    await pluginExecutor.executeMiddleware("infiniteRead", context, coreFetch);
+    const finalResponse = await pluginExecutor.executeMiddleware(
+      "infiniteRead",
+      context,
+      coreFetch
+    );
+    if (finalResponse.data !== void 0 && !finalResponse.error) {
+      pageRequests.set(pageKey, mergedRequest);
+      if (direction === "next") {
+        if (!pageKeys.includes(pageKey)) {
+          pageKeys = [...pageKeys, pageKey];
+        }
+      } else {
+        if (!pageKeys.includes(pageKey)) {
+          pageKeys = [pageKey, ...pageKeys];
+        }
+      }
+      saveToTracker();
+      subscribeToPages();
+      stateManager.setCache(pageKey, {
+        state: {
+          data: finalResponse.data,
+          error: void 0,
+          timestamp: Date.now()
+        },
+        tags,
+        stale: false
+      });
+      latestError = void 0;
+    } else if (finalResponse.error) {
+      latestError = finalResponse.error;
+    }
   };
   const controller = {
     getState() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/core",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "license": "MIT",
   "description": "Type-safe API client with plugin middleware system",
   "keywords": [