@piying/view-angular-core 2.4.6 → 2.5.0

package/fesm2022/piying-view-angular-core.mjs

@@ -1,11 +1,13 @@
 import { signal, computed, InjectionToken, effect, inject, Injector, untracked, DestroyRef, linkedSignal, isSignal } from '@angular/core';
 import * as v from 'valibot';
+import { summarize } from 'valibot';
 import { isObservable, BehaviorSubject, Subject, tap, pipe, shareReplay, map, combineLatest, startWith, skip } from 'rxjs';
 import rfdc from 'rfdc';
 import { deepEqual } from 'fast-equals';
 import { createRawConfig, defineType, BaseSchemaHandle, convertSchema, convertCore } from '@piying/valibot-visit';
 export { asControl, asVirtualGroup, changeObject, condition, getDefaults, getSchemaByIssuePath, getSchemaMetadata } from '@piying/valibot-visit';
 import clsx from 'clsx';
+import { pick } from 'es-toolkit';
 
 function isPromise(obj) {
     return !!obj && typeof obj.then === 'function';
@@ -111,6 +113,15 @@ function toObservable(listen, source, options) {
     return subject.asObservable();
 }
 
+function computedWithPrev(computation, options) {
+    let previous;
+    return computed(() => {
+        const newValue = computation(previous);
+        previous = newValue;
+        return newValue;
+    }, options);
+}
+
 function shortCircuitTrue(value) {
     return value;
 }
@@ -130,8 +141,12 @@ class AbstractControl {
         (!this.selfDisabled$$() ||
             (this.selfDisabled$$() && this.config$().disabledValue === 'reserve')));
     injector;
+    originValue$$;
     /** model的value */
-    value$$;
+    value$$ = computedWithPrev((value) => {
+        const result = this.#schemaCheck$$();
+        return result.success ? result.output : value;
+    });
     /** 已激活的子级,用于校验获得返回值之类 */
     activatedChildren$$;
     /** 通用的子级,用于查询之类 */
@@ -180,22 +195,46 @@ class AbstractControl {
         if (disabled) {
             return undefined;
         }
+        // 请求同级
         this.resetIndex$();
-        this.value$$();
-        const result = this.#validators$$().reduce((obj, item) => {
+        this.originValue$$();
+        const childrenResult = this.reduceChildren([], (child, value, key) => {
+            if ((!child.selfDisabled$$() ||
+                (child.selfDisabled$$() &&
+                    child.config$().disabledValue === 'reserve')) &&
+                child.errors) {
+                value.push({
+                    kind: 'descendant',
+                    key: key,
+                    metadata: child.errors,
+                    field: child,
+                });
+            }
+            return value;
+        });
+        if (childrenResult.length) {
+            return childrenResult;
+        }
+        const result = this.#validators$$().flatMap((item) => {
             const result = untracked(() => item(this));
-            if (result) {
-                obj = { ...obj, ...result };
+            if (!result) {
+                return [];
             }
-            return obj;
-        }, {});
+            if (Array.isArray(result)) {
+                return result;
+            }
+            return Object.entries(result).map(([key, value]) => ({
+                kind: key,
+                metadata: value,
+            }));
+        });
         const schemaResult = this.#schemaCheck$$();
         if (!schemaResult.success) {
-            return { ...result, valibot: schemaResult.issues };
+            return result.concat([
+                { kind: 'valibot', metadata: schemaResult.issues },
+            ]);
         }
-        return Object.keys(result).length
-            ? result
-            : undefined;
+        return result.length ? result : undefined;
     }, { equal: () => false }));
     asyncErrorRes$$ = computed(() => {
         const result = this.#asyncValidators$$();
@@ -203,24 +242,34 @@ class AbstractControl {
             return undefined;
         }
         this.resetIndex$();
-        this.value$$();
+        this.originValue$$();
         const dataList = result.map((item) => untracked(() => asyncValidatorToSignal(item(this))));
         return computed(() => {
             const params = dataList.map((item) => item());
             let pendingCount = 0;
-            const errorResult = params.reduce((obj, item) => {
+            const errorResult = params.flatMap((item) => {
                 if (item === ValidatorPending) {
                     pendingCount++;
-                    return obj;
+                    return [];
                 }
                 else if ('value' in item) {
-                    return { ...obj, ...item.value };
+                    const result = item.value;
+                    if (!result) {
+                        return [];
+                    }
+                    if (Array.isArray(result)) {
+                        return result;
+                    }
+                    return Object.entries(result).map(([key, value]) => ({
+                        kind: key,
+                        metadata: value,
+                    }));
                 }
                 else {
-                    return { ...obj, error: item.error };
+                    return { kind: 'error', metadata: item.error };
                 }
-            }, {});
-            if (!Object.keys(errorResult).length) {
+            });
+            if (!errorResult.length) {
                 if (pendingCount) {
                     return ValidatorPending;
                 }
@@ -259,7 +308,7 @@ class AbstractControl {
             return PENDING;
         }
         if (syncError && asyncError) {
-            return { ...syncError, ...asyncError };
+            return [...syncError, ...asyncError];
         }
         else if (syncError || asyncError) {
             return syncError || asyncError;
@@ -289,7 +338,7 @@ class AbstractControl {
         this.schemaParser = v.safeParser(rawSchema);
         this.context = this.injector.get(PI_CONTEXT_TOKEN);
     }
-    #schemaCheck$$ = computed(() => this.schemaParser(this.value$$()));
+    #schemaCheck$$ = computed(() => this.schemaParser(this.originValue$$()));
     setParent(parent) {
         this._parent = parent;
     }
@@ -366,7 +415,13 @@ class AbstractControl {
     getInitValue(value) {
         return value ?? this.config$().defaultValue;
     }
-    transfomerToModel$$ = computed(() => this.config$().transfomer?.toModel);
+    #transformer$$ = computed(() => this.config$().transfomer);
+    transformToModel(value, control) {
+        if (this.#transformer$$()) {
+            value = this.#transformer$$()?.toModel?.(value, control) ?? value;
+        }
+        return value;
+    }
     /** @internal */
     updateInitValue(value) { }
     find(name) {
@@ -380,14 +435,18 @@ class AbstractControl {
             return initialValue;
         }
         let value = initialValue;
-        for (const child of childrenMap) {
-            if (!child) {
+        const list = Object.entries(childrenMap);
+        const isArray = Array.isArray(childrenMap);
+        for (let index = 0; index < list.length; index++) {
+            if (!list[index][1]) {
                 continue;
             }
+            const key = isArray ? index : list[index][0];
+            const item = list[index][1];
             if (shortCircuit?.(value)) {
                 break;
             }
-            value = fn(child, value);
+            value = fn(item, value, key);
         }
         return value;
     }
@@ -436,7 +495,7 @@ class AbstractControl {
     /** 仅触发 updateOn: submit 时使用 */
     emitSubmit() {
         if (this.children$$) {
-            this.children$$().forEach((child) => {
+            Object.values(this.children$$()).forEach((child) => {
                 if (!child) {
                     return;
                 }
@@ -498,7 +557,7 @@ class FieldGroupbase extends AbstractControl {
         });
     }
     updateValue(value) {
-        if (deepEqual(value, this.value$$())) {
+        if (this.valid && deepEqual(value, this.value$$())) {
             return;
         }
         if (this.isUnChanged()) {
@@ -544,9 +603,9 @@ class FieldGroup extends FieldGroupbase {
         const returnResult = Object.keys(result).length
             ? result
             : this.emptyValue$$();
-        return this.transfomerToModel$$()?.(returnResult, this) ?? returnResult;
+        return this.transformToModel(returnResult, this);
     }
-    value$$ = computed(() => {
+    originValue$$ = computed(() => {
         if (this.updateOn$$() === 'submit') {
             this.submitIndex$();
             return untracked(() => this.#childUpdate());
@@ -562,7 +621,7 @@ class FieldGroup extends FieldGroupbase {
     get controls() {
         return this.#controls$$();
     }
-    children$$ = computed(() => Object.values(this.#controls$$()));
+    children$$ = computed(() => this.#controls$$());
     removeRestControl(key) {
         if (!this.resetControls$()[key]) {
             return;
@@ -632,7 +691,7 @@ class FieldControl extends AbstractControl {
         return this.modelValueToViewValueOrigin$$();
     }, { equal: () => false });
     /** modelValue + viewValue => modelValue */
-    value$$ = signal(undefined);
+    originValue$$ = signal(undefined);
     reset(formState = this.config$().defaultValue) {
         this.markAsPristine();
         this.markAsUntouched();
@@ -654,24 +713,7 @@ class FieldControl extends AbstractControl {
     #viewValueChange(value) {
         this.markAllAsDirty();
         this.#viewIndex++;
-        const toModel = this.config$?.().transfomer?.toModel;
-        const originValue = toModel ? toModel(value, this) : value;
-        const transfomered = this.schemaParser(originValue);
-        if (transfomered.success) {
-            this.value$$.set(transfomered.output);
-            this.syncError$.update((data) => {
-                if (data) {
-                    delete data['valibot'];
-                }
-                return data && Object.keys(data).length ? data : undefined;
-            });
-        }
-        else {
-            this.syncError$.update((data) => ({
-                ...data,
-                valibot: transfomered.issues,
-            }));
-        }
+        this.originValue$$.set(this.transformToModel(value, this));
     }
     /** view变更 */
     viewValueChange(value) {
@@ -686,17 +728,17 @@ class FieldControl extends AbstractControl {
         if (this.isUnChanged() || force) {
             value ??= this.getInitValue(value);
             this.modelValue$.set(value);
-            this.value$$.set(value);
+            this.originValue$$.set(value);
             this.#viewIndex++;
             this.viewIndex$.set(this.#viewIndex);
             this.resetIndex$.update((a) => a + 1);
             return;
         }
-        if (deepEqual(value, this.value$$())) {
+        if (this.valid && deepEqual(value, this.value$$())) {
             return;
         }
         this.modelValue$.set(value);
-        this.value$$.set(value);
+        this.originValue$$.set(value);
         this.viewIndex$.set(this.#viewIndex);
     }
     emitSubmit() {
@@ -709,7 +751,7 @@ class FieldControl extends AbstractControl {
     updateInitValue(value) {
         const initValue = this.getInitValue(value);
         this.modelValue$.set(initValue);
-        this.value$$.set(initValue);
+        this.originValue$$.set(value);
     }
 }
 
@@ -733,9 +775,9 @@ class FieldArray extends FieldGroupbase {
         });
         list = [...list, ...(this.resetValue$() ?? [])];
         const returnResult = list.length === 0 ? this.emptyValue$$() : list;
-        return this.transfomerToModel$$()?.(returnResult, this) ?? returnResult;
+        return this.transformToModel(returnResult, this);
     }
-    value$$ = computed(() => {
+    originValue$$ = computed(() => {
         if (this.updateOn$$() === 'submit') {
             this.submitIndex$();
             return untracked(() => this.#childUpdate());
@@ -808,9 +850,9 @@ class FieldLogicGroup extends FieldArray {
     activateControls$ = signal(undefined);
     #childUpdate() {
         const returnResult = this.getValue(false);
-        return this.transfomerToModel$$()?.(returnResult, this) ?? returnResult;
+        return this.transformToModel(returnResult, this);
     }
-    value$$ = computed(() => {
+    originValue$$ = computed(() => {
         if (this.updateOn$$() === 'submit') {
             this.submitIndex$();
             return untracked(() => this.#childUpdate());
@@ -856,7 +898,7 @@ class FieldLogicGroup extends FieldArray {
         return this.getValue(true);
     }
     updateValue(value) {
-        if (deepEqual(value, this.value$$())) {
+        if (this.valid && deepEqual(value, this.value$$())) {
             return;
         }
         if (this.isUnChanged()) {
@@ -932,7 +974,7 @@ key, formConfig$$, isRoot, injector) {
     }
     let control;
     if (isRoot) {
-        control = new FieldClass(field.sourceSchema, injector);
+        control = new FieldClass(field.checkSchema ?? field.sourceSchema, injector);
         if (isFieldLogicGroup(control)) {
             control.type.set(field.isLogicAnd ? 'and' : 'or');
         }
@@ -941,7 +983,7 @@ key, formConfig$$, isRoot, injector) {
     else {
         control = parentForm.get([key]);
         if (!control) {
-            control = new FieldClass(field.sourceSchema, injector);
+            control = new FieldClass(field.checkSchema ?? field.sourceSchema, injector);
             if (isFieldLogicGroup(control)) {
                 control.type.set(field.isLogicAnd ? 'and' : 'or');
             }
@@ -1127,26 +1169,51 @@ function initListen(input, control, injector, fn) {
     }, { injector });
 }
 
-function getDeepError(control) {
-    if (!control) {
+function errorItem(item, prefixList, list) {
+    if (item.kind === 'descendant') {
+        const item2 = item;
+        item2.metadata.forEach((child) => {
+            errorItem(child, prefixList.slice().concat(item2), list);
+        });
+    }
+    else {
+        list.push({
+            pathList: prefixList.map((item) => {
+                const parentField = item.field.parent;
+                if (parentField instanceof FieldLogicGroup) {
+                    return parentField.type() === 'and'
+                        ? `[∧${item.key}]`
+                        : `[∨${item.key}]`;
+                }
+                else if (parentField instanceof FieldArray) {
+                    return `[${item.key}]`;
+                }
+                else {
+                    return `${item.key}`;
+                }
+            }),
+            fieldList: prefixList.map((item) => item.field),
+            item: item,
+            get valibotIssueSummary() {
+                if (item.kind === 'valibot') {
+                    return summarize(item.metadata);
+                }
+                return undefined;
+            },
+        });
+    }
+}
+function errorSummary(control) {
+    if (!control?.errors) {
         return [];
     }
     const list = [];
-    const controlList = [control];
-    while (controlList.length) {
-        const control = controlList.shift();
-        if (control.valid) {
-            continue;
-        }
-        list.push({ control, errors: control.errors });
-        if (isFieldArray(control) || isFieldGroup(control)) {
-            (control.activatedChildren$$ ?? control.children$$)().forEach((control) => {
-                controlList.push(control);
-            });
-        }
+    for (const item of control.errors) {
+        errorItem(item, [], list);
     }
     return list;
 }
+const getDeepError = errorSummary;
 
 const DefaultOptions$1 = { autoDestroy: true };
 /** set输入,()输出的是管道后的值, */
@@ -1768,6 +1835,13 @@ class FormBuilder {
 }
 _a = FormBuilder;
 
+function findError(list, key) {
+    if (!list) {
+        return undefined;
+    }
+    return list.find((item) => item.kind === key);
+}
+
 function layout(value) {
     return {
         kind: 'metadata',
@@ -2421,6 +2495,62 @@ const actions = {
     },
 };
 
+const AnyDefine = v.any();
+function AnyDefault(input, schemahandle) {
+    return schemahandle.undefinedable
+        ? v.optional(input)
+        : schemahandle.nullable
+            ? v.nullable(input)
+            : input;
+}
+const checkOverride = {
+    logicGroup: (schemahandle) => v.pipe(AnyDefault(v.pipe(AnyDefine, v.check(Boolean)), schemahandle)),
+    array: (schemahandle) => {
+        const source = schemahandle.coreSchema;
+        const length = source &&
+            schemahandle.formConfig.groupMode &&
+            schemahandle.formConfig.groupMode !== 'reset'
+            ? source.items.length
+            : undefined;
+        return v.pipe(AnyDefault(v.pipe(AnyDefine, v.check((value) => {
+            if (!Array.isArray(value)) {
+                return false;
+            }
+            if (schemahandle.formConfig.groupMode === 'strict') {
+                return value.length === length;
+            }
+            return true;
+        }), v.transform((value) => {
+            if (schemahandle.formConfig.groupMode === 'default' &&
+                value.length !== length) {
+                return value.slice(0, length);
+            }
+            return value;
+        })), schemahandle));
+    },
+    group: (schemahandle) => {
+        const source = schemahandle.coreSchema;
+        const keys = source &&
+            schemahandle.formConfig.groupMode &&
+            schemahandle.formConfig.groupMode !== 'reset'
+            ? Object.keys(source.entries)
+            : undefined;
+        return v.pipe(AnyDefault(v.pipe(AnyDefine, v.check((value) => {
+            if (typeof value !== 'object') {
+                return false;
+            }
+            if (schemahandle.formConfig.groupMode === 'strict') {
+                return Object.keys(value).every((key) => key in source.entries);
+            }
+            return true;
+        }), v.transform((a) => {
+            if (schemahandle.formConfig.groupMode === 'default') {
+                return pick(a, keys);
+            }
+            return a;
+        })), schemahandle));
+    },
+};
 class CoreSchemaHandle extends BaseSchemaHandle {
     inputs = {};
     outputs = {};
@@ -2441,6 +2571,8 @@ class CoreSchemaHandle extends BaseSchemaHandle {
     nonFieldControl = false;
     hooks;
     providers;
+    checkSchema;
+    checkActions = [];
     lazySchema(schema) {
         super.lazySchema(schema);
         if (this.parent) {
@@ -2572,10 +2704,32 @@ class CoreSchemaHandle extends BaseSchemaHandle {
                 break;
         }
     }
+    validation(item) {
+        super.validation(item);
+        this.checkActions.push(item);
+    }
+    transformation(item) {
+        super.transformation(item);
+        this.checkActions.push(item);
+    }
     end(schema) {
         super.end(schema);
         this.formConfig.defaultValue =
             this.defaultValue ?? (this.nullable ? null : undefined);
+        if (this.isGroup) {
+            this.checkSchema = v.pipe(checkOverride.group(this), ...this.checkActions);
+        }
+        else if (this.isTuple || this.isArray) {
+            this.checkSchema = v.pipe(checkOverride.array(this), ...this.checkActions);
+        }
+        else if (this.isLogicAnd || this.isLogicOr) {
+            this.checkSchema = v.pipe(checkOverride.logicGroup(this), ...this.checkActions);
+        }
+    }
+    coreSchema;
+    defineSchema(schema) {
+        super.defineSchema(schema);
+        this.coreSchema = schema;
     }
 }
 
@@ -2638,5 +2792,5 @@ const NFCSchema = v.optional(v.void());
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractControl, CoreSchemaHandle, CustomDataSymbol, FieldArray, FieldControl, FieldGroup, FieldLogicGroup, FormBuilder, INVALID, InitPendingValue, NFCSchema, PENDING, PI_CONTEXT_TOKEN, PI_FORM_BUILDER_ALIAS_MAP, PI_FORM_BUILDER_OPTIONS_TOKEN, PI_VIEW_CONFIG_TOKEN, PI_VIEW_FIELD_TOKEN, SortedArray, UpdateType, VALID, actions, arrayStartsWith, asyncMergeOutputs, asyncObjectSignal, clone, combineSignal, controlStatusList, convert, createViewControlLink, disableWhen, effectListen, fieldControlStatusClass, findComponent, formConfig, getDeepError, getLazyImport, hideWhen, initListen, isArray, isFieldArray, isFieldControl, isFieldGroup, isFieldLogicGroup, isGroup, isLazyMark, layout, lazyMark, mergeHooks, mergeHooksFn, mergeOutputFn, mergeOutputs, nonFieldControl, observableSignal, outputChange, outputChangeFn, patchHooks, rawConfig, removeHooks, renderConfig, setAlias, setComponent, setHooks, toArray, toObservable, valueChange, valueChangeFn, changeProviders as ɵchangeProviders, classAction as ɵclassAction, patchProviders as ɵpatchProviders, setProviders as ɵsetProviders, wrappers as ɵwrappers };
+export { AbstractControl, CoreSchemaHandle, CustomDataSymbol, FieldArray, FieldControl, FieldGroup, FieldLogicGroup, FormBuilder, INVALID, InitPendingValue, NFCSchema, PENDING, PI_CONTEXT_TOKEN, PI_FORM_BUILDER_ALIAS_MAP, PI_FORM_BUILDER_OPTIONS_TOKEN, PI_VIEW_CONFIG_TOKEN, PI_VIEW_FIELD_TOKEN, SortedArray, UpdateType, VALID, actions, arrayStartsWith, asyncMergeOutputs, asyncObjectSignal, clone, combineSignal, controlStatusList, convert, createViewControlLink, disableWhen, effectListen, errorSummary, fieldControlStatusClass, findComponent, findError, formConfig, getDeepError, getLazyImport, hideWhen, initListen, isArray, isFieldArray, isFieldControl, isFieldGroup, isFieldLogicGroup, isGroup, isLazyMark, layout, lazyMark, mergeHooks, mergeHooksFn, mergeOutputFn, mergeOutputs, nonFieldControl, observableSignal, outputChange, outputChangeFn, patchHooks, rawConfig, removeHooks, renderConfig, setAlias, setComponent, setHooks, toArray, toObservable, valueChange, valueChangeFn, changeProviders as ɵchangeProviders, classAction as ɵclassAction, patchProviders as ɵpatchProviders, setProviders as ɵsetProviders, wrappers as ɵwrappers };
 //# sourceMappingURL=piying-view-angular-core.mjs.map