shelving 1.53.0 → 1.56.0

package/db/Database.d.ts

@@ -1,5 +1,5 @@
 import { Entry, Observable, Observer, Result, Unsubscriber, Results, Validatable, Validator, Key, Data, Entries, Datas, Validators, ValidatorType, Dispatcher } from "../util/index.js";
-import { PropUpdates, Update } from "../update/index.js";
+import { DataUpdate, PropUpdates } from "../update/index.js";
 import type { Provider } from "../provider/Provider.js";
 import { Filters, Sorts, Query, FilterProps, SortKeys } from "../query/index.js";
 /**
@@ -98,7 +98,7 @@ export declare class DatabaseQuery<T extends Data = Data> extends Query<T> imple
      * @param updates `Update` instance or set of updates to apply to every matching document.
      * @return Nothing (possibly promised).
      */
-    update(updates: Update<T> | PropUpdates<T>): number | PromiseLike<number>;
+    update(updates: DataUpdate<T> | PropUpdates<T>): number | PromiseLike<number>;
     /**
      * Delete all matching documents.
      * @return Nothing (possibly promised).
@@ -154,7 +154,7 @@ export declare class DatabaseDocument<T extends Data = Data> implements Observab
     /** Set the complete data of this document. */
     set(data: T): void | PromiseLike<void>;
     /** Update this document. */
-    update(updates: Update<T> | PropUpdates<T>): void | PromiseLike<void>;
+    update(updates: DataUpdate<T> | PropUpdates<T>): void | PromiseLike<void>;
     /** Delete this document. */
     delete(): void | PromiseLike<void>;
     /** Validate data for this query reference. */

package/db/Database.js

@@ -1,5 +1,5 @@
 import { callAsync, getFirstItem, throwAsync, validate, getMap, countItems, hasItems, ResultsObserver, } from "../util/index.js";
-import { DataUpdate, Update } from "../update/index.js";
+import { DataUpdate } from "../update/index.js";
 import { Feedback, InvalidFeedback } from "../feedback/index.js";
 import { Filters, Sorts, Query, Filter } from "../query/index.js";
 import { DocumentRequiredError, DocumentValidationError, QueryRequiredError, QueryValidationError } from "./errors.js";
@@ -130,7 +130,7 @@ export class DatabaseQuery extends Query {
      * @return Nothing (possibly promised).
      */
     update(updates) {
-        return this.db.provider.updateQuery(this, updates instanceof Update ? updates : new DataUpdate(updates));
+        return this.db.provider.updateQuery(this, updates instanceof DataUpdate ? updates : new DataUpdate(updates));
     }
     /**
      * Delete all matching documents.
@@ -236,7 +236,7 @@ export class DatabaseDocument {
     }
     /** Update this document. */
     update(updates) {
-        return this.db.provider.update(this, updates instanceof Update ? updates : new DataUpdate(updates));
+        return this.db.provider.update(this, updates instanceof DataUpdate ? updates : new DataUpdate(updates));
     }
     /** Delete this document. */
     delete() {

package/firestore/client/FirestoreClientProvider.d.ts

@@ -1,5 +1,5 @@
 import type { Firestore } from "firebase/firestore";
-import { Entries, Provider, DatabaseDocument, DatabaseQuery, Result, Observer, Update, AsynchronousProvider, Data, Unsubscriber } from "../../index.js";
+import { Entries, Provider, DatabaseDocument, DatabaseQuery, Result, Observer, AsynchronousProvider, DataUpdate, Data, Unsubscriber } from "../../index.js";
 /**
  * Firestore client database provider.
  * - Works with the Firebase JS SDK.
@@ -13,11 +13,11 @@ export declare class FirestoreClientProvider extends Provider implements Asynchr
     subscribe<T extends Data>(ref: DatabaseDocument<T>, observer: Observer<Result<T>>): Unsubscriber;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): Promise<string>;
     set<T extends Data>(ref: DatabaseDocument<T>, data: T): Promise<void>;
-    update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): Promise<void>;
+    update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): Promise<void>;
     delete<T extends Data>(ref: DatabaseDocument<T>): Promise<void>;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): Promise<Entries<T>>;
     subscribeQuery<T extends Data>(ref: DatabaseQuery<T>, observer: Observer<Entries<T>>): Unsubscriber;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, data: T): Promise<number>;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): Promise<number>;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): Promise<number>;
     deleteQuery<T extends Data>(ref: DatabaseQuery<T>): Promise<number>;
 }

package/firestore/client/FirestoreClientProvider.js

@@ -1,5 +1,5 @@
 import { orderBy as firestoreOrderBy, where as firestoreWhere, limit as firestoreLimit, increment as firestoreIncrement, arrayUnion as firestoreArrayUnion, arrayRemove as firestoreArrayRemove, deleteField as firestoreDeleteField, collection as firestoreCollection, doc as firestoreDocument, query as firestoreQuery, onSnapshot, addDoc, setDoc, updateDoc, deleteDoc, getDoc, getDocs, } from "firebase/firestore";
-import { Provider, dispatchNext, dispatchError, Update, ObjectUpdate, Increment, DataUpdate, AssertionError, ArrayUpdate, UnsupportedError, } from "../../index.js";
+import { Provider, dispatchNext, dispatchError, ObjectUpdate, Increment, DataUpdate, ArrayUpdate, UnsupportedError, } from "../../index.js";
 // Constants.
 // const ID = "__name__"; // DH: `__name__` is the entire path of the document. `__id__` is just ID.
 const ID = "__id__"; // Internal way Firestore Queries can reference the ID of the current document.
@@ -46,15 +46,10 @@ function* getResults(snapshot) {
         yield [s.id, s.data()];
 }
 /** Convert `Update` instances into corresponding Firestore `FieldValue` instances. */
-function getFieldValues(update) {
-    if (update instanceof DataUpdate)
-        return Object.fromEntries(yieldFieldValues(update));
-    throw new AssertionError("Unsupported transform", update);
-}
 function* yieldFieldValues(updates, prefix = "") {
     for (const [key, update] of updates) {
-        if (!(update instanceof Update))
-            yield [`${prefix}${key}`, update !== undefined ? update : firestoreDeleteField()];
+        if (update === undefined)
+            yield [`${prefix}${key}`, firestoreDeleteField()];
         else if (update instanceof Increment)
             yield [`${prefix}${key}`, firestoreIncrement(update.amount)];
         else if (update instanceof DataUpdate || update instanceof ObjectUpdate)
@@ -68,7 +63,7 @@ function* yieldFieldValues(updates, prefix = "") {
                 yield [`${prefix}${key}`, firestoreArrayRemove(...update.deletes)];
         }
         else
-            throw new AssertionError("Unsupported transform", update);
+            yield [`${prefix}${key}`, update];
     }
 }
 /**
@@ -95,8 +90,9 @@ export class FirestoreClientProvider extends Provider {
     async set(ref, data) {
         await setDoc(getDocument(this.firestore, ref), data);
     }
-    async update(ref, updates) {
-        await updateDoc(getDocument(this.firestore, ref), getFieldValues(updates));
+    async update(ref, update) {
+        const fieldValues = Object.fromEntries(yieldFieldValues(update));
+        await updateDoc(getDocument(this.firestore, ref), fieldValues);
     }
     async delete(ref) {
         await deleteDoc(getDocument(this.firestore, ref));
@@ -112,9 +108,9 @@ export class FirestoreClientProvider extends Provider {
         await Promise.all(snapshot.docs.map(s => setDoc(s.ref, data)));
         return snapshot.size;
     }
-    async updateQuery(ref, updates) {
+    async updateQuery(ref, update) {
         const snapshot = await getDocs(getQuery(this.firestore, ref));
-        const fieldValues = getFieldValues(updates);
+        const fieldValues = Object.fromEntries(yieldFieldValues(update));
         await Promise.all(snapshot.docs.map(s => updateDoc(s.ref, fieldValues)));
         return snapshot.size;
     }

package/firestore/lite/FirestoreLiteProvider.d.ts

@@ -1,5 +1,5 @@
 import type { Firestore } from "firebase/firestore/lite";
-import { Provider, DatabaseDocument, DatabaseQuery, Result, Update, AsynchronousProvider, Data, Entries, Unsubscriber } from "../../index.js";
+import { Provider, DatabaseDocument, DatabaseQuery, Result, Update, AsynchronousProvider, Data, DataUpdate, Entries, Unsubscriber } from "../../index.js";
 /**
  * Firestore Lite client database provider.
  * - Works with the Firebase JS SDK.
@@ -13,11 +13,11 @@ export declare class FirestoreClientProvider extends Provider implements Asynchr
     subscribe(): Unsubscriber;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): Promise<string>;
     set<T extends Data>(ref: DatabaseDocument<T>, data: T): Promise<void>;
-    update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): Promise<void>;
+    update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): Promise<void>;
     delete<T extends Data>(ref: DatabaseDocument<T>): Promise<void>;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): Promise<Entries<T>>;
     subscribeQuery(): Unsubscriber;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, data: T | Update<T> | undefined): Promise<number>;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): Promise<number>;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): Promise<number>;
     deleteQuery<T extends Data>(ref: DatabaseQuery<T>): Promise<number>;
 }

package/firestore/lite/FirestoreLiteProvider.js

@@ -1,5 +1,5 @@
 import { orderBy as firestoreOrderBy, where as firestoreWhere, limit as firestoreLimit, increment as firestoreIncrement, arrayUnion as firestoreArrayUnion, arrayRemove as firestoreArrayRemove, deleteField as firestoreDeleteField, collection as firestoreCollection, doc as firestoreDocument, query as firestoreQuery, setDoc, addDoc, updateDoc, deleteDoc, getDoc, getDocs, } from "firebase/firestore/lite";
-import { Provider, Update, ObjectUpdate, Increment, AssertionError, DataUpdate, ArrayUpdate, UnsupportedError, } from "../../index.js";
+import { Provider, ObjectUpdate, Increment, DataUpdate, ArrayUpdate, UnsupportedError, } from "../../index.js";
 // Constants.
 // const ID = "__name__"; // DH: `__name__` is the entire path of the document. `__id__` is just ID.
 const ID = "__id__"; // Internal way Firestore Queries can reference the ID of the current document.
@@ -46,15 +46,10 @@ function* getResults(snapshot) {
         yield [s.id, s.data()];
 }
 /** Convert `Update` instances into corresponding Firestore `FieldValue` instances. */
-function getFieldValues(update) {
-    if (update instanceof DataUpdate)
-        return Object.fromEntries(yieldFieldValues(update));
-    throw new AssertionError("Unsupported transform", update);
-}
 function* yieldFieldValues(updates, prefix = "") {
     for (const [key, update] of updates) {
-        if (!(update instanceof Update))
-            yield [`${prefix}${key}`, update !== undefined ? update : firestoreDeleteField()];
+        if (update === undefined)
+            yield [`${prefix}${key}`, firestoreDeleteField()];
         else if (update instanceof Increment)
             yield [`${prefix}${key}`, firestoreIncrement(update.amount)];
         else if (update instanceof DataUpdate || update instanceof ObjectUpdate)
@@ -68,7 +63,7 @@ function* yieldFieldValues(updates, prefix = "") {
                 yield [`${prefix}${key}`, firestoreArrayRemove(...update.deletes)];
         }
         else
-            throw new AssertionError("Unsupported transform", update);
+            yield [`${prefix}${key}`, update];
     }
 }
 /**
@@ -96,8 +91,9 @@ export class FirestoreClientProvider extends Provider {
     async set(ref, data) {
         await setDoc(getDocument(this.firestore, ref), data);
     }
-    async update(ref, updates) {
-        await updateDoc(getDocument(this.firestore, ref), getFieldValues(updates));
+    async update(ref, update) {
+        const fieldValues = Object.fromEntries(yieldFieldValues(update));
+        await updateDoc(getDocument(this.firestore, ref), fieldValues);
     }
     async delete(ref) {
         await deleteDoc(getDocument(this.firestore, ref));
@@ -113,9 +109,9 @@ export class FirestoreClientProvider extends Provider {
         await Promise.all(snapshot.docs.map(s => setDoc(s.ref, data)));
         return snapshot.size;
     }
-    async updateQuery(ref, updates) {
+    async updateQuery(ref, update) {
         const snapshot = await getDocs(getQuery(this.firestore, ref));
-        const fieldValues = getFieldValues(updates);
+        const fieldValues = Object.fromEntries(yieldFieldValues(update));
         await Promise.all(snapshot.docs.map(s => updateDoc(s.ref, fieldValues)));
         return snapshot.size;
     }

package/firestore/server/FirestoreServerProvider.d.ts

@@ -1,5 +1,5 @@
 import { Firestore } from "@google-cloud/firestore";
-import { Provider, DatabaseDocument, DatabaseQuery, Observer, Result, Update, Data, AsynchronousProvider, Entry, Entries, Unsubscriber } from "../../index.js";
+import { Provider, DatabaseDocument, DatabaseQuery, Observer, Result, Update, Data, AsynchronousProvider, DataUpdate, Entry, Entries, Unsubscriber } from "../../index.js";
 /**
  * Firestore server database provider.
  * - Works with the Firebase Admin SDK for Node.JS
@@ -11,11 +11,11 @@ export declare class FirestoreServerProvider extends Provider implements Asynchr
     subscribe<T extends Data>(ref: DatabaseDocument<T>, observer: Observer<Result<T>>): Unsubscriber;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): Promise<string>;
     set<T extends Data>(ref: DatabaseDocument<T>, data: T): Promise<void>;
-    update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): Promise<void>;
+    update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): Promise<void>;
     delete<T extends Data>(ref: DatabaseDocument<T>): Promise<void>;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): Promise<Iterable<Entry<T>>>;
     subscribeQuery<T extends Data>(ref: DatabaseQuery<T>, observer: Observer<Entries<T>>): Unsubscriber;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, data: T | Update<T> | undefined): Promise<number>;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): Promise<number>;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): Promise<number>;
     deleteQuery<T extends Data>(ref: DatabaseQuery<T>): Promise<number>;
 }

package/firestore/server/FirestoreServerProvider.js

@@ -46,16 +46,11 @@ function* getResults(snapshot) {
         yield [s.id, s.data()];
 }
 /** Convert `Update` instances into corresponding Firestore `FieldValue` instances. */
-function getFieldValues(update) {
-    if (update instanceof DataUpdate)
-        return Object.fromEntries(yieldFieldValues(update));
-    throw new AssertionError("Unsupported transform", update);
-}
 function* yieldFieldValues(updates, prefix = "") {
     for (const [key, update] of updates) {
         if (!(update instanceof Update))
             yield [`${prefix}${key}`, update !== undefined ? update : FieldValue.delete()];
-        if (update instanceof Increment)
+        else if (update instanceof Increment)
             yield [`${prefix}${key}`, FieldValue.increment(update.amount)];
         else if (update instanceof DataUpdate || update instanceof ObjectUpdate)
             yield* yieldFieldValues(update, `${prefix}${key}.`);
@@ -92,8 +87,9 @@ export class FirestoreServerProvider extends Provider {
     async set(ref, data) {
         await getDocument(this.firestore, ref).set(data);
     }
-    async update(ref, updates) {
-        await getDocument(this.firestore, ref).update(getFieldValues(updates));
+    async update(ref, update) {
+        const fieldValues = Object.fromEntries(yieldFieldValues(update)); // eslint-disable-line @typescript-eslint/no-explicit-any
+        await getDocument(this.firestore, ref).update(fieldValues);
     }
     async delete(ref) {
         await getDocument(this.firestore, ref).delete();
@@ -107,8 +103,8 @@ export class FirestoreServerProvider extends Provider {
     async setQuery(ref, data) {
         return await bulkWrite(this.firestore, ref, (w, s) => void w.set(s.ref, data));
     }
-    async updateQuery(ref, updates) {
-        const fieldValues = getFieldValues(updates);
+    async updateQuery(ref, update) {
+        const fieldValues = Object.fromEntries(yieldFieldValues(update)); // eslint-disable-line @typescript-eslint/no-explicit-any
         return await bulkWrite(this.firestore, ref, (w, s) => void w.update(s.ref, fieldValues));
     }
     async deleteQuery(ref) {

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.53.0",
+	"version": "1.56.0",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",
@@ -59,24 +59,24 @@
 		"build:jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config=jest.config.build.cjs"
 	},
 	"devDependencies": {
-		"@google-cloud/firestore": "^4.15.1",
-		"@types/jest": "^27.4.0",
-		"@types/react": "^17.0.39",
-		"@types/react-dom": "^17.0.11",
-		"@typescript-eslint/eslint-plugin": "^5.12.0",
-		"@typescript-eslint/parser": "^5.12.0",
-		"eslint": "^8.9.0",
-		"eslint-config-prettier": "^8.4.0",
-		"eslint-plugin-import": "^2.25.4",
+		"@google-cloud/firestore": "^5.0.2",
+		"@types/jest": "^27.4.1",
+		"@types/react": "^17.0.44",
+		"@types/react-dom": "^17.0.15",
+		"@typescript-eslint/eslint-plugin": "^5.20.0",
+		"@typescript-eslint/parser": "^5.20.0",
+		"eslint": "^8.14.0",
+		"eslint-config-prettier": "^8.5.0",
+		"eslint-plugin-import": "^2.26.0",
 		"eslint-plugin-prettier": "^4.0.0",
-		"firebase": "^9.6.7",
+		"firebase": "^9.6.11",
 		"jest": "^27.5.1",
 		"jest-ts-webcompat-resolver": "^1.0.0",
-		"prettier": "^2.5.1",
+		"prettier": "^2.6.2",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
-		"ts-jest": "^27.1.3",
-		"typescript": "^4.5.5"
+		"ts-jest": "^27.1.4",
+		"typescript": "^4.6.3"
 	},
 	"peerDependencies": {
 		"@google-cloud/firestore": ">=4.0.0",

package/provider/CacheProvider.d.ts

@@ -1,5 +1,5 @@
 import type { DatabaseDocument, DatabaseQuery } from "../db/index.js";
-import { Update } from "../update/index.js";
+import { DataUpdate } from "../update/index.js";
 import { Result, Unsubscriber, Observer, Entries, Data } from "../util/index.js";
 import type { Provider, AsynchronousProvider } from "./Provider.js";
 import { MemoryProvider } from "./MemoryProvider.js";
@@ -21,14 +21,14 @@ export declare class CacheProvider extends ThroughProvider implements Asynchrono
     subscribe<T extends Data>(ref: DatabaseDocument<T>, observer: Observer<Result<T>>): Unsubscriber;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): Promise<string>;
     set<T extends Data>(ref: DatabaseDocument<T>, data: T): Promise<void>;
-    update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): Promise<void>;
+    update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): Promise<void>;
     delete<T extends Data>(ref: DatabaseDocument<T>): Promise<void>;
     /** Cache a set of document entries. */
     private _cacheEntries;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): Promise<Entries<T>>;
     subscribeQuery<T extends Data>(ref: DatabaseQuery<T>, observer: Observer<Entries<T>>): Unsubscriber;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, data: T): Promise<number>;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): Promise<number>;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): Promise<number>;
     deleteQuery<T extends Data>(ref: DatabaseQuery<T>): Promise<number>;
     /** Reset this provider and clear all data. */
     reset(): void;

package/provider/CacheProvider.js

@@ -43,11 +43,11 @@ export class CacheProvider extends ThroughProvider {
         await super.set(ref, data);
         this.cache.set(ref, data);
     }
-    async update(ref, updates) {
-        await super.update(ref, updates);
+    async update(ref, update) {
+        await super.update(ref, update);
         // Update the document in the cache if it exists using `updateDocuments()` and an `id` query.
         // Using `updateDocument()` would throw `RequiredError` if the document didn't exist.
-        this.cache.updateQuery(ref.optional, updates);
+        this.cache.updateQuery(ref.optional, update);
     }
     async delete(ref) {
         await super.delete(ref);
@@ -83,9 +83,9 @@ export class CacheProvider extends ThroughProvider {
         this.cache.setQuery(ref, data);
         return count;
     }
-    async updateQuery(ref, updates) {
-        const count = await super.updateQuery(ref, updates);
-        this.cache.updateQuery(ref, updates);
+    async updateQuery(ref, update) {
+        const count = await super.updateQuery(ref, update);
+        this.cache.updateQuery(ref, update);
         return count;
     }
     async deleteQuery(ref) {

package/provider/ErrorProvider.d.ts

@@ -1,8 +1,6 @@
-import { DatabaseDocument, DatabaseQuery } from "../db/Database.js";
-import { Update } from "../update/Update.js";
-import { Data, Result } from "../util/data.js";
-import { Entries } from "../util/entry.js";
-import { Observer, Unsubscriber } from "../util/observable.js";
+import { DatabaseDocument, DatabaseQuery } from "../db/index.js";
+import { Data, Result, Entries, Observer, Unsubscriber } from "../util/index.js";
+import { DataUpdate } from "../update/index.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /** Provider that wraps errors thrown from deeper providers in `DatabaseReadError` and `DatabaseWriteError` etc to make it easier to see what read/write caused the error. */
 export declare class ErrorProvider extends ThroughProvider {
@@ -10,12 +8,12 @@ export declare class ErrorProvider extends ThroughProvider {
     subscribe<T extends Data>(ref: DatabaseDocument<T>, observer: Observer<Result<T>>): Unsubscriber;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): string | PromiseLike<string>;
     set<T extends Data>(ref: DatabaseDocument<T>, data: T): void | PromiseLike<void>;
-    update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): void | PromiseLike<void>;
+    update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): void | PromiseLike<void>;
     delete<T extends Data>(ref: DatabaseDocument<T>): void | PromiseLike<void>;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): Entries<T> | PromiseLike<Entries<T>>;
     subscribeQuery<T extends Data>(ref: DatabaseQuery<T>, observer: Observer<Entries<T>>): Unsubscriber;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, data: T): number | PromiseLike<number>;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): number | PromiseLike<number>;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): number | PromiseLike<number>;
     deleteQuery<T extends Data>(ref: DatabaseQuery<T>): number | PromiseLike<number>;
 }
 /** Thrown if an error occurs while reading a query. */

package/provider/ErrorProvider.js

@@ -1,5 +1,4 @@
-import { isAsync } from "../index.js";
-import { ThroughObserver } from "../util/observable.js";
+import { isAsync, ThroughObserver } from "../util/index.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /** Provider that wraps errors thrown from deeper providers in `DatabaseReadError` and `DatabaseWriteError` etc to make it easier to see what read/write caused the error. */
 export class ErrorProvider extends ThroughProvider {
@@ -51,9 +50,9 @@ export class ErrorProvider extends ThroughProvider {
             throw err;
         }
     }
-    update(ref, updates) {
+    update(ref, update) {
         try {
-            const result = super.update(ref, updates);
+            const result = super.update(ref, update);
             return isAsync(result)
                 ? result.then(undefined, err => {
                     throw err instanceof Error ? new DatabaseWriteError(err, ref) : err;
@@ -114,9 +113,9 @@ export class ErrorProvider extends ThroughProvider {
             throw err;
         }
     }
-    updateQuery(ref, updates) {
+    updateQuery(ref, update) {
         try {
-            const result = super.updateQuery(ref, updates);
+            const result = super.updateQuery(ref, update);
             return isAsync(result)
                 ? result.then(undefined, err => {
                     throw err instanceof Error ? new DatabaseWriteError(err, ref) : err;
@@ -162,7 +161,7 @@ export class DatabaseWriteError extends Error {
         this.ref = ref;
     }
 }
-DatabaseWriteError.prototype.name = "DocumentWriteError";
+DatabaseWriteError.prototype.name = "DatabaseWriteError";
 /** Observer that wraps errors in subscriptions in `DatabaseReadError` */
 class DatabaseErrorObserver extends ThroughObserver {
     constructor(ref, target) {

package/provider/MemoryProvider.d.ts

@@ -1,5 +1,5 @@
 import { Data, Result, Entries, Unsubscriber, Observer } from "../util/index.js";
-import { Update } from "../update/index.js";
+import { DataUpdate } from "../update/index.js";
 import { DatabaseQuery, DatabaseDocument } from "../db/index.js";
 import { Provider, SynchronousProvider } from "./Provider.js";
 /**
@@ -15,12 +15,12 @@ export declare class MemoryProvider extends Provider implements SynchronousProvi
     subscribe<T extends Data>(ref: DatabaseDocument<T>, observer: Observer<Result<T>>): Unsubscriber;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): string;
     set<T extends Data>(ref: DatabaseDocument<T>, data: T): void;
-    update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): void;
+    update<T extends Data>(ref: DatabaseDocument<T>, updates: DataUpdate<T>): void;
     delete<T extends Data>(ref: DatabaseDocument<T>): void;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): Entries<T>;
     subscribeQuery<T extends Data>(ref: DatabaseQuery<T>, observer: Observer<Entries<T>>): Unsubscriber;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, data: T): number;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): number;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): number;
     deleteQuery<T extends Data>(ref: DatabaseQuery<T>): number;
     /** Reset this provider and clear all data. */
     reset(): void;

package/provider/MemoryProvider.js

@@ -93,13 +93,13 @@ export class MemoryProvider extends Provider {
         }
         return count;
     }
-    updateQuery(ref, updates) {
+    updateQuery(ref, update) {
         const table = this._table(ref);
         // If there's a limit set: run the full query.
         // If there's no limit set: only need to run the filtering (more efficient because sort order doesn't matter).
         let count = 0;
         for (const [id, existing] of ref.limit ? ref.transform(table.data) : ref.filters.transform(table.data)) {
-            table.write(id, updates.transform(existing));
+            table.write(id, update.transform(existing));
             count++;
         }
         return count;

package/provider/Provider.d.ts

@@ -1,6 +1,6 @@
 import type { Observer, Unsubscriber, Result, Entries, Data } from "../util/index.js";
-import type { DatabaseDocument, DatabaseQuery } from "../db/Database.js";
-import type { Update } from "../update/index.js";
+import type { DatabaseDocument, DatabaseQuery } from "../db/index.js";
+import type { DataUpdate } from "../update/index.js";
 /** Provides access to data (e.g. IndexedDB, Firebase, or in-memory cache providers). */
 export declare abstract class Provider {
     /**
@@ -45,11 +45,11 @@ export declare abstract class Provider {
      * Update the data an existing document.
      *
      * @param ref Document reference specifying which document to update.
-     * @param updates Update instance to set the document to.
+     * @param update Update instance to set the document to.
      *
      * @throws Error If the document does not exist (ideally a `RequiredError` but may be provider-specific).
      */
-    abstract update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): void | PromiseLike<void>;
+    abstract update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): void | PromiseLike<void>;
     /**
      * Delete a specified document.
      * @param ref Document reference specifying which document to delete.
@@ -84,10 +84,10 @@ export declare abstract class Provider {
      * Update the data of all matching documents.
      *
      * @param ref Documents reference specifying which collection to set.
-     * @param updates Update instance to set the document to.
+     * @param update Update instance to set the document to.
      * @return Number of documents that were updated.
      */
-    abstract updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): number | PromiseLike<number>;
+    abstract updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): number | PromiseLike<number>;
     /**
      * Delete all matching documents.
      * @param ref Document reference specifying which document to delete.
@@ -100,11 +100,11 @@ export interface SynchronousProvider extends Provider {
     get<T extends Data>(ref: DatabaseDocument<T>): Result<T>;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): string;
     set<T extends Data>(ref: DatabaseDocument<T>, value: T): void;
-    update<T extends Data>(ref: DatabaseDocument<T>, value: Update<T>): void;
+    update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): void;
     delete<T extends Data>(ref: DatabaseDocument<T>): void;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): Entries<T>;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, value: T): number;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): number;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): number;
     deleteQuery<T extends Data>(ref: DatabaseQuery<T>): number;
 }
 /** Provider with a fully asynchronous interface */
@@ -112,10 +112,10 @@ export interface AsynchronousProvider extends Provider {
     get<T extends Data>(ref: DatabaseDocument<T>): PromiseLike<Result<T>>;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): PromiseLike<string>;
     set<T extends Data>(ref: DatabaseDocument<T>, value: T): PromiseLike<void>;
-    update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): PromiseLike<void>;
+    update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): PromiseLike<void>;
     delete<T extends Data>(ref: DatabaseDocument<T>): PromiseLike<void>;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): PromiseLike<Entries<T>>;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, value: T): PromiseLike<number>;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): PromiseLike<number>;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): PromiseLike<number>;
     deleteQuery<T extends Data>(ref: DatabaseQuery<T>): PromiseLike<number>;
 }

package/provider/ThroughProvider.d.ts

@@ -1,6 +1,6 @@
 import type { Result, Entries, Unsubscriber, Observer, Class, Data } from "../util/index.js";
 import type { DatabaseDocument, DatabaseQuery } from "../db/index.js";
-import type { Update } from "../update/index.js";
+import type { DataUpdate } from "../update/index.js";
 import { Provider } from "./Provider.js";
 /**
  * Pass all reads and writes through to a source provider.
@@ -12,12 +12,12 @@ export declare class ThroughProvider extends Provider {
     subscribe<T extends Data>(ref: DatabaseDocument<T>, observer: Observer<Result<T>>): Unsubscriber;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): string | PromiseLike<string>;
     set<T extends Data>(ref: DatabaseDocument<T>, data: T): void | PromiseLike<void>;
-    update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): void | PromiseLike<void>;
+    update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): void | PromiseLike<void>;
     delete<T extends Data>(ref: DatabaseDocument<T>): void | PromiseLike<void>;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): Entries<T> | PromiseLike<Entries<T>>;
     subscribeQuery<T extends Data>(ref: DatabaseQuery<T>, observer: Observer<Entries<T>>): Unsubscriber;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, data: T): number | PromiseLike<number>;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): number | PromiseLike<number>;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): number | PromiseLike<number>;
     deleteQuery<T extends Data>(ref: DatabaseQuery<T>): number | PromiseLike<number>;
 }
 /** Find a specific source provider in a database's provider stack. */

package/provider/ThroughProvider.js

@@ -20,8 +20,8 @@ export class ThroughProvider extends Provider {
     set(ref, data) {
         return this.source.set(ref, data);
     }
-    update(ref, updates) {
-        return this.source.update(ref, updates);
+    update(ref, update) {
+        return this.source.update(ref, update);
     }
     delete(ref) {
         return this.source.delete(ref);
@@ -35,8 +35,8 @@ export class ThroughProvider extends Provider {
     setQuery(ref, data) {
         return this.source.setQuery(ref, data);
     }
-    updateQuery(ref, updates) {
-        return this.source.updateQuery(ref, updates);
+    updateQuery(ref, update) {
+        return this.source.updateQuery(ref, update);
     }
     deleteQuery(ref) {
         return this.source.deleteQuery(ref);

package/provider/ValidationProvider.d.ts

@@ -1,6 +1,6 @@
 import type { DatabaseDocument, DatabaseQuery } from "../db/index.js";
 import { Data, Result, Unsubscriber, Observer, Entries } from "../util/index.js";
-import { Update } from "../update/index.js";
+import { DataUpdate } from "../update/index.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /** Validates any values that are read from or written to a source provider. */
 export declare class ValidationProvider extends ThroughProvider {
@@ -8,9 +8,9 @@ export declare class ValidationProvider extends ThroughProvider {
     subscribe<T extends Data>(ref: DatabaseDocument<T>, observer: Observer<Result>): Unsubscriber;
     add<T extends Data>(ref: DatabaseQuery<T>, data: T): string | PromiseLike<string>;
     set<T extends Data>(ref: DatabaseDocument<T>, value: T): void | PromiseLike<void>;
-    update<T extends Data>(ref: DatabaseDocument<T>, updates: Update<T>): void | PromiseLike<void>;
+    update<T extends Data>(ref: DatabaseDocument<T>, update: DataUpdate<T>): void | PromiseLike<void>;
     getQuery<T extends Data>(ref: DatabaseQuery<T>): Entries<T> | PromiseLike<Entries<T>>;
     subscribeQuery<T extends Data>(ref: DatabaseQuery<T>, observer: Observer<Entries<T>>): Unsubscriber;
     setQuery<T extends Data>(ref: DatabaseQuery<T>, value: T): number | PromiseLike<number>;
-    updateQuery<T extends Data>(ref: DatabaseQuery<T>, updates: Update<T>): number | PromiseLike<number>;
+    updateQuery<T extends Data>(ref: DatabaseQuery<T>, update: DataUpdate<T>): number | PromiseLike<number>;
 }