shelving 1.185.1 → 1.185.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "shelving",
-	"version": "1.185.1",
+	"version": "1.185.2",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"repository": {
 		"type": "git",

package/schema/ChoiceSchema.d.ts

@@ -20,7 +20,7 @@ export interface ChoiceSchemaOptions<K extends string> extends Omit<SchemaOption
 }
 /** Choose from an allowed set of values. */
 export declare class ChoiceSchema<K extends string> extends Schema<K> implements Iterable<ChoiceOption<K>> {
-    readonly value: K;
+    readonly value: K | undefined;
     readonly options: ChoiceOptions<K>;
     constructor({ one, title, placeholder, options, value, ...rest }: ChoiceSchemaOptions<K>);
     validate(unsafeValue?: unknown): K;

package/schema/ChoiceSchema.js

@@ -1,4 +1,4 @@
-import { isArray, requireFirst } from "../util/array.js";
+import { isArray } from "../util/array.js";
 import { getKeys, getProps, isProp } from "../util/object.js";
 import { Schema } from "./Schema.js";
 /** Get the options for a choice field as an array. */
@@ -19,14 +19,14 @@ export function isOption(options, option) {
 /** Choose from an allowed set of values. */
 export class ChoiceSchema extends Schema {
     options;
-    constructor({ one = "choice", title = "Choice", placeholder = `No ${one}`, options, value = requireFirst(isArray(options) ? options : getKeys(options)), ...rest }) {
+    constructor({ one = "choice", title = "Choice", placeholder = `No ${one}`, options, value, ...rest }) {
         super({ one, title, value, placeholder, ...rest });
         this.options = options;
     }
     validate(unsafeValue = this.value) {
         if (typeof unsafeValue === "string" && isOption(this.options, unsafeValue))
             return unsafeValue;
-        throw "Unknown value";
+        throw unsafeValue ? "Unknown value" : "Required";
     }
     // Implement iterable.
     *[Symbol.iterator]() {