shelving 1.91.1 → 1.91.2

package/api/Resource.d.ts

@@ -1,4 +1,4 @@
-import { Validator, Validatable } from "../util/validate.js";
+import type { Validatable, Validator } from "../util/validate.js";
 /**
  * An abstract API resource definition, used to specify types for e.g. serverless functions..
  *

package/api/Resource.js

@@ -1,7 +1,7 @@
-import { validate } from "../util/validate.js";
-import { getUndefined } from "../util/undefined.js";
-import { Feedback } from "../feedback/Feedback.js";
 import { ValidationError } from "../error/ValidationError.js";
+import { Feedback } from "../feedback/Feedback.js";
+import { getUndefined } from "../util/undefined.js";
+import { validate } from "../util/validate.js";
 /**
  * An abstract API resource definition, used to specify types for e.g. serverless functions..
  *

package/constraint/Constraints.d.ts

@@ -1,5 +1,5 @@
+import type { ImmutableArray } from "../util/array.js";
 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<Partial<T>>> extends Constraint<T> implements Iterable<C> {

package/constraint/Constraints.js

@@ -1,5 +1,5 @@
+import { omitArrayItems, withArrayItems } from "../util/array.js";
 import { cloneObjectWith } from "../util/object.js";
-import { withArrayItems, omitArrayItems } 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 {

package/constraint/Filter.d.ts

@@ -1,7 +1,7 @@
-import { Data, FlatDataKey } from "../util/data.js";
-import { ImmutableArray } from "../util/array.js";
+import type { ImmutableArray } from "../util/array.js";
+import type { Data, FlatDataKey } from "../util/data.js";
 import type { Matchable } from "../util/match.js";
-import type { Constraint } from "./Constraint.js";
+import { Constraint } from "./Constraint.js";
 /** Possible operator references. */
 export type FilterOperator = "IS" | "NOT" | "IN" | "OUT" | "CONTAINS" | "LT" | "LTE" | "GT" | "GTE";
 /** Format that allows multiple filters to be specified as a plain object. */
@@ -21,7 +21,7 @@ export type FilterKey<T extends Data> = keyof FilterProps<T>;
  * @param operator FilterOperator, e.g. `IS` or `CONTAINS`
  * @param value Value the specified property should be matched against.
  */
-export declare class Filter<T extends Data = Data> implements Constraint<T>, Matchable<[T]> {
+export declare class Filter<T extends Data = Data> extends Constraint<T> implements Matchable<[T]> {
     readonly keys: readonly [string, ...string[]];
     readonly operator: FilterOperator;
     readonly value: unknown;

package/constraint/Filter.js

@@ -1,8 +1,9 @@
 import { isArray } from "../util/array.js";
-import { isArrayWith, isEqualGreater, isEqualLess, isGreater, isInArray, isLess, notInArray, isEqual, notEqual } from "../util/equal.js";
-import { filterItems } from "../util/iterate.js";
+import { isArrayWith, isEqual, isEqualGreater, isEqualLess, isGreater, isInArray, isLess, notEqual, notInArray } from "../util/equal.js";
+import { filterItems } from "../util/match.js";
 import { getProp } from "../util/object.js";
 import { splitString } from "../util/string.js";
+import { Constraint } from "./Constraint.js";
 /** Map `FilterOperator` to its corresponding `Match` function. */
 const MATCHERS = {
     IS: isEqual,
@@ -22,7 +23,7 @@ const MATCHERS = {
  * @param operator FilterOperator, e.g. `IS` or `CONTAINS`
  * @param value Value the specified property should be matched against.
  */
-export class Filter {
+export class Filter extends Constraint {
     get key() {
         return this.keys.join(".");
     }
@@ -45,6 +46,7 @@ export class Filter {
                                     : operator; // Never.
     }
     constructor(filterKey, value) {
+        super();
         if (filterKey.startsWith("!")) {
             this.keys = splitString(filterKey.slice(1), ".");
             this.operator = isArray(value) ? "OUT" : "NOT";

package/constraint/Filters.d.ts

@@ -1,7 +1,8 @@
+import type { FilterProps } from "./Filter.js";
+import type { Data } from "../util/data.js";
 import type { Matchable } from "../util/match.js";
-import { Data } from "../util/data.js";
-import { Filter, FilterProps } from "./Filter.js";
 import { Constraints } from "./Constraints.js";
+import { Filter } from "./Filter.js";
 /** A possible set of filters. */
 export type PossibleFilters<T extends Data> = Filters<T> | FilterProps<T>;
 /** Turn `FilterProps` into a list of `Filter` instances. */

package/constraint/Filters.js

@@ -1,9 +1,9 @@
+import { clearArray } from "../util/array.js";
 import { getDataProps } from "../util/data.js";
-import { filterItems } from "../util/iterate.js";
+import { filterItems } from "../util/match.js";
 import { cloneObjectWith } from "../util/object.js";
-import { clearArray } from "../util/array.js";
-import { Filter } from "./Filter.js";
 import { Constraints } from "./Constraints.js";
+import { Filter } from "./Filter.js";
 /** Turn `FilterProps` into a list of `Filter` instances. */
 export function* getFilters(filters) {
     if (filters instanceof Filters)

package/constraint/Sort.d.ts

@@ -1,12 +1,12 @@
 import type { Data, FlatDataKey } from "../util/data.js";
-import { Rankable } from "../util/sort.js";
-import type { Constraint } from "./Constraint.js";
+import type { Rankable } from "../util/sort.js";
+import { 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 type SortKey<T extends Data> = FlatDataKey<T> | `${FlatDataKey<T>}` | `!${FlatDataKey<T>}`;
 /** Possible operator references. */
 export type SortDirection = "ASC" | "DESC";
 /** Sort a list of values. */
-export declare class Sort<T extends Data = Data> implements Constraint<T>, Rankable<T> {
+export declare class Sort<T extends Data = Data> extends Constraint<T> implements Rankable<T> {
     readonly keys: readonly [string, ...string[]];
     readonly direction: SortDirection;
     get key(): string;

package/constraint/Sort.js

@@ -1,8 +1,9 @@
 import { getProp } from "../util/object.js";
 import { rank, rankAsc, rankDesc, sortItems } from "../util/sort.js";
 import { splitString } from "../util/string.js";
+import { Constraint } from "./Constraint.js";
 /** Sort a list of values. */
-export class Sort {
+export class Sort extends Constraint {
     get key() {
         return this.keys.join(".");
     }
@@ -10,6 +11,7 @@ export class Sort {
         return `"${this.direction === "DESC" ? "!" : ""}${this.key}"`;
     }
     constructor(sortKey) {
+        super();
         if (sortKey.startsWith("!")) {
             this.keys = splitString(sortKey.slice(1), ".");
             this.direction = "DESC";

package/constraint/Sorts.d.ts

@@ -1,8 +1,9 @@
+import type { SortKey } from "./Sort.js";
+import type { ImmutableArray } from "../util/array.js";
 import type { Data } from "../util/data.js";
-import { ImmutableArray } from "../util/array.js";
-import { Rankable } from "../util/sort.js";
+import type { Rankable } from "../util/sort.js";
 import { Constraints } from "./Constraints.js";
-import { Sort, SortKey } from "./Sort.js";
+import { Sort } from "./Sort.js";
 /** A possible set of sorts. */
 export type PossibleSorts<T extends Data> = Sorts<T> | SortKey<T> | Iterable<SortKey<T>> | ImmutableArray<SortKey<T>>;
 /** Turn `SortList` into array of list of `Sort` instances. */

package/constraint/Statement.d.ts

@@ -1,7 +1,9 @@
+import type { Filterable, PossibleFilters } from "./Filters.js";
+import type { PossibleSorts, Sortable } from "./Sorts.js";
 import type { Data } from "../util/data.js";
-import { Filterable, Filters, PossibleFilters } from "./Filters.js";
-import { PossibleSorts, Sortable, Sorts } from "./Sorts.js";
 import { Constraint } from "./Constraint.js";
+import { Filters } from "./Filters.js";
+import { Sorts } from "./Sorts.js";
 /** Interface that combines Filterable, Sortable, Sliceable. */
 export interface Queryable<T extends Data> extends Filterable<T>, Sortable<T> {
     /**

package/constraint/Statement.js

@@ -1,10 +1,10 @@
-import { cloneObjectWith, getProp } from "../util/object.js";
-import { assert } from "../util/assert.js";
 import { limitArray } from "../util/array.js";
-import { Filters } from "./Filters.js";
-import { Sorts } from "./Sorts.js";
+import { assert } from "../util/assert.js";
+import { cloneObjectWith, getProp } from "../util/object.js";
 import { Constraint } from "./Constraint.js";
 import { Filter } from "./Filter.js";
+import { Filters } from "./Filters.js";
+import { Sorts } from "./Sorts.js";
 // Instances to save resources for the default case (empty query).
 const EMPTY_FILTERS = new Filters(); // eslint-disable-line @typescript-eslint/no-explicit-any
 const EMPTY_SORTS = new Sorts(); // eslint-disable-line @typescript-eslint/no-explicit-any

package/db/Change.d.ts

@@ -1,8 +1,8 @@
-import type { Data } from "../util/data.js";
+import type { AsyncProvider, Provider } from "../provider/Provider.js";
+import type { Updates } from "../update/DataUpdate.js";
 import type { ImmutableArray } from "../util/array.js";
-import type { Provider, AsyncProvider } from "../provider/Provider.js";
-import { Updates } from "../update/DataUpdate.js";
-import { Nullish } from "../util/null.js";
+import type { Data } from "../util/data.js";
+import type { Nullish } from "../util/null.js";
 /** Change on a collection. */
 export interface Change {
     readonly action: string;

package/db/Collection.d.ts

@@ -1,11 +1,12 @@
-import type { Data } from "../util/data.js";
+import type { AddChange, DeleteChange, SetChange, UpdateChange } from "./Change.js";
+import type { ItemData, ItemValue } from "./Item.js";
 import type { PossibleFilters } from "../constraint/Filters.js";
 import type { PossibleSorts } from "../constraint/Sorts.js";
+import type { AsyncProvider, Provider } from "../provider/Provider.js";
 import type { Updates } from "../update/DataUpdate.js";
-import type { Provider, AsyncProvider } from "../provider/Provider.js";
-import { ItemData, AsyncItem, Item, ItemValue } from "./Item.js";
+import type { Data } from "../util/data.js";
+import { AsyncItem, Item } from "./Item.js";
 import { AsyncQuery, Query } from "./Query.js";
-import { AddChange, UpdateChange, DeleteChange, SetChange } from "./Change.js";
 /** Reference to a collection in a synchronous or asynchronous provider. */
 declare abstract class BaseCollection<T extends Data = Data> {
     abstract readonly provider: Provider | AsyncProvider;

package/db/Database.d.ts

@@ -1,14 +1,14 @@
-import type { DataKey, Datas } from "../util/data.js";
-import type { Nullish } from "../util/null.js";
-import type { AsyncProvider, Provider } from "../provider/Provider.js";
+import type { AddChange, DeleteChange, ItemChanges, SetChange, UpdateChange, WriteChange } from "./Change.js";
 import type { PossibleFilters } from "../constraint/Filters.js";
 import type { PossibleSorts } from "../constraint/Sorts.js";
 import type { ItemData, ItemValue } from "../db/Item.js";
+import type { AsyncProvider, Provider } from "../provider/Provider.js";
 import type { Updates } from "../update/DataUpdate.js";
-import { Item, AsyncItem } from "./Item.js";
-import { Query, AsyncQuery } from "./Query.js";
-import { Collection, AsyncCollection } from "./Collection.js";
-import { AddChange, DeleteChange, ItemChanges, SetChange, UpdateChange, WriteChange } from "./Change.js";
+import type { DataKey, Datas } from "../util/data.js";
+import type { Nullish } from "../util/null.js";
+import { AsyncCollection, Collection } from "./Collection.js";
+import { AsyncItem, Item } from "./Item.js";
+import { AsyncQuery, Query } from "./Query.js";
 /** Database with a synchronous or asynchronous provider. */
 declare abstract class BaseDatabase<T extends Datas> {
     abstract readonly provider: Provider | AsyncProvider;

package/db/Database.js

@@ -1,7 +1,7 @@
-import { Item, AsyncItem } from "./Item.js";
-import { Query, AsyncQuery } from "./Query.js";
-import { Collection, AsyncCollection } from "./Collection.js";
 import { changeAsyncProvider, changeProvider } from "./Change.js";
+import { AsyncCollection, Collection } from "./Collection.js";
+import { AsyncItem, Item } from "./Item.js";
+import { AsyncQuery, Query } from "./Query.js";
 /** Database with a synchronous or asynchronous provider. */
 class BaseDatabase {
     /** Get an add change for a collection in this database. */

package/db/Item.d.ts

@@ -1,10 +1,10 @@
-import type { ImmutableArray } from "../util/array.js";
-import type { Stop, Handler, Dispatch } from "../util/function.js";
-import type { Provider, AsyncProvider } from "../provider/Provider.js";
+import type { DeleteChange, SetChange, UpdateChange } from "./Change.js";
+import type { AsyncProvider, Provider } from "../provider/Provider.js";
 import type { Updates } from "../update/DataUpdate.js";
+import type { ImmutableArray } from "../util/array.js";
+import type { Data } from "../util/data.js";
+import type { Dispatch, Handler, Stop } from "../util/function.js";
 import { Statement } from "../constraint/Statement.js";
-import { Data } from "../util/data.js";
-import type { DeleteChange, SetChange, UpdateChange } from "./Change.js";
 /** Item data with a string ID that uniquely identifies it. */
 export type ItemData<T extends Data = Data> = T & {
     id: string;

package/db/Item.js

@@ -1,6 +1,6 @@
-import { Statement } from "../constraint/Statement.js";
 import { Filter } from "../constraint/Filter.js";
 import { Filters } from "../constraint/Filters.js";
+import { Statement } from "../constraint/Statement.js";
 import { getData } from "../util/data.js";
 import { runSequence } from "../util/sequence.js";
 /** Get the ID from item data. */

package/db/ItemState.d.ts

@@ -1,8 +1,8 @@
+import type { AsyncItem, Item, ItemData, ItemValue } from "./Item.js";
+import type { Data } from "../util/data.js";
 import type { Dispatch } from "../util/function.js";
-import { Data } from "../util/data.js";
-import { State } from "../state/State.js";
 import { BooleanState } from "../state/BooleanState.js";
-import { ItemValue, Item, AsyncItem, ItemData } from "./Item.js";
+import { State } from "../state/State.js";
 /** Hold the current state of a item. */
 export declare class ItemState<T extends Data = Data> extends State<ItemValue<T>> {
     readonly ref: Item<T> | AsyncItem<T>;

package/db/ItemState.js

@@ -1,9 +1,9 @@
-import { getData } from "../util/data.js";
-import { State } from "../state/State.js";
+import { CacheProvider } from "../provider/CacheProvider.js";
+import { LazyDeferredSequence } from "../sequence/LazyDeferredSequence.js";
 import { BooleanState } from "../state/BooleanState.js";
+import { State } from "../state/State.js";
+import { getData } from "../util/data.js";
 import { getOptionalSource } from "../util/source.js";
-import { LazyDeferredSequence } from "../sequence/LazyDeferredSequence.js";
-import { CacheProvider } from "../provider/CacheProvider.js";
 /** Hold the current state of a item. */
 export class ItemState extends State {
     /** Get the data of the item (throws `RequiredError` if item doesn't exist). */

package/db/Query.d.ts

@@ -1,11 +1,11 @@
+import type { ItemArray, ItemData, ItemValue } from "./Item.js";
+import type { PossibleFilters } from "../constraint/Filters.js";
+import type { PossibleSorts } from "../constraint/Sorts.js";
+import type { AsyncProvider, Provider } from "../provider/Provider.js";
+import type { Updates } from "../update/DataUpdate.js";
 import type { Data } from "../util/data.js";
 import type { Dispatch, Handler, Stop } from "../util/function.js";
-import type { Updates } from "../update/DataUpdate.js";
-import type { Provider, AsyncProvider } from "../provider/Provider.js";
 import { Statement } from "../constraint/Statement.js";
-import type { PossibleFilters } from "../constraint/Filters.js";
-import type { PossibleSorts } from "../constraint/Sorts.js";
-import type { ItemArray, ItemValue, ItemData } from "./Item.js";
 /** Reference to a set of items in a sync or async provider. */
 declare abstract class BaseQuery<T extends Data = Data> extends Statement<ItemData<T>> implements AsyncIterable<ItemArray<T>> {
     abstract readonly provider: Provider | AsyncProvider;

package/db/Query.js

@@ -1,6 +1,6 @@
-import { getFirstItem, getLastItem, getOptionalFirstItem, getOptionalLastItem, isArrayLength, countArray } from "../util/array.js";
-import { runSequence } from "../util/sequence.js";
 import { Statement } from "../constraint/Statement.js";
+import { countArray, getFirstItem, getLastItem, getOptionalFirstItem, getOptionalLastItem, isArrayLength } from "../util/array.js";
+import { runSequence } from "../util/sequence.js";
 /** Reference to a set of items in a sync or async provider. */
 class BaseQuery extends Statement {
     // Override to include the collection name.

package/db/QueryState.d.ts

@@ -1,9 +1,9 @@
+import type { ItemArray, ItemData, ItemValue } from "../db/Item.js";
+import type { AsyncQuery, Query } from "../db/Query.js";
 import type { Data } from "../util/data.js";
 import type { Stop } from "../util/function.js";
-import type { ItemArray, ItemValue, ItemData } from "../db/Item.js";
-import type { AsyncQuery, Query } from "../db/Query.js";
-import { State } from "../state/State.js";
 import { BooleanState } from "../state/BooleanState.js";
+import { State } from "../state/State.js";
 /** Hold the current state of a query. */
 export declare class QueryState<T extends Data = Data> extends State<ItemArray<T>> implements Iterable<ItemData<T>> {
     readonly ref: Query<T> | AsyncQuery<T>;

package/db/QueryState.js

@@ -1,9 +1,9 @@
-import { getFirstItem, getLastItem, getOptionalFirstItem, getOptionalLastItem } from "../util/array.js";
-import { getOptionalSource } from "../util/source.js";
 import { CacheProvider } from "../provider/CacheProvider.js";
-import { State } from "../state/State.js";
-import { BooleanState } from "../state/BooleanState.js";
 import { LazyDeferredSequence } from "../sequence/LazyDeferredSequence.js";
+import { BooleanState } from "../state/BooleanState.js";
+import { State } from "../state/State.js";
+import { getFirstItem, getLastItem, getOptionalFirstItem, getOptionalLastItem } from "../util/array.js";
+import { getOptionalSource } from "../util/source.js";
 /** Hold the current state of a query. */
 export class QueryState extends State {
     /** Can more items be loaded after the current result. */

package/feedback/Feedback.d.ts

@@ -14,5 +14,3 @@ export declare class Feedback {
     constructor(feedback: string, value?: unknown);
     toString(): string;
 }
-/** Get the message from a feedback. */
-export declare const getFeedbackMessage: ({ message }: Feedback) => string;

package/feedback/Feedback.js

@@ -15,5 +15,3 @@ export class Feedback {
         return this.message;
     }
 }
-/** Get the message from a feedback. */
-export const getFeedbackMessage = ({ message }) => message;

package/feedback/Feedbacks.d.ts

@@ -4,7 +4,7 @@ import { Feedback } from "./Feedback.js";
 export declare class Feedbacks extends Feedback {
     /** List of sub-feedbacks. */
     readonly feedbacks: ImmutableDictionary<Feedback>;
+    /** List of sub-messages. */
+    get messages(): ImmutableDictionary<string>;
     constructor(feedbacks: ImmutableDictionary<Feedback>, value?: unknown);
 }
-/** Get the messages from a feedbacks' sub-feedbacks. */
-export declare const getFeedbackMessages: ({ feedbacks }: Feedbacks) => ImmutableDictionary<string>;

package/feedback/Feedbacks.js

@@ -1,11 +1,14 @@
+import { getProp } from "../util/object.js";
 import { mapDictionary } from "../util/transform.js";
-import { Feedback, getFeedbackMessage } from "./Feedback.js";
+import { Feedback } from "./Feedback.js";
 /** Feedback with a list of sub-feedbacks. */
 export class Feedbacks extends Feedback {
+    /** List of sub-messages. */
+    get messages() {
+        return mapDictionary(this.feedbacks, getProp, "message");
+    }
     constructor(feedbacks, value) {
         super("Invalid format", value);
         this.feedbacks = feedbacks;
     }
 }
-/** Get the messages from a feedbacks' sub-feedbacks. */
-export const getFeedbackMessages = ({ feedbacks }) => mapDictionary(feedbacks, getFeedbackMessage);

package/firestore/client/FirestoreClientProvider.d.ts

@@ -1,8 +1,8 @@
-import { Firestore } from "firebase/firestore";
-import type { Data } from "../../util/data.js";
+import type { ItemArray, ItemStatement, ItemValue } from "../../db/Item.js";
 import type { AsyncProvider } from "../../provider/Provider.js";
-import type { ItemArray, ItemValue, ItemStatement } from "../../db/Item.js";
-import { Updates } from "../../update/index.js";
+import type { Updates } from "../../update/DataUpdate.js";
+import type { Data } from "../../util/data.js";
+import type { Firestore } from "firebase/firestore";
 /**
  * Firestore client database provider.
  * - Works with the Firebase JS SDK.

package/firestore/client/FirestoreClientProvider.js

@@ -1,6 +1,11 @@
-import { documentId as firestoreDocumentId, 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 { addDoc, deleteDoc, arrayRemove as firestoreArrayRemove, arrayUnion as firestoreArrayUnion, collection as firestoreCollection, deleteField as firestoreDeleteField, doc as firestoreDocument, documentId as firestoreDocumentId, increment as firestoreIncrement, limit as firestoreLimit, orderBy as firestoreOrderBy, query as firestoreQuery, where as firestoreWhere, getDoc, getDocs, onSnapshot, setDoc, updateDoc, } from "firebase/firestore";
 import { LazyDeferredSequence } from "../../sequence/LazyDeferredSequence.js";
-import { ArrayUpdate, DataUpdate, Increment, DictionaryUpdate, Delete, Update } from "../../update/index.js";
+import { ArrayUpdate } from "../../update/ArrayUpdate.js";
+import { DataUpdate } from "../../update/DataUpdate.js";
+import { Delete } from "../../update/Delete.js";
+import { DictionaryUpdate } from "../../update/DictionaryUpdate.js";
+import { Increment } from "../../update/Increment.js";
+import { Update } from "../../update/Update.js";
 // Constants.
 const ID = firestoreDocumentId();
 // Map `Filter.types` to `WhereFilterOp`

package/firestore/lite/FirestoreLiteProvider.d.ts

@@ -1,8 +1,8 @@
-import type { Firestore } from "firebase/firestore/lite";
-import type { Data } from "../../util/data.js";
+import type { ItemArray, ItemStatement, ItemValue } from "../../db/Item.js";
 import type { AsyncProvider } from "../../provider/Provider.js";
-import type { ItemArray, ItemValue, ItemStatement } from "../../db/Item.js";
-import { Updates } from "../../update/index.js";
+import type { Updates } from "../../update/DataUpdate.js";
+import type { Data } from "../../util/data.js";
+import type { Firestore } from "firebase/firestore/lite";
 /**
  * Firestore Lite client database provider.
  * - Works with the Firebase JS SDK.

package/firestore/lite/FirestoreLiteProvider.js

@@ -1,6 +1,11 @@
-import { documentId as firestoreDocumentId, 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 { addDoc, deleteDoc, arrayRemove as firestoreArrayRemove, arrayUnion as firestoreArrayUnion, collection as firestoreCollection, deleteField as firestoreDeleteField, doc as firestoreDocument, documentId as firestoreDocumentId, increment as firestoreIncrement, limit as firestoreLimit, orderBy as firestoreOrderBy, query as firestoreQuery, where as firestoreWhere, getDoc, getDocs, setDoc, updateDoc, } from "firebase/firestore/lite";
 import { UnsupportedError } from "../../error/UnsupportedError.js";
-import { ArrayUpdate, DataUpdate, Increment, DictionaryUpdate, Delete, Update } from "../../update/index.js";
+import { ArrayUpdate } from "../../update/ArrayUpdate.js";
+import { DataUpdate } from "../../update/DataUpdate.js";
+import { Delete } from "../../update/Delete.js";
+import { DictionaryUpdate } from "../../update/DictionaryUpdate.js";
+import { Increment } from "../../update/Increment.js";
+import { Update } from "../../update/Update.js";
 // Constants.
 const ID = firestoreDocumentId();
 // Map `Filter.types` to `WhereFilterOp`

package/firestore/server/FirestoreServerProvider.d.ts

@@ -1,8 +1,8 @@
-import { Firestore } from "@google-cloud/firestore";
-import type { Data } from "../../util/data.js";
+import type { ItemArray, ItemStatement, ItemValue } from "../../db/Item.js";
 import type { AsyncProvider } from "../../provider/Provider.js";
-import type { ItemArray, ItemValue, ItemStatement } from "../../db/Item.js";
-import { Updates } from "../../update/index.js";
+import type { Updates } from "../../update/DataUpdate.js";
+import type { Data } from "../../util/data.js";
+import { Firestore } from "@google-cloud/firestore";
 /**
  * Firestore server database provider.
  * - Works with the Firebase Admin SDK for Node.JS

package/firestore/server/FirestoreServerProvider.js

@@ -1,6 +1,11 @@
-import { Firestore, FieldValue, FieldPath } from "@google-cloud/firestore";
+import { FieldPath, FieldValue, Firestore } from "@google-cloud/firestore";
 import { LazyDeferredSequence } from "../../sequence/LazyDeferredSequence.js";
-import { ArrayUpdate, DataUpdate, Increment, DictionaryUpdate, Delete, Update } from "../../update/index.js";
+import { ArrayUpdate } from "../../update/ArrayUpdate.js";
+import { DataUpdate } from "../../update/DataUpdate.js";
+import { Delete } from "../../update/Delete.js";
+import { DictionaryUpdate } from "../../update/DictionaryUpdate.js";
+import { Increment } from "../../update/Increment.js";
+import { Update } from "../../update/Update.js";
 // Constants.
 const ID = FieldPath.documentId();
 // Map `Filter.types` to `WhereFilterOp`

package/markup/regexp.d.ts

@@ -1,6 +1,6 @@
-import type { Data } from "../util/data.js";
-import { NamedRegExp, NamedRegExpData, PossibleRegExp } from "../util/regexp.js";
 import type { MarkupOptions } from "./options.js";
+import type { Data } from "../util/data.js";
+import type { NamedRegExp, NamedRegExpData, PossibleRegExp } from "../util/regexp.js";
 /** Subset of `NamedRegExpArray<T>` that are the only things we're required return from a `MarkupMatcher` function. */
 export type MarkupMatch<T extends Data | undefined> = {
     0: string;

package/markup/render.d.ts

@@ -1,5 +1,5 @@
+import type { MarkupOptions } from "./options.js";
 import type { JSXNode } from "../util/jsx.js";
-import { MarkupOptions } from "./options.js";
 /**
  * Parse a text string as Markdownish syntax and render it as a JSX node.
  * - Syntax is not defined by this code, but by the rules supplied to it.

package/markup/rule.d.ts

@@ -1,8 +1,8 @@
-import { NamedRegExp, NamedRegExpArray, NamedRegExpData } from "../util/regexp.js";
-import { Data } from "../util/data.js";
-import { JSXElement } from "../util/jsx.js";
-import { ImmutableArray } from "../util/array.js";
-import { MarkupOptions } from "./options.js";
+import type { MarkupOptions } from "./options.js";
+import type { ImmutableArray } from "../util/array.js";
+import type { Data } from "../util/data.js";
+import type { JSXElement } from "../util/jsx.js";
+import type { NamedRegExp, NamedRegExpArray, NamedRegExpData } from "../util/regexp.js";
 export type MarkupRuleMatch<T extends Data = Data> = {
     0: string;
     index: number;

package/markup/rules.d.ts

@@ -1,6 +1,7 @@
-import type { JSXElement } from "../util/jsx.js";
 import type { MarkupOptions } from "./options.js";
-import { LinkRegExpMarkupRule, MarkupRules, NamedRegExpMarkupRule, RegExpMarkupRule } from "./rule.js";
+import type { MarkupRules } from "./rule.js";
+import type { JSXElement } from "../util/jsx.js";
+import { LinkRegExpMarkupRule, NamedRegExpMarkupRule, RegExpMarkupRule } from "./rule.js";
 /**
  * Headings are single line only (don't allow multiline).
  * - 1-6 hashes then 1+ spaces, then the title.

package/markup/rules.js

@@ -1,6 +1,6 @@
 /* eslint-disable import/export */
 import { getRegExp } from "../util/regexp.js";
-import { getBlockRegExp, getLineRegExp, BLOCK_REGEXP, LINE_REGEXP, WordRegExp } from "./regexp.js";
+import { BLOCK_REGEXP, LINE_REGEXP, WordRegExp, getBlockRegExp, getLineRegExp } from "./regexp.js";
 import { LinkRegExpMarkupRule, NamedRegExpMarkupRule, RegExpMarkupRule } from "./rule.js";
 /** React security symbol — see https://github.com/facebook/react/pull/4832 */
 const $$typeof = Symbol.for("react.element");

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.91.1",
+	"version": "1.91.2",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",
@@ -49,11 +49,10 @@
 		"fix": "npm run fix:prettier && npm run fix:eslint",
 		"fix:prettier": "prettier --write './**/*.{md,json}'",
 		"fix:eslint": "eslint --cache --fix './**/*.{ts,tsx}'",
-		"test": "npm run test:prettier && npm run test:eslint && npm run test:dpdm && npm run test:typescript && npm run test:jest",
+		"test": "npm run test:prettier && npm run test:eslint && npm run test:typescript && npm run test:jest",
 		"test:prettier": "prettier --check './**/*.{md,json}'",
 		"test:eslint": "eslint --cache './**/*.{ts,tsx}'",
 		"test:typescript": "tsc --noEmit",
-		"test:dpdm": "dpdm ./modules/index.ts --transform --tree=false --warning=false --exit-code circular:1",
 		"test:jest": "jest --detectOpenHandles",
 		"test:jest:watch": "jest --watchAll",
 		"build": "npm run build:setup && npm run build:copy && npm run build:typescript && npm run build:check && npm run build:jest",
@@ -70,11 +69,11 @@
 		"@types/react-dom": "^18.0.10",
 		"@typescript-eslint/eslint-plugin": "^5.49.0",
 		"@typescript-eslint/parser": "^5.49.0",
-		"dpdm": "^3.11.0",
 		"esbuild": "^0.17.12",
 		"esbuild-jest": "^0.5.0",
 		"eslint": "^8.33.0",
 		"eslint-config-prettier": "^8.6.0",
+		"eslint-import-resolver-typescript": "^3.5.5",
 		"eslint-plugin-import": "^2.27.5",
 		"eslint-plugin-prettier": "^4.0.0",
 		"firebase": "^9.16.0",