@verdant-web/store 2.7.6 → 2.7.7-next.0

package/dist/esm/queries/QueryStore.js

@@ -0,0 +1,126 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { createOid, hashObject } from '@lo-fi/common';
+import { storeRequestPromise } from '../idb.js';
+import { Query } from './Query.js';
+export class QueryStore {
+    constructor(hydrator, context) {
+        this.hydrator = hydrator;
+        this.context = context;
+        this._disposed = false;
+        this.getStore = (collection, write) => {
+            return this.context.documentDb
+                .transaction(collection, write ? 'readwrite' : 'readonly')
+                .objectStore(collection);
+        };
+        this.getQueryKey = (_a) => {
+            var { range } = _a, rest = __rest(_a, ["range"]);
+            let hashedRange;
+            if (range instanceof IDBKeyRange) {
+                hashedRange = hashObject({
+                    includes: range.includes,
+                    lower: range.lower,
+                    lowerOpen: range.lowerOpen,
+                    upper: range.upper,
+                    upperOpen: range.upperOpen,
+                });
+            }
+            else {
+                hashedRange = range;
+            }
+            return hashObject(Object.assign({ range: hashedRange }, rest));
+        };
+        this.get = (params) => {
+            const { collection, range, index, direction, limit, write, single } = params;
+            const key = this.getQueryKey(params);
+            let run;
+            if (single) {
+                if (!range)
+                    throw new Error('Single object query requires a range value');
+                run = async () => {
+                    const store = this.getStore(collection, write);
+                    const source = index ? store.index(index) : store;
+                    const request = source.getKey(range);
+                    try {
+                        const key = await storeRequestPromise(request);
+                        // hackfix: avoid another db dip if already disposed
+                        if (this._disposed) {
+                            return null;
+                        }
+                        return key
+                            ? await this.hydrator(createOid(collection, key.toString(), []))
+                            : null;
+                    }
+                    catch (error) {
+                        if (error instanceof Error && error.name === 'InvalidStateError') {
+                            this.context.log('Query failed with InvalidStateError', error);
+                            return null;
+                        }
+                        else {
+                            throw error;
+                        }
+                    }
+                };
+            }
+            else {
+                run = async () => {
+                    const store = this.getStore(collection, write);
+                    const source = index ? store.index(index) : store;
+                    const request = source.openCursor(range, direction);
+                    try {
+                        const oids = await new Promise((resolve, reject) => {
+                            const result = [];
+                            request.onsuccess = async () => {
+                                const cursor = request.result;
+                                if (cursor === null || cursor === void 0 ? void 0 : cursor.primaryKey) {
+                                    result.push(createOid(collection, cursor.primaryKey.toString(), []));
+                                    if (limit && result.length >= limit) {
+                                        resolve(result);
+                                    }
+                                    else {
+                                        cursor.continue();
+                                    }
+                                }
+                                else {
+                                    resolve(result);
+                                }
+                            };
+                            request.onerror = () => reject(request.error);
+                        });
+                        if (this._disposed) {
+                            // hackfix: avoid another db dip if already disposed.
+                            return [];
+                        }
+                        return Promise.all(oids.map((oid) => this.hydrator(oid)));
+                    }
+                    catch (error) {
+                        if (error instanceof Error && error.name === 'InvalidStateError') {
+                            this.context.log('Query failed with InvalidStateError', error);
+                            return null;
+                        }
+                        else {
+                            throw error;
+                        }
+                    }
+                };
+            }
+            return new Query(key, collection, run);
+        };
+        this.dispose = () => {
+            this._disposed = true;
+        };
+        this.setContext = (context) => {
+            this.context = context;
+        };
+    }
+}
+//# sourceMappingURL=QueryStore.js.map

package/dist/esm/queries/QueryStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryStore.js","sourceRoot":"","sources":["../../../src/queries/QueryStore.ts"],"names":[],"mappings":"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"}

package/dist/esm/queries/dbQueries.d.ts

@@ -1,22 +1,22 @@
-import { CollectionFilter } from '@verdant-web/common';
-import { Context } from '../context.js';
-export declare function findOneOid({ collection, index, context, }: {
-    collection: string;
-    index?: CollectionFilter;
-    context: Context;
-}): Promise<string | null>;
-export declare function findAllOids({ collection, index, context, }: {
-    collection: string;
-    index?: CollectionFilter;
-    context: Context;
-}): Promise<string[]>;
-export declare function findPageOfOids({ collection, index, context, limit, offset, }: {
-    collection: string;
-    index?: CollectionFilter;
-    context: Context;
-    limit?: number;
-    offset?: number;
-}): Promise<{
-    result: string[];
-    hasNextPage: boolean;
-}>;
+import { CollectionFilter } from '@verdant-web/common';
+import { Context } from '../context.js';
+export declare function findOneOid({ collection, index, context, }: {
+    collection: string;
+    index?: CollectionFilter;
+    context: Context;
+}): Promise<string | null>;
+export declare function findAllOids({ collection, index, context, }: {
+    collection: string;
+    index?: CollectionFilter;
+    context: Context;
+}): Promise<string[]>;
+export declare function findPageOfOids({ collection, index, context, limit, offset, }: {
+    collection: string;
+    index?: CollectionFilter;
+    context: Context;
+    limit?: number;
+    offset?: number;
+}): Promise<{
+    result: string[];
+    hasNextPage: boolean;
+}>;

package/dist/esm/queries/dbQueries.js

@@ -1,120 +1,120 @@
-import { createOid } from '@verdant-web/common';
-import { getRange } from './ranges.js';
-function getStore(db, collection, write) {
-    return db
-        .transaction(collection, write ? 'readwrite' : 'readonly')
-        .objectStore(collection);
-}
-export async function findOneOid({ collection, index, context, }) {
-    const store = getStore(context.documentDb, collection);
-    const source = index ? store.index(index.where) : store;
-    const range = getRange(context.schema, collection, index);
-    const direction = (index === null || index === void 0 ? void 0 : index.order) === 'desc' ? 'prev' : 'next';
-    const request = source.openCursor(range, direction);
-    const result = await new Promise((resolve, reject) => {
-        request.onsuccess = () => {
-            const cursor = request.result;
-            if (cursor) {
-                resolve(createOid(collection, cursor.primaryKey.toString()));
-            }
-            else {
-                resolve(null);
-            }
-        };
-        request.onerror = () => {
-            var _a;
-            if (((_a = request.error) === null || _a === void 0 ? void 0 : _a.name) === 'InvalidStateError') {
-                context.log('error', `findOne query failed with InvalidStateError`, request.error);
-                resolve(null);
-            }
-            else {
-                reject(request.error);
-            }
-        };
-    });
-    return result;
-}
-export async function findAllOids({ collection, index, context, }) {
-    const store = getStore(context.documentDb, collection);
-    const source = index ? store.index(index.where) : store;
-    const range = getRange(context.schema, collection, index);
-    const direction = (index === null || index === void 0 ? void 0 : index.order) === 'desc' ? 'prev' : 'next';
-    const request = source.openCursor(range, direction);
-    const result = await new Promise((resolve, reject) => {
-        const results = new Set();
-        request.onsuccess = () => {
-            const cursor = request.result;
-            if (cursor) {
-                results.add(createOid(collection, cursor.primaryKey.toString()));
-                cursor.continue();
-            }
-            else {
-                resolve(Array.from(results));
-            }
-        };
-        request.onerror = () => {
-            var _a;
-            if (((_a = request.error) === null || _a === void 0 ? void 0 : _a.name) === 'InvalidStateError') {
-                context.log('error', `findAll query failed with InvalidStateError`, request.error);
-                resolve([]);
-            }
-            else {
-                reject(request.error);
-            }
-        };
-    });
-    return result;
-}
-export async function findPageOfOids({ collection, index, context, limit, offset, }) {
-    const store = getStore(context.documentDb, collection);
-    const source = index ? store.index(index.where) : store;
-    const range = getRange(context.schema, collection, index);
-    const direction = (index === null || index === void 0 ? void 0 : index.order) === 'desc' ? 'prev' : 'next';
-    const request = source.openCursor(range, direction);
-    let hasDoneOffset = !offset;
-    let hasNextPage = false;
-    let visited = 0;
-    const result = await new Promise((resolve, reject) => {
-        const results = new Set();
-        request.onsuccess = () => {
-            visited++;
-            const cursor = request.result;
-            if (cursor) {
-                if (offset && !hasDoneOffset) {
-                    cursor.advance(offset);
-                    hasDoneOffset = true;
-                }
-                else {
-                    if (limit && results.size < limit) {
-                        results.add(createOid(collection, cursor.primaryKey.toString()));
-                    }
-                    if (limit && visited > limit) {
-                        hasNextPage = true;
-                        resolve(Array.from(results));
-                    }
-                    else {
-                        cursor.continue();
-                    }
-                }
-            }
-            else {
-                resolve(Array.from(results));
-            }
-        };
-        request.onerror = () => {
-            var _a;
-            if (((_a = request.error) === null || _a === void 0 ? void 0 : _a.name) === 'InvalidStateError') {
-                context.log('error', `find query failed with InvalidStateError`, request.error);
-                resolve([]);
-            }
-            else {
-                reject(request.error);
-            }
-        };
-    });
-    return {
-        result: result,
-        hasNextPage,
-    };
-}
+import { createOid } from '@verdant-web/common';
+import { getRange } from './ranges.js';
+function getStore(db, collection, write) {
+    return db
+        .transaction(collection, write ? 'readwrite' : 'readonly')
+        .objectStore(collection);
+}
+export async function findOneOid({ collection, index, context, }) {
+    const store = getStore(context.documentDb, collection);
+    const source = index ? store.index(index.where) : store;
+    const range = getRange(context.schema, collection, index);
+    const direction = (index === null || index === void 0 ? void 0 : index.order) === 'desc' ? 'prev' : 'next';
+    const request = source.openCursor(range, direction);
+    const result = await new Promise((resolve, reject) => {
+        request.onsuccess = () => {
+            const cursor = request.result;
+            if (cursor) {
+                resolve(createOid(collection, cursor.primaryKey.toString()));
+            }
+            else {
+                resolve(null);
+            }
+        };
+        request.onerror = () => {
+            var _a;
+            if (((_a = request.error) === null || _a === void 0 ? void 0 : _a.name) === 'InvalidStateError') {
+                context.log('error', `findOne query failed with InvalidStateError`, request.error);
+                resolve(null);
+            }
+            else {
+                reject(request.error);
+            }
+        };
+    });
+    return result;
+}
+export async function findAllOids({ collection, index, context, }) {
+    const store = getStore(context.documentDb, collection);
+    const source = index ? store.index(index.where) : store;
+    const range = getRange(context.schema, collection, index);
+    const direction = (index === null || index === void 0 ? void 0 : index.order) === 'desc' ? 'prev' : 'next';
+    const request = source.openCursor(range, direction);
+    const result = await new Promise((resolve, reject) => {
+        const results = new Set();
+        request.onsuccess = () => {
+            const cursor = request.result;
+            if (cursor) {
+                results.add(createOid(collection, cursor.primaryKey.toString()));
+                cursor.continue();
+            }
+            else {
+                resolve(Array.from(results));
+            }
+        };
+        request.onerror = () => {
+            var _a;
+            if (((_a = request.error) === null || _a === void 0 ? void 0 : _a.name) === 'InvalidStateError') {
+                context.log('error', `findAll query failed with InvalidStateError`, request.error);
+                resolve([]);
+            }
+            else {
+                reject(request.error);
+            }
+        };
+    });
+    return result;
+}
+export async function findPageOfOids({ collection, index, context, limit, offset, }) {
+    const store = getStore(context.documentDb, collection);
+    const source = index ? store.index(index.where) : store;
+    const range = getRange(context.schema, collection, index);
+    const direction = (index === null || index === void 0 ? void 0 : index.order) === 'desc' ? 'prev' : 'next';
+    const request = source.openCursor(range, direction);
+    let hasDoneOffset = !offset;
+    let hasNextPage = false;
+    let visited = 0;
+    const result = await new Promise((resolve, reject) => {
+        const results = new Set();
+        request.onsuccess = () => {
+            visited++;
+            const cursor = request.result;
+            if (cursor) {
+                if (offset && !hasDoneOffset) {
+                    cursor.advance(offset);
+                    hasDoneOffset = true;
+                }
+                else {
+                    if (limit && results.size < limit) {
+                        results.add(createOid(collection, cursor.primaryKey.toString()));
+                    }
+                    if (limit && visited > limit) {
+                        hasNextPage = true;
+                        resolve(Array.from(results));
+                    }
+                    else {
+                        cursor.continue();
+                    }
+                }
+            }
+            else {
+                resolve(Array.from(results));
+            }
+        };
+        request.onerror = () => {
+            var _a;
+            if (((_a = request.error) === null || _a === void 0 ? void 0 : _a.name) === 'InvalidStateError') {
+                context.log('error', `find query failed with InvalidStateError`, request.error);
+                resolve([]);
+            }
+            else {
+                reject(request.error);
+            }
+        };
+    });
+    return {
+        result: result,
+        hasNextPage,
+    };
+}
 //# sourceMappingURL=dbQueries.js.map

package/dist/esm/queries/keys.d.ts

@@ -1,10 +1,10 @@
-export interface QueryParams {
-    collection: string;
-    range: IDBKeyRange | IDBValidKey | undefined;
-    index?: string;
-    direction?: IDBCursorDirection;
-    limit?: number;
-    single?: boolean;
-    write?: boolean;
-}
-export declare function getQueryKey({ range, ...rest }: QueryParams): string;
+export interface QueryParams {
+    collection: string;
+    range: IDBKeyRange | IDBValidKey | undefined;
+    index?: string;
+    direction?: IDBCursorDirection;
+    limit?: number;
+    single?: boolean;
+    write?: boolean;
+}
+export declare function getQueryKey({ range, ...rest }: QueryParams): string;

package/dist/esm/queries/keys.js

@@ -1,30 +1,30 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import { hashObject } from '@verdant-web/common';
-export function getQueryKey(_a) {
-    var { range } = _a, rest = __rest(_a, ["range"]);
-    let hashedRange;
-    if (range instanceof IDBKeyRange) {
-        hashedRange = hashObject({
-            includes: range.includes,
-            lower: range.lower,
-            lowerOpen: range.lowerOpen,
-            upper: range.upper,
-            upperOpen: range.upperOpen,
-        });
-    }
-    else {
-        hashedRange = range;
-    }
-    return hashObject(Object.assign({ range: hashedRange }, rest));
-}
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { hashObject } from '@verdant-web/common';
+export function getQueryKey(_a) {
+    var { range } = _a, rest = __rest(_a, ["range"]);
+    let hashedRange;
+    if (range instanceof IDBKeyRange) {
+        hashedRange = hashObject({
+            includes: range.includes,
+            lower: range.lower,
+            lowerOpen: range.lowerOpen,
+            upper: range.upper,
+            upperOpen: range.upperOpen,
+        });
+    }
+    else {
+        hashedRange = range;
+    }
+    return hashObject(Object.assign({ range: hashedRange }, rest));
+}
 //# sourceMappingURL=keys.js.map

package/dist/esm/queries/ranges.d.ts

@@ -1,2 +1,2 @@
-import { CollectionFilter, StorageSchema } from '@verdant-web/common';
-export declare function getRange(schema: StorageSchema, collection: string, index?: CollectionFilter): IDBKeyRange | undefined;
+import { CollectionFilter, StorageSchema } from '@verdant-web/common';
+export declare function getRange(schema: StorageSchema, collection: string, index?: CollectionFilter): IDBKeyRange | undefined;

package/dist/esm/queries/ranges.js

@@ -1,66 +1,66 @@
-import { assert, createCompoundIndexValue, createLowerBoundIndexValue, createUpperBoundIndexValue, isMatchIndexFilter, isRangeIndexFilter, isSortIndexFilter, isStartsWithIndexFilter, sanitizeIndexValue, } from '@verdant-web/common';
-const matchIndexToIdbKeyRange = (filter) => {
-    return IDBKeyRange.only(sanitizeIndexValue(filter.equals));
-};
-const sortIndexToIdbKeyRange = (filter) => {
-    return undefined;
-};
-const rangeIndexToIdbKeyRange = (filter) => {
-    const lower = filter.gte || filter.gt;
-    const upper = filter.lte || filter.lt;
-    if (lower === upper) {
-        return IDBKeyRange.only(sanitizeIndexValue(lower));
-    }
-    if (!lower) {
-        return IDBKeyRange.upperBound(sanitizeIndexValue(upper), !!filter.lt);
-    }
-    else if (!upper) {
-        return IDBKeyRange.lowerBound(sanitizeIndexValue(lower), !!filter.gt);
-    }
-    else {
-        return IDBKeyRange.bound(sanitizeIndexValue(lower), sanitizeIndexValue(upper), !!filter.gt, !!filter.lt);
-    }
-};
-const compoundIndexToIdbKeyRange = (
-// FIXME:
-schema, collection, filter) => {
-    // validate the usage of the compound index:
-    // - all match fields must be contiguous at the start of the compound order
-    const indexDefinition = schema.collections[collection].compounds[filter.where];
-    assert(indexDefinition, `Index ${filter.where} does not exist on collection ${collection}`);
-    const matchedKeys = Object.keys(filter.match).sort((a, b) => indexDefinition.of.indexOf(a) - indexDefinition.of.indexOf(b));
-    for (const key of matchedKeys) {
-        if (indexDefinition.of.indexOf(key) !== matchedKeys.indexOf(key)) {
-            throw new Error(`Compound index ${filter.where} does not have ${key} at the start of its order`);
-        }
-    }
-    const matchedValues = matchedKeys.map((key) => filter.match[key]);
-    // special case: all match fields are specified - we don't need a range
-    // query, just a single key query
-    if (matchedKeys.length === indexDefinition.of.length) {
-        return IDBKeyRange.only(createCompoundIndexValue(...matchedValues));
-    }
-    // create our bounds for the matched values
-    const lower = createLowerBoundIndexValue(...matchedValues);
-    const upper = createUpperBoundIndexValue(...matchedValues);
-    return IDBKeyRange.bound(lower, upper);
-};
-function startsWithIndexToIdbKeyRange(filter) {
-    const lower = filter.startsWith;
-    const upper = filter.startsWith + '\uffff';
-    return IDBKeyRange.bound(lower, upper);
-}
-export function getRange(schema, collection, index) {
-    if (!index)
-        return undefined;
-    if (isRangeIndexFilter(index))
-        return rangeIndexToIdbKeyRange(index);
-    if (isMatchIndexFilter(index))
-        return matchIndexToIdbKeyRange(index);
-    if (isSortIndexFilter(index))
-        return sortIndexToIdbKeyRange(index);
-    if (isStartsWithIndexFilter(index))
-        return startsWithIndexToIdbKeyRange(index);
-    return compoundIndexToIdbKeyRange(schema, collection, index);
-}
+import { assert, createCompoundIndexValue, createLowerBoundIndexValue, createUpperBoundIndexValue, isMatchIndexFilter, isRangeIndexFilter, isSortIndexFilter, isStartsWithIndexFilter, sanitizeIndexValue, } from '@verdant-web/common';
+const matchIndexToIdbKeyRange = (filter) => {
+    return IDBKeyRange.only(sanitizeIndexValue(filter.equals));
+};
+const sortIndexToIdbKeyRange = (filter) => {
+    return undefined;
+};
+const rangeIndexToIdbKeyRange = (filter) => {
+    const lower = filter.gte || filter.gt;
+    const upper = filter.lte || filter.lt;
+    if (lower === upper) {
+        return IDBKeyRange.only(sanitizeIndexValue(lower));
+    }
+    if (!lower) {
+        return IDBKeyRange.upperBound(sanitizeIndexValue(upper), !!filter.lt);
+    }
+    else if (!upper) {
+        return IDBKeyRange.lowerBound(sanitizeIndexValue(lower), !!filter.gt);
+    }
+    else {
+        return IDBKeyRange.bound(sanitizeIndexValue(lower), sanitizeIndexValue(upper), !!filter.gt, !!filter.lt);
+    }
+};
+const compoundIndexToIdbKeyRange = (
+// FIXME:
+schema, collection, filter) => {
+    // validate the usage of the compound index:
+    // - all match fields must be contiguous at the start of the compound order
+    const indexDefinition = schema.collections[collection].compounds[filter.where];
+    assert(indexDefinition, `Index ${filter.where} does not exist on collection ${collection}`);
+    const matchedKeys = Object.keys(filter.match).sort((a, b) => indexDefinition.of.indexOf(a) - indexDefinition.of.indexOf(b));
+    for (const key of matchedKeys) {
+        if (indexDefinition.of.indexOf(key) !== matchedKeys.indexOf(key)) {
+            throw new Error(`Compound index ${filter.where} does not have ${key} at the start of its order`);
+        }
+    }
+    const matchedValues = matchedKeys.map((key) => filter.match[key]);
+    // special case: all match fields are specified - we don't need a range
+    // query, just a single key query
+    if (matchedKeys.length === indexDefinition.of.length) {
+        return IDBKeyRange.only(createCompoundIndexValue(...matchedValues));
+    }
+    // create our bounds for the matched values
+    const lower = createLowerBoundIndexValue(...matchedValues);
+    const upper = createUpperBoundIndexValue(...matchedValues);
+    return IDBKeyRange.bound(lower, upper);
+};
+function startsWithIndexToIdbKeyRange(filter) {
+    const lower = filter.startsWith;
+    const upper = filter.startsWith + '\uffff';
+    return IDBKeyRange.bound(lower, upper);
+}
+export function getRange(schema, collection, index) {
+    if (!index)
+        return undefined;
+    if (isRangeIndexFilter(index))
+        return rangeIndexToIdbKeyRange(index);
+    if (isMatchIndexFilter(index))
+        return matchIndexToIdbKeyRange(index);
+    if (isSortIndexFilter(index))
+        return sortIndexToIdbKeyRange(index);
+    if (isStartsWithIndexFilter(index))
+        return startsWithIndexToIdbKeyRange(index);
+    return compoundIndexToIdbKeyRange(schema, collection, index);
+}
 //# sourceMappingURL=ranges.js.map

package/dist/esm/queries/types.d.ts

@@ -1,6 +1,6 @@
-import type { FindAllQuery } from './FindAllQuery.js';
-import type { FindPageQuery } from './FindPageQuery.js';
-import type { FindOneQuery } from './FindOneQuery.js';
-import type { FindInfiniteQuery } from './FindInfiniteQuery.js';
-import type { GetQuery } from './GetQuery.js';
-export type Query<T> = FindAllQuery<T> | FindPageQuery<T> | FindOneQuery<T> | FindInfiniteQuery<T> | GetQuery<T>;
+import type { FindAllQuery } from './FindAllQuery.js';
+import type { FindPageQuery } from './FindPageQuery.js';
+import type { FindOneQuery } from './FindOneQuery.js';
+import type { FindInfiniteQuery } from './FindInfiniteQuery.js';
+import type { GetQuery } from './GetQuery.js';
+export type Query<T> = FindAllQuery<T> | FindPageQuery<T> | FindOneQuery<T> | FindInfiniteQuery<T> | GetQuery<T>;