@verdant-web/store 2.8.5 → 3.0.0

package/dist/esm/metadata/OperationsStore.d.ts

@@ -9,6 +9,9 @@ export type StoredClientOperation = ClientOperation & {
     d_t: string;
 };
 export declare class OperationsStore extends IDBService {
+    constructor(db: IDBDatabase, opts: {
+        log?: (...args: any[]) => void;
+    });
     /**
      * Iterates over every patch for the root and every sub-object
      * of a given document. Optionally limit by timestamp.

package/dist/esm/metadata/OperationsStore.js

@@ -1,14 +1,18 @@
 import { createCompoundIndexValue, createLowerBoundIndexValue, createUpperBoundIndexValue, getOidRoot, assert, } from '@verdant-web/common';
 import { IDBService } from '../IDBService.js';
+import { isAbortError } from '../idb.js';
 export class OperationsStore extends IDBService {
-    constructor() {
-        super(...arguments);
+    constructor(db, opts) {
+        super(db, opts);
         /**
          * Iterates over every patch for the root and every sub-object
          * of a given document. Optionally limit by timestamp.
          */
         this.iterateOverAllOperationsForDocument = async (oid, iterator, { to, from, after, mode = 'readonly', transaction: providedTx, } = {}) => {
-            const transaction = providedTx || this.db.transaction('operations', mode);
+            const transaction = providedTx ||
+                this.createTransaction(['operations'], {
+                    mode,
+                });
             const store = transaction.objectStore('operations');
             const index = store.index('d_t');
             const startTimestamp = from || after;
@@ -38,12 +42,18 @@ export class OperationsStore extends IDBService {
                     }
                 };
                 request.onerror = (event) => {
-                    reject(event);
+                    if (isAbortError(request.error)) {
+                        resolve();
+                        return;
+                    }
+                    else {
+                        reject(request.error);
+                    }
                 };
             });
         };
         this.iterateOverAllOperationsForEntity = async (oid, iterator, { after, to, mode, transaction: providedTx, }) => {
-            const transaction = providedTx || this.db.transaction('operations', mode);
+            const transaction = providedTx || this.createTransaction(['operations'], { mode });
             const store = transaction.objectStore('operations');
             const start = after
                 ? createCompoundIndexValue(oid, after)
@@ -71,18 +81,23 @@ export class OperationsStore extends IDBService {
                     }
                 };
                 request.onerror = (event) => {
-                    reject(event);
+                    if (isAbortError(request.error)) {
+                        resolve();
+                    }
+                    else {
+                        reject(request.error);
+                    }
                 };
             });
         };
         this.iterateOverAllOperationsForCollection = async (collection, iterator, { after, to, mode, transaction: providedTx, }) => {
-            const transaction = providedTx || this.db.transaction('operations', mode);
+            const transaction = providedTx || this.createTransaction(['operations'], { mode });
             return this.iterate('operations', (store) => {
                 return store.openCursor(IDBKeyRange.bound(collection, collection + '\uffff', false, false), 'next');
-            }, iterator, mode, transaction);
+            }, iterator, { mode, transaction });
         };
         this.iterateOverAllLocalOperations = async (iterator, { before, after, mode = 'readonly', transaction: providedTx, }) => {
-            const transaction = providedTx || this.db.transaction('operations', mode);
+            const transaction = providedTx || this.createTransaction(['operations'], { mode });
             const store = transaction.objectStore('operations');
             const index = store.index('l_t');
             const start = after
@@ -110,7 +125,12 @@ export class OperationsStore extends IDBService {
                     }
                 };
                 request.onerror = (event) => {
-                    reject(event);
+                    if (isAbortError(request.error)) {
+                        resolve();
+                    }
+                    else {
+                        reject(request.error);
+                    }
                 };
             });
         };
@@ -119,15 +139,15 @@ export class OperationsStore extends IDBService {
                 const start = from ? createLowerBoundIndexValue(from) : undefined;
                 const end = before ? createUpperBoundIndexValue(before) : undefined;
                 const range = start && end
-                    ? IDBKeyRange.bound(start, end, false, true)
+                    ? window.IDBKeyRange.bound(start, end, false, true)
                     : start
-                        ? IDBKeyRange.lowerBound(start, false)
+                        ? window.IDBKeyRange.lowerBound(start, false)
                         : end
-                            ? IDBKeyRange.upperBound(end, true)
+                            ? window.IDBKeyRange.upperBound(end, true)
                             : undefined;
                 const index = store.index('timestamp');
                 return index.openCursor(range, 'next');
-            }, iterator, mode, transaction);
+            }, iterator, { mode, transaction });
         };
         /**
          * Adds a set of patches to the database.
@@ -144,7 +164,7 @@ export class OperationsStore extends IDBService {
             await this.runAll('operations', (store) => operations.map((op) => {
                 affected.add(getOidRoot(op.oid));
                 return store.put(op);
-            }), 'readwrite', transaction);
+            }), { mode: 'readwrite', transaction });
             return Array.from(affected);
         };
         this.reset = () => {

package/dist/esm/metadata/OperationsStore.js.map

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

package/dist/esm/migration/openDatabase.js

@@ -1,4 +1,4 @@
-import { addFieldDefaults, assert, assignOidsToAllSubObjects, cloneDeep, createOid, decomposeOid, diffToPatches, getIndexValues, getOidRoot, hasOid, initialToPatches, removeOidPropertiesFromAllSubObjects, } from '@verdant-web/common';
+import { addFieldDefaults, assert, assignOidsToAllSubObjects, cloneDeep, createOid, decomposeOid, diffToPatches, getIndexValues, getOid, getOidRoot, initialToPatches, removeOidPropertiesFromAllSubObjects, } from '@verdant-web/common';
 import { storeRequestPromise } from '../idb.js';
 import { findAllOids, findOneOid } from '../queries/dbQueries.js';
 import { acquireLock, closeDatabase, getDatabaseVersion, openDatabase, upgradeDatabase, } from './db.js';
@@ -113,7 +113,12 @@ async function runMigrations({ context, toRun, meta, indexedDB = globalIDB, name
                 }
                 catch (err) {
                     context.log('critical', `Migration failed (${migration.oldSchema.version} -> ${migration.newSchema.version})`, err);
-                    throw err;
+                    if (err instanceof Error) {
+                        throw err;
+                    }
+                    else {
+                        throw new Error('Unknown error during migration');
+                    }
                 }
                 // now we have to open the database again with the next version and
                 // make the appropriate schema changes during the upgrade.
@@ -181,6 +186,24 @@ async function runMigrations({ context, toRun, meta, indexedDB = globalIDB, name
                 }), ...docsWithUnappliedMigrations.filter((oid) => {
                     return decomposeOid(oid).collection === collection;
                 }));
+                // add 'touch' operations to all root OIDs of all documents.
+                // this marks documents which have undergone a migration
+                // so that other clients know when they're working
+                // with unmigrated data - by seeing that there are no
+                // existing operations or baselines with a timestamp
+                // that matches the current version.
+                // UPDATE: no longer necessary now that pruning is a thing.
+                // await Promise.all(
+                // 	oids.map((oid) =>
+                // 		meta.insertLocalOperations([
+                // 			{
+                // 				oid,
+                // 				timestamp: meta.time.zero(migration.version),
+                // 				data: { op: 'touch' },
+                // 			},
+                // 		]),
+                // 	),
+                // );
                 const snapshots = await Promise.all(oids.map(async (oid) => {
                     try {
                         const snap = await meta.getDocumentSnapshot(oid);
@@ -206,10 +229,7 @@ async function runMigrations({ context, toRun, meta, indexedDB = globalIDB, name
                 const writeStore = documentWriteTransaction.objectStore(collection);
                 await Promise.all(views.map(([oid, view]) => {
                     if (view) {
-                        return putView(writeStore, view).catch((err) => {
-                            view;
-                            throw err;
-                        });
+                        return putView(writeStore, view);
                     }
                     else {
                         const { id } = decomposeOid(oid);
@@ -245,13 +265,13 @@ function getMigrationMutations({ migration, meta, getMigrationNow, newOids, }) {
                 const primaryKey = doc[migration.newSchema.collections[collectionName].primaryKey];
                 const oid = createOid(collectionName, primaryKey);
                 newOids.push(oid);
-                await meta.insertLocalOperation(initialToPatches(doc, oid, getMigrationNow));
+                await meta.insertLocalOperations(initialToPatches(doc, oid, getMigrationNow));
                 return doc;
             },
             delete: async (id) => {
                 const rootOid = createOid(collectionName, id);
                 const allOids = await meta.getAllDocumentRelatedOids(rootOid);
-                return meta.insertLocalOperation(allOids.map((oid) => ({
+                return meta.insertLocalOperations(allOids.map((oid) => ({
                     oid,
                     timestamp: getMigrationNow(),
                     data: { op: 'delete' },
@@ -320,7 +340,7 @@ function getMigrationEngine({ meta, migration, context, }) {
     });
     const deleteCollection = async (collection) => {
         const allOids = await meta.getAllCollectionRelatedOids(collection);
-        return meta.insertLocalOperation(allOids.map((oid) => ({
+        return meta.insertLocalOperations(allOids.map((oid) => ({
             oid,
             timestamp: getMigrationNow(),
             data: { op: 'delete' },
@@ -334,7 +354,8 @@ function getMigrationEngine({ meta, migration, context, }) {
         migrate: async (collection, strategy) => {
             const docs = await queries[collection].findAll();
             await Promise.all(docs.filter(Boolean).map(async (doc) => {
-                assert(hasOid(doc), `Document is missing an OID: ${JSON.stringify(doc)}`);
+                const rootOid = getOid(doc);
+                assert(!!rootOid, `Document is missing an OID: ${JSON.stringify(doc)}`);
                 const original = cloneDeep(doc);
                 // @ts-ignore - excessive type resolution
                 const newValue = await strategy(doc);
@@ -349,7 +370,7 @@ function getMigrationEngine({ meta, migration, context, }) {
                         mergeUnknownObjects: true,
                     });
                     if (patches.length > 0) {
-                        await meta.insertLocalOperation(patches);
+                        await meta.insertLocalOperations(patches);
                     }
                 }
             }));

package/dist/esm/migration/openDatabase.js.map

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

package/dist/esm/queries/BaseQuery.js

@@ -20,6 +20,11 @@ export class BaseQuery extends Disposable {
             this._rawValue = value;
             this.subscribeToDeleteAndRestore(this._rawValue);
             this._value = filterResultSet(value);
+            // validate the value
+            if (Array.isArray(this._value) &&
+                this._value.some((v) => v.getSnapshot() === null)) {
+                debugger;
+            }
             this._status = 'ready';
             this._events.emit('change', this._value);
         };
@@ -65,8 +70,11 @@ export class BaseQuery extends Disposable {
                         // possibly accessing db while it's closed. not much we can do.
                         return this._value;
                     }
+                    throw err;
+                }
+                else {
+                    throw new Error('Unknown error executing query');
                 }
-                throw err;
             });
             return this._executionPromise;
         };
@@ -88,9 +96,13 @@ export class BaseQuery extends Disposable {
         this.addDispose(this.context.entityEvents.subscribe('collectionsChanged', (collections) => {
             if (shouldUpdateFn(collections)) {
                 this.context.log('info', 'Updating query', this.key);
+                // immediately refilter the result set - deleted
+                // entities will already be nulled out
+                // this.refreshValue();
                 this.execute();
             }
         }));
+        // TODO: subscribe to document changes and update if necessary.
     }
     get current() {
         return this._value;

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

@@ -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;IAepD,YAAY,EACX,OAAO,EACP,OAAO,EACP,UAAU,EACV,GAAG,EACH,YAAY,GACS;QACrB,KAAK,EAAE,CAAC;QAjBD,0BAAqB,GAAmB,EAAE,CAAC;QAE3C,YAAO,GAAgB,SAAS,CAAC;QACjC,sBAAiB,GAAsB,IAAI,CAAC;QA+F1C,aAAQ,GAAG,CAAC,KAAQ,EAAE,EAAE;YACjC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC,CAAC;QAEF,+CAA+C;QACrC,iBAAY,GAAG,GAAG,EAAE;YAC7B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEM,gCAA2B,GAAG,CAAC,KAAQ,EAAE,EAAE;;YAClD,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE;gBACzC,MAAA,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,2CAAI,CAAC;aACrC;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACzB,KAAK,CAAC,OAAO,CAAC,CAAC,MAAW,EAAE,EAAE;oBAC7B,IAAI,MAAM,YAAY,MAAM,EAAE;wBAC7B,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAC9B,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAC7C,CAAC;wBACF,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAC9B,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAC9C,CAAC;qBACF;gBACF,CAAC,CAAC,CAAC;aACH;iBAAM,IAAI,KAAK,YAAY,MAAM,EAAE;gBACnC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAC9B,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAC5C,CAAC;gBACF,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAC9B,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,EAAE;oBAC/B,IAAI,CAAC,YAAY,EAAE,CAAC;gBACrB,CAAC,CAAC,CACF,CAAC;aACF;QACF,CAAC,CAAC;QAEF,YAAO,GAAG,GAAG,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAEvD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;gBAC/B,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;aAC9B;iBAAM,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE;gBACpC,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;aAC9B;YACD,4DAA4D;YAE5D,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE;iBACjC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;iBACvB,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACd,IAAI,GAAG,YAAY,KAAK,EAAE;oBACzB,IACC,GAAG,CAAC,IAAI,KAAK,mBAAmB;wBAChC,GAAG,CAAC,IAAI,KAAK,oBAAoB,EAChC;wBACD,+DAA+D;wBAC/D,OAAO,IAAI,CAAC,MAAM,CAAC;qBACnB;iBACD;gBACD,MAAM,GAAG,CAAC;YACX,CAAC,CAAC,CAAC;YACJ,OAAO,IAAI,CAAC,iBAAiB,CAAC;QAC/B,CAAC,CAAC;QAGF,QAAqB,GAAG,CAAC,OAAsC,EAAE,EAAE;YAClE,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC;QACxC,CAAC,CAAC;QAvJD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,eAAe,CACjC,CAAC,KAA4B,EAAE,EAAE;;YAChC,IAAI,KAAK,KAAK,QAAQ;gBAAE,MAAA,IAAI,CAAC,uBAAuB,qDAAG,IAAI,CAAC,CAAC;QAC9D,CAAC,CACD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,MAAM,cAAc,GACnB,YAAY;YACZ,CAAC,CAAC,WAAqB,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,UAAU,CACd,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAClC,oBAAoB,EACpB,CAAC,WAAW,EAAE,EAAE;YACf,IAAI,cAAc,CAAC,WAAW,CAAC,EAAE;gBAChC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrD,IAAI,CAAC,OAAO,EAAE,CAAC;aACf;QACF,CAAC,CACD,CACD,CAAC;IACH,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,IAAI,QAAQ;;QACX,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjE,OAAO,MAAA,IAAI,CAAC,iBAAiB,mCAAI,IAAI,CAAC,OAAO,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAmBD,SAAS,CAAC,eAAoB,EAAE,QAAc;QAC7C,8CAA8C;QAC9C,IAAI,QAAQ,KAAK,SAAS,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;YACpE,mCAAmC;YACnC,IAAI,CAAC,QAAQ,CAAC;YACd,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;SACzD;aAAM,IAAI,eAAe,KAAK,QAAQ,IAAI,QAAQ,KAAK,SAAS,EAAE;YAClE,mCAAmC;YACnC,IAAI,CAAC,QAAQ,CAAC;YACd,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SAClD;aAAM,IACN,eAAe,KAAK,cAAc;YAClC,OAAO,QAAQ,KAAK,UAAU,EAC7B;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;SACzD;aAAM;YACN,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;SACzD;IACF,CAAC;CA0ED;KAHC,mBAAmB"}
+{"version":3,"file":"BaseQuery.js","sourceRoot":"","sources":["../../../src/queries/BaseQuery.ts"],"names":[],"mappings":"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"}

package/dist/esm/queries/CollectionQueries.js

@@ -77,7 +77,7 @@ export class CollectionQueries {
         };
         this.cache = cache;
         this.collection = collection;
-        this.hydrate = entities.get;
+        this.hydrate = entities.hydrate;
         this.context = context;
         this.documentManager = documentManager;
         this.put = this.documentManager.create.bind(this.documentManager, this.collection);

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

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

package/dist/esm/queries/FindAllQuery.js

@@ -23,6 +23,7 @@ export class FindAllQuery extends BaseQuery {
                 index: this.index,
                 context: this.context,
             });
+            this.context.log('debug', `FindAllQuery: ${oids.length} oids found: ${oids}`);
             this.setValue(await Promise.all(oids.map(this.hydrate)));
         };
         this[_a] = (index) => {

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

@@ -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"}
+{"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,OAAO,CAAC,GAAG,CACf,OAAO,EACP,iBAAiB,IAAI,CAAC,MAAM,gBAAgB,IAAI,EAAE,CAClD,CAAC;YACF,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;QArBD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;CAoBD;KALC,MAAM"}

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

@@ -13,4 +13,5 @@ export declare class QueryCache extends Disposable {
     set<V extends BaseQuery<any>>(value: V): V;
     getOrSet<V extends BaseQuery<any>>(key: string, create: () => V, update?: (query: V) => void): V;
     private onQueryUnsubscribed;
+    dropAll: () => void;
 }

package/dist/esm/queries/QueryCache.js

@@ -15,6 +15,10 @@ export class QueryCache extends Disposable {
                 }
             }, this._evictionTime);
         };
+        this.dropAll = () => {
+            this._cache.forEach((query) => query.dispose());
+            this._cache.clear();
+        };
         this._evictionTime = evictionTime;
         this.context = context;
     }

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

@@ -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;AAEhE,MAAM,OAAO,UAAW,SAAQ,UAAU;IAKzC,YAAY,EACX,YAAY,GAAG,CAAC,GAAG,IAAI,EACvB,OAAO,GAIP;QACA,KAAK,EAAE,CAAC;QAXD,WAAM,GAAgC,IAAI,GAAG,EAAE,CAAC;QAwChD,wBAAmB,GAAG,CAAC,KAAqB,EAAE,EAAE;YACvD,UAAU,CAAC,GAAG,EAAE;gBACf,IAAI,KAAK,CAAC,UAAU;oBAAE,OAAO;gBAC7B,qDAAqD;gBACrD,yCAAyC;gBACzC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;oBACzC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBAC9B;YACF,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACxB,CAAC,CAAC;QApCD,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,GAAG,CAA2B,GAAW;QACxC,OAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAO,IAAI,IAAI,CAAC;IAC5C,CAAC;IAED,GAAG,CAA2B,KAAQ;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,KAAK,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,QAAQ,CACP,GAAW,EACX,MAAe,EACf,MAA2B;QAE3B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAI,GAAG,CAAC,CAAC;QAClC,IAAI,QAAQ,EAAE;YACb,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,QAAQ,CAAC,CAAC;YACnB,OAAO,QAAQ,CAAC;SAChB;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3B,CAAC;CAYD"}
+{"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;AAEhE,MAAM,OAAO,UAAW,SAAQ,UAAU;IAKzC,YAAY,EACX,YAAY,GAAG,CAAC,GAAG,IAAI,EACvB,OAAO,GAIP;QACA,KAAK,EAAE,CAAC;QAXD,WAAM,GAAgC,IAAI,GAAG,EAAE,CAAC;QAwChD,wBAAmB,GAAG,CAAC,KAAqB,EAAE,EAAE;YACvD,UAAU,CAAC,GAAG,EAAE;gBACf,IAAI,KAAK,CAAC,UAAU;oBAAE,OAAO;gBAC7B,qDAAqD;gBACrD,yCAAyC;gBACzC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;oBACzC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBAC9B;YACF,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACxB,CAAC,CAAC;QAEF,YAAO,GAAG,GAAG,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC,CAAC;QAzCD,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,GAAG,CAA2B,GAAW;QACxC,OAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAO,IAAI,IAAI,CAAC;IAC5C,CAAC;IAED,GAAG,CAA2B,KAAQ;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,KAAK,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,QAAQ,CACP,GAAW,EACX,MAAe,EACf,MAA2B;QAE3B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAI,GAAG,CAAC,CAAC;QAClC,IAAI,QAAQ,EAAE;YACb,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,QAAQ,CAAC,CAAC;YACnB,OAAO,QAAQ,CAAC;SAChB;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3B,CAAC;CAiBD"}

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

@@ -0,0 +1,20 @@
+import { ObjectIdentifier } from '@verdant-web/common';
+import { IDBService } from '../IDBService.js';
+import { Context } from '../context.js';
+export declare class QueryableStorage extends IDBService {
+    private ctx;
+    constructor({ ctx }: {
+        ctx: Context;
+    });
+    /**
+     * DELETES EVERYTHING IN THE QUERYABLE DATABASE
+     */
+    reset: () => Promise<void>;
+    saveEntities: (entities: {
+        oid: ObjectIdentifier;
+        getSnapshot: () => any;
+    }[], opts?: {
+        abort?: AbortSignal;
+    }) => Promise<void>;
+    private saveDocument;
+}

package/dist/esm/queries/QueryableStorage.js

@@ -0,0 +1,80 @@
+import { decomposeOid, getIndexValues, } from '@verdant-web/common';
+import { IDBService } from '../IDBService.js';
+import { storeRequestPromise } from '../idb.js';
+export class QueryableStorage extends IDBService {
+    constructor({ ctx }) {
+        super(ctx.documentDb, { log: ctx.log });
+        /**
+         * DELETES EVERYTHING IN THE QUERYABLE DATABASE
+         */
+        this.reset = async () => {
+            const allCollections = Object.keys(this.ctx.schema.collections);
+            const tx = this.ctx.documentDb.transaction(allCollections, 'readwrite');
+            await Promise.all(allCollections.map((collection) => {
+                const store = tx.objectStore(collection);
+                return storeRequestPromise(store.clear());
+            }));
+            // notify queries to re-run now.
+            this.ctx.entityEvents.emit('collectionsChanged', allCollections);
+            this.ctx.log('info', '💨 Reset queryable storage');
+        };
+        this.saveEntities = async (entities, opts) => {
+            if (entities.length === 0) {
+                return;
+            }
+            const collections = Array.from(new Set(entities.map((e) => decomposeOid(e.oid).collection)));
+            const options = {
+                transaction: this.createTransaction(collections, {
+                    mode: 'readwrite',
+                    abort: opts === null || opts === void 0 ? void 0 : opts.abort,
+                }),
+            };
+            await Promise.all(entities.map(async (e) => {
+                const snapshot = e.getSnapshot();
+                try {
+                    await this.saveDocument(e.oid, snapshot, options);
+                }
+                catch (err) {
+                    this.ctx.log('error', `Error saving document ${e.oid} (${JSON.stringify(snapshot)})`, err);
+                    if (err instanceof Error) {
+                        throw err;
+                    }
+                    else {
+                        throw new Error('Unknown error saving document');
+                    }
+                }
+            }));
+            options.transaction.commit();
+            this.ctx.entityEvents.emit('collectionsChanged', collections);
+            for (const entity of entities) {
+                this.ctx.entityEvents.emit('documentChanged', entity.oid);
+            }
+        };
+        this.saveDocument = async (oid, doc, { transaction }) => {
+            this.ctx.log('debug', `Saving document indexes for querying ${oid}`, doc);
+            const { collection, id } = decomposeOid(oid);
+            if (!doc) {
+                await this.run(collection, (store) => store.delete(id), {
+                    mode: 'readwrite',
+                    transaction,
+                });
+                this.ctx.log('debug', `Deleted document indexes for querying ${oid}`);
+            }
+            else {
+                const schema = this.ctx.schema.collections[collection];
+                // no need to validate before storing; the entity's snapshot is already validated.
+                const indexes = getIndexValues(schema, doc);
+                await this.run(collection, (store) => store.put(indexes), {
+                    mode: 'readwrite',
+                    transaction,
+                });
+                this.ctx.log('debug', `Saved document indexes for querying ${oid}`, doc);
+            }
+        };
+        this.ctx = ctx;
+        this.addDispose(this.ctx.internalEvents.subscribe('documentDbChanged', (db) => {
+            this.db = db;
+        }));
+    }
+}
+//# sourceMappingURL=QueryableStorage.js.map

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

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