@spoosh/angular 0.6.0 → 0.6.2

package/README.md

@@ -2,7 +2,7 @@
 
 Angular signals integration for Spoosh - `injectRead`, `injectWrite`, and `injectInfiniteRead`.
 
-**[Documentation](https://spoosh.dev/docs/integrations/angular)** · **Requirements:** TypeScript >= 5.0, Angular >= 16.0
+**[Documentation](https://spoosh.dev/docs/angular)** · **Requirements:** TypeScript >= 5.0, Angular >= 16.0
 
 ## Installation
 

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>, 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>>;
-}
-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 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;
@@ -147,33 +156,6 @@ type ExtractResponseParamNames<T> = SuccessReturnType<T> extends {
         params: Record<infer K, unknown>;
     };
 } ? K extends string ? K : never : never;
-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;
-};
 type ExtractMethodQuery<T> = ExtractMethodOptions<T> extends {
     query: infer Q;
 } ? Q : never;
@@ -181,52 +163,6 @@ type ExtractMethodBody<T> = ExtractMethodOptions<T> extends {
     body: infer B;
 } ? B : never;
 
-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 {
@@ -286,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;
@@ -356,4 +361,4 @@ type SpooshAngularFunctions<TDefaultError, TSchema, TPlugins extends PluginArray
 
 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 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 TriggerOptions, 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>, 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>>;
-}
-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 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;
@@ -147,33 +156,6 @@ type ExtractResponseParamNames<T> = SuccessReturnType<T> extends {
         params: Record<infer K, unknown>;
     };
 } ? K extends string ? K : never : never;
-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;
-};
 type ExtractMethodQuery<T> = ExtractMethodOptions<T> extends {
     query: infer Q;
 } ? Q : never;
@@ -181,52 +163,6 @@ type ExtractMethodBody<T> = ExtractMethodOptions<T> extends {
     body: infer B;
 } ? B : never;
 
-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 {
@@ -286,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;
@@ -356,4 +361,4 @@ type SpooshAngularFunctions<TDefaultError, TSchema, TPlugins extends PluginArray
 
 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 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 TriggerOptions, 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

@@ -121,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);
@@ -256,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 }
@@ -275,7 +283,7 @@ function createInjectRead(options) {
       currentController?.abort();
     };
     const trigger = async (triggerOptions) => {
-      const { force = false, ...overrideOptions } = triggerOptions ?? {};
+      const { force = true, ...overrideOptions } = triggerOptions ?? {};
       const hasOverrides = Object.keys(overrideOptions).length > 0;
       if (!hasOverrides) {
         if (!currentController) {
@@ -432,7 +440,7 @@ function createInjectWrite(options) {
         return response;
       } catch (err) {
         errorSignal.set(err);
-        throw err;
+        return { error: err };
       } finally {
         loadingSignal.set(false);
       }
@@ -529,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();
@@ -563,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 = {
@@ -635,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();
@@ -725,6 +745,9 @@ function createInjectInfiniteRead(options) {
       if (unsubInvalidate) {
         unsubInvalidate();
       }
+      if (unsubRefetchAll) {
+        unsubRefetchAll();
+      }
       if (currentSubscription) {
         currentSubscription();
       }

package/dist/index.mjs

@@ -106,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);
@@ -241,9 +241,17 @@ function createInjectRead(options) {
             }
           }
         );
+        const unsubRefetchAll = eventEmitter.on("refetchAll", () => {
+          if (currentController) {
+            untracked(() => {
+              executeWithTracking(currentController, true);
+            });
+          }
+        });
         return () => {
           unsubRefetch();
           unsubInvalidate();
+          unsubRefetchAll();
         };
       },
       { allowSignalWrites: true }
@@ -260,7 +268,7 @@ function createInjectRead(options) {
       currentController?.abort();
     };
     const trigger = async (triggerOptions) => {
-      const { force = false, ...overrideOptions } = triggerOptions ?? {};
+      const { force = true, ...overrideOptions } = triggerOptions ?? {};
       const hasOverrides = Object.keys(overrideOptions).length > 0;
       if (!hasOverrides) {
         if (!currentController) {
@@ -422,7 +430,7 @@ function createInjectWrite(options) {
         return response;
       } catch (err) {
         errorSignal.set(err);
-        throw err;
+        return { error: err };
       } finally {
         loadingSignal.set(false);
       }
@@ -531,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();
@@ -565,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 = {
@@ -637,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();
@@ -727,6 +747,9 @@ function createInjectInfiniteRead(options) {
       if (unsubInvalidate) {
         unsubInvalidate();
       }
+      if (unsubRefetchAll) {
+        unsubRefetchAll();
+      }
       if (currentSubscription) {
         currentSubscription();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/angular",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "license": "MIT",
   "description": "Angular signals integration for Spoosh API client",
   "keywords": [
@@ -13,13 +13,13 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/nxnom/spoosh.git",
+    "url": "git+https://github.com/spooshdev/spoosh.git",
     "directory": "packages/angular"
   },
   "bugs": {
-    "url": "https://github.com/nxnom/spoosh/issues"
+    "url": "https://github.com/spooshdev/spoosh/issues"
   },
-  "homepage": "https://spoosh.dev/angular/docs",
+  "homepage": "https://spoosh.dev/docs/angular",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,9 @@
     "@angular/core": ">=16.0.0"
   },
   "devDependencies": {
-    "@spoosh/core": "0.9.0"
+    "@angular/core": "^19.0.0",
+    "@spoosh/core": "0.10.0",
+    "@spoosh/test-utils": "0.1.5"
   },
   "scripts": {
     "dev": "tsup --watch",