@verdant-web/store 2.4.1 → 2.5.0

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.
Files changed (196) hide show
  1. package/dist/cjs/DocumentManager.d.ts +1 -1
  2. package/dist/cjs/DocumentManager.js.map +1 -1
  3. package/dist/cjs/__tests__/queries.test.js +41 -0
  4. package/dist/cjs/__tests__/queries.test.js.map +1 -1
  5. package/dist/cjs/client/Client.d.ts +3 -3
  6. package/dist/cjs/client/Client.js +3 -3
  7. package/dist/cjs/client/Client.js.map +1 -1
  8. package/dist/{esm/reactives → cjs/entities}/DocumentFamiliyCache.d.ts +21 -6
  9. package/dist/cjs/{reactives → entities}/DocumentFamiliyCache.js +46 -11
  10. package/dist/cjs/entities/DocumentFamiliyCache.js.map +1 -0
  11. package/dist/cjs/entities/Entity.js.map +1 -0
  12. package/dist/cjs/{reactives → entities}/EntityStore.js +49 -25
  13. package/dist/cjs/entities/EntityStore.js.map +1 -0
  14. package/dist/cjs/entities/FakeWeakRef.js.map +1 -0
  15. package/dist/cjs/index.d.ts +4 -4
  16. package/dist/cjs/index.js +1 -1
  17. package/dist/cjs/index.js.map +1 -1
  18. package/dist/cjs/migration/openDatabase.js +1 -1
  19. package/dist/cjs/migration/openDatabase.js.map +1 -1
  20. package/dist/cjs/{queries2 → queries}/BaseQuery.js +2 -2
  21. package/dist/cjs/queries/BaseQuery.js.map +1 -0
  22. package/dist/{esm/queries2 → cjs/queries}/CollectionQueries.d.ts +1 -1
  23. package/dist/cjs/{queries2 → queries}/CollectionQueries.js +14 -5
  24. package/dist/cjs/queries/CollectionQueries.js.map +1 -0
  25. package/dist/cjs/{queries2 → queries}/FindAllQuery.d.ts +2 -1
  26. package/dist/cjs/{queries2 → queries}/FindAllQuery.js +12 -3
  27. package/dist/cjs/queries/FindAllQuery.js.map +1 -0
  28. package/dist/{esm/queries2 → cjs/queries}/FindInfiniteQuery.d.ts +2 -1
  29. package/dist/cjs/{queries2 → queries}/FindInfiniteQuery.js +11 -2
  30. package/dist/cjs/queries/FindInfiniteQuery.js.map +1 -0
  31. package/dist/{esm/queries2 → cjs/queries}/FindOneQuery.d.ts +2 -1
  32. package/dist/cjs/{queries2 → queries}/FindOneQuery.js +11 -2
  33. package/dist/cjs/queries/FindOneQuery.js.map +1 -0
  34. package/dist/cjs/{queries2 → queries}/FindPageQuery.d.ts +2 -1
  35. package/dist/cjs/{queries2 → queries}/FindPageQuery.js +11 -2
  36. package/dist/cjs/queries/FindPageQuery.js.map +1 -0
  37. package/dist/cjs/queries/GetQuery.js.map +1 -0
  38. package/dist/cjs/{queries2 → queries}/QueryCache.d.ts +1 -1
  39. package/dist/cjs/{queries2 → queries}/QueryCache.js +4 -2
  40. package/dist/{esm/queries2 → cjs/queries}/QueryCache.js.map +1 -1
  41. package/dist/cjs/queries/dbQueries.js.map +1 -0
  42. package/dist/cjs/queries/keys.js.map +1 -0
  43. package/dist/cjs/queries/ranges.js.map +1 -0
  44. package/dist/cjs/{queries2 → queries}/types.js.map +1 -1
  45. package/dist/cjs/queries/utils.d.ts +3 -0
  46. package/dist/cjs/{queries2 → queries}/utils.js +7 -2
  47. package/dist/cjs/queries/utils.js.map +1 -0
  48. package/dist/cjs/sync/Sync.js.map +1 -1
  49. package/dist/cjs/sync/WebSocketSync.d.ts +1 -1
  50. package/dist/cjs/sync/WebSocketSync.js.map +1 -1
  51. package/dist/cjs/types.d.ts +11 -4
  52. package/dist/esm/DocumentManager.d.ts +1 -1
  53. package/dist/esm/DocumentManager.js.map +1 -1
  54. package/dist/esm/__tests__/queries.test.js +41 -0
  55. package/dist/esm/__tests__/queries.test.js.map +1 -1
  56. package/dist/esm/client/Client.d.ts +3 -3
  57. package/dist/esm/client/Client.js +3 -3
  58. package/dist/esm/client/Client.js.map +1 -1
  59. package/dist/{cjs/reactives → esm/entities}/DocumentFamiliyCache.d.ts +21 -6
  60. package/dist/esm/{reactives → entities}/DocumentFamiliyCache.js +46 -11
  61. package/dist/esm/entities/DocumentFamiliyCache.js.map +1 -0
  62. package/dist/esm/entities/Entity.js.map +1 -0
  63. package/dist/esm/{reactives → entities}/EntityStore.js +49 -25
  64. package/dist/esm/entities/EntityStore.js.map +1 -0
  65. package/dist/esm/entities/FakeWeakRef.js.map +1 -0
  66. package/dist/esm/index.d.ts +4 -4
  67. package/dist/esm/index.js +1 -1
  68. package/dist/esm/index.js.map +1 -1
  69. package/dist/esm/migration/openDatabase.js +1 -1
  70. package/dist/esm/migration/openDatabase.js.map +1 -1
  71. package/dist/esm/{queries2 → queries}/BaseQuery.js +2 -2
  72. package/dist/esm/queries/BaseQuery.js.map +1 -0
  73. package/dist/{cjs/queries2 → esm/queries}/CollectionQueries.d.ts +1 -1
  74. package/dist/esm/{queries2 → queries}/CollectionQueries.js +14 -5
  75. package/dist/esm/queries/CollectionQueries.js.map +1 -0
  76. package/dist/esm/{queries2 → queries}/FindAllQuery.d.ts +2 -1
  77. package/dist/esm/{queries2 → queries}/FindAllQuery.js +12 -3
  78. package/dist/esm/queries/FindAllQuery.js.map +1 -0
  79. package/dist/{cjs/queries2 → esm/queries}/FindInfiniteQuery.d.ts +2 -1
  80. package/dist/esm/{queries2 → queries}/FindInfiniteQuery.js +12 -3
  81. package/dist/esm/queries/FindInfiniteQuery.js.map +1 -0
  82. package/dist/{cjs/queries2 → esm/queries}/FindOneQuery.d.ts +2 -1
  83. package/dist/esm/{queries2 → queries}/FindOneQuery.js +12 -3
  84. package/dist/esm/queries/FindOneQuery.js.map +1 -0
  85. package/dist/esm/{queries2 → queries}/FindPageQuery.d.ts +2 -1
  86. package/dist/esm/{queries2 → queries}/FindPageQuery.js +12 -3
  87. package/dist/esm/queries/FindPageQuery.js.map +1 -0
  88. package/dist/esm/queries/GetQuery.js.map +1 -0
  89. package/dist/esm/{queries2 → queries}/QueryCache.d.ts +1 -1
  90. package/dist/esm/{queries2 → queries}/QueryCache.js +4 -2
  91. package/dist/esm/queries/QueryCache.js.map +1 -0
  92. package/dist/esm/queries/dbQueries.js.map +1 -0
  93. package/dist/esm/queries/keys.js.map +1 -0
  94. package/dist/esm/queries/ranges.js.map +1 -0
  95. package/dist/esm/{queries2 → queries}/types.js.map +1 -1
  96. package/dist/esm/queries/utils.d.ts +3 -0
  97. package/dist/esm/{queries2 → queries}/utils.js +5 -1
  98. package/dist/esm/queries/utils.js.map +1 -0
  99. package/dist/esm/sync/Sync.js.map +1 -1
  100. package/dist/esm/sync/WebSocketSync.d.ts +1 -1
  101. package/dist/esm/sync/WebSocketSync.js.map +1 -1
  102. package/dist/esm/types.d.ts +11 -4
  103. package/dist/tsconfig-cjs.tsbuildinfo +1 -1
  104. package/dist/tsconfig.tsbuildinfo +1 -1
  105. package/package.json +1 -1
  106. package/src/DocumentManager.ts +1 -6
  107. package/src/__tests__/queries.test.ts +47 -0
  108. package/src/client/Client.ts +3 -3
  109. package/src/{reactives → entities}/DocumentFamiliyCache.ts +60 -16
  110. package/src/{reactives → entities}/EntityStore.ts +68 -31
  111. package/src/index.ts +4 -4
  112. package/src/migration/openDatabase.ts +1 -1
  113. package/src/{queries2 → queries}/BaseQuery.ts +3 -4
  114. package/src/{queries2 → queries}/CollectionQueries.ts +26 -12
  115. package/src/{queries2 → queries}/FindAllQuery.ts +8 -2
  116. package/src/{queries2 → queries}/FindInfiniteQuery.ts +8 -1
  117. package/src/{queries2 → queries}/FindOneQuery.ts +8 -2
  118. package/src/{queries2 → queries}/FindPageQuery.ts +8 -1
  119. package/src/{queries2 → queries}/QueryCache.ts +9 -2
  120. package/src/{queries2 → queries}/utils.ts +9 -1
  121. package/src/sync/Sync.ts +0 -1
  122. package/src/sync/WebSocketSync.ts +3 -8
  123. package/src/types.ts +11 -4
  124. package/dist/cjs/queries2/BaseQuery.js.map +0 -1
  125. package/dist/cjs/queries2/CollectionQueries.js.map +0 -1
  126. package/dist/cjs/queries2/FindAllQuery.js.map +0 -1
  127. package/dist/cjs/queries2/FindInfiniteQuery.js.map +0 -1
  128. package/dist/cjs/queries2/FindOneQuery.js.map +0 -1
  129. package/dist/cjs/queries2/FindPageQuery.js.map +0 -1
  130. package/dist/cjs/queries2/GetQuery.js.map +0 -1
  131. package/dist/cjs/queries2/QueryCache.js.map +0 -1
  132. package/dist/cjs/queries2/dbQueries.js.map +0 -1
  133. package/dist/cjs/queries2/keys.js.map +0 -1
  134. package/dist/cjs/queries2/ranges.js.map +0 -1
  135. package/dist/cjs/queries2/utils.d.ts +0 -1
  136. package/dist/cjs/queries2/utils.js.map +0 -1
  137. package/dist/cjs/reactives/DocumentFamiliyCache.js.map +0 -1
  138. package/dist/cjs/reactives/Entity.js.map +0 -1
  139. package/dist/cjs/reactives/EntityStore.js.map +0 -1
  140. package/dist/cjs/reactives/FakeWeakRef.js.map +0 -1
  141. package/dist/esm/queries2/BaseQuery.js.map +0 -1
  142. package/dist/esm/queries2/CollectionQueries.js.map +0 -1
  143. package/dist/esm/queries2/FindAllQuery.js.map +0 -1
  144. package/dist/esm/queries2/FindInfiniteQuery.js.map +0 -1
  145. package/dist/esm/queries2/FindOneQuery.js.map +0 -1
  146. package/dist/esm/queries2/FindPageQuery.js.map +0 -1
  147. package/dist/esm/queries2/GetQuery.js.map +0 -1
  148. package/dist/esm/queries2/dbQueries.js.map +0 -1
  149. package/dist/esm/queries2/keys.js.map +0 -1
  150. package/dist/esm/queries2/ranges.js.map +0 -1
  151. package/dist/esm/queries2/utils.d.ts +0 -1
  152. package/dist/esm/queries2/utils.js.map +0 -1
  153. package/dist/esm/reactives/DocumentFamiliyCache.js.map +0 -1
  154. package/dist/esm/reactives/Entity.js.map +0 -1
  155. package/dist/esm/reactives/EntityStore.js.map +0 -1
  156. package/dist/esm/reactives/FakeWeakRef.js.map +0 -1
  157. package/dist/cjs/{reactives → entities}/Entity.d.ts +0 -0
  158. package/dist/cjs/{reactives → entities}/Entity.js +0 -0
  159. package/dist/cjs/{reactives → entities}/EntityStore.d.ts +0 -0
  160. package/dist/cjs/{reactives → entities}/FakeWeakRef.d.ts +0 -0
  161. package/dist/cjs/{reactives → entities}/FakeWeakRef.js +0 -0
  162. package/dist/cjs/{queries2 → queries}/BaseQuery.d.ts +1 -1
  163. package/dist/cjs/{queries2 → queries}/GetQuery.d.ts +0 -0
  164. package/dist/cjs/{queries2 → queries}/GetQuery.js +0 -0
  165. package/dist/cjs/{queries2 → queries}/dbQueries.d.ts +0 -0
  166. package/dist/cjs/{queries2 → queries}/dbQueries.js +0 -0
  167. package/dist/cjs/{queries2 → queries}/keys.d.ts +0 -0
  168. package/dist/cjs/{queries2 → queries}/keys.js +0 -0
  169. package/dist/cjs/{queries2 → queries}/ranges.d.ts +0 -0
  170. package/dist/cjs/{queries2 → queries}/ranges.js +0 -0
  171. package/dist/cjs/{queries2 → queries}/types.d.ts +0 -0
  172. package/dist/cjs/{queries2 → queries}/types.js +0 -0
  173. package/dist/esm/{reactives → entities}/Entity.d.ts +0 -0
  174. package/dist/esm/{reactives → entities}/Entity.js +0 -0
  175. package/dist/esm/{reactives → entities}/EntityStore.d.ts +0 -0
  176. package/dist/esm/{reactives → entities}/FakeWeakRef.d.ts +0 -0
  177. package/dist/esm/{reactives → entities}/FakeWeakRef.js +0 -0
  178. package/dist/esm/{queries2 → queries}/BaseQuery.d.ts +1 -1
  179. /package/dist/esm/{queries2 → queries}/GetQuery.d.ts +0 -0
  180. /package/dist/esm/{queries2 → queries}/GetQuery.js +0 -0
  181. /package/dist/esm/{queries2 → queries}/dbQueries.d.ts +0 -0
  182. /package/dist/esm/{queries2 → queries}/dbQueries.js +0 -0
  183. /package/dist/esm/{queries2 → queries}/keys.d.ts +0 -0
  184. /package/dist/esm/{queries2 → queries}/keys.js +0 -0
  185. /package/dist/esm/{queries2 → queries}/ranges.d.ts +0 -0
  186. /package/dist/esm/{queries2 → queries}/ranges.js +0 -0
  187. /package/dist/esm/{queries2 → queries}/types.d.ts +0 -0
  188. /package/dist/esm/{queries2 → queries}/types.js +0 -0
  189. /package/src/{reactives → entities}/Entity.ts +0 -0
  190. /package/src/{reactives → entities}/FakeWeakRef.ts +0 -0
  191. /package/src/{reactives → entities}/design.tldr +0 -0
  192. /package/src/{queries2 → queries}/GetQuery.ts +0 -0
  193. /package/src/{queries2 → queries}/dbQueries.ts +0 -0
  194. /package/src/{queries2 → queries}/keys.ts +0 -0
  195. /package/src/{queries2 → queries}/ranges.ts +0 -0
  196. /package/src/{queries2 → queries}/types.ts +0 -0
@@ -35,7 +35,7 @@ export class EntityStore {
35
35
  properties: this.schema.collections[collection].fields,
36
36
  };
37
37
  };
38
- this.refreshFamilyCache = async (familyCache) => {
38
+ this.refreshFamilyCache = async (familyCache, dropUnconfirmed = false) => {
39
39
  // avoid writing to disposed db
40
40
  if (this._disposed)
41
41
  return;
@@ -51,10 +51,14 @@ export class EntityStore {
51
51
  baselines.push(baseline);
52
52
  }, {
53
53
  transaction,
54
+ mode: 'readwrite',
54
55
  }),
55
- this.meta.operations.iterateOverAllOperationsForDocument(familyCache.oid, (op) => operations.push(op), { transaction }),
56
+ this.meta.operations.iterateOverAllOperationsForDocument(familyCache.oid, (op) => {
57
+ op.confirmed = true;
58
+ operations.push(op);
59
+ }, { transaction, mode: 'readwrite' }),
56
60
  ]);
57
- familyCache.reset(operations, baselines);
61
+ familyCache.reset(operations, baselines, dropUnconfirmed);
58
62
  };
59
63
  this.openFamilyCache = async (oid) => {
60
64
  const documentOid = getOidRoot(oid);
@@ -151,7 +155,7 @@ export class EntityStore {
151
155
  assignOid(processed, oid);
152
156
  const operations = this.meta.patchCreator.createInitialize(processed, oid);
153
157
  const familyCache = await this.openFamilyCache(oid);
154
- familyCache.insertUnconfirmedOperations(operations);
158
+ familyCache.insertLocalOperations(operations);
155
159
  // don't enqueue these, submit as distinct operation.
156
160
  // we do this so it can be immediately queryable from storage...
157
161
  // only holding it in memory would introduce lag before it shows up
@@ -163,18 +167,18 @@ export class EntityStore {
163
167
  }
164
168
  return familyCache.getEntity(oid, schema);
165
169
  };
166
- this.addOperationsToOpenCaches = async (operations, confirmed = true, info) => {
170
+ this.addOperationsToOpenCaches = async (operations, info) => {
167
171
  const operationsByOid = groupPatchesByRootOid(operations);
168
172
  const oids = Object.keys(operationsByOid);
169
173
  oids.forEach((oid) => {
170
174
  const familyCache = this.documentFamilyCaches.get(oid);
171
175
  if (familyCache) {
172
- this.log('adding', confirmed ? 'confirmed' : 'unconfirmed', 'operations to cache', oid, operationsByOid[oid].length);
173
- if (confirmed) {
174
- familyCache.insertOperations(operationsByOid[oid], info);
176
+ this.log('adding', info.confirmed ? 'confirmed' : 'unconfirmed', 'operations to cache', oid, operationsByOid[oid].length);
177
+ if (info.isLocal) {
178
+ familyCache.insertLocalOperations(operationsByOid[oid]);
175
179
  }
176
180
  else {
177
- familyCache.insertUnconfirmedOperations(operationsByOid[oid]);
181
+ familyCache.insertOperations(operationsByOid[oid], info);
178
182
  }
179
183
  }
180
184
  });
@@ -191,19 +195,20 @@ export class EntityStore {
191
195
  });
192
196
  };
193
197
  this.addDataToOpenCaches = ({ baselines, operations, reset, isLocal, }) => {
198
+ var _a, _b, _c, _d;
194
199
  const baselinesByDocumentOid = groupBaselinesByRootOid(baselines);
195
200
  const operationsByDocumentOid = groupPatchesByRootOid(operations);
196
201
  const allDocumentOids = Array.from(new Set(Object.keys(baselinesByDocumentOid).concat(Object.keys(operationsByDocumentOid))));
197
202
  for (const oid of allDocumentOids) {
198
203
  const familyCache = this.documentFamilyCaches.get(oid);
199
204
  if (familyCache) {
200
- familyCache.addConfirmedData({
205
+ familyCache.addData({
201
206
  operations: operationsByDocumentOid[oid] || [],
202
207
  baselines: baselinesByDocumentOid[oid] || [],
203
208
  reset,
204
209
  isLocal,
205
210
  });
206
- this.log('debug', 'Added data to cache for', oid);
211
+ this.log('debug', 'Added data to cache for', oid, (_b = (_a = operationsByDocumentOid[oid]) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0, 'operations', (_d = (_c = baselinesByDocumentOid[oid]) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0, 'baselines');
207
212
  }
208
213
  else {
209
214
  this.log('debug', 'Could not add data to cache for', oid, 'because it is not open');
@@ -212,22 +217,38 @@ export class EntityStore {
212
217
  return allDocumentOids;
213
218
  };
214
219
  this.addData = async ({ operations, baselines, reset, }) => {
215
- // first, synchronously add data to any open caches for immediate change propagation
216
- const allDocumentOids = this.addDataToOpenCaches({
217
- operations,
218
- baselines,
219
- reset,
220
- });
221
- // then, asynchronously add data to storage
220
+ // convert operations to tagged operations with confirmed = false
221
+ // while we process and store them. this is in-place so as to
222
+ // not allocate a bunch of objects...
223
+ const taggedOperations = operations;
224
+ for (const op of taggedOperations) {
225
+ op.confirmed = false;
226
+ }
227
+ let allDocumentOids = [];
228
+ // in a reset scenario, it only makes things confusing if we
229
+ // optimistically apply incoming operations, since the local
230
+ // history is out of sync
222
231
  if (reset) {
223
232
  this.log('Resetting local store to replicate remote synced data', baselines.length, 'baselines, and', operations.length, 'operations');
224
233
  await this.meta.reset();
225
234
  await this.resetStoredDocuments();
235
+ allDocumentOids = Array.from(new Set(baselines
236
+ .map((b) => getOidRoot(b.oid))
237
+ .concat(operations.map((o) => getOidRoot(o.oid)))));
238
+ }
239
+ else {
240
+ // first, synchronously add data to any open caches for immediate change propagation
241
+ allDocumentOids = this.addDataToOpenCaches({
242
+ operations: taggedOperations,
243
+ baselines,
244
+ reset,
245
+ });
226
246
  }
247
+ // then, asynchronously add data to storage
227
248
  await this.meta.insertRemoteBaselines(baselines);
228
249
  await this.meta.insertRemoteOperations(operations);
229
250
  if (reset) {
230
- await this.refreshAllCaches();
251
+ await this.refreshAllCaches(true);
231
252
  }
232
253
  // recompute all affected documents for querying
233
254
  for (const oid of allDocumentOids) {
@@ -240,7 +261,10 @@ export class EntityStore {
240
261
  };
241
262
  this.addLocalOperations = async (operations) => {
242
263
  this.log('Adding local operations', operations.length);
243
- this.addOperationsToOpenCaches(operations, false, { isLocal: true });
264
+ this.addOperationsToOpenCaches(operations, {
265
+ isLocal: true,
266
+ confirmed: false,
267
+ });
244
268
  this.operationBatcher.add({
245
269
  key: this.currentBatchKey,
246
270
  items: operations,
@@ -313,10 +337,10 @@ export class EntityStore {
313
337
  this.undoHistory.addUndo(await this.createUndo(operations));
314
338
  }
315
339
  await this.meta.insertLocalOperation(operations);
340
+ // confirm the operations
341
+ this.addDataToOpenCaches({ operations, baselines: [] });
316
342
  // recompute all affected documents for querying
317
343
  const allDocumentOids = Array.from(new Set(operations.map((op) => getOidRoot(op.oid))));
318
- // confirm the operations
319
- this.addDataToOpenCaches({ operations, baselines: [], isLocal: true });
320
344
  for (const oid of allDocumentOids) {
321
345
  await this.writeDocumentToStorage(oid);
322
346
  }
@@ -369,7 +393,7 @@ export class EntityStore {
369
393
  this.reset = async () => {
370
394
  this.context.log('warn', 'Resetting local database');
371
395
  await this.resetStoredDocuments();
372
- await this.refreshAllCaches();
396
+ await this.refreshAllCaches(true);
373
397
  // this.context.entityEvents.emit(
374
398
  // 'collectionsChanged',
375
399
  // Object.keys(this.schema.collections),
@@ -398,9 +422,9 @@ export class EntityStore {
398
422
  await storeRequestPromise(store.clear());
399
423
  }
400
424
  };
401
- this.refreshAllCaches = async () => {
425
+ this.refreshAllCaches = async (dropUnconfirmed = false) => {
402
426
  for (const [_, cache] of this.documentFamilyCaches) {
403
- await this.refreshFamilyCache(cache);
427
+ await this.refreshFamilyCache(cache, dropUnconfirmed);
404
428
  }
405
429
  };
406
430
  this.context = context;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"EntityStore.js","sourceRoot":"","sources":["../../../src/entities/EntityStore.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FakeWeakRef.js","sourceRoot":"","sources":["../../../src/entities/FakeWeakRef.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,OAAO,OAAO;IACnB,YAAY,KAAQ;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAID,KAAK;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CACD"}
@@ -7,14 +7,14 @@ export { ClientDescriptor as StorageDescriptor };
7
7
  export { Client as Storage };
8
8
  export type { ClientDescriptorOptions };
9
9
  export type { ClientDescriptorOptions as StorageInitOptions };
10
- export { Entity } from './reactives/Entity.js';
11
- export type { ObjectEntity, ListEntity, EntityShape, AccessibleEntityProperty, AnyEntity, EntityDestructured, } from './reactives/Entity.js';
10
+ export { Entity } from './entities/Entity.js';
11
+ export type { ObjectEntity, ListEntity, EntityShape, AccessibleEntityProperty, AnyEntity, EntityDestructured, } from './entities/Entity.js';
12
12
  export { ServerSync } from './sync/Sync.js';
13
13
  export type { SyncTransportMode } from './sync/Sync.js';
14
14
  export { EntityFile } from './files/EntityFile.js';
15
15
  export { collection, schema, createDefaultMigration, migrate, } from '@verdant-web/common';
16
16
  export type { StorageDocument, StorageSchema, StorageCollectionSchema, Migration, } from '@verdant-web/common';
17
17
  export type { UserInfo } from '@verdant-web/common';
18
- export type { Query } from './queries2/types.js';
19
- export type { CollectionQueries } from './queries2/CollectionQueries.js';
18
+ export type { Query } from './queries/types.js';
19
+ export type { CollectionQueries } from './queries/CollectionQueries.js';
20
20
  export { MigrationPathError } from './migration/errors.js';
package/dist/esm/index.js CHANGED
@@ -5,7 +5,7 @@ export { Client };
5
5
  // backward compat
6
6
  export { ClientDescriptor as StorageDescriptor };
7
7
  export { Client as Storage };
8
- export { Entity } from './reactives/Entity.js';
8
+ export { Entity } from './entities/Entity.js';
9
9
  export { ServerSync } from './sync/Sync.js';
10
10
  export { EntityFile } from './files/EntityFile.js';
11
11
  export { collection, schema, createDefaultMigration, migrate, } from '@verdant-web/common';
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,gBAAgB,GAEhB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,kBAAkB;AAClB,OAAO,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,CAAC;AAG7B,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS/C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACN,UAAU,EACV,MAAM,EACN,sBAAsB,EACtB,OAAO,GACP,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,gBAAgB,GAEhB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,kBAAkB;AAClB,OAAO,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,CAAC;AAG7B,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAS9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACN,UAAU,EACV,MAAM,EACN,sBAAsB,EACtB,OAAO,GACP,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { addFieldDefaults, assert, assignIndexValues, assignOidPropertiesToAllSubObjects, assignOidsToAllSubObjects, cloneDeep, createOid, decomposeOid, diffToPatches, hasOid, initialToPatches, removeOidPropertiesFromAllSubObjects, } from '@verdant-web/common';
2
- import { findAllOids, findOneOid } from '../queries2/dbQueries.js';
2
+ import { findAllOids, findOneOid } from '../queries/dbQueries.js';
3
3
  import { acquireLock, closeDatabase, getDatabaseVersion, openDatabase, upgradeDatabase, } from './db.js';
4
4
  import { getMigrationPath } from './paths.js';
5
5
  const globalIDB = typeof window !== 'undefined' ? window.indexedDB : undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"openDatabase.js","sourceRoot":"","sources":["../../../src/migration/openDatabase.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"openDatabase.js","sourceRoot":"","sources":["../../../src/migration/openDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAMN,gBAAgB,EAChB,MAAM,EACN,iBAAiB,EAEjB,kCAAkC,EAClC,yBAAyB,EACzB,SAAS,EACT,SAAS,EACT,YAAY,EACZ,aAAa,EAEb,MAAM,EACN,gBAAgB,EAEhB,oCAAoC,GAEpC,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACN,WAAW,EACX,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,eAAe,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,SAAS,GACd,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAE,SAAiB,CAAC;AAIvE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAC1C,OAAO,EACP,SAAS,GAAG,SAAS,EACrB,UAAU,EACV,IAAI,EACJ,OAAO,GAOP;IACA,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAC9C,SAAS,EACT,OAAO,CAAC,SAAS,EACjB,OAAO,EACP,OAAO,CAAC,GAAG,CACX,CAAC;IAEF,OAAO,CAAC,GAAG,CACV,2BAA2B,EAC3B,cAAc,EACd,iBAAiB,EACjB,OAAO,CACP,CAAC;IAEF,MAAM,KAAK,GAAG,gBAAgB,CAAC;QAC9B,cAAc;QACd,aAAa,EAAE,OAAO;QACtB,UAAU;KACV,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,MAAM,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAC/C,mBAAmB;YACnB,KAAK,MAAM,SAAS,IAAI,KAAyB,EAAE;gBAClD,qFAAqF;gBACrF,4BAA4B;gBAC5B,IAAI,MAAiC,CAAC;gBACtC,IAAI,SAAS,CAAC,OAAO,KAAK,CAAC,EAAE;oBAC5B,MAAM,GAAG,0BAA0B,CAAC;wBACnC,IAAI;wBACJ,SAAS;wBACT,OAAO;qBACP,CAAC,CAAC;oBACH,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;iBAChC;qBAAM;oBACN,mFAAmF;oBACnF,6CAA6C;oBAC7C,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAC1C,SAAS,EACT,OAAO,CAAC,SAAS,EACjB,SAAS,CAAC,SAAS,CAAC,OAAO,CAC3B,CAAC;oBAEF,6DAA6D;oBAC7D,MAAM,GAAG,kBAAkB,CAAC;wBAC3B,IAAI;wBACJ,SAAS;wBACT,OAAO,kCACH,OAAO,KACV,UAAU,EAAE,gBAAgB,GAC5B;qBACD,CAAC,CAAC;oBACH,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBAChC,uDAAuD;oBACvD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBAErC,mEAAmE;oBACnE,0DAA0D;oBAC1D,MAAM,aAAa,CAAC,gBAAgB,CAAC,CAAC;iBACtC;gBACD,MAAM,eAAe,CACpB,SAAS,EACT,OAAO,CAAC,SAAS,EACjB,SAAS,CAAC,SAAS,CAAC,OAAO,EAC3B,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE;oBACnB,KAAK,MAAM,aAAa,IAAI,SAAS,CAAC,gBAAgB,EAAE;wBACvD,EAAE,CAAC,iBAAiB,CAAC,aAAa,EAAE;4BACnC,OAAO,EACN,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,UAAU;4BAC1D,aAAa,EAAE,KAAK;yBACpB,CAAC,CAAC;qBACH;oBAED,KAAK,MAAM,UAAU,IAAI,SAAS,CAAC,cAAc,EAAE;wBAClD,MAAM,KAAK,GAAG,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;wBAClD,oBAAoB;wBACpB,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE;4BAChE,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;gCAC/C,UAAU,EAAE,QAAQ,CAAC,UAAU;6BAC/B,CAAC,CAAC;yBACH;wBACD,qBAAqB;wBACrB,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;4BAC1D,EAAE,EAAE;4BACJ,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;yBACjC;qBACD;oBACD,KAAK,MAAM,iBAAiB,IAAI,SAAS,CAAC,kBAAkB,EAAE;wBAC7D,mEAAmE;wBACnE,sEAAsE;wBACtE,wBAAwB;wBACxB,WAAW,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,KAAK,EAAE,CAAC;qBACnD;gBACF,CAAC,EACD,OAAO,CAAC,GAAG,CACX,CAAC;gBAEF,qEAAqE;gBACrE,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAC1C,SAAS,EACT,OAAO,CAAC,SAAS,EACjB,SAAS,CAAC,SAAS,CAAC,OAAO,CAC3B,CAAC;gBACF,KAAK,MAAM,UAAU,IAAI,SAAS,CAAC,cAAc,EAAE;oBAClD,2DAA2D;oBAC3D,MAAM,uBAAuB,GAAG,gBAAgB,CAAC,WAAW,CAC3D,UAAU,EACV,WAAW,CACX,CAAC;oBACF,MAAM,SAAS,GAAG,uBAAuB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;oBAClE,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC;oBACzC,uBAAuB;oBACvB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;oBAChE,IAAI,CAAC,IAAI,CACR,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;wBAChC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC;oBACpD,CAAC,CAAC,CACF,CAAC;oBAEF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;wBACtB,IAAI;4BACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;4BACjD,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;yBACnB;wBAAC,OAAO,CAAC,EAAE;4BACX,8DAA8D;4BAC9D,6BAA6B;4BAC7B,OAAO,CAAC,GAAG,CACV,OAAO,EACP,wDAAwD,EACxD,GAAG,EACH,qCAAqC,EACrC,CAAC,CACD,CAAC;4BACF,OAAO,IAAI,CAAC;yBACZ;oBACF,CAAC,CAAC,CACF,CAAC;oBAEF,MAAM,KAAK,GAAG,SAAS;yBACrB,MAAM,CAAC,CAAC,CAAC,EAAsB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;yBACtC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,EAAE;wBACxB,IAAI,CAAC,QAAQ;4BAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;wBACvC,MAAM,IAAI,GAAG,iBAAiB,CAC7B,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,EAC3C,QAAQ,CACR,CAAC;wBACF,+DAA+D;wBAC/D,kCAAkC,CAAC,IAAI,CAAC,CAAC;wBACzC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBACpB,CAAC,CAAC,CAAC;oBAEJ,sCAAsC;oBACtC,MAAM,wBAAwB,GAAG,gBAAgB,CAAC,WAAW,CAC5D,UAAU,EACV,WAAW,CACX,CAAC;oBACF,MAAM,UAAU,GAAG,wBAAwB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;oBACpE,MAAM,OAAO,CAAC,GAAG,CAChB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;wBACzB,IAAI,IAAI,EAAE;4BACT,OAAO,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;yBACjC;6BAAM;4BACN,MAAM,EAAE,EAAE,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;4BACjC,OAAO,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;yBAClC;oBACF,CAAC,CAAC,CACF,CAAC;iBACF;gBAED,MAAM,aAAa,CAAC,gBAAgB,CAAC,CAAC;gBAEtC,OAAO,CAAC,GAAG,CAAC;WACL,SAAS,CAAC,SAAS,CAAC,OAAO;6BACT,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;+BACnC,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;+BACvC,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;uBAC/C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;qBAClD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACZ,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAC1D;qBACA,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;qBACjB,IAAI,CAAC,IAAI,CAAC;2BACS,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;qBACxD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACZ,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAC5D;qBACA,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;qBACjB,IAAI,CAAC,IAAI,CAAC;KACb,CAAC,CAAC;aACH;QACF,CAAC,CAAC,CAAC;QACH,OAAO,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KAC3D;SAAM;QACN,yBAAyB;QACzB,OAAO,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KAC3D;AACF,CAAC;AAED,SAAS,qBAAqB,CAAC,EAC9B,SAAS,EACT,IAAI,EACJ,eAAe,EACf,OAAO,GAMP;IACA,OAAO,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,cAAc,EAAE,EAAE;QAC9D,GAAG,CAAC,cAAc,CAAC,GAAG;YACrB,GAAG,EAAE,KAAK,EAAE,GAAQ,EAAE,EAAE;gBACvB,eAAe;gBACf,gBAAgB,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,CAAC;gBACvE,MAAM,UAAU,GACf,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,CAAC;gBACjE,MAAM,GAAG,GAAG,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;gBAClD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClB,MAAM,IAAI,CAAC,oBAAoB,CAC9B,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,eAAe,CAAC,CAC3C,CAAC;gBACF,OAAO,GAAG,CAAC;YACZ,CAAC;YACD,MAAM,EAAE,CAAC,EAAU,EAAE,EAAE;gBACtB,MAAM,GAAG,GAAG,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;gBAC1C,OAAO,IAAI,CAAC,oBAAoB,CAAC;oBAChC;wBACC,GAAG;wBACH,SAAS,EAAE,eAAe,EAAE;wBAC5B,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;qBACtB;iBACD,CAAC,CAAC;YACJ,CAAC;SACD,CAAC;QACF,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAS,CAAC,CAAC;AACf,CAAC;AAED,SAAS,mBAAmB,CAAC,EAC5B,SAAS,EACT,OAAO,EACP,IAAI,GAKJ;IACA,OAAO,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,cAAc,EAAE,EAAE;QAC9D,GAAG,CAAC,cAAc,CAAC,GAAG;YACrB,GAAG,EAAE,KAAK,EAAE,EAAU,EAAE,EAAE;gBACzB,MAAM,GAAG,GAAG,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;gBAC1C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;gBAChD,oCAAoC;gBACpC,OAAO,GAAG,CAAC;YACZ,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,MAAwB,EAAE,EAAE;gBAC3C,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC;oBAC5B,UAAU,EAAE,cAAc;oBAC1B,KAAK,EAAE,MAAM;oBACb,OAAO;iBACP,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG;oBAAE,OAAO,IAAI,CAAC;gBACtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;gBAChD,oCAAoC;gBACpC,OAAO,GAAG,CAAC;YACZ,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,MAAwB,EAAE,EAAE;gBAC3C,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC;oBAC9B,UAAU,EAAE,cAAc;oBAC1B,KAAK,EAAE,MAAM;oBACb,OAAO;iBACP,CAAC,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAChD,CAAC;gBACF,2DAA2D;gBAC3D,OAAO,IAAI,CAAC;YACb,CAAC;SACD,CAAC;QACF,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAS,CAAC,CAAC;AACf,CAAC;AAED,SAAS,kBAAkB,CAAC,EAC3B,IAAI,EACJ,SAAS,EACT,OAAO,GAMP;IACA,SAAS,eAAe;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,KAAK,EAAoB,CAAC;IAE9C,MAAM,OAAO,GAAG,mBAAmB,CAAC;QACnC,SAAS;QACT,OAAO;QACP,IAAI;KACJ,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,qBAAqB,CAAC;QACvC,SAAS;QACT,eAAe;QACf,OAAO;QACP,IAAI;KACJ,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,KAAK,EAAgB,CAAC;IAC7C,MAAM,MAAM,GAAkD;QAC7D,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO;QACP,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YACvC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;YAEjD,MAAM,OAAO,CAAC,GAAG,CAChB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAQ,EAAE,EAAE;gBAC3B,MAAM,CACL,MAAM,CAAC,GAAG,CAAC,EACX,+BAA+B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CACpD,CAAC;gBACF,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;gBAChC,+CAA+C;gBAC/C,sEAAsE;gBACtE,sBAAsB;gBACtB,oDAAoD;gBACpD,mDAAmD;gBACnD,KAAK;gBACL,+BAA+B;gBAC/B,oBAAoB;gBACpB,MAAM;gBACN,yCAAyC;gBACzC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACrC,IAAI,QAAQ,EAAE;oBACb,+DAA+D;oBAC/D,gEAAgE;oBAChE,oBAAoB;oBACpB,oCAAoC,CAAC,QAAQ,CAAC,CAAC;oBAC/C,oCAAoC,CAAC,QAAQ,CAAC,CAAC;oBAC/C,yBAAyB,CAAC,QAAQ,CAAC,CAAC;oBACpC,MAAM,OAAO,GAAG,aAAa,CAC5B,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,SAAS,EACT,EAAE,EACF;wBACC,mBAAmB,EAAE,IAAI;qBACzB,CACD,CAAC;oBACF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;wBACvB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;qBACzC;iBACD;YACF,CAAC,CAAC,CACF,CAAC;QACH,CAAC;QACD,OAAO;QACP,SAAS;QACT,UAAU;KACV,CAAC;IACF,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,0BAA0B,CAAC,EACnC,IAAI,EACJ,SAAS,EACT,OAAO,GAKP;IACA,SAAS,eAAe;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,KAAK,EAAoB,CAAC;IAE9C,MAAM,OAAO,GAAG,IAAI,KAAK,CAAC,EAAS,EAAE;QACpC,GAAG;YACF,MAAM,IAAI,KAAK,CACd,8EAA8E,CAC9E,CAAC;QACH,CAAC;KACD,CAAQ,CAAC;IAEV,MAAM,SAAS,GAAG,qBAAqB,CAAC;QACvC,SAAS;QACT,eAAe;QACf,OAAO;QACP,IAAI;KACJ,CAAC,CAAC;IACH,MAAM,MAAM,GAAkD;QAC7D,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO;QACP,OAAO,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;YACjC,MAAM,IAAI,KAAK,CACd,4HAA4H,CAC5H,CAAC;QACH,CAAC;QACD,OAAO;QACP,SAAS;QACT,UAAU,EAAE,EAAE;KACd,CAAC;IACF,OAAO,MAAM,CAAC;AACf,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,KAAqB;IAC9C,OAAO,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;QACnC,OAAO,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC,CAAC;QACF,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;YAC3B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,KAAqB,EAAE,EAAU;IAC1D,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,OAAO,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,EAAE,CAAC;QACX,CAAC,CAAC;QACF,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;YAC3B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,KAAqB,EAAE,IAAS;IACtD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5C,OAAO,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,EAAE,CAAC;QACX,CAAC,CAAC;QACF,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE;YAC3B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC"}
@@ -1,8 +1,8 @@
1
1
  var _a;
2
2
  import { EventSubscriber } from '@verdant-web/common';
3
- import { filterResultSet } from './utils.js';
4
- import { Entity } from '../reactives/Entity.js';
3
+ import { Entity } from '../entities/Entity.js';
5
4
  import { Disposable } from '../utils/Disposable.js';
5
+ import { filterResultSet } from './utils.js';
6
6
  export const ON_ALL_UNSUBSCRIBED = Symbol('ON_ALL_UNSUBSCRIBED');
7
7
  export const UPDATE = Symbol('UPDATE');
8
8
  export class BaseQuery extends Disposable {
@@ -0,0 +1 @@
1
+ {"version":3,"file":"BaseQuery.js","sourceRoot":"","sources":["../../../src/queries/BaseQuery.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { CollectionFilter } from '@verdant-web/common';
2
2
  import { Context } from '../context.js';
3
- import { EntityStore } from '../reactives/EntityStore.js';
3
+ import { EntityStore } from '../entities/EntityStore.js';
4
4
  import { GetQuery } from './GetQuery.js';
5
5
  import { QueryCache } from './QueryCache.js';
6
6
  import { FindOneQuery } from './FindOneQuery.js';
@@ -4,6 +4,7 @@ import { FindOneQuery } from './FindOneQuery.js';
4
4
  import { FindPageQuery } from './FindPageQuery.js';
5
5
  import { FindInfiniteQuery } from './FindInfiniteQuery.js';
6
6
  import { FindAllQuery } from './FindAllQuery.js';
7
+ import { UPDATE } from './BaseQuery.js';
7
8
  export class CollectionQueries {
8
9
  constructor({ collection, cache, entities, context, documentManager, }) {
9
10
  this.serializeIndex = (index) => {
@@ -29,7 +30,9 @@ export class CollectionQueries {
29
30
  hydrate: this.hydrate,
30
31
  context: this.context,
31
32
  key,
32
- }));
33
+ }), (existing) => {
34
+ existing[UPDATE](index);
35
+ });
33
36
  };
34
37
  this.findAll = ({ index, key: providedKey, } = {}) => {
35
38
  const key = providedKey || `findAll:${this.collection}:${this.serializeIndex(index)}`;
@@ -39,12 +42,14 @@ export class CollectionQueries {
39
42
  hydrate: this.hydrate,
40
43
  context: this.context,
41
44
  key,
42
- }));
45
+ }), (existing) => {
46
+ existing[UPDATE](index);
47
+ });
43
48
  };
44
49
  this.findPage = ({ index, pageSize, page, key: providedKey, }) => {
45
50
  const key = providedKey ||
46
51
  `findPage:${this.collection}:${this.serializeIndex(index)}:${pageSize}`;
47
- return this.cache.set(new FindPageQuery({
52
+ return this.cache.getOrSet(key, () => new FindPageQuery({
48
53
  index,
49
54
  collection: this.collection,
50
55
  hydrate: this.hydrate,
@@ -52,7 +57,9 @@ export class CollectionQueries {
52
57
  key,
53
58
  pageSize,
54
59
  page,
55
- }));
60
+ }), (existing) => {
61
+ existing[UPDATE](index);
62
+ });
56
63
  };
57
64
  this.findAllInfinite = ({ index, pageSize, key: providedKey, }) => {
58
65
  const key = providedKey ||
@@ -64,7 +71,9 @@ export class CollectionQueries {
64
71
  context: this.context,
65
72
  key,
66
73
  pageSize,
67
- }));
74
+ }), (existing) => {
75
+ existing[UPDATE](index);
76
+ });
68
77
  };
69
78
  this.cache = cache;
70
79
  this.collection = collection;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"CollectionQueries.js","sourceRoot":"","sources":["../../../src/queries/CollectionQueries.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { CollectionFilter } from '@verdant-web/common';
2
- import { BaseQuery, BaseQueryOptions } from './BaseQuery.js';
2
+ 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;
@@ -8,4 +8,5 @@ export declare class FindAllQuery<T> extends BaseQuery<T[]> {
8
8
  hydrate: (oid: string) => Promise<T>;
9
9
  } & Omit<BaseQueryOptions<T[]>, 'initial'>);
10
10
  protected run: () => Promise<void>;
11
+ [UPDATE]: (index: CollectionFilter | undefined) => void;
11
12
  }
@@ -9,11 +9,13 @@ var __rest = (this && this.__rest) || function (s, e) {
9
9
  }
10
10
  return t;
11
11
  };
12
+ var _a;
13
+ import { BaseQuery, UPDATE } from './BaseQuery.js';
12
14
  import { findAllOids } from './dbQueries.js';
13
- import { BaseQuery } from './BaseQuery.js';
15
+ import { areIndexesEqual } from './utils.js';
14
16
  export class FindAllQuery extends BaseQuery {
15
- constructor(_a) {
16
- var { index, hydrate } = _a, rest = __rest(_a, ["index", "hydrate"]);
17
+ constructor(_b) {
18
+ var { index, hydrate } = _b, rest = __rest(_b, ["index", "hydrate"]);
17
19
  super(Object.assign({ initial: [] }, rest));
18
20
  this.run = async () => {
19
21
  const oids = await findAllOids({
@@ -23,8 +25,15 @@ export class FindAllQuery extends BaseQuery {
23
25
  });
24
26
  this.setValue(await Promise.all(oids.map(this.hydrate)));
25
27
  };
28
+ this[_a] = (index) => {
29
+ if (areIndexesEqual(this.index, index))
30
+ return;
31
+ this.index = index;
32
+ this.execute();
33
+ };
26
34
  this.index = index;
27
35
  this.hydrate = hydrate;
28
36
  }
29
37
  }
38
+ _a = UPDATE;
30
39
  //# sourceMappingURL=FindAllQuery.js.map
@@ -0,0 +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,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,OAAO,YAAgB,SAAQ,SAAc;IAIlD,YAAY,EAO8B;YAP9B,EACX,KAAK,EACL,OAAO,OAKkC,EAJtC,IAAI,cAHI,oBAIX,CADO;QAKP,KAAK,iBACJ,OAAO,EAAE,EAAE,IACR,IAAI,EACN,CAAC;QAKM,QAAG,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC;gBAC9B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,OAAO,EAAE,IAAI,CAAC,OAAO;aACrB,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1D,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;QAjBD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAgBD;KALC,MAAM"}
@@ -1,5 +1,5 @@
1
1
  import { CollectionFilter } from '@verdant-web/common';
2
- import { BaseQuery, BaseQueryOptions } from './BaseQuery.js';
2
+ import { BaseQuery, BaseQueryOptions, UPDATE } from './BaseQuery.js';
3
3
  export declare class FindInfiniteQuery<T> extends BaseQuery<T[]> {
4
4
  private index;
5
5
  private hydrate;
@@ -15,4 +15,5 @@ export declare class FindInfiniteQuery<T> extends BaseQuery<T[]> {
15
15
  } & Omit<BaseQueryOptions<T[]>, 'initial'>);
16
16
  protected run: () => Promise<void>;
17
17
  loadMore: () => Promise<void>;
18
+ [UPDATE]: (index: CollectionFilter | undefined) => void;
18
19
  }
@@ -9,8 +9,10 @@ var __rest = (this && this.__rest) || function (s, e) {
9
9
  }
10
10
  return t;
11
11
  };
12
- import { BaseQuery } from './BaseQuery.js';
12
+ var _a;
13
+ import { BaseQuery, UPDATE } from './BaseQuery.js';
13
14
  import { findPageOfOids } from './dbQueries.js';
15
+ import { areIndexesEqual } from './utils.js';
14
16
  export class FindInfiniteQuery extends BaseQuery {
15
17
  get pageSize() {
16
18
  return this._pageSize;
@@ -18,8 +20,8 @@ export class FindInfiniteQuery extends BaseQuery {
18
20
  get hasMore() {
19
21
  return this._hasNextPage;
20
22
  }
21
- constructor(_a) {
22
- var { hydrate, pageSize, index } = _a, rest = __rest(_a, ["hydrate", "pageSize", "index"]);
23
+ constructor(_b) {
24
+ var { hydrate, pageSize, index } = _b, rest = __rest(_b, ["hydrate", "pageSize", "index"]);
23
25
  super(Object.assign({ initial: [] }, rest));
24
26
  this._upToPage = 1;
25
27
  this._hasNextPage = false;
@@ -49,9 +51,16 @@ export class FindInfiniteQuery extends BaseQuery {
49
51
  ...(await Promise.all(result.map(this.hydrate))),
50
52
  ]);
51
53
  };
54
+ this[_a] = (index) => {
55
+ if (areIndexesEqual(this.index, index))
56
+ return;
57
+ this.index = index;
58
+ this.execute();
59
+ };
52
60
  this.index = index;
53
61
  this.hydrate = hydrate;
54
62
  this._pageSize = pageSize;
55
63
  }
56
64
  }
65
+ _a = UPDATE;
57
66
  //# sourceMappingURL=FindInfiniteQuery.js.map
@@ -0,0 +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,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,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,cAAc,CAAC;gBACpD,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;gBACtC,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;YAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC;QAEK,aAAQ,GAAG,KAAK,IAAI,EAAE;YAC5B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,cAAc,CAAC;gBACpD,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,SAAS;gBACrB,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;gBACvC,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;YACH,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,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;aAChD,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;QArCD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC3B,CAAC;CAmCD;KALC,MAAM"}
@@ -1,5 +1,5 @@
1
1
  import { CollectionFilter } from '@verdant-web/common';
2
- import { BaseQuery, BaseQueryOptions } from './BaseQuery.js';
2
+ import { BaseQuery, BaseQueryOptions, UPDATE } from './BaseQuery.js';
3
3
  export declare class FindOneQuery<T> extends BaseQuery<T | null> {
4
4
  private index;
5
5
  private hydrate;
@@ -8,4 +8,5 @@ export declare class FindOneQuery<T> extends BaseQuery<T | null> {
8
8
  hydrate: (oid: string) => Promise<T>;
9
9
  } & Omit<BaseQueryOptions<T | null>, 'initial'>);
10
10
  protected run: () => Promise<void>;
11
+ [UPDATE]: (index: CollectionFilter | undefined) => void;
11
12
  }
@@ -9,11 +9,13 @@ var __rest = (this && this.__rest) || function (s, e) {
9
9
  }
10
10
  return t;
11
11
  };
12
- import { BaseQuery } from './BaseQuery.js';
12
+ var _a;
13
+ import { BaseQuery, UPDATE } from './BaseQuery.js';
13
14
  import { findOneOid } from './dbQueries.js';
15
+ import { areIndexesEqual } from './utils.js';
14
16
  export class FindOneQuery extends BaseQuery {
15
- constructor(_a) {
16
- var { index, hydrate } = _a, rest = __rest(_a, ["index", "hydrate"]);
17
+ constructor(_b) {
18
+ var { index, hydrate } = _b, rest = __rest(_b, ["index", "hydrate"]);
17
19
  super(Object.assign({ initial: null }, rest));
18
20
  this.run = async () => {
19
21
  const oid = await findOneOid({
@@ -23,8 +25,15 @@ export class FindOneQuery extends BaseQuery {
23
25
  });
24
26
  this.setValue(oid ? await this.hydrate(oid) : null);
25
27
  };
28
+ this[_a] = (index) => {
29
+ if (areIndexesEqual(this.index, index))
30
+ return;
31
+ this.index = index;
32
+ this.execute();
33
+ };
26
34
  this.index = index;
27
35
  this.hydrate = hydrate;
28
36
  }
29
37
  }
38
+ _a = UPDATE;
30
39
  //# sourceMappingURL=FindOneQuery.js.map
@@ -0,0 +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,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,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,UAAU,CAAC;gBAC5B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,OAAO,EAAE,IAAI,CAAC,OAAO;aACrB,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACrD,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;QAjBD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAgBD;KALC,MAAM"}
@@ -1,5 +1,5 @@
1
1
  import { CollectionFilter } from '@verdant-web/common';
2
- import { BaseQuery, BaseQueryOptions } from './BaseQuery.js';
2
+ import { BaseQuery, BaseQueryOptions, UPDATE } from './BaseQuery.js';
3
3
  export declare class FindPageQuery<T> extends BaseQuery<T[]> {
4
4
  private index;
5
5
  private hydrate;
@@ -20,4 +20,5 @@ export declare class FindPageQuery<T> extends BaseQuery<T[]> {
20
20
  nextPage: () => Promise<void>;
21
21
  previousPage: () => Promise<void>;
22
22
  setPage: (page: number) => Promise<void>;
23
+ [UPDATE]: (index: CollectionFilter | undefined) => void;
23
24
  }