@ethlete/query 0.1.0-next.12 → 0.1.0-next.13

package/lib/directives/query.directive.d.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, ErrorHandler, OnDestroy, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
-import { AnyQuery, QueryRawResponseType, QueryResponseType } from '../query';
+import { AnyQuery, AnyQueryCreatorCollection, AnyQueryOfCreatorCollection, QueryOf, QueryRawResponseType, QueryResponseType } from '../query';
 import { RequestError } from '../request';
 import * as i0 from "@angular/core";
 interface QueryContext<Q extends AnyQuery | null> {
@@ -9,7 +9,7 @@ interface QueryContext<Q extends AnyQuery | null> {
     loading: boolean;
     error: RequestError<unknown> | null;
 }
-export declare class QueryDirective<Q extends AnyQuery | null> implements OnInit, OnDestroy {
+export declare class QueryDirective<Q extends AnyQuery | AnyQueryOfCreatorCollection<AnyQueryCreatorCollection> | null> implements OnInit, OnDestroy {
     private _mainTemplateRef;
     private _viewContainerRef;
     private _errorHandler;
@@ -23,8 +23,8 @@ export declare class QueryDirective<Q extends AnyQuery | null> implements OnInit
     get cache(): boolean;
     set cache(v: boolean);
     private _cache;
-    constructor(_mainTemplateRef: TemplateRef<QueryContext<Q>>, _viewContainerRef: ViewContainerRef, _errorHandler: ErrorHandler, _cdr: ChangeDetectorRef);
-    static ngTemplateContextGuard<Q extends AnyQuery | null>(dir: QueryDirective<Q>, ctx: unknown): ctx is QueryContext<Q>;
+    constructor(_mainTemplateRef: TemplateRef<QueryContext<QueryOf<Q>>>, _viewContainerRef: ViewContainerRef, _errorHandler: ErrorHandler, _cdr: ChangeDetectorRef);
+    static ngTemplateContextGuard<Q extends AnyQuery | AnyQueryOfCreatorCollection<AnyQueryCreatorCollection> | null>(dir: QueryDirective<Q>, ctx: unknown): ctx is QueryContext<QueryOf<Q>>;
     ngOnInit(): void;
     ngOnDestroy(): void;
     private _subscribeToQuery;

package/lib/query/query.types.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { ResponseTransformerType } from '../query-client';
+import { AnyQueryCreator, QueryCreatorReturnType, ResponseTransformerType } from '../query-client';
 import { Method, PathParams, QueryParams, RequestError } from '../request';
 import { Query } from './query';
 export interface RestQueryConfig<Route extends RouteType<Arguments>, Response, Arguments extends BaseArguments | undefined, ResponseTransformer extends ResponseTransformerType<Response> | undefined> {
@@ -129,3 +129,15 @@ export type QueryType<T extends {
 }> = T['prepare'] extends () => infer R ? R : T['prepare'] extends (args: any) => infer R ? R : never;
 export type QueryResponseType<Q extends AnyQuery | null> = Q extends AnyQuery ? QueryStateData<Q['state']> | null : null;
 export type QueryRawResponseType<Q extends AnyQuery | null> = Q extends AnyQuery ? QueryStateRawData<Q['state']> | null : null;
+export type AnyQueryCreatorCollection = {
+    [name: string]: AnyQueryCreator;
+};
+export type AnyQueryOfCreatorCollection<T extends {
+    [name: string]: AnyQueryCreator;
+}> = {
+    [K in keyof T]: {
+        type: K;
+        query: QueryCreatorReturnType<T[K]>;
+    };
+}[keyof T];
+export type QueryOf<T extends AnyQueryOfCreatorCollection<AnyQueryCreatorCollection> | AnyQuery | null> = T extends AnyQuery ? T : T extends AnyQueryOfCreatorCollection<AnyQueryCreatorCollection> ? T['query'] : never;

package/lib/query/query.utils.d.ts

@@ -1,7 +1,7 @@
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { ResponseTransformerType } from '../query-client';
 import { RequestHeaders } from '../request';
-import { AnyQuery, BaseArguments, Cancelled, Failure, GqlQueryConfig, Loading, Prepared, QueryRawResponseType, QueryResponseType, QueryState, QueryStateData, QueryStateRawData, QueryStateType, RouteType, Success } from './query.types';
+import { AnyQuery, AnyQueryCreatorCollection, AnyQueryOfCreatorCollection, BaseArguments, Cancelled, Failure, GqlQueryConfig, Loading, Prepared, QueryRawResponseType, QueryResponseType, QueryState, QueryStateData, QueryStateRawData, QueryStateType, RouteType, Success } from './query.types';
 type OmitNull<T> = T extends null ? never : T;
 export declare function filterSuccess(): <T extends QueryState<unknown, unknown> | null, Response_1 extends QueryStateData<OmitNull<T>>, RawResponse extends QueryStateRawData<OmitNull<T>>>(source: Observable<T>) => Observable<Success<Response_1, RawResponse>>;
 export declare function filterFailure(): <T extends QueryState<unknown, unknown> | null>(source: Observable<T>) => Observable<Failure>;
@@ -16,4 +16,10 @@ export declare const isQueryStateCancelled: (state: QueryState | null | undefine
 export declare const isQueryStatePrepared: (state: QueryState | null | undefined) => state is Prepared;
 export declare const mergeHeaders: (...headers: Array<RequestHeaders | null | undefined>) => RequestHeaders | null | undefined;
 export declare const isGqlQueryConfig: <Response_1, Arguments extends BaseArguments | undefined, Route extends RouteType<Arguments> | undefined, ResponseTransformer extends ResponseTransformerType<Response_1> | undefined>(config: unknown) => config is GqlQueryConfig<Route, Response_1, Arguments, ResponseTransformer>;
+export declare const isQuery: <T extends AnyQuery>(query: unknown) => query is T;
+export declare const createQueryCollection: <T extends AnyQueryCreatorCollection, R extends AnyQueryOfCreatorCollection<T>>(queryMap: T) => BehaviorSubject<R | null>;
+export declare const extractQuery: <T extends AnyQuery | {
+    type: string;
+    query: import("@ethlete/query").Query<any, any, any, any, any>;
+} | null>(v: T) => import("@ethlete/query").Query<any, any, any, any, any> | null;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethlete/query",
-  "version": "0.1.0-next.12",
+  "version": "0.1.0-next.13",
   "dependencies": {
     "tslib": "^2.3.0"
   },
@@ -8,7 +8,7 @@
     "@angular/common": "^14.2.0 || ^15.0.0",
     "@angular/core": "^14.2.0 || ^15.0.0",
     "rxjs": "7.8.0",
-    "@ethlete/core": "0.2.0-next.10",
+    "@ethlete/core": "0.2.0-next.11",
     "@angular/forms": "15.1.0",
     "@angular/router": "15.1.0"
   },