@piying/view-angular-core 1.2.2 → 1.3.2

package/index.d.ts

@@ -3,7 +3,7 @@ import { WritableSignal, Signal, Injector, CreateEffectOptions, EffectRef, Injec
 import * as rxjs from 'rxjs';
 import { UnaryFunction, Observable } from 'rxjs';
 import * as _piying_valibot_visit from '@piying/valibot-visit';
-import { SchemaOrPipe, BaseSchemaHandle, LazySchema, DefaultSchema, TupleSchema, EnumSchema, IntersectSchema, UnionSchema, Schema, VoidSchema, MetadataAction, RawConfigActionCommon, ConvertOptions } from '@piying/valibot-visit';
+import { SchemaOrPipe, BaseSchemaHandle, LazySchema, DefaultSchema, TupleSchema, ObjectSchema, EnumSchema, IntersectSchema, UnionSchema, Schema, VoidSchema, MetadataAction, RawConfigActionCommon, ConvertOptions } from '@piying/valibot-visit';
 export { RawConfig, asControl, asVirtualGroup, changeObject, condition, getDefaults, getSchemaByIssuePath, getSchemaMetadata } from '@piying/valibot-visit';
 import * as v from 'valibot';
 import { BaseMetadata, ArraySchema, BaseSchema, BaseIssue, ErrorMessage, ArrayIssue } from 'valibot';
@@ -35,11 +35,18 @@ interface FieldFormConfig<T = any> {
     emptyValue?: any;
     /** array  */
     deletionMode?: ArrayDeletionMode;
+    /** group/array */
+    groupMode?: 'loose' | 'default' | 'strict' | 'reset';
 }
 type FieldFormConfig$ = WritableSignal<FieldFormConfig>;
 type FieldGroupConfig$ = WritableSignal<Omit<FieldFormConfig, 'defaultValue'>>;
 type FieldArrayConfig$ = WritableSignal<Omit<FieldFormConfig, 'defaultValue'>>;
 type FieldLogicGroupConfig$ = WritableSignal<Omit<FieldFormConfig, 'defaultValue'>>;
+declare const enum UpdateType {
+    init = 0,
+    update = 1,
+    reset = 2
+}
 
 declare const ValidatorPending: unique symbol;
 
@@ -65,8 +72,8 @@ declare abstract class AbstractControl<TValue = any> {
     shouldInclude$$: Signal<boolean>;
     readonly injector: Injector;
     /** model的value */
-    abstract value$$: Signal<TValue | undefined>;
-    abstract children$$?: Signal<AbstractControl[]>;
+    value$$: Signal<TValue | undefined>;
+    children$$?: Signal<AbstractControl[]>;
     /** disabled */
     readonly selfDisabled$$: Signal<boolean>;
     /** `self` || `parent` */
@@ -115,15 +122,13 @@ declare abstract class AbstractControl<TValue = any> {
     markAsUntouched(): void;
     markAsDirty(): void;
     markAsPristine(): void;
-    abstract reset(value?: any): void;
+    reset(value?: any): void;
     getRawValue(): any;
     get<P extends string | (string | number)[]>(path: P): AbstractControl | null;
     get root(): AbstractControl;
-    abstract updateValue(value: any): void;
+    updateValue(value: any): void;
     config$: FieldFormConfig$;
-    initConfig(config: any): void;
     protected getInitValue(value: any): any;
-    abstract updateInitValue(value: any): void;
     find(name: string | number): AbstractControl | null;
     setControl(name: string | number, control: AbstractControl): void;
     private reduceChildren;
@@ -132,25 +137,33 @@ declare abstract class AbstractControl<TValue = any> {
     get statusChanges(): Observable<VALID_STATUS>;
     /** 仅触发 updateOn: submit 时使用 */
     emitSubmit(): void;
+    protected isUnChanged(): boolean;
+}
+
+declare class FieldGroupbase extends AbstractControl {
+    resetValue$: _angular_core.WritableSignal<any>;
+    updateValue(value: any): void;
+    protected inited: boolean;
+    reset(value?: any): void;
 }
 
 declare class FieldGroup<TControl extends {
     [K in keyof TControl]: AbstractControl<any>;
-} = any> extends AbstractControl {
+} = any> extends FieldGroupbase {
     #private;
     value$$: _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>[]>;
-    controls$: _angular_core.WritableSignal<Record<string, AbstractControl<any>>>;
-    get controls(): Record<string, AbstractControl<any>>;
-    registerControl(name: string, control: AbstractControl): AbstractControl<any>;
-    removeControl(name: string): void;
-    setControl(name: string, control: AbstractControl): void;
-    reset(value?: any): void;
+    removeRestControl(key: string): void;
+    setControl(key: string, control: AbstractControl): void;
     getRawValue(): any;
-    find(name: string): AbstractControl | null;
-    looseValue$$: _angular_core.Signal<any>;
-    updateValue(value: any): void;
-    updateInitValue(value: any): void;
+    clear(): void;
+    find(key: string): AbstractControl | null;
+    getResetValue(inputValue: any): Record<string, any>;
 }
 
 declare class FieldControl<TValue = any> extends AbstractControl<TValue> {
@@ -160,7 +173,6 @@ declare class FieldControl<TValue = any> extends AbstractControl<TValue> {
         change: boolean;
         value: undefined;
     }>;
-    children$$: undefined;
     /** 视图变化时model值不变也要更新view */
     private viewIndex$;
     /** model输入值 */
@@ -178,37 +190,33 @@ declare class FieldControl<TValue = any> extends AbstractControl<TValue> {
     updateInitValue(value: any): void;
 }
 
-declare class FieldArray<TControl extends AbstractControl<any> = any> extends AbstractControl {
+declare class FieldArray<TControl extends AbstractControl<any> = any> extends FieldGroupbase {
     #private;
     value$$: _angular_core.Signal<any>;
     children$$: _angular_core.Signal<AbstractControl<any>[]>;
-    controls$: _angular_core.WritableSignal<AbstractControl<any>[]>;
+    fixedControls$: _angular_core.WritableSignal<AbstractControl<any>[]>;
+    resetControls$: _angular_core.WritableSignal<AbstractControl<any>[]>;
     get controls(): AbstractControl<any>[];
-    removeAt(index: number): void;
-    setControl(index: number, control: TControl): void;
+    removeRestControl(key: number): void;
+    setControl(key: number, control: TControl): void;
     get length(): number;
-    reset(value?: any[]): void;
-    getRawValue(): any[];
+    getRawValue(): any;
     clear(): void;
-    private _adjustIndex;
-    find(name: number): AbstractControl;
-    beforeUpdateList: ((value: any[]) => void)[];
-    updateValue(value?: any[]): void;
-    updateInitValue(value: any): void;
+    find(key: number): AbstractControl;
+    getResetValue(value?: any[]): any[];
 }
 
 declare class FieldLogicGroup extends FieldArray {
+    #private;
     /** 待定参数 */
     activateIndex$: _angular_core.WritableSignal<number>;
     type: _angular_core.WritableSignal<LogicType>;
     activateControl$: _angular_core.WritableSignal<AbstractControl<any>[] | undefined>;
     value$$: _angular_core.Signal<any>;
-    getActivateControls(): AbstractControl<any>[];
     getValue(rawData: boolean): any;
     reset(value?: any[]): void;
     getRawValue(): any;
     updateValue(value: any): void;
-    updateInitValue(value: any): void;
 }
 
 declare function isFieldGroup(input: any): input is FieldGroup;
@@ -423,6 +431,9 @@ declare class CoreSchemaHandle<Self extends CoreSchemaHandle<any, any>, RESOLVED
     arraySchema(schema: ArraySchema<BaseSchema<unknown, unknown, BaseIssue<unknown>>, ErrorMessage<ArrayIssue> | undefined>): void;
     defaultSchema(schema: DefaultSchema): void;
     tupleDefault(schema: TupleSchema): void;
+    objectDefault(schema: ObjectSchema): void;
+    recordSchema(key: v.BaseSchema<unknown, unknown, v.BaseIssue<unknown>>, value: v.BaseSchema<unknown, unknown, v.BaseIssue<unknown>>): void;
+    restSchema(schema: v.BaseSchema<unknown, unknown, v.BaseIssue<unknown>>): void;
     enumSchema(schema: EnumSchema): void;
     intersectBefore(schema: IntersectSchema): void;
     logicItemSchema(schema: v.BaseSchema<unknown, unknown, v.BaseIssue<unknown>>, index: number, type: 'intersect' | 'union'): void;
@@ -592,8 +603,6 @@ type CoreResolvedComponentDefine = SetWrapper$<CoreRawComponentDefine, 'attribut
 interface HookConfig<RESOLVED_FIELD> {
     /** 配置刚被解析 */
     fieldResolved?: (field: RESOLVED_FIELD) => void;
-    /** 子级已经初始化,每次array添加都会触发 */
-    afterChildrenInit?: (field: RESOLVED_FIELD) => void;
     /** 所有feilds初始化后执行,也就是可以进行表单监听 */
     allFieldsResolved?: (field: RESOLVED_FIELD) => void;
     /** todo 此hook暂时没有使用到 创建组件之前 */
@@ -608,8 +617,9 @@ type PiResolvedCommonViewFieldConfig<SelfResolvedFn extends () => any, Define> =
     readonly keyPath?: KeyPath | undefined;
     readonly fullPath: KeyPath;
     readonly props: WritableSignal<Record<string, any>>;
-    fieldGroup?: WritableSignal<ReturnType<SelfResolvedFn>[]>;
-    fieldArray?: WritableSignal<ReturnType<SelfResolvedFn>[]>;
+    children?: Signal<ReturnType<SelfResolvedFn>[]>;
+    fixedChildren?: WritableSignal<ReturnType<SelfResolvedFn>[]>;
+    restChildren?: WritableSignal<ReturnType<SelfResolvedFn>[]>;
     parent: ReturnType<SelfResolvedFn>;
     readonly form: {
         readonly control?: FieldGroup | FieldArray | FieldControl | FieldLogicGroup;
@@ -622,8 +632,8 @@ type PiResolvedCommonViewFieldConfig<SelfResolvedFn extends () => any, Define> =
     readonly context?: any;
     get: (keyPath: KeyPath, aliasNotFoundFn?: (name: string, field: PiResolvedCommonViewFieldConfig<any, any>) => PiResolvedCommonViewFieldConfig<any, any>) => ReturnType<SelfResolvedFn> | undefined;
     action: {
-        set: (value: any, index?: number) => void;
-        remove: (index: number) => void;
+        set: (value: any, index?: any) => void;
+        remove: (index: any) => void;
     };
     readonly define?: Define;
     wrappers: WritableSignal<CoreResolvedWrapperConfig[]>;
@@ -674,17 +684,21 @@ interface BuildRootItem {
 }
 interface BuildGroupItem<SchemaHandle extends CoreSchemaHandle<any, any>> {
     type: 'group';
+    templateField?: SchemaHandle;
     fields: SchemaHandle[];
     form: FieldGroup;
     field: _PiResolvedCommonViewFieldConfig;
     append: (input: _PiResolvedCommonViewFieldConfig) => void;
+    skipAppend?: boolean;
 }
 interface BuildArrayItem<SchemaHandle extends CoreSchemaHandle<any, any>> {
     type: 'array';
     templateField: SchemaHandle;
+    fields: SchemaHandle[];
     form: FieldArray;
     field: _PiResolvedCommonViewFieldConfig;
     append: (input: _PiResolvedCommonViewFieldConfig) => void;
+    skipAppend?: boolean;
 }
 
 declare class FormBuilder<SchemaHandle extends CoreSchemaHandle<any, any>> {
@@ -692,7 +706,6 @@ declare class FormBuilder<SchemaHandle extends CoreSchemaHandle<any, any>> {
     buildRoot(item: BuildRootInputItem<SchemaHandle>): void;
     allFieldInitHookCall(): void;
     afterResolveConfig(rawConfig: SchemaHandle, config: _PiResolvedCommonViewFieldConfig): _PiResolvedCommonViewFieldConfig | undefined;
-    createArrayItem(parent: BuildGroupItem<SchemaHandle> | BuildArrayItem<SchemaHandle>, field: AnyCoreSchemaHandle, index: number): PiResolvedCommonViewFieldConfig<any, any>;
     protected configMergeRaw<T extends SignalInputValue<any>>(list: T[], isArray: boolean, strategy: ConfigMergeStrategy): UnWrapSignal<NonNullable<T>>;
     /**
      * 后面覆盖前面
@@ -718,5 +731,5 @@ declare const PI_CONTEXT_TOKEN: InjectionToken<any>;
 declare function isGroup(schema: AnyCoreSchemaHandle): boolean | undefined;
 declare function isArray(schema: AnyCoreSchemaHandle): boolean;
 
-export { AbstractControl, CoreSchemaHandle, FieldArray, FieldControl, FieldGroup, FieldLogicGroup, FormBuilder, INVALID, NFCSchema, PENDING, PI_CONTEXT_TOKEN, PI_VIEW_CONFIG_TOKEN, SortedArray, VALID, arrayStartsWith, asyncInputMerge, clone, componentClass, controlStatusList, convert, createViewControlLink, disableWhen, effectListen, fieldControlStatusClass, formConfig, hideWhen, isArray, isFieldArray, isFieldControl, isFieldGroup, isFieldLogicGroup, isGroup, layout, mergeHooks, mergeHooksFn, mergeOutputFn, mergeOutputs, nonFieldControl, outputChange, outputChangeFn, patchAsyncAttributes, patchAsyncFn, patchAsyncInputs, patchAsyncProps, patchAttributes, patchHooks, patchInputs, patchOutputs, patchProps, patchWrappers, rawConfig, removeAttributes, removeHooks, removeInputs, removeOutputs, removeProps, removeWrappers, renderConfig, setAlias, setAttributes, setComponent, setHooks, setInputs, setOutputs, setProps, setWrappers, toArray, toObservable, topClass, unWrapSignal, valueChange, valueChangeFn };
+export { AbstractControl, CoreSchemaHandle, FieldArray, FieldControl, FieldGroup, FieldLogicGroup, FormBuilder, INVALID, NFCSchema, PENDING, PI_CONTEXT_TOKEN, PI_VIEW_CONFIG_TOKEN, SortedArray, UpdateType, VALID, arrayStartsWith, asyncInputMerge, clone, componentClass, controlStatusList, convert, createViewControlLink, disableWhen, effectListen, fieldControlStatusClass, formConfig, hideWhen, isArray, isFieldArray, isFieldControl, isFieldGroup, isFieldLogicGroup, isGroup, layout, mergeHooks, mergeHooksFn, mergeOutputFn, mergeOutputs, nonFieldControl, outputChange, outputChangeFn, patchAsyncAttributes, patchAsyncFn, patchAsyncInputs, patchAsyncProps, patchAttributes, patchHooks, patchInputs, patchOutputs, patchProps, patchWrappers, rawConfig, removeAttributes, removeHooks, removeInputs, removeOutputs, removeProps, removeWrappers, renderConfig, setAlias, setAttributes, setComponent, setHooks, setInputs, setOutputs, setProps, setWrappers, toArray, toObservable, topClass, unWrapSignal, valueChange, valueChangeFn };
 export type { AbstractControlParams, AnyCoreSchemaHandle, ArraryIterable, ArrayDeletionMode, AsyncValidatorFn, BuildArrayItem, BuildGroupItem, BuildRootInputItem, BuildRootItem, ChangeWhenOption, ConfigMergeStrategy, ControlValueAccessor, CoreRawComponentDefine, CoreRawProps, CoreRawViewAttributes, CoreRawViewInputs, CoreRawViewOutputs, CoreRawWrapperConfig, CoreResolvedComponentDefine, CoreResolvedWrapperConfig, CoreWrapperConfig1, DefaultConfigKey, DisableWhenOption, DisabledValueStrategy, EventChangeFn, FieldArrayConfig$, FieldFormConfig, FieldFormConfig$, FieldGroupConfig$, FieldLogicGroupConfig$, FieldRenderConfig, FieldTransformerConfig, FormBuilderOptions, FormHooks, HideWhenOption, HookConfig, HooksConfig, KeyPath, LayoutAction, LazyImport, LogicType, MergeHooksConfig, NonFieldControlAction, PiCommonConfig, PiCommonDefaultConfig, PiResolvedCommonViewFieldConfig, QueryPath, RawKeyPath, SetOptional, SetReadonly, SetWrapper$, SetWrapper$$, SignalInputValue, ToObservableOptions, UnWrapSignal, VALID_STATUS, ValidationErrors, ValidatorFn, ValueChangFnOptions, ValueChangeFn, Wrapper$, Writeable, _PiResolvedCommonViewFieldConfig };

package/package.json

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

package/readme.md

@@ -1 +1,27 @@
-[document](https://piying-org.github.io/website/docs/client/intro)
+<div><a href="https://www.npmjs.com/package/@piying/view-core"><img src="https://img.shields.io/npm/v/@piying/view-core" alt="NPM Version" /></a> <a href="https://coveralls.io/github/piying-org/piying-view?branch=main"><img src="https://coveralls.io/repos/github/piying-org/piying-view/badge.svg" alt="Coverage Status" ></a> <a href=""><img src="https://img.shields.io/badge/License-MIT-teal.svg" alt="MIT License" /></a></div>
+
+## document
+
+- https://piying-org.github.io/website/docs/client/intro
+
+## start
+
+- npm i
+- npm run build:core
+
+## test
+
+- npx playwright install
+- npm run test:all
+
+### test Core/Angular
+
+- npm run test
+
+### test Vue
+
+- npm run test:vue
+
+### test React
+
+- npm run test:react