shelving 1.80.1 → 1.81.0

package/constraint/FilterConstraints.js

@@ -22,6 +22,6 @@ export class FilterConstraints extends Constraints {
     }
     // Stringify as object syntax.
     toString() {
-        return `{${this._constraints.map(String).join(",")}`;
+        return this._constraints.length ? `"filters":{${this._constraints.map(String).join(",")}}` : "";
     }
 }

package/constraint/QueryConstraints.js

@@ -87,7 +87,7 @@ export class QueryConstraints extends Constraint {
     }
     // Implement toString()
     toString() {
-        return `{"filters":${this.filters.toString()}},"sorts":${this.sorts.toString()},"limit":${this.limit}}`;
+        return [this.filters.toString(), this.sorts.toString(), typeof this.limit === "number" ? `"limit":${this.limit}` : null].filter(Boolean).join(",");
     }
 }
 function* _getAfterFilters(sorts, item) {

package/constraint/SortConstraints.js

@@ -24,6 +24,6 @@ export class SortConstraints extends Constraints {
     }
     // Stringify as array syntax.
     toString() {
-        return `[${this._constraints.map(String).join(",")}]`;
+        return this._constraints.length ? `"sorts":[${this._constraints.map(String).join(",")}]` : "";
     }
 }

package/db/Change.js

@@ -1,10 +1,10 @@
 import { QueryConstraints } from "../constraint/QueryConstraints.js";
 import { FilterConstraint } from "../constraint/FilterConstraint.js";
 import { notNullish } from "../util/null.js";
-import { flattenDeepIterable } from "../util/iterate.js";
+import { flattenItems } from "../util/iterate.js";
 /** Apply a set of changes to a synchronous provider. */
 export function changeProvider(provider, ...changes) {
-    return Array.from(flattenDeepIterable(changes)).filter(notNullish).map(_changeItem, provider);
+    return Array.from(flattenItems(changes)).filter(notNullish).map(_changeItem, provider);
 }
 function _changeItem(change) {
     const { action, collection } = change;
@@ -20,7 +20,7 @@ function _changeItem(change) {
 }
 /** Apply a set of changes to an asynchronous provider. */
 export function changeAsyncProvider(provider, ...changes) {
-    return Promise.all(Array.from(flattenDeepIterable(changes)).filter(notNullish).map(_changeAsyncItem, provider));
+    return Promise.all(Array.from(flattenItems(changes)).filter(notNullish).map(_changeAsyncItem, provider));
 }
 async function _changeAsyncItem(change) {
     const { collection, action } = change;

package/db/Collection.d.ts

@@ -4,9 +4,6 @@ import type { FilterList } from "../constraint/FilterConstraint.js";
 import type { SortList } from "../constraint/SortConstraint.js";
 import type { DeepIterable } from "../util/iterate.js";
 import type { Updates } from "../update/DataUpdate.js";
-import type { PartialObserver } from "../observe/Observer.js";
-import type { Dispatch } from "../util/function.js";
-import type { Unsubscribe } from "../observe/Observable.js";
 import type { AsyncDatabase, Database } from "./Database.js";
 import { ItemData, AsyncItem, Item, ItemValue } from "./Item.js";
 import { AsyncQuery, Query } from "./Query.js";
@@ -23,8 +20,6 @@ declare abstract class BaseCollection<T extends Datas = Datas, K extends Key<T>
     abstract change(...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): ItemChanges<T, K> | Promise<ItemChanges<T, K>>;
     /** Get an item from this collection. */
     abstract get(id: string): ItemValue<T[K]> | Promise<ItemValue<T[K]>>;
-    /** Subscribe a document from a collection in this database. */
-    subscribe(id: string, next: PartialObserver<ItemValue<T[K]>> | Dispatch<[ItemValue<T[K]>]>): Unsubscribe;
     /** Add an item to this collection. */
     abstract add(data: T[K]): string | Promise<string>;
     /** Set a document in this collection. */

package/db/Collection.js

@@ -3,10 +3,6 @@ import { AsyncQuery, Query } from "./Query.js";
 import { changeAsyncProvider, changeProvider } from "./Change.js";
 /** Reference to a collection in a synchronous or asynchronous provider. */
 class BaseCollection {
-    /** Subscribe a document from a collection in this database. */
-    subscribe(id, next) {
-        return this.db.subscribe(this.collection, id, typeof next === "function" ? { next } : next);
-    }
     /** Get an add change for this collection. */
     getAdd(data) {
         return this.db.getAdd(this.collection, data);

package/db/Database.d.ts

@@ -6,9 +6,6 @@ import type { FilterList } from "../constraint/FilterConstraint.js";
 import type { SortList } from "../constraint/SortConstraint.js";
 import type { ItemData, ItemValue } from "../db/Item.js";
 import type { Updates } from "../update/DataUpdate.js";
-import type { PartialObserver } from "../observe/Observer.js";
-import type { Dispatch } from "../util/function.js";
-import type { Unsubscribe } from "../observe/Observable.js";
 import { Item, AsyncItem } from "./Item.js";
 import { Query, AsyncQuery } from "./Query.js";
 import { Collection, AsyncCollection } from "./Collection.js";
@@ -26,8 +23,6 @@ declare abstract class BaseDatabase<T extends Datas> {
     abstract change(...changes: DeepIterable<Nullish<WriteChange<T>>>[]): ItemChanges<T> | Promise<ItemChanges<T>>;
     /** Get a document from a collection in this database. */
     abstract get<K extends Key<T>>(collection: K, id: string): ItemValue<T[K]> | Promise<ItemValue<T[K]>>;
-    /** Subscribe a document from a collection in this database. */
-    subscribe<K extends Key<T>>(collection: K, id: string, next: PartialObserver<ItemValue<T[K]>> | Dispatch<[ItemValue<T[K]>]>): Unsubscribe;
     /** Add a document to a collection in this database. */
     abstract add<K extends Key<T>>(collection: K, data: T[K]): string | Promise<string>;
     /** Set a document in a collection in this database. */

package/db/Database.js

@@ -4,10 +4,6 @@ import { Collection, AsyncCollection } from "./Collection.js";
 import { changeAsyncProvider, changeProvider } from "./Change.js";
 /** Database with a synchronous or asynchronous provider. */
 class BaseDatabase {
-    /** Subscribe a document from a collection in this database. */
-    subscribe(collection, id, next) {
-        return this.provider.subscribeItem(collection, id, typeof next === "function" ? { next } : next);
-    }
     /** Get an add change for a collection in this database. */
     getAdd(collection, data) {
         return { action: "ADD", collection, data };

package/db/Item.d.ts

@@ -1,13 +1,11 @@
-import { Data, Datas, Key } from "../util/data.js";
-import type { Dispatch } from "../util/function.js";
-import type { PartialObserver } from "../observe/Observer.js";
 import type { ImmutableArray } from "../util/array.js";
-import type { Observable, Unsubscribe } from "../observe/Observable.js";
-import { DataUpdate, Updates } from "../update/DataUpdate.js";
+import type { Stop, Handler, Dispatch } from "../util/function.js";
 import type { QueryConstraints } from "../constraint/QueryConstraints.js";
-import type { AsyncDatabase, Database } from "./Database.js";
-import type { AsyncQuery, Query } from "./Query.js";
+import { Data, Datas, Key } from "../util/data.js";
+import { DataUpdate, Updates } from "../update/DataUpdate.js";
 import type { DeleteChange, SetChange, UpdateChange } from "./Change.js";
+import type { AsyncQuery, Query } from "./Query.js";
+import type { AsyncDatabase, Database } from "./Database.js";
 /** Item data with a string ID that uniquely identifies it. */
 export declare type ItemData<T extends Data = Data> = T & {
     id: string;
@@ -19,7 +17,7 @@ export declare type ItemArray<T extends Data = Data> = ImmutableArray<ItemData<T
 /** A set of query constraints for item data. */
 export declare type ItemConstraints<T extends Data = Data> = QueryConstraints<ItemData<T>>;
 /** Reference to an item in a synchronous or asynchronous database. */
-declare abstract class BaseItem<T extends Datas = Datas, K extends Key<T> = Key<T>> implements Observable<ItemValue<T[K]>> {
+declare abstract class BaseItem<T extends Datas = Datas, K extends Key<T> = Key<T>> implements AsyncIterable<ItemValue<T[K]>> {
     abstract readonly db: Database<T> | AsyncDatabase<T>;
     abstract readonly collection: K;
     abstract readonly id: string;
@@ -43,14 +41,6 @@ declare abstract class BaseItem<T extends Datas = Datas, K extends Key<T> = Key<
      * @throws RequiredError if the item does not exist.
      */
     abstract data: ItemData<T[K]> | PromiseLike<ItemData<T[K]>>;
-    /**
-     * Subscribe to the result of this item (indefinitely).
-     * - `next()` is called once with the initial result, and again any time the result changes.
-     *
-     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
-     * @return Function that ends the subscription.
-     */
-    subscribe(next: PartialObserver<ItemValue<T[K]>> | Dispatch<[ItemValue<T[K]>]>): Unsubscribe;
     /** Set the complete data of this item. */
     abstract set(data: T[K]): void | PromiseLike<void>;
     /** Update this item. */
@@ -64,6 +54,9 @@ declare abstract class BaseItem<T extends Datas = Datas, K extends Key<T> = Key<
     /** Get a delete change for this item. */
     getDelete(): DeleteChange<T, K>;
     toString(): `${K}/${string}`;
+    /** Subscribe to this item. */
+    subscribe(onNext?: Dispatch<[ItemValue<T[K]>]>, onError?: Handler): Stop;
+    [Symbol.asyncIterator](): AsyncIterator<ItemValue<T[K]>>;
 }
 /** Reference to an item in a synchronous database. */
 export declare class Item<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseItem<T, K> {

package/db/Item.js

@@ -1,17 +1,8 @@
 import { getData } from "../util/data.js";
 import { FilterConstraint } from "../constraint/FilterConstraint.js";
+import { runSequence } from "../util/sequence.js";
 /** Reference to an item in a synchronous or asynchronous database. */
 class BaseItem {
-    /**
-     * Subscribe to the result of this item (indefinitely).
-     * - `next()` is called once with the initial result, and again any time the result changes.
-     *
-     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
-     * @return Function that ends the subscription.
-     */
-    subscribe(next) {
-        return this.db.subscribe(this.collection, this.id, next);
-    }
     /** Get a set change for this item. */
     getSet(data) {
         return this.db.getSet(this.collection, this.id, data);
@@ -28,6 +19,14 @@ class BaseItem {
     toString() {
         return `${this.collection}/${this.id}`;
     }
+    /** Subscribe to this item. */
+    subscribe(onNext, onError) {
+        return runSequence(this, onNext, onError);
+    }
+    // Implement AsyncIterable
+    [Symbol.asyncIterator]() {
+        return this.db.provider.getItemSequence(this.collection, this.id)[Symbol.asyncIterator]();
+    }
 }
 /** Reference to an item in a synchronous database. */
 export class Item extends BaseItem {

package/db/Query.d.ts

@@ -1,15 +1,13 @@
-import type { Dispatch } from "../util/function.js";
 import type { Key, Datas } from "../util/data.js";
+import type { Dispatch, Handler, Stop } from "../util/function.js";
 import type { Updates } from "../update/DataUpdate.js";
-import type { PartialObserver } from "../observe/Observer.js";
-import type { Observable, Unsubscribe } from "../observe/Observable.js";
 import type { FilterList } from "../constraint/FilterConstraint.js";
 import type { SortList } from "../constraint/SortConstraint.js";
 import { QueryConstraints } from "../constraint/QueryConstraints.js";
 import type { ItemArray, ItemValue, ItemData } from "./Item.js";
 import type { AsyncDatabase, Database } from "./Database.js";
 /** Reference to a set of items in a sync or async provider. */
-declare abstract class BaseQuery<T extends Datas = Datas, K extends Key<T> = Key<T>> extends QueryConstraints<ItemData<T[K]>> implements Observable<ItemArray<T[K]>> {
+declare abstract class BaseQuery<T extends Datas = Datas, K extends Key<T> = Key<T>> extends QueryConstraints<ItemData<T[K]>> implements AsyncIterable<ItemArray<T[K]>> {
     abstract readonly db: Database<T> | AsyncDatabase<T>;
     abstract readonly collection: K;
     /**
@@ -47,14 +45,6 @@ declare abstract class BaseQuery<T extends Datas = Datas, K extends Key<T> = Key
      * @throws RequiredError if there were no results for this query.
      */
     abstract lastData: ItemData<T[K]> | PromiseLike<ItemData<T[K]>>;
-    /**
-     * Subscribe to all matching items.
-     * - `next()` is called once with the initial results, and again any time the results change.
-     *
-     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
-     * @return Function that ends the subscription.
-     */
-    subscribe(next: PartialObserver<ItemArray<T[K]>> | Dispatch<[ItemArray<T[K]>]>): Unsubscribe;
     /**
      * Set all matching items to the same exact value.
      *
@@ -75,9 +65,12 @@ declare abstract class BaseQuery<T extends Datas = Datas, K extends Key<T> = Key
      */
     abstract delete(): number | PromiseLike<number>;
     toString(): string;
+    /** Subscribe to this item. */
+    subscribe(onNext?: Dispatch<[ItemArray<T[K]>]>, onError?: Handler): Stop;
+    [Symbol.asyncIterator](): AsyncIterator<ItemArray<T[K]>>;
 }
 /** Reference to a set of items in a provider. */
-export declare class Query<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseQuery<T, K> implements BaseQuery<T, K> {
+export declare class Query<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseQuery<T, K> {
     readonly db: Database<T>;
     readonly collection: K;
     constructor(db: Database<T>, collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null);
@@ -93,7 +86,7 @@ export declare class Query<T extends Datas = Datas, K extends Key<T> = Key<T>> e
     delete(): number;
 }
 /** Reference to a set of items in a provider. */
-export declare class AsyncQuery<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseQuery<T, K> implements BaseQuery<T, K> {
+export declare class AsyncQuery<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseQuery<T, K> {
     readonly db: AsyncDatabase<T>;
     readonly collection: K;
     constructor(db: AsyncDatabase<T>, collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null);

package/db/Query.js

@@ -1,21 +1,20 @@
 import { getFirstItem, getLastItem, getOptionalFirstItem, getOptionalLastItem } from "../util/array.js";
-import { QueryConstraints } from "../constraint/QueryConstraints.js";
 import { countItems, hasItems } from "../util/iterate.js";
+import { runSequence } from "../util/sequence.js";
+import { QueryConstraints } from "../constraint/QueryConstraints.js";
 /** Reference to a set of items in a sync or async provider. */
 class BaseQuery extends QueryConstraints {
-    /**
-     * Subscribe to all matching items.
-     * - `next()` is called once with the initial results, and again any time the results change.
-     *
-     * @param next Observer with `next`, `error`, or `complete` methods or a `next()` dispatcher.
-     * @return Function that ends the subscription.
-     */
-    subscribe(next) {
-        return this.db.provider.subscribeQuery(this.collection, this, typeof next === "function" ? { next } : next);
-    }
     // Override to include the collection name.
     toString() {
-        return `${this.collection}?${super.toString()}`;
+        return `${this.collection}?{${super.toString()}`;
+    }
+    /** Subscribe to this item. */
+    subscribe(onNext, onError) {
+        return runSequence(this, onNext, onError);
+    }
+    // Implement AsyncIterable
+    [Symbol.asyncIterator]() {
+        return this.db.provider.getQuerySequence(this.collection, this)[Symbol.asyncIterator]();
     }
 }
 /** Reference to a set of items in a provider. */

package/firestore/client/FirestoreClientProvider.d.ts

@@ -1,10 +1,8 @@
 import type { Firestore } from "firebase/firestore";
 import type { Data } from "../../util/data.js";
-import type { Unsubscribe } from "../../observe/Observable.js";
 import type { AsyncProvider } from "../../provider/Provider.js";
 import type { ItemArray, ItemValue, ItemConstraints } from "../../db/Item.js";
-import { Observer, PartialObserver } from "../../observe/Observer.js";
-import { Updates } from "../../update/DataUpdate.js";
+import { Updates } from "../../update/index.js";
 /**
  * Firestore client database provider.
  * - Works with the Firebase JS SDK.
@@ -15,13 +13,13 @@ export declare class FirestoreClientProvider implements AsyncProvider {
     private readonly _firestore;
     constructor(firestore: Firestore);
     getItem(collection: string, id: string): Promise<ItemValue>;
-    subscribeItem(collection: string, id: string, observer: PartialObserver<ItemValue>): Unsubscribe;
+    getItemSequence<K extends string>(collection: K, id: string): AsyncIterable<ItemValue>;
     addItem(collection: string, data: Data): Promise<string>;
     setItem(collection: string, id: string, data: Data): Promise<void>;
     updateItem(collection: string, id: string, updates: Updates): Promise<void>;
     deleteItem(collection: string, id: string): Promise<void>;
     getQuery(collection: string, constraints: ItemConstraints): Promise<ItemArray>;
-    subscribeQuery(collection: string, constraints: ItemConstraints, observer: Observer<ItemArray>): Unsubscribe;
+    getQuerySequence<K extends string>(collection: K, constraints: ItemConstraints): AsyncIterable<ItemArray>;
     setQuery(collection: string, constraints: ItemConstraints, data: Data): Promise<number>;
     updateQuery(collection: string, constraints: ItemConstraints, updates: Updates): Promise<number>;
     deleteQuery(collection: string, constraints: ItemConstraints): Promise<number>;

package/firestore/client/FirestoreClientProvider.js

@@ -1,11 +1,6 @@
 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 { dispatchError, dispatchNext } from "../../observe/Observer.js";
-import { ArrayUpdate } from "../../update/ArrayUpdate.js";
-import { DataUpdate } from "../../update/DataUpdate.js";
-import { Increment } from "../../update/Increment.js";
-import { ObjectUpdate } from "../../update/ObjectUpdate.js";
-import { Delete } from "../../update/Delete.js";
-import { Update } from "../../update/Update.js";
+import { LazyDeferredSequence } from "../../sequence/LazyDeferredSequence.js";
+import { ArrayUpdate, DataUpdate, Increment, ObjectUpdate, Delete, Update } from "../../update/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.
@@ -91,8 +86,10 @@ export class FirestoreClientProvider {
     async getItem(collection, id) {
         return _getItemValue(await getDoc(firestoreDocument(this._firestore, collection, id)));
     }
-    subscribeItem(collection, id, observer) {
-        return onSnapshot(firestoreDocument(this._firestore, collection, id), snapshot => dispatchNext(observer, _getItemValue(snapshot)), thrown => dispatchError(observer, thrown));
+    getItemSequence(collection, id) {
+        return new LazyDeferredSequence(({ resolve, reject }) => onSnapshot(firestoreDocument(this._firestore, collection, id), //
+        //
+        snapshot => resolve(_getItemValue(snapshot)), reject));
     }
     async addItem(collection, data) {
         const reference = await addDoc(firestoreCollection(this._firestore, collection), data);
@@ -110,8 +107,10 @@ export class FirestoreClientProvider {
     async getQuery(collection, constraints) {
         return _getItems(await getDocs(_getQuery(this._firestore, collection, constraints)));
     }
-    subscribeQuery(collection, constraints, observer) {
-        return onSnapshot(_getQuery(this._firestore, collection, constraints), snapshot => dispatchNext(observer, _getItems(snapshot)), thrown => dispatchError(observer, thrown));
+    getQuerySequence(collection, constraints) {
+        return new LazyDeferredSequence(({ resolve, reject }) => onSnapshot(_getQuery(this._firestore, collection, constraints), //
+        //
+        snapshot => resolve(_getItems(snapshot)), reject));
     }
     async setQuery(collection, constraints, data) {
         const snapshot = await getDocs(_getQuery(this._firestore, collection, constraints));

package/firestore/lite/FirestoreLiteProvider.d.ts

@@ -1,9 +1,8 @@
 import type { Firestore } from "firebase/firestore/lite";
 import type { Data } from "../../util/data.js";
-import type { Unsubscribe } from "../../observe/Observable.js";
 import type { AsyncProvider } from "../../provider/Provider.js";
 import type { ItemArray, ItemValue, ItemConstraints } from "../../db/Item.js";
-import { Updates } from "../../update/DataUpdate.js";
+import { Updates } from "../../update/index.js";
 /**
  * Firestore Lite client database provider.
  * - Works with the Firebase JS SDK.
@@ -14,13 +13,13 @@ export declare class FirestoreLiteProvider implements AsyncProvider {
     private readonly _firestore;
     constructor(firestore: Firestore);
     getItem(collection: string, id: string): Promise<ItemValue>;
-    subscribeItem(): Unsubscribe;
+    getItemSequence(): AsyncIterableIterator<ItemValue>;
     addItem(collection: string, data: Data): Promise<string>;
     setItem(collection: string, id: string, data: Data): Promise<void>;
     updateItem(collection: string, id: string, updates: Updates): Promise<void>;
     deleteItem(collection: string, id: string): Promise<void>;
     getQuery(collection: string, constraints: ItemConstraints): Promise<ItemArray>;
-    subscribeQuery(): Unsubscribe;
+    getQuerySequence(): AsyncIterableIterator<ItemArray>;
     setQuery(collection: string, constraints: ItemConstraints, data: Data): Promise<number>;
     updateQuery(collection: string, constraints: ItemConstraints, updates: Updates): Promise<number>;
     deleteQuery(collection: string, constraints: ItemConstraints): Promise<number>;

package/firestore/lite/FirestoreLiteProvider.js

@@ -1,11 +1,6 @@
 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 { UnsupportedError } from "../../error/UnsupportedError.js";
-import { ArrayUpdate } from "../../update/ArrayUpdate.js";
-import { DataUpdate } from "../../update/DataUpdate.js";
-import { Increment } from "../../update/Increment.js";
-import { ObjectUpdate } from "../../update/ObjectUpdate.js";
-import { Update } from "../../update/Update.js";
-import { Delete } from "../../update/Delete.js";
+import { ArrayUpdate, DataUpdate, Increment, ObjectUpdate, Delete, Update } from "../../update/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.
@@ -91,7 +86,7 @@ export class FirestoreLiteProvider {
     async getItem(collection, id) {
         return _getItemValue(await getDoc(firestoreDocument(this._firestore, collection, id)));
     }
-    subscribeItem() {
+    getItemSequence() {
         throw new UnsupportedError("FirestoreLiteProvider does not support realtime subscriptions");
     }
     async addItem(collection, data) {
@@ -110,7 +105,7 @@ export class FirestoreLiteProvider {
     async getQuery(collection, constraints) {
         return _getItems(await getDocs(_getQuery(this._firestore, collection, constraints)));
     }
-    subscribeQuery() {
+    getQuerySequence() {
         throw new UnsupportedError("FirestoreLiteProvider does not support realtime subscriptions");
     }
     async setQuery(collection, constraints, data) {

package/firestore/server/FirestoreServerProvider.d.ts

@@ -1,10 +1,8 @@
 import { Firestore } from "@google-cloud/firestore";
-import type { Unsubscribe } from "../../observe/Observable.js";
+import type { Data } from "../../util/data.js";
 import type { AsyncProvider } from "../../provider/Provider.js";
 import type { ItemArray, ItemValue, ItemConstraints } from "../../db/Item.js";
-import { Observer } from "../../observe/Observer.js";
-import { Updates } from "../../update/DataUpdate.js";
-import { Data } from "../../util/data.js";
+import { Updates } from "../../update/index.js";
 /**
  * Firestore server database provider.
  * - Works with the Firebase Admin SDK for Node.JS
@@ -13,13 +11,13 @@ export declare class FirestoreServerProvider implements AsyncProvider {
     private readonly _firestore;
     constructor(firestore?: Firestore);
     getItem(collection: string, id: string): Promise<ItemValue>;
-    subscribeItem(collection: string, id: string, observer: Observer<ItemValue>): Unsubscribe;
+    getItemSequence(collection: string, id: string): AsyncIterable<ItemValue>;
     addItem(collection: string, data: Data): Promise<string>;
     setItem(collection: string, id: string, data: Data): Promise<void>;
     updateItem(collection: string, id: string, updates: Updates): Promise<void>;
     deleteItem(collection: string, id: string): Promise<void>;
     getQuery(collection: string, constraints: ItemConstraints): Promise<ItemArray>;
-    subscribeQuery(collection: string, constraints: ItemConstraints, observer: Observer<ItemArray>): Unsubscribe;
+    getQuerySequence<K extends string>(collection: K, constraints: ItemConstraints): AsyncIterable<ItemArray>;
     setQuery(collection: string, constraints: ItemConstraints, data: Data): Promise<number>;
     updateQuery(collection: string, constraints: ItemConstraints, updates: Updates): Promise<number>;
     deleteQuery(collection: string, constraints: ItemConstraints): Promise<number>;

package/firestore/server/FirestoreServerProvider.js

@@ -1,11 +1,6 @@
 import { Firestore, FieldValue as FirestoreFieldValue } from "@google-cloud/firestore";
-import { dispatchError, dispatchNext } from "../../observe/Observer.js";
-import { ArrayUpdate } from "../../update/ArrayUpdate.js";
-import { DataUpdate } from "../../update/DataUpdate.js";
-import { Increment } from "../../update/Increment.js";
-import { ObjectUpdate } from "../../update/ObjectUpdate.js";
-import { Delete } from "../../update/Delete.js";
-import { Update } from "../../update/Update.js";
+import { LazyDeferredSequence } from "../../sequence/LazyDeferredSequence.js";
+import { ArrayUpdate, DataUpdate, Increment, ObjectUpdate, Delete, Update } from "../../update/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.
@@ -38,7 +33,7 @@ function _getQuery(firestore, collection, constraints) {
         query = query.limit(limit);
     return query;
 }
-function _getItems(snapshot) {
+function _getItemArray(snapshot) {
     return snapshot.docs.map(_getItemData);
 }
 function _getItemData(snapshot) {
@@ -89,11 +84,10 @@ export class FirestoreServerProvider {
     async getItem(collection, id) {
         return _getItemValue(await this._firestore.collection(collection).doc(id).get());
     }
-    subscribeItem(collection, id, observer) {
-        return this._firestore
-            .collection(collection)
-            .doc(id)
-            .onSnapshot(snapshot => dispatchNext(observer, _getItemValue(snapshot)), thrown => dispatchError(observer, thrown));
+    getItemSequence(collection, id) {
+        const ref = this._firestore.collection(collection).doc(id);
+        return new LazyDeferredSequence(({ resolve, reject }) => ref.onSnapshot(snapshot => resolve(_getItemValue(snapshot)), //
+        reject));
     }
     async addItem(collection, data) {
         return (await this._firestore.collection(collection).add(data)).id;
@@ -111,10 +105,12 @@ export class FirestoreServerProvider {
         await this._firestore.collection(collection).doc(id).delete();
     }
     async getQuery(collection, constraints) {
-        return _getItems(await _getQuery(this._firestore, collection, constraints).get());
+        return _getItemArray(await _getQuery(this._firestore, collection, constraints).get());
     }
-    subscribeQuery(collection, constraints, observer) {
-        return _getQuery(this._firestore, collection, constraints).onSnapshot(snapshot => dispatchNext(observer, _getItems(snapshot)), thrown => dispatchError(observer, thrown));
+    getQuerySequence(collection, constraints) {
+        const ref = _getQuery(this._firestore, collection, constraints);
+        return new LazyDeferredSequence(({ resolve, reject }) => ref.onSnapshot(snapshot => resolve(_getItemArray(snapshot)), //
+        reject));
     }
     async setQuery(collection, constraints, data) {
         return await bulkWrite(this._firestore, collection, constraints, (w, s) => void w.set(s.ref, data));

package/index.d.ts

@@ -1,17 +1,18 @@
 /**
  * This module exports almost everything in Shelving except...
- * - Modules that use peer dependencies, like `shelving/react` and `shelving/firebase-client`
- * - Modules that are for internal testing, like `shelving/test` and
+ * - Modules that use peer dependencies, like `shelving/react` and `shelving/firebase/client`
+ * - Modules that are for internal use, like `shelving/test`
  */
-export * from "./schema/index.js";
-export * from "./db/index.js";
-export * from "./provider/index.js";
-export * from "./constraint/index.js";
 export * from "./api/index.js";
+export * from "./constraint/index.js";
+export * from "./db/index.js";
 export * from "./error/index.js";
 export * from "./feedback/index.js";
+export * from "./iterate/index.js";
 export * from "./markup/index.js";
-export * from "./observe/index.js";
+export * from "./provider/index.js";
+export * from "./schema/index.js";
+export * from "./sequence/index.js";
 export * from "./state/index.js";
 export * from "./update/index.js";
 export * from "./util/index.js";

package/index.js

@@ -1,26 +1,23 @@
 /**
  * This module exports almost everything in Shelving except...
- * - Modules that use peer dependencies, like `shelving/react` and `shelving/firebase-client`
- * - Modules that are for internal testing, like `shelving/test` and
+ * - Modules that use peer dependencies, like `shelving/react` and `shelving/firebase/client`
+ * - Modules that are for internal use, like `shelving/test`
  */
-// Data storage.
-export * from "./schema/index.js";
-export * from "./db/index.js";
-export * from "./provider/index.js";
-export * from "./constraint/index.js";
 export * from "./api/index.js";
-// Utilities.
+export * from "./constraint/index.js";
+export * from "./db/index.js";
 export * from "./error/index.js";
 export * from "./feedback/index.js";
-export * from "./markup/index.js";
-export * from "./observe/index.js";
-export * from "./state/index.js";
-export * from "./update/index.js";
-export * from "./util/index.js";
-// Integrations.
-// export * from "./react/index.js"; // Not exported.
 // export * from "./firestore/client/index.js"; // Not exported.
 // export * from "./firestore/lite/index.js"; // Not exported.
 // export * from "./firestore/server/index.js"; // Not exported.
-// Testing.
+export * from "./iterate/index.js";
+export * from "./markup/index.js";
+export * from "./provider/index.js";
+// export * from "./react/index.js"; // Not exported.
+export * from "./schema/index.js";
+export * from "./sequence/index.js";
+export * from "./state/index.js";
 // export * from "./test/index.js"; // Not exported.
+export * from "./update/index.js";
+export * from "./util/index.js";

package/iterate/AbstractGenerator.d.ts

@@ -0,0 +1,8 @@
+/** Abstract generator designed to be extended that implements the full generator protocol. */
+export declare abstract class AbstractGenerator<T, R, N> implements Generator<T, R, N> {
+    readonly [Symbol.toStringTag]: string;
+    abstract next(value: N): IteratorResult<T, R>;
+    throw(thrown: Error | unknown): IteratorResult<T, R>;
+    return(value: R): IteratorResult<T, R>;
+    [Symbol.iterator](): Generator<T, R, N>;
+}

package/iterate/AbstractGenerator.js

@@ -0,0 +1,26 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var _a;
+import { setPrototype } from "../util/class.js";
+/** Abstract generator designed to be extended that implements the full generator protocol. */
+export class AbstractGenerator {
+    throw(thrown) {
+        // Default behaviour for a generator is to throw the error back out of the iterator and not continue.
+        throw thrown;
+    }
+    return(value) {
+        // Default behaviour for a generator is to return `done: true` and the input value.
+        return { done: true, value };
+    }
+    // Implement `Iterable`
+    [(_a = Symbol.toStringTag, Symbol.iterator)]() {
+        return this;
+    }
+}
+__decorate([
+    setPrototype(Symbol.toStringTag, "Generator")
+], AbstractGenerator.prototype, _a, void 0);