shelving 1.158.2 → 1.159.0

package/package.json

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

package/schema/ArraySchema.d.ts

@@ -39,7 +39,7 @@ export interface ArraySchemaOptions<T> extends SchemaOptions {
  *  schema.validate(["a", null], schema); // Throws Invalids({ "1": Invalid('Must be a string') });
  */
 export declare class ArraySchema<T> extends Schema<ImmutableArray<T>> {
-    readonly value: ImmutableArray;
+    readonly value: ImmutableArray<T>;
     readonly one: string;
     readonly many: string;
     readonly items: Schema<T>;

package/schema/DataSchema.d.ts

@@ -11,9 +11,9 @@ export interface DataSchemaOptions<T extends Data> extends SchemaOptions {
 }
 /** Validate a data object. */
 export declare class DataSchema<T extends Data> extends Schema<unknown> {
-    readonly value: Partial<T>;
+    readonly value: T;
     readonly props: Schemas<T>;
-    constructor({ props, title, value, ...options }: DataSchemaOptions<T>);
+    constructor({ props, title, value: partialValue, ...options }: DataSchemaOptions<T>);
     validate(unsafeValue?: unknown): T;
 }
 /** Set of named data schemas. */

package/schema/DataSchema.js

@@ -8,7 +8,9 @@ import { Schema } from "./Schema.js";
 /** Validate a data object. */
 export class DataSchema extends Schema {
     props;
-    constructor({ props, title = "Data", value = {}, ...options }) {
+    constructor({ props, title = "Data", value: partialValue, ...options }) {
+        // Build default value from props and partial value.
+        const value = { ...mapProps(props, _getSchemaValue), ...partialValue };
         super({ title, value, ...options });
         this.props = props;
     }
@@ -18,6 +20,9 @@ export class DataSchema extends Schema {
         return validateData(unsafeValue, this.props);
     }
 }
+function _getSchemaValue([, { value }]) {
+    return value;
+}
 /** Create a `DataSchema` for a set of properties. */
 export const DATA = (props) => new DataSchema({ props });
 /** Valid data object with specifed properties, or `null` */

package/schema/DictionarySchema.d.ts

@@ -12,7 +12,7 @@ export interface DictionarySchemaOptions<T> extends SchemaOptions {
 }
 /** Validate a dictionary object (whose props are all the same with string keys). */
 export declare class DictionarySchema<T> extends Schema<ImmutableDictionary<T>> {
-    readonly value: ImmutableDictionary;
+    readonly value: ImmutableDictionary<T>;
     readonly one: string;
     readonly many: string;
     readonly items: Schema<T>;

package/util/sequence.d.ts

@@ -15,3 +15,5 @@ export declare function repeatDelay(ms: number): AsyncIterable<number>;
 export declare function callSequence<T>(sequence: AsyncIterable<T>, callback: AsyncValueCallback<T>): AsyncIterable<T>;
 /** Pull values from a sequence until the returned function is called. */
 export declare function runSequence<T>(sequence: AsyncIterable<T>, onNext?: ValueCallback<T>, onError?: ErrorCallback): StopCallback;
+/** Merge several sequences (calls the sequences in series). */
+export declare function mergeSequences<T>(...sequences: AsyncIterable<T>[]): AsyncIterable<T>;

package/util/sequence.js

@@ -71,3 +71,8 @@ async function _runSequence(sequence, stopped, onNext, onError) {
     // Continue iteration.
     return _runSequence(sequence, stopped, onNext, onError);
 }
+/** Merge several sequences (calls the sequences in series). */
+export async function* mergeSequences(...sequences) {
+    for await (const sequence of sequences)
+        yield* sequence;
+}