@spoosh/core 0.10.1 → 0.11.0

package/README.md

@@ -47,8 +47,11 @@ type ApiSchema = {
 ```typescript
 import { createClient } from "@spoosh/core";
 
-const api = createClient<ApiSchema>({
-  baseUrl: "/api",
+const api = createClient<ApiSchema>("/api");
+
+// With custom options
+const apiWithAuth = createClient<ApiSchema>("/api", {
+  headers: { Authorization: "Bearer token" },
 });
 
 // Import body wrappers for explicit serialization
@@ -115,7 +118,7 @@ When using `createClient`, Next.js cache tags are automatically generated from t
 // Server component
 import { createClient } from "@spoosh/core";
 
-const api = createClient<ApiSchema>({ baseUrl: process.env.API_URL! });
+const api = createClient<ApiSchema>(process.env.API_URL!);
 
 // Auto-generates next: { tags: ['posts'] }
 const { data: posts } = await api("posts").GET();
@@ -128,51 +131,6 @@ const { data: userPosts } = await api("users/:id/posts").GET({
 
 This enables automatic cache invalidation with `revalidateTag()` in Next.js.
 
-### With Middlewares
-
-```typescript
-import { createClient, createMiddleware } from "@spoosh/core";
-
-const authMiddleware = createMiddleware("auth", "before", async (ctx) => {
-  ctx.requestOptions = {
-    ...ctx.requestOptions,
-    headers: { Authorization: `Bearer ${token}` },
-  };
-  return ctx;
-});
-
-const api = createClient<ApiSchema>({
-  baseUrl: "/api",
-  middlewares: [authMiddleware],
-});
-```
-
-### Middleware Utilities
-
-```typescript
-import {
-  createMiddleware,
-  applyMiddlewares,
-  composeMiddlewares,
-} from "@spoosh/core";
-
-// createMiddleware(name, phase, handler) - Create a named middleware
-const logMiddleware = createMiddleware("logger", "after", async (ctx) => {
-  console.log(ctx.response?.status);
-  return ctx;
-});
-
-// composeMiddlewares(...lists) - Combine multiple middleware arrays
-const allMiddlewares = composeMiddlewares(
-  [authMiddleware],
-  [logMiddleware],
-  conditionalMiddlewares
-);
-
-// applyMiddlewares(context, middlewares, phase) - Run middlewares for a phase
-const updatedContext = await applyMiddlewares(context, middlewares, "before");
-```
-
 ## Schema Types
 
 | Field   | Description           | Example                                          |
@@ -186,15 +144,16 @@ Path parameters are defined using `:param` syntax in the path key (e.g., `"users
 
 ## API Reference
 
-### createClient(config)
+### createClient(baseUrl, defaultOptions?)
 
 Creates a lightweight type-safe API instance.
 
-| Option           | Type                 | Description                                        |
-| ---------------- | -------------------- | -------------------------------------------------- |
-| `baseUrl`        | `string`             | Base URL for all API requests                      |
-| `defaultOptions` | `RequestInit`        | Default fetch options (headers, credentials, etc.) |
-| `middlewares`    | `SpooshMiddleware[]` | Request/response middlewares                       |
+**Parameters:**
+
+| Parameter        | Type          | Description                                                   |
+| ---------------- | ------------- | ------------------------------------------------------------- |
+| `baseUrl`        | `string`      | Base URL for all API requests                                 |
+| `defaultOptions` | `RequestInit` | (Optional) Default fetch options (headers, credentials, etc.) |
 
 ### Spoosh (class)
 

package/dist/index.d.mts

@@ -4,24 +4,6 @@ type Simplify<T> = {
     [K in keyof T]: T[K];
 } & {};
 
-type MiddlewarePhase = "before" | "after";
-type MiddlewareContext<TData = unknown, TError = unknown> = {
-    baseUrl: string;
-    path: string[];
-    method: HttpMethod;
-    defaultOptions: SpooshOptions & SpooshOptionsExtra;
-    requestOptions?: AnyRequestOptions;
-    fetchInit?: RequestInit;
-    response?: SpooshResponse<TData, TError>;
-    metadata: Record<string, unknown>;
-};
-type MiddlewareHandler<TData = unknown, TError = unknown> = (context: MiddlewareContext<TData, TError>) => MiddlewareContext<TData, TError> | Promise<MiddlewareContext<TData, TError>>;
-type SpooshMiddleware<TData = unknown, TError = unknown> = {
-    name: string;
-    phase: MiddlewarePhase;
-    handler: MiddlewareHandler<TData, TError>;
-};
-
 type QueryField<TQuery> = [TQuery] extends [never] ? object : {
     query: TQuery;
 };
@@ -54,15 +36,25 @@ type SpooshResponse<TData, TError, TRequestOptions = unknown, TQuery = never, TB
     aborted?: boolean;
     readonly __requestOptions?: TRequestOptions;
 } & InputFieldWrapper<TQuery, TBody, TParamNames>);
-type SpooshOptionsExtra<TData = unknown, TError = unknown> = {
-    middlewares?: SpooshMiddleware<TData, TError>[];
-};
 
-type SpooshBody<T = unknown> = {
-    readonly __spooshBody: true;
-    readonly kind: "form" | "json" | "urlencoded";
-    readonly value: T;
-};
+/**
+ * Opaque type representing a transformed body. Create using `form()`, `json()`, or `urlencoded()` helpers.
+ * Do not create this type manually - use the helper functions instead.
+ *
+ * @example
+ * ```ts
+ * import { form, json, urlencoded } from "@spoosh/core";
+ *
+ * // Use helpers to create SpooshBody
+ * trigger({ body: form({ file: myFile }) });
+ * trigger({ body: json({ data: "value" }) });
+ * trigger({ body: urlencoded({ key: "value" }) });
+ * ```
+ */
+declare class SpooshBodyClass<T> {
+    private __brand;
+}
+type SpooshBody<T = unknown> = SpooshBodyClass<T>;
 declare function isSpooshBody(value: unknown): value is SpooshBody;
 declare function form<T>(value: T): SpooshBody<T>;
 declare function json<T>(value: T): SpooshBody<T>;
@@ -231,7 +223,7 @@ type CacheEntryWithKey<TData = unknown, TError = unknown> = {
 declare function createInitialState<TData, TError>(): OperationState<TData, TError>;
 type StateManager = {
     createQueryKey: (params: {
-        path: string[];
+        path: string;
         method: string;
         options?: unknown;
     }) => string;
@@ -249,6 +241,8 @@ type StateManager = {
     getAllCacheEntries: <TData, TError>() => CacheEntryWithKey<TData, TError>[];
     /** Get the number of cache entries */
     getSize: () => number;
+    /** Get the number of active subscribers for a cache key */
+    getSubscribersCount: (key: string) => number;
     /** Set a pending promise for a query key (for deduplication) */
     setPendingPromise: (key: string, promise: Promise<unknown> | undefined) => void;
     /** Get a pending promise for a query key */
@@ -275,9 +269,13 @@ type CacheEntry<TData = unknown, TError = unknown> = {
     /** Cache was invalidated while no subscriber was listening. Triggers refetch on next mount. */
     stale?: boolean;
 };
-type PluginContext<TData = unknown, TError = unknown> = {
+/** RequestOptions in plugin context have headers already resolved to Record */
+type PluginRequestOptions = Omit<AnyRequestOptions, "headers"> & {
+    headers: Record<string, string>;
+};
+type PluginContext = {
     readonly operationType: OperationType;
-    readonly path: string[];
+    readonly path: string;
     readonly method: HttpMethod;
     readonly queryKey: string;
     readonly tags: string[];
@@ -285,17 +283,10 @@ type PluginContext<TData = unknown, TError = unknown> = {
     readonly requestTimestamp: number;
     /** Unique identifier for the hook instance. Persists across queryKey changes within the same hook. */
     readonly hookId?: string;
-    requestOptions: AnyRequestOptions;
-    state: OperationState<TData, TError>;
-    response?: SpooshResponse<TData, TError>;
+    request: PluginRequestOptions;
     metadata: Map<string, unknown>;
-    abort: () => void;
     stateManager: StateManager;
     eventEmitter: EventEmitter;
-    /** Resolved headers as a plain object. Modify via setHeaders(). */
-    headers: Record<string, string>;
-    /** Add/update headers. Merges with existing headers. */
-    setHeaders: (headers: Record<string, string>) => void;
     /** Access other plugins' exported APIs */
     plugins: PluginAccessor;
     /** Plugin-specific options passed from hooks (useRead/useWrite/useInfiniteRead) */
@@ -304,7 +295,7 @@ type PluginContext<TData = unknown, TError = unknown> = {
     forceRefetch?: boolean;
 };
 /** Input type for creating PluginContext (without injected properties) */
-type PluginContextInput<TData = unknown, TError = unknown> = Omit<PluginContext<TData, TError>, "plugins" | "setHeaders" | "headers">;
+type PluginContextInput = Omit<PluginContext, "plugins">;
 /**
  * Middleware function that wraps the fetch flow.
  * Plugins use this for full control over request/response handling.
@@ -334,22 +325,22 @@ type PluginContextInput<TData = unknown, TError = unknown> = Omit<PluginContext<
  * }
  * ```
  */
-type PluginMiddleware<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, next: () => Promise<SpooshResponse<TData, TError>>) => Promise<SpooshResponse<TData, TError>>;
-type PluginHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>) => void | Promise<void>;
-type PluginUpdateHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, previousContext: PluginContext<TData, TError>) => void | Promise<void>;
+type PluginMiddleware = (context: PluginContext, next: () => Promise<SpooshResponse<any, any>>) => Promise<SpooshResponse<any, any>>;
+type PluginHandler = (context: PluginContext) => void | Promise<void>;
+type PluginUpdateHandler = (context: PluginContext, previousContext: PluginContext) => void | Promise<void>;
 /**
  * Handler called after every response, regardless of early returns from middleware.
  * 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>) => SpooshResponse<TData, TError> | void | Promise<SpooshResponse<TData, TError> | void>;
-type PluginLifecycle<TData = unknown, TError = unknown> = {
+type PluginResponseHandler = (context: PluginContext, response: SpooshResponse<any, any>) => SpooshResponse<any, any> | void | Promise<SpooshResponse<any, any> | void>;
+type PluginLifecycle = {
     /** Called on component mount */
-    onMount?: PluginHandler<TData, TError>;
+    onMount?: PluginHandler;
     /** Called when options/query changes. Receives both new and previous context. */
-    onUpdate?: PluginUpdateHandler<TData, TError>;
+    onUpdate?: PluginUpdateHandler;
     /** Called on component unmount */
-    onUnmount?: PluginHandler<TData, TError>;
+    onUnmount?: PluginHandler;
 };
 /**
  * Configuration object for plugin type definitions.
@@ -606,8 +597,8 @@ type RefetchEvent = {
  * Avoids circular dependency with executor.ts.
  */
 type InstancePluginExecutor = {
-    executeMiddleware: <TData, TError>(operationType: OperationType, context: PluginContext<TData, TError>, coreFetch: () => Promise<SpooshResponse<TData, TError>>) => Promise<SpooshResponse<TData, TError>>;
-    createContext: <TData, TError>(input: PluginContextInput<TData, TError>) => PluginContext<TData, TError>;
+    executeMiddleware: <TData, TError>(operationType: OperationType, context: PluginContext, coreFetch: () => Promise<SpooshResponse<any, any>>) => Promise<SpooshResponse<TData, TError>>;
+    createContext: (input: PluginContextInput) => PluginContext;
 };
 /**
  * Context provided to plugin's instanceApi function.
@@ -622,14 +613,13 @@ type InstanceApiContext<TApi = unknown> = {
 
 type PluginExecutor = {
     /** Execute lifecycle hooks for onMount or onUnmount */
-    executeLifecycle: <TData, TError>(phase: "onMount" | "onUnmount", operationType: OperationType, context: PluginContext<TData, TError>) => Promise<void>;
+    executeLifecycle: (phase: "onMount" | "onUnmount", operationType: OperationType, context: PluginContext) => 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 afterResponse handlers */
-    executeMiddleware: <TData, TError>(operationType: OperationType, context: PluginContext<TData, TError>, coreFetch: () => Promise<SpooshResponse<TData, TError>>) => Promise<SpooshResponse<TData, TError>>;
+    executeUpdateLifecycle: (operationType: OperationType, context: PluginContext, previousContext: PluginContext) => Promise<void>;
+    executeMiddleware: (operationType: OperationType, context: PluginContext, coreFetch: () => Promise<SpooshResponse<any, any>>) => Promise<SpooshResponse<any, any>>;
     getPlugins: () => readonly SpooshPlugin[];
     /** Creates a full PluginContext with plugins accessor injected */
-    createContext: <TData, TError>(input: PluginContextInput<TData, TError>) => PluginContext<TData, TError>;
+    createContext: (input: PluginContextInput) => PluginContext;
 };
 declare function createPluginExecutor(initialPlugins?: SpooshPlugin[]): PluginExecutor;
 
@@ -1346,18 +1336,14 @@ declare class Spoosh<TSchema = unknown, TError = unknown, TPlugins extends Plugi
     };
 }
 
-type SpooshClientConfig = {
-    baseUrl: string;
-    defaultOptions?: SpooshOptionsInput;
-    middlewares?: SpooshMiddleware[];
-};
 /**
  * Creates a lightweight type-safe API instance for vanilla JavaScript/TypeScript usage.
  *
  * This is a simpler alternative to `Spoosh` for users who don't need
  * the full plugin system, state management, or React integration.
  *
- * @param config - Client configuration
+ * @param baseUrl - Base URL for all API requests
+ * @param defaultOptions - Default fetch options (headers, credentials, etc.)
  * @returns Type-safe API instance
  *
  * @example
@@ -1378,23 +1364,21 @@ type SpooshClientConfig = {
  *   message: string;
  * }
  *
- * const api = createClient<ApiSchema, ApiError>({
- *   baseUrl: "/api",
- * });
+ * const api = createClient<ApiSchema, ApiError>("/api");
  *
  * // Type-safe API calls with path strings
  * const { data } = await api("posts").GET();
  * const { data: post } = await api("posts/123").GET();
  * await api("posts/:id").GET({ params: { id: 123 } });
  *
- * // With XHR transport
- * const api = createClient<ApiSchema, ApiError>({
- *   baseUrl: "/api",
- *   defaultOptions: { transport: "xhr" },
+ * // With custom options
+ * const api = createClient<ApiSchema, ApiError>("/api", {
+ *   headers: { Authorization: "Bearer token" },
+ *   transport: "xhr",
  * });
  * ```
  */
-declare function createClient<TSchema, TDefaultError = unknown>(config: SpooshClientConfig): SpooshClient<TSchema, TDefaultError>;
+declare function createClient<TSchema, TDefaultError = unknown>(baseUrl: string, defaultOptions?: SpooshOptionsInput): SpooshClient<TSchema, TDefaultError>;
 
 declare function buildUrl(baseUrl: string, path: string[], query?: Record<string, string | number | boolean | undefined>): string;
 
@@ -1593,11 +1577,7 @@ declare module "./types" {
 }
 declare const xhrTransport: Transport<XhrTransportOptions>;
 
-declare function executeFetch<TData, TError>(baseUrl: string, path: string[], method: HttpMethod, defaultOptions: SpooshOptions & SpooshOptionsExtra, requestOptions?: AnyRequestOptions, nextTags?: boolean): Promise<SpooshResponse<TData, TError>>;
-
-declare function createMiddleware<TData = unknown, TError = unknown>(name: string, phase: MiddlewarePhase, handler: SpooshMiddleware<TData, TError>["handler"]): SpooshMiddleware<TData, TError>;
-declare function applyMiddlewares<TData = unknown, TError = unknown>(context: MiddlewareContext<TData, TError>, middlewares: SpooshMiddleware<TData, TError>[], phase: MiddlewarePhase): Promise<MiddlewareContext<TData, TError>>;
-declare function composeMiddlewares<TData = unknown, TError = unknown>(...middlewareLists: (SpooshMiddleware<TData, TError>[] | undefined)[]): SpooshMiddleware<TData, TError>[];
+declare function executeFetch<TData, TError>(baseUrl: string, path: string[], method: HttpMethod, defaultOptions: SpooshOptions, requestOptions?: AnyRequestOptions, nextTags?: boolean): Promise<SpooshResponse<TData, TError>>;
 
 type ExecuteOptions = {
     force?: boolean;
@@ -1613,15 +1593,15 @@ type OperationController<TData = unknown, TError = unknown> = {
     /** Called once when hook finally unmounts */
     unmount: () => void;
     /** Called when options/query changes. Pass previous context for cleanup. */
-    update: (previousContext: PluginContext<TData, TError>) => void;
+    update: (previousContext: PluginContext) => void;
     /** Get current context (for passing to update as previousContext) */
-    getContext: () => PluginContext<TData, TError>;
+    getContext: () => PluginContext;
     setPluginOptions: (options: unknown) => void;
     setMetadata: (key: string, value: unknown) => void;
 };
 type CreateOperationOptions<TData, TError> = {
     operationType: OperationType;
-    path: string[];
+    path: string;
     method: HttpMethod;
     tags: string[];
     requestOptions?: AnyRequestOptions;
@@ -1663,12 +1643,12 @@ type InfiniteReadController<TData, TItem, TError> = {
     abort: () => void;
     mount: () => void;
     unmount: () => void;
-    update: (previousContext: PluginContext<TData, TError>) => void;
-    getContext: () => PluginContext<TData, TError>;
+    update: (previousContext: PluginContext) => void;
+    getContext: () => PluginContext;
     setPluginOptions: (options: unknown) => void;
 };
 type CreateInfiniteReadOptions<TData, TItem, TError, TRequest> = {
-    path: string[];
+    path: string;
     method: HttpMethod;
     tags: string[];
     initialRequest: InfiniteRequestOptions;
@@ -1687,4 +1667,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 HasReadMethod, type HasWriteMethod, 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 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 ReadClient, type ReadPaths, type ReadSchemaHelper, type RefetchEvent, type RequestOptions$1 as RequestOptions, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type RetryConfig, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, type Simplify, Spoosh, type SpooshBody, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshMiddleware, type SpooshOptions, type SpooshOptionsExtra, type SpooshOptionsInput, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StateManager, type StripPrefix, type TagMode, type TagOptions, type Transport, type TransportOption, type TransportOptionsMap, type TransportResponse, type WriteClient, type WriteMethod, type WritePaths, type WriteSchemaHelper, __DEV__, applyMiddlewares, buildUrl, composeMiddlewares, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createMiddleware, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, executeFetch, extractMethodFromSelector, extractPathFromSelector, fetchTransport, form, generateTags, getContentType, isJsonBody, isSpooshBody, json, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveRequestBody, resolveTags, setHeaders, sortObjectKeys, urlencoded, xhrTransport };
+export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, 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 HasReadMethod, type HasWriteMethod, 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 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 PluginRequestOptions, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type ReadClient, type ReadPaths, type ReadSchemaHelper, type RefetchEvent, type RequestOptions$1 as RequestOptions, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type RetryConfig, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, type Simplify, Spoosh, type SpooshBody, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshOptions, type SpooshOptionsInput, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StateManager, type StripPrefix, type TagMode, type TagOptions, type Transport, type TransportOption, type TransportOptionsMap, type TransportResponse, type WriteClient, type WriteMethod, type WritePaths, type WriteSchemaHelper, __DEV__, buildUrl, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, executeFetch, extractMethodFromSelector, extractPathFromSelector, fetchTransport, form, generateTags, getContentType, isJsonBody, isSpooshBody, json, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveRequestBody, resolveTags, setHeaders, sortObjectKeys, urlencoded, xhrTransport };

package/dist/index.d.ts

@@ -4,24 +4,6 @@ type Simplify<T> = {
     [K in keyof T]: T[K];
 } & {};
 
-type MiddlewarePhase = "before" | "after";
-type MiddlewareContext<TData = unknown, TError = unknown> = {
-    baseUrl: string;
-    path: string[];
-    method: HttpMethod;
-    defaultOptions: SpooshOptions & SpooshOptionsExtra;
-    requestOptions?: AnyRequestOptions;
-    fetchInit?: RequestInit;
-    response?: SpooshResponse<TData, TError>;
-    metadata: Record<string, unknown>;
-};
-type MiddlewareHandler<TData = unknown, TError = unknown> = (context: MiddlewareContext<TData, TError>) => MiddlewareContext<TData, TError> | Promise<MiddlewareContext<TData, TError>>;
-type SpooshMiddleware<TData = unknown, TError = unknown> = {
-    name: string;
-    phase: MiddlewarePhase;
-    handler: MiddlewareHandler<TData, TError>;
-};
-
 type QueryField<TQuery> = [TQuery] extends [never] ? object : {
     query: TQuery;
 };
@@ -54,15 +36,25 @@ type SpooshResponse<TData, TError, TRequestOptions = unknown, TQuery = never, TB
     aborted?: boolean;
     readonly __requestOptions?: TRequestOptions;
 } & InputFieldWrapper<TQuery, TBody, TParamNames>);
-type SpooshOptionsExtra<TData = unknown, TError = unknown> = {
-    middlewares?: SpooshMiddleware<TData, TError>[];
-};
 
-type SpooshBody<T = unknown> = {
-    readonly __spooshBody: true;
-    readonly kind: "form" | "json" | "urlencoded";
-    readonly value: T;
-};
+/**
+ * Opaque type representing a transformed body. Create using `form()`, `json()`, or `urlencoded()` helpers.
+ * Do not create this type manually - use the helper functions instead.
+ *
+ * @example
+ * ```ts
+ * import { form, json, urlencoded } from "@spoosh/core";
+ *
+ * // Use helpers to create SpooshBody
+ * trigger({ body: form({ file: myFile }) });
+ * trigger({ body: json({ data: "value" }) });
+ * trigger({ body: urlencoded({ key: "value" }) });
+ * ```
+ */
+declare class SpooshBodyClass<T> {
+    private __brand;
+}
+type SpooshBody<T = unknown> = SpooshBodyClass<T>;
 declare function isSpooshBody(value: unknown): value is SpooshBody;
 declare function form<T>(value: T): SpooshBody<T>;
 declare function json<T>(value: T): SpooshBody<T>;
@@ -231,7 +223,7 @@ type CacheEntryWithKey<TData = unknown, TError = unknown> = {
 declare function createInitialState<TData, TError>(): OperationState<TData, TError>;
 type StateManager = {
     createQueryKey: (params: {
-        path: string[];
+        path: string;
         method: string;
         options?: unknown;
     }) => string;
@@ -249,6 +241,8 @@ type StateManager = {
     getAllCacheEntries: <TData, TError>() => CacheEntryWithKey<TData, TError>[];
     /** Get the number of cache entries */
     getSize: () => number;
+    /** Get the number of active subscribers for a cache key */
+    getSubscribersCount: (key: string) => number;
     /** Set a pending promise for a query key (for deduplication) */
     setPendingPromise: (key: string, promise: Promise<unknown> | undefined) => void;
     /** Get a pending promise for a query key */
@@ -275,9 +269,13 @@ type CacheEntry<TData = unknown, TError = unknown> = {
     /** Cache was invalidated while no subscriber was listening. Triggers refetch on next mount. */
     stale?: boolean;
 };
-type PluginContext<TData = unknown, TError = unknown> = {
+/** RequestOptions in plugin context have headers already resolved to Record */
+type PluginRequestOptions = Omit<AnyRequestOptions, "headers"> & {
+    headers: Record<string, string>;
+};
+type PluginContext = {
     readonly operationType: OperationType;
-    readonly path: string[];
+    readonly path: string;
     readonly method: HttpMethod;
     readonly queryKey: string;
     readonly tags: string[];
@@ -285,17 +283,10 @@ type PluginContext<TData = unknown, TError = unknown> = {
     readonly requestTimestamp: number;
     /** Unique identifier for the hook instance. Persists across queryKey changes within the same hook. */
     readonly hookId?: string;
-    requestOptions: AnyRequestOptions;
-    state: OperationState<TData, TError>;
-    response?: SpooshResponse<TData, TError>;
+    request: PluginRequestOptions;
     metadata: Map<string, unknown>;
-    abort: () => void;
     stateManager: StateManager;
     eventEmitter: EventEmitter;
-    /** Resolved headers as a plain object. Modify via setHeaders(). */
-    headers: Record<string, string>;
-    /** Add/update headers. Merges with existing headers. */
-    setHeaders: (headers: Record<string, string>) => void;
     /** Access other plugins' exported APIs */
     plugins: PluginAccessor;
     /** Plugin-specific options passed from hooks (useRead/useWrite/useInfiniteRead) */
@@ -304,7 +295,7 @@ type PluginContext<TData = unknown, TError = unknown> = {
     forceRefetch?: boolean;
 };
 /** Input type for creating PluginContext (without injected properties) */
-type PluginContextInput<TData = unknown, TError = unknown> = Omit<PluginContext<TData, TError>, "plugins" | "setHeaders" | "headers">;
+type PluginContextInput = Omit<PluginContext, "plugins">;
 /**
  * Middleware function that wraps the fetch flow.
  * Plugins use this for full control over request/response handling.
@@ -334,22 +325,22 @@ type PluginContextInput<TData = unknown, TError = unknown> = Omit<PluginContext<
  * }
  * ```
  */
-type PluginMiddleware<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, next: () => Promise<SpooshResponse<TData, TError>>) => Promise<SpooshResponse<TData, TError>>;
-type PluginHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>) => void | Promise<void>;
-type PluginUpdateHandler<TData = unknown, TError = unknown> = (context: PluginContext<TData, TError>, previousContext: PluginContext<TData, TError>) => void | Promise<void>;
+type PluginMiddleware = (context: PluginContext, next: () => Promise<SpooshResponse<any, any>>) => Promise<SpooshResponse<any, any>>;
+type PluginHandler = (context: PluginContext) => void | Promise<void>;
+type PluginUpdateHandler = (context: PluginContext, previousContext: PluginContext) => void | Promise<void>;
 /**
  * Handler called after every response, regardless of early returns from middleware.
  * 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>) => SpooshResponse<TData, TError> | void | Promise<SpooshResponse<TData, TError> | void>;
-type PluginLifecycle<TData = unknown, TError = unknown> = {
+type PluginResponseHandler = (context: PluginContext, response: SpooshResponse<any, any>) => SpooshResponse<any, any> | void | Promise<SpooshResponse<any, any> | void>;
+type PluginLifecycle = {
     /** Called on component mount */
-    onMount?: PluginHandler<TData, TError>;
+    onMount?: PluginHandler;
     /** Called when options/query changes. Receives both new and previous context. */
-    onUpdate?: PluginUpdateHandler<TData, TError>;
+    onUpdate?: PluginUpdateHandler;
     /** Called on component unmount */
-    onUnmount?: PluginHandler<TData, TError>;
+    onUnmount?: PluginHandler;
 };
 /**
  * Configuration object for plugin type definitions.
@@ -606,8 +597,8 @@ type RefetchEvent = {
  * Avoids circular dependency with executor.ts.
  */
 type InstancePluginExecutor = {
-    executeMiddleware: <TData, TError>(operationType: OperationType, context: PluginContext<TData, TError>, coreFetch: () => Promise<SpooshResponse<TData, TError>>) => Promise<SpooshResponse<TData, TError>>;
-    createContext: <TData, TError>(input: PluginContextInput<TData, TError>) => PluginContext<TData, TError>;
+    executeMiddleware: <TData, TError>(operationType: OperationType, context: PluginContext, coreFetch: () => Promise<SpooshResponse<any, any>>) => Promise<SpooshResponse<TData, TError>>;
+    createContext: (input: PluginContextInput) => PluginContext;
 };
 /**
  * Context provided to plugin's instanceApi function.
@@ -622,14 +613,13 @@ type InstanceApiContext<TApi = unknown> = {
 
 type PluginExecutor = {
     /** Execute lifecycle hooks for onMount or onUnmount */
-    executeLifecycle: <TData, TError>(phase: "onMount" | "onUnmount", operationType: OperationType, context: PluginContext<TData, TError>) => Promise<void>;
+    executeLifecycle: (phase: "onMount" | "onUnmount", operationType: OperationType, context: PluginContext) => 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 afterResponse handlers */
-    executeMiddleware: <TData, TError>(operationType: OperationType, context: PluginContext<TData, TError>, coreFetch: () => Promise<SpooshResponse<TData, TError>>) => Promise<SpooshResponse<TData, TError>>;
+    executeUpdateLifecycle: (operationType: OperationType, context: PluginContext, previousContext: PluginContext) => Promise<void>;
+    executeMiddleware: (operationType: OperationType, context: PluginContext, coreFetch: () => Promise<SpooshResponse<any, any>>) => Promise<SpooshResponse<any, any>>;
     getPlugins: () => readonly SpooshPlugin[];
     /** Creates a full PluginContext with plugins accessor injected */
-    createContext: <TData, TError>(input: PluginContextInput<TData, TError>) => PluginContext<TData, TError>;
+    createContext: (input: PluginContextInput) => PluginContext;
 };
 declare function createPluginExecutor(initialPlugins?: SpooshPlugin[]): PluginExecutor;
 
@@ -1346,18 +1336,14 @@ declare class Spoosh<TSchema = unknown, TError = unknown, TPlugins extends Plugi
     };
 }
 
-type SpooshClientConfig = {
-    baseUrl: string;
-    defaultOptions?: SpooshOptionsInput;
-    middlewares?: SpooshMiddleware[];
-};
 /**
  * Creates a lightweight type-safe API instance for vanilla JavaScript/TypeScript usage.
  *
  * This is a simpler alternative to `Spoosh` for users who don't need
  * the full plugin system, state management, or React integration.
  *
- * @param config - Client configuration
+ * @param baseUrl - Base URL for all API requests
+ * @param defaultOptions - Default fetch options (headers, credentials, etc.)
  * @returns Type-safe API instance
  *
  * @example
@@ -1378,23 +1364,21 @@ type SpooshClientConfig = {
  *   message: string;
  * }
  *
- * const api = createClient<ApiSchema, ApiError>({
- *   baseUrl: "/api",
- * });
+ * const api = createClient<ApiSchema, ApiError>("/api");
  *
  * // Type-safe API calls with path strings
  * const { data } = await api("posts").GET();
  * const { data: post } = await api("posts/123").GET();
  * await api("posts/:id").GET({ params: { id: 123 } });
  *
- * // With XHR transport
- * const api = createClient<ApiSchema, ApiError>({
- *   baseUrl: "/api",
- *   defaultOptions: { transport: "xhr" },
+ * // With custom options
+ * const api = createClient<ApiSchema, ApiError>("/api", {
+ *   headers: { Authorization: "Bearer token" },
+ *   transport: "xhr",
  * });
  * ```
  */
-declare function createClient<TSchema, TDefaultError = unknown>(config: SpooshClientConfig): SpooshClient<TSchema, TDefaultError>;
+declare function createClient<TSchema, TDefaultError = unknown>(baseUrl: string, defaultOptions?: SpooshOptionsInput): SpooshClient<TSchema, TDefaultError>;
 
 declare function buildUrl(baseUrl: string, path: string[], query?: Record<string, string | number | boolean | undefined>): string;
 
@@ -1593,11 +1577,7 @@ declare module "./types" {
 }
 declare const xhrTransport: Transport<XhrTransportOptions>;
 
-declare function executeFetch<TData, TError>(baseUrl: string, path: string[], method: HttpMethod, defaultOptions: SpooshOptions & SpooshOptionsExtra, requestOptions?: AnyRequestOptions, nextTags?: boolean): Promise<SpooshResponse<TData, TError>>;
-
-declare function createMiddleware<TData = unknown, TError = unknown>(name: string, phase: MiddlewarePhase, handler: SpooshMiddleware<TData, TError>["handler"]): SpooshMiddleware<TData, TError>;
-declare function applyMiddlewares<TData = unknown, TError = unknown>(context: MiddlewareContext<TData, TError>, middlewares: SpooshMiddleware<TData, TError>[], phase: MiddlewarePhase): Promise<MiddlewareContext<TData, TError>>;
-declare function composeMiddlewares<TData = unknown, TError = unknown>(...middlewareLists: (SpooshMiddleware<TData, TError>[] | undefined)[]): SpooshMiddleware<TData, TError>[];
+declare function executeFetch<TData, TError>(baseUrl: string, path: string[], method: HttpMethod, defaultOptions: SpooshOptions, requestOptions?: AnyRequestOptions, nextTags?: boolean): Promise<SpooshResponse<TData, TError>>;
 
 type ExecuteOptions = {
     force?: boolean;
@@ -1613,15 +1593,15 @@ type OperationController<TData = unknown, TError = unknown> = {
     /** Called once when hook finally unmounts */
     unmount: () => void;
     /** Called when options/query changes. Pass previous context for cleanup. */
-    update: (previousContext: PluginContext<TData, TError>) => void;
+    update: (previousContext: PluginContext) => void;
     /** Get current context (for passing to update as previousContext) */
-    getContext: () => PluginContext<TData, TError>;
+    getContext: () => PluginContext;
     setPluginOptions: (options: unknown) => void;
     setMetadata: (key: string, value: unknown) => void;
 };
 type CreateOperationOptions<TData, TError> = {
     operationType: OperationType;
-    path: string[];
+    path: string;
     method: HttpMethod;
     tags: string[];
     requestOptions?: AnyRequestOptions;
@@ -1663,12 +1643,12 @@ type InfiniteReadController<TData, TItem, TError> = {
     abort: () => void;
     mount: () => void;
     unmount: () => void;
-    update: (previousContext: PluginContext<TData, TError>) => void;
-    getContext: () => PluginContext<TData, TError>;
+    update: (previousContext: PluginContext) => void;
+    getContext: () => PluginContext;
     setPluginOptions: (options: unknown) => void;
 };
 type CreateInfiniteReadOptions<TData, TItem, TError, TRequest> = {
-    path: string[];
+    path: string;
     method: HttpMethod;
     tags: string[];
     initialRequest: InfiniteRequestOptions;
@@ -1687,4 +1667,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 HasReadMethod, type HasWriteMethod, 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 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 ReadClient, type ReadPaths, type ReadSchemaHelper, type RefetchEvent, type RequestOptions$1 as RequestOptions, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type RetryConfig, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, type Simplify, Spoosh, type SpooshBody, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshMiddleware, type SpooshOptions, type SpooshOptionsExtra, type SpooshOptionsInput, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StateManager, type StripPrefix, type TagMode, type TagOptions, type Transport, type TransportOption, type TransportOptionsMap, type TransportResponse, type WriteClient, type WriteMethod, type WritePaths, type WriteSchemaHelper, __DEV__, applyMiddlewares, buildUrl, composeMiddlewares, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createMiddleware, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, executeFetch, extractMethodFromSelector, extractPathFromSelector, fetchTransport, form, generateTags, getContentType, isJsonBody, isSpooshBody, json, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveRequestBody, resolveTags, setHeaders, sortObjectKeys, urlencoded, xhrTransport };
+export { type AnyRequestOptions, type ApiSchema, type BuiltInEvents, type CacheEntry, type CacheEntryWithKey, type CapturedCall, 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 HasReadMethod, type HasWriteMethod, 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 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 PluginRequestOptions, type PluginResolvers, type PluginResponseHandler, type PluginResultResolvers, type PluginTypeConfig, type PluginUpdateHandler, type ReadClient, type ReadPaths, type ReadSchemaHelper, type RefetchEvent, type RequestOptions$1 as RequestOptions, type ResolveInstanceApi, type ResolveResultTypes, type ResolveSchemaTypes, type ResolveTypes, type ResolverContext, type RetryConfig, type SchemaPaths, type SelectedEndpoint, type SelectorFunction, type SelectorResult, type Simplify, Spoosh, type SpooshBody, type SpooshClient, type SpooshConfig, type SpooshInstance, type SpooshOptions, type SpooshOptionsInput, type SpooshPlugin, type SpooshResponse, type SpooshSchema, type StateManager, type StripPrefix, type TagMode, type TagOptions, type Transport, type TransportOption, type TransportOptionsMap, type TransportResponse, type WriteClient, type WriteMethod, type WritePaths, type WriteSchemaHelper, __DEV__, buildUrl, containsFile, createClient, createEventEmitter, createInfiniteReadController, createInitialState, createOperationController, createPluginExecutor, createPluginRegistry, createProxyHandler, createSelectorProxy, createStateManager, executeFetch, extractMethodFromSelector, extractPathFromSelector, fetchTransport, form, generateTags, getContentType, isJsonBody, isSpooshBody, json, mergeHeaders, objectToFormData, objectToUrlEncoded, resolveHeadersToRecord, resolvePath, resolveRequestBody, resolveTags, setHeaders, sortObjectKeys, urlencoded, xhrTransport };

package/dist/index.js

@@ -23,15 +23,12 @@ __export(src_exports, {
   HTTP_METHODS: () => HTTP_METHODS,
   Spoosh: () => Spoosh,
   __DEV__: () => __DEV__,
-  applyMiddlewares: () => applyMiddlewares,
   buildUrl: () => buildUrl,
-  composeMiddlewares: () => composeMiddlewares,
   containsFile: () => containsFile,
   createClient: () => createClient,
   createEventEmitter: () => createEventEmitter,
   createInfiniteReadController: () => createInfiniteReadController,
   createInitialState: () => createInitialState,
-  createMiddleware: () => createMiddleware,
   createOperationController: () => createOperationController,
   createPluginExecutor: () => createPluginExecutor,
   createPluginRegistry: () => createPluginRegistry,
@@ -62,22 +59,6 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
-// src/middleware.ts
-function createMiddleware(name, phase, handler) {
-  return { name, phase, handler };
-}
-async function applyMiddlewares(context, middlewares, phase) {
-  const phaseMiddlewares = middlewares.filter((m) => m.phase === phase);
-  let ctx = context;
-  for (const middleware of phaseMiddlewares) {
-    ctx = await middleware.handler(ctx);
-  }
-  return ctx;
-}
-function composeMiddlewares(...middlewareLists) {
-  return middlewareLists.flat().filter(Boolean);
-}
-
 // src/utils/buildUrl.ts
 function stringifyQuery(query) {
   const parts = [];
@@ -288,19 +269,20 @@ function resolveRequestBody(rawBody) {
     return void 0;
   }
   if (isSpooshBody(rawBody)) {
-    switch (rawBody.kind) {
+    const body = rawBody;
+    switch (body.kind) {
       case "form":
         return {
-          body: objectToFormData(rawBody.value)
+          body: objectToFormData(body.value)
         };
       case "json":
         return {
-          body: JSON.stringify(rawBody.value),
+          body: JSON.stringify(body.value),
           headers: { "Content-Type": "application/json" }
         };
       case "urlencoded":
         return {
-          body: objectToUrlEncoded(rawBody.value),
+          body: objectToUrlEncoded(body.value),
           headers: { "Content-Type": "application/x-www-form-urlencoded" }
         };
     }
@@ -456,32 +438,15 @@ var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var isNetworkError = (err) => err instanceof TypeError;
 var isAbortError = (err) => err instanceof DOMException && err.name === "AbortError";
 async function executeFetch(baseUrl, path, method, defaultOptions, requestOptions, nextTags) {
-  const middlewares = defaultOptions.middlewares ?? [];
-  let context = {
+  return executeCoreFetch({
     baseUrl,
     path,
     method,
     defaultOptions,
     requestOptions,
-    metadata: {}
-  };
-  if (middlewares.length > 0) {
-    context = await applyMiddlewares(context, middlewares, "before");
-  }
-  const response = await executeCoreFetch({
-    baseUrl: context.baseUrl,
-    path: context.path,
-    method: context.method,
-    defaultOptions: context.defaultOptions,
-    requestOptions: context.requestOptions,
-    middlewareFetchInit: context.fetchInit,
+    middlewareFetchInit: void 0,
     nextTags
   });
-  context.response = response;
-  if (middlewares.length > 0) {
-    context = await applyMiddlewares(context, middlewares, "after");
-  }
-  return context.response;
 }
 function buildInputFields(requestOptions) {
   const fields = {};
@@ -516,12 +481,10 @@ async function executeCoreFetch(config) {
     nextTags
   } = config;
   const {
-    middlewares: _,
     headers: defaultHeaders,
     transport: defaultTransport,
     ...fetchDefaults
   } = defaultOptions;
-  void _;
   const inputFields = buildInputFields(requestOptions);
   const maxRetries = requestOptions?.retries ?? 3;
   const baseDelay = requestOptions?.retryDelay ?? 1e3;
@@ -712,7 +675,7 @@ function createInitialState() {
 function generateSelfTagFromKey(key) {
   try {
     const parsed = JSON.parse(key);
-    return parsed.path?.join("/");
+    return parsed.path;
   } catch {
     return void 0;
   }
@@ -854,6 +817,9 @@ function createStateManager() {
     getSize() {
       return cache.size;
     },
+    getSubscribersCount(key) {
+      return subscribers.get(key)?.size ?? 0;
+    },
     setPendingPromise(key, promise) {
       if (promise === void 0) {
         pendingPromises.delete(key);
@@ -967,10 +933,7 @@ function createPluginExecutor(initialPlugins = []) {
       if (!handler) {
         continue;
       }
-      await handler(
-        context,
-        previousContext
-      );
+      await handler(context, previousContext);
     }
   };
   return {
@@ -990,6 +953,7 @@ function createPluginExecutor(initialPlugins = []) {
             return () => middleware(
               context,
               next
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             );
           },
           coreFetch
@@ -1015,11 +979,6 @@ function createPluginExecutor(initialPlugins = []) {
     createContext(input) {
       const ctx = input;
       ctx.plugins = createPluginAccessor(ctx);
-      ctx.headers = {};
-      ctx.setHeaders = (newHeaders) => {
-        ctx.headers = { ...ctx.headers, ...newHeaders };
-        ctx.requestOptions.headers = ctx.headers;
-      };
       return ctx;
     }
   };
@@ -1253,15 +1212,10 @@ var Spoosh = class _Spoosh {
 };
 
 // src/createClient.ts
-function createClient(config) {
-  const { baseUrl, defaultOptions = {}, middlewares = [] } = config;
-  const optionsWithMiddlewares = {
-    ...defaultOptions,
-    middlewares
-  };
+function createClient(baseUrl, defaultOptions) {
   return createProxyHandler({
     baseUrl,
-    defaultOptions: optionsWithMiddlewares,
+    defaultOptions: defaultOptions || {},
     nextTags: true
   });
 }
@@ -1292,9 +1246,7 @@ function createOperationController(options) {
   let cachedState = initialState;
   let currentRequestTimestamp = Date.now();
   let isFirstExecute = true;
-  const createContext = (requestOptions = {}, requestTimestamp = Date.now()) => {
-    const cached = stateManager.getCache(queryKey);
-    const state = cached?.state ?? createInitialState();
+  const createContext = (requestOptions = {}, requestTimestamp = Date.now(), resolvedHeaders) => {
     const resolvedTags = pluginOptions?.tags ?? tags;
     return pluginExecutor.createContext({
       operationType,
@@ -1304,11 +1256,13 @@ function createOperationController(options) {
       tags: resolvedTags,
       requestTimestamp,
       hookId,
-      requestOptions: { ...initialRequestOptions, ...requestOptions },
-      state,
+      request: {
+        ...initialRequestOptions,
+        ...requestOptions,
+        headers: resolvedHeaders ?? {}
+      },
       metadata,
       pluginOptions,
-      abort: () => abortController?.abort(),
       stateManager,
       eventEmitter
     });
@@ -1336,21 +1290,24 @@ function createOperationController(options) {
         currentRequestTimestamp = Date.now();
       }
       isFirstExecute = false;
-      const context = createContext(opts, currentRequestTimestamp);
+      const mergedOptions = { ...initialRequestOptions, ...opts };
+      const resolvedHeaders = await resolveHeadersToRecord(
+        mergedOptions.headers
+      );
+      const context = createContext(
+        opts,
+        currentRequestTimestamp,
+        resolvedHeaders
+      );
       if (force) {
         context.forceRefetch = true;
       }
-      context.headers = await resolveHeadersToRecord(
-        context.requestOptions.headers
-      );
-      context.requestOptions.headers = context.headers;
       const coreFetch = async () => {
         abortController = new AbortController();
-        context.requestOptions.signal = abortController.signal;
+        context.request.signal = abortController.signal;
         const fetchPromise = (async () => {
           try {
-            const response = await fetchFn(context.requestOptions);
-            context.response = response;
+            const response = await fetchFn(context.request);
             return response;
           } catch (err) {
             const errorResponse = {
@@ -1358,7 +1315,6 @@ function createOperationController(options) {
               error: err,
               data: void 0
             };
-            context.response = errorResponse;
             return errorResponse;
           }
         })();
@@ -1587,11 +1543,6 @@ function createInfiniteReadController(options) {
     );
   };
   const createContext = (pageKey) => {
-    const initialState = {
-      data: void 0,
-      error: void 0,
-      timestamp: 0
-    };
     return pluginExecutor.createContext({
       operationType: "infiniteRead",
       path,
@@ -1600,11 +1551,9 @@ function createInfiniteReadController(options) {
       tags,
       requestTimestamp: Date.now(),
       hookId,
-      requestOptions: {},
-      state: initialState,
+      request: { headers: {} },
       metadata: /* @__PURE__ */ new Map(),
       pluginOptions,
-      abort: () => abortController?.abort(),
       stateManager,
       eventEmitter
     });
@@ -1631,7 +1580,6 @@ function createInfiniteReadController(options) {
       const fetchPromise = (async () => {
         try {
           const response = await fetchFn(mergedRequest, signal);
-          context.response = response;
           if (signal.aborted) {
             return {
               status: 0,
@@ -1653,7 +1601,6 @@ function createInfiniteReadController(options) {
             error: err,
             data: void 0
           };
-          context.response = errorResponse;
           latestError = err;
           return errorResponse;
         } finally {

package/dist/index.mjs

@@ -1,19 +1,3 @@
-// src/middleware.ts
-function createMiddleware(name, phase, handler) {
-  return { name, phase, handler };
-}
-async function applyMiddlewares(context, middlewares, phase) {
-  const phaseMiddlewares = middlewares.filter((m) => m.phase === phase);
-  let ctx = context;
-  for (const middleware of phaseMiddlewares) {
-    ctx = await middleware.handler(ctx);
-  }
-  return ctx;
-}
-function composeMiddlewares(...middlewareLists) {
-  return middlewareLists.flat().filter(Boolean);
-}
-
 // src/utils/buildUrl.ts
 function stringifyQuery(query) {
   const parts = [];
@@ -224,19 +208,20 @@ function resolveRequestBody(rawBody) {
     return void 0;
   }
   if (isSpooshBody(rawBody)) {
-    switch (rawBody.kind) {
+    const body = rawBody;
+    switch (body.kind) {
       case "form":
         return {
-          body: objectToFormData(rawBody.value)
+          body: objectToFormData(body.value)
         };
       case "json":
         return {
-          body: JSON.stringify(rawBody.value),
+          body: JSON.stringify(body.value),
           headers: { "Content-Type": "application/json" }
         };
       case "urlencoded":
         return {
-          body: objectToUrlEncoded(rawBody.value),
+          body: objectToUrlEncoded(body.value),
           headers: { "Content-Type": "application/x-www-form-urlencoded" }
         };
     }
@@ -392,32 +377,15 @@ var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var isNetworkError = (err) => err instanceof TypeError;
 var isAbortError = (err) => err instanceof DOMException && err.name === "AbortError";
 async function executeFetch(baseUrl, path, method, defaultOptions, requestOptions, nextTags) {
-  const middlewares = defaultOptions.middlewares ?? [];
-  let context = {
+  return executeCoreFetch({
     baseUrl,
     path,
     method,
     defaultOptions,
     requestOptions,
-    metadata: {}
-  };
-  if (middlewares.length > 0) {
-    context = await applyMiddlewares(context, middlewares, "before");
-  }
-  const response = await executeCoreFetch({
-    baseUrl: context.baseUrl,
-    path: context.path,
-    method: context.method,
-    defaultOptions: context.defaultOptions,
-    requestOptions: context.requestOptions,
-    middlewareFetchInit: context.fetchInit,
+    middlewareFetchInit: void 0,
     nextTags
   });
-  context.response = response;
-  if (middlewares.length > 0) {
-    context = await applyMiddlewares(context, middlewares, "after");
-  }
-  return context.response;
 }
 function buildInputFields(requestOptions) {
   const fields = {};
@@ -452,12 +420,10 @@ async function executeCoreFetch(config) {
     nextTags
   } = config;
   const {
-    middlewares: _,
     headers: defaultHeaders,
     transport: defaultTransport,
     ...fetchDefaults
   } = defaultOptions;
-  void _;
   const inputFields = buildInputFields(requestOptions);
   const maxRetries = requestOptions?.retries ?? 3;
   const baseDelay = requestOptions?.retryDelay ?? 1e3;
@@ -648,7 +614,7 @@ function createInitialState() {
 function generateSelfTagFromKey(key) {
   try {
     const parsed = JSON.parse(key);
-    return parsed.path?.join("/");
+    return parsed.path;
   } catch {
     return void 0;
   }
@@ -790,6 +756,9 @@ function createStateManager() {
     getSize() {
       return cache.size;
     },
+    getSubscribersCount(key) {
+      return subscribers.get(key)?.size ?? 0;
+    },
     setPendingPromise(key, promise) {
       if (promise === void 0) {
         pendingPromises.delete(key);
@@ -903,10 +872,7 @@ function createPluginExecutor(initialPlugins = []) {
       if (!handler) {
         continue;
       }
-      await handler(
-        context,
-        previousContext
-      );
+      await handler(context, previousContext);
     }
   };
   return {
@@ -926,6 +892,7 @@ function createPluginExecutor(initialPlugins = []) {
             return () => middleware(
               context,
               next
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             );
           },
           coreFetch
@@ -951,11 +918,6 @@ function createPluginExecutor(initialPlugins = []) {
     createContext(input) {
       const ctx = input;
       ctx.plugins = createPluginAccessor(ctx);
-      ctx.headers = {};
-      ctx.setHeaders = (newHeaders) => {
-        ctx.headers = { ...ctx.headers, ...newHeaders };
-        ctx.requestOptions.headers = ctx.headers;
-      };
       return ctx;
     }
   };
@@ -1189,15 +1151,10 @@ var Spoosh = class _Spoosh {
 };
 
 // src/createClient.ts
-function createClient(config) {
-  const { baseUrl, defaultOptions = {}, middlewares = [] } = config;
-  const optionsWithMiddlewares = {
-    ...defaultOptions,
-    middlewares
-  };
+function createClient(baseUrl, defaultOptions) {
   return createProxyHandler({
     baseUrl,
-    defaultOptions: optionsWithMiddlewares,
+    defaultOptions: defaultOptions || {},
     nextTags: true
   });
 }
@@ -1228,9 +1185,7 @@ function createOperationController(options) {
   let cachedState = initialState;
   let currentRequestTimestamp = Date.now();
   let isFirstExecute = true;
-  const createContext = (requestOptions = {}, requestTimestamp = Date.now()) => {
-    const cached = stateManager.getCache(queryKey);
-    const state = cached?.state ?? createInitialState();
+  const createContext = (requestOptions = {}, requestTimestamp = Date.now(), resolvedHeaders) => {
     const resolvedTags = pluginOptions?.tags ?? tags;
     return pluginExecutor.createContext({
       operationType,
@@ -1240,11 +1195,13 @@ function createOperationController(options) {
       tags: resolvedTags,
       requestTimestamp,
       hookId,
-      requestOptions: { ...initialRequestOptions, ...requestOptions },
-      state,
+      request: {
+        ...initialRequestOptions,
+        ...requestOptions,
+        headers: resolvedHeaders ?? {}
+      },
       metadata,
       pluginOptions,
-      abort: () => abortController?.abort(),
       stateManager,
       eventEmitter
     });
@@ -1272,21 +1229,24 @@ function createOperationController(options) {
         currentRequestTimestamp = Date.now();
       }
       isFirstExecute = false;
-      const context = createContext(opts, currentRequestTimestamp);
+      const mergedOptions = { ...initialRequestOptions, ...opts };
+      const resolvedHeaders = await resolveHeadersToRecord(
+        mergedOptions.headers
+      );
+      const context = createContext(
+        opts,
+        currentRequestTimestamp,
+        resolvedHeaders
+      );
       if (force) {
         context.forceRefetch = true;
       }
-      context.headers = await resolveHeadersToRecord(
-        context.requestOptions.headers
-      );
-      context.requestOptions.headers = context.headers;
       const coreFetch = async () => {
         abortController = new AbortController();
-        context.requestOptions.signal = abortController.signal;
+        context.request.signal = abortController.signal;
         const fetchPromise = (async () => {
           try {
-            const response = await fetchFn(context.requestOptions);
-            context.response = response;
+            const response = await fetchFn(context.request);
             return response;
           } catch (err) {
             const errorResponse = {
@@ -1294,7 +1254,6 @@ function createOperationController(options) {
               error: err,
               data: void 0
             };
-            context.response = errorResponse;
             return errorResponse;
           }
         })();
@@ -1523,11 +1482,6 @@ function createInfiniteReadController(options) {
     );
   };
   const createContext = (pageKey) => {
-    const initialState = {
-      data: void 0,
-      error: void 0,
-      timestamp: 0
-    };
     return pluginExecutor.createContext({
       operationType: "infiniteRead",
       path,
@@ -1536,11 +1490,9 @@ function createInfiniteReadController(options) {
       tags,
       requestTimestamp: Date.now(),
       hookId,
-      requestOptions: {},
-      state: initialState,
+      request: { headers: {} },
       metadata: /* @__PURE__ */ new Map(),
       pluginOptions,
-      abort: () => abortController?.abort(),
       stateManager,
       eventEmitter
     });
@@ -1567,7 +1519,6 @@ function createInfiniteReadController(options) {
       const fetchPromise = (async () => {
         try {
           const response = await fetchFn(mergedRequest, signal);
-          context.response = response;
           if (signal.aborted) {
             return {
               status: 0,
@@ -1589,7 +1540,6 @@ function createInfiniteReadController(options) {
             error: err,
             data: void 0
           };
-          context.response = errorResponse;
           latestError = err;
           return errorResponse;
         } finally {
@@ -1764,15 +1714,12 @@ export {
   HTTP_METHODS,
   Spoosh,
   __DEV__,
-  applyMiddlewares,
   buildUrl,
-  composeMiddlewares,
   containsFile,
   createClient,
   createEventEmitter,
   createInfiniteReadController,
   createInitialState,
-  createMiddleware,
   createOperationController,
   createPluginExecutor,
   createPluginRegistry,

package/package.json

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