@neeloong/form 0.29.0 → 0.30.0

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
-* @neeloong/form v0.29.0
+* @neeloong/form v0.30.0
 * (c) 2024-2026 Fierflame
 * @license Apache-2.0
 */
@@ -201,79 +201,127 @@ function toResult(v) {
 /**
  * 
  * @param {Store} store 
- * @param  {...Schema.Validator | undefined | null | (Schema.Validator | undefined | null)[]} validators 
+ * @param {Schema.SyncValidator[]} syncValidators 
  * @returns 
  */
-function createValidator(store, ...validators) {
-	const allValidators = validators.flat().filter(v => typeof v === 'function');
-	if (!allValidators.length) {
-		return new Signal.Computed(() => /** @type {string[]} */([]));
-	}
+function createSyncValidator(store, syncValidators) {
 	return new Signal.Computed(() => {
 		const results = [];
-		for (const validator of allValidators) {
+		for (const item of syncValidators) {
 			try {
-				results.push(validator(store));
-			} catch (e){
+				results.push(item(store));
+			} catch (e) {
 				results.push(e);
 			}
 		}
 		return results.flat().map(toResult).filter(Boolean);
-	})
+	});
 }
+
 /**
  * 
  * @param {Store} store 
- * @param  {...Schema.AsyncValidator | undefined | null | (Schema.AsyncValidator | undefined | null)[]} validators 
- * @returns {[exec: () => Promise<string[]>, state: Signal.Computed<string[]>, stop: () => void]}
+ * @param {Map<string, Schema.AsyncValidator[]>} eventsValidators 
+ * @returns {[Record<string, () => Promise<string[]>>, results: Signal.State<string[]>[], stop: () => void]}
  */
-function createAsyncValidator(store, ...validators) {
-	const allValidators = validators.flat().filter(v => typeof v === 'function');
-	if (!allValidators.length) {
-		return [
-			()=>Promise.resolve([]),
-			new Signal.Computed(() => /** @type {string[]} */([])),
-			() => {}
-		];
-	}
-	const st = new Signal.State(/** @type {string[]} */([]));
-	/**
-	 * 
-	 * @param {Schema.AsyncValidator} validator 
-	 * @param {AbortSignal} signal 
-	 */
-	async function run(validator, signal) {
-		let results = [];
-		try {
-			results.push(await validator(store, signal));
-		} catch (e){
-			results.push(e);
+function createEventsValidator(store, eventsValidators) {
+	/** @type {Record<string, () => Promise<string[]>>} */
+	const eventExecMap = {};
+	/** @type {(() => void)[]} */
+	const allCancels = [];
+	/** @type {Signal.State<string[]>[]} */
+	const results = [];
+	for (const [name, validators] of eventsValidators) {
+		const st = new Signal.State(/** @type {string[]} */([]));
+		/**
+		 * 
+		 * @param {Schema.AsyncValidator} validator 
+		 * @param {AbortSignal} signal 
+		 */
+		async function run(validator, signal) {
+			let results = [];
+			try {
+				results.push(await validator(store, signal));
+			} catch (e) {
+				results.push(e);
+			}
+			const list = results.flat().map(toResult).filter(Boolean);
+			if (!signal.aborted && list.length) { st.set([...st.get(), ...list]); }
+			return list;
 		}
-		const list = results.flat().map(toResult).filter(Boolean);
-		if (!signal.aborted && list.length) { st.set([...st.get(), ...list]); }
-		return list;
+		/** @type {AbortController?} */
+		let ac = null;
+		function exec() {
+			ac?.abort();
+			ac = new AbortController();
+			const signal = ac.signal;
+			st.set([]);
+
+			return Promise.all(validators.map(f => run(f, signal))).then(v => v.flat());
+		}
+		eventExecMap[name] = exec;
+		allCancels.push(() => { ac?.abort(); st.set([]); });
+		results.push(st);
 	}
-	/** @type {AbortController?} */
-	let ac = null;
-	function exec() {
-		ac?.abort();
-		ac = new AbortController();
-		const signal = ac.signal;
-		st.set([]);
-		
-		return Promise.all(allValidators.map(f => run(f, signal))).then(v => v.flat());
-	}
-	return [exec, new Signal.Computed(() => st.get()), () => {ac?.abort(); st.set([]);}]
+
+	function stop() {
+		for (const c of allCancels) {
+			c();
+		}
+
+	}
+
+	return [eventExecMap, results, stop];
 }
 
 /**
  * 
- * @param  {...Signal.Computed<string[]>} v 
- * @returns 
+ * @param {Store} store 
+ * @param  {...Schema.Validator | undefined | null | (Schema.Validator | undefined | null)[]} validators 
+ * @returns {[exec: () => Promise<string[]>, Record<string, () => Promise<string[]>>, state: Signal.Computed<string[]>, stop: () => void]}
  */
-function merge(...v) {
-	const list = /** @type {Signal.Computed<string[]>[]} */(v.filter(Boolean));
-	return new Signal.Computed(() => list.flatMap(v => v.get()));
+function createValidator(store, ...validators) {
+
+	/** @type {Schema.SyncValidator[]} */
+	const syncValidators = [];
+	/** @type {Map<string, Schema.AsyncValidator[]>} */
+	const eventsValidators = new Map();
+	for (const v of validators.flat()) {
+		if (!v) { continue; }
+		if (typeof v === 'function') {
+			syncValidators.push(v);
+			continue;
+		}
+		const { event, validator } = v;
+		if (typeof validator !== 'function') { continue; }
+		if (typeof event !== 'string') {
+			syncValidators.push(validator);
+			continue;
+		}
+		const list = eventsValidators.get(event);
+		if (list) {
+			list.push(validator);
+		} else {
+			eventsValidators.set(event, [validator]);
+		}
+	}
+
+
+	const validatorResult = syncValidators.length
+		? createSyncValidator(store, syncValidators)
+		: new Signal.Computed(() => /** @type {string[]} */([]));
+	if (!eventsValidators.size) {
+		return [() => Promise.resolve(validatorResult.get()), {}, validatorResult, () => {}];
+	}
+
+	const [eventExecMap, results, stop] = createEventsValidator(store, eventsValidators);
+
+	const errors = new Signal.Computed(() => [validatorResult, ...results].flatMap(v => v.get()));
+	const execAll = () => Promise.all([
+		validatorResult.get(),
+		...Object.values(eventExecMap).map(exec => exec()),
+	]).then(v => v.flat());
+	return [execAll, eventExecMap, errors, stop];
 }
 
 /** @import Store from './Store.mjs' */
@@ -332,10 +380,25 @@ class Store {
 	/**
 	 * 监听事件
 	 * @template {keyof Schema.Events} K
+	 * @overload
 	 * @param {K} event 
 	 * @param  {(this: this, p: Schema.Events[K], store: this) => void | boolean | null} listener
 	 * @returns {() => void}
 	 */
+	/**
+	 * 监听事件
+	 * @template {keyof Schema.Events} K
+	 * @overload
+	 * @param {string} event 
+	 * @param  {(this: this, p: unknown, store: this) => void | boolean | null} listener
+	 * @returns {() => void}
+	 */
+	/**
+	 * 监听事件
+	 * @param {string} event 
+	 * @param  {(this: this, p: unknown, store: this) => void | boolean | null} listener
+	 * @returns {() => void}
+	 */
 	listen(event, listener) {
 		const originStore = this.#originStore;
 		if (originStore) { return originStore.listen(event, p => listener.call(this, p, this)); }
@@ -385,73 +448,70 @@ class Store {
 	constructor(schema, options) {
 		if (schema instanceof Store) {
 			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;
+			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.#execValidators = store.#execValidators;
+			this.#cancelEventValidator = store.#cancelEventValidator;
+			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;
+			const subBindStores = store.#subBindStores;
 			subBindStores.add(this);
 			signal?.addEventListener('abort', () => subBindStores.delete(this));
 			store.#requestUpdate();
@@ -459,8 +519,7 @@ class Store {
 		}
 		const {
 			null: isNull, ref, default: defaultValue,
-			setValue, convert, onUpdate, states,
-			validator, validators,
+			setValue, convert, onUpdate, states, validator,
 			index, size, new: isNew, parent: parentNode,
 			hidden, clearable, required, disabled, readonly, removable,
 			label, description, placeholder, min, max, step, minLength, maxLength, pattern, values: values$1
@@ -535,9 +594,6 @@ class Store {
 
 		[this.#selfRemovable, this.#removable] = createBooleanStates(this, removable, schema.removable ?? true);
 
-		const validatorResult = createValidator(this, schema.validator, validator);
-
-
 		const schemaStates = schema.states;
 		this.#states = schemaStates ? Object.defineProperties(Object.create(null),
 			Object.fromEntries(
@@ -553,16 +609,13 @@ class Store {
 				})
 			)) : null;
 
-		const [changed, changedResult, cancelChange] = createAsyncValidator(this, schema.validators?.change, validators?.change);
-		const [blurred, blurredResult, cancelBlur] = createAsyncValidator(this, schema.validators?.blur, validators?.blur);
-		this.listen('change', () => { changed(); });
-		this.listen('blur', () => { blurred(); });
-		this.#errors = merge(validatorResult, changedResult, blurredResult);
-		this.#validatorResult = validatorResult;
-		this.#changed = changed;
-		this.#blurred = blurred;
-		this.#cancelChange = cancelChange;
-		this.#cancelBlur = cancelBlur;
+		const [execValidators, eventExecMap, errors, cancelEventValidator] = createValidator(this, schema.validator, validator);
+		for (const [name, exec] of Object.entries(eventExecMap)) {
+			this.listen(name, () => { exec(); });
+		}
+		this.#errors = errors;
+		this.#execValidators = execValidators;
+		this.#cancelEventValidator = cancelEventValidator;
 
 		if (size instanceof Signal.State || size instanceof Signal.Computed) {
 			this.#size = size;
@@ -847,16 +900,10 @@ class Store {
 
 	/** @type {Signal.Computed<string[]>} */
 	#errors;
-	/** @type {Signal.Computed<string[]>} */
-	#validatorResult;
 	/** @type {() => Promise<string[]>} */
-	#changed;
-	/** @type {() => Promise<string[]>} */
-	#blurred;
-	/** @type {() => void} */
-	#cancelChange;
+	#execValidators;
 	/** @type {() => void} */
-	#cancelBlur;
+	#cancelEventValidator;
 	/** 所有校验错误列表 */
 	get errors() { return this.#errors.get(); }
 	/** 字段校验错误信息 */
@@ -920,8 +967,7 @@ class Store {
 		this.#selfNew.set(isNew);
 		const newValue = this.#setValue?.(v);
 		const value = newValue === undefined ? v : newValue;
-		this.#cancelChange();
-		this.#cancelBlur();
+		this.#cancelEventValidator();
 		this.#set = true;
 		if (!value || typeof value !== 'object') {
 			for (const bind of [this, ...this.#subBindStores]) {
@@ -1017,11 +1063,7 @@ class Store {
 	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();
-					return errors.length ? errors : null;
-				});
+			return this.#execValidators().then(errors => errors.length ? errors : null);
 		}
 		const selfPath = Array.isArray(path) ? path : [];
 		if (!this.#originStore && this.#hidden.get()) { return Promise.resolve([]); }
@@ -1069,7 +1111,6 @@ class Store {
  * @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]
  * 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neeloong/form",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "description": "一个基于响应式数据绑定的表单渲染库",
   "keywords": [
     "from",