@spoosh/angular 0.5.0 → 0.6.1

package/README.md

@@ -1,6 +1,6 @@
 # @spoosh/angular
 
-Angular signals integration for Spoosh - `injectRead`, `injectLazyRead`, `injectWrite`, and `injectInfiniteRead`.
+Angular signals integration for Spoosh - `injectRead`, `injectWrite`, and `injectInfiniteRead`.
 
 **[Documentation](https://spoosh.dev/docs/integrations/angular)** · **Requirements:** TypeScript >= 5.0, Angular >= 16.0
 
@@ -23,7 +23,7 @@ const spoosh = new Spoosh<ApiSchema, Error>("/api").use([
   cachePlugin({ staleTime: 5000 }),
 ]);
 
-export const { injectRead, injectLazyRead, injectWrite, injectInfiniteRead } =
+export const { injectRead, injectWrite, injectInfiniteRead } =
   createAngularSpoosh(spoosh);
 ```
 
@@ -74,28 +74,6 @@ export class UserListComponent {
 }
 ```
 
-### injectLazyRead
-
-Lazy data fetching for print/download/export scenarios. Does not auto-fetch on mount.
-
-```typescript
-@Component({
-  template: `
-    <button (click)="handlePrint('123')" [disabled]="order.loading()">
-      {{ order.loading() ? "Loading..." : "Print" }}
-    </button>
-  `,
-})
-export class PrintOrderComponent {
-  order = injectLazyRead((api) => api("orders/:id").GET);
-
-  async handlePrint(orderId: string) {
-    const { data } = await this.order.trigger({ params: { id: orderId } });
-    if (data) this.printService.printReceipt(data);
-  }
-}
-```
-
 ### injectWrite
 
 Trigger mutations with loading and error states.

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as _spoosh_core from '@spoosh/core';
-import { PluginArray, StateManager, EventEmitter, PluginExecutor, ReadClient, TagOptions, SpooshResponse, WriteClient, MethodOptionsMap, CoreRequestOptionsBase, SpooshPlugin, PluginTypeConfig, InfiniteRequestOptions, ResolveTypes, ResolverContext, ResolveResultTypes, MergePluginInstanceApi } from '@spoosh/core';
+import { PluginArray, StateManager, EventEmitter, PluginExecutor, MethodOptionsMap, CoreRequestOptionsBase, ReadClient, TagOptions, SpooshPlugin, PluginTypeConfig, SpooshResponse, InfiniteRequestOptions, ResolveTypes, ResolverContext, WriteClient, ResolveResultTypes, MergePluginInstanceApi } from '@spoosh/core';
 import { Signal } from '@angular/core';
 
 interface SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins extends PluginArray> {
@@ -14,33 +14,10 @@ interface SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins extends Plu
     };
 }
 type EnabledOption = boolean | (() => boolean);
-interface BaseReadOptions extends TagOptions {
-    enabled?: EnabledOption;
-}
-interface BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> {
-    data: Signal<TData | undefined>;
-    error: Signal<TError | undefined>;
-    loading: Signal<boolean>;
-    fetching: Signal<boolean>;
-    meta: Signal<TPluginResult>;
-    abort: () => void;
-    trigger: () => Promise<SpooshResponse<TData, TError>>;
-}
-interface BaseWriteResult<TData, TError, TOptions, TPluginResult = Record<string, unknown>> {
-    trigger: (options?: TOptions) => Promise<SpooshResponse<TData, TError>>;
-    data: Signal<TData | undefined>;
-    error: Signal<TError | undefined>;
-    loading: Signal<boolean>;
-    meta: Signal<TPluginResult>;
-    abort: () => void;
-}
-interface BaseLazyReadResult<TData, TError, TOptions> {
-    trigger: (options?: TOptions) => Promise<SpooshResponse<TData, TError>>;
-    data: Signal<TData | undefined>;
-    error: Signal<TError | undefined>;
-    loading: Signal<boolean>;
-    abort: () => void;
-}
+type QueryRequestOptions = CoreRequestOptionsBase;
+type MutationRequestOptions = CoreRequestOptionsBase;
+type AngularOptionsMap = MethodOptionsMap<QueryRequestOptions, MutationRequestOptions>;
+
 type PageContext<TData, TRequest> = {
     response: TData | undefined;
     allResponses: TData[];
@@ -70,32 +47,54 @@ interface BaseInfiniteReadResult<TData, TError, TItem, TPluginResult = Record<st
     trigger: () => Promise<void>;
     abort: () => void;
 }
-type QueryRequestOptions = CoreRequestOptionsBase;
-type MutationRequestOptions = CoreRequestOptionsBase;
-type AngularOptionsMap = MethodOptionsMap<QueryRequestOptions, MutationRequestOptions>;
-type ReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
-type WriteApiClient<TSchema, TDefaultError> = WriteClient<TSchema, TDefaultError>;
-type QueryField<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
-    query?: Exclude<TQuery, undefined>;
-} : {
-    query: TQuery;
-};
-type BodyField<TBody> = [TBody] extends [never] ? object : undefined extends TBody ? {
-    body?: Exclude<TBody, undefined>;
-} : {
-    body: TBody;
-};
-type ParamsField<TParamNames extends string> = [TParamNames] extends [never] ? object : {
-    params: Record<TParamNames, string | number>;
-};
-type ReadInputFields<TQuery, TBody, TParamNames extends string> = QueryField<TQuery> & BodyField<TBody> & ParamsField<TParamNames>;
-type ResponseInputFields<TQuery, TBody, TParamNames extends string> = [
-    TQuery,
-    TBody,
-    TParamNames
-] extends [never, never, never] ? object : {
-    input: ReadInputFields<TQuery, TBody, TParamNames>;
-};
+type InfiniteReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
+
+type AnyInfiniteRequestOptions = InfiniteRequestOptions;
+declare function createInjectInfiniteRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TReadFn extends (api: InfiniteReadApiClient<TSchema, TDefaultError>) => Promise<SpooshResponse<unknown, unknown>>, TRequest extends AnyInfiniteRequestOptions = AnyInfiniteRequestOptions, TItem = unknown>(readFn: TReadFn, readOptions: BaseInfiniteReadOptions<TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
+    data: unknown;
+    error?: undefined;
+}> extends {
+    data: infer D;
+} ? D : unknown : unknown, TItem, TRequest> & ResolveTypes<((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
+    readOptions: infer R_3;
+} ? R_3 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
+    readOptions: infer R_3;
+} ? R_3 : object : object : never : never) ? T_4 extends unknown ? (x: T_4) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
+    data: unknown;
+    error?: undefined;
+}> extends {
+    data: infer D;
+} ? D : unknown : unknown, [TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
+    error: unknown;
+    data?: undefined;
+}> extends {
+    error: infer E;
+} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
+    error: unknown;
+    data?: undefined;
+}> extends {
+    error: infer E;
+} ? E : unknown : unknown>>) => BaseInfiniteReadResult<TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
+    data: unknown;
+    error?: undefined;
+}> extends {
+    data: infer D;
+} ? D : unknown : unknown, [TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
+    error: unknown;
+    data?: undefined;
+}> extends {
+    error: infer E;
+} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
+    error: unknown;
+    data?: undefined;
+}> extends {
+    error: infer E;
+} ? E : unknown : unknown, TItem, ((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+    readResult: infer R_2;
+} ? R_2 : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+    readResult: infer R_2;
+} ? R_2 : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never>;
+
 type OptionalQueryField<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
     query?: Exclude<TQuery, undefined>;
 } : {
@@ -115,6 +114,16 @@ type InputFields<TQuery, TBody, TParamNames extends string> = OptionalQueryField
 type WriteResponseInputFields<TQuery, TBody, TParamNames extends string> = [TQuery, TBody, TParamNames] extends [never, never, never] ? object : {
     input: Signal<InputFields<TQuery, TBody, TParamNames> | undefined>;
 };
+interface BaseWriteResult<TData, TError, TOptions, TPluginResult = Record<string, unknown>> {
+    trigger: (options?: TOptions) => Promise<SpooshResponse<TData, TError>>;
+    data: Signal<TData | undefined>;
+    error: Signal<TError | undefined>;
+    loading: Signal<boolean>;
+    meta: Signal<TPluginResult>;
+    abort: () => void;
+}
+type WriteApiClient<TSchema, TDefaultError> = WriteClient<TSchema, TDefaultError>;
+
 type SuccessResponse<T> = Extract<T, {
     data: unknown;
     error?: undefined;
@@ -154,69 +163,6 @@ type ExtractMethodBody<T> = ExtractMethodOptions<T> extends {
     body: infer B;
 } ? B : never;
 
-declare function createInjectLazyRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TMethod extends (...args: never[]) => Promise<SpooshResponse<unknown, unknown>>>(readFn: (api: ReadApiClient<TSchema, TDefaultError>) => TMethod) => BaseLazyReadResult<TMethod extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
-    data: unknown;
-    error?: undefined;
-}> extends {
-    data: infer D;
-} ? D : unknown : unknown, [TMethod extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TMethod extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown, TMethod extends (...args: infer A) => unknown ? A[0] extends object ? Pick<A[0], Extract<keyof A[0], "query" | "body" | "params">> : object : object> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
-
-type AnyInfiniteRequestOptions = InfiniteRequestOptions;
-declare function createInjectInfiniteRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<SpooshResponse<unknown, unknown>>, TRequest extends AnyInfiniteRequestOptions = AnyInfiniteRequestOptions, TItem = unknown>(readFn: TReadFn, readOptions: BaseInfiniteReadOptions<TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
-    data: unknown;
-    error?: undefined;
-}> extends {
-    data: infer D;
-} ? D : unknown : unknown, TItem, TRequest> & ResolveTypes<((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_3;
-} ? R_3 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_3;
-} ? R_3 : object : object : never : never) ? T_4 extends unknown ? (x: T_4) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
-    data: unknown;
-    error?: undefined;
-}> extends {
-    data: infer D;
-} ? D : unknown : unknown, [TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown>>) => BaseInfiniteReadResult<TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
-    data: unknown;
-    error?: undefined;
-}> extends {
-    data: infer D;
-} ? D : unknown : unknown, [TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown, TItem, ((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    readResult: infer R_2;
-} ? R_2 : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    readResult: infer R_2;
-} ? R_2 : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never>;
-
 declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TMethod extends (...args: never[]) => Promise<SpooshResponse<unknown, unknown>>, TWriteOpts extends (TMethod extends (...args: infer A) => unknown ? A[0] : never) & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
     writeOptions: infer W_1;
 } ? W_1 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
@@ -276,6 +222,75 @@ declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends read
     writeResult: infer W;
 } ? W : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TWriteOpts>> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
 
+interface BaseReadOptions extends TagOptions {
+    enabled?: EnabledOption;
+}
+type QueryField<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
+    query?: Exclude<TQuery, undefined>;
+} : {
+    query: TQuery;
+};
+type BodyField<TBody> = [TBody] extends [never] ? object : undefined extends TBody ? {
+    body?: Exclude<TBody, undefined>;
+} : {
+    body: TBody;
+};
+type ParamsField<TParamNames extends string> = [TParamNames] extends [never] ? object : {
+    params: Record<TParamNames, string | number>;
+};
+type ReadInputFields<TQuery, TBody, TParamNames extends string> = QueryField<TQuery> & BodyField<TBody> & ParamsField<TParamNames>;
+type ResponseInputFields<TQuery, TBody, TParamNames extends string> = [
+    TQuery,
+    TBody,
+    TParamNames
+] extends [never, never, never] ? object : {
+    input: ReadInputFields<TQuery, TBody, TParamNames>;
+};
+type AwaitedReturnTypeTrigger<T> = T extends (...args: never[]) => infer R ? Awaited<R> : never;
+type ExtractInputFromResponse<T> = T extends {
+    input: infer I;
+} ? I : never;
+type ExtractTriggerQuery<I> = I extends {
+    query: infer Q;
+} ? {
+    query?: Q;
+} : unknown;
+type ExtractTriggerBody<I> = I extends {
+    body: infer B;
+} ? {
+    body?: B;
+} : unknown;
+type ExtractTriggerParams<I> = I extends {
+    params: infer P;
+} ? {
+    params?: P;
+} : unknown;
+type TriggerOptions<T> = ExtractInputFromResponse<AwaitedReturnTypeTrigger<T>> extends infer I ? [I] extends [never] ? {
+    force?: boolean;
+} : ExtractTriggerQuery<I> & ExtractTriggerBody<I> & ExtractTriggerParams<I> & {
+    /** Force refetch even if data is cached */
+    force?: boolean;
+} : {
+    force?: boolean;
+};
+interface BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>, TTriggerOptions = {
+    force?: boolean;
+}> {
+    data: Signal<TData | undefined>;
+    error: Signal<TError | undefined>;
+    loading: Signal<boolean>;
+    fetching: Signal<boolean>;
+    meta: Signal<TPluginResult>;
+    abort: () => void;
+    /**
+     * Manually trigger a fetch.
+     *
+     * @param options - Optional override options (query, body, params) to use for this specific request
+     */
+    trigger: (options?: TTriggerOptions) => Promise<SpooshResponse<TData, TError>>;
+}
+type ReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
+
 declare function createInjectRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
     data?: unknown;
     error?: unknown;
@@ -336,15 +351,14 @@ declare function createInjectRead<TSchema, TDefaultError, TPlugins extends reado
     readResult: infer R_2;
 } ? R_2 : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
     readResult: infer R_2;
-} ? R_2 : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TReadOpts>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+} ? R_2 : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TReadOpts>, TriggerOptions<TReadFn>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
 
 type SpooshAngularFunctions<TDefaultError, TSchema, TPlugins extends PluginArray> = {
     injectRead: ReturnType<typeof createInjectRead<TSchema, TDefaultError, TPlugins>>;
     injectWrite: ReturnType<typeof createInjectWrite<TSchema, TDefaultError, TPlugins>>;
     injectInfiniteRead: ReturnType<typeof createInjectInfiniteRead<TSchema, TDefaultError, TPlugins>>;
-    injectLazyRead: ReturnType<typeof createInjectLazyRead<TSchema, TDefaultError, TPlugins>>;
 } & MergePluginInstanceApi<TPlugins, TSchema>;
 
 declare function createAngularSpoosh<TSchema, TDefaultError, TPlugins extends PluginArray, TApi>(instance: SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins>): SpooshAngularFunctions<TDefaultError, TSchema, TPlugins>;
 
-export { type AngularOptionsMap, type BaseInfiniteReadOptions, type BaseInfiniteReadResult, type BaseLazyReadResult, type BaseReadOptions, type BaseReadResult, type BaseWriteResult, type EnabledOption, type ExtractMethodBody, type ExtractMethodData, type ExtractMethodError, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractResponseBody, type ExtractResponseParamNames, type ExtractResponseQuery, type PageContext, type ReadApiClient, type ResponseInputFields, type SpooshInstanceShape, type WriteApiClient, type WriteResponseInputFields, createAngularSpoosh };
+export { type AngularOptionsMap, type BaseInfiniteReadOptions, type BaseInfiniteReadResult, type BaseReadOptions, type BaseReadResult, type BaseWriteResult, type EnabledOption, type ExtractMethodBody, type ExtractMethodData, type ExtractMethodError, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractResponseBody, type ExtractResponseParamNames, type ExtractResponseQuery, type InfiniteReadApiClient, type PageContext, type ReadApiClient, type ResponseInputFields, type SpooshInstanceShape, type TriggerOptions, type WriteApiClient, type WriteResponseInputFields, createAngularSpoosh };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _spoosh_core from '@spoosh/core';
-import { PluginArray, StateManager, EventEmitter, PluginExecutor, ReadClient, TagOptions, SpooshResponse, WriteClient, MethodOptionsMap, CoreRequestOptionsBase, SpooshPlugin, PluginTypeConfig, InfiniteRequestOptions, ResolveTypes, ResolverContext, ResolveResultTypes, MergePluginInstanceApi } from '@spoosh/core';
+import { PluginArray, StateManager, EventEmitter, PluginExecutor, MethodOptionsMap, CoreRequestOptionsBase, ReadClient, TagOptions, SpooshPlugin, PluginTypeConfig, SpooshResponse, InfiniteRequestOptions, ResolveTypes, ResolverContext, WriteClient, ResolveResultTypes, MergePluginInstanceApi } from '@spoosh/core';
 import { Signal } from '@angular/core';
 
 interface SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins extends PluginArray> {
@@ -14,33 +14,10 @@ interface SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins extends Plu
     };
 }
 type EnabledOption = boolean | (() => boolean);
-interface BaseReadOptions extends TagOptions {
-    enabled?: EnabledOption;
-}
-interface BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> {
-    data: Signal<TData | undefined>;
-    error: Signal<TError | undefined>;
-    loading: Signal<boolean>;
-    fetching: Signal<boolean>;
-    meta: Signal<TPluginResult>;
-    abort: () => void;
-    trigger: () => Promise<SpooshResponse<TData, TError>>;
-}
-interface BaseWriteResult<TData, TError, TOptions, TPluginResult = Record<string, unknown>> {
-    trigger: (options?: TOptions) => Promise<SpooshResponse<TData, TError>>;
-    data: Signal<TData | undefined>;
-    error: Signal<TError | undefined>;
-    loading: Signal<boolean>;
-    meta: Signal<TPluginResult>;
-    abort: () => void;
-}
-interface BaseLazyReadResult<TData, TError, TOptions> {
-    trigger: (options?: TOptions) => Promise<SpooshResponse<TData, TError>>;
-    data: Signal<TData | undefined>;
-    error: Signal<TError | undefined>;
-    loading: Signal<boolean>;
-    abort: () => void;
-}
+type QueryRequestOptions = CoreRequestOptionsBase;
+type MutationRequestOptions = CoreRequestOptionsBase;
+type AngularOptionsMap = MethodOptionsMap<QueryRequestOptions, MutationRequestOptions>;
+
 type PageContext<TData, TRequest> = {
     response: TData | undefined;
     allResponses: TData[];
@@ -70,32 +47,54 @@ interface BaseInfiniteReadResult<TData, TError, TItem, TPluginResult = Record<st
     trigger: () => Promise<void>;
     abort: () => void;
 }
-type QueryRequestOptions = CoreRequestOptionsBase;
-type MutationRequestOptions = CoreRequestOptionsBase;
-type AngularOptionsMap = MethodOptionsMap<QueryRequestOptions, MutationRequestOptions>;
-type ReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
-type WriteApiClient<TSchema, TDefaultError> = WriteClient<TSchema, TDefaultError>;
-type QueryField<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
-    query?: Exclude<TQuery, undefined>;
-} : {
-    query: TQuery;
-};
-type BodyField<TBody> = [TBody] extends [never] ? object : undefined extends TBody ? {
-    body?: Exclude<TBody, undefined>;
-} : {
-    body: TBody;
-};
-type ParamsField<TParamNames extends string> = [TParamNames] extends [never] ? object : {
-    params: Record<TParamNames, string | number>;
-};
-type ReadInputFields<TQuery, TBody, TParamNames extends string> = QueryField<TQuery> & BodyField<TBody> & ParamsField<TParamNames>;
-type ResponseInputFields<TQuery, TBody, TParamNames extends string> = [
-    TQuery,
-    TBody,
-    TParamNames
-] extends [never, never, never] ? object : {
-    input: ReadInputFields<TQuery, TBody, TParamNames>;
-};
+type InfiniteReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
+
+type AnyInfiniteRequestOptions = InfiniteRequestOptions;
+declare function createInjectInfiniteRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TReadFn extends (api: InfiniteReadApiClient<TSchema, TDefaultError>) => Promise<SpooshResponse<unknown, unknown>>, TRequest extends AnyInfiniteRequestOptions = AnyInfiniteRequestOptions, TItem = unknown>(readFn: TReadFn, readOptions: BaseInfiniteReadOptions<TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
+    data: unknown;
+    error?: undefined;
+}> extends {
+    data: infer D;
+} ? D : unknown : unknown, TItem, TRequest> & ResolveTypes<((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
+    readOptions: infer R_3;
+} ? R_3 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
+    readOptions: infer R_3;
+} ? R_3 : object : object : never : never) ? T_4 extends unknown ? (x: T_4) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
+    data: unknown;
+    error?: undefined;
+}> extends {
+    data: infer D;
+} ? D : unknown : unknown, [TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
+    error: unknown;
+    data?: undefined;
+}> extends {
+    error: infer E;
+} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
+    error: unknown;
+    data?: undefined;
+}> extends {
+    error: infer E;
+} ? E : unknown : unknown>>) => BaseInfiniteReadResult<TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
+    data: unknown;
+    error?: undefined;
+}> extends {
+    data: infer D;
+} ? D : unknown : unknown, [TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
+    error: unknown;
+    data?: undefined;
+}> extends {
+    error: infer E;
+} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
+    error: unknown;
+    data?: undefined;
+}> extends {
+    error: infer E;
+} ? E : unknown : unknown, TItem, ((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+    readResult: infer R_2;
+} ? R_2 : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
+    readResult: infer R_2;
+} ? R_2 : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never>;
+
 type OptionalQueryField<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
     query?: Exclude<TQuery, undefined>;
 } : {
@@ -115,6 +114,16 @@ type InputFields<TQuery, TBody, TParamNames extends string> = OptionalQueryField
 type WriteResponseInputFields<TQuery, TBody, TParamNames extends string> = [TQuery, TBody, TParamNames] extends [never, never, never] ? object : {
     input: Signal<InputFields<TQuery, TBody, TParamNames> | undefined>;
 };
+interface BaseWriteResult<TData, TError, TOptions, TPluginResult = Record<string, unknown>> {
+    trigger: (options?: TOptions) => Promise<SpooshResponse<TData, TError>>;
+    data: Signal<TData | undefined>;
+    error: Signal<TError | undefined>;
+    loading: Signal<boolean>;
+    meta: Signal<TPluginResult>;
+    abort: () => void;
+}
+type WriteApiClient<TSchema, TDefaultError> = WriteClient<TSchema, TDefaultError>;
+
 type SuccessResponse<T> = Extract<T, {
     data: unknown;
     error?: undefined;
@@ -154,69 +163,6 @@ type ExtractMethodBody<T> = ExtractMethodOptions<T> extends {
     body: infer B;
 } ? B : never;
 
-declare function createInjectLazyRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TMethod extends (...args: never[]) => Promise<SpooshResponse<unknown, unknown>>>(readFn: (api: ReadApiClient<TSchema, TDefaultError>) => TMethod) => BaseLazyReadResult<TMethod extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
-    data: unknown;
-    error?: undefined;
-}> extends {
-    data: infer D;
-} ? D : unknown : unknown, [TMethod extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TMethod extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown, TMethod extends (...args: infer A) => unknown ? A[0] extends object ? Pick<A[0], Extract<keyof A[0], "query" | "body" | "params">> : object : object> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
-
-type AnyInfiniteRequestOptions = InfiniteRequestOptions;
-declare function createInjectInfiniteRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<SpooshResponse<unknown, unknown>>, TRequest extends AnyInfiniteRequestOptions = AnyInfiniteRequestOptions, TItem = unknown>(readFn: TReadFn, readOptions: BaseInfiniteReadOptions<TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
-    data: unknown;
-    error?: undefined;
-}> extends {
-    data: infer D;
-} ? D : unknown : unknown, TItem, TRequest> & ResolveTypes<((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_3;
-} ? R_3 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
-    readOptions: infer R_3;
-} ? R_3 : object : object : never : never) ? T_4 extends unknown ? (x: T_4) => void : never : never : never) extends (x: infer I) => void ? I : never, ResolverContext<TSchema, TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
-    data: unknown;
-    error?: undefined;
-}> extends {
-    data: infer D;
-} ? D : unknown : unknown, [TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown>>) => BaseInfiniteReadResult<TReadFn extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
-    data: unknown;
-    error?: undefined;
-}> extends {
-    data: infer D;
-} ? D : unknown : unknown, [TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown] extends [unknown] ? TDefaultError : TReadFn extends (...args: never[]) => infer R_1 ? Extract<Awaited<R_1>, {
-    error: unknown;
-    data?: undefined;
-}> extends {
-    error: infer E;
-} ? E : unknown : unknown, TItem, ((TPlugins[number] extends infer T ? T extends TPlugins[number] ? T extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    readResult: infer R_2;
-} ? R_2 : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
-    readResult: infer R_2;
-} ? R_2 : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never>;
-
 declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TMethod extends (...args: never[]) => Promise<SpooshResponse<unknown, unknown>>, TWriteOpts extends (TMethod extends (...args: infer A) => unknown ? A[0] : never) & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T_3 ? T_3 extends TPlugins[number] ? T_3 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
     writeOptions: infer W_1;
 } ? W_1 : object : object : never : never) extends infer T_4 ? T_4 extends (TPlugins[number] extends infer T_5 ? T_5 extends TPlugins[number] ? T_5 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
@@ -276,6 +222,75 @@ declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends read
     writeResult: infer W;
 } ? W : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TWriteOpts>> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
 
+interface BaseReadOptions extends TagOptions {
+    enabled?: EnabledOption;
+}
+type QueryField<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
+    query?: Exclude<TQuery, undefined>;
+} : {
+    query: TQuery;
+};
+type BodyField<TBody> = [TBody] extends [never] ? object : undefined extends TBody ? {
+    body?: Exclude<TBody, undefined>;
+} : {
+    body: TBody;
+};
+type ParamsField<TParamNames extends string> = [TParamNames] extends [never] ? object : {
+    params: Record<TParamNames, string | number>;
+};
+type ReadInputFields<TQuery, TBody, TParamNames extends string> = QueryField<TQuery> & BodyField<TBody> & ParamsField<TParamNames>;
+type ResponseInputFields<TQuery, TBody, TParamNames extends string> = [
+    TQuery,
+    TBody,
+    TParamNames
+] extends [never, never, never] ? object : {
+    input: ReadInputFields<TQuery, TBody, TParamNames>;
+};
+type AwaitedReturnTypeTrigger<T> = T extends (...args: never[]) => infer R ? Awaited<R> : never;
+type ExtractInputFromResponse<T> = T extends {
+    input: infer I;
+} ? I : never;
+type ExtractTriggerQuery<I> = I extends {
+    query: infer Q;
+} ? {
+    query?: Q;
+} : unknown;
+type ExtractTriggerBody<I> = I extends {
+    body: infer B;
+} ? {
+    body?: B;
+} : unknown;
+type ExtractTriggerParams<I> = I extends {
+    params: infer P;
+} ? {
+    params?: P;
+} : unknown;
+type TriggerOptions<T> = ExtractInputFromResponse<AwaitedReturnTypeTrigger<T>> extends infer I ? [I] extends [never] ? {
+    force?: boolean;
+} : ExtractTriggerQuery<I> & ExtractTriggerBody<I> & ExtractTriggerParams<I> & {
+    /** Force refetch even if data is cached */
+    force?: boolean;
+} : {
+    force?: boolean;
+};
+interface BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>, TTriggerOptions = {
+    force?: boolean;
+}> {
+    data: Signal<TData | undefined>;
+    error: Signal<TError | undefined>;
+    loading: Signal<boolean>;
+    fetching: Signal<boolean>;
+    meta: Signal<TPluginResult>;
+    abort: () => void;
+    /**
+     * Manually trigger a fetch.
+     *
+     * @param options - Optional override options (query, body, params) to use for this specific request
+     */
+    trigger: (options?: TTriggerOptions) => Promise<SpooshResponse<TData, TError>>;
+}
+type ReadApiClient<TSchema, TDefaultError> = ReadClient<TSchema, TDefaultError>;
+
 declare function createInjectRead<TSchema, TDefaultError, TPlugins extends readonly SpooshPlugin<PluginTypeConfig>[]>(options: Omit<SpooshInstanceShape<unknown, TSchema, TDefaultError, TPlugins>, "_types">): <TReadFn extends (api: ReadApiClient<TSchema, TDefaultError>) => Promise<{
     data?: unknown;
     error?: unknown;
@@ -336,15 +351,14 @@ declare function createInjectRead<TSchema, TDefaultError, TPlugins extends reado
     readResult: infer R_2;
 } ? R_2 : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
     readResult: infer R_2;
-} ? R_2 : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TReadOpts>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
+} ? R_2 : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TReadOpts>, TriggerOptions<TReadFn>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
 
 type SpooshAngularFunctions<TDefaultError, TSchema, TPlugins extends PluginArray> = {
     injectRead: ReturnType<typeof createInjectRead<TSchema, TDefaultError, TPlugins>>;
     injectWrite: ReturnType<typeof createInjectWrite<TSchema, TDefaultError, TPlugins>>;
     injectInfiniteRead: ReturnType<typeof createInjectInfiniteRead<TSchema, TDefaultError, TPlugins>>;
-    injectLazyRead: ReturnType<typeof createInjectLazyRead<TSchema, TDefaultError, TPlugins>>;
 } & MergePluginInstanceApi<TPlugins, TSchema>;
 
 declare function createAngularSpoosh<TSchema, TDefaultError, TPlugins extends PluginArray, TApi>(instance: SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins>): SpooshAngularFunctions<TDefaultError, TSchema, TPlugins>;
 
-export { type AngularOptionsMap, type BaseInfiniteReadOptions, type BaseInfiniteReadResult, type BaseLazyReadResult, type BaseReadOptions, type BaseReadResult, type BaseWriteResult, type EnabledOption, type ExtractMethodBody, type ExtractMethodData, type ExtractMethodError, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractResponseBody, type ExtractResponseParamNames, type ExtractResponseQuery, type PageContext, type ReadApiClient, type ResponseInputFields, type SpooshInstanceShape, type WriteApiClient, type WriteResponseInputFields, createAngularSpoosh };
+export { type AngularOptionsMap, type BaseInfiniteReadOptions, type BaseInfiniteReadResult, type BaseReadOptions, type BaseReadResult, type BaseWriteResult, type EnabledOption, type ExtractMethodBody, type ExtractMethodData, type ExtractMethodError, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractResponseBody, type ExtractResponseParamNames, type ExtractResponseQuery, type InfiniteReadApiClient, type PageContext, type ReadApiClient, type ResponseInputFields, type SpooshInstanceShape, type TriggerOptions, type WriteApiClient, type WriteResponseInputFields, createAngularSpoosh };

package/dist/index.js

@@ -45,6 +45,7 @@ function createInjectRead(options) {
     const metaSignal = (0, import_core.signal)({});
     let currentController = null;
     let currentQueryKey = null;
+    let baseQueryKey = null;
     let currentSubscription = null;
     let currentResolvedTags = [];
     let prevContext = null;
@@ -99,12 +100,16 @@ function createInjectRead(options) {
       currentResolvedTags = resolvedTags;
       return controller;
     };
-    const executeWithTracking = async (controller, force = false) => {
+    const executeWithTracking = async (controller, force = false, overrideOptions) => {
       const hasData = dataSignal() !== void 0;
       loadingSignal.set(!hasData);
       fetchingSignal.set(true);
       try {
-        const response = await controller.execute(void 0, { force });
+        const execOptions = overrideOptions ? {
+          ...currentController?.getContext().requestOptions,
+          ...overrideOptions
+        } : void 0;
+        const response = await controller.execute(execOptions, { force });
         if (response.error) {
           errorSignal.set(response.error);
         } else {
@@ -116,7 +121,7 @@ function createInjectRead(options) {
         return response;
       } catch (err) {
         errorSignal.set(err);
-        throw err;
+        return { error: err };
       } finally {
         loadingSignal.set(false);
         fetchingSignal.set(false);
@@ -145,6 +150,7 @@ function createInjectRead(options) {
       options: initialCapturedCall.options
     });
     createController(initialCapturedCall, initialResolvedTags, initialQueryKey);
+    baseQueryKey = initialQueryKey;
     loadingSignal.set(false);
     let wasEnabled = false;
     (0, import_core.effect)(
@@ -181,10 +187,11 @@ function createInjectRead(options) {
           inputInner.params = opts.params;
         }
         inputSignal.set(inputInner);
-        const queryKeyChanged = queryKey !== currentQueryKey;
+        const baseQueryKeyChanged = queryKey !== baseQueryKey;
         const enabledChanged = isEnabled !== wasEnabled;
         wasEnabled = isEnabled;
-        if (queryKeyChanged) {
+        if (baseQueryKeyChanged) {
+          baseQueryKey = queryKey;
           if (currentController) {
             prevContext = currentController.getContext();
             if (isMounted) {
@@ -249,9 +256,17 @@ function createInjectRead(options) {
             }
           }
         );
+        const unsubRefetchAll = eventEmitter.on("refetchAll", () => {
+          if (currentController) {
+            (0, import_core.untracked)(() => {
+              executeWithTracking(currentController, true);
+            });
+          }
+        });
         return () => {
           unsubRefetch();
           unsubInvalidate();
+          unsubRefetchAll();
         };
       },
       { allowSignalWrites: true }
@@ -267,15 +282,47 @@ function createInjectRead(options) {
     const abort = () => {
       currentController?.abort();
     };
-    const trigger = () => {
-      if (currentController) {
-        if (!isMounted) {
-          currentController.mount();
-          isMounted = true;
+    const trigger = async (triggerOptions) => {
+      const { force = false, ...overrideOptions } = triggerOptions ?? {};
+      const hasOverrides = Object.keys(overrideOptions).length > 0;
+      if (!hasOverrides) {
+        if (!currentController) {
+          return Promise.resolve({ data: void 0, error: void 0 });
         }
-        return executeWithTracking(currentController, true);
+        return executeWithTracking(currentController, force, void 0);
       }
-      return Promise.resolve({ data: void 0, error: void 0 });
+      const selectorResult = captureSelector();
+      const capturedCall = selectorResult.call;
+      if (!capturedCall) {
+        return Promise.resolve({ data: void 0, error: void 0 });
+      }
+      const mergedOptions = {
+        ...capturedCall.options ?? {},
+        ...overrideOptions
+      };
+      const pathSegments = capturedCall.path.split("/").filter(Boolean);
+      const newQueryKey = stateManager.createQueryKey({
+        path: pathSegments,
+        method: capturedCall.method,
+        options: mergedOptions
+      });
+      if (newQueryKey === currentQueryKey && currentController) {
+        return executeWithTracking(currentController, force, overrideOptions);
+      }
+      const params = mergedOptions?.params;
+      const newResolvedPath = (0, import_core2.resolvePath)(pathSegments, params);
+      const newResolvedTags = (0, import_core2.resolveTags)(
+        tags !== void 0 ? { tags } : void 0,
+        newResolvedPath
+      );
+      const newController = createController(
+        { ...capturedCall, options: mergedOptions },
+        newResolvedTags,
+        newQueryKey
+      );
+      newController.mount();
+      isMounted = true;
+      return executeWithTracking(newController, force, void 0);
     };
     const result = {
       meta: metaSignal,
@@ -393,7 +440,7 @@ function createInjectWrite(options) {
         return response;
       } catch (err) {
         errorSignal.set(err);
-        throw err;
+        return { error: err };
       } finally {
         loadingSignal.set(false);
       }
@@ -490,6 +537,7 @@ function createInjectInfiniteRead(options) {
     let prevContext = null;
     let isMounted = false;
     let unsubInvalidate = null;
+    let unsubRefetchAll = null;
     const updateSignalsFromState = () => {
       if (!currentController) return;
       const state = currentController.getState();
@@ -524,6 +572,9 @@ function createInjectInfiniteRead(options) {
       if (unsubInvalidate) {
         unsubInvalidate();
       }
+      if (unsubRefetchAll) {
+        unsubRefetchAll();
+      }
       const requestOptions = capturedCall.options;
       const pathSegments = capturedCall.path.split("/").filter(Boolean);
       const baseOptionsForKey = {
@@ -596,6 +647,14 @@ function createInjectInfiniteRead(options) {
           }
         }
       );
+      unsubRefetchAll = eventEmitter.on("refetchAll", () => {
+        if (!getEnabled() || !currentController) return;
+        loadingSignal.set(true);
+        currentController.refetch().finally(() => {
+          updateSignalsFromState();
+          loadingSignal.set(false);
+        });
+      });
       return controller;
     };
     const initialCapturedCall = captureSelector();
@@ -686,6 +745,9 @@ function createInjectInfiniteRead(options) {
       if (unsubInvalidate) {
         unsubInvalidate();
       }
+      if (unsubRefetchAll) {
+        unsubRefetchAll();
+      }
       if (currentSubscription) {
         currentSubscription();
       }
@@ -761,130 +823,6 @@ function createInjectInfiniteRead(options) {
   };
 }
 
-// src/injectLazyRead/index.ts
-var import_core7 = require("@angular/core");
-var import_core8 = require("@spoosh/core");
-function createInjectLazyRead(options) {
-  const { api, stateManager, pluginExecutor, eventEmitter } = options;
-  return function injectLazyRead(readFn) {
-    const destroyRef = (0, import_core7.inject)(import_core7.DestroyRef);
-    const captureSelector = () => {
-      const selectorResult = {
-        call: null,
-        selector: null
-      };
-      const selectorProxy = (0, import_core8.createSelectorProxy)(
-        (result2) => {
-          selectorResult.call = result2.call;
-          selectorResult.selector = result2.selector;
-        }
-      );
-      readFn(selectorProxy);
-      if (!selectorResult.selector) {
-        throw new Error(
-          'injectLazyRead requires selecting an HTTP method (GET). Example: injectLazyRead((api) => api("posts").GET)'
-        );
-      }
-      return selectorResult.selector;
-    };
-    const hookId = `angular-${Math.random().toString(36).slice(2)}`;
-    let currentQueryKey = null;
-    let currentController = null;
-    let currentSubscription = null;
-    const dataSignal = (0, import_core7.signal)(void 0);
-    const errorSignal = (0, import_core7.signal)(void 0);
-    const loadingSignal = (0, import_core7.signal)(false);
-    const lastTriggerOptionsSignal = (0, import_core7.signal)(void 0);
-    const inputSignal = (0, import_core7.signal)({});
-    destroyRef.onDestroy(() => {
-      if (currentSubscription) {
-        currentSubscription();
-      }
-    });
-    const abort = () => {
-      currentController?.abort();
-    };
-    const trigger = async (triggerOptions) => {
-      const selectedEndpoint = captureSelector();
-      const params = triggerOptions?.params;
-      const pathSegments = selectedEndpoint.path.split("/").filter(Boolean);
-      (0, import_core8.resolvePath)(pathSegments, params);
-      const queryKey = stateManager.createQueryKey({
-        path: pathSegments,
-        method: selectedEndpoint.method,
-        options: triggerOptions
-      });
-      const needsNewController = !currentController || currentQueryKey !== queryKey;
-      if (needsNewController) {
-        if (currentSubscription) {
-          currentSubscription();
-        }
-        const controller = (0, import_core8.createOperationController)({
-          operationType: "read",
-          path: pathSegments,
-          method: selectedEndpoint.method,
-          tags: [],
-          stateManager,
-          eventEmitter,
-          pluginExecutor,
-          hookId,
-          requestOptions: triggerOptions,
-          fetchFn: async (fetchOpts) => {
-            const pathMethods = api(selectedEndpoint.path);
-            const method = pathMethods[selectedEndpoint.method];
-            return method(fetchOpts);
-          }
-        });
-        currentSubscription = controller.subscribe(() => {
-          const state = controller.getState();
-          dataSignal.set(state.data);
-          errorSignal.set(state.error);
-        });
-        currentController = controller;
-        currentQueryKey = queryKey;
-      }
-      lastTriggerOptionsSignal.set(triggerOptions);
-      const opts = triggerOptions;
-      const inputInner = {};
-      if (opts?.query !== void 0) {
-        inputInner.query = opts.query;
-      }
-      if (opts?.body !== void 0) {
-        inputInner.body = opts.body;
-      }
-      if (opts?.params !== void 0) {
-        inputInner.params = opts.params;
-      }
-      inputSignal.set(inputInner);
-      loadingSignal.set(true);
-      currentController.setPluginOptions(triggerOptions);
-      try {
-        const response = await currentController.execute(triggerOptions);
-        if (response.error) {
-          errorSignal.set(response.error);
-        } else {
-          errorSignal.set(void 0);
-        }
-        return response;
-      } catch (err) {
-        errorSignal.set(err);
-        throw err;
-      } finally {
-        loadingSignal.set(false);
-      }
-    };
-    const result = {
-      trigger,
-      input: inputSignal,
-      data: dataSignal,
-      error: errorSignal,
-      loading: loadingSignal,
-      abort
-    };
-    return result;
-  };
-}
-
 // src/createAngularSpoosh/index.ts
 function createAngularSpoosh(instance) {
   const { api, stateManager, eventEmitter, pluginExecutor } = instance;
@@ -906,14 +844,6 @@ function createAngularSpoosh(instance) {
     eventEmitter,
     pluginExecutor
   });
-  const injectLazyRead = createInjectLazyRead(
-    {
-      api,
-      stateManager,
-      eventEmitter,
-      pluginExecutor
-    }
-  );
   const instanceApiContext = {
     api,
     stateManager,
@@ -934,7 +864,6 @@ function createAngularSpoosh(instance) {
     injectRead,
     injectWrite,
     injectInfiniteRead,
-    injectLazyRead,
     ...instanceApis
   };
 }

package/dist/index.mjs

@@ -30,6 +30,7 @@ function createInjectRead(options) {
     const metaSignal = signal({});
     let currentController = null;
     let currentQueryKey = null;
+    let baseQueryKey = null;
     let currentSubscription = null;
     let currentResolvedTags = [];
     let prevContext = null;
@@ -84,12 +85,16 @@ function createInjectRead(options) {
       currentResolvedTags = resolvedTags;
       return controller;
     };
-    const executeWithTracking = async (controller, force = false) => {
+    const executeWithTracking = async (controller, force = false, overrideOptions) => {
       const hasData = dataSignal() !== void 0;
       loadingSignal.set(!hasData);
       fetchingSignal.set(true);
       try {
-        const response = await controller.execute(void 0, { force });
+        const execOptions = overrideOptions ? {
+          ...currentController?.getContext().requestOptions,
+          ...overrideOptions
+        } : void 0;
+        const response = await controller.execute(execOptions, { force });
         if (response.error) {
           errorSignal.set(response.error);
         } else {
@@ -101,7 +106,7 @@ function createInjectRead(options) {
         return response;
       } catch (err) {
         errorSignal.set(err);
-        throw err;
+        return { error: err };
       } finally {
         loadingSignal.set(false);
         fetchingSignal.set(false);
@@ -130,6 +135,7 @@ function createInjectRead(options) {
       options: initialCapturedCall.options
     });
     createController(initialCapturedCall, initialResolvedTags, initialQueryKey);
+    baseQueryKey = initialQueryKey;
     loadingSignal.set(false);
     let wasEnabled = false;
     effect(
@@ -166,10 +172,11 @@ function createInjectRead(options) {
           inputInner.params = opts.params;
         }
         inputSignal.set(inputInner);
-        const queryKeyChanged = queryKey !== currentQueryKey;
+        const baseQueryKeyChanged = queryKey !== baseQueryKey;
         const enabledChanged = isEnabled !== wasEnabled;
         wasEnabled = isEnabled;
-        if (queryKeyChanged) {
+        if (baseQueryKeyChanged) {
+          baseQueryKey = queryKey;
           if (currentController) {
             prevContext = currentController.getContext();
             if (isMounted) {
@@ -234,9 +241,17 @@ function createInjectRead(options) {
             }
           }
         );
+        const unsubRefetchAll = eventEmitter.on("refetchAll", () => {
+          if (currentController) {
+            untracked(() => {
+              executeWithTracking(currentController, true);
+            });
+          }
+        });
         return () => {
           unsubRefetch();
           unsubInvalidate();
+          unsubRefetchAll();
         };
       },
       { allowSignalWrites: true }
@@ -252,15 +267,47 @@ function createInjectRead(options) {
     const abort = () => {
       currentController?.abort();
     };
-    const trigger = () => {
-      if (currentController) {
-        if (!isMounted) {
-          currentController.mount();
-          isMounted = true;
+    const trigger = async (triggerOptions) => {
+      const { force = false, ...overrideOptions } = triggerOptions ?? {};
+      const hasOverrides = Object.keys(overrideOptions).length > 0;
+      if (!hasOverrides) {
+        if (!currentController) {
+          return Promise.resolve({ data: void 0, error: void 0 });
         }
-        return executeWithTracking(currentController, true);
+        return executeWithTracking(currentController, force, void 0);
       }
-      return Promise.resolve({ data: void 0, error: void 0 });
+      const selectorResult = captureSelector();
+      const capturedCall = selectorResult.call;
+      if (!capturedCall) {
+        return Promise.resolve({ data: void 0, error: void 0 });
+      }
+      const mergedOptions = {
+        ...capturedCall.options ?? {},
+        ...overrideOptions
+      };
+      const pathSegments = capturedCall.path.split("/").filter(Boolean);
+      const newQueryKey = stateManager.createQueryKey({
+        path: pathSegments,
+        method: capturedCall.method,
+        options: mergedOptions
+      });
+      if (newQueryKey === currentQueryKey && currentController) {
+        return executeWithTracking(currentController, force, overrideOptions);
+      }
+      const params = mergedOptions?.params;
+      const newResolvedPath = resolvePath(pathSegments, params);
+      const newResolvedTags = resolveTags(
+        tags !== void 0 ? { tags } : void 0,
+        newResolvedPath
+      );
+      const newController = createController(
+        { ...capturedCall, options: mergedOptions },
+        newResolvedTags,
+        newQueryKey
+      );
+      newController.mount();
+      isMounted = true;
+      return executeWithTracking(newController, force, void 0);
     };
     const result = {
       meta: metaSignal,
@@ -383,7 +430,7 @@ function createInjectWrite(options) {
         return response;
       } catch (err) {
         errorSignal.set(err);
-        throw err;
+        return { error: err };
       } finally {
         loadingSignal.set(false);
       }
@@ -492,6 +539,7 @@ function createInjectInfiniteRead(options) {
     let prevContext = null;
     let isMounted = false;
     let unsubInvalidate = null;
+    let unsubRefetchAll = null;
     const updateSignalsFromState = () => {
       if (!currentController) return;
       const state = currentController.getState();
@@ -526,6 +574,9 @@ function createInjectInfiniteRead(options) {
       if (unsubInvalidate) {
         unsubInvalidate();
       }
+      if (unsubRefetchAll) {
+        unsubRefetchAll();
+      }
       const requestOptions = capturedCall.options;
       const pathSegments = capturedCall.path.split("/").filter(Boolean);
       const baseOptionsForKey = {
@@ -598,6 +649,14 @@ function createInjectInfiniteRead(options) {
           }
         }
       );
+      unsubRefetchAll = eventEmitter.on("refetchAll", () => {
+        if (!getEnabled() || !currentController) return;
+        loadingSignal.set(true);
+        currentController.refetch().finally(() => {
+          updateSignalsFromState();
+          loadingSignal.set(false);
+        });
+      });
       return controller;
     };
     const initialCapturedCall = captureSelector();
@@ -688,6 +747,9 @@ function createInjectInfiniteRead(options) {
       if (unsubInvalidate) {
         unsubInvalidate();
       }
+      if (unsubRefetchAll) {
+        unsubRefetchAll();
+      }
       if (currentSubscription) {
         currentSubscription();
       }
@@ -763,134 +825,6 @@ function createInjectInfiniteRead(options) {
   };
 }
 
-// src/injectLazyRead/index.ts
-import { signal as signal4, DestroyRef as DestroyRef4, inject as inject4 } from "@angular/core";
-import {
-  createOperationController as createOperationController3,
-  createSelectorProxy as createSelectorProxy4,
-  resolvePath as resolvePath4
-} from "@spoosh/core";
-function createInjectLazyRead(options) {
-  const { api, stateManager, pluginExecutor, eventEmitter } = options;
-  return function injectLazyRead(readFn) {
-    const destroyRef = inject4(DestroyRef4);
-    const captureSelector = () => {
-      const selectorResult = {
-        call: null,
-        selector: null
-      };
-      const selectorProxy = createSelectorProxy4(
-        (result2) => {
-          selectorResult.call = result2.call;
-          selectorResult.selector = result2.selector;
-        }
-      );
-      readFn(selectorProxy);
-      if (!selectorResult.selector) {
-        throw new Error(
-          'injectLazyRead requires selecting an HTTP method (GET). Example: injectLazyRead((api) => api("posts").GET)'
-        );
-      }
-      return selectorResult.selector;
-    };
-    const hookId = `angular-${Math.random().toString(36).slice(2)}`;
-    let currentQueryKey = null;
-    let currentController = null;
-    let currentSubscription = null;
-    const dataSignal = signal4(void 0);
-    const errorSignal = signal4(void 0);
-    const loadingSignal = signal4(false);
-    const lastTriggerOptionsSignal = signal4(void 0);
-    const inputSignal = signal4({});
-    destroyRef.onDestroy(() => {
-      if (currentSubscription) {
-        currentSubscription();
-      }
-    });
-    const abort = () => {
-      currentController?.abort();
-    };
-    const trigger = async (triggerOptions) => {
-      const selectedEndpoint = captureSelector();
-      const params = triggerOptions?.params;
-      const pathSegments = selectedEndpoint.path.split("/").filter(Boolean);
-      resolvePath4(pathSegments, params);
-      const queryKey = stateManager.createQueryKey({
-        path: pathSegments,
-        method: selectedEndpoint.method,
-        options: triggerOptions
-      });
-      const needsNewController = !currentController || currentQueryKey !== queryKey;
-      if (needsNewController) {
-        if (currentSubscription) {
-          currentSubscription();
-        }
-        const controller = createOperationController3({
-          operationType: "read",
-          path: pathSegments,
-          method: selectedEndpoint.method,
-          tags: [],
-          stateManager,
-          eventEmitter,
-          pluginExecutor,
-          hookId,
-          requestOptions: triggerOptions,
-          fetchFn: async (fetchOpts) => {
-            const pathMethods = api(selectedEndpoint.path);
-            const method = pathMethods[selectedEndpoint.method];
-            return method(fetchOpts);
-          }
-        });
-        currentSubscription = controller.subscribe(() => {
-          const state = controller.getState();
-          dataSignal.set(state.data);
-          errorSignal.set(state.error);
-        });
-        currentController = controller;
-        currentQueryKey = queryKey;
-      }
-      lastTriggerOptionsSignal.set(triggerOptions);
-      const opts = triggerOptions;
-      const inputInner = {};
-      if (opts?.query !== void 0) {
-        inputInner.query = opts.query;
-      }
-      if (opts?.body !== void 0) {
-        inputInner.body = opts.body;
-      }
-      if (opts?.params !== void 0) {
-        inputInner.params = opts.params;
-      }
-      inputSignal.set(inputInner);
-      loadingSignal.set(true);
-      currentController.setPluginOptions(triggerOptions);
-      try {
-        const response = await currentController.execute(triggerOptions);
-        if (response.error) {
-          errorSignal.set(response.error);
-        } else {
-          errorSignal.set(void 0);
-        }
-        return response;
-      } catch (err) {
-        errorSignal.set(err);
-        throw err;
-      } finally {
-        loadingSignal.set(false);
-      }
-    };
-    const result = {
-      trigger,
-      input: inputSignal,
-      data: dataSignal,
-      error: errorSignal,
-      loading: loadingSignal,
-      abort
-    };
-    return result;
-  };
-}
-
 // src/createAngularSpoosh/index.ts
 function createAngularSpoosh(instance) {
   const { api, stateManager, eventEmitter, pluginExecutor } = instance;
@@ -912,14 +846,6 @@ function createAngularSpoosh(instance) {
     eventEmitter,
     pluginExecutor
   });
-  const injectLazyRead = createInjectLazyRead(
-    {
-      api,
-      stateManager,
-      eventEmitter,
-      pluginExecutor
-    }
-  );
   const instanceApiContext = {
     api,
     stateManager,
@@ -940,7 +866,6 @@ function createAngularSpoosh(instance) {
     injectRead,
     injectWrite,
     injectInfiniteRead,
-    injectLazyRead,
     ...instanceApis
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/angular",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "license": "MIT",
   "description": "Angular signals integration for Spoosh API client",
   "keywords": [
@@ -38,7 +38,9 @@
     "@angular/core": ">=16.0.0"
   },
   "devDependencies": {
-    "@spoosh/core": "0.9.0"
+    "@angular/core": "^19.0.0",
+    "@spoosh/core": "0.9.3",
+    "@spoosh/test-utils": "0.1.5"
   },
   "scripts": {
     "dev": "tsup --watch",