shelving 1.21.0 → 1.23.0

package/api/Resource.d.ts

@@ -6,24 +6,22 @@ import { Validator, Validatable } from "../util/index.js";
  * @param returns The `Validator` the function's returned value must conform to (defaults to `undefined` if not specified).
  */
 export declare class Resource<P = unknown, R = void> implements Validatable<R> {
-    static create<X, Y>(payload: Validator<X>, result: Validator<Y>): Resource<X, Y>;
-    static create<Y>(payload: undefined, result: Y): Resource<undefined, Y>;
-    static create<X>(payload: Validator<X>, result?: undefined): Resource<X, void>;
-    static create(payload?: undefined, result?: undefined): Resource<undefined, void>;
     /** Payload validator. */
     readonly payload: Validator<P>;
     /** Result validator. */
     readonly result: Validator<R>;
-    protected constructor(payload: Validator<P>, result: Validator<R>);
+    constructor(payload: Validator<P>, result: Validator<R>);
     /**
      * Validate a payload for this resource.
      *
+     * @returns The validated payload for this resource.
+     * @throws InvalidFeedback if the payload could not be validated.
      */
-    validatePayload(unsafePayload: unknown): P;
+    prepare(unsafePayload: unknown): P;
     /**
      * Validate a result for this resource.
      *
-     * @returns The validated payload for this resource.
+     * @returns The validated result for this resource.
      * @throws ValidationError if the result could not be validated.
      */
     validate(unsafeResult: unknown): R;
@@ -32,3 +30,11 @@ export declare class Resource<P = unknown, R = void> implements Validatable<R> {
 export declare type PayloadType<X extends Resource> = X extends Resource<infer Y, unknown> ? Y : never;
 /** Extract the result type from a `Resource`. */
 export declare type ResourceType<X extends Resource> = X extends Resource<unknown, infer Y> ? Y : never;
+/**
+ * Shortcut to create a new `Resource` (consistent with `Schema` shortcuts.
+ * - Sets `undefined` as the default type for payload and result.
+ */
+export declare function RESOURCE<X, Y>(payload: Validator<X>, result: Validator<Y>): Resource<X, Y>;
+export declare function RESOURCE<Y>(payload: undefined, result: Y): Resource<undefined, Y>;
+export declare function RESOURCE<X>(payload: Validator<X>, result?: undefined): Resource<X, void>;
+export declare function RESOURCE(payload?: undefined, result?: undefined): Resource<undefined, void>;

package/api/Resource.js

@@ -1,8 +1,6 @@
 import { UNDEFINED, validate } from "../util/index.js";
-import { Feedback, throwFeedback } from "../feedback/index.js";
+import { Feedback } from "../feedback/index.js";
 import { ResourceValidationError } from "./errors.js";
-/** Validator that always returns void/undefined. */
-const UNDEFINED_VALIDATOR = UNDEFINED;
 /**
  * An abstract API resource definition, used to specify types for e.g. serverless functions..
  *
@@ -15,20 +13,19 @@ export class Resource {
         this.payload = payload;
         this.result = result;
     }
-    static create(payload = UNDEFINED_VALIDATOR, result = UNDEFINED_VALIDATOR) {
-        return new Resource(payload, result);
-    }
     /**
      * Validate a payload for this resource.
      *
+     * @returns The validated payload for this resource.
+     * @throws InvalidFeedback if the payload could not be validated.
      */
-    validatePayload(unsafePayload) {
-        return throwFeedback(validate(unsafePayload, this.payload));
+    prepare(unsafePayload) {
+        return validate(unsafePayload, this.payload);
     }
     /**
      * Validate a result for this resource.
      *
-     * @returns The validated payload for this resource.
+     * @returns The validated result for this resource.
      * @throws ValidationError if the result could not be validated.
      */
     validate(unsafeResult) {
@@ -40,3 +37,6 @@ export class Resource {
         }
     }
 }
+export function RESOURCE(payload = UNDEFINED, result = UNDEFINED) {
+    return new Resource(payload, result);
+}

package/db/Database.d.ts

@@ -1,7 +1,8 @@
-import { Dispatcher, Entry, Observable, Observer, Result, Unsubscriber, ResultsMap, Validatable, Validator, Key, Data, Results, Datas, Validators, ValidatorType } from "../util/index.js";
+import { Entry, Observable, Observer, Result, Unsubscriber, ResultsMap, Validatable, Validator, Key, Data, Results, Datas, Validators, ValidatorType, Dispatcher } from "../util/index.js";
 import { Transform, Transforms } from "../transform/index.js";
 import type { Provider } from "../provider/Provider.js";
 import { Filters, Sorts, Query } from "../query/index.js";
+import { Write } from "./Write.js";
 /**
  * Combines a database model and a provider.
  *
@@ -58,26 +59,18 @@ export declare class DataQuery<T extends Data = Data> extends Query<T> implement
      * Subscribe to all matching documents.
      * - `next()` is called once with the initial results, and again any time the results change.
      *
-     * @param observer Observer with `next`, `error`, or `complete` methods that the document results are reported back to.
-     * @param next Callback that is called once initially and again whenever the results change.
-     * @param error Callback that is called if an error occurs.
-     * @param complete Callback that is called when the subscription is done.
-     *
+     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
      * @return Function that ends the subscription.
      */
-    subscribe(next: Observer<Results<T>> | Dispatcher<Results<T>>, error?: Dispatcher<Error | unknown>, complete?: Dispatcher<void>): Unsubscriber;
+    subscribe(next: Observer<Results<T>> | Dispatcher<[Results<T>]>): Unsubscriber;
     /**
      * Subscribe to all matching documents.
      * - `next()` is called once with the initial results, and again any time the results change.
      *
-     * @param observer Observer with `next`, `error`, or `complete` methods that the document results are reported back to.
-     * @param next Callback that is called once initially and again whenever the results change.
-     * @param error Callback that is called if an error occurs.
-     * @param complete Callback that is called when the subscription is done.
-     *
+     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
      * @return Function that ends the subscription.
      */
-    subscribeMap(next: Observer<ResultsMap<T>> | Dispatcher<ResultsMap<T>>, error?: Dispatcher<Error | unknown>, complete?: Dispatcher<void>): Unsubscriber;
+    subscribeMap(next: Observer<ResultsMap<T>> | Dispatcher<[ResultsMap<T>]>): Unsubscriber;
     /**
      * Set all matching documents to the same exact value.
      *
@@ -145,45 +138,26 @@ export declare class DataDocument<T extends Data = Data> implements Observable<R
      * Subscribe to the result of this document (indefinitely).
      * - `next()` is called once with the initial result, and again any time the result changes.
      *
-     * @param observer Observer with `next`, `error`, or `complete` methods.
-     * @param next Callback that is called once initially and again whenever the result changes.
-     * @param error Callback that is called if an error occurs.
-     * @param complete Callback that is called when the subscription is done.
-     *
+     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
      * @return Function that ends the subscription.
      */
-    subscribe(next: Observer<Result<T>> | Dispatcher<Result<T>>, error?: Dispatcher<Error | unknown>, complete?: Dispatcher<void>): Unsubscriber;
-    /**
-     * Set the complete data of this document.
-     *
-     * @param data Complete data to set the document to.
-     *
-     * @return Nothing (possibly promised).
-     */
+    subscribe(next: Observer<Result<T>> | Dispatcher<[Result<T>]>): Unsubscriber;
+    /** Set the complete data of this document. */
     set(data: T): void | PromiseLike<void>;
-    /**
-     * Update this document with partial data.
-     * - If the document exists, merge the partial data into it.
-     * - If the document doesn't exist, throw an error.
-     *
-     * @param transforms `Transform` instance or set of transforms to apply to the existing document.
-     * - Not all transforms may be supported by all providers.
-     *
-     * @return Nothing (possibly promised).
-     * @throws Error If the document does not exist (ideally a `RequiredError` but may be provider-specific).
-     */
+    /** Update this document. */
     update(transforms: Transform<T> | Transforms<T>): void | PromiseLike<void>;
-    /**
-     * Delete this document.
-     * - Will not throw an error if the document doesn't exist.
-     *
-     * @return Nothing (possibly promised).
-     */
+    /** Delete this document. */
     delete(): void | PromiseLike<void>;
-    /**
-     * Combine `set()`, `update()`, `delete()` into a single method.
-     */
+    /** Set, update, or delete this document. */
     write(value: Result<T> | Transform<T>): void | PromiseLike<void>;
+    /** Represent a write that sets the complete data of this document in a database. */
+    setter(data: T): Write<T>;
+    /** Represent a write that updates this document in a database. */
+    updater(transforms: Transform<T> | Transforms<T>): Write<T>;
+    /** Represent a write that deletes this document in a database. */
+    deleter(): Write<T>;
+    /** Represent a write that sets, updates, or deletes this document in a database. */
+    writer(value: Result<T> | Transform<T>): Write<T>;
     /** Validate data for this query reference. */
     validate(unsafeData: Data): T;
     toString(): string;

package/db/Database.js

@@ -1,8 +1,9 @@
-import { callAsync, createObserver, getFirstItem, throwAsync, validate, toMap, countItems, DeriveObserver, } from "../util/index.js";
+import { callAsync, getFirstItem, throwAsync, validate, toMap, countItems, TransformObserver, } from "../util/index.js";
 import { DataTransform, Transform } from "../transform/index.js";
 import { Feedback, InvalidFeedback } from "../feedback/index.js";
 import { Filters, Query, EqualFilter } from "../query/index.js";
 import { DocumentRequiredError, DocumentValidationError, QueryValidationError } from "./errors.js";
+import { Write } from "./Write.js";
 /**
  * Combines a database model and a provider.
  *
@@ -79,29 +80,21 @@ export class DataQuery extends Query {
      * Subscribe to all matching documents.
      * - `next()` is called once with the initial results, and again any time the results change.
      *
-     * @param observer Observer with `next`, `error`, or `complete` methods that the document results are reported back to.
-     * @param next Callback that is called once initially and again whenever the results change.
-     * @param error Callback that is called if an error occurs.
-     * @param complete Callback that is called when the subscription is done.
-     *
+     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
      * @return Function that ends the subscription.
      */
-    subscribe(next, error, complete) {
-        return this.provider.subscribeQuery(this, createObserver(next, error, complete));
+    subscribe(next) {
+        return this.provider.subscribeQuery(this, typeof next === "function" ? { next } : next);
     }
     /**
      * Subscribe to all matching documents.
      * - `next()` is called once with the initial results, and again any time the results change.
      *
-     * @param observer Observer with `next`, `error`, or `complete` methods that the document results are reported back to.
-     * @param next Callback that is called once initially and again whenever the results change.
-     * @param error Callback that is called if an error occurs.
-     * @param complete Callback that is called when the subscription is done.
-     *
+     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
      * @return Function that ends the subscription.
      */
-    subscribeMap(next, error, complete) {
-        return this.provider.subscribeQuery(this, new DeriveObserver(toMap, createObserver(next, error, complete)));
+    subscribeMap(next) {
+        return this.provider.subscribeQuery(this, new TransformObserver(toMap, typeof next === "function" ? { next } : next));
     }
     /**
      * Set all matching documents to the same exact value.
@@ -210,55 +203,44 @@ export class DataDocument {
      * Subscribe to the result of this document (indefinitely).
      * - `next()` is called once with the initial result, and again any time the result changes.
      *
-     * @param observer Observer with `next`, `error`, or `complete` methods.
-     * @param next Callback that is called once initially and again whenever the result changes.
-     * @param error Callback that is called if an error occurs.
-     * @param complete Callback that is called when the subscription is done.
-     *
+     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
      * @return Function that ends the subscription.
      */
-    subscribe(next, error, complete) {
-        return this.provider.subscribe(this, createObserver(next, error, complete));
+    subscribe(next) {
+        return this.provider.subscribe(this, typeof next === "function" ? { next } : next);
     }
-    /**
-     * Set the complete data of this document.
-     *
-     * @param data Complete data to set the document to.
-     *
-     * @return Nothing (possibly promised).
-     */
+    /** Set the complete data of this document. */
     set(data) {
         return this.write(data);
     }
-    /**
-     * Update this document with partial data.
-     * - If the document exists, merge the partial data into it.
-     * - If the document doesn't exist, throw an error.
-     *
-     * @param transforms `Transform` instance or set of transforms to apply to the existing document.
-     * - Not all transforms may be supported by all providers.
-     *
-     * @return Nothing (possibly promised).
-     * @throws Error If the document does not exist (ideally a `RequiredError` but may be provider-specific).
-     */
+    /** Update this document. */
     update(transforms) {
         return this.write(transforms instanceof Transform ? transforms : new DataTransform(transforms));
     }
-    /**
-     * Delete this document.
-     * - Will not throw an error if the document doesn't exist.
-     *
-     * @return Nothing (possibly promised).
-     */
+    /** Delete this document. */
     delete() {
         return this.write(undefined);
     }
-    /**
-     * Combine `set()`, `update()`, `delete()` into a single method.
-     */
+    /** Set, update, or delete this document. */
     write(value) {
         return this.provider.write(this, value);
     }
+    /** Represent a write that sets the complete data of this document in a database. */
+    setter(data) {
+        return this.writer(data);
+    }
+    /** Represent a write that updates this document in a database. */
+    updater(transforms) {
+        return this.writer(transforms instanceof Transform ? transforms : new DataTransform(transforms));
+    }
+    /** Represent a write that deletes this document in a database. */
+    deleter() {
+        return this.writer(undefined);
+    }
+    /** Represent a write that sets, updates, or deletes this document in a database. */
+    writer(value) {
+        return new Write(this, value);
+    }
     /** Validate data for this query reference. */
     validate(unsafeData) {
         try {

package/db/Pagination.js

@@ -71,7 +71,7 @@ export class Pagination extends State {
      * @return The change in the number of results.
      */
     merge(more) {
-        this.next(toMap(this.ref.sorts.derive(yieldMerged(more, this.value))));
+        this.next(toMap(this.ref.sorts.transform(yieldMerged(more, this.value))));
     }
     /** Iterate over the entries of the values currently in the pagination. */
     [Symbol.iterator]() {

package/db/Write.d.ts

@@ -0,0 +1,28 @@
+import { Transform } from "../transform/index.js";
+import { ImmutableArray, Data, Transformable } from "../util/index.js";
+import type { Database, DataDocument } from "./Database.js";
+/** Change transformable. */
+export declare type DatabaseTransformable = Transformable<Database, void | PromiseLike<void>>;
+/** Represent a write made to a single document in a database. */
+export declare class Write<T extends Data> implements Transformable<Database, void | PromiseLike<void>> {
+    readonly collection: string;
+    readonly id: string;
+    readonly value: Data | Transform<Data> | undefined;
+    constructor({ collection, id }: DataDocument<T>, value: T | Transform<T> | undefined);
+    transform(db: Database): Promise<void>;
+}
+/**
+ * Represent a list of writes made to a set of documents in a database.
+ * - Sets of writes are predictable and repeatable, so unpredictable operations like `create()` and query operations are not supported.
+ * - Every write must be applied to a specific database document in a specific collection and are applied in the specified order.
+ */
+export declare class Writes implements Transformable<Database, void | PromiseLike<void>> {
+    readonly writes: ImmutableArray<Write<Data>>;
+    constructor(...writes: Write<Data>[]);
+    transform(db: Database): Promise<void>;
+}
+/** Set of hydrations for all change classes. */
+export declare const DATABASE_HYDRATIONS: {
+    changes: typeof Writes;
+    change: typeof Write;
+};

package/db/Write.js

@@ -0,0 +1,32 @@
+import { transform } from "../util/index.js";
+/** Represent a write made to a single document in a database. */
+export class Write {
+    constructor({ collection, id }, value) {
+        this.collection = collection;
+        this.id = id;
+        this.value = value;
+    }
+    async transform(db) {
+        await db.doc(this.collection, this.id).write(this.value);
+    }
+}
+/**
+ * Represent a list of writes made to a set of documents in a database.
+ * - Sets of writes are predictable and repeatable, so unpredictable operations like `create()` and query operations are not supported.
+ * - Every write must be applied to a specific database document in a specific collection and are applied in the specified order.
+ */
+export class Writes {
+    constructor(...writes) {
+        this.writes = writes;
+    }
+    async transform(db) {
+        for (const writes of this.writes)
+            await transform(db, writes);
+    }
+}
+/** Set of hydrations for all change classes. */
+export const DATABASE_HYDRATIONS = {
+    changes: Writes,
+    change: Write,
+};
+DATABASE_HYDRATIONS;

package/db/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./Database.js";
-export * from "./Change.js";
 export * from "./Pagination.js";
+export * from "./Write.js";
 export * from "./errors.js";

package/db/index.js

@@ -1,4 +1,4 @@
 export * from "./Database.js";
-export * from "./Change.js";
 export * from "./Pagination.js";
+export * from "./Write.js";
 export * from "./errors.js";

package/feedback/index.d.ts

@@ -4,4 +4,3 @@ export * from "./WarningFeedback.js";
 export * from "./ErrorFeedback.js";
 export * from "./InvalidFeedback.js";
 export * from "./hydrations.js";
-export * from "./util.js";

package/feedback/index.js

@@ -4,4 +4,3 @@ export * from "./WarningFeedback.js";
 export * from "./ErrorFeedback.js";
 export * from "./InvalidFeedback.js";
 export * from "./hydrations.js";
-export * from "./util.js";

package/firestore/client/FirestoreClientProvider.d.ts

@@ -1,5 +1,5 @@
 import type { Firestore } from "firebase/firestore";
-import { Results, Provider, DataDocument, DataQuery, Result, Observer, Transform, AsynchronousProvider, Data } from "../../index.js";
+import { Results, Provider, DataDocument, DataQuery, Result, Observer, Transform, AsynchronousProvider, Data, Unsubscriber } from "../../index.js";
 /**
  * Firestore client database provider.
  * - Works with the Firebase JS SDK.
@@ -10,10 +10,10 @@ export declare class FirestoreClientProvider extends Provider implements Asynchr
     readonly firestore: Firestore;
     constructor(firestore: Firestore);
     get<T extends Data>(ref: DataDocument<T>): Promise<Result<T>>;
-    subscribe<T extends Data>(ref: DataDocument<T>, observer: Observer<Result<T>>): () => void;
+    subscribe<T extends Data>(ref: DataDocument<T>, observer: Observer<Result<T>>): Unsubscriber;
     add<T extends Data>(ref: DataQuery<T>, data: T): Promise<string>;
     write<T extends Data>(ref: DataDocument<T>, value: T | Transform<T> | undefined): Promise<void>;
     getQuery<T extends Data>(ref: DataQuery<T>): Promise<Results<T>>;
-    subscribeQuery<T extends Data>(ref: DataQuery<T>, observer: Observer<Results<T>>): () => void;
+    subscribeQuery<T extends Data>(ref: DataQuery<T>, observer: Observer<Results<T>>): Unsubscriber;
     writeQuery<T extends Data>(ref: DataQuery<T>, value: T | Transform<T> | undefined): Promise<void>;
 }

package/firestore/client/FirestoreClientProvider.js

@@ -88,7 +88,7 @@ export class FirestoreClientProvider extends Provider {
         return snapshot.data();
     }
     subscribe(ref, observer) {
-        return onSnapshot(getDocument(this.firestore, ref), snapshot => dispatchNext(snapshot.data(), observer), thrown => dispatchError(thrown, observer));
+        return onSnapshot(getDocument(this.firestore, ref), snapshot => dispatchNext(observer, snapshot.data()), thrown => dispatchError(observer, thrown));
     }
     async add(ref, data) {
         const reference = await addDoc(getCollection(this.firestore, ref), data); // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -106,7 +106,7 @@ export class FirestoreClientProvider extends Provider {
         return getResults(await getDocs(getQuery(this.firestore, ref)));
     }
     subscribeQuery(ref, observer) {
-        return onSnapshot(getQuery(this.firestore, ref), snapshot => dispatchNext(getResults(snapshot), observer), thrown => dispatchError(thrown, observer));
+        return onSnapshot(getQuery(this.firestore, ref), snapshot => dispatchNext(observer, getResults(snapshot)), thrown => dispatchError(observer, thrown));
     }
     async writeQuery(ref, value) {
         const snapshot = await getDocs(getQuery(this.firestore, ref));

package/firestore/lite/FirestoreLiteProvider.d.ts

@@ -1,5 +1,5 @@
 import type { Firestore } from "firebase/firestore/lite";
-import { Provider, DataDocument, DataQuery, Result, Transform, AsynchronousProvider, Data, Results } from "../../index.js";
+import { Provider, DataDocument, DataQuery, Result, Transform, AsynchronousProvider, Data, Results, Unsubscriber } from "../../index.js";
 /**
  * Firestore Lite client database provider.
  * - Works with the Firebase JS SDK.
@@ -10,10 +10,10 @@ export declare class FirestoreClientProvider extends Provider implements Asynchr
     readonly firestore: Firestore;
     constructor(firestore: Firestore);
     get<T extends Data>(ref: DataDocument<T>): Promise<Result<T>>;
-    subscribe(): () => void;
+    subscribe(): Unsubscriber;
     add<T extends Data>(ref: DataQuery<T>, data: T): Promise<string>;
     write<T extends Data>(ref: DataDocument<T>, value: T | Transform<T> | undefined): Promise<void>;
     getQuery<T extends Data>(ref: DataQuery<T>): Promise<Results<T>>;
-    subscribeQuery(): () => void;
+    subscribeQuery(): Unsubscriber;
     writeQuery<T extends Data>(ref: DataQuery<T>, value: T | Transform<T> | undefined): Promise<void>;
 }

package/firestore/server/FirestoreServerProvider.d.ts

@@ -1,5 +1,5 @@
 import { Firestore } from "@google-cloud/firestore";
-import { Provider, DataDocument, DataQuery, Observer, Result, Transform, Data, AsynchronousProvider, Entry, Results } from "../../index.js";
+import { Provider, DataDocument, DataQuery, Observer, Result, Transform, Data, AsynchronousProvider, Entry, Results, Unsubscriber } from "../../index.js";
 /**
  * Firestore server database provider.
  * - Works with the Firebase Admin SDK for Node.JS
@@ -8,10 +8,10 @@ export declare class FirestoreServerProvider extends Provider implements Asynchr
     readonly firestore: Firestore;
     constructor(firestore?: Firestore);
     get<T extends Data>(ref: DataDocument<T>): Promise<Result<T>>;
-    subscribe<T extends Data>(ref: DataDocument<T>, observer: Observer<Result<T>>): () => void;
+    subscribe<T extends Data>(ref: DataDocument<T>, observer: Observer<Result<T>>): Unsubscriber;
     add<T extends Data>(ref: DataQuery<T>, data: T): Promise<string>;
     write<T extends Data>(ref: DataDocument<T>, value: T | Transform<T> | undefined): Promise<void>;
     getQuery<T extends Data>(ref: DataQuery<T>): Promise<Iterable<Entry<T>>>;
-    subscribeQuery<T extends Data>(ref: DataQuery<T>, observer: Observer<Results<T>>): () => void;
+    subscribeQuery<T extends Data>(ref: DataQuery<T>, observer: Observer<Results<T>>): Unsubscriber;
     writeQuery<T extends Data>(ref: DataQuery<T>, value: T | Transform<T> | undefined): Promise<void>;
 }

package/firestore/server/FirestoreServerProvider.js

@@ -85,7 +85,7 @@ export class FirestoreServerProvider extends Provider {
         return (await getDocument(this.firestore, ref).get()).data();
     }
     subscribe(ref, observer) {
-        return getDocument(this.firestore, ref).onSnapshot(snapshot => dispatchNext(snapshot.data(), observer), thrown => dispatchError(thrown, observer));
+        return getDocument(this.firestore, ref).onSnapshot(snapshot => dispatchNext(observer, snapshot.data()), thrown => dispatchError(observer, thrown));
     }
     async add(ref, data) {
         return (await getCollection(this.firestore, ref).add(data)).id;
@@ -102,7 +102,7 @@ export class FirestoreServerProvider extends Provider {
         return getResults(await getQuery(this.firestore, ref).get());
     }
     subscribeQuery(ref, observer) {
-        return getQuery(this.firestore, ref).onSnapshot(snapshot => dispatchNext(getResults(snapshot), observer), thrown => dispatchError(thrown, observer));
+        return getQuery(this.firestore, ref).onSnapshot(snapshot => dispatchNext(observer, getResults(snapshot)), thrown => dispatchError(observer, thrown));
     }
     async writeQuery(ref, value) {
         const writer = this.firestore.bulkWriter();

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.21.0",
+	"version": "1.23.0",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",

package/provider/BatchProvider.js

@@ -1,4 +1,4 @@
-import { isAsync, toMap, DeriveObserver, awaitNext, } from "../util/index.js";
+import { isAsync, toMap, TransformObserver, awaitNext, } from "../util/index.js";
 import { LazyState } from "../stream/index.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /** How long to wait after all subscriptions have ended to close the source subscription. */
@@ -80,7 +80,7 @@ export class BatchProvider extends ThroughProvider {
         const sub = ((_a = this._subs)[key] || (_a[key] = new LazyState(STOP_DELAY).from(o => {
             var _a;
             // Convert the iterable to a map because it might be read multiple times.
-            const stop = super.subscribeQuery(ref, new DeriveObserver(toMap, o));
+            const stop = super.subscribeQuery(ref, new TransformObserver(toMap, o));
             // The first value from the subscription can be reused for any concurrent get requests.
             (_a = this._gets)[key] || (_a[key] = this._awaitDocuments(ref, awaitNext(sub)));
             return () => {

package/provider/CacheProvider.js

@@ -1,5 +1,5 @@
 import { Transform } from "../transform/index.js";
-import { DeriveObserver } from "../util/index.js";
+import { TransformObserver } from "../util/index.js";
 import { MemoryProvider } from "./MemoryProvider.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /** Keep a copy of received data in a local cache. */
@@ -33,7 +33,7 @@ export class CacheProvider extends ThroughProvider {
     }
     // Override to cache any got results.
     subscribe(ref, observer) {
-        return super.subscribe(ref, new DeriveObserver(result => this._cacheResult(ref, result), observer));
+        return super.subscribe(ref, new TransformObserver(result => this._cacheResult(ref, result), observer));
     }
     async add(ref, data) {
         const id = await super.add(ref, data);
@@ -72,7 +72,7 @@ export class CacheProvider extends ThroughProvider {
     }
     // Override to cache any got results.
     subscribeQuery(ref, observer) {
-        return super.subscribeQuery(ref, new DeriveObserver(results => this._cacheResults(ref, results), observer));
+        return super.subscribeQuery(ref, new TransformObserver(results => this._cacheResults(ref, results), observer));
     }
     async writeQuery(ref, value) {
         await super.writeQuery(ref, value);