@ethlete/query 5.42.0 → 5.42.1

package/index.d.ts

@@ -1638,7 +1638,7 @@ type CreateLegacyQueryCreatorOptions<TArgs extends QueryArgs, Response, Store ex
      */
     entity?: QueryEntityConfig<Store, Data, Response, LegacyArgumentsOfQueryArgs<TArgs>, Id>;
 };
-interface WithLegacyConfig {
+type WithLegacyConfig = {
     /**
      * Additional configuration for this query.
      */
@@ -1648,8 +1648,8 @@ interface WithLegacyConfig {
          */
         destroyOnResponse?: boolean;
     };
-}
-type LegacyQueryPrepareFn<Arguments extends BaseArguments | undefined, Response, Route extends RouteType<Arguments>, Store extends EntityStore<unknown>, Data, Id, TNewQuery extends AnyNewQuery> = Arguments extends BaseArguments ? (args: Arguments & WithHeaders & WithLegacyConfig & WithInjector) => LegacyQuery<Response, Arguments, Route, Store, Data, Id, TNewQuery> : (args?: (Arguments extends EmptyObject ? Arguments : EmptyObject) & WithHeaders & WithLegacyConfig & WithInjector) => LegacyQuery<Response, Arguments, Route, Store, Data, Id, TNewQuery>;
+};
+type LegacyQueryPrepareFn<Arguments extends BaseArguments | undefined, Response, Route extends RouteType<Arguments>, Store extends EntityStore<unknown>, Data, Id, TNewQuery extends AnyNewQuery> = (args: Arguments & WithHeaders & WithLegacyConfig & WithInjector) => LegacyQuery<Response, Arguments, Route, Store, Data, Id, TNewQuery>;
 type AnyLegacyQueryCreator = LegacyQueryCreator<any, any, any, any, any>;
 /**
  * Creates a legacy query creator.
@@ -1658,10 +1658,10 @@ type AnyLegacyQueryCreator = LegacyQueryCreator<any, any, any, any, any>;
 declare class LegacyQueryCreator<TArgs extends QueryArgs, Response extends ResponseType<TArgs>, Store extends EntityStore<unknown>, Id, Data = Response> {
     options: CreateLegacyQueryCreatorOptions<TArgs, Response, Store, Data, Id>;
     constructor(options: CreateLegacyQueryCreatorOptions<TArgs, Response, Store, Data, Id>);
-    prepare: LegacyQueryPrepareFn<LegacyArgs, Response, Route, Store, Data, Id, Query$1<TArgs>>;
-    createSubject: (initialValue?: ReturnType<typeof this.prepare> | null, config?: QueryContainerConfig) => BehaviorSubject<LegacyQuery<Response, LegacyArgs, Route, Store, Data, Id, Query$1<TArgs>> | null>;
-    createSignal: (initialValue?: ReturnType<typeof this.prepare> | null, config?: QueryContainerConfig) => _angular_core.WritableSignal<LegacyQuery<Response, LegacyArgs, Route, Store, Data, Id, Query$1<TArgs>> | null>;
-    behaviorSubject: (initialValue?: ReturnType<typeof this.prepare> | null, config?: QueryContainerConfig) => BehaviorSubject<LegacyQuery<Response, LegacyArgs, Route, Store, Data, Id, Query$1<TArgs>> | null>;
+    prepare: LegacyQueryPrepareFn<LegacyArgumentsOfQueryArgs<TArgs>, Response, RouteType<LegacyArgumentsOfQueryArgs<TArgs>>, Store, Data, Id, Query$1<TArgs>>;
+    createSubject: (initialValue?: ReturnType<typeof this.prepare> | null, config?: QueryContainerConfig) => BehaviorSubject<LegacyQuery<Response, LegacyArgumentsOfQueryArgs<TArgs>, RouteType<LegacyArgumentsOfQueryArgs<TArgs>>, Store, Data, Id, Query$1<TArgs>> | null>;
+    createSignal: (initialValue?: ReturnType<typeof this.prepare> | null, config?: QueryContainerConfig) => _angular_core.WritableSignal<LegacyQuery<Response, LegacyArgumentsOfQueryArgs<TArgs>, RouteType<LegacyArgumentsOfQueryArgs<TArgs>>, Store, Data, Id, Query$1<TArgs>> | null>;
+    behaviorSubject: (initialValue?: ReturnType<typeof this.prepare> | null, config?: QueryContainerConfig) => BehaviorSubject<LegacyQuery<Response, LegacyArgumentsOfQueryArgs<TArgs>, RouteType<LegacyArgumentsOfQueryArgs<TArgs>>, Store, Data, Id, Query$1<TArgs>> | null>;
 }
 declare const createLegacyQueryCreator: <TArgs extends QueryArgs, Response extends ResponseType<TArgs>, Store extends EntityStore<unknown>, Id, Data = Response>(options: CreateLegacyQueryCreatorOptions<TArgs, Response, Store, Data, Id>) => LegacyQueryCreator<TArgs, Response, Store, Id, Data>;
 
@@ -2755,9 +2755,9 @@ declare function takeUntilResponse(config?: {
     excludeNull?: boolean;
 }): <T extends QueryState | null>(source: Observable<T>) => Observable<T>;
 declare function filterNull(): <T>(source: Observable<T>) => Observable<OmitNull<T>>;
-declare function switchQueryState(): <T extends AnyQuery | null, Data extends QueryDataOf<T>>(source: Observable<T>) => Observable<QueryState<Data> | null>;
+declare function switchQueryState(): <T extends AnyQuery | AnyLegacyQuery | null, Data extends QueryDataOf<T>>(source: Observable<T>) => Observable<QueryState<Data> | null>;
 declare function switchQueryCollectionState(): <T extends AnyQueryCollection | null, Data extends AnyQueryCollectionData<OmitNull<T>>>(source: Observable<T>) => Observable<QueryState<Data> | null>;
-declare const resetPageOnError: <T extends AnyQuery | null | undefined, J extends QueryForm<any>>(config: ResetPageOnErrorOperatorConfig<J>) => (source: Observable<T>) => Observable<QueryState<any> | T>;
+declare const resetPageOnError: <T extends AnyQuery | AnyLegacyQuery | null | undefined, J extends QueryForm<any>>(config: ResetPageOnErrorOperatorConfig<J>) => (source: Observable<T>) => Observable<QueryState<any> | T>;
 declare const isQueryStateLoading: (state: QueryState | null | undefined) => state is Loading;
 declare const isQueryStateSuccess: (state: QueryState | null | undefined) => state is Success;
 declare const isQueryStateFailure: (state: QueryState | null | undefined) => state is Failure;
@@ -2766,7 +2766,7 @@ declare const isQueryStatePrepared: (state: QueryState | null | undefined) => st
 declare const isAutoRefresh: (state: QueryState | null | undefined) => boolean;
 declare const mergeHeaders: (...headers: Array<RequestHeaders | null | undefined>) => RequestHeaders | null | undefined;
 declare const isGqlQueryConfig: <Response, Arguments extends BaseArguments | undefined, Route extends RouteType<Arguments> | undefined, Store extends EntityStore<unknown>, Data, Id>(config: unknown) => config is GqlQueryConfig<Route, Response, Arguments, Store, Data, Id>;
-declare const isQuery: <T extends AnyQuery>(query: unknown) => query is T;
+declare const isQuery: <T extends AnyQuery | AnyLegacyQuery>(query: unknown) => query is T;
 declare const isQueryCollection: <T extends AnyQueryCollection>(query: unknown) => query is T;
 /**
  * @deprecated Use `createQueryCollectionSubject` instead. Will be removed in v6.
@@ -2774,7 +2774,7 @@ declare const isQueryCollection: <T extends AnyQueryCollection>(query: unknown)
 declare const createQueryCollection: <T extends AnyQueryCreatorCollection, R extends QueryCollectionOf<T>>(queryMap: T) => BehaviorSubject<R | null>;
 declare const createQueryCollectionSubject: <T extends AnyQueryCreatorCollection, R extends QueryCollectionOf<T>>(queryMap: T, config?: QueryContainerConfig) => BehaviorSubject<R | null>;
 declare const createQueryCollectionSignal: <T extends AnyQueryCreatorCollection, R extends QueryCollectionOf<T>>(queryMap: T, config?: QueryContainerConfig) => _angular_core.WritableSignal<R | null>;
-declare const extractQuery: <T extends AnyQuery | AnyLegacyQuery | AnyQueryCollection | null>(v: T) => _ethlete_query.Query<any, any, any, any, any, any> | (T & AnyLegacyQuery) | LegacyQuery<any, LegacyArgs, Route, any, any, any, Query$1<any>> | null;
+declare const extractQuery: <T extends AnyQuery | AnyLegacyQuery | AnyQueryCollection | null>(v: T) => Query<any, any, any, any, any, any> | (T & AnyLegacyQuery) | LegacyQuery<any, LegacyArgumentsOfQueryArgs<any>, `/${string}`, any, any, any, Query$1<any>> | null;
 declare const getDefaultHeaders: (headers: RequestHeaders | RequestHeadersMethodMap | null | undefined, method: Method) => RequestHeaders;
 declare const castQueryCreatorTypes: <QC extends AnyQueryCreator, Arguments extends QueryArgsOf<QC>, Response extends QueryResponseOf<QC>, Store extends QueryStoreOf<QC>, Data extends QueryDataOf<QC>, Route extends RouteType<Arguments>, Id extends QueryStoreIdOf<QC>, OverrideArguments extends BaseArguments | undefined, OverrideResponse extends Response | undefined>(config: {
     creator: QC;
@@ -3508,7 +3508,7 @@ declare class InfinityQuery<QueryCreator extends AnyQueryCreator | AnyLegacyQuer
 declare const createInfinityQueryConfig: <QueryCreator extends AnyQueryCreator | AnyLegacyQueryCreator, Args extends QueryArgsOf<QueryCreator>, QueryResponse extends QueryDataOf<QueryCreator>, InfinityResponse extends unknown[]>(config: InfinityQueryConfig<QueryCreator, Args, QueryResponse, InfinityResponse>) => InfinityQueryConfig<QueryCreator, Args, QueryResponse, InfinityResponse>;
 declare const skipPaginationPageParamCalculator: ({ page, itemsPerPage }: PageParamCalculatorOptions) => number;
 
-interface InfinityQueryContext<Q extends InfinityQueryConfig<AnyQueryCreator, BaseArguments | undefined, any, unknown[]>> {
+interface InfinityQueryContext<Q extends InfinityQueryConfig<DirectiveQueryCreator, BaseArguments | undefined, any, unknown[]>> {
     $implicit: Q['response']['arrayType'] | null;
     etInfinityQuery: Q['response']['arrayType'] | null;
     loading: boolean;
@@ -3522,7 +3522,8 @@ interface InfinityQueryContext<Q extends InfinityQueryConfig<AnyQueryCreator, Ba
     currentQuery: ConstructQuery<Q['queryCreator']> | null;
 }
 declare const INFINITY_QUERY_TOKEN: InjectionToken<InfinityQueryDirective<any>>;
-declare class InfinityQueryDirective<Q extends InfinityQueryConfig<AnyQueryCreator, BaseArguments | undefined, any, unknown[]>> {
+type DirectiveQueryCreator = AnyQueryCreator | AnyLegacyQueryCreator;
+declare class InfinityQueryDirective<Q extends InfinityQueryConfig<DirectiveQueryCreator, BaseArguments | undefined, any, unknown[]>> {
     private readonly _queryConfigChanged$;
     private readonly _viewContext;
     private _infinityQueryInstance;
@@ -3540,7 +3541,7 @@ declare class InfinityQueryDirective<Q extends InfinityQueryConfig<AnyQueryCreat
     get instance(): InfinityQueryOf<Q> | null;
     get data$(): rxjs.Observable<Q["response"]["arrayType"]>;
     data: _angular_core.Signal<Q["response"]["arrayType"]>;
-    static ngTemplateContextGuard<Q extends InfinityQueryConfig<AnyQueryCreator, BaseArguments | undefined, any, unknown[]>>(dir: InfinityQueryDirective<Q>, ctx: unknown): ctx is InfinityQueryContext<Q>;
+    static ngTemplateContextGuard<Q extends InfinityQueryConfig<DirectiveQueryCreator, BaseArguments | undefined, any, unknown[]>>(dir: InfinityQueryDirective<Q>, ctx: unknown): ctx is InfinityQueryContext<Q>;
     constructor();
     private _setupInfinityQuery;
     loadNextPage(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethlete/query",
-  "version": "5.42.0",
+  "version": "5.42.1",
   "license": "MIT",
   "sideEffects": false,
   "peerDependencies": {