shelving 1.196.1 → 1.196.3

package/package.json

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

package/schema/AddressSchema.js

@@ -5,8 +5,8 @@ import { NULLABLE } from "./NullableSchema.js";
 import { StringSchema } from "./StringSchema.js";
 export { formatAddress };
 const ADDRESS_PROPS = {
-    address1: new StringSchema({ title: "Address 1", max: 60, min: 1 }),
-    address2: new StringSchema({ title: "Address 2", max: 60, min: 0 }),
+    address1: new StringSchema({ title: "Address", max: 60, min: 1 }),
+    address2: new StringSchema({ title: undefined, max: 60, min: 0 }),
     city: new StringSchema({ title: "City", min: 1, max: 60 }),
     state: new StringSchema({ title: "State", min: 0, max: 60 }),
     postcode: new StringSchema({ title: "Postcode", min: 1, max: 12, case: "upper" }),

package/store/BusyStore.d.ts

@@ -1,12 +1,12 @@
 import { BooleanStore } from "./BooleanStore.js";
-import { Store } from "./Store.js";
+import { Store, type StoreInput } from "./Store.js";
 /**
  * Store that tracks its busy status via a separate `this.busy` store.
  * - "busy" means the store is awaiting a new value.
  */
 export declare class BusyStore<T, TT = T> extends Store<T, TT> {
     readonly busy: BooleanStore;
-    await(pending: PromiseLike<TT>): Promise<boolean>;
+    await(pending: PromiseLike<StoreInput<TT>>): Promise<boolean>;
     abort(): void;
     [Symbol.asyncDispose](): Promise<void>;
 }

package/store/FetchStore.d.ts

@@ -1,8 +1,8 @@
 import { type NONE } from "../util/constants.js";
 import { BusyStore } from "./BusyStore.js";
-import type { StoreInput } from "./Store.js";
+import type { AsyncStoreInput, StoreInput } from "./Store.js";
 /** Callback for a callback fetch store. */
-export type FetchCallback<T> = (signal: AbortSignal) => T | PromiseLike<T>;
+export type FetchCallback<T> = (signal: AbortSignal) => StoreInput<T> | PromiseLike<StoreInput<T>>;
 /**
  * Store that fetches its values from a remote source.
  *
@@ -35,7 +35,7 @@ export declare class FetchStore<T, TT = T> extends BusyStore<T, TT> {
      * Call the fetch callback to get the next value.
      * @param signal `AbortSignal` for the current fetch — passed through to the callback so it can cancel HTTP requests etc.
      */
-    protected _fetch(signal: AbortSignal): TT | PromiseLike<TT>;
+    protected _fetch(signal: AbortSignal): AsyncStoreInput<TT>;
     private _callback;
     /** Whether this store is has currently been invalidated and needs a refresh. */
     get invalidated(): boolean;

package/store/Store.d.ts

@@ -6,12 +6,14 @@ import { type PossibleStarter } from "../util/start.js";
 export type AnyStore = Store<any, any>;
 /** Values that a store natively knows how to process as inputs. */
 export type StoreInput<I> = I | typeof SKIP | typeof NONE;
+/** Values that a store natively knows how to process as inputs. */
+export type AsyncStoreInput<I> = StoreInput<I> | PromiseLike<StoreInput<I>>;
 /** Internal storage value for a store. */
 export type StoreInternal<O> = O | typeof NONE;
 /** Callback that sets a store's value (possibly asynchronously). */
-export type StoreCallback<I, A extends Arguments = []> = (...args: A) => StoreInput<I> | PromiseLike<StoreInput<I>>;
+export type StoreCallback<I, A extends Arguments = []> = (...args: A) => AsyncStoreInput<I>;
 /** Reducer that receives a store's current value and sets the stores next value (possibly asynchronously). */
-export type StoreReducer<I, O, A extends Arguments = []> = (value: O, ...args: A) => StoreInput<I> | PromiseLike<StoreInput<I>>;
+export type StoreReducer<I, O, A extends Arguments = []> = (value: O, ...args: A) => AsyncStoreInput<I>;
 /**
  * Store that retains its most recent value and is async-iterable to allow values to be observed.
  * - Current value can be read at `store.value` and `store.data`
@@ -53,7 +55,7 @@ export declare class Store<T, TT = T> implements AsyncIterable<T, void, void>, A
      * - Setting value to the same as the existing value
      * - If this store has any pending `await()` calls they are aborted and their results are silently discarded.
      */
-    set value(input: StoreInput<TT> | PromiseLike<StoreInput<TT>>);
+    set value(input: AsyncStoreInput<TT>);
     /** Write a synchronous value to this store. */
     write(input: StoreInput<TT>): void;
     /**