shelving 1.98.0 → 1.98.2

package/api/Resource.d.ts

@@ -1,11 +1,11 @@
-import type { Validatable, Validator } from "../util/validate.js";
+import type { Validator } from "../util/validate.js";
 /**
  * An abstract API resource definition, used to specify types for e.g. serverless functions..
  *
  * @param payload The `Validator` the payload must conform to (defaults to `undefined` if not specified).
  * @param returns The `Validator` the function's returned value must conform to (defaults to `undefined` if not specified).
  */
-export declare class Resource<P = unknown, R = void> implements Validatable<R> {
+export declare class Resource<P = unknown, R = void> implements Validator<R> {
     /** Payload validator. */
     readonly payload: Validator<P>;
     /** Result validator. */

package/api/Resource.js

@@ -1,7 +1,7 @@
 import { ValidationError } from "../error/ValidationError.js";
 import { Feedback } from "../feedback/Feedback.js";
-import { getUndefined } from "../util/undefined.js";
-import { validate } from "../util/validate.js";
+// Undefined validator.
+const UNDEFINED = { validate: () => undefined };
 /**
  * An abstract API resource definition, used to specify types for e.g. serverless functions..
  *
@@ -20,7 +20,8 @@ export class Resource {
      * @throws Feedback if the payload could not be validated.
      */
     prepare(unsafePayload) {
-        return validate(unsafePayload, this.payload);
+        var _a;
+        return (_a = this.payload) === null || _a === void 0 ? void 0 : _a.validate(unsafePayload);
     }
     /**
      * Validate a result for this resource.
@@ -30,7 +31,7 @@ export class Resource {
      */
     validate(unsafeResult) {
         try {
-            return validate(unsafeResult, this.result);
+            return this.result.validate(unsafeResult);
         }
         catch (thrown) {
             if (thrown instanceof Feedback)
@@ -39,6 +40,6 @@ export class Resource {
         }
     }
 }
-export function RESOURCE(payload = getUndefined, result = getUndefined) {
+export function RESOURCE(payload = UNDEFINED, result = UNDEFINED) {
     return new Resource(payload, result);
 }

package/db/ItemReference.d.ts

@@ -1,7 +1,7 @@
 import type { DeleteChange, SetChange, UpdateChange } from "./Change.js";
 import type { AsyncProvider, Provider } from "../provider/Provider.js";
 import type { ImmutableArray } from "../util/array.js";
-import type { Callback, ErrorCallback, StopCallback } from "../util/callback.js";
+import type { ErrorCallback, StopCallback, ValueCallback } from "../util/callback.js";
 import type { Data } from "../util/data.js";
 import type { Query } from "../util/query.js";
 import type { Updates } from "../util/update.js";
@@ -61,7 +61,7 @@ declare abstract class AbstractItemReference<T extends Data = Data> implements A
     getDelete(): DeleteChange;
     toString(): string;
     /** Subscribe to this item. */
-    subscribe(onNext?: Callback<ItemValue<T>>, onError?: ErrorCallback): StopCallback;
+    subscribe(onNext?: ValueCallback<ItemValue<T>>, onError?: ErrorCallback): StopCallback;
     [Symbol.asyncIterator](): AsyncIterator<ItemValue<T>>;
 }
 /** Reference to an item in a synchronous database. */

package/db/ItemState.js

@@ -34,12 +34,12 @@ export class ItemState extends State {
     }
     async _refresh() {
         this.busy.set(true);
-        this.error(undefined); // Optimistically clear the error.
+        this.reason = undefined; // Optimistically clear the error.
         try {
             this.set(await this.ref.value);
         }
         catch (thrown) {
-            this.error(thrown);
+            this.reason = thrown;
         }
         finally {
             this.busy.set(false);

package/db/QueryReference.d.ts

@@ -1,6 +1,6 @@
 import type { ItemArray, ItemData, ItemQuery, ItemValue } from "./ItemReference.js";
 import type { AsyncProvider, Provider } from "../provider/Provider.js";
-import type { Callback, ErrorCallback, StopCallback } from "../util/callback.js";
+import type { ErrorCallback, StopCallback, ValueCallback } from "../util/callback.js";
 import type { Data } from "../util/data.js";
 import type { Updates } from "../util/update.js";
 /** Reference to a set of items in a sync or async provider. */
@@ -62,7 +62,7 @@ declare abstract class AbstractQueryReference<T extends Data = Data> implements
     abstract delete(): number | PromiseLike<number>;
     toString(): string;
     /** Subscribe to this item. */
-    subscribe(onNext?: Callback<ItemArray<T>>, onError?: ErrorCallback): StopCallback;
+    subscribe(onNext?: ValueCallback<ItemArray<T>>, onError?: ErrorCallback): StopCallback;
     [Symbol.asyncIterator](): AsyncIterator<ItemArray<T>>;
 }
 /** Reference to a set of items in a provider. */

package/db/QueryState.js

@@ -66,7 +66,7 @@ export class QueryState extends State {
     }
     async _refresh() {
         this.busy.set(true);
-        this.error(undefined); // Optimistically clear the error.
+        this.reason = undefined; // Optimistically clear the error.
         try {
             const items = await this.ref.items;
             this._hasMore = items.length >= this.limit; // If the query returned {limit} or more items, we can assume there are more items waiting to be queried.
@@ -90,7 +90,7 @@ export class QueryState extends State {
     }
     async _loadMore() {
         this.busy.set(true);
-        this.error(undefined); // Optimistically clear the error.
+        this.reason = undefined; // Optimistically clear the error.
         try {
             const last = this.last;
             const ref = last ? this.ref.with(getAfterQuery(this.ref.query, last)) : this.ref;
@@ -99,7 +99,7 @@ export class QueryState extends State {
             this._hasMore = items.length >= this.limit; // If the query returned {limit} or more items, we can assume there are more items waiting to be queried.
         }
         catch (thrown) {
-            this.error(thrown);
+            this.reason = thrown;
         }
         finally {
             this.busy.set(false);

package/package.json

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

package/provider/ValidationProvider.js

@@ -1,7 +1,7 @@
 import { ValidationError } from "../error/ValidationError.js";
 import { Feedback } from "../feedback/Feedback.js";
 import { updateData } from "../util/update.js";
-import { validate, validateWithContext } from "../util/validate.js";
+import { validateWithContext } from "../util/validate.js";
 // Constants.
 const VALIDATION_CONTEXT_GET = { action: "get", id: true };
 const VALIDATION_CONTEXT_ADD = { action: "add" };
@@ -52,7 +52,7 @@ export class ValidationProvider extends BaseValidationProvider {
         return _validateItemArray(collection, this.source.getQuery(collection, constraints), this.getSchema(collection));
     }
     setQuery(collection, constraints, value) {
-        return this.source.setQuery(collection, constraints, validate(value, this.getSchema(collection)));
+        return this.source.setQuery(collection, constraints, this.getSchema(collection).validate(value));
     }
     updateQuery(collection, constraints, updates) {
         validateWithContext(updateData({}, updates), this.getSchema(collection), VALIDATION_CONTEXT_UPDATE);

package/schema/Schema.d.ts

@@ -1,4 +1,4 @@
-import type { Validatable } from "../util/validate.js";
+import type { Validator } from "../util/validate.js";
 /** Options allowed by a `Schema` instance. */
 export type SchemaOptions = {
     /** Title of the schema, e.g. for using as the title of a corresponding field. */
@@ -15,7 +15,7 @@ export type SchemaOptions = {
  * - Type `T` represents the type of value `validate()` returns.
  * - `validate()` returns `Invalid` if value was not valid.
  */
-export declare abstract class Schema<T extends unknown = unknown> implements Validatable<T> {
+export declare abstract class Schema<T extends unknown = unknown> implements Validator<T> {
     /** Title of the schema, e.g. for using as the title of a corresponding field. */
     readonly title: string;
     /** Description of the schema, e.g. for using as a description in a corresponding field. */

package/sequence/DeferredSequence.d.ts

@@ -1,5 +1,5 @@
 import type { Deferred } from "../util/async.js";
-import type { Callback, ErrorCallback, StopCallback } from "../util/callback.js";
+import type { ErrorCallback, StopCallback, ValueCallback } from "../util/callback.js";
 import { AbstractSequence } from "./AbstractSequence.js";
 /**
  * Deferred sequence of values that can be async iterated and new values can be published.
@@ -16,7 +16,7 @@ export declare class DeferredSequence<T = void, R = void> extends AbstractSequen
     /** Get the next promise to be deferred/rejected. */
     get promise(): Promise<T>;
     /** Resolve the current deferred in the sequence. */
-    readonly resolve: Callback<T>;
+    readonly resolve: ValueCallback<T>;
     private _nextValue;
     /** Reject the current deferred in the sequence. */
     readonly reject: ErrorCallback;
@@ -32,5 +32,5 @@ export declare class DeferredSequence<T = void, R = void> extends AbstractSequen
     /** Pull values from a source sequence until the returned stop function is called. */
     from(source: AsyncIterable<T>, onError?: ErrorCallback): StopCallback;
     /** Subscrbe to the value of the sequence with a callback until the returned stop function is called. */
-    to(onNext: Callback<T>, onError?: ErrorCallback): StopCallback;
+    to(onNext: ValueCallback<T>, onError?: ErrorCallback): StopCallback;
 }

package/state/ArrayState.js

@@ -11,15 +11,15 @@ export class ArrayState extends State {
     }
     /** Add items to this array. */
     add(...items) {
-        this.set(withArrayItems(this.value, ...items));
+        this.value = withArrayItems(this.value, ...items);
     }
     /** Remove items from this array. */
     delete(...items) {
-        this.set(omitArrayItems(this.value, ...items));
+        this.value = omitArrayItems(this.value, ...items);
     }
     /** Toggle items in this array. */
     toggle(...items) {
-        this.set(toggleArrayItems(this.value, ...items));
+        this.value = toggleArrayItems(this.value, ...items);
     }
     /** Iterate over the items. */
     [Symbol.iterator]() {

package/state/BooleanState.js

@@ -6,6 +6,6 @@ export class BooleanState extends State {
     }
     /** Toggle the current boolean value. */
     toggle() {
-        this.set(this.value ? false : true);
+        this.value = !this.value;
     }
 }

package/state/DataState.js

@@ -10,7 +10,7 @@ export class DataState extends State {
     }
     /** Update several props in this data. */
     update(updates) {
-        this.set(updateData(this.data, updates));
+        this.value = updateData(this.data, updates);
     }
     /** Update a single named prop in this data. */
     getProp(name) {
@@ -18,7 +18,7 @@ export class DataState extends State {
     }
     /** Update a single named prop in this data. */
     setProp(name, value) {
-        this.set(withProp(this.data, name, value));
+        this.value = withProp(this.data, name, value);
     }
 }
 /** State that stores an optional data object and has additional methods to help with that. */
@@ -33,7 +33,7 @@ export class OptionalDataState extends State {
     }
     /** Update several props in this data. */
     update(updates) {
-        this.set(updateData(this.data, updates));
+        this.value = updateData(this.data, updates);
     }
     /** Update a single named prop in this data. */
     getProp(name) {
@@ -41,10 +41,10 @@ export class OptionalDataState extends State {
     }
     /** Update a single named prop in this data. */
     setProp(name, value) {
-        this.set(withProp(this.data, name, value));
+        this.value = withProp(this.data, name, value);
     }
     /** Set the data to `undefined`. */
     unset() {
-        this.set(undefined);
+        this.value = undefined;
     }
 }

package/state/DictionaryState.js

@@ -1,4 +1,4 @@
-import { omitDictionaryItems } from "../util/dictionary.js";
+import { getDictionaryItems, omitDictionaryItems } from "../util/dictionary.js";
 import { withProp } from "../util/object.js";
 import { updateData } from "../util/update.js";
 import { State } from "./State.js";
@@ -13,11 +13,11 @@ export class DictionaryState extends State {
     }
     /** Set a named entry in this object with a different value. */
     update(updates) {
-        this.set(updateData(this.value, updates));
+        this.value = updateData(this.value, updates);
     }
     /** Remove a named entry from this object. */
     delete(...keys) {
-        this.set(omitDictionaryItems(this.value, ...keys));
+        this.value = omitDictionaryItems(this.value, ...keys);
     }
     /** Get an item in this dictionary. */
     getItem(name) {
@@ -25,10 +25,10 @@ export class DictionaryState extends State {
     }
     /** Set an item in this dictionary. */
     setItem(name, value) {
-        this.set(withProp(this.value, name, value));
+        this.value = withProp(this.value, name, value);
     }
     /** Iterate over the entries of the object. */
     [Symbol.iterator]() {
-        return Object.entries(this.value)[Symbol.iterator]();
+        return getDictionaryItems(this.value)[Symbol.iterator]();
     }
 }

package/state/State.d.ts

@@ -1,5 +1,5 @@
-import type { Callback, ErrorCallback, StopCallback } from "../util/callback.js";
-import type { Validatable } from "../util/validate.js";
+import type { ErrorCallback, StopCallback, ValueCallback } from "../util/callback.js";
+import type { Validator } from "../util/validate.js";
 import { DeferredSequence } from "../sequence/DeferredSequence.js";
 /** Any `State` instance. */
 export type AnyState = State<any>;
@@ -19,11 +19,12 @@ export type StateOptions<T> = {
  * - To set the state to be loading, use the `NONE` constant or a `Promise` value.
  * - To set the state to an explicit value, use that value or another `State` instance with a value.
  * */
-export declare class State<T> implements AsyncIterable<T>, Validatable<T> {
+export declare class State<T> implements AsyncIterable<T>, Validator<T> {
     /** Deferred sequence this state uses to issue values as they change. */
     readonly next: DeferredSequence<T>;
     /** Current value of the state (or throw a promise that resolves when this state receives its next value or error). */
     get value(): T;
+    set value(next: T);
     private _value;
     /** Time this state was last updated with a new value. */
     get time(): number | undefined;
@@ -34,19 +35,18 @@ export declare class State<T> implements AsyncIterable<T>, Validatable<T> {
     get age(): number;
     /** Current error of this state (or `undefined` if there is no reason). */
     get reason(): unknown;
+    set reason(reason: Error | unknown);
     private _reason;
     /** State is initiated with an initial state. */
     constructor(options?: StateOptions<T>);
     /** Set the value of the state. */
     set(next: T): void;
-    /** Set the error reason of the state (will be  */
-    error(reason: unknown): void;
     /** Set the value of the state as values are pulled from a sequence. */
     through(sequence: AsyncIterable<T>): AsyncIterable<T>;
     /** Pull values from a source sequence until the returned stop function is called. */
     from(source: AsyncIterable<T>, onError?: ErrorCallback): StopCallback;
     /** Push values to another state or callback to this state until the returned stop function is called. */
-    to(target: Callback<T>, onError?: ErrorCallback): StopCallback;
+    to(target: ValueCallback<T>, onError?: ErrorCallback): StopCallback;
     [Symbol.asyncIterator](): AsyncIterator<T>;
     /** Validate data set on this state. */
     validate(value: T): T;

package/state/State.js

@@ -20,6 +20,15 @@ export class State {
             throw this.next;
         return this._value;
     }
+    set value(next) {
+        const value = this.validate(next);
+        if (value !== this._value || this._reason !== undefined) {
+            this._reason = undefined;
+            this._value = value;
+            this._time = Date.now();
+            this.next.resolve(value);
+        }
+    }
     /** Time this state was last updated with a new value. */
     get time() {
         return this._time;
@@ -37,6 +46,12 @@ export class State {
     get reason() {
         return this._reason;
     }
+    set reason(reason) {
+        this._reason = reason;
+        if (reason !== undefined) {
+            this.next.reject(reason);
+        }
+    }
     /** State is initiated with an initial state. */
     constructor(options = {}) {
         this._value = NONE;
@@ -50,25 +65,12 @@ export class State {
     }
     /** Set the value of the state. */
     set(next) {
-        const value = this.validate(next);
-        if (value !== this._value || this._reason !== undefined) {
-            this._reason = undefined;
-            this._value = value;
-            this._time = Date.now();
-            this.next.resolve(value);
-        }
-    }
-    /** Set the error reason of the state (will be  */
-    error(reason) {
-        this._reason = reason;
-        if (reason !== undefined) {
-            this.next.reject(reason);
-        }
+        this.value = next;
     }
     /** Set the value of the state as values are pulled from a sequence. */
     async *through(sequence) {
         for await (const value of sequence) {
-            this.set(value);
+            this.value = value;
             yield value;
         }
     }

package/util/async.d.ts

@@ -1,4 +1,4 @@
-import type { Callback, ErrorCallback } from "./callback.js";
+import type { ErrorCallback, ValueCallback } from "./callback.js";
 /** Is a value an asynchronous value implementing a `then()` function. */
 export declare const isAsync: <T>(value: T | PromiseLike<T>) => value is PromiseLike<T>;
 /** Is a value a synchronous value. */
@@ -21,7 +21,7 @@ export declare function runMicrotasks(): Promise<void>;
 export declare abstract class AbstractPromise<T> extends Promise<T> {
     static get [Symbol.species](): PromiseConstructor;
     /** Resolve this promise with a value. */
-    protected readonly _resolve: Callback<T>;
+    protected readonly _resolve: ValueCallback<T>;
     /** Reject this promise with a reason. */
     protected readonly _reject: ErrorCallback;
     constructor();
@@ -29,7 +29,7 @@ export declare abstract class AbstractPromise<T> extends Promise<T> {
 /** Deferred allows you to access the internal resolve/reject callbacks of a `Promise` */
 export type Deferred<T> = {
     promise: Promise<T>;
-    resolve: Callback<T>;
+    resolve: ValueCallback<T>;
     reject: ErrorCallback;
 };
 /**

package/util/callback.d.ts

@@ -1,7 +1,11 @@
-/** Callback function that receives a dispatched value. */
-export type Callback<T = void> = (value: T) => void;
-/** Callback function that receives a dispatched value. */
-export type AsyncCallback<T = void> = (value: T) => void | PromiseLike<void>;
+/** Callback function with no value. */
+export type Callback = () => void;
+/** Callback function with no value. */
+export type AsyncCallback = () => void | PromiseLike<void>;
+/** Callback function that receives a value. */
+export type ValueCallback<T> = (value: T) => void;
+/** Callback function that receives a value. */
+export type AsyncValueCallback<T = void> = (value: T) => void | PromiseLike<void>;
 /** Callback function that handles an error. */
 export type ErrorCallback = (reason: Error | unknown) => void;
 /** Callback function that starts something (and returns an optional stop callback). */
@@ -12,7 +16,7 @@ export type StopCallback = () => void;
 export declare function call(callback: () => void | PromiseLike<void>): void;
 export declare function call<T>(callback: (value: T) => void | PromiseLike<void>, value: T): void;
 /** Return a callback function that safely calls a callback function (possibly with a value). */
-export declare function called<T>(dispatcher: AsyncCallback<T>): Callback<T>;
+export declare function called<T>(dispatcher: AsyncValueCallback<T>): ValueCallback<T>;
 /** Safely call a callback method (possibly wth a value). */
 export declare function callMethod<M extends string | symbol>(obj: {
     [K in M]: () => void | PromiseLike<void>;

package/util/index.d.ts

@@ -2,6 +2,7 @@ export * from "./array.js";
 export * from "./assert.js";
 export * from "./async.js";
 export * from "./boolean.js";
+export * from "./callback.js";
 export * from "./class.js";
 export * from "./color.js";
 export * from "./constants.js";

package/util/index.js

@@ -2,6 +2,7 @@ export * from "./array.js";
 export * from "./assert.js";
 export * from "./async.js";
 export * from "./boolean.js";
+export * from "./callback.js";
 export * from "./class.js";
 export * from "./color.js";
 export * from "./constants.js";

package/util/sequence.d.ts

@@ -1,4 +1,4 @@
-import type { AsyncCallback, Callback, ErrorCallback, StopCallback } from "./callback.js";
+import type { AsyncValueCallback, ErrorCallback, StopCallback, ValueCallback } from "./callback.js";
 import { STOP } from "./constants.js";
 /**
  * Is a value an async iterable object?
@@ -11,8 +11,8 @@ export declare function repeatUntil<T>(source: AsyncIterable<T>, ...signals: [Pr
 /** Infinite sequence that yields every X milliseconds (yields a count of the number of iterations). */
 export declare function repeatDelay(ms: number): AsyncIterable<number>;
 /** Dispatch items in a sequence to a (possibly async) callback. */
-export declare function dispatchSequence<T>(sequence: AsyncIterable<T>, onNext: AsyncCallback<T>): AsyncIterable<T>;
+export declare function dispatchSequence<T>(sequence: AsyncIterable<T>, onNext: AsyncValueCallback<T>): AsyncIterable<T>;
 /** Get the first value from an async iterator. **/
 export declare function getNextValue<T>(sequence: AsyncIterable<T>): Promise<T>;
 /** Pull values from a sequence until the returned function is called. */
-export declare function runSequence<T>(sequence: AsyncIterable<T>, onNext?: Callback<T>, onError?: ErrorCallback): StopCallback;
+export declare function runSequence<T>(sequence: AsyncIterable<T>, onNext?: ValueCallback<T>, onError?: ErrorCallback): StopCallback;

package/util/validate.d.ts

@@ -2,7 +2,7 @@ import type { ImmutableArray, PossibleArray } from "./array.js";
 import type { Data } from "./data.js";
 import type { ImmutableDictionary, PossibleDictionary } from "./dictionary.js";
 /** Object that can validate an unknown value with its `validate()` method. */
-export interface Validatable<T> {
+export interface Validator<T> {
     /**
      * `validate()` method accepts an unsafe value and returns a valid value.
      *
@@ -15,10 +15,6 @@ export interface Validatable<T> {
      */
     validate(unsafeValue: unknown): T;
 }
-/** Function that can validate a value. */
-export type Validate<T> = (unsafeValue: unknown) => T;
-/** Something that can validate a value. */
-export type Validator<T = unknown> = Validatable<T> | Validate<T>;
 /** Extract the type from a validator. */
 export type ValidatorType<X> = X extends Validator<infer Y> ? Y : never;
 /** A set of named validators in `{ name: Validator }` format. */
@@ -29,8 +25,6 @@ export type Validators<T extends Data = Data> = {
 export type ValidatorsType<T> = {
     readonly [K in keyof T]: ValidatorType<T[K]>;
 };
-/** Validate an unknown value with a validator. */
-export declare function validate<T>(unsafeValue: unknown, validator: Validator<T>): T;
 /** Get value that validates against a given `Validator`, or throw `ValidationError` */
 export declare function getValid<T>(unsafeValue: unknown, validator: Validator<T>): T;
 /** Assert that a value validates against a given `Validator`, or throw `ValidationError` */

package/util/validate.js

@@ -5,14 +5,10 @@ import { getLastItem, isArray } from "./array.js";
 import { getDataProps } from "./data.js";
 import { getDictionaryItems } from "./dictionary.js";
 import { isIterable } from "./iterate.js";
-/** Validate an unknown value with a validator. */
-export function validate(unsafeValue, validator) {
-    return typeof validator === "function" ? validator(unsafeValue) : validator.validate(unsafeValue);
-}
 /** Get value that validates against a given `Validator`, or throw `ValidationError` */
 export function getValid(unsafeValue, validator) {
     try {
-        return validate(unsafeValue, validator);
+        return validator.validate(unsafeValue);
     }
     catch (thrown) {
         if (thrown instanceof Feedback)
@@ -37,7 +33,7 @@ export function* validateItems(unsafeItems, validator) {
     const feedbacks = {};
     for (const unsafeItem of unsafeItems) {
         try {
-            yield validate(unsafeItem, validator);
+            yield validator.validate(unsafeItem);
         }
         catch (thrown) {
             if (!(thrown instanceof Feedback))
@@ -65,7 +61,7 @@ export function validateArray(unsafeArray, validator) {
     const feedbacks = {};
     for (const unsafeItem of unsafeArray) {
         try {
-            const safeItem = validate(unsafeItem, validator);
+            const safeItem = validator.validate(unsafeItem);
             safeArray.push(safeItem);
             if (!changed && safeItem !== unsafeItem)
                 changed = true;
@@ -95,7 +91,7 @@ export function validateDictionary(unsafeDictionary, validator) {
     const feedbacks = {};
     for (const [key, unsafeValue] of getDictionaryItems(unsafeDictionary)) {
         try {
-            const safeValue = validate(unsafeValue, validator);
+            const safeValue = validator.validate(unsafeValue);
             safeDictionary[key] = safeValue;
             if (!changed && safeValue !== unsafeValue)
                 changed = true;
@@ -131,7 +127,7 @@ export function validateData(unsafeData, validators) {
         if (unsafeValue === undefined && partial)
             continue; // Silently skip `undefined` props if in partial mode.
         try {
-            const safeValue = validate(unsafeValue, validator);
+            const safeValue = validator.validate(unsafeValue);
             safeData[key] = safeValue;
             if (!changed && safeValue !== unsafeValue)
                 changed = true;
@@ -154,7 +150,7 @@ export const getValidationContext = () => getLastItem(CONTEXTS);
 /** Validate a unknown value with a validator, and supply a context that can be read during the validation process. */
 export function validateWithContext(unsafeValue, validator, context) {
     CONTEXTS.push(context);
-    const validValue = validate(unsafeValue, validator);
+    const validValue = validator.validate(unsafeValue);
     CONTEXTS.pop();
     return validValue;
 }