@verdant-web/store 5.4.2 → 5.4.4
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__/QueryBatcher.test.d.ts +1 -0
- package/dist/esm/__tests__/QueryBatcher.test.js +17 -0
- package/dist/esm/__tests__/QueryBatcher.test.js.map +1 -0
- package/dist/esm/__tests__/queries.test.js +16 -0
- package/dist/esm/__tests__/queries.test.js.map +1 -1
- package/dist/esm/queries/BaseQuery.d.ts +6 -1
- package/dist/esm/queries/BaseQuery.js +33 -12
- package/dist/esm/queries/BaseQuery.js.map +1 -1
- package/dist/esm/queries/QueryBatcher.d.ts +2 -0
- package/dist/esm/queries/QueryBatcher.js +39 -0
- package/dist/esm/queries/QueryBatcher.js.map +1 -0
- package/dist/esm/queries/diagnostics.d.ts +5 -0
- package/dist/esm/queries/diagnostics.js.map +1 -1
- package/package.json +1 -1
- package/src/__tests__/QueryBatcher.test.ts +21 -0
- package/src/__tests__/queries.test.ts +19 -0
- package/src/queries/BaseQuery.ts +41 -18
- package/src/queries/QueryBatcher.ts +54 -0
- package/src/queries/diagnostics.ts +6 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { enqueueQueryRun } from '../queries/QueryBatcher.js';
|
|
3
|
+
describe('QueryBatcher', () => {
|
|
4
|
+
it('yields between batches of query runs', async () => {
|
|
5
|
+
vi.useFakeTimers();
|
|
6
|
+
const context = {};
|
|
7
|
+
const runs = Array.from({ length: 21 }, () => vi.fn(async () => { }));
|
|
8
|
+
const results = runs.map((run) => enqueueQueryRun(context, run));
|
|
9
|
+
expect(runs.filter((run) => run.mock.calls.length > 0)).toHaveLength(0);
|
|
10
|
+
await Promise.resolve();
|
|
11
|
+
expect(runs.filter((run) => run.mock.calls.length > 0)).toHaveLength(20);
|
|
12
|
+
await vi.runAllTimersAsync();
|
|
13
|
+
expect(runs.filter((run) => run.mock.calls.length > 0)).toHaveLength(21);
|
|
14
|
+
await Promise.all(results);
|
|
15
|
+
});
|
|
16
|
+
});
|
|
17
|
+
//# sourceMappingURL=QueryBatcher.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"QueryBatcher.test.js","sourceRoot":"","sources":["../../../src/__tests__/QueryBatcher.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACrD,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,EAAa,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC;QAErE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAExE,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAEzE,MAAM,EAAE,CAAC,iBAAiB,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACzE,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -334,6 +334,22 @@ describe('query reactivity', () => {
|
|
|
334
334
|
expect(query.current.length).toBe(6);
|
|
335
335
|
// revalidating on change is tested elsewhere below.
|
|
336
336
|
});
|
|
337
|
+
it('revalidates on the leading and trailing edges of collection changes', async () => {
|
|
338
|
+
const storage = await createTestStorage();
|
|
339
|
+
const query = storage.todos.findAll();
|
|
340
|
+
await query.resolved;
|
|
341
|
+
const execute = vi.spyOn(query, 'execute');
|
|
342
|
+
vi.useFakeTimers();
|
|
343
|
+
const entityEvents = storage.context.entityEvents;
|
|
344
|
+
entityEvents.emit('collectionsChanged', ['todos']);
|
|
345
|
+
entityEvents.emit('collectionsChanged', ['todos']);
|
|
346
|
+
entityEvents.emit('collectionsChanged', ['todos']);
|
|
347
|
+
expect(execute).toHaveBeenCalledTimes(1);
|
|
348
|
+
await vi.advanceTimersByTimeAsync(49);
|
|
349
|
+
expect(execute).toHaveBeenCalledTimes(1);
|
|
350
|
+
await vi.advanceTimersByTimeAsync(1);
|
|
351
|
+
expect(execute).toHaveBeenCalledTimes(2);
|
|
352
|
+
});
|
|
337
353
|
it('updates a get query when the item is deleted', async () => {
|
|
338
354
|
const client = await createTestStorage();
|
|
339
355
|
const query = await getQuery(client);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queries.test.js","sourceRoot":"","sources":["../../../src/__tests__/queries.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,KAAK,UAAU,eAAe,CAAC,OAA8B;IAC5D,IAAI,KAAK,GAAG,EAAE,CAAC;IAEf,KAAK,MAAM,IAAI,IAAI;QAClB;YACC,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,CAAC,GAAG,CAAC;YACX,QAAQ,EAAE,SAAS;SACnB;QACD;YACC,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YAChB,QAAQ,EAAE,SAAS;SACnB;QACD;YACC,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YAChB,QAAQ,EAAE,SAAS;SACnB;QACD;YACC,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,gBAAgB;YACzB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,EAAE;YACR,QAAQ,EAAE,UAAU;SACpB;QACD;YACC,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YAChB,QAAQ,EAAE,UAAU;SACpB;QACD;YACC,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,CAAC,GAAG,CAAC;YACX,QAAQ,EAAE,UAAU;SACpB;KACD,EAAE,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,CAAC,GAAG,EAAE;IACd,EAAE,CAAC,aAAa,EAAE,CAAC;AACpB,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;QAEpC,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE;gBACN,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,gBAAgB;aACxB;SACD,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;QAErC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;QACpC,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAEtD,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC;QAEvC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;QACxD,MAAM,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YACpC,GAAG,EAAE,0BAA0B;YAC/B,UAAU,EAAE,OAAO;YACnB,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;SACtC,CAAC,CAAC;QACH,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzD,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;QAEpC,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE;gBACN,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACN,QAAQ,EAAE,SAAS;iBACnB;gBACD,KAAK,EAAE,KAAK;aACZ;SACD,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;QAErC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACpD,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QAC1E,MAAM,OAAO,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAE1C,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE;gBACN,KAAK,EAAE,kBAAkB;gBACzB,KAAK,EAAE;oBACN,IAAI,EAAE,GAAG;iBACT;gBACD,KAAK,EAAE,KAAK;aACZ;SACD,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;QAErC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACpD,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,OAAO,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAE1C,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE;gBACN,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACN,QAAQ,EAAE,SAAS;iBACnB;gBACD,KAAK,EAAE,KAAK;aACZ;YACD,KAAK,EAAE,CAAC;SACR,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;QAErC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACpD,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE;gBACN,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,MAAM;aAClB;SACD,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;QAErC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACpD,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,OAAO,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAE1C,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;YACpC,KAAK,EAAE;gBACN,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACN,QAAQ,EAAE,SAAS;iBACnB;gBACD,KAAK,EAAE,KAAK;aACZ;YACD,QAAQ,EAAE,CAAC;YACX,IAAI,EAAE,CAAC;SACP,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;QAErC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACpD,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAErC,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QAEvB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC1D,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,OAAO,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAE1C,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC;YAC3C,KAAK,EAAE;gBACN,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACN,QAAQ,EAAE,SAAS;iBACnB;gBACD,KAAK,EAAE,KAAK;aACZ;YACD,QAAQ,EAAE,CAAC;SACX,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;QAErC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACpD,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjC,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QAEvB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC1D,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,OAAO,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAE1C,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACxC,GAAG,EAAE,WAAW;YAChB,KAAK,EAAE;gBACN,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACN,QAAQ,EAAE,SAAS;iBACnB;gBACD,KAAK,EAAE,KAAK;aACZ;SACD,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC;QAC/C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACzD,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACzC,GAAG,EAAE,WAAW;YAChB,KAAK,EAAE;gBACN,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACN,QAAQ,EAAE,UAAU;iBACpB;gBACD,KAAK,EAAE,KAAK;aACZ;SACD,CAAC,CAAC;QAEH,yCAAyC;QACzC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE1C,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC;QACjD,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC1D,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC/D,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAClB,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;SAClB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,OAAO,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAE7C,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE;gBACN,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACN,QAAQ,EAAE,SAAS;iBACnB;gBACD,KAAK,EAAE,KAAK;aACZ;SACD,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAExD,wFAAwF;QACxF,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE5D,EAAE,CAAC,aAAa,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,OAAO,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAE7C,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE;gBACN,KAAK,EAAE,sBAAsB;gBAC7B,KAAK,EAAE;oBACN,QAAQ,EAAE,SAAS;iBACnB;gBACD,KAAK,EAAE,KAAK;aACZ;SACD,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAErC,wFAAwF;QACxF,4BAA4B;QAC5B,EAAE,CAAC,mBAAmB,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;QAElC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAExD,cAAc;QACd,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEzC,mCAAmC;QACnC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAExD,6CAA6C;QAC7C,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAE7B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IACjC,KAAK,UAAU,QAAQ,CAAC,OAA8B;QACrD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;YACpC,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,CAAC,GAAG,CAAC;YACX,QAAQ,EAAE,SAAS;SACnB,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IACD,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QACnE,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,iBAAiB,EAAE,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;QAElC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE3C,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;QAEpC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,OAAO,GAAG,MAAM,iBAAiB,EAAE,CAAC;QAC1C,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,yCAAyC;QACzC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,MAAM,QAAQ,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrC,oDAAoD;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,MAAM,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC;QAElC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC;QACtC,oBAAoB;SACpB,CAAC,CAAC;QACH,MAAM,eAAe,CAAC,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG;YACf,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;YACtB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC;gBAC5B,QAAQ,EAAE,EAAE;aACZ,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;gBACrB,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,CAAC;aACP,CAAC;SACF,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE1C,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;YACtB,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,CAAC,GAAG,CAAC;YACX,QAAQ,EAAE,SAAS;SACnB,CAAC,CAAC;QAEH,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC;QACtC,oBAAoB;SACpB,CAAC,CAAC;QACH,MAAM,eAAe,CAAC,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG;YACf,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;YACtB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC;gBAC5B,QAAQ,EAAE,EAAE;aACZ,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;gBACrB,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,CAAC;aACP,CAAC;SACF,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE1C,MAAM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAE/B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3C,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"queries.test.js","sourceRoot":"","sources":["../../../src/__tests__/queries.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Context } from '../context/context.js';
|
|
1
|
+
import type { Context } from '../context/context.js';
|
|
2
2
|
import { Disposable } from '../utils/Disposable.js';
|
|
3
3
|
import { QueryDiagnostic } from './diagnostics.js';
|
|
4
4
|
export type BaseQueryEvents = {
|
|
@@ -24,12 +24,17 @@ export declare abstract class BaseQuery<T> extends Disposable {
|
|
|
24
24
|
private _status;
|
|
25
25
|
private _executionPromise;
|
|
26
26
|
private _timing;
|
|
27
|
+
private _startedAt;
|
|
28
|
+
private _timingHistory;
|
|
29
|
+
private _revalidationTimeout;
|
|
30
|
+
private _needsTrailingRevalidation;
|
|
27
31
|
protected context: Context;
|
|
28
32
|
readonly collection: string;
|
|
29
33
|
readonly key: string;
|
|
30
34
|
readonly isListQuery: boolean;
|
|
31
35
|
readonly type: string;
|
|
32
36
|
constructor({ initial, context, collection, key, shouldUpdate, }: BaseQueryOptions<T>);
|
|
37
|
+
private revalidate;
|
|
33
38
|
get current(): T;
|
|
34
39
|
get resolved(): Promise<T>;
|
|
35
40
|
get subscribed(): boolean;
|
|
@@ -2,15 +2,12 @@ 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
|
+
import { getDiagnosticResult, } from './diagnostics.js';
|
|
6
|
+
import { enqueueQueryRun } from './QueryBatcher.js';
|
|
6
7
|
import { filterResultSet } from './utils.js';
|
|
7
8
|
export const ON_ALL_UNSUBSCRIBED = Symbol('ON_ALL_UNSUBSCRIBED');
|
|
8
9
|
export const UPDATE = Symbol('UPDATE');
|
|
9
|
-
|
|
10
|
-
// subscribe(event: 'change', callback: (value: T) => void): () => void;
|
|
11
|
-
// subscribe(event: 'statusChange', callback: (status: QueryStatus) => void): () => void;
|
|
12
|
-
// subscribe(callback: (value: T) => void): () => void;
|
|
13
|
-
// }
|
|
10
|
+
const REVALIDATION_DEBOUNCE = 50;
|
|
14
11
|
export class BaseQuery extends Disposable {
|
|
15
12
|
constructor({ initial, context, collection, key, shouldUpdate, }) {
|
|
16
13
|
super();
|
|
@@ -22,6 +19,25 @@ export class BaseQuery extends Disposable {
|
|
|
22
19
|
hydration: null,
|
|
23
20
|
total: null,
|
|
24
21
|
};
|
|
22
|
+
this._startedAt = null;
|
|
23
|
+
this._timingHistory = [];
|
|
24
|
+
this._needsTrailingRevalidation = false;
|
|
25
|
+
this.revalidate = () => {
|
|
26
|
+
if (this._revalidationTimeout !== undefined) {
|
|
27
|
+
this._needsTrailingRevalidation = true;
|
|
28
|
+
clearTimeout(this._revalidationTimeout);
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
this.execute();
|
|
32
|
+
}
|
|
33
|
+
this._revalidationTimeout = setTimeout(() => {
|
|
34
|
+
this._revalidationTimeout = undefined;
|
|
35
|
+
if (this._needsTrailingRevalidation) {
|
|
36
|
+
this._needsTrailingRevalidation = false;
|
|
37
|
+
this.execute();
|
|
38
|
+
}
|
|
39
|
+
}, REVALIDATION_DEBOUNCE);
|
|
40
|
+
};
|
|
25
41
|
this.setValue = (value) => {
|
|
26
42
|
this._rawValue = value;
|
|
27
43
|
this.subscribeToDeleteAndRestore(this._rawValue);
|
|
@@ -81,6 +97,7 @@ export class BaseQuery extends Disposable {
|
|
|
81
97
|
};
|
|
82
98
|
this.execute = () => {
|
|
83
99
|
const startTime = performance.now();
|
|
100
|
+
this._startedAt = Date.now();
|
|
84
101
|
this.context.log('debug', 'Executing query', this.key);
|
|
85
102
|
if (this.status === 'initial') {
|
|
86
103
|
this.status = 'initializing';
|
|
@@ -89,7 +106,7 @@ export class BaseQuery extends Disposable {
|
|
|
89
106
|
this.status = 'revalidating';
|
|
90
107
|
}
|
|
91
108
|
// no status change needed if already in a 'running' status.
|
|
92
|
-
this._executionPromise = this.run
|
|
109
|
+
this._executionPromise = enqueueQueryRun(this.context, this.run)
|
|
93
110
|
.then(() => this._value)
|
|
94
111
|
.catch((err) => {
|
|
95
112
|
if (err instanceof Error) {
|
|
@@ -105,8 +122,13 @@ export class BaseQuery extends Disposable {
|
|
|
105
122
|
}
|
|
106
123
|
})
|
|
107
124
|
.finally(() => {
|
|
125
|
+
var _b;
|
|
108
126
|
const duration = performance.now() - startTime;
|
|
109
127
|
this._timing.total = duration;
|
|
128
|
+
this._timingHistory = [
|
|
129
|
+
...this._timingHistory,
|
|
130
|
+
Object.assign({ startedAt: (_b = this._startedAt) !== null && _b !== void 0 ? _b : Date.now() }, this._timing),
|
|
131
|
+
].slice(-100);
|
|
110
132
|
this.context.log('debug', 'Query executed', this.key, `Duration: ${duration}ms`);
|
|
111
133
|
});
|
|
112
134
|
return this._executionPromise;
|
|
@@ -131,12 +153,14 @@ export class BaseQuery extends Disposable {
|
|
|
131
153
|
};
|
|
132
154
|
this.getDiagnostic = (active) => ({
|
|
133
155
|
key: this.key,
|
|
156
|
+
startedAt: this._startedAt,
|
|
134
157
|
collection: this.collection,
|
|
135
158
|
type: this.type,
|
|
136
159
|
status: this.status,
|
|
137
160
|
active,
|
|
138
161
|
result: getDiagnosticResult(this.current),
|
|
139
162
|
timing: Object.assign({}, this._timing),
|
|
163
|
+
runs: this._timingHistory.map((run) => (Object.assign({}, run))),
|
|
140
164
|
});
|
|
141
165
|
this[_a] = (handler) => {
|
|
142
166
|
this._allUnsubscribedHandler = handler;
|
|
@@ -154,15 +178,12 @@ export class BaseQuery extends Disposable {
|
|
|
154
178
|
this.key = key;
|
|
155
179
|
this.collection = collection;
|
|
156
180
|
this.type = this.constructor.name;
|
|
181
|
+
this.addDispose(() => clearTimeout(this._revalidationTimeout));
|
|
157
182
|
const shouldUpdateFn = shouldUpdate ||
|
|
158
183
|
((collections) => collections.includes(collection));
|
|
159
184
|
this.addDispose(this.context.entityEvents.subscribe('collectionsChanged', (collections) => {
|
|
160
185
|
if (shouldUpdateFn(collections)) {
|
|
161
|
-
this.
|
|
162
|
-
// immediately refilter the result set - deleted
|
|
163
|
-
// entities will already be nulled out
|
|
164
|
-
// this.refreshValue();
|
|
165
|
-
this.execute();
|
|
186
|
+
this.revalidate();
|
|
166
187
|
}
|
|
167
188
|
}));
|
|
168
189
|
// TODO: subscribe to document changes and update if necessary.
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"BaseQuery.js","sourceRoot":"","sources":["../../../src/queries/BaseQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
const BATCH_SIZE = 20;
|
|
2
|
+
class QueryBatcher {
|
|
3
|
+
constructor() {
|
|
4
|
+
this.queue = [];
|
|
5
|
+
this.scheduled = false;
|
|
6
|
+
this.flush = () => {
|
|
7
|
+
const batch = this.queue.splice(0, BATCH_SIZE);
|
|
8
|
+
for (const { run, resolve, reject } of batch) {
|
|
9
|
+
run().then(resolve, reject);
|
|
10
|
+
}
|
|
11
|
+
if (this.queue.length) {
|
|
12
|
+
setTimeout(this.flush, 0);
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
this.scheduled = false;
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
enqueue(run) {
|
|
20
|
+
const promise = new Promise((resolve, reject) => {
|
|
21
|
+
this.queue.push({ run, resolve, reject });
|
|
22
|
+
});
|
|
23
|
+
if (!this.scheduled) {
|
|
24
|
+
this.scheduled = true;
|
|
25
|
+
queueMicrotask(this.flush);
|
|
26
|
+
}
|
|
27
|
+
return promise;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
const batchers = new WeakMap();
|
|
31
|
+
export function enqueueQueryRun(context, run) {
|
|
32
|
+
let batcher = batchers.get(context);
|
|
33
|
+
if (!batcher) {
|
|
34
|
+
batcher = new QueryBatcher();
|
|
35
|
+
batchers.set(context, batcher);
|
|
36
|
+
}
|
|
37
|
+
return batcher.enqueue(run);
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=QueryBatcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"QueryBatcher.js","sourceRoot":"","sources":["../../../src/queries/QueryBatcher.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,EAAE,CAAC;AAQtB,MAAM,YAAY;IAAlB;QACS,UAAK,GAAgB,EAAE,CAAC;QACxB,cAAS,GAAG,KAAK,CAAC;QAelB,UAAK,GAAG,GAAG,EAAE;YACpB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YAC/C,KAAK,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;gBAC9C,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7B,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACvB,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACxB,CAAC;QACF,CAAC,CAAC;IACH,CAAC;IAzBA,OAAO,CAAI,GAAqB;QAC/B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;CAcD;AAED,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAyB,CAAC;AAEtD,MAAM,UAAU,eAAe,CAC9B,OAAgB,EAChB,GAAqB;IAErB,IAAI,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;QAC7B,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC"}
|
|
@@ -4,14 +4,19 @@ export type QueryTiming = {
|
|
|
4
4
|
hydration: number | null;
|
|
5
5
|
total: number | null;
|
|
6
6
|
};
|
|
7
|
+
export type QueryRun = QueryTiming & {
|
|
8
|
+
startedAt: number;
|
|
9
|
+
};
|
|
7
10
|
export type QueryDiagnostic = {
|
|
8
11
|
key: string;
|
|
12
|
+
startedAt: number | null;
|
|
9
13
|
collection: string;
|
|
10
14
|
type: string;
|
|
11
15
|
status: QueryStatus;
|
|
12
16
|
active: boolean;
|
|
13
17
|
result: unknown;
|
|
14
18
|
timing: QueryTiming;
|
|
19
|
+
runs: QueryRun[];
|
|
15
20
|
};
|
|
16
21
|
export type QueryDiagnostics = {
|
|
17
22
|
queries: QueryDiagnostic[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../../src/queries/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../../src/queries/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AA6B/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAW,EAAE;IAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { Context } from '../context/context.js';
|
|
3
|
+
import { enqueueQueryRun } from '../queries/QueryBatcher.js';
|
|
4
|
+
|
|
5
|
+
describe('QueryBatcher', () => {
|
|
6
|
+
it('yields between batches of query runs', async () => {
|
|
7
|
+
vi.useFakeTimers();
|
|
8
|
+
const context = {} as Context;
|
|
9
|
+
const runs = Array.from({ length: 21 }, () => vi.fn(async () => {}));
|
|
10
|
+
|
|
11
|
+
const results = runs.map((run) => enqueueQueryRun(context, run));
|
|
12
|
+
expect(runs.filter((run) => run.mock.calls.length > 0)).toHaveLength(0);
|
|
13
|
+
|
|
14
|
+
await Promise.resolve();
|
|
15
|
+
expect(runs.filter((run) => run.mock.calls.length > 0)).toHaveLength(20);
|
|
16
|
+
|
|
17
|
+
await vi.runAllTimersAsync();
|
|
18
|
+
expect(runs.filter((run) => run.mock.calls.length > 0)).toHaveLength(21);
|
|
19
|
+
await Promise.all(results);
|
|
20
|
+
});
|
|
21
|
+
});
|
|
@@ -404,6 +404,25 @@ describe('query reactivity', () => {
|
|
|
404
404
|
// revalidating on change is tested elsewhere below.
|
|
405
405
|
});
|
|
406
406
|
|
|
407
|
+
it('revalidates on the leading and trailing edges of collection changes', async () => {
|
|
408
|
+
const storage = await createTestStorage();
|
|
409
|
+
const query = storage.todos.findAll();
|
|
410
|
+
await query.resolved;
|
|
411
|
+
const execute = vi.spyOn(query, 'execute');
|
|
412
|
+
vi.useFakeTimers();
|
|
413
|
+
|
|
414
|
+
const entityEvents = (storage as any).context.entityEvents;
|
|
415
|
+
entityEvents.emit('collectionsChanged', ['todos']);
|
|
416
|
+
entityEvents.emit('collectionsChanged', ['todos']);
|
|
417
|
+
entityEvents.emit('collectionsChanged', ['todos']);
|
|
418
|
+
expect(execute).toHaveBeenCalledTimes(1);
|
|
419
|
+
|
|
420
|
+
await vi.advanceTimersByTimeAsync(49);
|
|
421
|
+
expect(execute).toHaveBeenCalledTimes(1);
|
|
422
|
+
await vi.advanceTimersByTimeAsync(1);
|
|
423
|
+
expect(execute).toHaveBeenCalledTimes(2);
|
|
424
|
+
});
|
|
425
|
+
|
|
407
426
|
it('updates a get query when the item is deleted', async () => {
|
|
408
427
|
const client = await createTestStorage();
|
|
409
428
|
const query = await getQuery(client);
|
package/src/queries/BaseQuery.ts
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import { EventSubscriber } from '@verdant-web/common';
|
|
2
|
-
import { Context } from '../context/context.js';
|
|
2
|
+
import type { Context } from '../context/context.js';
|
|
3
3
|
import { Entity } from '../entities/Entity.js';
|
|
4
4
|
import { Disposable } from '../utils/Disposable.js';
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
getDiagnosticResult,
|
|
7
|
+
QueryDiagnostic,
|
|
8
|
+
QueryRun,
|
|
9
|
+
QueryTiming,
|
|
10
|
+
} from './diagnostics.js';
|
|
11
|
+
import { enqueueQueryRun } from './QueryBatcher.js';
|
|
6
12
|
import { filterResultSet } from './utils.js';
|
|
7
13
|
|
|
8
14
|
export type BaseQueryEvents = {
|
|
@@ -23,11 +29,7 @@ export type QueryStatus = 'initial' | 'initializing' | 'revalidating' | 'ready';
|
|
|
23
29
|
export const ON_ALL_UNSUBSCRIBED = Symbol('ON_ALL_UNSUBSCRIBED');
|
|
24
30
|
export const UPDATE = Symbol('UPDATE');
|
|
25
31
|
|
|
26
|
-
|
|
27
|
-
// subscribe(event: 'change', callback: (value: T) => void): () => void;
|
|
28
|
-
// subscribe(event: 'statusChange', callback: (status: QueryStatus) => void): () => void;
|
|
29
|
-
// subscribe(callback: (value: T) => void): () => void;
|
|
30
|
-
// }
|
|
32
|
+
const REVALIDATION_DEBOUNCE = 50;
|
|
31
33
|
|
|
32
34
|
export abstract class BaseQuery<T> extends Disposable {
|
|
33
35
|
private _rawValue;
|
|
@@ -43,6 +45,10 @@ export abstract class BaseQuery<T> extends Disposable {
|
|
|
43
45
|
hydration: null,
|
|
44
46
|
total: null,
|
|
45
47
|
};
|
|
48
|
+
private _startedAt: number | null = null;
|
|
49
|
+
private _timingHistory: QueryRun[] = [];
|
|
50
|
+
private _revalidationTimeout: ReturnType<typeof setTimeout> | undefined;
|
|
51
|
+
private _needsTrailingRevalidation = false;
|
|
46
52
|
|
|
47
53
|
protected context;
|
|
48
54
|
|
|
@@ -73,6 +79,7 @@ export abstract class BaseQuery<T> extends Disposable {
|
|
|
73
79
|
this.key = key;
|
|
74
80
|
this.collection = collection;
|
|
75
81
|
this.type = this.constructor.name;
|
|
82
|
+
this.addDispose(() => clearTimeout(this._revalidationTimeout));
|
|
76
83
|
const shouldUpdateFn =
|
|
77
84
|
shouldUpdate ||
|
|
78
85
|
((collections: string[]) => collections.includes(collection));
|
|
@@ -81,11 +88,7 @@ export abstract class BaseQuery<T> extends Disposable {
|
|
|
81
88
|
'collectionsChanged',
|
|
82
89
|
(collections) => {
|
|
83
90
|
if (shouldUpdateFn(collections)) {
|
|
84
|
-
this.
|
|
85
|
-
// immediately refilter the result set - deleted
|
|
86
|
-
// entities will already be nulled out
|
|
87
|
-
// this.refreshValue();
|
|
88
|
-
this.execute();
|
|
91
|
+
this.revalidate();
|
|
89
92
|
}
|
|
90
93
|
},
|
|
91
94
|
),
|
|
@@ -93,6 +96,23 @@ export abstract class BaseQuery<T> extends Disposable {
|
|
|
93
96
|
// TODO: subscribe to document changes and update if necessary.
|
|
94
97
|
}
|
|
95
98
|
|
|
99
|
+
private revalidate = () => {
|
|
100
|
+
if (this._revalidationTimeout !== undefined) {
|
|
101
|
+
this._needsTrailingRevalidation = true;
|
|
102
|
+
clearTimeout(this._revalidationTimeout);
|
|
103
|
+
} else {
|
|
104
|
+
this.execute();
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
this._revalidationTimeout = setTimeout(() => {
|
|
108
|
+
this._revalidationTimeout = undefined;
|
|
109
|
+
if (this._needsTrailingRevalidation) {
|
|
110
|
+
this._needsTrailingRevalidation = false;
|
|
111
|
+
this.execute();
|
|
112
|
+
}
|
|
113
|
+
}, REVALIDATION_DEBOUNCE);
|
|
114
|
+
};
|
|
115
|
+
|
|
96
116
|
get current() {
|
|
97
117
|
return this._value;
|
|
98
118
|
}
|
|
@@ -232,11 +252,8 @@ export abstract class BaseQuery<T> extends Disposable {
|
|
|
232
252
|
|
|
233
253
|
execute = () => {
|
|
234
254
|
const startTime = performance.now();
|
|
235
|
-
this.
|
|
236
|
-
|
|
237
|
-
'Executing query',
|
|
238
|
-
this.key,
|
|
239
|
-
);
|
|
255
|
+
this._startedAt = Date.now();
|
|
256
|
+
this.context.log('debug', 'Executing query', this.key);
|
|
240
257
|
|
|
241
258
|
if (this.status === 'initial') {
|
|
242
259
|
this.status = 'initializing';
|
|
@@ -245,7 +262,7 @@ export abstract class BaseQuery<T> extends Disposable {
|
|
|
245
262
|
}
|
|
246
263
|
// no status change needed if already in a 'running' status.
|
|
247
264
|
|
|
248
|
-
this._executionPromise = this.run
|
|
265
|
+
this._executionPromise = enqueueQueryRun(this.context, this.run)
|
|
249
266
|
.then(() => this._value)
|
|
250
267
|
.catch((err) => {
|
|
251
268
|
if (err instanceof Error) {
|
|
@@ -264,6 +281,10 @@ export abstract class BaseQuery<T> extends Disposable {
|
|
|
264
281
|
.finally(() => {
|
|
265
282
|
const duration = performance.now() - startTime;
|
|
266
283
|
this._timing.total = duration;
|
|
284
|
+
this._timingHistory = [
|
|
285
|
+
...this._timingHistory,
|
|
286
|
+
{ startedAt: this._startedAt ?? Date.now(), ...this._timing },
|
|
287
|
+
].slice(-100);
|
|
267
288
|
this.context.log(
|
|
268
289
|
'debug',
|
|
269
290
|
'Query executed',
|
|
@@ -296,12 +317,14 @@ export abstract class BaseQuery<T> extends Disposable {
|
|
|
296
317
|
|
|
297
318
|
getDiagnostic = (active: boolean): QueryDiagnostic => ({
|
|
298
319
|
key: this.key,
|
|
320
|
+
startedAt: this._startedAt,
|
|
299
321
|
collection: this.collection,
|
|
300
322
|
type: this.type,
|
|
301
323
|
status: this.status,
|
|
302
324
|
active,
|
|
303
325
|
result: getDiagnosticResult(this.current),
|
|
304
326
|
timing: { ...this._timing },
|
|
327
|
+
runs: this._timingHistory.map((run) => ({ ...run })),
|
|
305
328
|
});
|
|
306
329
|
protected abstract run(): Promise<void>;
|
|
307
330
|
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import type { Context } from '../context/context.js';
|
|
2
|
+
|
|
3
|
+
const BATCH_SIZE = 20;
|
|
4
|
+
|
|
5
|
+
type QueuedRun = {
|
|
6
|
+
run: () => Promise<any>;
|
|
7
|
+
resolve: (value: any) => void;
|
|
8
|
+
reject: (reason?: any) => void;
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
class QueryBatcher {
|
|
12
|
+
private queue: QueuedRun[] = [];
|
|
13
|
+
private scheduled = false;
|
|
14
|
+
|
|
15
|
+
enqueue<T>(run: () => Promise<T>): Promise<T> {
|
|
16
|
+
const promise = new Promise<T>((resolve, reject) => {
|
|
17
|
+
this.queue.push({ run, resolve, reject });
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
if (!this.scheduled) {
|
|
21
|
+
this.scheduled = true;
|
|
22
|
+
queueMicrotask(this.flush);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
return promise;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
private flush = () => {
|
|
29
|
+
const batch = this.queue.splice(0, BATCH_SIZE);
|
|
30
|
+
for (const { run, resolve, reject } of batch) {
|
|
31
|
+
run().then(resolve, reject);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
if (this.queue.length) {
|
|
35
|
+
setTimeout(this.flush, 0);
|
|
36
|
+
} else {
|
|
37
|
+
this.scheduled = false;
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const batchers = new WeakMap<Context, QueryBatcher>();
|
|
43
|
+
|
|
44
|
+
export function enqueueQueryRun<T>(
|
|
45
|
+
context: Context,
|
|
46
|
+
run: () => Promise<T>,
|
|
47
|
+
): Promise<T> {
|
|
48
|
+
let batcher = batchers.get(context);
|
|
49
|
+
if (!batcher) {
|
|
50
|
+
batcher = new QueryBatcher();
|
|
51
|
+
batchers.set(context, batcher);
|
|
52
|
+
}
|
|
53
|
+
return batcher.enqueue(run);
|
|
54
|
+
}
|
|
@@ -7,14 +7,20 @@ export type QueryTiming = {
|
|
|
7
7
|
total: number | null;
|
|
8
8
|
};
|
|
9
9
|
|
|
10
|
+
export type QueryRun = QueryTiming & {
|
|
11
|
+
startedAt: number;
|
|
12
|
+
};
|
|
13
|
+
|
|
10
14
|
export type QueryDiagnostic = {
|
|
11
15
|
key: string;
|
|
16
|
+
startedAt: number | null;
|
|
12
17
|
collection: string;
|
|
13
18
|
type: string;
|
|
14
19
|
status: QueryStatus;
|
|
15
20
|
active: boolean;
|
|
16
21
|
result: unknown;
|
|
17
22
|
timing: QueryTiming;
|
|
23
|
+
runs: QueryRun[];
|
|
18
24
|
};
|
|
19
25
|
|
|
20
26
|
export type QueryDiagnostics = {
|