npm - @spoosh/angular - Versions diffs - 0.2.0 → 0.4.0 - Mend

@spoosh/angular 0.2.0 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/README.md CHANGED Viewed

@@ -48,7 +48,7 @@ Fetch data with automatic caching and refetching using Angular signals.
   `,
 })
 export class UserListComponent {
-  users = injectRead((api) => api.users.$get());
+  users = injectRead((api) => api("users").GET());
 }
 // With options
@@ -58,15 +58,19 @@ export class UserListComponent {
   // Recommended: Pass signal directly (shorter syntax)
   users = injectRead(
-    (api) => api.users.$get({ query: { page: 1 } }),
+    (api) => api("users").GET({ query: { page: 1 } }),
     {
       staleTime: 10000,
       enabled: this.isReady,
     }
   );
-  // Also works: Arrow function wrapper
-  // enabled: () => this.isReady(),
+  // With path parameters
+  userId = signal(123);
+  user = injectRead(
+    (api) => api("users/:id").GET({ params: { id: this.userId() } }),
+    { enabled: () => this.userId() !== null }
+  );
 }
 ```
@@ -88,7 +92,7 @@ Trigger mutations with loading and error states.
 export class CreateUserComponent {
   title = signal("");
-  createUser = injectWrite((api) => api.users.$post);
+  createUser = injectWrite((api) => api("users").POST);
   async handleSubmit() {
     const result = await this.createUser.trigger({
@@ -100,6 +104,16 @@ export class CreateUserComponent {
     }
   }
 }
+// With path parameters
+updateUser = injectWrite((api) => api("users/:id").PUT);
+async updateUserName(userId: number, name: string) {
+  await this.updateUser.trigger({
+    params: { id: userId },
+    body: { name },
+  });
+}
 ```
 ### injectInfiniteRead
@@ -127,26 +141,29 @@ Bidirectional paginated data fetching with infinite scroll support.
   `,
 })
 export class PostListComponent {
-  posts = injectInfiniteRead((api) => api.posts.$get({ query: { page: 1 } }), {
-    // Required: Check if next page exists
-    canFetchNext: ({ response }) => response?.meta.hasMore ?? false,
+  posts = injectInfiniteRead(
+    (api) => api("posts").GET({ query: { page: 1 } }),
+    {
+      // Required: Check if next page exists
+      canFetchNext: ({ response }) => response?.meta.hasMore ?? false,
-    // Required: Build request for next page
-    nextPageRequest: ({ response, request }) => ({
-      query: { ...request.query, page: (response?.meta.page ?? 0) + 1 },
-    }),
+      // Required: Build request for next page
+      nextPageRequest: ({ response, request }) => ({
+        query: { ...request.query, page: (response?.meta.page ?? 0) + 1 },
+      }),
-    // Required: Merge all responses into items
-    merger: (allResponses) => allResponses.flatMap((r) => r.items),
+      // Required: Merge all responses into items
+      merger: (allResponses) => allResponses.flatMap((r) => r.items),
-    // Optional: Check if previous page exists
-    canFetchPrev: ({ response }) => (response?.meta.page ?? 1) > 1,
+      // Optional: Check if previous page exists
+      canFetchPrev: ({ response }) => (response?.meta.page ?? 1) > 1,
-    // Optional: Build request for previous page
-    prevPageRequest: ({ response, request }) => ({
-      query: { ...request.query, page: (response?.meta.page ?? 2) - 1 },
-    }),
-  });
+      // Optional: Build request for previous page
+      prevPageRequest: ({ response, request }) => ({
+        query: { ...request.query, page: (response?.meta.page ?? 2) - 1 },
+      }),
+    }
+  );
 }
 ```

package/dist/index.d.mts CHANGED Viewed

@@ -1,5 +1,5 @@
 import * as _spoosh_core from '@spoosh/core';
-import { PluginArray, StateManager, EventEmitter, PluginExecutor, QueryOnlyClient, MethodOptionsMap, CoreRequestOptionsBase, SpooshResponse, MutationOnlyClient, SpooshPlugin, PluginTypeConfig, InfiniteRequestOptions, ResolveTypes, ResolverContext, ResolveResultTypes, MergePluginInstanceApi } 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 { Signal } from '@angular/core';
 interface SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins extends PluginArray> {
@@ -14,10 +14,8 @@ interface SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins extends Plu
     };
 }
 type EnabledOption = boolean | (() => boolean);
-interface BaseReadOptions {
+interface BaseReadOptions extends TagOptions {
     enabled?: EnabledOption;
-    tags?: string[];
-    additionalTags?: string[];
 }
 interface BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> {
     data: Signal<TData | undefined>;
@@ -42,7 +40,8 @@ type PageContext<TData, TRequest> = {
     allResponses: TData[];
     request: TRequest;
 };
-interface BaseInfiniteReadOptions<TData, TItem, TRequest> extends BaseReadOptions {
+interface BaseInfiniteReadOptions<TData, TItem, TRequest> extends TagOptions {
+    enabled?: EnabledOption;
     canFetchNext: (ctx: PageContext<TData, TRequest>) => boolean;
     canFetchPrev?: (ctx: PageContext<TData, TRequest>) => boolean;
     nextPageRequest: (ctx: PageContext<TData, TRequest>) => Partial<TRequest>;
@@ -68,8 +67,8 @@ interface BaseInfiniteReadResult<TData, TError, TItem, TPluginResult = Record<st
 type QueryRequestOptions = CoreRequestOptionsBase;
 type MutationRequestOptions = CoreRequestOptionsBase;
 type AngularOptionsMap = MethodOptionsMap<QueryRequestOptions, MutationRequestOptions>;
-type ReadApiClient<TSchema, TDefaultError> = QueryOnlyClient<TSchema, TDefaultError, AngularOptionsMap>;
-type WriteApiClient<TSchema, TDefaultError> = MutationOnlyClient<TSchema, TDefaultError, AngularOptionsMap>;
+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>;
 } : {
@@ -80,17 +79,16 @@ type BodyField<TBody> = [TBody] extends [never] ? object : undefined extends TBo
 } : {
     body: TBody;
 };
-type FormDataField<TFormData> = [TFormData] extends [never] ? object : undefined extends TFormData ? {
-    formData?: Exclude<TFormData, undefined>;
-} : {
-    formData: TFormData;
-};
 type ParamsField<TParamNames extends string> = [TParamNames] extends [never] ? object : {
     params: Record<TParamNames, string | number>;
 };
-type ReadInputFields<TQuery, TBody, TFormData, TParamNames extends string> = QueryField<TQuery> & BodyField<TBody> & FormDataField<TFormData> & ParamsField<TParamNames>;
-type ResponseInputFields<TQuery, TBody, TFormData, TParamNames extends string> = [TQuery, TBody, TFormData, TParamNames] extends [never, never, never, never] ? object : {
-    input: ReadInputFields<TQuery, TBody, TFormData, TParamNames>;
+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 OptionalQueryField<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
     query?: Exclude<TQuery, undefined>;
@@ -102,19 +100,14 @@ type OptionalBodyField<TBody> = [TBody] extends [never] ? object : undefined ext
 } : {
     body: TBody;
 };
-type OptionalFormDataField<TFormData> = [TFormData] extends [never] ? object : undefined extends TFormData ? {
-    formData?: Exclude<TFormData, undefined>;
-} : {
-    formData: TFormData;
-};
 type OptionalParamsField<TParamNames extends string> = [TParamNames] extends [
     never
 ] ? object : {
     params: Record<TParamNames, string | number>;
 };
-type InputFields<TQuery, TBody, TFormData, TParamNames extends string> = OptionalQueryField<TQuery> & OptionalBodyField<TBody> & OptionalFormDataField<TFormData> & OptionalParamsField<TParamNames>;
-type WriteResponseInputFields<TQuery, TBody, TFormData, TParamNames extends string> = [TQuery, TBody, TFormData, TParamNames] extends [never, never, never, never] ? object : {
-    input: Signal<InputFields<TQuery, TBody, TFormData, TParamNames> | undefined>;
+type InputFields<TQuery, TBody, TParamNames extends string> = OptionalQueryField<TQuery> & OptionalBodyField<TBody> & OptionalParamsField<TParamNames>;
+type WriteResponseInputFields<TQuery, TBody, TParamNames extends string> = [TQuery, TBody, TParamNames] extends [never, never, never] ? object : {
+    input: Signal<InputFields<TQuery, TBody, TParamNames> | undefined>;
 };
 type SuccessResponse<T> = Extract<T, {
     data: unknown;
@@ -143,11 +136,6 @@ type ExtractResponseBody<T> = SuccessReturnType<T> extends {
         body: infer B;
     };
 } ? B : never;
-type ExtractResponseFormData<T> = SuccessReturnType<T> extends {
-    input: {
-        formData: infer F;
-    };
-} ? F : never;
 type ExtractResponseParamNames<T> = SuccessReturnType<T> extends {
     input: {
         params: Record<infer K, unknown>;
@@ -159,12 +147,6 @@ type ExtractMethodQuery<T> = ExtractMethodOptions<T> extends {
 type ExtractMethodBody<T> = ExtractMethodOptions<T> extends {
     body: infer B;
 } ? B : never;
-type ExtractMethodFormData<T> = ExtractMethodOptions<T> extends {
-    formData: infer F;
-} ? F : never;
-type ExtractMethodUrlEncoded<T> = ExtractMethodOptions<T> extends {
-    urlEncoded: infer U;
-} ? U : 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>, {
@@ -231,7 +213,7 @@ declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends read
     data?: undefined;
 }> extends {
     error: infer E;
-} ? E : unknown : unknown, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>, ExtractMethodFormData<TMethod>, never>> = (TMethod extends (...args: infer A) => unknown ? A[0] : never) & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T_6 ? T_6 extends TPlugins[number] ? T_6 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
+} ? E : unknown : unknown, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>> = (TMethod extends (...args: infer A) => unknown ? A[0] : never) & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T_6 ? T_6 extends TPlugins[number] ? T_6 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
     writeOptions: infer W_1;
 } ? W_1 : object : object : never : never) extends infer T_7 ? T_7 extends (TPlugins[number] extends infer T_8 ? T_8 extends TPlugins[number] ? T_8 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
     writeOptions: infer W_1;
@@ -250,7 +232,7 @@ declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends read
     data?: undefined;
 }> extends {
     error: infer E;
-} ? E : unknown : unknown, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>, ExtractMethodFormData<TMethod>, never>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<TMethod extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
+} ? E : unknown : unknown, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<TMethod extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
     data: unknown;
     error?: undefined;
 }> extends {
@@ -269,7 +251,7 @@ declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends read
     writeResult: infer W;
 } ? W : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
     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>, ExtractResponseFormData<TMethod>, ExtractResponseParamNames<TMethod>>;
+} ? W : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TWriteOpts>> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
 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;
@@ -331,7 +313,7 @@ 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>, ExtractResponseFormData<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>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
 type SpooshAngularFunctions<TDefaultError, TSchema, TPlugins extends PluginArray> = {
     injectRead: ReturnType<typeof createInjectRead<TSchema, TDefaultError, TPlugins>>;
@@ -341,4 +323,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 ExtractMethodFormData, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractMethodUrlEncoded, type ExtractResponseBody, type ExtractResponseFormData, 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 PageContext, type ReadApiClient, type ResponseInputFields, type SpooshInstanceShape, type WriteApiClient, type WriteResponseInputFields, createAngularSpoosh };

package/dist/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import * as _spoosh_core from '@spoosh/core';
-import { PluginArray, StateManager, EventEmitter, PluginExecutor, QueryOnlyClient, MethodOptionsMap, CoreRequestOptionsBase, SpooshResponse, MutationOnlyClient, SpooshPlugin, PluginTypeConfig, InfiniteRequestOptions, ResolveTypes, ResolverContext, ResolveResultTypes, MergePluginInstanceApi } 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 { Signal } from '@angular/core';
 interface SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins extends PluginArray> {
@@ -14,10 +14,8 @@ interface SpooshInstanceShape<TApi, TSchema, TDefaultError, TPlugins extends Plu
     };
 }
 type EnabledOption = boolean | (() => boolean);
-interface BaseReadOptions {
+interface BaseReadOptions extends TagOptions {
     enabled?: EnabledOption;
-    tags?: string[];
-    additionalTags?: string[];
 }
 interface BaseReadResult<TData, TError, TPluginResult = Record<string, unknown>> {
     data: Signal<TData | undefined>;
@@ -42,7 +40,8 @@ type PageContext<TData, TRequest> = {
     allResponses: TData[];
     request: TRequest;
 };
-interface BaseInfiniteReadOptions<TData, TItem, TRequest> extends BaseReadOptions {
+interface BaseInfiniteReadOptions<TData, TItem, TRequest> extends TagOptions {
+    enabled?: EnabledOption;
     canFetchNext: (ctx: PageContext<TData, TRequest>) => boolean;
     canFetchPrev?: (ctx: PageContext<TData, TRequest>) => boolean;
     nextPageRequest: (ctx: PageContext<TData, TRequest>) => Partial<TRequest>;
@@ -68,8 +67,8 @@ interface BaseInfiniteReadResult<TData, TError, TItem, TPluginResult = Record<st
 type QueryRequestOptions = CoreRequestOptionsBase;
 type MutationRequestOptions = CoreRequestOptionsBase;
 type AngularOptionsMap = MethodOptionsMap<QueryRequestOptions, MutationRequestOptions>;
-type ReadApiClient<TSchema, TDefaultError> = QueryOnlyClient<TSchema, TDefaultError, AngularOptionsMap>;
-type WriteApiClient<TSchema, TDefaultError> = MutationOnlyClient<TSchema, TDefaultError, AngularOptionsMap>;
+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>;
 } : {
@@ -80,17 +79,16 @@ type BodyField<TBody> = [TBody] extends [never] ? object : undefined extends TBo
 } : {
     body: TBody;
 };
-type FormDataField<TFormData> = [TFormData] extends [never] ? object : undefined extends TFormData ? {
-    formData?: Exclude<TFormData, undefined>;
-} : {
-    formData: TFormData;
-};
 type ParamsField<TParamNames extends string> = [TParamNames] extends [never] ? object : {
     params: Record<TParamNames, string | number>;
 };
-type ReadInputFields<TQuery, TBody, TFormData, TParamNames extends string> = QueryField<TQuery> & BodyField<TBody> & FormDataField<TFormData> & ParamsField<TParamNames>;
-type ResponseInputFields<TQuery, TBody, TFormData, TParamNames extends string> = [TQuery, TBody, TFormData, TParamNames] extends [never, never, never, never] ? object : {
-    input: ReadInputFields<TQuery, TBody, TFormData, TParamNames>;
+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 OptionalQueryField<TQuery> = [TQuery] extends [never] ? object : undefined extends TQuery ? {
     query?: Exclude<TQuery, undefined>;
@@ -102,19 +100,14 @@ type OptionalBodyField<TBody> = [TBody] extends [never] ? object : undefined ext
 } : {
     body: TBody;
 };
-type OptionalFormDataField<TFormData> = [TFormData] extends [never] ? object : undefined extends TFormData ? {
-    formData?: Exclude<TFormData, undefined>;
-} : {
-    formData: TFormData;
-};
 type OptionalParamsField<TParamNames extends string> = [TParamNames] extends [
     never
 ] ? object : {
     params: Record<TParamNames, string | number>;
 };
-type InputFields<TQuery, TBody, TFormData, TParamNames extends string> = OptionalQueryField<TQuery> & OptionalBodyField<TBody> & OptionalFormDataField<TFormData> & OptionalParamsField<TParamNames>;
-type WriteResponseInputFields<TQuery, TBody, TFormData, TParamNames extends string> = [TQuery, TBody, TFormData, TParamNames] extends [never, never, never, never] ? object : {
-    input: Signal<InputFields<TQuery, TBody, TFormData, TParamNames> | undefined>;
+type InputFields<TQuery, TBody, TParamNames extends string> = OptionalQueryField<TQuery> & OptionalBodyField<TBody> & OptionalParamsField<TParamNames>;
+type WriteResponseInputFields<TQuery, TBody, TParamNames extends string> = [TQuery, TBody, TParamNames] extends [never, never, never] ? object : {
+    input: Signal<InputFields<TQuery, TBody, TParamNames> | undefined>;
 };
 type SuccessResponse<T> = Extract<T, {
     data: unknown;
@@ -143,11 +136,6 @@ type ExtractResponseBody<T> = SuccessReturnType<T> extends {
         body: infer B;
     };
 } ? B : never;
-type ExtractResponseFormData<T> = SuccessReturnType<T> extends {
-    input: {
-        formData: infer F;
-    };
-} ? F : never;
 type ExtractResponseParamNames<T> = SuccessReturnType<T> extends {
     input: {
         params: Record<infer K, unknown>;
@@ -159,12 +147,6 @@ type ExtractMethodQuery<T> = ExtractMethodOptions<T> extends {
 type ExtractMethodBody<T> = ExtractMethodOptions<T> extends {
     body: infer B;
 } ? B : never;
-type ExtractMethodFormData<T> = ExtractMethodOptions<T> extends {
-    formData: infer F;
-} ? F : never;
-type ExtractMethodUrlEncoded<T> = ExtractMethodOptions<T> extends {
-    urlEncoded: infer U;
-} ? U : 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>, {
@@ -231,7 +213,7 @@ declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends read
     data?: undefined;
 }> extends {
     error: infer E;
-} ? E : unknown : unknown, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>, ExtractMethodFormData<TMethod>, never>> = (TMethod extends (...args: infer A) => unknown ? A[0] : never) & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T_6 ? T_6 extends TPlugins[number] ? T_6 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
+} ? E : unknown : unknown, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>> = (TMethod extends (...args: infer A) => unknown ? A[0] : never) & _spoosh_core.ResolveTypes<((TPlugins[number] extends infer T_6 ? T_6 extends TPlugins[number] ? T_6 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
     writeOptions: infer W_1;
 } ? W_1 : object : object : never : never) extends infer T_7 ? T_7 extends (TPlugins[number] extends infer T_8 ? T_8 extends TPlugins[number] ? T_8 extends SpooshPlugin<infer Types_1 extends PluginTypeConfig> ? Types_1 extends {
     writeOptions: infer W_1;
@@ -250,7 +232,7 @@ declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends read
     data?: undefined;
 }> extends {
     error: infer E;
-} ? E : unknown : unknown, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>, ExtractMethodFormData<TMethod>, never>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<TMethod extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
+} ? E : unknown : unknown, ExtractMethodQuery<TMethod>, ExtractMethodBody<TMethod>, ExtractResponseParamNames<TMethod> extends never ? never : Record<ExtractResponseParamNames<TMethod>, string | number>>>>(writeFn: (api: WriteApiClient<TSchema, TDefaultError>) => TMethod) => BaseWriteResult<TMethod extends (...args: never[]) => infer R ? Extract<Awaited<R>, {
     data: unknown;
     error?: undefined;
 }> extends {
@@ -269,7 +251,7 @@ declare function createInjectWrite<TSchema, TDefaultError, TPlugins extends read
     writeResult: infer W;
 } ? W : object : object : never : never) extends infer T_1 ? T_1 extends (TPlugins[number] extends infer T_2 ? T_2 extends TPlugins[number] ? T_2 extends SpooshPlugin<infer Types extends PluginTypeConfig> ? Types extends {
     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>, ExtractResponseFormData<TMethod>, ExtractResponseParamNames<TMethod>>;
+} ? W : object : object : never : never) ? T_1 extends unknown ? (x: T_1) => void : never : never : never) extends (x: infer I) => void ? I : never, TWriteOpts>> & WriteResponseInputFields<ExtractResponseQuery<TMethod>, ExtractResponseBody<TMethod>, ExtractResponseParamNames<TMethod>>;
 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;
@@ -331,7 +313,7 @@ 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>, ExtractResponseFormData<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>> & ResponseInputFields<ExtractResponseQuery<TReadFn>, ExtractResponseBody<TReadFn>, ExtractResponseParamNames<TReadFn>>;
 type SpooshAngularFunctions<TDefaultError, TSchema, TPlugins extends PluginArray> = {
     injectRead: ReturnType<typeof createInjectRead<TSchema, TDefaultError, TPlugins>>;
@@ -341,4 +323,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 ExtractMethodFormData, type ExtractMethodOptions, type ExtractMethodQuery, type ExtractMethodUrlEncoded, type ExtractResponseBody, type ExtractResponseFormData, 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 PageContext, type ReadApiClient, type ResponseInputFields, type SpooshInstanceShape, type WriteApiClient, type WriteResponseInputFields, createAngularSpoosh };

package/dist/index.js CHANGED Viewed

@@ -33,8 +33,7 @@ function createInjectRead(options) {
     const destroyRef = (0, import_core.inject)(import_core.DestroyRef);
     const {
       enabled: enabledOption = true,
-      tags = void 0,
-      additionalTags = void 0,
+      tags,
       ...pluginOpts
     } = readOptions ?? {};
     const getEnabled = () => typeof enabledOption === "function" ? enabledOption() : enabledOption;
@@ -65,13 +64,14 @@ function createInjectRead(options) {
       readFn(selectorProxy);
       return selectorResult;
     };
-    const createController = (capturedCall, resolvedPath, resolvedTags, queryKey) => {
+    const createController = (capturedCall, resolvedTags, queryKey) => {
       if (currentSubscription) {
         currentSubscription();
       }
+      const pathSegments = capturedCall.path.split("/").filter(Boolean);
       const controller = (0, import_core2.createOperationController)({
         operationType: "read",
-        path: capturedCall.path,
+        path: pathSegments,
         method: capturedCall.method,
         tags: resolvedTags,
         requestOptions: capturedCall.options,
@@ -80,11 +80,8 @@ function createInjectRead(options) {
         pluginExecutor,
         hookId,
         fetchFn: async (fetchOpts) => {
-          let current = api;
-          for (const segment of resolvedPath) {
-            current = current[segment];
-          }
-          const method = current[capturedCall.method];
+          const pathMethods = api(capturedCall.path);
+          const method = pathMethods[capturedCall.method];
           return method(fetchOpts);
         }
       });
@@ -129,29 +126,25 @@ function createInjectRead(options) {
     const initialCapturedCall = initialSelectorResult.call;
     if (!initialCapturedCall) {
       throw new Error(
-        "injectRead requires calling an HTTP method ($get). Example: injectRead((api) => api.posts.$get())"
+        'injectRead requires calling an HTTP method (GET). Example: injectRead((api) => api("posts").GET())'
       );
     }
     const initialRequestOptions = initialCapturedCall.options;
+    const initialPathSegments = initialCapturedCall.path.split("/").filter(Boolean);
     const initialResolvedPath = (0, import_core2.resolvePath)(
-      initialCapturedCall.path,
+      initialPathSegments,
       initialRequestOptions?.params
     );
     const initialResolvedTags = (0, import_core2.resolveTags)(
-      { tags, additionalTags },
+      tags !== void 0 ? { tags } : void 0,
       initialResolvedPath
     );
     const initialQueryKey = stateManager.createQueryKey({
-      path: initialCapturedCall.path,
+      path: initialPathSegments,
       method: initialCapturedCall.method,
       options: initialCapturedCall.options
     });
-    createController(
-      initialCapturedCall,
-      initialResolvedPath,
-      initialResolvedTags,
-      initialQueryKey
-    );
+    createController(initialCapturedCall, initialResolvedTags, initialQueryKey);
     loadingSignal.set(false);
     let wasEnabled = false;
     (0, import_core.effect)(
@@ -161,20 +154,18 @@ function createInjectRead(options) {
         const capturedCall = selectorResult.call;
         if (!capturedCall) {
           throw new Error(
-            "injectRead requires calling an HTTP method ($get). Example: injectRead((api) => api.posts.$get())"
+            'injectRead requires calling an HTTP method (GET). Example: injectRead((api) => api("posts").GET())'
           );
         }
         const requestOptions = capturedCall.options;
-        const resolvedPath = (0, import_core2.resolvePath)(
-          capturedCall.path,
-          requestOptions?.params
-        );
+        const pathSegments = capturedCall.path.split("/").filter(Boolean);
+        const resolvedPath = (0, import_core2.resolvePath)(pathSegments, requestOptions?.params);
         const resolvedTags = (0, import_core2.resolveTags)(
-          { tags, additionalTags },
+          tags !== void 0 ? { tags } : void 0,
           resolvedPath
         );
         const queryKey = stateManager.createQueryKey({
-          path: capturedCall.path,
+          path: pathSegments,
           method: capturedCall.method,
           options: capturedCall.options
         });
@@ -186,9 +177,6 @@ function createInjectRead(options) {
         if (opts?.body !== void 0) {
           inputInner.body = opts.body;
         }
-        if (opts?.formData !== void 0) {
-          inputInner.formData = opts.formData;
-        }
         if (opts?.params !== void 0) {
           inputInner.params = opts.params;
         }
@@ -206,7 +194,6 @@ function createInjectRead(options) {
           }
           const controller = createController(
             capturedCall,
-            resolvedPath,
             resolvedTags,
             queryKey
           );
@@ -327,7 +314,7 @@ function createInjectWrite(options) {
       writeFn(selectorProxy);
       if (!selectorResult.selector) {
         throw new Error(
-          "injectWrite requires selecting an HTTP method ($post, $put, $patch, $delete). Example: injectWrite((api) => api.posts.$post)"
+          'injectWrite requires selecting an HTTP method (POST, PUT, PATCH, DELETE). Example: injectWrite((api) => api("posts").POST)'
         );
       }
       return selectorResult.selector;
@@ -360,10 +347,11 @@ function createInjectWrite(options) {
     const trigger = async (triggerOptions) => {
       const selectedEndpoint = captureSelector();
       const params = triggerOptions?.params;
-      const resolvedPath = (0, import_core4.resolvePath)(selectedEndpoint.path, params);
+      const pathSegments = selectedEndpoint.path.split("/").filter(Boolean);
+      const resolvedPath = (0, import_core4.resolvePath)(pathSegments, params);
       const tags = (0, import_core4.resolveTags)(triggerOptions, resolvedPath);
       const queryKey = stateManager.createQueryKey({
-        path: selectedEndpoint.path,
+        path: pathSegments,
         method: selectedEndpoint.method,
         options: triggerOptions
       });
@@ -374,7 +362,7 @@ function createInjectWrite(options) {
         }
         const controller = (0, import_core4.createOperationController)({
           operationType: "write",
-          path: selectedEndpoint.path,
+          path: pathSegments,
           method: selectedEndpoint.method,
           tags,
           stateManager,
@@ -382,16 +370,8 @@ function createInjectWrite(options) {
           pluginExecutor,
           hookId,
           fetchFn: async (fetchOpts) => {
-            const fetchParams = fetchOpts?.params;
-            const fetchResolvedPath = (0, import_core4.resolvePath)(
-              selectedEndpoint.path,
-              fetchParams
-            );
-            let current = api;
-            for (const segment of fetchResolvedPath) {
-              current = current[segment];
-            }
-            const method = current[selectedEndpoint.method];
+            const pathMethods = api(selectedEndpoint.path);
+            const method = pathMethods[selectedEndpoint.method];
             return method(fetchOpts);
           }
         });
@@ -437,9 +417,6 @@ function createInjectWrite(options) {
         if (opts?.body !== void 0) {
           inputInner.body = opts.body;
         }
-        if (opts?.formData !== void 0) {
-          inputInner.formData = opts.formData;
-        }
         if (opts?.params !== void 0) {
           inputInner.params = opts.params;
         }
@@ -471,7 +448,6 @@ function createInjectInfiniteRead(options) {
     const {
       enabled: enabledOption = true,
       tags,
-      additionalTags,
       canFetchNext,
       nextPageRequest,
       merger,
@@ -501,7 +477,7 @@ function createInjectInfiniteRead(options) {
       readFn(selectorProxy);
       if (!selectorResult.call) {
         throw new Error(
-          "injectInfiniteRead requires calling an HTTP method ($get). Example: injectInfiniteRead((api) => api.posts.$get())"
+          'injectInfiniteRead requires calling an HTTP method (GET). Example: injectInfiniteRead((api) => api("posts").GET())'
         );
       }
       return selectorResult.call;
@@ -558,6 +534,7 @@ function createInjectInfiniteRead(options) {
         unsubInvalidate();
       }
       const requestOptions = capturedCall.options;
+      const pathSegments = capturedCall.path.split("/").filter(Boolean);
       const baseOptionsForKey = {
         ...capturedCall.options,
         query: void 0,
@@ -570,7 +547,7 @@ function createInjectInfiniteRead(options) {
         body: requestOptions?.body
       };
       const controller = (0, import_core6.createInfiniteReadController)({
-        path: capturedCall.path,
+        path: pathSegments,
         method: capturedCall.method,
         tags: resolvedTags,
         initialRequest,
@@ -585,12 +562,8 @@ function createInjectInfiniteRead(options) {
         pluginExecutor,
         hookId,
         fetchFn: async (opts, abortSignal) => {
-          const fetchPath = (0, import_core6.resolvePath)(capturedCall.path, opts.params);
-          let current = api;
-          for (const segment of fetchPath) {
-            current = current[segment];
-          }
-          const method = current[capturedCall.method];
+          const pathMethods = api(capturedCall.path);
+          const method = pathMethods[capturedCall.method];
           const fetchOptions = {
             ...capturedCall.options,
             query: opts.query,
@@ -636,12 +609,13 @@ function createInjectInfiniteRead(options) {
     };
     const initialCapturedCall = captureSelector();
     const initialRequestOptions = initialCapturedCall.options;
+    const initialPathSegments = initialCapturedCall.path.split("/").filter(Boolean);
     const initialResolvedPath = (0, import_core6.resolvePath)(
-      initialCapturedCall.path,
+      initialPathSegments,
       initialRequestOptions?.params
     );
     const initialResolvedTags = (0, import_core6.resolveTags)(
-      { tags, additionalTags },
+      tags !== void 0 ? { tags } : void 0,
       initialResolvedPath
     );
     const initialBaseOptionsForKey = {
@@ -651,7 +625,7 @@ function createInjectInfiniteRead(options) {
       body: void 0
     };
     const initialQueryKey = stateManager.createQueryKey({
-      path: initialCapturedCall.path,
+      path: initialPathSegments,
       method: initialCapturedCall.method,
       options: initialBaseOptionsForKey
     });
@@ -661,12 +635,10 @@ function createInjectInfiniteRead(options) {
         const isEnabled = getEnabled();
         const capturedCall = captureSelector();
         const requestOptions = capturedCall.options;
-        const resolvedPath = (0, import_core6.resolvePath)(
-          capturedCall.path,
-          requestOptions?.params
-        );
+        const pathSegments = capturedCall.path.split("/").filter(Boolean);
+        const resolvedPath = (0, import_core6.resolvePath)(pathSegments, requestOptions?.params);
         const resolvedTags = (0, import_core6.resolveTags)(
-          { tags, additionalTags },
+          tags !== void 0 ? { tags } : void 0,
           resolvedPath
         );
         const baseOptionsForKey = {
@@ -676,7 +648,7 @@ function createInjectInfiniteRead(options) {
           body: void 0
         };
         const queryKey = stateManager.createQueryKey({
-          path: capturedCall.path,
+          path: pathSegments,
           method: capturedCall.method,
           options: baseOptionsForKey
         });

package/dist/index.mjs CHANGED Viewed

@@ -18,8 +18,7 @@ function createInjectRead(options) {
     const destroyRef = inject(DestroyRef);
     const {
       enabled: enabledOption = true,
-      tags = void 0,
-      additionalTags = void 0,
+      tags,
       ...pluginOpts
     } = readOptions ?? {};
     const getEnabled = () => typeof enabledOption === "function" ? enabledOption() : enabledOption;
@@ -50,13 +49,14 @@ function createInjectRead(options) {
       readFn(selectorProxy);
       return selectorResult;
     };
-    const createController = (capturedCall, resolvedPath, resolvedTags, queryKey) => {
+    const createController = (capturedCall, resolvedTags, queryKey) => {
       if (currentSubscription) {
         currentSubscription();
       }
+      const pathSegments = capturedCall.path.split("/").filter(Boolean);
       const controller = createOperationController({
         operationType: "read",
-        path: capturedCall.path,
+        path: pathSegments,
         method: capturedCall.method,
         tags: resolvedTags,
         requestOptions: capturedCall.options,
@@ -65,11 +65,8 @@ function createInjectRead(options) {
         pluginExecutor,
         hookId,
         fetchFn: async (fetchOpts) => {
-          let current = api;
-          for (const segment of resolvedPath) {
-            current = current[segment];
-          }
-          const method = current[capturedCall.method];
+          const pathMethods = api(capturedCall.path);
+          const method = pathMethods[capturedCall.method];
           return method(fetchOpts);
         }
       });
@@ -114,29 +111,25 @@ function createInjectRead(options) {
     const initialCapturedCall = initialSelectorResult.call;
     if (!initialCapturedCall) {
       throw new Error(
-        "injectRead requires calling an HTTP method ($get). Example: injectRead((api) => api.posts.$get())"
+        'injectRead requires calling an HTTP method (GET). Example: injectRead((api) => api("posts").GET())'
       );
     }
     const initialRequestOptions = initialCapturedCall.options;
+    const initialPathSegments = initialCapturedCall.path.split("/").filter(Boolean);
     const initialResolvedPath = resolvePath(
-      initialCapturedCall.path,
+      initialPathSegments,
       initialRequestOptions?.params
     );
     const initialResolvedTags = resolveTags(
-      { tags, additionalTags },
+      tags !== void 0 ? { tags } : void 0,
       initialResolvedPath
     );
     const initialQueryKey = stateManager.createQueryKey({
-      path: initialCapturedCall.path,
+      path: initialPathSegments,
       method: initialCapturedCall.method,
       options: initialCapturedCall.options
     });
-    createController(
-      initialCapturedCall,
-      initialResolvedPath,
-      initialResolvedTags,
-      initialQueryKey
-    );
+    createController(initialCapturedCall, initialResolvedTags, initialQueryKey);
     loadingSignal.set(false);
     let wasEnabled = false;
     effect(
@@ -146,20 +139,18 @@ function createInjectRead(options) {
         const capturedCall = selectorResult.call;
         if (!capturedCall) {
           throw new Error(
-            "injectRead requires calling an HTTP method ($get). Example: injectRead((api) => api.posts.$get())"
+            'injectRead requires calling an HTTP method (GET). Example: injectRead((api) => api("posts").GET())'
           );
         }
         const requestOptions = capturedCall.options;
-        const resolvedPath = resolvePath(
-          capturedCall.path,
-          requestOptions?.params
-        );
+        const pathSegments = capturedCall.path.split("/").filter(Boolean);
+        const resolvedPath = resolvePath(pathSegments, requestOptions?.params);
         const resolvedTags = resolveTags(
-          { tags, additionalTags },
+          tags !== void 0 ? { tags } : void 0,
           resolvedPath
         );
         const queryKey = stateManager.createQueryKey({
-          path: capturedCall.path,
+          path: pathSegments,
           method: capturedCall.method,
           options: capturedCall.options
         });
@@ -171,9 +162,6 @@ function createInjectRead(options) {
         if (opts?.body !== void 0) {
           inputInner.body = opts.body;
         }
-        if (opts?.formData !== void 0) {
-          inputInner.formData = opts.formData;
-        }
         if (opts?.params !== void 0) {
           inputInner.params = opts.params;
         }
@@ -191,7 +179,6 @@ function createInjectRead(options) {
           }
           const controller = createController(
             capturedCall,
-            resolvedPath,
             resolvedTags,
             queryKey
           );
@@ -317,7 +304,7 @@ function createInjectWrite(options) {
       writeFn(selectorProxy);
       if (!selectorResult.selector) {
         throw new Error(
-          "injectWrite requires selecting an HTTP method ($post, $put, $patch, $delete). Example: injectWrite((api) => api.posts.$post)"
+          'injectWrite requires selecting an HTTP method (POST, PUT, PATCH, DELETE). Example: injectWrite((api) => api("posts").POST)'
         );
       }
       return selectorResult.selector;
@@ -350,10 +337,11 @@ function createInjectWrite(options) {
     const trigger = async (triggerOptions) => {
       const selectedEndpoint = captureSelector();
       const params = triggerOptions?.params;
-      const resolvedPath = resolvePath2(selectedEndpoint.path, params);
+      const pathSegments = selectedEndpoint.path.split("/").filter(Boolean);
+      const resolvedPath = resolvePath2(pathSegments, params);
       const tags = resolveTags2(triggerOptions, resolvedPath);
       const queryKey = stateManager.createQueryKey({
-        path: selectedEndpoint.path,
+        path: pathSegments,
         method: selectedEndpoint.method,
         options: triggerOptions
       });
@@ -364,7 +352,7 @@ function createInjectWrite(options) {
         }
         const controller = createOperationController2({
           operationType: "write",
-          path: selectedEndpoint.path,
+          path: pathSegments,
           method: selectedEndpoint.method,
           tags,
           stateManager,
@@ -372,16 +360,8 @@ function createInjectWrite(options) {
           pluginExecutor,
           hookId,
           fetchFn: async (fetchOpts) => {
-            const fetchParams = fetchOpts?.params;
-            const fetchResolvedPath = resolvePath2(
-              selectedEndpoint.path,
-              fetchParams
-            );
-            let current = api;
-            for (const segment of fetchResolvedPath) {
-              current = current[segment];
-            }
-            const method = current[selectedEndpoint.method];
+            const pathMethods = api(selectedEndpoint.path);
+            const method = pathMethods[selectedEndpoint.method];
             return method(fetchOpts);
           }
         });
@@ -427,9 +407,6 @@ function createInjectWrite(options) {
         if (opts?.body !== void 0) {
           inputInner.body = opts.body;
         }
-        if (opts?.formData !== void 0) {
-          inputInner.formData = opts.formData;
-        }
         if (opts?.params !== void 0) {
           inputInner.params = opts.params;
         }
@@ -473,7 +450,6 @@ function createInjectInfiniteRead(options) {
     const {
       enabled: enabledOption = true,
       tags,
-      additionalTags,
       canFetchNext,
       nextPageRequest,
       merger,
@@ -503,7 +479,7 @@ function createInjectInfiniteRead(options) {
       readFn(selectorProxy);
       if (!selectorResult.call) {
         throw new Error(
-          "injectInfiniteRead requires calling an HTTP method ($get). Example: injectInfiniteRead((api) => api.posts.$get())"
+          'injectInfiniteRead requires calling an HTTP method (GET). Example: injectInfiniteRead((api) => api("posts").GET())'
         );
       }
       return selectorResult.call;
@@ -560,6 +536,7 @@ function createInjectInfiniteRead(options) {
         unsubInvalidate();
       }
       const requestOptions = capturedCall.options;
+      const pathSegments = capturedCall.path.split("/").filter(Boolean);
       const baseOptionsForKey = {
         ...capturedCall.options,
         query: void 0,
@@ -572,7 +549,7 @@ function createInjectInfiniteRead(options) {
         body: requestOptions?.body
       };
       const controller = createInfiniteReadController({
-        path: capturedCall.path,
+        path: pathSegments,
         method: capturedCall.method,
         tags: resolvedTags,
         initialRequest,
@@ -587,12 +564,8 @@ function createInjectInfiniteRead(options) {
         pluginExecutor,
         hookId,
         fetchFn: async (opts, abortSignal) => {
-          const fetchPath = resolvePath3(capturedCall.path, opts.params);
-          let current = api;
-          for (const segment of fetchPath) {
-            current = current[segment];
-          }
-          const method = current[capturedCall.method];
+          const pathMethods = api(capturedCall.path);
+          const method = pathMethods[capturedCall.method];
           const fetchOptions = {
             ...capturedCall.options,
             query: opts.query,
@@ -638,12 +611,13 @@ function createInjectInfiniteRead(options) {
     };
     const initialCapturedCall = captureSelector();
     const initialRequestOptions = initialCapturedCall.options;
+    const initialPathSegments = initialCapturedCall.path.split("/").filter(Boolean);
     const initialResolvedPath = resolvePath3(
-      initialCapturedCall.path,
+      initialPathSegments,
       initialRequestOptions?.params
     );
     const initialResolvedTags = resolveTags3(
-      { tags, additionalTags },
+      tags !== void 0 ? { tags } : void 0,
       initialResolvedPath
     );
     const initialBaseOptionsForKey = {
@@ -653,7 +627,7 @@ function createInjectInfiniteRead(options) {
       body: void 0
     };
     const initialQueryKey = stateManager.createQueryKey({
-      path: initialCapturedCall.path,
+      path: initialPathSegments,
       method: initialCapturedCall.method,
       options: initialBaseOptionsForKey
     });
@@ -663,12 +637,10 @@ function createInjectInfiniteRead(options) {
         const isEnabled = getEnabled();
         const capturedCall = captureSelector();
         const requestOptions = capturedCall.options;
-        const resolvedPath = resolvePath3(
-          capturedCall.path,
-          requestOptions?.params
-        );
+        const pathSegments = capturedCall.path.split("/").filter(Boolean);
+        const resolvedPath = resolvePath3(pathSegments, requestOptions?.params);
         const resolvedTags = resolveTags3(
-          { tags, additionalTags },
+          tags !== void 0 ? { tags } : void 0,
           resolvedPath
         );
         const baseOptionsForKey = {
@@ -678,7 +650,7 @@ function createInjectInfiniteRead(options) {
           body: void 0
         };
         const queryKey = stateManager.createQueryKey({
-          path: capturedCall.path,
+          path: pathSegments,
           method: capturedCall.method,
           options: baseOptionsForKey
         });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/angular",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "license": "MIT",
   "description": "Angular signals integration for Spoosh API client",
   "keywords": [
@@ -34,11 +34,11 @@
     }
   },
   "peerDependencies": {
-    "@spoosh/core": ">=0.4.0",
+    "@spoosh/core": ">=0.7.0",
     "@angular/core": ">=16.0.0"
   },
   "devDependencies": {
-    "@spoosh/core": "0.5.0"
+    "@spoosh/core": "0.7.0"
   },
   "scripts": {
     "dev": "tsup --watch",