shelving 1.76.0 → 1.77.0

package/constraint/Constraints.d.ts

@@ -2,7 +2,7 @@ import type { Data } from "../util/data.js";
 import { ImmutableArray } 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 declare abstract class Constraints<T extends Data, C extends Constraint<T>> extends Constraint<T> implements Iterable<C> {
+export declare abstract class Constraints<T extends Data, C extends Constraint<Partial<T>>> extends Constraint<T> implements Iterable<C> {
     protected readonly _constraints: ImmutableArray<C>;
     /** Get the first constraint. */
     get first(): C | undefined;

package/constraint/FilterConstraint.d.ts

@@ -1,8 +1,8 @@
-import { ArrayType, ImmutableArray } from "../util/array.js";
-import { Data, Key } from "../util/data.js";
+import type { Data, Key } from "../util/data.js";
+import type { Nullish } from "../util/null.js";
+import { ImmutableArray } from "../util/array.js";
 import { Matchable } from "../util/match.js";
-import { NotString } from "../util/string.js";
-import { Constraint } from "./Constraint.js";
+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` */
@@ -11,12 +11,12 @@ export declare type FilterKey<T extends Data> = Key<T> | `${Key<T>}` | `!${Key<T
 export declare type FilterProps<T extends Data> = {
     [K in Key<T> as `${K}` | `!${K}`]?: T[K] | ImmutableArray<T[K]>;
 } & {
-    [K in Key<T> as `${K}[]`]?: T[K] extends ImmutableArray ? ArrayType<T[K]> : never;
+    [K in Key<T> as `${K}[]`]?: Required<T>[K] extends ReadonlyArray<infer X> ? X : never;
 } & {
     [K in Key<T> as `${K}<` | `${K}<=` | `${K}>` | `${K}>=`]?: T[K];
 };
 /** List of filters in a flexible format. */
-export declare type FilterList<T extends Data> = FilterProps<T> | FilterConstraint<T> | Iterable<FilterList<T> & NotString>;
+export declare type FilterList<T extends Data> = Nullish<FilterProps<T> | FilterConstraint<T>> | Iterable<FilterList<T>>;
 /**
  * Filter: filters a list of data.
  *

package/constraint/FilterConstraint.js

@@ -89,7 +89,7 @@ export function* getFilters(filters) {
         for (const filter of filters)
             yield* getFilters(filter);
     }
-    else {
+    else if (filters) {
         for (const [key, value] of Object.entries(filters))
             yield new FilterConstraint(key, value);
     }

package/constraint/FilterConstraints.d.ts

@@ -1,6 +1,6 @@
 import type { Data } from "../util/data.js";
 import type { Matchable } from "../util/match.js";
-import { FilterList, FilterProps, FilterConstraint } from "./FilterConstraint.js";
+import { FilterList, FilterConstraint } from "./FilterConstraint.js";
 import { Constraints } from "./Constraints.js";
 /**
  * Interface to make sure an object implements all matchers.
@@ -8,14 +8,14 @@ import { Constraints } from "./Constraints.js";
  */
 export interface Filterable<T extends Data> extends Matchable<T, void> {
     /** Add a filter to this filterable. */
-    filter(props: FilterProps<T>): this;
+    filter(...filters: FilterList<Partial<T>>[]): this;
     /** Match an item against the filters specified for this object. */
     match(item: T): boolean;
 }
 /** A set of filters. */
-export declare class FilterConstraints<T extends Data = Data> extends Constraints<T, FilterConstraint<T>> implements Filterable<T> {
-    constructor(...filters: FilterList<T>[]);
-    filter(...filters: FilterList<T>[]): this;
+export declare class FilterConstraints<T extends Data = Data> extends Constraints<T, FilterConstraint<Partial<T>>> implements Filterable<T> {
+    constructor(...filters: FilterList<Partial<T>>[]);
+    filter(...filters: FilterList<Partial<T>>[]): this;
     match(item: T): boolean;
     transform(items: Iterable<T>): Iterable<T>;
     toString(): string;

package/constraint/QueryConstraints.d.ts

@@ -3,7 +3,7 @@ import { Filterable, FilterConstraints } from "./FilterConstraints.js";
 import { Sortable, SortConstraints } from "./SortConstraints.js";
 import { Constraint } from "./Constraint.js";
 import { FilterList } from "./FilterConstraint.js";
-import { SortKeys, SortList } from "./SortConstraint.js";
+import { SortList } from "./SortConstraint.js";
 /** Interface that combines Filterable, Sortable, Sliceable. */
 export interface Queryable<T extends Data> extends Filterable<T>, Sortable<T> {
     /**
@@ -31,11 +31,11 @@ export declare class QueryConstraints<T extends Data = Data> extends Constraint<
     readonly filters: FilterConstraints<T>;
     readonly sorts: SortConstraints<T>;
     readonly limit: number | null;
-    constructor(filters?: FilterList<T>, sorts?: SortList<T>, limit?: number | null);
-    filter(...filters: FilterList<T>[]): this;
+    constructor(filters?: FilterList<Partial<T>>, sorts?: SortList<Partial<T>>, limit?: number | null);
+    filter(...filters: FilterList<Partial<T>>[]): this;
     get unfilter(): this;
     match(item: T): boolean;
-    sort(...keys: SortKeys<T>[]): this;
+    sort(...sorts: SortList<Partial<T>>[]): this;
     get unsort(): this;
     rank(left: T, right: T): number;
     after(item: T): this;

package/constraint/QueryConstraints.js

@@ -37,11 +37,11 @@ export class QueryConstraints extends Constraint {
         return this.filters.match(item);
     }
     // Implement `Sortable`
-    sort(...keys) {
+    sort(...sorts) {
         return {
             __proto__: Object.getPrototypeOf(this),
             ...this,
-            sorts: this.sorts.sort(...keys),
+            sorts: this.sorts.sort(...sorts),
         };
     }
     get unsort() {

package/constraint/SortConstraint.d.ts

@@ -1,7 +1,8 @@
 import type { ImmutableArray } from "../util/array.js";
-import { Data, Key } from "../util/data.js";
+import type { Data, Key } from "../util/data.js";
+import type { Nullish } from "../util/null.js";
 import { Rankable } from "../util/sort.js";
-import { Constraint } from "./Constraint.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>}`;
 /** One or more sort keys. */
@@ -9,7 +10,7 @@ export declare type SortKeys<T extends Data> = SortKey<T> | ImmutableArray<SortK
 /** Possible operator references. */
 export declare type SortDirection = "ASC" | "DESC";
 /** List of sorts in a flexible format. */
-export declare type SortList<T extends Data> = SortKeys<T> | SortConstraint<T> | Iterable<SortList<T>>;
+export declare type SortList<T extends Data> = Nullish<SortKeys<T> | SortConstraint<T> | Iterable<SortList<T>>>;
 /** Sort a list of values. */
 export declare class SortConstraint<T extends Data = Data> implements Constraint<T>, Rankable<T> {
     readonly key: string;

package/constraint/SortConstraint.js

@@ -1,4 +1,3 @@
-import { getProp } from "../util/data.js";
 import { rank, rankAsc, rankDesc, sortItems } from "../util/sort.js";
 /** Sort a list of values. */
 export class SortConstraint {
@@ -16,7 +15,7 @@ export class SortConstraint {
         return `"${this.direction === "DESC" ? "!" : ""}${this.key}"`;
     }
     rank(left, right) {
-        return rank(getProp(left, this.key), this.direction === "ASC" ? rankAsc : rankDesc, getProp(right, this.key));
+        return rank(left[this.key], this.direction === "ASC" ? rankAsc : rankDesc, right[this.key]);
     }
     transform(items) {
         return sortItems(items, this);
@@ -33,7 +32,7 @@ export function* getSorts(sorts) {
     else if (sorts instanceof SortConstraint) {
         yield sorts;
     }
-    else {
+    else if (sorts) {
         for (const sort of sorts)
             yield* getSorts(sort);
     }

package/constraint/SortConstraints.d.ts

@@ -1,19 +1,19 @@
 import type { Data } from "../util/data.js";
 import { Rankable } from "../util/sort.js";
 import { Constraints } from "./Constraints.js";
-import { SortConstraint, SortKeys, SortList } from "./SortConstraint.js";
+import { SortConstraint, SortList } from "./SortConstraint.js";
 /**
  * Interface to make sure an object implements all directions.
  * - Extends `Rankable` so this object itself can be directly be used with `filterItems()` and `filterEntries()`
  */
 export interface Sortable<T extends Data> extends Rankable<T> {
     /** Add one or more sorts to this sortable. */
-    sort(...keys: SortKeys<T>[]): this;
+    sort(...keys: SortList<Partial<T>>[]): this;
 }
 /** A set of sorts. */
-export declare class SortConstraints<T extends Data = Data> extends Constraints<T, SortConstraint<T>> implements Sortable<T> {
-    constructor(...sorts: SortList<T>[]);
-    sort(...sorts: SortList<T>[]): this;
+export declare class SortConstraints<T extends Data = Data> extends Constraints<T, SortConstraint<Partial<T>>> implements Sortable<T> {
+    constructor(...sorts: SortList<Partial<T>>[]);
+    sort(...sorts: SortList<Partial<T>>[]): this;
     rank(left: T, right: T): number;
     transform(items: Iterable<T>): Iterable<T>;
     toString(): string;

package/db/Change.d.ts

@@ -3,33 +3,34 @@ import type { ImmutableArray } from "../util/array.js";
 import type { Provider, AsyncProvider } from "../provider/Provider.js";
 import { DataUpdate } from "../update/DataUpdate.js";
 import { Nullish } from "../util/null.js";
+import { DeepIterable } from "../util/iterate.js";
 import type { ItemConstraints, ItemData } from "./Item.js";
-export interface Change<T extends Datas, K extends Key<T>> {
+export interface Change<T extends Datas> {
     readonly action: string;
-    readonly collection: K;
+    readonly collection: Key<T>;
 }
 /** Add on an item. */
-export interface AddChange<T extends Datas, K extends Key<T>> extends Change<T, K> {
+export interface AddChange<T extends Datas, K extends Key<T> = Key<T>> extends Change<T> {
     readonly action: "ADD";
     readonly collection: K;
     readonly data: T[K];
 }
 /** Set on an item. */
-export interface SetChange<T extends Datas, K extends Key<T>> extends Change<T, K> {
+export interface SetChange<T extends Datas, K extends Key<T> = Key<T>> extends Change<T> {
     readonly action: "SET";
     readonly collection: K;
     readonly id: string;
     readonly data: T[K];
 }
 /** Update change on an item. */
-export interface UpdateChange<T extends Datas, K extends Key<T>> extends Change<T, K> {
+export interface UpdateChange<T extends Datas, K extends Key<T> = Key<T>> extends Change<T> {
     readonly action: "UPDATE";
     readonly collection: K;
     readonly id: string;
     readonly update: DataUpdate<T[K]>;
 }
 /** Delete change on an item. */
-export interface DeleteChange<T extends Datas, K extends Key<T>> extends Change<T, K> {
+export interface DeleteChange<T extends Datas, K extends Key<T> = Key<T>> extends Change<T> {
     readonly action: "DELETE";
     readonly collection: K;
     readonly id: string;
@@ -43,7 +44,7 @@ export declare type WriteChange<T extends Datas, K extends Key<T> = Key<T>> = It
 /** Array of write changes. */
 export declare type WriteChanges<T extends Datas, K extends Key<T> = Key<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> = Key<T>>(provider: Provider<T>, changes: ImmutableArray<Nullish<WriteChange<T, K>>>): ItemChanges<T, K>;
+export declare function changeProvider<T extends Datas, K extends Key<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: ImmutableArray<Nullish<WriteChange<T, K>>>): Promise<ItemChanges<T, K>>;
+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 _getItemConstraint<T extends Data>(id: string): ItemConstraints<ItemData<T>>;

package/db/Change.js

@@ -1,9 +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";
 /** Apply a set of changes to a synchronous provider. */
-export function changeProvider(provider, changes) {
-    return changes.filter(notNullish).map(_changeItem, provider);
+export function changeProvider(provider, ...changes) {
+    return Array.from(flattenDeepIterable(changes)).filter(notNullish).map(_changeItem, provider);
 }
 function _changeItem(change) {
     const { action, collection } = change;
@@ -18,8 +19,8 @@ function _changeItem(change) {
     return change;
 }
 /** Apply a set of changes to an asynchronous provider. */
-export function changeAsyncProvider(provider, changes) {
-    return Promise.all(changes.filter(notNullish).map(_changeAsyncItem, provider));
+export function changeAsyncProvider(provider, ...changes) {
+    return Promise.all(Array.from(flattenDeepIterable(changes)).filter(notNullish).map(_changeAsyncItem, provider));
 }
 async function _changeAsyncItem(change) {
     const { collection, action } = change;

package/db/Collection.d.ts

@@ -2,22 +2,23 @@ import type { Datas, Key } 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 { ItemData, AsyncItem, Item } from "./Item.js";
+import type { DeepIterable } from "../util/iterate.js";
 import type { AsyncDatabase, Database } from "./Database.js";
-import type { AsyncQuery, Query } from "./Query.js";
-import type { AddChange, ItemChanges, WriteChange } from "./Change.js";
+import { ItemData, AsyncItem, Item } from "./Item.js";
+import { AsyncQuery, Query } from "./Query.js";
+import { AddChange, ItemChanges, WriteChange } 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>> {
     abstract readonly db: Database<T> | AsyncDatabase<T>;
     abstract readonly collection: K;
     /** Create a query on this item's collection. */
-    abstract query(filters?: FilterList<ItemData<T[K]>>, sorts?: SortList<ItemData<T[K]>>, limit?: number | null): Query<T, K> | AsyncQuery<T, K>;
+    abstract query(filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null): Query<T, K> | AsyncQuery<T, K>;
     /** Create a query on this item's collection. */
     abstract item(id: string): Item<T, K> | AsyncItem<T, K>;
     /** Add an item to this collection. */
     abstract add(data: T[K]): string | Promise<string>;
     /** Run a set of changes on this database. */
-    abstract change(...changes: Nullish<WriteChange<T, K>>[]): ItemChanges<T, K> | Promise<ItemChanges<T, K>>;
+    abstract change(...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): ItemChanges<T, K> | Promise<ItemChanges<T, K>>;
     /** Get an add change for this collection. */
     getAdd(data: T[K]): AddChange<T, K>;
     toString(): K;
@@ -27,19 +28,19 @@ export declare class Collection<T extends Datas = Datas, K extends Key<T> = Key<
     readonly db: Database<T>;
     readonly collection: K;
     constructor(db: Database<T>, collection: K);
-    query(filters?: FilterList<ItemData<T[K]>>, sorts?: SortList<ItemData<T[K]>>, limit?: number | null): Query<T, K>;
+    query(filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null): Query<T, K>;
     item(id: string): Item<T, K>;
     add(data: T[K]): string;
-    change(...changes: Nullish<WriteChange<T, K>>[]): ItemChanges<T, K>;
+    change(...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): ItemChanges<T, K>;
 }
 /** 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> {
     readonly db: AsyncDatabase<T>;
     readonly collection: K;
     constructor(db: AsyncDatabase<T>, collection: K);
-    query(filters?: FilterList<ItemData<T[K]>>, sorts?: SortList<ItemData<T[K]>>, limit?: number | null): AsyncQuery<T, K>;
+    query(filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null): AsyncQuery<T, K>;
     item(id: string): AsyncItem<T, K>;
     add(data: T[K]): Promise<string>;
-    change(...changes: Nullish<WriteChange<T, K>>[]): Promise<ItemChanges<T, K>>;
+    change(...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): Promise<ItemChanges<T, K>>;
 }
 export {};

package/db/Collection.js

@@ -1,3 +1,6 @@
+import { AsyncItem, Item } from "./Item.js";
+import { AsyncQuery, Query } from "./Query.js";
+import { changeAsyncProvider, changeProvider } from "./Change.js";
 /** Reference to a collection in a synchronous or asynchronous provider. */
 class BaseCollection {
     /** Get an add change for this collection. */
@@ -17,16 +20,16 @@ export class Collection extends BaseCollection {
         this.collection = collection;
     }
     query(filters, sorts, limit) {
-        return this.db.query(this.collection, filters, sorts, limit);
+        return new Query(this.db, this.collection, filters, sorts, limit);
     }
     item(id) {
-        return this.db.item(this.collection, id);
+        return new Item(this.db, this.collection, id);
     }
     add(data) {
         return this.db.provider.addItem(this.collection, data);
     }
     change(...changes) {
-        return this.db.change(...changes);
+        return changeProvider(this.db.provider, changes);
     }
 }
 /** Reference to a collection in an asynchronous provider. */
@@ -37,15 +40,15 @@ export class AsyncCollection extends BaseCollection {
         this.collection = collection;
     }
     query(filters, sorts, limit) {
-        return this.db.query(this.collection, filters, sorts, limit);
+        return new AsyncQuery(this.db, this.collection, filters, sorts, limit);
     }
     item(id) {
-        return this.db.item(this.collection, id);
+        return new AsyncItem(this.db, this.collection, id);
     }
     add(data) {
         return this.db.provider.addItem(this.collection, data);
     }
     change(...changes) {
-        return this.db.change(...changes);
+        return changeAsyncProvider(this.db.provider, changes);
     }
 }

package/db/Database.d.ts

@@ -4,6 +4,7 @@ import type { FilterList } from "../constraint/FilterConstraint.js";
 import type { SortList } from "../constraint/SortConstraint.js";
 import type { ItemData } from "../db/Item.js";
 import type { Nullish } from "../util/null.js";
+import { DeepIterable } from "../util/iterate.js";
 import { Item, AsyncItem } from "./Item.js";
 import { Query, AsyncQuery } from "./Query.js";
 import { Collection, AsyncCollection } from "./Collection.js";
@@ -14,28 +15,28 @@ declare abstract class BaseDatabase<T extends Datas> {
     /** Create a query on a collection in this database. */
     abstract collection<K extends Key<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<ItemData<T[K]>>, sorts?: SortList<ItemData<T[K]>>, limit?: number | null): Query<T, K> | AsyncQuery<T, K>;
+    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>;
     /** 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>;
     /** Run a set of changes on this database. */
-    abstract change<K extends Key<T>>(...changes: Nullish<WriteChange<T, K>>[]): ItemChanges<T, K> | Promise<ItemChanges<T, K>>;
+    abstract change<K extends Key<T>>(...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): ItemChanges<T, K> | Promise<ItemChanges<T, K>>;
 }
 /** Database with a synchronous provider. */
 export declare class Database<T extends Datas = Datas> implements 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<ItemData<T[K]>>, sorts?: SortList<ItemData<T[K]>>, limit?: number | null): Query<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>;
-    change<K extends Key<T>>(...changes: Nullish<WriteChange<T, K>>[]): ItemChanges<T, K>;
+    change<K extends Key<T>>(...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): ItemChanges<T, K>;
 }
 /** Database with a synchronous provider. */
 export declare class AsyncDatabase<T extends Datas = Datas> implements 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<ItemData<T[K]>>, sorts?: SortList<ItemData<T[K]>>, limit?: number | null): AsyncQuery<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>;
-    change<K extends Key<T>>(...changes: Nullish<WriteChange<T, K>>[]): Promise<ItemChanges<T, K>>;
+    change<K extends Key<T>>(...changes: DeepIterable<Nullish<WriteChange<T, K>>>[]): Promise<ItemChanges<T, K>>;
 }
 export {};

package/db/Query.d.ts

@@ -80,7 +80,7 @@ declare abstract class BaseQuery<T extends Datas = Datas, K extends Key<T> = Key
 export declare class Query<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseQuery<T, K> implements BaseQuery<T, K> {
     readonly db: Database<T>;
     readonly collection: K;
-    constructor(db: Database<T>, collection: K, filters?: FilterList<ItemData<T[K]>>, sorts?: SortList<ItemData<T[K]>>, limit?: number | null);
+    constructor(db: Database<T>, collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null);
     get value(): ItemArray<T[K]>;
     get count(): number;
     get exists(): boolean;
@@ -96,7 +96,7 @@ export declare class Query<T extends Datas = Datas, K extends Key<T> = Key<T>> e
 export declare class AsyncQuery<T extends Datas = Datas, K extends Key<T> = Key<T>> extends BaseQuery<T, K> implements BaseQuery<T, K> {
     readonly db: AsyncDatabase<T>;
     readonly collection: K;
-    constructor(db: AsyncDatabase<T>, collection: K, filters?: FilterList<ItemData<T[K]>>, sorts?: SortList<ItemData<T[K]>>, limit?: number | null);
+    constructor(db: AsyncDatabase<T>, collection: K, filters?: FilterList<Partial<ItemData<T[K]>>>, sorts?: SortList<Partial<ItemData<T[K]>>>, limit?: number | null);
     get value(): Promise<ItemArray<T[K]>>;
     get count(): Promise<number>;
     get exists(): Promise<boolean>;

package/package.json

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

package/react/useItem.d.ts

@@ -1,10 +1,10 @@
 import type { Unsubscribe } from "../observe/Observable.js";
-import { Key, Datas } from "../util/data.js";
+import { Datas, Key } from "../util/data.js";
 import { ItemValue, ItemData, AsyncItem, Item } from "../db/Item.js";
 import { State } from "../state/State.js";
 import { BooleanState } from "../state/BooleanState.js";
 /** Hold the current state of a item. */
-export declare class ItemState<T extends Datas, K extends Key<T>> extends State<ItemValue<T[K]>> {
+export declare class ItemState<T extends Datas, K extends Key<T> = Key<T>> extends State<ItemValue<T[K]>> {
     readonly ref: Item<T, K> | AsyncItem<T, K>;
     readonly busy: BooleanState;
     /** Get the data of the item (throws `RequiredError` if item doesn't exist). */

package/react/useQuery.d.ts

@@ -1,11 +1,11 @@
 import type { Unsubscribe } from "../observe/Observable.js";
-import type { Key, Datas } from "../util/data.js";
+import type { Datas, Key } from "../util/data.js";
 import type { ItemArray, ItemValue, ItemData } from "../db/Item.js";
 import { AsyncQuery, Query } from "../db/Query.js";
 import { State } from "../state/State.js";
 import { BooleanState } from "../state/BooleanState.js";
 /** Hold the current state of a query. */
-export declare class QueryState<T extends Datas, K extends Key<T>> extends State<ItemArray<T[K]>> {
+export declare class QueryState<T extends Datas, K extends Key<T> = Key<T>> extends State<ItemArray<T[K]>> {
     readonly ref: Query<T, K> | AsyncQuery<T, K>;
     readonly busy: BooleanState;
     readonly limit: number;

package/util/iterate.d.ts

@@ -20,6 +20,10 @@ export declare const isAsyncIterable: <T extends AsyncIterable<unknown>>(value:
  * - Checks `items.size` or `items.length` first, or consumes the iterable and counts its iterations.
  */
 export declare function countItems(items: Iterable<unknown>): number;
+/** An iterable possibly containing multiple other iterables. */
+export declare type DeepIterable<T> = T | Iterable<DeepIterable<T>>;
+/** Flatten one or more iterables. */
+export declare function flattenDeepIterable<T>(items: DeepIterable<T>): Iterable<T>;
 /**
  * Does an iterable have one or more items.
  * - Checks `items.size` or `items.length` first, or consumes the iterable and counts its iterations.

package/util/iterate.js

@@ -31,6 +31,14 @@ function _countItems(items) {
         count++;
     return count;
 }
+/** Flatten one or more iterables. */
+export function* flattenDeepIterable(items) {
+    if (isIterable(items))
+        for (const item of items)
+            yield* flattenDeepIterable(item);
+    else
+        yield items;
+}
 /**
  * Does an iterable have one or more items.
  * - Checks `items.size` or `items.length` first, or consumes the iterable and counts its iterations.