shelving 1.94.0 → 1.95.0

package/package.json

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

package/schema/OptionalSchema.d.ts

@@ -1,12 +1,14 @@
-import type { Schema } from "./Schema.js";
+import type { Schema, SchemaOptions } from "./Schema.js";
 import { ThroughSchema } from "./ThroughSchema.js";
+/** Allowed options for `OptionalSchema` */
+export type OptionalSchemaOptions<T> = SchemaOptions & {
+    readonly source: Schema<T>;
+    readonly value?: T | null;
+};
 /** Validate a value of a specific type or `null`. */
 export declare class OptionalSchema<T> extends ThroughSchema<T | null> {
     readonly value: T | null;
-    constructor(options: ConstructorParameters<typeof Schema>[0] & {
-        source: Schema<T>;
-        value?: T | null;
-    });
+    constructor(options: OptionalSchemaOptions<T>);
     validate(unsafeValue?: unknown): T | null;
 }
 /** Create a new optional schema from a source schema. */

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 return `Feedback` if the validated value is falsy. */
+/** Validate a value of a specifed type, but throw `Feedback` if the validated value is falsy. */
 export declare class RequiredSchema<T> extends ThroughSchema<T> {
     validate(unsafeValue: unknown): T;
 }

package/schema/RequiredSchema.js

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

package/schema/ThroughSchema.js

@@ -2,8 +2,9 @@ import { Schema } from "./Schema.js";
 /** Schema that passes through to a source schema. */
 export class ThroughSchema extends Schema {
     constructor(options) {
-        super(options);
-        this.source = options.source;
+        const source = options.source;
+        super({ ...source, ...options });
+        this.source = source;
     }
     validate(unsafeValue) {
         return this.source.validate(unsafeValue);