shelving 1.171.0 → 1.173.0

package/db/ValidationProvider.js

@@ -1,5 +1,4 @@
 import { ValueError } from "../error/ValueError.js";
-import { Feedback } from "../feedback/Feedback.js";
 import { PARTIAL } from "../schema/DataSchema.js";
 import { getNamedMessage } from "../util/error.js";
 import { validateData } from "../util/validate.js";
@@ -119,9 +118,9 @@ function _validateItem(collection, item, identifier, schema, caller) {
         return validateData(item, { id: identifier, ...schema.props });
     }
     catch (thrown) {
-        if (!(thrown instanceof Feedback))
+        if (typeof thrown !== "string")
             throw thrown;
-        throw new ValueError(`Invalid data for "${collection}"\n${thrown.message}`, { item, caller });
+        throw new ValueError(`Invalid data for "${collection}"\n${thrown}`, { item, caller });
     }
 }
 /**
@@ -138,9 +137,9 @@ function* _yieldValidItems(collection, items, validators, caller) {
             yield validateData(item, validators);
         }
         catch (thrown) {
-            if (!(thrown instanceof Feedback))
+            if (typeof thrown !== "string")
                 throw thrown;
-            messages.push(getNamedMessage(item.id, thrown.message));
+            messages.push(getNamedMessage(item.id, thrown));
         }
     }
     if (messages.length)
@@ -151,8 +150,8 @@ function _validateUpdates(collection, updates, schema, caller) {
         return validateData(updates, PARTIAL(schema).props);
     }
     catch (thrown) {
-        if (!(thrown instanceof Feedback))
+        if (typeof thrown !== "string")
             throw thrown;
-        throw new ValueError(`Invalid updates for "${collection}"\n${thrown.message}`, { updates, caller });
+        throw new ValueError(`Invalid updates for "${collection}"\n${thrown}`, { updates, caller });
     }
 }

package/endpoint/Endpoint.d.ts

@@ -34,7 +34,7 @@ export declare class Endpoint<P, R> {
      * @param unsafePayload The payload to pass into the callback (will be validated against this endpoint's payload schema).
      * @param request The entire HTTP request that is being handled (payload was possibly extracted from this somehow).
      *
-     * @throws `Feedback` if the payload is invalid.
+     * @throws `string` if the payload is invalid.
      * @throws `ValueError` if `callback()` returns an invalid result.
      */
     handle(callback: EndpointCallback<P, R>, unsafePayload: unknown, request: Request, caller?: AnyCaller): Promise<Response>;
@@ -48,7 +48,7 @@ export declare class Endpoint<P, R> {
      * - Validates a payload against this endpoints payload schema
      * - Return an HTTP `Request` that will send it the valid payload to this endpoint.
      *
-     * @throws `Feedback` if the payload is invalid.
+     * @throws `string` if the payload is invalid.
      */
     request(payload: P, options?: RequestOptions, caller?: AnyCaller): Request;
     /**
@@ -63,7 +63,7 @@ export declare class Endpoint<P, R> {
      * - Validate the `payload` against this endpoint's payload schema.
      * - Validate the returned response against this endpoint's result schema.
      *
-     * @throws `Feedback` if the payload is invalid.
+     * @throws `string` if the payload is invalid.
      * @throws `ResponseError` if the response status is not ok (200-299)
      * @throws `ResponseError` if the response content is invalid.
      */

package/endpoint/Endpoint.js

@@ -1,6 +1,5 @@
 import { ResponseError } from "../error/ResponseError.js";
 import { ValueError } from "../error/ValueError.js";
-import { Feedback } from "../feedback/Feedback.js";
 import { UNDEFINED } from "../schema/Schema.js";
 import { assertDictionary } from "../util/dictionary.js";
 import { getMessage } from "../util/error.js";
@@ -44,7 +43,7 @@ export class Endpoint {
      * @param unsafePayload The payload to pass into the callback (will be validated against this endpoint's payload schema).
      * @param request The entire HTTP request that is being handled (payload was possibly extracted from this somehow).
      *
-     * @throws `Feedback` if the payload is invalid.
+     * @throws `string` if the payload is invalid.
      * @throws `ValueError` if `callback()` returns an invalid result.
      */
     async handle(callback, unsafePayload, request, caller = this.handle) {
@@ -57,8 +56,8 @@ export class Endpoint {
             return getResponse(this.result.validate(unsafeResult));
         }
         catch (thrown) {
-            if (thrown instanceof Feedback)
-                throw new ValueError(`Invalid result for ${this.toString()}:\n${thrown.message}`, {
+            if (typeof thrown === "string")
+                throw new ValueError(`Invalid result for ${this.toString()}:\n${thrown}`, {
                     endpoint: this,
                     callback,
                     cause: thrown,
@@ -87,7 +86,7 @@ export class Endpoint {
      * - Validates a payload against this endpoints payload schema
      * - Return an HTTP `Request` that will send it the valid payload to this endpoint.
      *
-     * @throws `Feedback` if the payload is invalid.
+     * @throws `string` if the payload is invalid.
      */
     request(payload, options = {}, caller = this.request) {
         return getRequest(this.method, this.url, this.payload.validate(payload), options, caller);
@@ -110,13 +109,8 @@ export class Endpoint {
             return this.result.validate(content);
         }
         catch (thrown) {
-            if (thrown instanceof Feedback)
-                throw new ResponseError(`Invalid result for ${this.toString()}:\n${thrown.message}`, {
-                    endpoint: this,
-                    code: 422,
-                    cause: thrown,
-                    caller,
-                });
+            if (typeof thrown === "string")
+                throw new ResponseError(`Invalid result for ${this.toString()}:\n${thrown}`, { endpoint: this, code: 422, caller });
             throw thrown;
         }
     }
@@ -125,7 +119,7 @@ export class Endpoint {
      * - Validate the `payload` against this endpoint's payload schema.
      * - Validate the returned response against this endpoint's result schema.
      *
-     * @throws `Feedback` if the payload is invalid.
+     * @throws `string` if the payload is invalid.
      * @throws `ResponseError` if the response status is not ok (200-299)
      * @throws `ResponseError` if the response content is invalid.
      */

package/index.d.ts

@@ -6,7 +6,6 @@
 export * from "./db/index.js";
 export * from "./endpoint/index.js";
 export * from "./error/index.js";
-export * from "./feedback/index.js";
 export * from "./markup/index.js";
 export * from "./schema/index.js";
 export * from "./sequence/index.js";

package/index.js

@@ -6,7 +6,6 @@
 export * from "./db/index.js";
 export * from "./endpoint/index.js";
 export * from "./error/index.js";
-export * from "./feedback/index.js";
 // export * from "./firestore/client/index.js"; // Not exported.
 // export * from "./firestore/lite/index.js"; // Not exported.
 // export * from "./firestore/server/index.js"; // Not exported.

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.171.0",
+	"version": "1.173.0",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/dhoulb/shelving.git"
@@ -27,7 +27,6 @@
 		"./api": "./api/index.js",
 		"./db": "./db/index.js",
 		"./error": "./error/index.js",
-		"./feedback": "./feedback/index.js",
 		"./firestore/client": "./firestore/client/index.js",
 		"./firestore/lite": "./firestore/lite/index.js",
 		"./firestore/server": "./firestore/server/index.js",

package/schema/AddressSchema.d.ts

@@ -0,0 +1,13 @@
+import type { AddressData } from "../util/address.js";
+import { DataSchema, type DataSchemaOptions } from "./DataSchema.js";
+/** Allowed options for `AddressSchema` */
+export interface AddressSchemaOptions extends Omit<DataSchemaOptions<AddressData>, "props"> {
+}
+/** Schema that validates a postal address. */
+export declare class AddressSchema extends DataSchema<AddressData> {
+    constructor({ one, title, ...options }?: AddressSchemaOptions);
+}
+/** Valid postal address data. */
+export declare const ADDRESS: AddressSchema;
+/** Valid postal address data, or `null` */
+export declare const NULLABLE_ADDRESS: import("./NullableSchema.js").NullableSchema<AddressData>;

package/schema/AddressSchema.js

@@ -0,0 +1,22 @@
+import { COUNTRY } from "./CountrySchema.js";
+import { DataSchema } from "./DataSchema.js";
+import { NULLABLE } from "./NullableSchema.js";
+import { StringSchema } from "./StringSchema.js";
+const ADDRESS_PROPS = {
+    address1: new StringSchema({ title: "Address 1", max: 60, min: 1 }),
+    address2: new StringSchema({ title: "Address 2", max: 60, min: 0 }),
+    city: new StringSchema({ title: "City", min: 1, max: 60 }),
+    state: new StringSchema({ title: "State", min: 1, max: 60 }),
+    postcode: new StringSchema({ title: "Postcode", min: 1, max: 12, case: "upper" }),
+    country: COUNTRY,
+};
+/** Schema that validates a postal address. */
+export class AddressSchema extends DataSchema {
+    constructor({ one = "address", title = "Address", ...options } = {}) {
+        super({ one, title, props: ADDRESS_PROPS, ...options });
+    }
+}
+/** Valid postal address data. */
+export const ADDRESS = new AddressSchema({});
+/** Valid postal address data, or `null` */
+export const NULLABLE_ADDRESS = NULLABLE(ADDRESS);

package/schema/ArraySchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { getUniqueArray, isArray } from "../util/array.js";
 import { validateArray } from "../util/validate.js";
 import { Schema } from "./Schema.js";
@@ -39,13 +38,13 @@ export class ArraySchema extends Schema {
     validate(unsafeValue = this.value) {
         const unsafeArray = typeof unsafeValue === "string" ? unsafeValue.split(this.separator).filter(Boolean) : unsafeValue;
         if (!isArray(unsafeArray))
-            throw new ValueFeedback("Must be array", unsafeValue);
+            throw "Must be array";
         const validArray = validateArray(unsafeArray, this.items);
         const uniqueArray = this.unique ? getUniqueArray(validArray) : validArray;
         if (uniqueArray.length < this.min)
-            throw new ValueFeedback(uniqueArray.length ? `Minimum ${this.min} ${this.many}` : "Required", uniqueArray);
+            throw uniqueArray.length ? `Minimum ${this.min} ${this.many}` : "Required";
         if (uniqueArray.length > this.max)
-            throw new ValueFeedback(`Maximum ${this.max} ${this.many}`, uniqueArray);
+            throw `Maximum ${this.max} ${this.many}`;
         return uniqueArray;
     }
 }

package/schema/BooleanSchema.js

@@ -1,4 +1,3 @@
-import { Feedback } from "../feedback/Feedback.js";
 import { Schema } from "./Schema.js";
 const NEGATIVE = ["", "false", "0", "no", "n", "off"];
 /** Define a valid boolean. */
@@ -10,7 +9,7 @@ export class BooleanSchema extends Schema {
     validate(unsafeValue = this.value) {
         const value = typeof unsafeValue === "string" ? !NEGATIVE.includes(unsafeValue.toLowerCase().trim()) : !!unsafeValue;
         if (this.required && !value)
-            throw new Feedback("Required");
+            throw "Required";
         return value;
     }
 }

package/schema/ChoiceSchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { isArray, requireFirst } from "../util/array.js";
 import { getKeys, getProps, isProp } from "../util/object.js";
 import { Schema } from "./Schema.js";
@@ -27,7 +26,7 @@ export class ChoiceSchema extends Schema {
     validate(unsafeValue = this.value) {
         if (typeof unsafeValue === "string" && isOption(this.options, unsafeValue))
             return unsafeValue;
-        throw new ValueFeedback("Unknown value", unsafeValue);
+        throw "Unknown value";
     }
     // Implement iterable.
     *[Symbol.iterator]() {

package/schema/CountrySchema.d.ts

@@ -0,0 +1,17 @@
+import { type Country } from "../util/country.js";
+import { ChoiceSchema, type ChoiceSchemaOptions } from "./ChoiceSchema.js";
+/** Allowed options for `CountrySchema` */
+export interface CountrySchemaOptions extends Omit<ChoiceSchemaOptions<Country>, "options" | "value"> {
+    /** Country value, or `"detect"` to resolve from browser language. */
+    readonly value?: Country | "detect";
+}
+/** Schema that validates an ISO country code. */
+export declare class CountrySchema extends ChoiceSchema<Country> {
+    readonly defaultValue: Country | "detect";
+    constructor({ one, title, value, ...options }?: CountrySchemaOptions);
+    validate(unsafeValue?: unknown): Country;
+}
+/** Valid country code, e.g. `GB` (required because falsy values are invalid). */
+export declare const COUNTRY: CountrySchema;
+/** Valid country code, e.g. `GB`, or `null` */
+export declare const NULLABLE_COUNTRY: import("./NullableSchema.js").NullableSchema<"AF" | "AX" | "AL" | "DZ" | "AS" | "AD" | "AO" | "AI" | "AQ" | "AG" | "AR" | "AM" | "AW" | "AU" | "AT" | "AZ" | "BS" | "BH" | "BD" | "BB" | "BY" | "BE" | "BZ" | "BJ" | "BM" | "BT" | "BO" | "BA" | "BW" | "BV" | "BR" | "IO" | "BN" | "BG" | "BF" | "BI" | "KH" | "CM" | "CA" | "CV" | "KY" | "CF" | "TD" | "CL" | "CN" | "CX" | "CC" | "CO" | "KM" | "CG" | "CD" | "CK" | "CR" | "CI" | "HR" | "CU" | "CY" | "CZ" | "DK" | "DJ" | "DM" | "DO" | "EC" | "EG" | "SV" | "GQ" | "ER" | "EE" | "ET" | "FK" | "FO" | "FJ" | "FI" | "FR" | "GF" | "PF" | "TF" | "GA" | "GM" | "GE" | "DE" | "GH" | "GI" | "GR" | "GL" | "GD" | "GP" | "GU" | "GT" | "GG" | "GN" | "GW" | "GY" | "HT" | "HM" | "VA" | "HN" | "HK" | "HU" | "IS" | "IN" | "ID" | "IR" | "IQ" | "IE" | "IM" | "IL" | "IT" | "JM" | "JP" | "JE" | "JO" | "KZ" | "KE" | "KI" | "KR" | "KP" | "KW" | "KG" | "LA" | "LV" | "LB" | "LS" | "LR" | "LY" | "LI" | "LT" | "LU" | "MO" | "MK" | "MG" | "MW" | "MY" | "MV" | "ML" | "MT" | "MH" | "MQ" | "MR" | "MU" | "YT" | "MX" | "FM" | "MD" | "MC" | "MN" | "ME" | "MS" | "MA" | "MZ" | "MM" | "NA" | "NR" | "NP" | "NL" | "AN" | "NC" | "NZ" | "NI" | "NE" | "NG" | "NU" | "NF" | "MP" | "NO" | "OM" | "PK" | "PW" | "PS" | "PA" | "PG" | "PY" | "PE" | "PH" | "PN" | "PL" | "PT" | "PR" | "QA" | "RE" | "RO" | "RU" | "RW" | "BL" | "SH" | "KN" | "LC" | "MF" | "PM" | "VC" | "WS" | "SM" | "ST" | "SA" | "SN" | "RS" | "SC" | "SL" | "SG" | "SK" | "SI" | "SB" | "SO" | "ZA" | "GS" | "ES" | "LK" | "SD" | "SR" | "SJ" | "SZ" | "SE" | "CH" | "SY" | "TW" | "TJ" | "TZ" | "TH" | "TL" | "TG" | "TK" | "TO" | "TT" | "TN" | "TR" | "TM" | "TC" | "TV" | "UG" | "UA" | "AE" | "GB" | "US" | "UM" | "UY" | "UZ" | "VU" | "VE" | "VN" | "VG" | "VI" | "WF" | "EH" | "YE" | "ZM" | "ZW">;

package/schema/CountrySchema.js

@@ -0,0 +1,26 @@
+import { COUNTRIES, getCountry } from "../util/country.js";
+import { isProp } from "../util/object.js";
+import { ChoiceSchema } from "./ChoiceSchema.js";
+import { NULLABLE } from "./NullableSchema.js";
+/** Schema that validates an ISO country code. */
+export class CountrySchema extends ChoiceSchema {
+    defaultValue;
+    constructor({ one = "country", title = "Country", value = "detect", ...options } = {}) {
+        super({ one, title, options: COUNTRIES, value: value === "detect" ? "GB" : value, ...options });
+        this.defaultValue = value;
+    }
+    validate(unsafeValue = this.defaultValue) {
+        const country = getCountry(unsafeValue);
+        if (country)
+            return super.validate(country);
+        if (unsafeValue === undefined || unsafeValue === null || unsafeValue === "" || unsafeValue === "detect")
+            throw "Required";
+        if (typeof unsafeValue === "string" && isProp(COUNTRIES, unsafeValue.toUpperCase()))
+            return super.validate(unsafeValue.toUpperCase());
+        return super.validate(unsafeValue);
+    }
+}
+/** Valid country code, e.g. `GB` (required because falsy values are invalid). */
+export const COUNTRY = new CountrySchema({});
+/** Valid country code, e.g. `GB`, or `null` */
+export const NULLABLE_COUNTRY = NULLABLE(COUNTRY);

package/schema/DataSchema.d.ts

@@ -6,7 +6,6 @@ import type { SchemaOptions, Schemas } from "./Schema.js";
 import { Schema } from "./Schema.js";
 /** Allowed options for `PropsSchema` (a schema that has props). */
 export interface DataSchemaOptions<T extends Data> extends SchemaOptions {
-    readonly id?: Schema<string>;
     readonly props: Schemas<T>;
     readonly value?: Partial<T> | undefined;
 }
@@ -16,7 +15,9 @@ export declare class DataSchema<T extends Data> extends Schema<unknown> {
     readonly props: Schemas<T>;
     constructor({ one, title, props, value: partialValue, ...options }: DataSchemaOptions<T>);
     validate(unsafeValue?: unknown): T;
+    /** Make a new `DataSchema` that only uses a defined subset of the current props. */
     pick<K extends Key<T>>(...keys: K[]): DataSchema<Pick<T, K>>;
+    /** Make a new `DataSchema` that omits one or more of the current props. */
     omit<K extends Key<T>>(...keys: K[]): DataSchema<Omit<T, K>>;
 }
 /** Set of named data schemas. */

package/schema/DataSchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { isData } from "../util/data.js";
 import { omitProps, pickProps } from "../util/object.js";
 import { mapProps } from "../util/transform.js";
@@ -17,12 +16,14 @@ export class DataSchema extends Schema {
     }
     validate(unsafeValue = this.value) {
         if (!isData(unsafeValue))
-            throw new ValueFeedback("Must be object", unsafeValue);
+            throw "Must be object";
         return validateData(unsafeValue, this.props);
     }
+    /** Make a new `DataSchema` that only uses a defined subset of the current props. */
     pick(...keys) {
         return new DataSchema({ ...this, props: pickProps(this.props, ...keys) });
     }
+    /** Make a new `DataSchema` that omits one or more of the current props. */
     omit(...keys) {
         return new DataSchema({ ...this, props: omitProps(this.props, ...keys) });
     }

package/schema/DateSchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { getDate, requireDateString } from "../util/date.js";
 import { formatDate } from "../util/format.js";
 import { roundStep } from "../util/number.js";
@@ -19,12 +18,12 @@ export class DateSchema extends Schema {
     validate(value = this.value) {
         const date = getDate(value);
         if (!date)
-            throw new ValueFeedback(value ? "Invalid date" : "Required", value);
+            throw value ? "Invalid date" : "Required";
         const rounded = typeof this.step === "number" ? new Date(roundStep(date.getTime(), this.step)) : date;
         if (this.min && rounded < this.min)
-            throw new ValueFeedback(`Minimum ${this.format(this.min)}`, rounded);
+            throw `Minimum ${this.format(this.min)}`;
         if (this.max && rounded > this.max)
-            throw new ValueFeedback(`Maximum ${this.format(this.max)}`, rounded);
+            throw `Maximum ${this.format(this.max)}`;
         return this.stringify(rounded);
     }
     stringify(value) {

package/schema/DictionarySchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { isDictionary } from "../util/dictionary.js";
 import { validateDictionary } from "../util/validate.js";
 import { Schema } from "./Schema.js";
@@ -15,13 +14,13 @@ export class DictionarySchema extends Schema {
     }
     validate(unsafeValue = this.value) {
         if (!isDictionary(unsafeValue))
-            throw new ValueFeedback("Must be object", unsafeValue);
+            throw "Must be object";
         const validDictionary = validateDictionary(unsafeValue, this.items);
         const length = Object.keys(validDictionary).length;
         if (length < this.min)
-            throw new ValueFeedback(length ? `Minimum ${this.min} ${this.many}` : "Required", validDictionary);
+            throw length ? `Minimum ${this.min} ${this.many}` : "Required";
         if (length > this.max)
-            throw new ValueFeedback(`Maximum ${this.max} ${this.many}`, validDictionary);
+            throw `Maximum ${this.max} ${this.many}`;
         return validDictionary;
     }
 }

package/schema/EntitySchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { isArrayItem } from "../util/array.js";
 import { getEntity } from "../util/entity.js";
 import { NULLABLE } from "./NullableSchema.js";
@@ -14,9 +13,9 @@ export class EntitySchema extends StringSchema {
         const entity = super.validate(unsafeValue);
         const [type] = getEntity(entity);
         if (!type)
-            throw new ValueFeedback("Must be entity", unsafeValue);
+            throw "Must be entity";
         if (this.types && !isArrayItem(this.types, type))
-            throw new ValueFeedback("Invalid entity type", type);
+            throw "Invalid entity type";
         return entity;
     }
 }

package/schema/FileSchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { getFileExtension } from "../util/file.js";
 import { isProp } from "../util/object.js";
 import { NULLABLE } from "./NullableSchema.js";
@@ -14,9 +13,9 @@ export class FileSchema extends StringSchema {
         const path = super.validate(unsafeValue);
         const extension = getFileExtension(path);
         if (!extension)
-            throw new ValueFeedback("Must be file name with extension", unsafeValue);
+            throw "Must be file name with extension";
         if (this.types && !isProp(this.types, extension))
-            throw new ValueFeedback("Invalid file type", extension);
+            throw "Invalid file type";
         return path;
     }
 }

package/schema/NumberSchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { formatNumber } from "../util/format.js";
 import { getNumber, roundStep } from "../util/number.js";
 import { NULLABLE } from "./NullableSchema.js";
@@ -17,12 +16,12 @@ export class NumberSchema extends Schema {
     validate(unsafeValue = this.value) {
         const optionalNumber = getNumber(unsafeValue);
         if (typeof optionalNumber !== "number")
-            throw new ValueFeedback("Must be number", unsafeValue);
+            throw "Must be number";
         const roundedNumber = typeof this.step === "number" ? roundStep(optionalNumber, this.step) : optionalNumber;
         if (roundedNumber < this.min)
-            throw new ValueFeedback(!optionalNumber ? "Required" : `Minimum ${formatNumber(this.min)}`, roundedNumber);
+            throw !optionalNumber ? "Required" : `Minimum ${formatNumber(this.min)}`;
         if (roundedNumber > this.max)
-            throw new ValueFeedback(`Maximum ${formatNumber(this.max)}`, roundedNumber);
+            throw `Maximum ${formatNumber(this.max)}`;
         return roundedNumber;
     }
 }

package/schema/RequiredSchema.d.ts

@@ -1,6 +1,6 @@
 import type { Schema } from "./Schema.js";
 import { ThroughSchema } from "./ThroughSchema.js";
-/** Validate a value of a specifed type, but throw `Feedback` if the validated value is falsy. */
+/** Validate a value of a specifed type, but throw `"Required"` if the validated value is falsy. */
 export declare class RequiredSchema<T> extends ThroughSchema<T> {
     validate(unsafeValue: unknown): T;
 }

package/schema/RequiredSchema.js

@@ -1,11 +1,10 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { ThroughSchema } from "./ThroughSchema.js";
-/** Validate a value of a specifed type, but throw `Feedback` if the validated value is falsy. */
+/** Validate a value of a specifed type, but throw `"Required"` if the validated value is falsy. */
 export class RequiredSchema extends ThroughSchema {
     validate(unsafeValue) {
         const safeValue = super.validate(unsafeValue);
         if (!safeValue)
-            throw new ValueFeedback("Required", safeValue);
+            throw "Required";
         return safeValue;
     }
 }

package/schema/StringSchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { sanitizeMultilineText, sanitizeText } from "../util/string.js";
 import { NULLABLE } from "./NullableSchema.js";
 import { Schema } from "./Schema.js";
@@ -36,14 +35,14 @@ export class StringSchema extends Schema {
     validate(unsafeValue = this.value) {
         const possibleString = typeof unsafeValue === "number" ? unsafeValue.toString() : unsafeValue;
         if (typeof possibleString !== "string")
-            throw new ValueFeedback("Must be string", unsafeValue);
+            throw "Must be string";
         const saneString = this.sanitize(possibleString);
         if (saneString.length < this.min)
-            throw new ValueFeedback(possibleString.length ? `Minimum ${this.min} characters` : "Required", saneString);
+            throw possibleString.length ? `Minimum ${this.min} characters` : "Required";
         if (saneString.length > this.max)
-            throw new ValueFeedback(`Maximum ${this.max} characters`, saneString);
+            throw `Maximum ${this.max} characters`;
         if (this.match && !this.match.test(saneString))
-            throw new ValueFeedback(saneString ? "Invalid format" : "Required", saneString);
+            throw saneString ? "Invalid format" : "Required";
         return saneString;
     }
     /** Sanitize the string by removing unwanted characters. */

package/schema/URISchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { getURI, HTTP_SCHEMES } from "../util/uri.js";
 import { NULLABLE } from "./NullableSchema.js";
 import { StringSchema } from "./StringSchema.js";
@@ -26,9 +25,9 @@ export class URISchema extends StringSchema {
         const str = super.validate(unsafeValue);
         const uri = getURI(str);
         if (!uri)
-            throw new ValueFeedback(str ? "Invalid format" : "Required", str);
+            throw str ? "Invalid format" : "Required";
         if (this.schemes && !this.schemes.includes(uri.protocol))
-            throw new ValueFeedback("Invalid URI scheme", str);
+            throw "Invalid URI scheme";
         return uri.href;
     }
 }

package/schema/URLSchema.js

@@ -1,4 +1,3 @@
-import { ValueFeedback } from "../feedback/Feedback.js";
 import { HTTP_SCHEMES } from "../util/uri.js";
 import { getURL } from "../util/url.js";
 import { NULLABLE } from "./NullableSchema.js";
@@ -29,9 +28,9 @@ export class URLSchema extends StringSchema {
         const str = super.validate(unsafeValue);
         const url = getURL(str, this.base);
         if (!url)
-            throw new ValueFeedback(str ? "Invalid format" : "Required", str);
+            throw str ? "Invalid format" : "Required";
         if (this.schemes && !this.schemes.includes(url.protocol))
-            throw new ValueFeedback("Invalid URL scheme", str);
+            throw "Invalid URL scheme";
         return url.href;
     }
 }

package/schema/index.d.ts

@@ -1,7 +1,9 @@
+export * from "./AddressSchema.js";
 export * from "./ArraySchema.js";
 export * from "./BooleanSchema.js";
 export * from "./ChoiceSchema.js";
 export * from "./ColorSchema.js";
+export * from "./CountrySchema.js";
 export * from "./DataSchema.js";
 export * from "./DateSchema.js";
 export * from "./DateTimeSchema.js";

package/schema/index.js

@@ -1,7 +1,9 @@
+export * from "./AddressSchema.js";
 export * from "./ArraySchema.js";
 export * from "./BooleanSchema.js";
 export * from "./ChoiceSchema.js";
 export * from "./ColorSchema.js";
+export * from "./CountrySchema.js";
 export * from "./DataSchema.js";
 export * from "./DateSchema.js";
 export * from "./DateTimeSchema.js";

package/util/address.d.ts

@@ -0,0 +1,12 @@
+import { type Country } from "./country.js";
+/** Valid shape for postal address data. */
+export type AddressData = {
+    readonly address1: string;
+    readonly address2: string;
+    readonly city: string;
+    readonly state: string;
+    readonly postcode: string;
+    readonly country: Country;
+};
+/** Format address lines into a printable string. */
+export declare function formatAddress({ address1, address2, city, state, postcode, country }: AddressData): string;

package/util/address.js

@@ -0,0 +1,5 @@
+import { formatCountry } from "./country.js";
+/** Format address lines into a printable string. */
+export function formatAddress({ address1, address2, city, state, postcode, country }) {
+    return `${address1}\n${address2 ? `${address2}\n` : ""}${city}\n${state}\n${postcode}\n${formatCountry(country)}`;
+}

package/util/array.d.ts

@@ -105,6 +105,10 @@ export declare function countArray<T>(arr: ImmutableArray<T>): number;
 /** Interleave array items with a separator */
 export declare function interleaveArray<T>(items: PossibleArray<T>, separator: T): ImmutableArray<T>;
 export declare function interleaveArray<A, B>(items: PossibleArray<A>, separator: B): ImmutableArray<A | B>;
+/** Return a new array with a new value replacing a specific index in the array (or the same array if the value was unchanged). */
+export declare function withArrayIndex<T>(arr: ImmutableArray<T>, index: number, value: T): ImmutableArray<T>;
+/** Return a new array without a specific index in the array (or the same array if the value was unchanged). */
+export declare function omitArrayIndex<T>(arr: ImmutableArray<T>, index: number): ImmutableArray<T>;
 /** Get the first item from an array or iterable, or `undefined` if it didn't exist. */
 export declare function getFirst<T>(items: PossibleArray<T>): T | undefined;
 /** Get the first item from an array or iterable. */

package/util/array.js

@@ -124,6 +124,17 @@ export function interleaveArray(items, separator) {
         return items; // Return same empty array if empty or only one item.
     return Array.from(interleaveItems(items, separator));
 }
+/** Return a new array with a new value replacing a specific index in the array (or the same array if the value was unchanged). */
+export function withArrayIndex(arr, index, value) {
+    if (arr[index] === value)
+        return arr;
+    return [...arr.slice(0, index), value, ...arr.slice(index + 1)];
+}
+/** Return a new array without a specific index in the array (or the same array if the value was unchanged). */
+export function omitArrayIndex(arr, index) {
+    const output = [...arr.slice(0, index), ...arr.slice(index + 1)];
+    return arr.length !== output.length ? output : arr;
+}
 /** Get the first item from an array or iterable, or `undefined` if it didn't exist. */
 export function getFirst(items) {
     if (isArray(items))