@piying/view-angular-core 2.4.6 → 2.5.1

package/index.d.ts

@@ -55,14 +55,34 @@ declare const enum UpdateType {
 
 declare const ValidatorPending: unique symbol;
 
-type ValidationErrors = {
+type ValidationErrorsLegacy = {
     [key: string]: any;
 };
+type ValidationValibotError2 = {
+    kind: 'valibot';
+    metadata: [v.BaseIssue<unknown>, ...v.BaseIssue<unknown>[]];
+};
+type ValidationErrorError2 = {
+    kind: 'error';
+    metadata: Error;
+};
+type ValidationDescendantError2 = {
+    kind: 'descendant';
+    key: string | number;
+    field: AbstractControl;
+    metadata: ValidationCommonError2[];
+};
+type ValidationCommonError2 = {
+    kind: string;
+    metadata?: any;
+    message?: string;
+};
+type ValidationErrors2 = ValidationValibotError2 | ValidationErrorError2 | ValidationDescendantError2 | ValidationCommonError2;
 interface ValidatorFn {
-    (control: AbstractControl): ValidationErrors | undefined;
+    (control: AbstractControl): ValidationErrorsLegacy | ValidationErrors2[] | undefined;
 }
 interface AsyncValidatorFn {
-    (control: AbstractControl): Promise<ValidationErrors | undefined> | Observable<ValidationErrors | undefined> | Signal<ValidationErrors | undefined>;
+    (control: AbstractControl): Promise<ValidationErrorsLegacy | ValidationErrors2[] | undefined> | Observable<ValidationErrorsLegacy | ValidationErrors2[] | undefined> | Signal<ValidationErrorsLegacy | ValidationErrors2[] | undefined>;
 }
 declare const VALID = "VALID";
 declare const INVALID = "INVALID";
@@ -86,12 +106,15 @@ declare abstract class AbstractControl<TValue = any> {
     /** 父级取值时,当前子级是否包含在内 */
     shouldInclude$$: Signal<boolean>;
     readonly injector: Injector;
+    originValue$$: Signal<TValue | undefined>;
     /** model的value */
-    value$$: Signal<TValue | undefined>;
+    value$$: Signal<TValue>;
     /** 已激活的子级,用于校验获得返回值之类 */
     activatedChildren$$?: Signal<AbstractControl[]>;
     /** 通用的子级,用于查询之类 */
-    children$$?: Signal<AbstractControl[]>;
+    children$$?: Signal<{
+        [s: string]: AbstractControl;
+    } | ArrayLike<AbstractControl>>;
     /** disabled */
     readonly selfDisabled$$: Signal<boolean>;
     /** `self` || `parent` */
@@ -112,16 +135,16 @@ declare abstract class AbstractControl<TValue = any> {
     get dirty(): boolean;
     get pristine(): boolean;
     protected resetIndex$: _angular_core.WritableSignal<number>;
-    syncError$: _angular_core.WritableSignal<ValidationErrors | undefined>;
-    asyncErrorRes$$: Signal<Signal<typeof ValidatorPending | Record<string, any> | undefined> | undefined>;
-    asyncError$$: Signal<"PENDING" | Record<string, any> | undefined>;
-    rawError$$: Signal<"PENDING" | ValidationErrors | undefined>;
+    syncError$: _angular_core.WritableSignal<ValidationErrors2[] | undefined>;
+    asyncErrorRes$$: Signal<Signal<typeof ValidatorPending | (ValidationValibotError2 | ValidationErrorError2 | ValidationDescendantError2 | ValidationCommonError2)[] | undefined> | undefined>;
+    asyncError$$: Signal<"PENDING" | (ValidationValibotError2 | ValidationErrorError2 | ValidationDescendantError2 | ValidationCommonError2)[] | undefined>;
+    rawError$$: Signal<"PENDING" | ValidationErrors2[] | undefined>;
     valueNoError$$: Signal<boolean>;
-    get errors(): ValidationErrors | undefined;
+    get errors(): ValidationErrors2[] | undefined;
     /** parent */
     private _parent?;
     get parent(): AbstractControl | undefined;
-    get value(): TValue | undefined;
+    get value(): TValue;
     required$$: Signal<boolean | undefined>;
     readonly schemaParser: v.SafeParser<SchemaOrPipe, undefined>;
     context: any;
@@ -146,7 +169,7 @@ declare abstract class AbstractControl<TValue = any> {
     updateValue(value: any): void;
     config$: FieldFormConfig$;
     protected getInitValue(value: any): any;
-    protected transfomerToModel$$: Signal<((value: any, control: AbstractControl) => any) | undefined>;
+    protected transformToModel(value: any, control: AbstractControl<any>): any;
     find(name: string | number): AbstractControl | null;
     setControl(name: string | number, control: AbstractControl): void;
     /** 校验和获得值用 */
@@ -171,13 +194,15 @@ declare class FieldGroup<TControl extends {
     [K in keyof TControl]: AbstractControl<any>;
 } = any> extends FieldGroupbase {
     #private;
-    value$$: _angular_core.Signal<any>;
+    originValue$$: _angular_core.Signal<any>;
     fixedControls$: _angular_core.WritableSignal<Record<string, AbstractControl<any>>>;
     resetControls$: _angular_core.WritableSignal<Record<string, AbstractControl<any>>>;
     get controls(): {
         [x: string]: AbstractControl<any>;
     };
-    children$$: _angular_core.Signal<AbstractControl<any>[]>;
+    children$$: _angular_core.Signal<{
+        [x: string]: AbstractControl<any>;
+    }>;
     removeRestControl(key: string): void;
     setControl(key: string, control: AbstractControl): void;
     getRawValue(): any;
@@ -196,7 +221,7 @@ declare class FieldControl<TValue = any> extends AbstractControl<TValue> {
     /** 传入到view中的值 */
     modelValueToViewValue$$: _angular_core.Signal<any>;
     /** modelValue + viewValue => modelValue */
-    value$$: WritableSignal<any>;
+    originValue$$: WritableSignal<any>;
     reset(formState?: TValue): void;
     /** view变更 */
     viewValueChange(value: TValue | undefined): void;
@@ -207,7 +232,7 @@ declare class FieldControl<TValue = any> extends AbstractControl<TValue> {
 
 declare class FieldArray<TControl extends AbstractControl<any> = any> extends FieldGroupbase {
     #private;
-    value$$: _angular_core.Signal<any>;
+    originValue$$: _angular_core.Signal<any>;
     children$$: _angular_core.Signal<AbstractControl<any>[]>;
     fixedControls$: _angular_core.WritableSignal<AbstractControl<any>[]>;
     resetControls$: _angular_core.WritableSignal<AbstractControl<any>[]>;
@@ -226,7 +251,7 @@ declare class FieldLogicGroup extends FieldArray {
     activateIndex$: _angular_core.WritableSignal<number>;
     type: _angular_core.WritableSignal<LogicType>;
     activateControls$: _angular_core.WritableSignal<AbstractControl<any>[] | undefined>;
-    value$$: _angular_core.Signal<any>;
+    originValue$$: _angular_core.Signal<any>;
     activatedChildren$$: _angular_core.Signal<AbstractControl<any>[]>;
     getValue(rawData: boolean): any;
     reset(value?: any[]): void;
@@ -427,10 +452,17 @@ declare function fieldControlStatusClass(fieldControl?: AbstractControl, skipDis
 
 declare function initListen(input: any, control: AbstractControl, injector: Injector, fn: (input: any) => void): _angular_core.EffectRef;
 
-declare function getDeepError(control?: AbstractControl): {
-    control: AbstractControl<any>;
-    errors: _piying_view_angular_core.ValidationErrors | undefined;
-}[];
+interface ErrorSummary {
+    /** 方便判断是哪一个控件产生的异常 */
+    debugPathList: string[];
+    /** 可以用于直接get查询到当前配置 */
+    queryPathList: (number | string)[];
+    fieldList: AbstractControl[];
+    item: Exclude<ValidationErrors2, ValidationDescendantError2>;
+    valibotIssueSummary: string | undefined;
+}
+declare function errorSummary(control?: AbstractControl): ErrorSummary[];
+declare const getDeepError: typeof errorSummary;
 
 type ObservableSignal<Input, Output> = WritableSignal<Input> & {
     input: Signal<Input>;
@@ -496,6 +528,8 @@ declare class CoreSchemaHandle<Self extends CoreSchemaHandle<any, any>, RESOLVED
     nonFieldControl: boolean;
     hooks?: HookConfig<ReturnType<RESOLVED_FN>>;
     providers?: InjectorProvider[];
+    checkSchema?: v.BaseSchema<unknown, unknown, v.BaseIssue<unknown>>;
+    checkActions: (v.BaseValidation<any, any, any> | v.BaseTransformation<any, any, any>)[];
     lazySchema(schema: LazySchema): void;
     arraySchema(schema: ArraySchema<BaseSchema<unknown, unknown, BaseIssue<unknown>>, ErrorMessage<ArrayIssue> | undefined>): void;
     defaultSchema(schema: DefaultSchema): void;
@@ -511,7 +545,11 @@ declare class CoreSchemaHandle<Self extends CoreSchemaHandle<any, any>, RESOLVED
     beforeSchemaType(schema: Schema): void;
     voidSchema(schema: VoidSchema): void;
     metadataDefaulthandle(metadata: MetadataAction, environments: string[]): void;
+    validation(item: v.BaseValidation<any, any, v.BaseIssue<unknown>>): void;
+    transformation(item: v.BaseTransformation<any, any, v.BaseIssue<unknown>>): void;
     end(schema: SchemaOrPipe): void;
+    coreSchema: v.BaseSchema<any, any, any>;
+    defineSchema(schema: SchemaOrPipe): void;
 }
 type AnyCoreSchemaHandle = CoreSchemaHandle<any, () => _PiResolvedCommonViewFieldConfig>;
 
@@ -858,5 +896,7 @@ declare class FormBuilder<SchemaHandle extends CoreSchemaHandle<any, any>> {
 declare function isGroup(schema: AnyCoreSchemaHandle): boolean | undefined;
 declare function isArray(schema: AnyCoreSchemaHandle): boolean;
 
-export { AbstractControl, CoreSchemaHandle, CustomDataSymbol, FieldArray, FieldControl, FieldGroup, FieldLogicGroup, FormBuilder, INVALID, InitPendingValue, NFCSchema, PENDING, PI_CONTEXT_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 type { AbstractControlParams, AnyCoreSchemaHandle, ArraryIterable, ArrayDeletionMode, AsyncCallback, AsyncObjectSignal, AsyncValidatorFn, BuildArrayItem, BuildGroupItem, BuildRootInputItem, BuildRootItem, CombineSignal, ConfigAction, ControlValueAccessor, CoreResolvedComponentDefine, CoreWrapperConfig, DisableWhenOption, DisabledValueStrategy, EventChangeFn, FieldArrayConfig$, FieldFormConfig, FieldFormConfig$, FieldGroupConfig$, FieldLogicGroupConfig$, FieldRenderConfig, FieldTransformerConfig, FormBuilderOptions, FormHooks, HideWhenOption, HookConfig, HooksConfig, InjectorProvider, KeyPath, LayoutAction, LazyImport, LazyMarkType, LogicType, MergeHooksConfig, NonFieldControlAction, ObservableSignal, PiCommonConfig, PiResolvedCommonViewFieldConfig, QueryPath, RawCoreWrapperConfig, RawKeyPath, SetOptional, SetReadonly, SetUnWrapper$, SetWrapper$, SetWrapper$$, SignalInputValue, ToObservableOptions, UnWrapSignal, UnWrapper$, VALID_STATUS, ValidationErrors, ValidatorFn, ValueChangFnOptions, ValueChangeFn, ViewAttributes, ViewEvents, ViewInputs, ViewOutputs, ViewProps, Wrapper$, Writeable, _PiResolvedCommonViewFieldConfig };
+declare function findError<K extends string>(list: ValidationErrors2[] | undefined, key: K): (K extends ValidationValibotError2['kind'] ? ValidationValibotError2 : K extends ValidationErrorError2['kind'] ? ValidationErrorError2 : ValidationCommonError2) | undefined;
+
+export { AbstractControl, CoreSchemaHandle, CustomDataSymbol, FieldArray, FieldControl, FieldGroup, FieldLogicGroup, FormBuilder, INVALID, InitPendingValue, NFCSchema, PENDING, PI_CONTEXT_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 };
+export type { AbstractControlParams, AnyCoreSchemaHandle, ArraryIterable, ArrayDeletionMode, AsyncCallback, AsyncObjectSignal, AsyncValidatorFn, BuildArrayItem, BuildGroupItem, BuildRootInputItem, BuildRootItem, CombineSignal, ConfigAction, ControlValueAccessor, CoreResolvedComponentDefine, CoreWrapperConfig, DisableWhenOption, DisabledValueStrategy, ErrorSummary, EventChangeFn, FieldArrayConfig$, FieldFormConfig, FieldFormConfig$, FieldGroupConfig$, FieldLogicGroupConfig$, FieldRenderConfig, FieldTransformerConfig, FormBuilderOptions, FormHooks, HideWhenOption, HookConfig, HooksConfig, InjectorProvider, KeyPath, LayoutAction, LazyImport, LazyMarkType, LogicType, MergeHooksConfig, NonFieldControlAction, ObservableSignal, PiCommonConfig, PiResolvedCommonViewFieldConfig, QueryPath, RawCoreWrapperConfig, RawKeyPath, SetOptional, SetReadonly, SetUnWrapper$, SetWrapper$, SetWrapper$$, SignalInputValue, ToObservableOptions, UnWrapSignal, UnWrapper$, VALID_STATUS, ValidationCommonError2, ValidationDescendantError2, ValidationErrorError2, ValidationErrors2, ValidationErrorsLegacy, ValidationValibotError2, ValidatorFn, ValueChangFnOptions, ValueChangeFn, ViewAttributes, ViewEvents, ViewInputs, ViewOutputs, ViewProps, Wrapper$, Writeable, _PiResolvedCommonViewFieldConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@piying/view-angular-core",
-    "version": "2.4.6",
+    "version": "2.5.1",
     "homepage": "https://piying-org.github.io/website/docs/client/intro",
     "repository": {
         "url": "https://github.com/piying-org/piying-view"