@neeloong/form 0.27.0 → 0.28.0

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
-* @neeloong/form v0.27.0
+* @neeloong/form v0.28.0
 * (c) 2024-2026 Fierflame
 * @license Apache-2.0
 */
@@ -410,6 +410,31 @@ type Ref = {
     [k: string]: Ref | undefined;
 };
 
+/** @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>}
+ */
+declare class BindObjectStore<T = any, M = any, S extends {
+    [x: string]: Schema.State;
+} = {
+    [x: string]: Schema.State;
+}> extends Store<T, M, S> {
+    /**
+     * @param {Schema<any, Object.<string, Schema.State>>} schema 数据结构模式
+     * @param {Store<T, M, S>} store
+     */
+    constructor(schema: Schema<any, {
+        [x: string]: Schema.State;
+    }>, store: Store<T, M, S>);
+    [Symbol.iterator](): Generator<[string, Store<any, any, {
+        [x: string]: Schema.State;
+    }>], void, unknown>;
+    #private;
+}
+
 /** @import { Ref } from './ref.mjs' */
 /** @import { Schema } from '../Schema.types.mjs' */
 /** @import { StoreLayout } from '../StoreLayout.types.mjs' */
@@ -450,7 +475,7 @@ declare class Store<T = any, M = any, S extends {
         new (...p: ConstructorParameters<typeof Store>): Store;
     }): void;
     /**
-     * @param {Schema.Field<M, S>} schema 字段的 Schema 定义
+     * @param {Schema.Field<M, S> | Store<T,M,S>} schema 字段的 Schema 定义
      * @param {object} [options] 可选配置
      * @param {Store?} [options.parent]
      * @param {Partial<S>?} [options.states]
@@ -486,7 +511,7 @@ declare class Store<T = any, M = any, S extends {
      *
      * @param {((value: T?, index: any, store: Store) => void)?} [options.onUpdate]
      */
-    constructor(schema: Schema.Field<M, S>, { 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 }?: {
+    constructor(schema: Schema.Field<M, S> | Store<T, M, S>, { 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 }?: {
         parent?: Store<any, any, {
             [x: string]: Schema.State;
         }> | null | undefined;
@@ -540,11 +565,13 @@ declare class Store<T = any, M = any, S extends {
         convert?: ((value: any) => any) | null | undefined;
         onUpdate?: ((value: T | null, index: any, store: Store) => void) | null | undefined;
     });
+    get schema(): Schema.Field<M, S>;
     /**
      * 触发事件并通知监听器
      * @template {keyof Schema.Events} K
      * @param {K} event
      * @param  {Schema.Events[K]} value
+     * @returns {boolean}
      */
     emit<K extends keyof Schema.Events>(event: K, value: Schema.Events[K]): boolean;
     /**
@@ -560,7 +587,6 @@ declare class Store<T = any, M = any, S extends {
     /** 存储类类别，继承的自定义类需要设置自定义的此只读属性 */
     get kind(): string;
     get ref(): Ref;
-    schema: Schema.Field<M, S>;
     get states(): S | null;
     get layout(): StoreLayout.Field<any>;
     /** @param {any} [value] @returns {any} */
@@ -700,17 +726,19 @@ declare class Store<T = any, M = any, S extends {
      * @template [M=any]
      * @template {Object.<string, Schema.State>} [S=Object.<string, Schema.State>]
      * @param {Schema<M, S>} schema 数据结构模式
+     * @param {AbortSignal} [signal]
+     * @returns {BindObjectStore}
      */
     bindObject<M_1 = any, S_1 extends {
         [x: string]: Schema.State;
     } = {
         [x: string]: Schema.State;
-    }>(schema: Schema<M_1, S_1>): () => void;
+    }>(schema: Schema<M_1, S_1>, signal?: AbortSignal): BindObjectStore;
+    /** 内容是否已改变 */
+    get changed(): boolean;
     set value(v: T | null);
     /** 字段当前值 */
     get value(): T | null;
-    /** 内容是否已改变 */
-    get changed(): boolean;
     /** 重置数据 */
     reset(value?: unknown, isNew?: boolean): void;
     /**

package/index.full.js

@@ -1,5 +1,5 @@
 /*!
-* @neeloong/form v0.27.0
+* @neeloong/form v0.28.0
 * (c) 2024-2026 Fierflame
 * @license Apache-2.0
 */
@@ -716,7 +716,7 @@
 
 
   /** @type {{new(...p: ConstructorParameters<typeof Store>): Store}?} */
-  let ObjectStore$1 = null;
+  let ObjectStore$2 = 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$1) { Class = ObjectStore$1; }
+  		if (ObjectStore$2) { Class = ObjectStore$2; }
   	}
   	return new Class(schema, options);
   }
 
   /** @param {{new(...p: ConstructorParameters<typeof Store>): Store}} Class */
   function setObjectStore(Class) {
-  	ObjectStore$1 = Class;
+  	ObjectStore$2 = Class;
   }
 
   /** @param {{new(...p: ConstructorParameters<typeof Store>): ArrayStore}} Class */
@@ -870,6 +870,52 @@
   	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' */
@@ -881,6 +927,12 @@
    * @template {Object.<string, Schema.State>} [S=Object.<string, Schema.State>]
    */
   class Store {
+  	/** @type {Store<T, M, S>?} */
+  	#originStore = null;
+
+  	/** @type {Schema.Field<M, S>}  字段的 Schema 定义 */
+  	#schema;
+  	get schema() { return this.#schema; }
   	/** @type {Map<string, Set<(value: any, store: any) => void | boolean | null>>} */
   	#events = new Map();
   	/**
@@ -888,8 +940,11 @@
   	 * @template {keyof Schema.Events} K
   	 * @param {K} event 
   	 * @param  {Schema.Events[K]} value 
+  	 * @returns {boolean}
   	 */
   	emit(event, value) {
+  		const originStore = this.#originStore;
+  		if (originStore) { return originStore.emit(event, value); }
   		const key = typeof event === 'number' ? String(event) : event;
   		const events = this.#events;
   		let canceled = false;
@@ -906,6 +961,8 @@
   	 * @returns {() => void}
   	 */
   	listen(event, listener) {
+  		const originStore = this.#originStore;
+  		if (originStore) { return originStore.listen(event, p => listener.call(this, p, this)); }
   		const fn = listener.bind(this);
   		const events = this.#events;
   		const key = typeof event === 'number' ? String(event) : event;
@@ -946,7 +1003,7 @@
   	#ref = null;
   	get ref() { return this.#ref || createRef(this); }
   	/**
-  	 * @param {Schema.Field<M, S>} schema 字段的 Schema 定义
+  	 * @param {Schema.Field<M, S> | Store<T,M,S>} schema 字段的 Schema 定义
   	 * @param {object} [options] 可选配置
   	 * @param {Store?} [options.parent] 
   	 * @param {Partial<S>?} [options.states] 
@@ -990,7 +1047,74 @@
   		hidden, clearable, required, disabled, readonly, removable,
   		label, description, placeholder, min, max, step, minLength, maxLength, pattern, values: values$1
   	} = {}) {
-  		this.schema = schema;
+  		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;
+  			return;
+  		}
+  		this.#schema = schema;
   		const parent = parentNode instanceof Store ? parentNode : null;
   		if (parent) {
   			this.#parent = parent;
@@ -1118,6 +1242,7 @@
   	/** @type {StoreLayout.Field<any>} */
   	#layout;
   	get layout() { return this.#layout; }
+  	/** @type {(value?: any) => unknown} */
   	#createDefault;
   	/** @param {any} [value] @returns {any} */
   	createDefault(value) { return this.#createDefault(value); }
@@ -1399,40 +1524,26 @@
   	#initValue = new exports.Signal.State(/** @type {T?} */(null));
   	#value = new exports.Signal.State(this.#initValue.get());
 
+  	/** @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) {
-  		const bindStores = this.#bindStores;
-  		/** @type {Store[]} */
-  		const list = [];
-  		for (const [index, field] of Object.entries(schema)) {
-  			const bindStore = create(field, {
-  				index, parent: this,
-  				/** @param {*} value @param {*} currentIndex @param {Store} store */
-  				onUpdate: (value, currentIndex, store) => {
-  					if (index !== currentIndex) { return; }
-  					if (bindStores.has(store)) { return; }
-  					const val = this.#value ?? null;
-  					if (typeof val !== 'object' || Array.isArray(val)) { return }
-  					// @ts-ignore
-  					this.value = { ...val, [currentIndex]: value };
-  				},
-  			});
-  			list.push(bindStore);
-  			bindStores.set(bindStore, index);
-  		}
+  	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 () => {
-  			for (const bindStore of list) {
-  				bindStores.delete(bindStore);
-  			}
-  		};
+  		return store;
   	}
-  	/** @type {Map<Store, string>} */
-  	#bindStores = new Map();
 
   	/** 内容是否已改变 */
   	get changed() { return !Object.is(this.#value.get(), this.#initValue.get()); }
@@ -1440,6 +1551,8 @@
   	/** 字段当前值 */
   	get value() { return this.#value.get(); }
   	set value(v) {
+  		const originStore = this.#originStore;
+  		if (originStore) { originStore.value = v; return; }
   		const newValue = this.#setValue?.(v);
   		const val = newValue === undefined ? v : newValue;
   		this.#value.set(val);
@@ -1460,6 +1573,8 @@
   	}
   	/** 重置数据 */
   	reset(value = this.#set ? this.#initValue.get() : this.#createDefault(), isNew = this.#selfNew.get()) {
+  		const originStore = this.#originStore;
+  		if (originStore) { originStore.reset(value, isNew); return; }
   		this.#reset(value, Boolean(isNew));
   	}
   	/**
@@ -1476,11 +1591,10 @@
   		this.#cancelBlur();
   		this.#set = true;
   		if (!value || typeof value !== 'object') {
-  			for (const [, field] of this) {
-  				field.#reset(null, false);
-  			}
-  			for (const [field] of this.#bindStores) {
-  				field.#reset(null, false);
+  			for (const bind of [this, ...this.#subBindStores]) {
+  				for (const [, field] of bind) {
+  					field.#reset(null, false);
+  				}
   			}
   			this.#value.set(value);
   			this.#initValue.set(value);
@@ -1489,11 +1603,10 @@
   		}
   		/** @type {*} */
   		const newValues = Array.isArray(value) ? [...value] : { ...value };
-  		for (const [key, field] of this) {
-  			newValues[key] = field.#reset(Object.hasOwn(newValues, key) ? newValues[key] : undefined, false);
-  		}
-  		for (const [field, key] of this.#bindStores) {
-  			newValues[key] = field.#reset(Object.hasOwn(newValues, key) ? newValues[key] : undefined, false);
+  		for (const bind of [this, ...this.#subBindStores]) {
+  			for (const [key, field] of bind) {
+  				newValues[key] = field.#reset(Object.hasOwn(newValues, key) ? newValues[key] : undefined, false);
+  			}
   		}
   		this.#value.set(newValues);
   		this.#initValue.set(newValues);
@@ -1527,23 +1640,16 @@
   			// @ts-ignore
   			let newValues = Array.isArray(val) ? [...val] : { ...val };
   			let updated = false;
-  			for (const [key, field] of this) {
-  				// @ts-ignore
-  				const data = Object.hasOwn(val, key) ? val[key] : undefined;
-  				const newData = field.#toUpdate(data);
-  				if (Object.is(data, newData)) { continue; }
-  				// @ts-ignore
-  				newValues[key] = newData;
-  				updated = true;
-  			}
-  			for (const [field, key] of this.#bindStores) {
-  				// @ts-ignore
-  				const data = Object.hasOwn(val, key) ? val[key] : undefined;
-  				const newData = field.#toUpdate(data);
-  				if (Object.is(data, newData)) { continue; }
-  				// @ts-ignore
-  				newValues[key] = newData;
-  				updated = true;
+  			for (const bind of [this,...this.#subBindStores]) {
+  				for (const [key, field] of bind) {
+  					// @ts-ignore
+  					const data = Object.hasOwn(val, key) ? val[key] : undefined;
+  					const newData = field.#toUpdate(data);
+  					if (Object.is(data, newData)) { continue; }
+  					// @ts-ignore
+  					newValues[key] = newData;
+  					updated = true;
+  				}
   			}
   			if (updated) {
   				val = newValues;
@@ -1577,6 +1683,7 @@
   	 */
   	validate(path) {
   		if (path === true) {
+  			if (this.#originStore) { return Promise.resolve(null); }
   			return Promise.all([this.#validatorResult.get(), this.#changed(), this.#blurred()])
   				.then(v => {
   					const errors = v.flat();
@@ -1584,7 +1691,7 @@
   				});
   		}
   		const selfPath = Array.isArray(path) ? path : [];
-  		if (this.#hidden.get()) { return Promise.resolve([]); }
+  		if (!this.#originStore && this.#hidden.get()) { return Promise.resolve([]); }
   		const list = [this.validate(true).then(errors => {
   			if (!errors?.length) { return []; }
   			return [{ path: [...selfPath], store: /** @type {Store} */(this), errors }];
@@ -1592,8 +1699,8 @@
   		for (const [key, field] of this) {
   			list.push(field.validate([...selfPath, key]));
   		}
-  		for (const [field, key] of this.#bindStores) {
-  			list.push(field.validate([...selfPath, key]));
+  		for (const sub of this.#subBindStores) {
+  			list.push(sub.validate(selfPath));
   		}
   		return Promise.all(list).then(v => v.flat());
   	}
@@ -1607,7 +1714,7 @@
    * @template {Object.<string, Schema.State>} [S=Object.<string, Schema.State>]
    * @extends {Store<T, M, S>}
    */
-  class ObjectStore extends Store {
+  let ObjectStore$1 = class ObjectStore extends Store {
   	get kind() { return 'object'; }
   	/** @type {Record<string, Store>} */
   	#children;
@@ -1660,9 +1767,9 @@
   		}
   		this.#children = children;
   	}
-  }
+  };
   // @ts-ignore
-  setObjectStore(ObjectStore);
+  setObjectStore(ObjectStore$1);
 
   /** @import { Schema } from '../Schema.types.mjs' */
 
@@ -5332,7 +5439,7 @@
   		if (list instanceof ArrayStore) {
   			return renderArray(parent, next, list, env, r, layout.sort);
   		}
-  		if (list instanceof ObjectStore) {
+  		if (list instanceof ObjectStore$1) {
   			return renderObject(parent, next, list, env, r, layout.sort);
   		}
   		if (typeof list === 'function') {
@@ -7066,7 +7173,7 @@
 
   exports.ArrayStore = ArrayStore;
   exports.Layout = index;
-  exports.ObjectStore = ObjectStore;
+  exports.ObjectStore = ObjectStore$1;
   exports.Store = Store;
   exports.effect = effect;
   exports.render = render;