shelving 1.61.0 → 1.62.1

package/api/Resource.d.ts

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

package/api/Resource.js

@@ -1,5 +1,6 @@
-import { UNDEFINED, validate } from "../util/index.js";
-import { Feedback } from "../feedback/index.js";
+import { validate } from "../util/validate.js";
+import { getUndefined } from "../util/undefined.js";
+import { Feedback } from "../feedback/Feedback.js";
 import { ResourceValidationError } from "./errors.js";
 /**
  * An abstract API resource definition, used to specify types for e.g. serverless functions..
@@ -37,6 +38,6 @@ export class Resource {
         }
     }
 }
-export function RESOURCE(payload = UNDEFINED, result = UNDEFINED) {
+export function RESOURCE(payload = getUndefined, result = getUndefined) {
     return new Resource(payload, result);
 }

package/api/errors.d.ts

@@ -1,5 +1,5 @@
-import { Feedback } from "../feedback/index.js";
-import { ValidationError } from "../error/index.js";
+import type { Feedback } from "../feedback/Feedback.js";
+import { ValidationError } from "../error/ValidationError.js";
 import type { Resource } from "./Resource.js";
 /** Thrown if an API `Resource` can't validate. */
 export declare class ResourceValidationError<P, R> extends ValidationError {

package/api/errors.js

@@ -1,4 +1,4 @@
-import { ValidationError } from "../error/index.js";
+import { ValidationError } from "../error/ValidationError.js";
 /** Thrown if an API `Resource` can't validate. */
 export class ResourceValidationError extends ValidationError {
     constructor(resource, feedback) {

package/db/Database.d.ts

@@ -1,6 +1,8 @@
-import { Key, Datas, Validators, ValidatorType } from "../util/index.js";
+import type { Validators, ValidatorType } from "../util/validate.js";
+import type { Key, Datas } from "../util/data.js";
 import type { Provider } from "../provider/Provider.js";
-import { FilterProps, SortKeys } from "../query/index.js";
+import type { SortKeys } from "../query/Sort.js";
+import type { FilterProps } from "../query/Filter.js";
 import { DocumentReference, QueryReference } from "./Reference.js";
 /**
  * Combines a database model and a provider.

package/db/Database.js

@@ -1,4 +1,5 @@
-import { Filters, Sorts } from "../query/index.js";
+import { Filters } from "../query/Filters.js";
+import { Sorts } from "../query/Sorts.js";
 import { DocumentReference, QueryReference } from "./Reference.js";
 /**
  * Combines a database model and a provider.

package/db/Operation.d.ts

@@ -1,5 +1,9 @@
-import { PropUpdates, Update } from "../update/index.js";
-import { ImmutableArray, Nullish, Data, Key } from "../util/index.js";
+import type { PropUpdates } from "../update/DataUpdate.js";
+import { Update } from "../update/Update.js";
+import { ImmutableArray } from "../util/array.js";
+import { Data, Key } from "../util/data.js";
+import { Hydrations } from "../util/hydrate.js";
+import { Nullish } from "../util/null.js";
 import type { Database } from "./Database.js";
 import type { DocumentReference, QueryReference } from "./Reference.js";
 /** Represent a write operation on a database. */
@@ -72,10 +76,4 @@ export declare class DeleteOperation extends Operation {
     run(db: Database): Promise<this>;
 }
 /** Set of hydrations for all change classes. */
-export declare const OPERATION_HYDRATIONS: {
-    Operations: typeof Operations;
-    AddOperation: typeof AddOperation;
-    SetOperation: typeof SetOperation;
-    UpdateOperation: typeof UpdateOperation;
-    DeleteOperation: typeof DeleteOperation;
-};
+export declare const OPERATION_HYDRATIONS: Hydrations;

package/db/Operation.js

@@ -1,4 +1,5 @@
-import { callAsyncSeries, notNullish, isNullish } from "../util/index.js";
+import { callAsyncSeries } from "../util/async.js";
+import { isNullish, notNullish } from "../util/null.js";
 /** Represent a write operation on a database. */
 export class Operation {
 }
@@ -120,10 +121,9 @@ export class DeleteOperation extends Operation {
 }
 /** Set of hydrations for all change classes. */
 export const OPERATION_HYDRATIONS = {
-    Operations: Operations,
+    Operations,
     AddOperation,
     SetOperation,
     UpdateOperation,
     DeleteOperation,
 };
-OPERATION_HYDRATIONS;

package/db/PaginationState.d.ts

@@ -1,5 +1,7 @@
-import { Results, Entry, Entries, Data } from "../util/index.js";
-import { BooleanState, State } from "../stream/index.js";
+import type { Entries, Entry } from "../util/entry.js";
+import type { Data, Results } from "../util/data.js";
+import { BooleanState } from "../stream/BooleanState.js";
+import { State } from "../stream/State.js";
 import { QueryReference } from "./Reference.js";
 /**
  * State that wraps a `Documents` reference to enable pagination.

package/db/PaginationState.js

@@ -1,6 +1,11 @@
-import { getLastItem, assertNumber, yieldMerged, getMap, LOADING, assertMax } from "../util/index.js";
-import { BooleanState, State } from "../stream/index.js";
-import { ConditionError } from "../index.js";
+import { ConditionError } from "../error/ConditionError.js";
+import { BooleanState } from "../stream/BooleanState.js";
+import { State } from "../stream/State.js";
+import { getLastItem } from "../util/array.js";
+import { NOVALUE } from "../util/constants.js";
+import { yieldMerged } from "../util/iterate.js";
+import { getMap } from "../util/map.js";
+import { assertMax, assertNumber } from "../util/number.js";
 /**
  * State that wraps a `Documents` reference to enable pagination.
  * - If you pass in initial values, it will use that as the first page.
@@ -22,7 +27,7 @@ export class PaginationState extends State {
                 this.busy.next(true);
                 if (!this.exists) {
                     // First set of results.
-                    this._value === LOADING;
+                    this._value === NOVALUE;
                     const next = await this.ref.results;
                     this.next(next);
                     if (next.size < this.limit)

package/db/Reference.d.ts

@@ -1,7 +1,15 @@
-import { Entry, Observable, Observer, Result, Unsubscriber, Results, Validatable, Validator, Data, Entries, Dispatcher } from "../util/index.js";
-import { DataUpdate, PropUpdates } from "../update/index.js";
-import { Filters, Sorts, Query, FilterProps, SortKeys } from "../query/index.js";
-import { DocumentData, DocumentResult } from "./helpers.js";
+import type { Data, Result, Results } from "../util/data.js";
+import type { Dispatcher } from "../util/function.js";
+import type { SortKeys } from "../query/Sort.js";
+import { Observable, Observer, Unsubscriber } from "../util/observe.js";
+import { Validatable, Validator } from "../util/validate.js";
+import { Query } from "../query/Query.js";
+import { Entries, Entry } from "../util/entry.js";
+import { Filters } from "../query/Filters.js";
+import { Sorts } from "../query/Sorts.js";
+import { DataUpdate, PropUpdates } from "../update/DataUpdate.js";
+import { FilterProps } from "../query/Filter.js";
+import { DocumentData, DocumentResult } from "./util.js";
 import type { Database } from "./Database.js";
 /** A refence to a location in a database. */
 export interface Reference {

package/db/Reference.js

@@ -1,9 +1,17 @@
-import { callAsync, throwAsync, validate, getMap, countItems, hasItems, ResultsObserver } from "../util/index.js";
-import { DataUpdate } from "../update/index.js";
-import { Feedback, InvalidFeedback } from "../feedback/index.js";
-import { Filters, Sorts, Query, Filter } from "../query/index.js";
+import { ResultsObserver } from "../util/observe.js";
+import { validate } from "../util/validate.js";
+import { Query } from "../query/Query.js";
+import { Filters } from "../query/Filters.js";
+import { Sorts } from "../query/Sorts.js";
+import { callAsync, throwAsync } from "../util/async.js";
+import { getMap } from "../util/map.js";
+import { countItems, hasItems } from "../util/iterate.js";
+import { DataUpdate } from "../update/DataUpdate.js";
+import { Feedback } from "../feedback/Feedback.js";
+import { InvalidFeedback } from "../feedback/InvalidFeedback.js";
+import { Filter } from "../query/Filter.js";
 import { DocumentValidationError, QueryValidationError } from "./errors.js";
-import { DocumentResultObserver, getDocumentData, getDocumentResult, getQueryData, getQueryResult } from "./helpers.js";
+import { DocumentResultObserver, getDocumentData, getDocumentResult, getQueryData, getQueryResult } from "./util.js";
 /** A query reference within a specific database. */
 export class QueryReference extends Query {
     constructor(db, validator, collection, filters, sorts, limit) {

package/db/errors.d.ts

@@ -1,6 +1,7 @@
-import type { Data } from "../util/index.js";
-import { RequiredError, ValidationError } from "../error/index.js";
-import type { Feedback } from "../feedback/index.js";
+import type { Data } from "../util/data.js";
+import type { Feedback } from "../feedback/Feedback.js";
+import { ValidationError } from "../error/ValidationError.js";
+import { RequiredError } from "../error/RequiredError.js";
 import type { DocumentReference, QueryReference } from "./Reference.js";
 /** Thrown if a document doesn't exist. */
 export declare class DocumentRequiredError<T extends Data> extends RequiredError {

package/db/errors.js

@@ -1,4 +1,5 @@
-import { RequiredError, ValidationError } from "../error/index.js";
+import { ValidationError } from "../error/ValidationError.js";
+import { RequiredError } from "../error/RequiredError.js";
 /** Thrown if a document doesn't exist. */
 export class DocumentRequiredError extends RequiredError {
     constructor(ref) {

package/db/index.d.ts

@@ -2,5 +2,5 @@ export * from "./Database.js";
 export * from "./Reference.js";
 export * from "./Operation.js";
 export * from "./PaginationState.js";
-export * from "./helpers.js";
+export * from "./util.js";
 export * from "./errors.js";

package/db/index.js

@@ -2,5 +2,5 @@ export * from "./Database.js";
 export * from "./Reference.js";
 export * from "./Operation.js";
 export * from "./PaginationState.js";
-export * from "./helpers.js";
+export * from "./util.js";
 export * from "./errors.js";

package/db/{helpers.d.ts → util.d.ts}

@@ -1,4 +1,6 @@
-import { Data, Result, TransformerObserver, Observer, Entries } from "../util/index.js";
+import { TransformableObserver, Observer } from "../util/observe.js";
+import { Data, Result } from "../util/data.js";
+import type { Entries } from "../util/entry.js";
 import type { DocumentReference, QueryReference, Reference } from "./Reference.js";
 /** Database data embeds the corresponding `Document` instance and string ID into the data. */
 export declare type DocumentData<T extends Data> = T & {
@@ -10,7 +12,7 @@ export declare function getDocumentData<T extends Data>(result: DocumentResult<T
 /** Is an unknown value a DocumentResult. */
 export declare const isDocumentData: <T extends Data>(v: unknown) => v is DocumentData<T>;
 /** Oserver that transforms a result into a document result. */
-export declare class DocumentDataObserver<T extends Data> extends TransformerObserver<Result<T>, DocumentData<T>> {
+export declare class DocumentDataObserver<T extends Data> extends TransformableObserver<Result<T>, DocumentData<T>> {
     protected _ref: DocumentReference<T>;
     constructor(target: Observer<DocumentData<T>>, ref: DocumentReference<T>);
     transform(result: Result<T>): DocumentData<T>;
@@ -22,7 +24,7 @@ export declare function getDocumentResult<T extends Data>(result: Result<T>, ref
 /** Is an unknown value a DocumentResult. */
 export declare const isDocumentResult: <T extends Data>(v: unknown) => v is DocumentResult<T>;
 /** Oserver that transforms a set of entries into a results map. */
-export declare class DocumentResultObserver<T extends Data> extends TransformerObserver<Result<T>, DocumentResult<T>> {
+export declare class DocumentResultObserver<T extends Data> extends TransformableObserver<Result<T>, DocumentResult<T>> {
     protected _ref: DocumentReference<T>;
     constructor(target: Observer<DocumentResult<T>>, ref: DocumentReference<T>);
     transform(result: Result<T>): DocumentResult<T>;

package/db/{helpers.js → util.js}

@@ -1,4 +1,6 @@
-import { TransformerObserver, isData, getFirstItem } from "../util/index.js";
+import { TransformableObserver } from "../util/observe.js";
+import { isData } from "../util/data.js";
+import { getFirstItem } from "../util/array.js";
 import { DocumentRequiredError, QueryRequiredError } from "./errors.js";
 /** Get the data for a document from a result for that document. */
 export function getDocumentData(result, ref) {
@@ -9,7 +11,7 @@ export function getDocumentData(result, ref) {
 /** Is an unknown value a DocumentResult. */
 export const isDocumentData = (v) => isData(v) && "id" in v && "doc" in v;
 /** Oserver that transforms a result into a document result. */
-export class DocumentDataObserver extends TransformerObserver {
+export class DocumentDataObserver extends TransformableObserver {
     constructor(target, ref) {
         super(target);
         this._ref = ref;
@@ -25,7 +27,7 @@ export function getDocumentResult(result, ref) {
 /** Is an unknown value a DocumentResult. */
 export const isDocumentResult = (v) => isData(v) && "id" in v && "doc" in v;
 /** Oserver that transforms a set of entries into a results map. */
-export class DocumentResultObserver extends TransformerObserver {
+export class DocumentResultObserver extends TransformableObserver {
     constructor(target, ref) {
         super(target);
         this._ref = ref;

package/error/AssertionError.js

@@ -1,4 +1,4 @@
-import { debug } from "../util/index.js";
+import { debug } from "../util/debug.js";
 /**
  * Thrown if the program receives a value it didn't expect.
  *

package/error/ValidationError.d.ts

@@ -1,4 +1,4 @@
-import type { Feedback } from "../feedback/index.js";
+import type { Feedback } from "../feedback/Feedback.js";
 /** Thrown if a value isn't valid. */
 export declare class ValidationError extends Error {
     readonly feedback: Feedback;

package/feedback/Feedback.d.ts

@@ -1,4 +1,4 @@
-import { ImmutableObject } from "../util/index.js";
+import type { ImmutableObject } from "../util/object.js";
 /**
  * The `Feedback` class represents a feedback message that should be shown to the user.
  * - Basic `Feedback` is neither good nor bad, `SuccessFeedback` indicates good news, and `ErrorFeedback` indicates bad news.

package/feedback/Feedback.js

@@ -1,4 +1,5 @@
-import { debug, toTitle } from "../util/index.js";
+import { debug } from "../util/debug.js";
+import { toTitle } from "../util/string.js";
 /**
  * The `Feedback` class represents a feedback message that should be shown to the user.
  * - Basic `Feedback` is neither good nor bad, `SuccessFeedback` indicates good news, and `ErrorFeedback` indicates bad news.

package/feedback/hydrations.d.ts

@@ -1,13 +1,3 @@
-import { Feedback } from "./Feedback.js";
-import { SuccessFeedback } from "./SuccessFeedback.js";
-import { WarningFeedback } from "./WarningFeedback.js";
-import { ErrorFeedback } from "./ErrorFeedback.js";
-import { InvalidFeedback } from "./InvalidFeedback.js";
+import type { Hydrations } from "../util/hydrate.js";
 /** Set of hydrations for all feedback classes. */
-export declare const FEEDBACK_HYDRATIONS: {
-    SuccessFeedback: typeof SuccessFeedback;
-    WarningFeedback: typeof WarningFeedback;
-    InvalidFeedback: typeof InvalidFeedback;
-    ErrorFeedback: typeof ErrorFeedback;
-    Feedback: typeof Feedback;
-};
+export declare const FEEDBACK_HYDRATIONS: Hydrations;

package/feedback/hydrations.js

@@ -11,4 +11,3 @@ export const FEEDBACK_HYDRATIONS = {
     ErrorFeedback,
     Feedback,
 };
-FEEDBACK_HYDRATIONS;

package/firestore/client/FirestoreClientProvider.d.ts

@@ -1,5 +1,10 @@
 import type { Firestore } from "firebase/firestore";
-import { Entries, Provider, DocumentReference, QueryReference, Result, Observer, AsynchronousProvider, DataUpdate, Data, Unsubscriber } from "../../index.js";
+import type { DocumentReference, QueryReference } from "../../db/Reference.js";
+import type { Data, Result } from "../../util/data.js";
+import type { Entries } from "../../util/entry.js";
+import { AsynchronousProvider, Provider } from "../../provider/Provider.js";
+import { DataUpdate } from "../../update/DataUpdate.js";
+import { Observer, Unsubscriber } from "../../util/observe.js";
 /**
  * Firestore client database provider.
  * - Works with the Firebase JS SDK.

package/firestore/client/FirestoreClientProvider.js

@@ -1,5 +1,11 @@
 import { orderBy as firestoreOrderBy, where as firestoreWhere, limit as firestoreLimit, increment as firestoreIncrement, arrayUnion as firestoreArrayUnion, arrayRemove as firestoreArrayRemove, deleteField as firestoreDeleteField, collection as firestoreCollection, doc as firestoreDocument, query as firestoreQuery, onSnapshot, addDoc, setDoc, updateDoc, deleteDoc, getDoc, getDocs, } from "firebase/firestore";
-import { Provider, dispatchNext, dispatchError, ObjectUpdate, Increment, DataUpdate, ArrayUpdate, UnsupportedError, } from "../../index.js";
+import { UnsupportedError } from "../../error/UnsupportedError.js";
+import { Provider } from "../../provider/Provider.js";
+import { ArrayUpdate } from "../../update/ArrayUpdate.js";
+import { DataUpdate } from "../../update/DataUpdate.js";
+import { Increment } from "../../update/Increment.js";
+import { ObjectUpdate } from "../../update/ObjectUpdate.js";
+import { dispatchError, dispatchNext } from "../../util/observe.js";
 // Constants.
 // const ID = "__name__"; // DH: `__name__` is the entire path of the document. `__id__` is just ID.
 const ID = "__id__"; // Internal way Firestore Queries can reference the ID of the current document.

package/firestore/lite/FirestoreLiteProvider.d.ts

@@ -1,5 +1,10 @@
 import type { Firestore } from "firebase/firestore/lite";
-import { Provider, DocumentReference, QueryReference, Result, Update, AsynchronousProvider, Data, DataUpdate, Entries, Unsubscriber } from "../../index.js";
+import type { DocumentReference, QueryReference } from "../../db/Reference.js";
+import type { Data, Result } from "../../util/data.js";
+import type { Entries } from "../../util/entry.js";
+import type { Unsubscriber } from "../../util/observe.js";
+import { AsynchronousProvider, Provider } from "../../provider/Provider.js";
+import { DataUpdate } from "../../update/DataUpdate.js";
 /**
  * Firestore Lite client database provider.
  * - Works with the Firebase JS SDK.
@@ -17,7 +22,7 @@ export declare class FirestoreClientProvider extends Provider implements Asynchr
     delete<T extends Data>(ref: DocumentReference<T>): Promise<void>;
     getQuery<T extends Data>(ref: QueryReference<T>): Promise<Entries<T>>;
     subscribeQuery(): Unsubscriber;
-    setQuery<T extends Data>(ref: QueryReference<T>, data: T | Update<T> | undefined): Promise<number>;
+    setQuery<T extends Data>(ref: QueryReference<T>, data: T): Promise<number>;
     updateQuery<T extends Data>(ref: QueryReference<T>, update: DataUpdate<T>): Promise<number>;
     deleteQuery<T extends Data>(ref: QueryReference<T>): Promise<number>;
 }

package/firestore/lite/FirestoreLiteProvider.js

@@ -1,5 +1,10 @@
 import { orderBy as firestoreOrderBy, where as firestoreWhere, limit as firestoreLimit, increment as firestoreIncrement, arrayUnion as firestoreArrayUnion, arrayRemove as firestoreArrayRemove, deleteField as firestoreDeleteField, collection as firestoreCollection, doc as firestoreDocument, query as firestoreQuery, setDoc, addDoc, updateDoc, deleteDoc, getDoc, getDocs, } from "firebase/firestore/lite";
-import { Provider, ObjectUpdate, Increment, DataUpdate, ArrayUpdate, UnsupportedError, } from "../../index.js";
+import { UnsupportedError } from "../../error/UnsupportedError.js";
+import { Provider } from "../../provider/Provider.js";
+import { ArrayUpdate } from "../../update/ArrayUpdate.js";
+import { DataUpdate } from "../../update/DataUpdate.js";
+import { Increment } from "../../update/Increment.js";
+import { ObjectUpdate } from "../../update/ObjectUpdate.js";
 // Constants.
 // const ID = "__name__"; // DH: `__name__` is the entire path of the document. `__id__` is just ID.
 const ID = "__id__"; // Internal way Firestore Queries can reference the ID of the current document.

package/firestore/server/FirestoreServerProvider.d.ts

@@ -1,5 +1,10 @@
 import { Firestore } from "@google-cloud/firestore";
-import { Provider, DocumentReference, QueryReference, Observer, Result, Update, Data, AsynchronousProvider, DataUpdate, Entry, Entries, Unsubscriber } from "../../index.js";
+import type { DocumentReference, QueryReference } from "../../db/Reference.js";
+import type { Data, Result } from "../../util/data.js";
+import type { Entries, Entry } from "../../util/entry.js";
+import { AsynchronousProvider, Provider } from "../../provider/Provider.js";
+import { DataUpdate } from "../../update/DataUpdate.js";
+import { Observer, Unsubscriber } from "../../util/observe.js";
 /**
  * Firestore server database provider.
  * - Works with the Firebase Admin SDK for Node.JS
@@ -15,7 +20,7 @@ export declare class FirestoreServerProvider extends Provider implements Asynchr
     delete<T extends Data>(ref: DocumentReference<T>): Promise<void>;
     getQuery<T extends Data>(ref: QueryReference<T>): Promise<Iterable<Entry<T>>>;
     subscribeQuery<T extends Data>(ref: QueryReference<T>, observer: Observer<Entries<T>>): Unsubscriber;
-    setQuery<T extends Data>(ref: QueryReference<T>, data: T | Update<T> | undefined): Promise<number>;
+    setQuery<T extends Data>(ref: QueryReference<T>, data: T): Promise<number>;
     updateQuery<T extends Data>(ref: QueryReference<T>, update: DataUpdate<T>): Promise<number>;
     deleteQuery<T extends Data>(ref: QueryReference<T>): Promise<number>;
 }

package/firestore/server/FirestoreServerProvider.js

@@ -1,5 +1,11 @@
 import { Firestore, FieldValue } from "@google-cloud/firestore";
-import { Provider, dispatchNext, dispatchError, Update, Increment, DataUpdate, AssertionError, ArrayUpdate, UnsupportedError, ObjectUpdate, } from "../../index.js";
+import { UnsupportedError } from "../../error/UnsupportedError.js";
+import { Provider } from "../../provider/Provider.js";
+import { ArrayUpdate } from "../../update/ArrayUpdate.js";
+import { DataUpdate } from "../../update/DataUpdate.js";
+import { Increment } from "../../update/Increment.js";
+import { ObjectUpdate } from "../../update/ObjectUpdate.js";
+import { dispatchError, dispatchNext } from "../../util/observe.js";
 // Constants.
 // const ID = "__name__"; // DH: `__name__` is the entire path of the document. `__id__` is just ID.
 const ID = "__id__"; // Internal way Firestore Queries can reference the ID of the current document.
@@ -48,8 +54,8 @@ function* getResults(snapshot) {
 /** Convert `Update` instances into corresponding Firestore `FieldValue` instances. */
 function* yieldFieldValues(updates, prefix = "") {
     for (const [key, update] of updates) {
-        if (!(update instanceof Update))
-            yield [`${prefix}${key}`, update !== undefined ? update : FieldValue.delete()];
+        if (update === undefined)
+            yield [`${prefix}${key}`, FieldValue.delete()];
         else if (update instanceof Increment)
             yield [`${prefix}${key}`, FieldValue.increment(update.amount)];
         else if (update instanceof DataUpdate || update instanceof ObjectUpdate)
@@ -63,7 +69,7 @@ function* yieldFieldValues(updates, prefix = "") {
                 yield [`${prefix}${key}`, FieldValue.arrayRemove(...update.deletes)];
         }
         else
-            throw new AssertionError("Unsupported transform", update);
+            yield [`${prefix}${key}`, update];
     }
 }
 /**

package/markup/render.d.ts

@@ -1,4 +1,4 @@
-import { JSXNode } from "../util/index.js";
+import type { JSXNode } from "../util/jsx.js";
 import type { MarkupOptions } from "./types.js";
 /**
  * Parse a text string as Markdownish syntax and render it as a JSX node.

package/markup/render.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { sanitizeLines } from "../util/index.js";
+import { sanitizeLines } from "../util/string.js";
 import { MARKUP_RULES } from "./rules.js";
 /** Convert a string into an array of React nodes using a set of rules. */
 function renderString(content, options) {

package/markup/rules.js

@@ -1,4 +1,5 @@
-import { formatUrl, toURL, getLineRegExp, getBlockRegExp, MATCH_LINE, MATCH_BLOCK, getWrapRegExp } from "../util/index.js";
+import { getBlockRegExp, getLineRegExp, getWrapRegExp, MATCH_BLOCK, MATCH_LINE } from "../util/search.js";
+import { formatUrl, toURL } from "../util/url.js";
 // Regular expression partials (`\` slashes must be escaped as `\\`).
 const BULLETS = "-*•+"; // Anything that can be a bullet (used for unordered lists and horizontal rules).
 // Regular expressions.

package/markup/types.d.ts

@@ -1,4 +1,4 @@
-import { JSXElement } from "../util/index.js";
+import type { JSXElement } from "../util/jsx.js";
 /** A single markup parsing rule. */
 export declare type MarkupRule = {
     /** RegExp for matching this rule. */

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.61.0",
+	"version": "1.62.1",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",
@@ -47,10 +47,11 @@
 		"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:typescript && npm run test:jest",
+		"test": "npm run test:prettier && npm run test:eslint && npm run test:dpdm && 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",
 		"test:jest": "jest",
 		"test:jest:watch": "jest --watchAll",
 		"build": "npm run build:typescript && npm run build:copy && npm run build:jest",
@@ -61,21 +62,22 @@
 	"devDependencies": {
 		"@google-cloud/firestore": "^5.0.2",
 		"@types/jest": "^27.5.1",
-		"@types/react": "^17.0.45",
-		"@types/react-dom": "^17.0.17",
+		"@types/react": "^18.0.9",
+		"@types/react-dom": "^18.0.4",
 		"@typescript-eslint/eslint-plugin": "^5.23.0",
 		"@typescript-eslint/parser": "^5.23.0",
+		"dpdm": "^3.9.0",
 		"eslint": "^8.15.0",
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-import": "^2.26.0",
 		"eslint-plugin-prettier": "^4.0.0",
 		"firebase": "^9.8.1",
-		"jest": "^27.5.1",
+		"jest": "^28.1.0",
 		"jest-ts-webcompat-resolver": "^1.0.0",
 		"prettier": "^2.6.2",
-		"react": "^17.0.2",
-		"react-dom": "^17.0.2",
-		"ts-jest": "^27.1.4",
+		"react": "^18.1.0",
+		"react-dom": "^18.1.0",
+		"ts-jest": "^28.0.2",
 		"typescript": "^4.6.4"
 	},
 	"peerDependencies": {

package/provider/BatchProvider.d.ts

@@ -1,5 +1,8 @@
-import { MutableObject, Result, Observer, Unsubscriber, Observable, Entries, Results, Data } from "../util/index.js";
-import type { DocumentReference, QueryReference } from "../db/index.js";
+import type { MutableObject } from "../util/object.js";
+import type { Entries } from "../util/entry.js";
+import type { DocumentReference, QueryReference } from "../db/Reference.js";
+import { Observable, Observer, Unsubscriber } from "../util/observe.js";
+import { Data, Result, Results } from "../util/data.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /**
  * Provider that batches multiple database reads from a source provider together, for efficiency.

package/provider/BatchProvider.js

@@ -1,5 +1,7 @@
-import { isAsync, getMap, awaitNext, ResultsObserver } from "../util/index.js";
-import { LazyState } from "../stream/index.js";
+import { awaitNext, ResultsObserver } from "../util/observe.js";
+import { getMap } from "../util/map.js";
+import { isAsync } from "../util/async.js";
+import { LazyState } from "../stream/LazyState.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /** How long to wait after all subscriptions have ended to close the source subscription. */
 const STOP_DELAY = 2000;

package/provider/CacheProvider.d.ts

@@ -1,6 +1,8 @@
-import type { DocumentReference, QueryReference } from "../db/index.js";
-import { DataUpdate } from "../update/index.js";
-import { Result, Unsubscriber, Observer, Entries, Data } from "../util/index.js";
+import type { DocumentReference, QueryReference } from "../db/Reference.js";
+import type { Data, Result } from "../util/data.js";
+import { Observer, Unsubscriber } from "../util/observe.js";
+import { DataUpdate } from "../update/DataUpdate.js";
+import { Entries } from "../util/entry.js";
 import type { Provider, AsynchronousProvider } from "./Provider.js";
 import { MemoryProvider } from "./MemoryProvider.js";
 import { ThroughProvider } from "./ThroughProvider.js";

package/provider/CacheProvider.js

@@ -1,4 +1,4 @@
-import { TransformObserver } from "../util/index.js";
+import { TransformObserver } from "../util/observe.js";
 import { MemoryProvider } from "./MemoryProvider.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /** Keep a copy of received data in a local cache. */

package/provider/ErrorProvider.d.ts

@@ -1,6 +1,8 @@
-import { DocumentReference, QueryReference } from "../db/index.js";
-import { Data, Result, Entries, Observer, Unsubscriber } from "../util/index.js";
-import { DataUpdate } from "../update/index.js";
+import type { Data, Result } from "../util/data.js";
+import type { Entries } from "../util/entry.js";
+import type { DocumentReference, QueryReference } from "../db/Reference.js";
+import type { DataUpdate } from "../update/DataUpdate.js";
+import { Observer, Unsubscriber } from "../util/observe.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /** Provider that wraps errors thrown from deeper providers in `DatabaseReadError` and `DatabaseWriteError` etc to make it easier to see what read/write caused the error. */
 export declare class ErrorProvider extends ThroughProvider {

package/provider/ErrorProvider.js

@@ -1,4 +1,5 @@
-import { isAsync, ThroughObserver } from "../util/index.js";
+import { ThroughObserver } from "../util/observe.js";
+import { isAsync } from "../util/async.js";
 import { ThroughProvider } from "./ThroughProvider.js";
 /** Provider that wraps errors thrown from deeper providers in `DatabaseReadError` and `DatabaseWriteError` etc to make it easier to see what read/write caused the error. */
 export class ErrorProvider extends ThroughProvider {