@verdant-web/store 5.3.0 → 5.4.2
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.
- package/dist/bundle/index.js +8 -8
- package/dist/bundle/index.js.map +4 -4
- package/dist/esm/__tests__/queries.test.js +35 -0
- package/dist/esm/__tests__/queries.test.js.map +1 -1
- package/dist/esm/client/Client.js +12 -4
- package/dist/esm/client/Client.js.map +1 -1
- package/dist/esm/entities/Entity.d.ts +2 -5
- package/dist/esm/entities/Entity.js +17 -10
- package/dist/esm/entities/Entity.js.map +1 -1
- package/dist/esm/entities/EntityMetadata.js +14 -2
- package/dist/esm/entities/EntityMetadata.js.map +1 -1
- package/dist/esm/entities/EntityStore.js +1 -0
- package/dist/esm/entities/EntityStore.js.map +1 -1
- package/dist/esm/persistence/MessageCreator.js +1 -1
- package/dist/esm/persistence/MessageCreator.js.map +1 -1
- package/dist/esm/persistence/PersistenceMetadata.d.ts +6 -1
- package/dist/esm/persistence/PersistenceMetadata.js +40 -2
- package/dist/esm/persistence/PersistenceMetadata.js.map +1 -1
- package/dist/esm/persistence/PersistenceRebaser.js +1 -1
- package/dist/esm/persistence/PersistenceRebaser.js.map +1 -1
- package/dist/esm/persistence/idb/IdbService.js +1 -1
- package/dist/esm/persistence/idb/IdbService.js.map +1 -1
- package/dist/esm/persistence/idb/indexNames.d.ts +5 -0
- package/dist/esm/persistence/idb/indexNames.js +6 -0
- package/dist/esm/persistence/idb/indexNames.js.map +1 -0
- package/dist/esm/persistence/idb/metadata/IdbMetadataDb.d.ts +6 -3
- package/dist/esm/persistence/idb/metadata/IdbMetadataDb.js +33 -8
- package/dist/esm/persistence/idb/metadata/IdbMetadataDb.js.map +1 -1
- package/dist/esm/persistence/idb/metadata/openMetadataDatabase.js +5 -5
- package/dist/esm/persistence/idb/metadata/openMetadataDatabase.js.map +1 -1
- package/dist/esm/persistence/idb/queries/ranges.js +3 -4
- package/dist/esm/persistence/idb/queries/ranges.js.map +1 -1
- package/dist/esm/persistence/interfaces.d.ts +2 -0
- package/dist/esm/persistence/migration/engine.js +3 -4
- package/dist/esm/persistence/migration/engine.js.map +1 -1
- package/dist/esm/queries/BaseQuery.d.ts +6 -0
- package/dist/esm/queries/BaseQuery.js +39 -5
- package/dist/esm/queries/BaseQuery.js.map +1 -1
- package/dist/esm/queries/CollectionQueries.d.ts +8 -7
- package/dist/esm/queries/CollectionQueries.js +8 -6
- package/dist/esm/queries/CollectionQueries.js.map +1 -1
- package/dist/esm/queries/FindAllQuery.d.ts +3 -1
- package/dist/esm/queries/FindAllQuery.js +6 -4
- package/dist/esm/queries/FindAllQuery.js.map +1 -1
- package/dist/esm/queries/FindInfiniteQuery.js +6 -6
- package/dist/esm/queries/FindInfiniteQuery.js.map +1 -1
- package/dist/esm/queries/FindOneQuery.js +3 -3
- package/dist/esm/queries/FindOneQuery.js.map +1 -1
- package/dist/esm/queries/FindPageQuery.js +3 -3
- package/dist/esm/queries/FindPageQuery.js.map +1 -1
- package/dist/esm/queries/GetQuery.js +1 -1
- package/dist/esm/queries/GetQuery.js.map +1 -1
- package/dist/esm/queries/QueryCache.d.ts +4 -1
- package/dist/esm/queries/QueryCache.js +15 -1
- package/dist/esm/queries/QueryCache.js.map +1 -1
- package/dist/esm/queries/diagnostics.d.ts +19 -0
- package/dist/esm/queries/diagnostics.js +11 -0
- package/dist/esm/queries/diagnostics.js.map +1 -0
- package/dist/esm/queries/ranges.js +3 -4
- package/dist/esm/queries/ranges.js.map +1 -1
- package/dist/esm/sync/WebSocketSync.js +4 -2
- package/dist/esm/sync/WebSocketSync.js.map +1 -1
- package/package.json +7 -2
- package/src/__tests__/queries.test.ts +42 -0
- package/src/client/Client.ts +15 -4
- package/src/entities/Entity.ts +31 -22
- package/src/entities/EntityMetadata.ts +15 -3
- package/src/entities/EntityStore.ts +1 -0
- package/src/persistence/MessageCreator.ts +1 -1
- package/src/persistence/PersistenceMetadata.ts +67 -7
- package/src/persistence/PersistenceRebaser.ts +1 -1
- package/src/persistence/idb/IdbService.ts +1 -1
- package/src/persistence/idb/indexNames.ts +5 -0
- package/src/persistence/idb/metadata/IdbMetadataDb.ts +71 -14
- package/src/persistence/idb/metadata/openMetadataDatabase.ts +15 -7
- package/src/persistence/idb/queries/ranges.ts +2 -3
- package/src/persistence/interfaces.ts +5 -1
- package/src/persistence/migration/engine.ts +3 -4
- package/src/queries/BaseQuery.ts +41 -5
- package/src/queries/CollectionQueries.ts +12 -9
- package/src/queries/FindAllQuery.ts +14 -7
- package/src/queries/FindInfiniteQuery.ts +22 -18
- package/src/queries/FindOneQuery.ts +9 -7
- package/src/queries/FindPageQuery.ts +11 -9
- package/src/queries/GetQuery.ts +1 -1
- package/src/queries/QueryCache.ts +19 -2
- package/src/queries/diagnostics.ts +32 -0
- package/src/queries/ranges.ts +2 -3
- package/src/sync/WebSocketSync.ts +2 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ranges.js","sourceRoot":"","sources":["../../../../../src/persistence/idb/queries/ranges.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,MAAM,EAGN,wBAAwB,EACxB,0BAA0B,EAC1B,0BAA0B,EAC1B,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,EAGvB,kBAAkB,GAIlB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,uBAAuB,GAAG,CAAC,MAAkC,EAAE,EAAE;IACtE,OAAO,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,MAAuB,EAAE,EAAE;IAC1D,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,MAAkC,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;IACtC,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACrB,OAAO,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;SAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACP,OAAO,WAAW,CAAC,KAAK,CACvB,kBAAkB,CAAC,KAAK,CAAC,EACzB,kBAAkB,CAAC,KAAK,CAAC,EACzB,CAAC,CAAC,MAAM,CAAC,EAAE,EACX,CAAC,CAAC,MAAM,CAAC,EAAE,CACX,CAAC;IACH,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG
|
|
1
|
+
{"version":3,"file":"ranges.js","sourceRoot":"","sources":["../../../../../src/persistence/idb/queries/ranges.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,MAAM,EAGN,wBAAwB,EACxB,0BAA0B,EAC1B,0BAA0B,EAC1B,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,EAGvB,kBAAkB,GAIlB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,uBAAuB,GAAG,CAAC,MAAkC,EAAE,EAAE;IACtE,OAAO,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,MAAuB,EAAE,EAAE;IAC1D,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,MAAkC,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;IACtC,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACrB,OAAO,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;SAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACP,OAAO,WAAW,CAAC,KAAK,CACvB,kBAAkB,CAAC,KAAK,CAAC,EACzB,kBAAkB,CAAC,KAAK,CAAC,EACzB,CAAC,CAAC,MAAM,CAAC,EAAE,EACX,CAAC,CAAC,MAAM,CAAC,EAAE,CACX,CAAC;IACH,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAClC,MAAqB,EACrB,UAAkB,EAClB,MAAqC,EACpC,EAAE;;IACH,4CAA4C;IAC5C,2EAA2E;IAC3E,MAAM,eAAe,GACpB,MAAA,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,SAAS,0CAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,CACL,eAAe,EACf,SAAS,MAAM,CAAC,KAAK,iCAAiC,UAAU,EAAE,CAClE,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CACvE,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC/B,IAAI,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,KAAK,CACd,kBAAkB,MAAM,CAAC,KAAK,kBAAkB,GAAG,4BAA4B,CAC/E,CAAC;QACH,CAAC;IACF,CAAC;IAED,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CACpC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAgC,CAAoB,CAC1E,CAAC;IAEF,uEAAuE;IACvE,iCAAiC;IACjC,IAAI,WAAW,CAAC,MAAM,KAAK,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;QACtD,OAAO,WAAW,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,2CAA2C;IAC3C,MAAM,KAAK,GAAG,0BAA0B,CAAC,GAAG,aAAa,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,0BAA0B,CAAC,GAAG,aAAa,CAAC,CAAC;IAC3D,OAAO,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,SAAS,4BAA4B,CAAC,MAA6B;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;IAChC,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC;IAC3C,OAAO,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,QAAQ,CACvB,MAAqB,EACrB,UAAkB,EAClB,KAAwB;IAExB,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,IAAI,kBAAkB,CAAC,KAAK,CAAC;QAAE,OAAO,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACrE,IAAI,kBAAkB,CAAC,KAAK,CAAC;QAAE,OAAO,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACrE,IAAI,iBAAiB,CAAC,KAAK,CAAC;QAAE,OAAO,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACnE,IAAI,uBAAuB,CAAC,KAAK,CAAC;QACjC,OAAO,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAC5C,OAAO,0BAA0B,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -51,6 +51,7 @@ export interface PersistenceMetadataDb<Tx extends AbstractTransaction = Abstract
|
|
|
51
51
|
}): Promise<void>;
|
|
52
52
|
iterateEntityOperations(oid: string, iterator: Iterator<ClientOperation>, opts?: CommonQueryOptions<Tx> & {
|
|
53
53
|
to?: string | null;
|
|
54
|
+
reverse?: boolean;
|
|
54
55
|
}): Promise<void>;
|
|
55
56
|
iterateCollectionOperations(collection: string, iterator: Iterator<ClientOperation>, opts?: CommonQueryOptions<Tx>): Promise<void>;
|
|
56
57
|
iterateLocalOperations(iterator: Iterator<ClientOperation>, opts?: CommonQueryOptions<Tx> & {
|
|
@@ -69,6 +70,7 @@ export interface PersistenceMetadataDb<Tx extends AbstractTransaction = Abstract
|
|
|
69
70
|
* @returns a list of all document (root) OIDs affected by the adds.
|
|
70
71
|
*/
|
|
71
72
|
addOperations(ops: ClientOperation[], opts?: CommonQueryOptions<Tx>): Promise<ObjectIdentifier[]>;
|
|
73
|
+
purgeDocumentData(oid: ObjectIdentifier, opts?: CommonQueryOptions<Tx>): Promise<void>;
|
|
72
74
|
reset(opts?: {
|
|
73
75
|
clearReplica?: boolean;
|
|
74
76
|
transaction?: Tx;
|
|
@@ -100,10 +100,9 @@ export async function getMigrationEngine({ migration, context, ns, meta, }) {
|
|
|
100
100
|
await Promise.all(docs.filter(Boolean).map(async (doc) => {
|
|
101
101
|
const rootOid = getOid(doc);
|
|
102
102
|
assert(!!rootOid, `Document is missing an OID: ${JSON.stringify(doc)}`);
|
|
103
|
-
//
|
|
104
|
-
//
|
|
105
|
-
//
|
|
106
|
-
// lower to retain access to lower level data here?
|
|
103
|
+
// while querying again for data we already discarded in the findAll
|
|
104
|
+
// above isn't ideal, in practice the get authz method is
|
|
105
|
+
// fairly quick because it short-circuits.
|
|
107
106
|
const authz = await meta.getDocumentAuthz(rootOid);
|
|
108
107
|
const original = cloneDeep(doc);
|
|
109
108
|
// @ts-ignore - excessive type resolution
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../../src/persistence/migration/engine.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../../../src/persistence/migration/engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Context } from '../context/context.js';
|
|
2
2
|
import { Disposable } from '../utils/Disposable.js';
|
|
3
|
+
import { QueryDiagnostic } from './diagnostics.js';
|
|
3
4
|
export type BaseQueryEvents = {
|
|
4
5
|
change: (value: any) => void;
|
|
5
6
|
statusChange: (status: QueryStatus) => void;
|
|
@@ -22,10 +23,12 @@ export declare abstract class BaseQuery<T> extends Disposable {
|
|
|
22
23
|
private _allUnsubscribedHandler?;
|
|
23
24
|
private _status;
|
|
24
25
|
private _executionPromise;
|
|
26
|
+
private _timing;
|
|
25
27
|
protected context: Context;
|
|
26
28
|
readonly collection: string;
|
|
27
29
|
readonly key: string;
|
|
28
30
|
readonly isListQuery: boolean;
|
|
31
|
+
readonly type: string;
|
|
29
32
|
constructor({ initial, context, collection, key, shouldUpdate, }: BaseQueryOptions<T>);
|
|
30
33
|
get current(): T;
|
|
31
34
|
get resolved(): Promise<T>;
|
|
@@ -51,6 +54,9 @@ export declare abstract class BaseQuery<T> extends Disposable {
|
|
|
51
54
|
protected refreshValue: () => void;
|
|
52
55
|
private subscribeToDeleteAndRestore;
|
|
53
56
|
execute: () => Promise<T>;
|
|
57
|
+
protected measureSweep: <V>(work: () => Promise<V>) => Promise<V>;
|
|
58
|
+
protected measureHydration: <V>(work: () => Promise<V>) => Promise<V>;
|
|
59
|
+
getDiagnostic: (active: boolean) => QueryDiagnostic;
|
|
54
60
|
protected abstract run(): Promise<void>;
|
|
55
61
|
[ON_ALL_UNSUBSCRIBED]: (handler: (query: BaseQuery<T>) => void) => void;
|
|
56
62
|
get __rawValue(): T;
|
|
@@ -2,6 +2,7 @@ var _a;
|
|
|
2
2
|
import { EventSubscriber } from '@verdant-web/common';
|
|
3
3
|
import { Entity } from '../entities/Entity.js';
|
|
4
4
|
import { Disposable } from '../utils/Disposable.js';
|
|
5
|
+
import { getDiagnosticResult } from './diagnostics.js';
|
|
5
6
|
import { filterResultSet } from './utils.js';
|
|
6
7
|
export const ON_ALL_UNSUBSCRIBED = Symbol('ON_ALL_UNSUBSCRIBED');
|
|
7
8
|
export const UPDATE = Symbol('UPDATE');
|
|
@@ -16,6 +17,11 @@ export class BaseQuery extends Disposable {
|
|
|
16
17
|
this._internalUnsubscribes = [];
|
|
17
18
|
this._status = 'initial';
|
|
18
19
|
this._executionPromise = null;
|
|
20
|
+
this._timing = {
|
|
21
|
+
sweep: null,
|
|
22
|
+
hydration: null,
|
|
23
|
+
total: null,
|
|
24
|
+
};
|
|
19
25
|
this.setValue = (value) => {
|
|
20
26
|
this._rawValue = value;
|
|
21
27
|
this.subscribeToDeleteAndRestore(this._rawValue);
|
|
@@ -74,8 +80,8 @@ export class BaseQuery extends Disposable {
|
|
|
74
80
|
}
|
|
75
81
|
};
|
|
76
82
|
this.execute = () => {
|
|
77
|
-
const startTime =
|
|
78
|
-
this.context.log('debug',
|
|
83
|
+
const startTime = performance.now();
|
|
84
|
+
this.context.log('debug', 'Executing query', this.key);
|
|
79
85
|
if (this.status === 'initial') {
|
|
80
86
|
this.status = 'initializing';
|
|
81
87
|
}
|
|
@@ -99,12 +105,39 @@ export class BaseQuery extends Disposable {
|
|
|
99
105
|
}
|
|
100
106
|
})
|
|
101
107
|
.finally(() => {
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
this.context.log('debug',
|
|
108
|
+
const duration = performance.now() - startTime;
|
|
109
|
+
this._timing.total = duration;
|
|
110
|
+
this.context.log('debug', 'Query executed', this.key, `Duration: ${duration}ms`);
|
|
105
111
|
});
|
|
106
112
|
return this._executionPromise;
|
|
107
113
|
};
|
|
114
|
+
this.measureSweep = async (work) => {
|
|
115
|
+
const start = performance.now();
|
|
116
|
+
try {
|
|
117
|
+
return await work();
|
|
118
|
+
}
|
|
119
|
+
finally {
|
|
120
|
+
this._timing.sweep = performance.now() - start;
|
|
121
|
+
}
|
|
122
|
+
};
|
|
123
|
+
this.measureHydration = async (work) => {
|
|
124
|
+
const start = performance.now();
|
|
125
|
+
try {
|
|
126
|
+
return await work();
|
|
127
|
+
}
|
|
128
|
+
finally {
|
|
129
|
+
this._timing.hydration = performance.now() - start;
|
|
130
|
+
}
|
|
131
|
+
};
|
|
132
|
+
this.getDiagnostic = (active) => ({
|
|
133
|
+
key: this.key,
|
|
134
|
+
collection: this.collection,
|
|
135
|
+
type: this.type,
|
|
136
|
+
status: this.status,
|
|
137
|
+
active,
|
|
138
|
+
result: getDiagnosticResult(this.current),
|
|
139
|
+
timing: Object.assign({}, this._timing),
|
|
140
|
+
});
|
|
108
141
|
this[_a] = (handler) => {
|
|
109
142
|
this._allUnsubscribedHandler = handler;
|
|
110
143
|
};
|
|
@@ -120,6 +153,7 @@ export class BaseQuery extends Disposable {
|
|
|
120
153
|
this.context = context;
|
|
121
154
|
this.key = key;
|
|
122
155
|
this.collection = collection;
|
|
156
|
+
this.type = this.constructor.name;
|
|
123
157
|
const shouldUpdateFn = shouldUpdate ||
|
|
124
158
|
((collections) => collections.includes(collection));
|
|
125
159
|
this.addDispose(this.context.entityEvents.subscribe('collectionsChanged', (collections) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseQuery.js","sourceRoot":"","sources":["../../../src/queries/BaseQuery.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAiB7C,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AACjE,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEvC,kCAAkC;AAClC,yEAAyE;AACzE,0FAA0F;AAC1F,wDAAwD;AACxD,IAAI;AAEJ,MAAM,OAAgB,SAAa,SAAQ,UAAU;
|
|
1
|
+
{"version":3,"file":"BaseQuery.js","sourceRoot":"","sources":["../../../src/queries/BaseQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { AuthorizationKey, CollectionFilter } from '@verdant-web/common';
|
|
2
2
|
import { Context } from '../context/context.js';
|
|
3
|
+
import { DocumentManager } from '../entities/DocumentManager.js';
|
|
3
4
|
import { EntityStore } from '../entities/EntityStore.js';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
5
|
+
import { ObjectEntity } from '../index.js';
|
|
6
|
+
import { FindAllQuery } from './FindAllQuery.js';
|
|
7
|
+
import { FindInfiniteQuery } from './FindInfiniteQuery.js';
|
|
6
8
|
import { FindOneQuery } from './FindOneQuery.js';
|
|
7
9
|
import { FindPageQuery } from './FindPageQuery.js';
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import { DocumentManager } from '../entities/DocumentManager.js';
|
|
11
|
-
import { ObjectEntity } from '../index.js';
|
|
10
|
+
import { GetQuery } from './GetQuery.js';
|
|
11
|
+
import { QueryCache } from './QueryCache.js';
|
|
12
12
|
export declare class CollectionQueries<T extends ObjectEntity<any, any>, Init, Filter extends CollectionFilter> {
|
|
13
13
|
private cache;
|
|
14
14
|
private collection;
|
|
@@ -43,9 +43,10 @@ export declare class CollectionQueries<T extends ObjectEntity<any, any>, Init, F
|
|
|
43
43
|
index?: Filter;
|
|
44
44
|
key?: string;
|
|
45
45
|
}) => FindOneQuery<T>;
|
|
46
|
-
findAll: ({ index, key: providedKey, }?: {
|
|
46
|
+
findAll: ({ index, key: providedKey, limit, }?: {
|
|
47
47
|
index?: Filter;
|
|
48
48
|
key?: string;
|
|
49
|
+
limit?: number;
|
|
49
50
|
}) => FindAllQuery<T>;
|
|
50
51
|
findPage: ({ index, pageSize, page, key: providedKey, }: {
|
|
51
52
|
index?: Filter;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { hashObject, } from '@verdant-web/common';
|
|
2
|
-
import {
|
|
2
|
+
import { UPDATE } from './BaseQuery.js';
|
|
3
|
+
import { FindAllQuery } from './FindAllQuery.js';
|
|
4
|
+
import { FindInfiniteQuery } from './FindInfiniteQuery.js';
|
|
3
5
|
import { FindOneQuery } from './FindOneQuery.js';
|
|
4
6
|
import { FindPageQuery } from './FindPageQuery.js';
|
|
5
|
-
import {
|
|
6
|
-
import { FindAllQuery } from './FindAllQuery.js';
|
|
7
|
-
import { UPDATE } from './BaseQuery.js';
|
|
7
|
+
import { GetQuery } from './GetQuery.js';
|
|
8
8
|
export class CollectionQueries {
|
|
9
9
|
constructor({ collection, cache, entities, context, documentManager, }) {
|
|
10
10
|
this.serializeIndex = (index) => {
|
|
@@ -34,14 +34,16 @@ export class CollectionQueries {
|
|
|
34
34
|
existing[UPDATE](index);
|
|
35
35
|
});
|
|
36
36
|
};
|
|
37
|
-
this.findAll = ({ index, key: providedKey, } = {}) => {
|
|
38
|
-
const key = providedKey ||
|
|
37
|
+
this.findAll = ({ index, key: providedKey, limit, } = {}) => {
|
|
38
|
+
const key = providedKey ||
|
|
39
|
+
`findAll:${this.collection}:${limit}:${this.serializeIndex(index)}`;
|
|
39
40
|
return this.cache.getOrSet(key, () => new FindAllQuery({
|
|
40
41
|
index,
|
|
41
42
|
collection: this.collection,
|
|
42
43
|
hydrate: this.hydrate,
|
|
43
44
|
context: this.context,
|
|
44
45
|
key,
|
|
46
|
+
limit,
|
|
45
47
|
}), (existing) => {
|
|
46
48
|
existing[UPDATE](index);
|
|
47
49
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollectionQueries.js","sourceRoot":"","sources":["../../../src/queries/CollectionQueries.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,UAAU,GACV,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"CollectionQueries.js","sourceRoot":"","sources":["../../../src/queries/CollectionQueries.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,11 @@ import { BaseQuery, BaseQueryOptions, UPDATE } from './BaseQuery.js';
|
|
|
3
3
|
export declare class FindAllQuery<T> extends BaseQuery<T[]> {
|
|
4
4
|
private index;
|
|
5
5
|
private hydrate;
|
|
6
|
-
|
|
6
|
+
private limit;
|
|
7
|
+
constructor({ index, hydrate, limit, ...rest }: {
|
|
7
8
|
index?: CollectionFilter;
|
|
8
9
|
hydrate: (oid: string) => Promise<T>;
|
|
10
|
+
limit?: number;
|
|
9
11
|
} & Omit<BaseQueryOptions<T[]>, 'initial'>);
|
|
10
12
|
protected run: () => Promise<void>;
|
|
11
13
|
[UPDATE]: (index: CollectionFilter | undefined) => void;
|
|
@@ -14,15 +14,16 @@ import { BaseQuery, UPDATE } from './BaseQuery.js';
|
|
|
14
14
|
import { areIndexesEqual } from './utils.js';
|
|
15
15
|
export class FindAllQuery extends BaseQuery {
|
|
16
16
|
constructor(_b) {
|
|
17
|
-
var { index, hydrate } = _b, rest = __rest(_b, ["index", "hydrate"]);
|
|
17
|
+
var { index, hydrate, limit } = _b, rest = __rest(_b, ["index", "hydrate", "limit"]);
|
|
18
18
|
super(Object.assign({ initial: [] }, rest));
|
|
19
19
|
this.run = async () => {
|
|
20
|
-
const { result: oids } = await (await this.context.documents).findAllOids({
|
|
20
|
+
const { result: oids } = await this.measureSweep(async () => (await this.context.documents).findAllOids({
|
|
21
21
|
collection: this.collection,
|
|
22
22
|
index: this.index,
|
|
23
|
-
|
|
23
|
+
limit: this.limit,
|
|
24
|
+
}));
|
|
24
25
|
this.context.log('debug', `FindAllQuery: ${oids.length} oids found: ${oids}`);
|
|
25
|
-
this.setValue(await Promise.all(oids.map(this.hydrate)));
|
|
26
|
+
this.setValue(await this.measureHydration(() => Promise.all(oids.map(this.hydrate))));
|
|
26
27
|
};
|
|
27
28
|
this[_a] = (index) => {
|
|
28
29
|
if (areIndexesEqual(this.index, index))
|
|
@@ -30,6 +31,7 @@ export class FindAllQuery extends BaseQuery {
|
|
|
30
31
|
this.index = index;
|
|
31
32
|
this.execute();
|
|
32
33
|
};
|
|
34
|
+
this.limit = limit;
|
|
33
35
|
this.index = index;
|
|
34
36
|
this.hydrate = hydrate;
|
|
35
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FindAllQuery.js","sourceRoot":"","sources":["../../../src/queries/FindAllQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,YAAgB,SAAQ,SAAc;
|
|
1
|
+
{"version":3,"file":"FindAllQuery.js","sourceRoot":"","sources":["../../../src/queries/FindAllQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,YAAgB,SAAQ,SAAc;IAKlD,YAAY,EAS8B;YAT9B,EACX,KAAK,EACL,OAAO,EACP,KAAK,OAMoC,EALtC,IAAI,cAJI,6BAKX,CADO;QAMP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAMM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAC3D,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC;gBAC1C,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CACF,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,GAAG,CACf,OAAO,EACP,iBAAiB,IAAI,CAAC,MAAM,gBAAgB,IAAI,EAAE,CAClD,CAAC;YACF,IAAI,CAAC,QAAQ,CACZ,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACtE,CAAC;QACH,CAAC,CAAC;QAEF,QAAQ,GAAG,CAAC,KAAmC,EAAE,EAAE;YAClD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,OAAO;YAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC;QA1BD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAwBD;KALC,MAAM"}
|
|
@@ -25,27 +25,27 @@ export class FindInfiniteQuery extends BaseQuery {
|
|
|
25
25
|
this._upToPage = 1;
|
|
26
26
|
this._hasNextPage = false;
|
|
27
27
|
this.run = async () => {
|
|
28
|
-
const { result, hasNextPage } = await (await this.context.documents).findAllOids({
|
|
28
|
+
const { result, hasNextPage } = await this.measureSweep(async () => (await this.context.documents).findAllOids({
|
|
29
29
|
collection: this.collection,
|
|
30
30
|
limit: this._pageSize * this._upToPage,
|
|
31
31
|
offset: 0,
|
|
32
32
|
index: this.index,
|
|
33
|
-
});
|
|
33
|
+
}));
|
|
34
34
|
this._hasNextPage = hasNextPage;
|
|
35
|
-
this.setValue(await Promise.all(result.map(this.hydrate)));
|
|
35
|
+
this.setValue(await this.measureHydration(() => Promise.all(result.map(this.hydrate))));
|
|
36
36
|
};
|
|
37
37
|
this.loadMore = async () => {
|
|
38
|
-
const { result, hasNextPage } = await (await this.context.documents).findAllOids({
|
|
38
|
+
const { result, hasNextPage } = await this.measureSweep(async () => (await this.context.documents).findAllOids({
|
|
39
39
|
collection: this.collection,
|
|
40
40
|
limit: this._pageSize,
|
|
41
41
|
offset: this._pageSize * this._upToPage,
|
|
42
42
|
index: this.index,
|
|
43
|
-
});
|
|
43
|
+
}));
|
|
44
44
|
this._hasNextPage = hasNextPage;
|
|
45
45
|
this._upToPage++;
|
|
46
46
|
this.setValue([
|
|
47
47
|
...this.current,
|
|
48
|
-
...(await Promise.all(result.map(this.hydrate))),
|
|
48
|
+
...(await this.measureHydration(() => Promise.all(result.map(this.hydrate)))),
|
|
49
49
|
]);
|
|
50
50
|
};
|
|
51
51
|
this[_a] = (index) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FindInfiniteQuery.js","sourceRoot":"","sources":["../../../src/queries/FindInfiniteQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,iBAAqB,SAAQ,SAAc;IAOvD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,YAAY,EAS8B;YAT9B,EACX,OAAO,EACP,QAAQ,EACR,KAAK,OAMoC,EALtC,IAAI,cAJI,gCAKX,CADO;QAMP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAzBI,cAAS,GAAG,CAAC,CAAC;QAEd,iBAAY,GAAY,KAAK,CAAC;QA6B5B,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"FindInfiniteQuery.js","sourceRoot":"","sources":["../../../src/queries/FindInfiniteQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,iBAAqB,SAAQ,SAAc;IAOvD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,YAAY,EAS8B;YAT9B,EACX,OAAO,EACP,QAAQ,EACR,KAAK,OAMoC,EALtC,IAAI,cAJI,gCAKX,CADO;QAMP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAzBI,cAAS,GAAG,CAAC,CAAC;QAEd,iBAAY,GAAY,KAAK,CAAC;QA6B5B,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAClE,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC;gBAC1C,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;gBACtC,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CACF,CAAC;YACF,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;YAChC,IAAI,CAAC,QAAQ,CACZ,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACxE,CAAC;QACH,CAAC,CAAC;QAEK,aAAQ,GAAG,KAAK,IAAI,EAAE;YAC5B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAClE,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC;gBAC1C,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,SAAS;gBACrB,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;gBACvC,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CACF,CAAC;YACF,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;YAChC,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC;gBACb,GAAG,IAAI,CAAC,OAAO;gBACf,GAAG,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CACpC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CACrC,CAAC;aACF,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,QAAQ,GAAG,CAAC,KAAmC,EAAE,EAAE;YAClD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,OAAO;YAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC;QA3CD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC3B,CAAC;CAyCD;KALC,MAAM"}
|
|
@@ -17,11 +17,11 @@ export class FindOneQuery extends BaseQuery {
|
|
|
17
17
|
var { index, hydrate } = _b, rest = __rest(_b, ["index", "hydrate"]);
|
|
18
18
|
super(Object.assign({ initial: null }, rest));
|
|
19
19
|
this.run = async () => {
|
|
20
|
-
const oid = await (await this.context.documents).findOneOid({
|
|
20
|
+
const oid = await this.measureSweep(async () => (await this.context.documents).findOneOid({
|
|
21
21
|
collection: this.collection,
|
|
22
22
|
index: this.index,
|
|
23
|
-
});
|
|
24
|
-
this.setValue(oid ? await this.hydrate(oid) : null);
|
|
23
|
+
}));
|
|
24
|
+
this.setValue(oid ? await this.measureHydration(() => this.hydrate(oid)) : null);
|
|
25
25
|
};
|
|
26
26
|
this[_a] = (index) => {
|
|
27
27
|
if (areIndexesEqual(this.index, index))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FindOneQuery.js","sourceRoot":"","sources":["../../../src/queries/FindOneQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,YAAgB,SAAQ,SAAmB;IAIvD,YAAY,EAOmC;YAPnC,EACX,KAAK,EACL,OAAO,OAKuC,EAJ3C,IAAI,cAHI,oBAIX,CADO;QAKP,KAAK,iBACJ,OAAO,EAAE,IAAI,IACV,IAAI,EACN,CAAC;QAKM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,GAAG,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"FindOneQuery.js","sourceRoot":"","sources":["../../../src/queries/FindOneQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,YAAgB,SAAQ,SAAmB;IAIvD,YAAY,EAOmC;YAPnC,EACX,KAAK,EACL,OAAO,OAKuC,EAJ3C,IAAI,cAHI,oBAIX,CADO;QAKP,KAAK,iBACJ,OAAO,EAAE,IAAI,IACV,IAAI,EACN,CAAC;QAKM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAC9C,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC;gBACzC,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CACF,CAAC;YACF,IAAI,CAAC,QAAQ,CACZ,GAAG,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACjE,CAAC;QACH,CAAC,CAAC;QAEF,QAAQ,GAAG,CAAC,KAAmC,EAAE,EAAE;YAClD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,OAAO;YAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC;QApBD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAmBD;KALC,MAAM"}
|
|
@@ -30,14 +30,14 @@ export class FindPageQuery extends BaseQuery {
|
|
|
30
30
|
super(Object.assign({ initial: [] }, rest));
|
|
31
31
|
this._hasNextPage = false;
|
|
32
32
|
this.run = async () => {
|
|
33
|
-
const { result, hasNextPage } = await (await this.context.documents).findAllOids({
|
|
33
|
+
const { result, hasNextPage } = await this.measureSweep(async () => (await this.context.documents).findAllOids({
|
|
34
34
|
collection: this.collection,
|
|
35
35
|
index: this.index,
|
|
36
36
|
limit: this._pageSize,
|
|
37
37
|
offset: this._page * this._pageSize,
|
|
38
|
-
});
|
|
38
|
+
}));
|
|
39
39
|
this._hasNextPage = hasNextPage;
|
|
40
|
-
this.setValue(await Promise.all(result.map(this.hydrate)));
|
|
40
|
+
this.setValue(await this.measureHydration(() => Promise.all(result.map(this.hydrate))));
|
|
41
41
|
};
|
|
42
42
|
this.nextPage = async () => {
|
|
43
43
|
if (!this.hasNextPage)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FindPageQuery.js","sourceRoot":"","sources":["../../../src/queries/FindPageQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,aAAiB,SAAQ,SAAc;IAOnD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,YAAY,EAW8B;YAX9B,EACX,KAAK,EACL,OAAO,EACP,QAAQ,EACR,IAAI,OAOqC,EANtC,IAAI,cALI,wCAMX,CADO;QAOP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAjCI,iBAAY,GAAY,KAAK,CAAC;QAwC5B,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"FindPageQuery.js","sourceRoot":"","sources":["../../../src/queries/FindPageQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAoB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,aAAiB,SAAQ,SAAc;IAOnD,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,YAAY,EAW8B;YAX9B,EACX,KAAK,EACL,OAAO,EACP,QAAQ,EACR,IAAI,OAOqC,EANtC,IAAI,cALI,wCAMX,CADO;QAOP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAjCI,iBAAY,GAAY,KAAK,CAAC;QAwC5B,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAClE,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC;gBAC1C,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,IAAI,CAAC,SAAS;gBACrB,MAAM,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS;aACnC,CAAC,CACF,CAAC;YACF,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;YAChC,IAAI,CAAC,QAAQ,CACZ,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACxE,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAG,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,WAAW;gBAAE,OAAO;YAE9B,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC,CAAC;QAEF,iBAAY,GAAG,KAAK,IAAI,EAAE;YACzB,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC;gBAAE,OAAO;YAE7B,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC,CAAC;QAEF,YAAO,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;YAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC,CAAC;QAEF,QAAQ,GAAG,CAAC,KAAmC,EAAE,EAAE;YAClD,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,OAAO;YAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC;QA5CD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACnB,CAAC;CAyCD;KALC,MAAM"}
|
|
@@ -16,7 +16,7 @@ export class GetQuery extends BaseQuery {
|
|
|
16
16
|
var { id, hydrate } = _a, rest = __rest(_a, ["id", "hydrate"]);
|
|
17
17
|
super(Object.assign({ initial: null }, rest));
|
|
18
18
|
this.run = async () => {
|
|
19
|
-
const value = await this.hydrate(this.oid);
|
|
19
|
+
const value = await this.measureHydration(() => this.hydrate(this.oid));
|
|
20
20
|
this.setValue(value);
|
|
21
21
|
};
|
|
22
22
|
this.oid = createOid(rest.collection, id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetQuery.js","sourceRoot":"","sources":["../../../src/queries/GetQuery.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAoB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,OAAO,QAAY,SAAQ,SAAmB;IAInD,YAAY,EAOmC;YAPnC,EACX,EAAE,EACF,OAAO,OAKuC,EAJ3C,IAAI,cAHI,iBAIX,CADO;QAKP,KAAK,iBACJ,OAAO,EAAE,IAAI,IACV,IAAI,EACN,CAAC;QAKM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"GetQuery.js","sourceRoot":"","sources":["../../../src/queries/GetQuery.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAoB,MAAM,gBAAgB,CAAC;AAE7D,MAAM,OAAO,QAAY,SAAQ,SAAmB;IAInD,YAAY,EAOmC;YAPnC,EACX,EAAE,EACF,OAAO,OAKuC,EAJ3C,IAAI,cAHI,iBAIX,CADO;QAKP,KAAK,iBACJ,OAAO,EAAE,IAAI,IACV,IAAI,EACN,CAAC;QAKM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACxE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC;QAPD,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAMD"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { Context } from '../context/context.js';
|
|
2
2
|
import { Disposable } from '../utils/Disposable.js';
|
|
3
3
|
import { BaseQuery } from './BaseQuery.js';
|
|
4
|
+
import { QueryDiagnostics } from './diagnostics.js';
|
|
4
5
|
export declare class QueryCache extends Disposable {
|
|
5
6
|
private _cache;
|
|
6
7
|
private _evictionTime;
|
|
7
8
|
private context;
|
|
8
9
|
/** A set of query keys to keep alive even if they unsubscribe */
|
|
9
10
|
private _holds;
|
|
11
|
+
private _inactiveDiagnostics;
|
|
10
12
|
constructor({ evictionTime, context, }: {
|
|
11
13
|
evictionTime?: number;
|
|
12
14
|
context: Context;
|
|
@@ -14,6 +16,7 @@ export declare class QueryCache extends Disposable {
|
|
|
14
16
|
get activeKeys(): string[];
|
|
15
17
|
get<T extends BaseQuery<any>>(key: string): T | null;
|
|
16
18
|
set<V extends BaseQuery<any>>(value: V): V;
|
|
19
|
+
get diagnostics(): QueryDiagnostics;
|
|
17
20
|
getOrSet<V extends BaseQuery<any>>(key: string, create: () => V, update?: (query: V) => void): V;
|
|
18
21
|
private enqueueQueryEviction;
|
|
19
22
|
dropAll: () => void;
|
|
@@ -22,4 +25,4 @@ export declare class QueryCache extends Disposable {
|
|
|
22
25
|
dropKeepAlive(key: string): void;
|
|
23
26
|
get keepAlives(): Set<string>;
|
|
24
27
|
}
|
|
25
|
-
export type PublicQueryCacheAPI = Pick<QueryCache, 'keepAlive' | 'dropKeepAlive' | 'keepAlives' | 'forceRefreshAll' | 'activeKeys'>;
|
|
28
|
+
export type PublicQueryCacheAPI = Pick<QueryCache, 'keepAlive' | 'dropKeepAlive' | 'keepAlives' | 'forceRefreshAll' | 'activeKeys' | 'diagnostics'>;
|
|
@@ -6,6 +6,7 @@ export class QueryCache extends Disposable {
|
|
|
6
6
|
this._cache = new Map();
|
|
7
7
|
/** A set of query keys to keep alive even if they unsubscribe */
|
|
8
8
|
this._holds = new Set();
|
|
9
|
+
this._inactiveDiagnostics = new Map();
|
|
9
10
|
this.enqueueQueryEviction = (query) => {
|
|
10
11
|
setTimeout(() => {
|
|
11
12
|
if (query.subscribed)
|
|
@@ -18,13 +19,17 @@ export class QueryCache extends Disposable {
|
|
|
18
19
|
// got a different version of this query.
|
|
19
20
|
if (this._cache.get(query.key) === query) {
|
|
20
21
|
this._cache.delete(query.key);
|
|
22
|
+
this._inactiveDiagnostics.set(query.key, query.getDiagnostic(false));
|
|
21
23
|
this.context.log('debug', 'QueryCache: evicted query', query.key);
|
|
22
24
|
}
|
|
23
25
|
}, this._evictionTime);
|
|
24
26
|
};
|
|
25
27
|
this.dropAll = () => {
|
|
26
28
|
this.context.log('debug', 'QueryCache: drop all', this._cache.size, 'queries');
|
|
27
|
-
this._cache.forEach((query) =>
|
|
29
|
+
this._cache.forEach((query) => {
|
|
30
|
+
this._inactiveDiagnostics.set(query.key, query.getDiagnostic(false));
|
|
31
|
+
query.dispose();
|
|
32
|
+
});
|
|
28
33
|
this._cache.clear();
|
|
29
34
|
};
|
|
30
35
|
this.forceRefreshAll = () => {
|
|
@@ -43,6 +48,7 @@ export class QueryCache extends Disposable {
|
|
|
43
48
|
}
|
|
44
49
|
set(value) {
|
|
45
50
|
this._cache.set(value.key, value);
|
|
51
|
+
this._inactiveDiagnostics.delete(value.key);
|
|
46
52
|
value[ON_ALL_UNSUBSCRIBED](this.enqueueQueryEviction);
|
|
47
53
|
// immediately enqueue a check to see if this query should be evicted --
|
|
48
54
|
// this basically gives code X seconds to subscribe to the query before
|
|
@@ -50,6 +56,14 @@ export class QueryCache extends Disposable {
|
|
|
50
56
|
this.enqueueQueryEviction(value);
|
|
51
57
|
return value;
|
|
52
58
|
}
|
|
59
|
+
get diagnostics() {
|
|
60
|
+
return {
|
|
61
|
+
queries: [
|
|
62
|
+
...this._cache.values().map((query) => query.getDiagnostic(true)),
|
|
63
|
+
...this._inactiveDiagnostics.values(),
|
|
64
|
+
],
|
|
65
|
+
};
|
|
66
|
+
}
|
|
53
67
|
getOrSet(key, create, update) {
|
|
54
68
|
const existing = this.get(key);
|
|
55
69
|
if (existing) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryCache.js","sourceRoot":"","sources":["../../../src/queries/QueryCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAa,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryCache.js","sourceRoot":"","sources":["../../../src/queries/QueryCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { QueryStatus } from './BaseQuery.js';
|
|
2
|
+
export type QueryTiming = {
|
|
3
|
+
sweep: number | null;
|
|
4
|
+
hydration: number | null;
|
|
5
|
+
total: number | null;
|
|
6
|
+
};
|
|
7
|
+
export type QueryDiagnostic = {
|
|
8
|
+
key: string;
|
|
9
|
+
collection: string;
|
|
10
|
+
type: string;
|
|
11
|
+
status: QueryStatus;
|
|
12
|
+
active: boolean;
|
|
13
|
+
result: unknown;
|
|
14
|
+
timing: QueryTiming;
|
|
15
|
+
};
|
|
16
|
+
export type QueryDiagnostics = {
|
|
17
|
+
queries: QueryDiagnostic[];
|
|
18
|
+
};
|
|
19
|
+
export declare const getDiagnosticResult: (value: unknown) => unknown;
|