shelving 1.80.1 → 1.82.1

package/constraint/Constraints.js

@@ -1,4 +1,4 @@
-import { withItems, withoutItems } from "../util/array.js";
+import { withArrayItems, withoutArrayItems } from "../util/array.js";
 import { Constraint } from "./Constraint.js";
 /** Type of Rule that is powered by several sub-constraints (e.g. `Filters` and `Sorts` and `Query` itself extend this). */
 export class Constraints extends Constraint {
@@ -20,12 +20,12 @@ export class Constraints extends Constraint {
     }
     /** Clone this set of constraints but add additional constraints. */
     with(...constraints) {
-        const _constraints = withItems(this._constraints, ...constraints);
+        const _constraints = withArrayItems(this._constraints, ...constraints);
         return _constraints !== this._constraints ? { __proto__: Object.getPrototypeOf(this), ...this, _constraints: _constraints } : this;
     }
     /** Clone this set of constraints but remove specific constraints. */
     without(...constraints) {
-        const _constraints = withoutItems(this._constraints, ...constraints);
+        const _constraints = withoutArrayItems(this._constraints, ...constraints);
         return _constraints !== this._constraints ? { __proto__: Object.getPrototypeOf(this), ...this, _constraints: _constraints } : this;
     }
     /** Iterate over the constraints. */

package/constraint/FilterConstraint.d.ts

@@ -1,4 +1,4 @@
-import type { Data, Key } from "../util/data.js";
+import type { Data, DataKey } from "../util/data.js";
 import type { Nullish } from "../util/null.js";
 import { ImmutableArray } from "../util/array.js";
 import { Matchable } from "../util/match.js";
@@ -6,14 +6,14 @@ import type { Constraint } from "./Constraint.js";
 /** Possible operator references. */
 export declare type FilterOperator = "IS" | "NOT" | "IN" | "OUT" | "CONTAINS" | "LT" | "LTE" | "GT" | "GTE";
 /** Format that allows filters to be specified as a string, e.g. `!name` means `name is not` and `age>` means `age is more than` and `tags[]` means `tags array contains` */
-export declare type FilterKey<T extends Data> = Key<T> | `${Key<T>}` | `!${Key<T>}` | `${Key<T>}[]` | `${Key<T>}<` | `${Key<T>}<=` | `${Key<T>}>` | `${Key<T>}>=`;
+export declare type FilterKey<T extends Data> = DataKey<T> | `${DataKey<T>}` | `!${DataKey<T>}` | `${DataKey<T>}[]` | `${DataKey<T>}<` | `${DataKey<T>}<=` | `${DataKey<T>}>` | `${DataKey<T>}>=`;
 /** Format that allows multiple filters to be specified as a plain object. */
 export declare type FilterProps<T extends Data> = {
-    [K in Key<T> as `${K}` | `!${K}`]?: T[K] | ImmutableArray<T[K]>;
+    [K in DataKey<T> as `${K}` | `!${K}`]?: T[K] | ImmutableArray<T[K]>;
 } & {
-    [K in Key<T> as `${K}[]`]?: Required<T>[K] extends ImmutableArray<infer X> ? X : never;
+    [K in DataKey<T> as `${K}[]`]?: Required<T>[K] extends ImmutableArray<infer X> ? X : never;
 } & {
-    [K in Key<T> as `${K}<` | `${K}<=` | `${K}>` | `${K}>=`]?: T[K];
+    [K in DataKey<T> as `${K}<` | `${K}<=` | `${K}>` | `${K}>=`]?: T[K];
 };
 /** List of filters in a flexible format. */
 export declare type FilterList<T extends Data> = Nullish<FilterProps<T> | FilterConstraint<T>> | Iterable<FilterList<T>>;

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

@@ -1,4 +1,4 @@
-import { getProp } from "../util/object.js";
+import { getObjectProp } from "../util/object.js";
 import { assert } from "../util/assert.js";
 import { limitItems } from "../util/iterate.js";
 import { FilterConstraints } from "./FilterConstraints.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) {
@@ -96,7 +96,7 @@ function* _getAfterFilters(sorts, item) {
     for (const sort of sorts) {
         const { key, direction } = sort;
         const filterKey = direction === "ASC" ? (sort === lastSort ? `${key}>` : `${key}>=`) : sort === lastSort ? `${key}<` : `${key}<=`;
-        yield new FilterConstraint(filterKey, getProp(item, key));
+        yield new FilterConstraint(filterKey, getObjectProp(item, key));
     }
 }
 function* _getBeforeFilters(sorts, item) {
@@ -105,6 +105,6 @@ function* _getBeforeFilters(sorts, item) {
     for (const sort of sorts) {
         const { key, direction } = sort;
         const filterKey = direction === "ASC" ? (sort === lastSort ? `${key}<` : `${key}<=`) : sort === lastSort ? `${key}>` : `${key}>=`;
-        yield new FilterConstraint(filterKey, getProp(item, key));
+        yield new FilterConstraint(filterKey, getObjectProp(item, key));
     }
 }

package/constraint/SortConstraint.d.ts

@@ -1,10 +1,10 @@
 import type { ImmutableArray } from "../util/array.js";
-import type { Data, Key } from "../util/data.js";
+import type { Data, DataKey } from "../util/data.js";
 import type { Nullish } from "../util/null.js";
 import { Rankable } from "../util/sort.js";
 import type { Constraint } from "./Constraint.js";
 /** Format that allows sorts to be set as a plain string, e.g. `name` sorts by name in ascending order and `!date` sorts by date in descending order. */
-export declare type SortKey<T extends Data> = Key<T> | `${Key<T>}` | `!${Key<T>}`;
+export declare type SortKey<T extends Data> = DataKey<T> | `${DataKey<T>}` | `!${DataKey<T>}`;
 /** One or more sort keys. */
 export declare type SortKeys<T extends Data> = SortKey<T> | ImmutableArray<SortKey<T>>;
 /** Possible operator references. */

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.d.ts

@@ -1,4 +1,4 @@
-import type { Data, Datas, Key } from "../util/data.js";
+import type { Data, Datas, DataKey } from "../util/data.js";
 import type { ImmutableArray } from "../util/array.js";
 import type { Provider, AsyncProvider } from "../provider/Provider.js";
 import { Updates } from "../update/DataUpdate.js";
@@ -6,42 +6,42 @@ import { Nullish } from "../util/null.js";
 import { DeepIterable } from "../util/iterate.js";
 import type { ItemConstraints, ItemData } from "./Item.js";
 /** Change on a collection. */
-export interface Change<T extends Datas, K extends Key<T> = Key<T>> {
+export interface Change<T extends Datas, K extends DataKey<T> = DataKey<T>> {
     readonly action: string;
     readonly collection: K;
 }
 /** Add on an item. */
-export interface AddChange<T extends Datas, K extends Key<T> = Key<T>> extends Change<T, K> {
+export interface AddChange<T extends Datas, K extends DataKey<T> = DataKey<T>> extends Change<T, K> {
     readonly action: "ADD";
     readonly data: T[K];
 }
 /** Set on an item. */
-export interface SetChange<T extends Datas, K extends Key<T> = Key<T>> extends Change<T, K> {
+export interface SetChange<T extends Datas, K extends DataKey<T> = DataKey<T>> extends Change<T, K> {
     readonly action: "SET";
     readonly id: string;
     readonly data: T[K];
 }
 /** Update change on an item. */
-export interface UpdateChange<T extends Datas, K extends Key<T> = Key<T>> extends Change<T, K> {
+export interface UpdateChange<T extends Datas, K extends DataKey<T> = DataKey<T>> extends Change<T, K> {
     readonly action: "UPDATE";
     readonly id: string;
     readonly updates: Updates<T[K]>;
 }
 /** Delete change on an item. */
-export interface DeleteChange<T extends Datas, K extends Key<T> = Key<T>> extends Change<T, K> {
+export interface DeleteChange<T extends Datas, K extends DataKey<T> = DataKey<T>> extends Change<T, K> {
     readonly action: "DELETE";
     readonly id: string;
 }
 /** Set, update, or delete change on an item. */
-export declare type ItemChange<T extends Datas, K extends Key<T> = Key<T>> = SetChange<T, K> | UpdateChange<T, K> | DeleteChange<T, K>;
+export declare type ItemChange<T extends Datas, K extends DataKey<T> = DataKey<T>> = SetChange<T, K> | UpdateChange<T, K> | DeleteChange<T, K>;
 /** Array of item changes. */
-export declare type ItemChanges<T extends Datas, K extends Key<T> = Key<T>> = ImmutableArray<ItemChange<T, K>>;
+export declare type ItemChanges<T extends Datas, K extends DataKey<T> = DataKey<T>> = ImmutableArray<ItemChange<T, K>>;
 /** Write change on an item. */
-export declare type WriteChange<T extends Datas, K extends Key<T> = Key<T>> = ItemChange<T, K> | AddChange<T, K>;
+export declare type WriteChange<T extends Datas, K extends DataKey<T> = DataKey<T>> = ItemChange<T, K> | AddChange<T, K>;
 /** Array of write changes. */
-export declare type WriteChanges<T extends Datas, K extends Key<T> = Key<T>> = ImmutableArray<WriteChange<T, K>>;
+export declare type WriteChanges<T extends Datas, K extends DataKey<T> = DataKey<T>> = ImmutableArray<WriteChange<T, K>>;
 /** Apply a set of changes to a synchronous provider. */
-export declare function changeProvider<T extends Datas, K extends Key<T>>(provider: Provider<T>, ...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): ItemChanges<T, K>;
+export declare function changeProvider<T extends Datas, K extends DataKey<T>>(provider: Provider<T>, ...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): ItemChanges<T, K>;
 /** Apply a set of changes to an asynchronous provider. */
-export declare function changeAsyncProvider<T extends Datas, K extends Key<T>>(provider: AsyncProvider<T>, ...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): Promise<ItemChanges<T, K>>;
+export declare function changeAsyncProvider<T extends Datas, K extends DataKey<T>>(provider: AsyncProvider<T>, ...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): Promise<ItemChanges<T, K>>;
 export declare function _getItemConstraint<T extends Data>(id: string): ItemConstraints<ItemData<T>>;

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

@@ -1,18 +1,15 @@
-import type { Datas, Key } from "../util/data.js";
+import type { Datas, DataKey } from "../util/data.js";
 import type { Nullish } from "../util/null.js";
 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";
 import { AddChange, ItemChanges, WriteChange, UpdateChange, DeleteChange, SetChange } from "./Change.js";
 /** Reference to a collection in a synchronous or asynchronous provider. */
-declare abstract class BaseCollection<T extends Datas = Datas, K extends Key<T> = Key<T>> {
+declare abstract class BaseCollection<T extends Datas = Datas, K extends DataKey<T> = DataKey<T>> {
     abstract readonly db: Database<T> | AsyncDatabase<T>;
     abstract readonly collection: K;
     /** Create a query on this item's collection. */
@@ -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. */
@@ -44,7 +39,7 @@ declare abstract class BaseCollection<T extends Datas = Datas, K extends Key<T>
     toString(): K;
 }
 /** Reference to a collection in a synchronous provider. */
-export declare class Collection<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseCollection<T, K> {
+export declare class Collection<T extends Datas = Datas, K extends DataKey<T> = DataKey<T>> extends BaseCollection<T, K> {
     readonly db: Database<T>;
     readonly collection: K;
     constructor(db: Database<T>, collection: K);
@@ -58,7 +53,7 @@ export declare class Collection<T extends Datas = Datas, K extends Key<T> = Key<
     delete(id: string): void;
 }
 /** Reference to a collection in an asynchronous provider. */
-export declare class AsyncCollection<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseCollection<T, K> {
+export declare class AsyncCollection<T extends Datas = Datas, K extends DataKey<T> = DataKey<T>> extends BaseCollection<T, K> {
     readonly db: AsyncDatabase<T>;
     readonly collection: K;
     constructor(db: AsyncDatabase<T>, collection: K);

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

@@ -1,4 +1,4 @@
-import type { Key, Datas } from "../util/data.js";
+import type { DataKey, Datas } from "../util/data.js";
 import type { Nullish } from "../util/null.js";
 import type { DeepIterable } from "../util/iterate.js";
 import type { AsyncProvider, Provider } from "../provider/Provider.js";
@@ -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";
@@ -17,60 +14,58 @@ import { AddChange, DeleteChange, ItemChanges, SetChange, UpdateChange, WriteCha
 declare abstract class BaseDatabase<T extends Datas> {
     abstract readonly provider: Provider<T> | AsyncProvider<T>;
     /** Create a query on a collection in this database. */
-    abstract collection<K extends Key<T>>(collection: K): Collection<T, K> | AsyncCollection<T, K>;
+    abstract collection<K extends DataKey<T>>(collection: K): Collection<T, K> | AsyncCollection<T, K>;
     /** Create a query on a collection in this database. */
-    abstract query<K extends Key<T>>(collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null): Query<T, K> | AsyncQuery<T, K>;
+    abstract query<K extends DataKey<T>>(collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null): Query<T, K> | AsyncQuery<T, K>;
     /** Reference an item in a collection in this database. */
-    abstract item<K extends Key<T>>(collection: K, id: string): Item<T, K> | AsyncItem<T, K>;
+    abstract item<K extends DataKey<T>>(collection: K, id: string): Item<T, K> | AsyncItem<T, K>;
     /** Run a set of changes in this database. */
     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;
+    abstract get<K extends DataKey<T>>(collection: K, id: string): ItemValue<T[K]> | Promise<ItemValue<T[K]>>;
     /** Add a document to a collection in this database. */
-    abstract add<K extends Key<T>>(collection: K, data: T[K]): string | Promise<string>;
+    abstract add<K extends DataKey<T>>(collection: K, data: T[K]): string | Promise<string>;
     /** Set a document in a collection in this database. */
-    abstract set<K extends Key<T>>(collection: K, id: string, data: T[K]): void | Promise<void>;
+    abstract set<K extends DataKey<T>>(collection: K, id: string, data: T[K]): void | Promise<void>;
     /** Update a document in a collection in this database. */
-    abstract update<K extends Key<T>>(collection: K, id: string, updates: Updates<T[K]>): void | Promise<void>;
+    abstract update<K extends DataKey<T>>(collection: K, id: string, updates: Updates<T[K]>): void | Promise<void>;
     /** Delete a document from a collection in this database. */
-    abstract delete<K extends Key<T>>(collection: K, id: string): void | Promise<void>;
+    abstract delete<K extends DataKey<T>>(collection: K, id: string): void | Promise<void>;
     /** Get an add change for a collection in this database. */
-    getAdd<K extends Key<T>>(collection: K, data: T[K]): AddChange<T, K>;
+    getAdd<K extends DataKey<T>>(collection: K, data: T[K]): AddChange<T, K>;
     /** Get a set change for a collection in this database. */
-    getSet<K extends Key<T>>(collection: K, id: string, data: T[K]): SetChange<T, K>;
+    getSet<K extends DataKey<T>>(collection: K, id: string, data: T[K]): SetChange<T, K>;
     /** Get an update change for a collection in this database. */
-    getUpdate<K extends Key<T>>(collection: K, id: string, updates: Updates<T[K]>): UpdateChange<T, K>;
+    getUpdate<K extends DataKey<T>>(collection: K, id: string, updates: Updates<T[K]>): UpdateChange<T, K>;
     /** Get a delete change for a collection in this database. */
-    getDelete<K extends Key<T>>(collection: K, id: string): DeleteChange<T, K>;
+    getDelete<K extends DataKey<T>>(collection: K, id: string): DeleteChange<T, K>;
 }
 /** Database with a synchronous provider. */
 export declare class Database<T extends Datas = Datas> extends BaseDatabase<T> {
     readonly provider: Provider<T>;
     constructor(provider: Provider<T>);
-    collection<K extends Key<T>>(collection: K): Collection<T, K>;
-    query<K extends Key<T>>(collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null): Query<T, K>;
-    item<K extends Key<T>>(collection: K, id: string): Item<T, K>;
+    collection<K extends DataKey<T>>(collection: K): Collection<T, K>;
+    query<K extends DataKey<T>>(collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null): Query<T, K>;
+    item<K extends DataKey<T>>(collection: K, id: string): Item<T, K>;
     change(...changes: DeepIterable<Nullish<WriteChange<T>>>[]): ItemChanges<T>;
-    get<K extends Key<T>>(collection: K, id: string): ItemValue<T[K]>;
-    add<K extends Key<T>>(collection: K, data: T[K]): string;
-    set<K extends Key<T>>(collection: K, id: string, data: T[K]): void;
-    update<K extends Key<T>>(collection: K, id: string, updates: Updates<T[K]>): void;
-    delete<K extends Key<T>>(collection: K, id: string): void;
+    get<K extends DataKey<T>>(collection: K, id: string): ItemValue<T[K]>;
+    add<K extends DataKey<T>>(collection: K, data: T[K]): string;
+    set<K extends DataKey<T>>(collection: K, id: string, data: T[K]): void;
+    update<K extends DataKey<T>>(collection: K, id: string, updates: Updates<T[K]>): void;
+    delete<K extends DataKey<T>>(collection: K, id: string): void;
 }
 /** Database with a synchronous provider. */
 export declare class AsyncDatabase<T extends Datas = Datas> extends BaseDatabase<T> {
     readonly provider: AsyncProvider<T>;
     constructor(provider: AsyncProvider<T>);
-    collection<K extends Key<T>>(collection: K): AsyncCollection<T, K>;
-    query<K extends Key<T>>(collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null): AsyncQuery<T, K>;
-    item<K extends Key<T>>(collection: K, id: string): AsyncItem<T, K>;
+    collection<K extends DataKey<T>>(collection: K): AsyncCollection<T, K>;
+    query<K extends DataKey<T>>(collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null): AsyncQuery<T, K>;
+    item<K extends DataKey<T>>(collection: K, id: string): AsyncItem<T, K>;
     change(...changes: DeepIterable<Nullish<WriteChange<T>>>[]): Promise<ItemChanges<T>>;
-    get<K extends Key<T>>(collection: K, id: string): Promise<ItemValue<T[K]>>;
-    add<K extends Key<T>>(collection: K, data: T[K]): Promise<string>;
-    set<K extends Key<T>>(collection: K, id: string, data: T[K]): Promise<void>;
-    update<K extends Key<T>>(collection: K, id: string, updates: Updates<T[K]>): Promise<void>;
-    delete<K extends Key<T>>(collection: K, id: string): Promise<void>;
+    get<K extends DataKey<T>>(collection: K, id: string): Promise<ItemValue<T[K]>>;
+    add<K extends DataKey<T>>(collection: K, data: T[K]): Promise<string>;
+    set<K extends DataKey<T>>(collection: K, id: string, data: T[K]): Promise<void>;
+    update<K extends DataKey<T>>(collection: K, id: string, updates: Updates<T[K]>): Promise<void>;
+    delete<K extends DataKey<T>>(collection: K, id: string): Promise<void>;
 }
 export {};

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, DataKey } 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 DataKey<T> = DataKey<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,9 +54,12 @@ 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> {
+export declare class Item<T extends Datas = Datas, K extends DataKey<T> = DataKey<T>> extends BaseItem<T, K> {
     readonly db: Database<T>;
     readonly collection: K;
     readonly id: string;
@@ -80,7 +73,7 @@ export declare class Item<T extends Datas = Datas, K extends Key<T> = Key<T>> ex
     delete(): void;
 }
 /** Reference to an item in an asynchronous database. */
-export declare class AsyncItem<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseItem<T, K> {
+export declare class AsyncItem<T extends Datas = Datas, K extends DataKey<T> = DataKey<T>> extends BaseItem<T, K> {
     readonly db: AsyncDatabase<T>;
     readonly collection: K;
     readonly id: string;

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 { DataKey, 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 DataKey<T> = DataKey<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 DataKey<T> = DataKey<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 DataKey<T> = DataKey<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>;