@neeloong/form 0.28.0 → 0.29.0

package/index.full.js

@@ -1,5 +1,5 @@
 /*!
-* @neeloong/form v0.28.0
+* @neeloong/form v0.29.0
 * (c) 2024-2026 Fierflame
 * @license Apache-2.0
 */
@@ -716,7 +716,7 @@
 
 
   /** @type {{new(...p: ConstructorParameters<typeof Store>): Store}?} */
-  let ObjectStore$2 = null;
+  let ObjectStore$1 = null;
   /** @type {{new(...p: ConstructorParameters<typeof Store>): ArrayStore}?} */
   let ArrayStoreClass = null;
   /** @type {Record<string, {new(...p: ConstructorParameters<typeof Store>): Store}?>} */
@@ -741,14 +741,14 @@
   		const C = TypeStores[type];
   		if (C) { Class = C; }
   	} else if (type && typeof type === 'object') {
-  		if (ObjectStore$2) { Class = ObjectStore$2; }
+  		if (ObjectStore$1) { Class = ObjectStore$1; }
   	}
   	return new Class(schema, options);
   }
 
   /** @param {{new(...p: ConstructorParameters<typeof Store>): Store}} Class */
   function setObjectStore(Class) {
-  	ObjectStore$2 = Class;
+  	ObjectStore$1 = Class;
   }
 
   /** @param {{new(...p: ConstructorParameters<typeof Store>): ArrayStore}} Class */
@@ -870,52 +870,6 @@
   	return (value) => structuredClone(def(store, value));
   }
 
-  /** @import { Schema } from '../Schema.types.mjs' */
-
-  /**
-   * @template [T=any]
-   * @template [M=any]
-   * @template {Object.<string, Schema.State>} [S=Object.<string, Schema.State>]
-   * @extends {Store<T, M, S>}
-   */
-  class BindObjectStore extends Store {
-
-  	get kind() { return 'object'; }
-  	/** @type {Record<string, Store>} */
-  	#children = Object.create(null);
-  	*[Symbol.iterator]() { yield* Object.entries(this.#children); }
-  	/**
-  	 * 
-  	 * @param {string | number} key 
-  	 * @returns {Store?}
-  	 */
-  	child(key) { return this.#children[key] || null; }
-  	/**
-  	 * @param {Schema<any, Object.<string, Schema.State>>} schema 数据结构模式
-  	 * @param {Store<T, M, S>} store
-  	 */
-  	constructor(schema, store) {
-  		super(store);
-  		const children = this.#children;
-  		for (const [index, field] of Object.entries(schema)) {
-  			const bindStore = create(field, {
-  				index, parent: this,
-  				/** @param {*} value @param {*} index @param {Store} store */
-  				onUpdate: (value, index, store) => {
-  					if (store !== children[index]) { return; }
-  					const val = this.value ?? null;
-  					if (typeof val !== 'object' || Array.isArray(val)) { return; }
-  					// @ts-ignore
-  					this.value = { ...val, [index]: value };
-  				},
-  			});
-  			children[index] = bindStore;
-  		}
-  	}
-  }
-  // @ts-ignore
-  setObjectStore(ObjectStore);
-
   /** @import { Ref } from './ref.mjs' */
   /** @import { Schema } from '../Schema.types.mjs' */
   /** @import { StoreLayout } from '../StoreLayout.types.mjs' */
@@ -1004,116 +958,91 @@
   	get ref() { return this.#ref || createRef(this); }
   	/**
   	 * @param {Schema.Field<M, S> | Store<T,M,S>} schema 字段的 Schema 定义
-  	 * @param {object} [options] 可选配置
-  	 * @param {Store?} [options.parent] 
-  	 * @param {Partial<S>?} [options.states] 
-  	 * @param {((store: Store, value?: any) => any) | object | number | string | boolean | null | undefined} [options.default]
-  	 * @param {number | string | null} [options.index] 
-  	 * @param {number | Signal.State<number> | Signal.Computed<number>} [options.size] 
-  	 * @param {boolean} [options.null] 
-  	 * @param {boolean} [options.new] 
-  	 * @param {boolean} [options.hidden] 
-  	 * @param {boolean} [options.clearable] 
-  	 * @param {boolean} [options.required] 
-  	 * @param {boolean} [options.disabled] 
-  	 * @param {boolean} [options.readonly] 
-  	 * @param {boolean} [options.removable] 
-  	 * 
-  	 * @param {string} [options.label] 字段标签
-  	 * @param {string} [options.description] 字段描述
-  	 * @param {string} [options.placeholder] 占位符
-  	 * @param {number} [options.min] 日期、时间、数字的最小值
-  	 * @param {number} [options.max] 日期、时间、数字的最大值
-  	 * @param {number} [options.step] 日期、时间、数字的步长
-  	 * @param {number} [options.minLength] 
-  	 * @param {number} [options.maxLength] 
-  	 * @param {RegExp} [options.pattern] 
-  	 * @param {(Schema.Value.Group | Schema.Value | string | number)[]} [options.values] 可选值
-  	 * @param {Schema.Validator | Schema.Validator[] | null} [options.validator]
-  	 * @param {{[k in keyof Schema.Events]?: Schema.AsyncValidator | Schema.AsyncValidator[] | null}} [options.validators]
-  	 * 
-  	 * @param {Ref?} [options.ref]
-  	 * 
-  	 * @param {((value: any) => any)?} [options.setValue] 
-  	 * @param {((value: any) => any)?} [options.convert] 
-  	 * 
-  	 * @param {((value: T?, index: any, store: Store) => void)?} [options.onUpdate] 
+  	 * @param {StoreOptions | AbortSignal | null} [options] 可选配置
   	 */
-  	constructor(schema, {
-  		null: isNull, ref, default: defaultValue,
-  		setValue, convert, onUpdate, states,
-  		validator, validators,
-  		index, size, new: isNew, parent: parentNode,
-  		hidden, clearable, required, disabled, readonly, removable,
-  		label, description, placeholder, min, max, step, minLength, maxLength, pattern, values: values$1
-  	} = {}) {
+  	constructor(schema, options) {
   		if (schema instanceof Store) {
-  			this.#originStore = schema;
-  			this.#schema = schema.#schema;
-  			this.#null = schema.#null;
-  			this.#ref = schema.#ref;
-  			this.#states = schema.#states;
-  			this.#layout = schema.#layout;
-  			this.#createDefault = schema.#createDefault;
-  			this.#setValue = schema.#setValue;
-  			this.#convert = schema.#convert;
-  			this.#onUpdate = schema.#onUpdate;
-  			this.#parent = schema.#parent;
-  			this.#root = schema.#root;
-  			this.#type = schema.#type;
-  			this.#meta = schema.#meta;
-  			this.#component = schema.#component;
-  			this.#selfLoading = schema.#selfLoading;
-  			this.#loading = schema.#loading;
-  			this.#size = schema.#size;
-  			this.#index = schema.#index;
-  			this.#creatable = schema.#creatable;
-  			this.#immutable = schema.#immutable;
-  			this.#new = schema.#new;
-  			this.#selfNew = schema.#selfNew;
-  			this.#selfHidden = schema.#selfHidden;
-  			this.#hidden = schema.#hidden;
-  			this.#selfClearable = schema.#selfClearable;
-  			this.#clearable = schema.#clearable;
-  			this.#selfRequired = schema.#selfRequired;
-  			this.#required = schema.#required;
-  			this.#selfDisabled = schema.#selfDisabled;
-  			this.#disabled = schema.#disabled;
-  			this.#selfReadonly = schema.#selfReadonly;
-  			this.#readonly = schema.#readonly;
-  			this.#selfRemovable = schema.#selfRemovable;
-  			this.#removable = schema.#removable;
-  			this.#selfLabel = schema.#selfLabel;
-  			this.#label = schema.#label;
-  			this.#selfDescription = schema.#selfDescription;
-  			this.#description = schema.#description;
-  			this.#selfPlaceholder = schema.#selfPlaceholder;
-  			this.#placeholder = schema.#placeholder;
-  			this.#selfMin = schema.#selfMin;
-  			this.#min = schema.#min;
-  			this.#selfMax = schema.#selfMax;
-  			this.#max = schema.#max;
-  			this.#selfStep = schema.#selfStep;
-  			this.#step = schema.#step;
-  			this.#selfMinLength = schema.#selfMinLength;
-  			this.#minLength = schema.#minLength;
-  			this.#selfMaxLength = schema.#selfMaxLength;
-  			this.#maxLength = schema.#maxLength;
-  			this.#selfPattern = schema.#selfPattern;
-  			this.#pattern = schema.#pattern;
-  			this.#selfValues = schema.#selfValues;
-  			this.#values = schema.#values;
-  			this.#errors = schema.#errors;
-  			this.#validatorResult = schema.#validatorResult;
-  			this.#changed = schema.#changed;
-  			this.#blurred = schema.#blurred;
-  			this.#cancelChange = schema.#cancelChange;
-  			this.#cancelBlur = schema.#cancelBlur;
-  			this.#set = schema.#set;
-  			this.#initValue = schema.#initValue;
-  			this.#value = schema.#value;
+  			const store = schema.#originStore || schema;
+  			this.#originStore= store;
+  			this.#schema= store.#schema;
+  			this.#null= store.#null;
+  			this.#ref= store.#ref;
+  			this.#states= store.#states;
+  			this.#layout= store.#layout;
+  			this.#createDefault= store.#createDefault;
+  			this.#setValue= store.#setValue;
+  			this.#convert= store.#convert;
+  			this.#onUpdate= store.#onUpdate;
+  			this.#parent= store.#parent;
+  			this.#root= store.#root;
+  			this.#type= store.#type;
+  			this.#meta= store.#meta;
+  			this.#component= store.#component;
+  			this.#selfLoading= store.#selfLoading;
+  			this.#loading= store.#loading;
+  			this.#size= store.#size;
+  			this.#index= store.#index;
+  			this.#creatable= store.#creatable;
+  			this.#immutable= store.#immutable;
+  			this.#new= store.#new;
+  			this.#selfNew= store.#selfNew;
+  			this.#selfHidden= store.#selfHidden;
+  			this.#hidden= store.#hidden;
+  			this.#selfClearable= store.#selfClearable;
+  			this.#clearable= store.#clearable;
+  			this.#selfRequired= store.#selfRequired;
+  			this.#required= store.#required;
+  			this.#selfDisabled= store.#selfDisabled;
+  			this.#disabled= store.#disabled;
+  			this.#selfReadonly= store.#selfReadonly;
+  			this.#readonly= store.#readonly;
+  			this.#selfRemovable= store.#selfRemovable;
+  			this.#removable= store.#removable;
+  			this.#selfLabel= store.#selfLabel;
+  			this.#label= store.#label;
+  			this.#selfDescription= store.#selfDescription;
+  			this.#description= store.#description;
+  			this.#selfPlaceholder= store.#selfPlaceholder;
+  			this.#placeholder= store.#placeholder;
+  			this.#selfMin= store.#selfMin;
+  			this.#min= store.#min;
+  			this.#selfMax= store.#selfMax;
+  			this.#max= store.#max;
+  			this.#selfStep= store.#selfStep;
+  			this.#step= store.#step;
+  			this.#selfMinLength= store.#selfMinLength;
+  			this.#minLength= store.#minLength;
+  			this.#selfMaxLength= store.#selfMaxLength;
+  			this.#maxLength= store.#maxLength;
+  			this.#selfPattern= store.#selfPattern;
+  			this.#pattern= store.#pattern;
+  			this.#selfValues= store.#selfValues;
+  			this.#values= store.#values;
+  			this.#errors= store.#errors;
+  			this.#validatorResult= store.#validatorResult;
+  			this.#changed= store.#changed;
+  			this.#blurred= store.#blurred;
+  			this.#cancelChange= store.#cancelChange;
+  			this.#cancelBlur= store.#cancelBlur;
+  			this.#set= store.#set;
+  			this.#initValue= store.#initValue;
+  			this.#value= store.#value;
+  			const signal = options instanceof AbortSignal ? options : null;
+  			if (signal?.aborted) { return; }
+  			const subBindStores= store.#subBindStores;
+  			subBindStores.add(this);
+  			signal?.addEventListener('abort', () => subBindStores.delete(this));
+  			store.#requestUpdate();
   			return;
   		}
+  		const {
+  			null: isNull, ref, default: defaultValue,
+  			setValue, convert, onUpdate, states,
+  			validator, validators,
+  			index, size, new: isNew, parent: parentNode,
+  			hidden, clearable, required, disabled, readonly, removable,
+  			label, description, placeholder, min, max, step, minLength, maxLength, pattern, values: values$1
+  		} = !(options instanceof AbortSignal) && options || {};
   		this.#schema = schema;
   		const parent = parentNode instanceof Store ? parentNode : null;
   		if (parent) {
@@ -1526,24 +1455,6 @@
 
   	/** @type {Set<Store>} */
   	#subBindStores = new Set();
-  	/**
-  	 * @template [M=any]
-  	 * @template {Object.<string, Schema.State>} [S=Object.<string, Schema.State>]
-  	 * @param {Schema<M, S>} schema 数据结构模式
-  	 * @param {AbortSignal} [signal]
-  	 * @returns {BindObjectStore}
-  	 */
-  	bindObject(schema, signal) {
-  		const originStore = this.#originStore;
-  		if (originStore) { return originStore.bindObject(schema, signal); }
-  		const store = new BindObjectStore(schema, this);
-  		if (signal?.aborted) { return store; }
-  		const subBindStores = this.#subBindStores;
-  		subBindStores.add(store);
-  		signal?.addEventListener('abort', () => subBindStores.delete(store));
-  		this.#requestUpdate();
-  		return store;
-  	}
 
   	/** 内容是否已改变 */
   	get changed() { return !Object.is(this.#value.get(), this.#initValue.get()); }
@@ -1640,7 +1551,7 @@
   			// @ts-ignore
   			let newValues = Array.isArray(val) ? [...val] : { ...val };
   			let updated = false;
-  			for (const bind of [this,...this.#subBindStores]) {
+  			for (const bind of [this, ...this.#subBindStores]) {
   				for (const [key, field] of bind) {
   					// @ts-ignore
   					const data = Object.hasOwn(val, key) ? val[key] : undefined;
@@ -1706,6 +1617,46 @@
   	}
   }
 
+  /**
+   * @template [T=any]
+   * @template [M=any]
+   * @template {Object.<string, Schema.State>} [S=Object.<string, Schema.State>]
+   * @typedef {object} StoreOptions
+   * @property {Store?} [parent] 
+   * @property {Partial<S>?} [states] 
+   * @property {((store: Store, value?: any) => any) | object | number | string | boolean | null | undefined} [default]
+   * @property {number | string | null} [index] 
+   * @property {number | Signal.State<number> | Signal.Computed<number>} [size] 
+   * @property {boolean} [null] 
+   * @property {boolean} [new] 
+   * @property {boolean} [hidden] 
+   * @property {boolean} [clearable] 
+   * @property {boolean} [required] 
+   * @property {boolean} [disabled] 
+   * @property {boolean} [readonly] 
+   * @property {boolean} [removable] 
+   * 
+   * @property {string} [label] 字段标签
+   * @property {string} [description] 字段描述
+   * @property {string} [placeholder] 占位符
+   * @property {number} [min] 日期、时间、数字的最小值
+   * @property {number} [max] 日期、时间、数字的最大值
+   * @property {number} [step] 日期、时间、数字的步长
+   * @property {number} [minLength] 
+   * @property {number} [maxLength] 
+   * @property {RegExp} [pattern] 
+   * @property {(Schema.Value.Group | Schema.Value | string | number)[]} [values] 可选值
+   * @property {Schema.Validator | Schema.Validator[] | null} [validator]
+   * @property {{[k in keyof Schema.Events]?: Schema.AsyncValidator | Schema.AsyncValidator[] | null}} [validators]
+   * 
+   * @property {Ref?} [ref]
+   * 
+   * @property {((value: any) => any)?} [setValue] 
+   * @property {((value: any) => any)?} [convert] 
+   * 
+   * @property {((value: T?, index: any, store: Store) => void)?} [onUpdate] 
+   */
+
   /** @import { Schema } from '../Schema.types.mjs' */
 
   /**
@@ -1714,7 +1665,7 @@
    * @template {Object.<string, Schema.State>} [S=Object.<string, Schema.State>]
    * @extends {Store<T, M, S>}
    */
-  let ObjectStore$1 = class ObjectStore extends Store {
+  class ObjectStore extends Store {
   	get kind() { return 'object'; }
   	/** @type {Record<string, Store>} */
   	#children;
@@ -1767,9 +1718,9 @@
   		}
   		this.#children = children;
   	}
-  };
+  }
   // @ts-ignore
-  setObjectStore(ObjectStore$1);
+  setObjectStore(ObjectStore);
 
   /** @import { Schema } from '../Schema.types.mjs' */
 
@@ -2011,6 +1962,51 @@
   // @ts-ignore
   setArrayStore(ArrayStore);
 
+  /** @import { Schema } from '../Schema.types.mjs' */
+
+  /**
+   * @template [T=any]
+   * @template [M=any]
+   * @template {Object.<string, Schema.State>} [S=Object.<string, Schema.State>]
+   * @extends {Store<T, M, S>}
+   */
+  class BindObjectStore extends Store {
+
+  	get kind() { return 'object'; }
+  	/** @type {Record<string, Store>} */
+  	#children = Object.create(null);
+  	*[Symbol.iterator]() { yield* Object.entries(this.#children); }
+  	/**
+  	 * 
+  	 * @param {string | number} key 
+  	 * @returns {Store?}
+  	 */
+  	child(key) { return this.#children[key] || null; }
+  	/**
+  	 * @param {Schema<any, Object.<string, Schema.State>>} schema 数据结构模式
+  	 * @param {Store<T, M, S>} store
+  	 * @param {AbortSignal} [signal]
+  	 */
+  	constructor(schema, store, signal) {
+  		super(store, signal);
+  		const children = this.#children;
+  		for (const [index, field] of Object.entries(schema)) {
+  			const bindStore = create(field, {
+  				index, parent: this,
+  				/** @param {*} value @param {*} index @param {Store} store */
+  				onUpdate: (value, index, store) => {
+  					if (store !== children[index]) { return; }
+  					const val = this.value ?? null;
+  					if (typeof val !== 'object' || Array.isArray(val)) { return; }
+  					// @ts-ignore
+  					this.value = { ...val, [index]: value };
+  				},
+  			});
+  			children[index] = bindStore;
+  		}
+  	}
+  }
+
   /** @import * as Layout from './index.mjs' */
 
   /** @import { OldNode } from './createElement.mjs' */
@@ -5439,7 +5435,7 @@
   		if (list instanceof ArrayStore) {
   			return renderArray(parent, next, list, env, r, layout.sort);
   		}
-  		if (list instanceof ObjectStore$1) {
+  		if (list instanceof ObjectStore) {
   			return renderObject(parent, next, list, env, r, layout.sort);
   		}
   		if (typeof list === 'function') {
@@ -7172,8 +7168,9 @@
   }
 
   exports.ArrayStore = ArrayStore;
+  exports.BindObjectStore = BindObjectStore;
   exports.Layout = index;
-  exports.ObjectStore = ObjectStore$1;
+  exports.ObjectStore = ObjectStore;
   exports.Store = Store;
   exports.effect = effect;
   exports.render = render;