@piying/view-angular-core 2.3.1 → 2.4.0

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

@@ -1,6 +1,6 @@
 import { signal, computed, InjectionToken, effect, inject, Injector, untracked, DestroyRef, linkedSignal, isSignal } from '@angular/core';
 import * as v from 'valibot';
-import { isObservable, BehaviorSubject, Subject, tap, pipe, shareReplay, combineLatest, startWith, skip, map } from 'rxjs';
+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';
@@ -1445,10 +1445,10 @@ class FormBuilder {
             : typeof field.type !== 'string'
                 ? field.type
                 : this.#findConfig.findComponentConfig(field.type);
-        const inputs = field.inputs;
-        const outputs = field.outputs;
-        const attributes = field.attributes;
-        const events = field.events;
+        const inputs = asyncObjectSignal(field.inputs);
+        const outputs = asyncObjectSignal(field.outputs);
+        const attributes = asyncObjectSignal(field.attributes);
+        const events = asyncObjectSignal(field.events);
         const formConfig$ = signal(field.formConfig ?? {});
         const renderConfig = signal(field.renderConfig ?? {});
         let control;
@@ -1503,7 +1503,7 @@ class FormBuilder {
             origin: field,
             renderConfig: renderConfig,
             formConfig: formConfig$,
-            props: field.props,
+            props: asyncObjectSignal(field.props),
             context: this.#options.context,
             priority: field.priority,
             hooks: field.hooks,
@@ -1523,7 +1523,7 @@ class FormBuilder {
             define: define
                 ? signal({ type: define, inputs, outputs, attributes, events })
                 : undefined,
-            wrappers: field.wrappers,
+            wrappers: this.#wrapperToSignal(field.wrappers, injector),
             injector: injector,
         };
         resolvedConfig =
@@ -1750,6 +1750,23 @@ class FormBuilder {
         parent.fixedChildren().push(inputField);
     }
     #findConfig = inject(FindConfigToken);
+    #wrapperToSignal(list, injector) {
+        return combineSignal(list.map((item) => {
+            return observableSignal({
+                type: item.type,
+                attributes: asyncObjectSignal(item.attributes),
+                inputs: asyncObjectSignal(item.inputs),
+                outputs: asyncObjectSignal(item.outputs),
+                events: asyncObjectSignal(item.events),
+            }, {
+                pipe: pipe(map((item) => {
+                    const defaultWrapperConfig = this.#findConfig.findWrapperComponent(item.type);
+                    return { ...item, type: defaultWrapperConfig };
+                })),
+                injector: injector,
+            });
+        }));
+    }
 }
 _a = FormBuilder;
 
@@ -1829,19 +1846,15 @@ function mergeOutputFn(field, outputs) {
     });
 }
 const mergeOutputs = (outputs) => rawConfig((field) => {
-    field.outputs.update((originOutputs) => {
-        originOutputs = { ...originOutputs };
-        for (const key in outputs) {
-            const oldFn = originOutputs[key];
-            originOutputs[key] = (...args) => {
-                if (oldFn) {
-                    oldFn(...args);
-                }
-                return outputs[key](...args);
-            };
-        }
-        return originOutputs;
-    });
+    for (const key in outputs) {
+        const oldFn = field.outputs[key];
+        field.outputs[key] = (...args) => {
+            if (oldFn) {
+                oldFn(...args);
+            }
+            return outputs[key](...args);
+        };
+    }
 });
 const asyncMergeOutputs = (outputs) => rawConfig((field) => {
     mergeHooksFn({
@@ -1986,7 +1999,7 @@ const createRemovePropertyFn = (key) => (list) => rawConfig((rawField, _, ...arg
         if (args.length > 0 &&
             typeof args[args.length - 1] === 'object' &&
             CustomDataSymbol in args[args.length - 1]) {
-            data$ = args[args.length - 1][CustomDataSymbol];
+            data$ = args[args.length - 1][CustomDataSymbol](rawField);
         }
         else {
             data$ = (() => field);
@@ -2008,12 +2021,20 @@ function createPatchAsyncPropertyFn(key) {
         if (args.length > 0 &&
             typeof args[args.length - 1] === 'object' &&
             CustomDataSymbol in args[args.length - 1]) {
-            data$ = args[args.length - 1][CustomDataSymbol];
+            data$ = args[args.length - 1][CustomDataSymbol](rawField);
         }
         else {
-            data$ = (() => rawField);
+            data$ = rawField;
         }
-        const content$ = data$()[key];
+        const content$ = {
+            update: (fn) => {
+                let value = fn(data$[key]);
+                data$[key] = value;
+            },
+            set: (value) => {
+                data$[key] = value;
+            },
+        };
         const inputList = Object.keys(dataObj);
         // 设置初始值
         content$.update((content) => ({
@@ -2025,6 +2046,16 @@ function createPatchAsyncPropertyFn(key) {
         }));
         return mergeHooksFn({
             allFieldsResolved: (field) => {
+                let data$;
+                if (args.length > 0 &&
+                    typeof args[args.length - 1] === 'object' &&
+                    CustomDataSymbol in args[args.length - 1]) {
+                    data$ = args[args.length - 1][CustomDataSymbol](undefined, field);
+                }
+                else {
+                    data$ = (() => field);
+                }
+                const content$ = data$()[key];
                 Object.entries(dataObj).forEach(([key, value]) => {
                     const result = value(field);
                     content$.connect(key, result);
@@ -2039,12 +2070,20 @@ function createSetOrPatchPropertyFn(key, isPatch) {
         if (args.length > 0 &&
             typeof args[args.length - 1] === 'object' &&
             CustomDataSymbol in args[args.length - 1]) {
-            data$ = args[args.length - 1][CustomDataSymbol];
+            data$ = args[args.length - 1][CustomDataSymbol](rawField);
         }
         else {
-            data$ = (() => rawField);
+            data$ = rawField;
         }
-        const content$ = data$()[key];
+        const content$ = {
+            update: (fn) => {
+                let value = fn(data$[key]);
+                data$[key] = value;
+            },
+            set: (value) => {
+                data$[key] = value;
+            },
+        };
         if (isPatch) {
             content$.update((data) => ({
                 ...data,
@@ -2056,21 +2095,6 @@ function createSetOrPatchPropertyFn(key, isPatch) {
         }
     });
 }
-function createMapPropertyFn(key) {
-    return (fn) => rawConfig((rawField, _, ...args) => {
-        let data$;
-        if (args.length > 0 &&
-            typeof args[args.length - 1] === 'object' &&
-            CustomDataSymbol in args[args.length - 1]) {
-            data$ = args[args.length - 1][CustomDataSymbol];
-        }
-        else {
-            data$ = (() => rawField);
-        }
-        const content$ = data$()[key];
-        content$.map(fn);
-    });
-}
 function createMapAsyncPropertyFn(key) {
     return (fn) => rawConfig((rawField, _, ...args) => mergeHooksFn({
         allFieldsResolved: (field) => {
@@ -2078,7 +2102,7 @@ function createMapAsyncPropertyFn(key) {
             if (args.length > 0 &&
                 typeof args[args.length - 1] === 'object' &&
                 CustomDataSymbol in args[args.length - 1]) {
-                data$ = args[args.length - 1][CustomDataSymbol];
+                data$ = args[args.length - 1][CustomDataSymbol](undefined, field);
             }
             else {
                 data$ = (() => field);
@@ -2094,7 +2118,6 @@ const __actions = {
         set: createSetOrPatchPropertyFn('inputs'),
         patchAsync: createPatchAsyncPropertyFn('inputs'),
         remove: createRemovePropertyFn('inputs'),
-        map: createMapPropertyFn('inputs'),
         mapAsync: createMapAsyncPropertyFn('inputs'),
     },
     outputs: {
@@ -2104,7 +2127,6 @@ const __actions = {
         remove: createRemovePropertyFn('outputs'),
         merge: mergeOutputs,
         mergeAsync: asyncMergeOutputs,
-        map: createMapPropertyFn('outputs'),
         mapAsync: createMapAsyncPropertyFn('outputs'),
     },
     attributes: {
@@ -2112,7 +2134,6 @@ const __actions = {
         set: createSetOrPatchPropertyFn('attributes'),
         patchAsync: createPatchAsyncPropertyFn('attributes'),
         remove: createRemovePropertyFn('attributes'),
-        map: createMapPropertyFn('attributes'),
         mapAsync: createMapAsyncPropertyFn('attributes'),
     },
     events: {
@@ -2120,7 +2141,6 @@ const __actions = {
         set: createSetOrPatchPropertyFn('events'),
         patchAsync: createPatchAsyncPropertyFn('events'),
         remove: createRemovePropertyFn('events'),
-        map: createMapPropertyFn('events'),
         mapAsync: createMapAsyncPropertyFn('events'),
     },
     props: {
@@ -2128,7 +2148,6 @@ const __actions = {
         set: createSetOrPatchPropertyFn('props'),
         patchAsync: createPatchAsyncPropertyFn('props'),
         remove: createRemovePropertyFn('props'),
-        map: createMapPropertyFn('props'),
         mapAsync: createMapAsyncPropertyFn('props'),
     },
 };
@@ -2136,48 +2155,43 @@ const __actions = {
 function createSetOrPatchWrappersFn(isPatch) {
     return (wrappers) => rawConfig((rawField, _) => {
         const wrapperConfig = rawField.globalConfig.additionalData['defaultWrapperMetadataGroup'];
-        const injector = rawField.globalConfig.additionalData['injector'];
-        const OptionDefine = {
-            pipe: pipe(map((item) => {
-                if (typeof item.type === 'string') {
-                    const type = wrapperConfig[item.type]?.type;
-                    if (!type) {
-                        throw new Error(`🈳wrapper:[${item.type}]❗`);
-                    }
-                    return { ...item, type: type };
-                }
-                return item;
-            })),
-            injector: injector,
-        };
         if (!isPatch) {
-            rawField.wrappers.clean();
-        }
-        wrappers.forEach((item) => {
-            if (typeof item === 'string') {
-                const defaultActions = wrapperConfig[item]?.actions ?? [];
-                const define = observableSignal({
-                    type: item,
-                    inputs: asyncObjectSignal({}),
-                    outputs: asyncObjectSignal({}),
-                    attributes: asyncObjectSignal({}),
-                    events: asyncObjectSignal({}),
-                }, OptionDefine);
-                rawField.wrappers.add(define);
+            rawField.wrappers = [];
+        }
+        wrappers.forEach((wrapperItem) => {
+            if (typeof wrapperItem === 'string') {
+                const defaultActions = wrapperConfig[wrapperItem]?.actions ?? [];
+                const define = {
+                    type: wrapperItem,
+                    inputs: {},
+                    outputs: {},
+                    attributes: {},
+                    events: {},
+                };
+                rawField.wrappers.push(define);
                 defaultActions.forEach((item) => {
                     item.value(rawField, _, {
-                        [CustomDataSymbol]: define,
+                        [CustomDataSymbol]: (rawField, field) => {
+                            if (rawField) {
+                                return define;
+                            }
+                            else {
+                                return field.wrappers.items().find((item) => {
+                                    return (item.input().type === wrapperItem);
+                                });
+                            }
+                        },
                     });
                 });
             }
             else {
-                rawField.wrappers.add(observableSignal({
-                    type: item.type,
-                    inputs: asyncObjectSignal(item.inputs ?? {}),
-                    outputs: asyncObjectSignal(item.outputs ?? {}),
-                    attributes: asyncObjectSignal(item.attributes ?? {}),
-                    events: asyncObjectSignal(item.events ?? {}),
-                }, OptionDefine));
+                rawField.wrappers.push({
+                    type: wrapperItem.type,
+                    inputs: wrapperItem.inputs ?? {},
+                    outputs: wrapperItem.outputs ?? {},
+                    attributes: wrapperItem.attributes ?? {},
+                    events: wrapperItem.events ?? {},
+                });
             }
         });
     });
@@ -2201,6 +2215,12 @@ function removeWrappers(removeList) {
         }, { position: 'bottom' }, field);
     });
 }
+function setSubInitValue(key, fn, initObj) {
+    if (!Object.keys(initObj[key]).length) {
+        return;
+    }
+    fn()[key].set(initObj[key]);
+}
 function patchAsyncWrapper(type, actions, options) {
     return rawConfig((rawFiled) => {
         // 在这里增加要处理的wrapper类型
@@ -2228,10 +2248,24 @@ function patchAsyncWrapper(type, actions, options) {
                 }
                 const allActions = [...defaultActions, ...(actions ?? [])];
                 for (const item of allActions) {
-                    const tempField = {};
+                    const tempField = {
+                        inputs: {},
+                        outputs: {},
+                        attributes: {},
+                        events: {},
+                    };
                     item.value(tempField, undefined, {
-                        [CustomDataSymbol]: initData,
+                        [CustomDataSymbol]: (rawField, field) => {
+                            if (rawField) {
+                                return tempField;
+                            }
+                            return initData;
+                        },
                     });
+                    setSubInitValue('inputs', initData, tempField);
+                    setSubInitValue('outputs', initData, tempField);
+                    setSubInitValue('attributes', initData, tempField);
+                    setSubInitValue('events', initData, tempField);
                     tempField.hooks?.allFieldsResolved?.(field);
                 }
             },
@@ -2249,10 +2283,24 @@ function changeAsyncWrapper(indexFn, actions) {
                     throw new Error(`change wrapper not found`);
                 }
                 for (const item of actions) {
-                    const tempField = {};
+                    const tempField = {
+                        inputs: {},
+                        outputs: {},
+                        attributes: {},
+                        events: {},
+                    };
                     item.value(tempField, undefined, {
-                        [CustomDataSymbol]: initData,
+                        [CustomDataSymbol]: (rawField, field) => {
+                            if (rawField) {
+                                return tempField;
+                            }
+                            return initData;
+                        },
                     });
+                    setSubInitValue('inputs', initData, tempField);
+                    setSubInitValue('outputs', initData, tempField);
+                    setSubInitValue('attributes', initData, tempField);
+                    setSubInitValue('events', initData, tempField);
                     tempField.hooks?.allFieldsResolved?.(field);
                 }
             },
@@ -2302,16 +2350,15 @@ const componentClass = (className, merge) => rawConfig((rawField, _, ...args) =>
     if (args.length > 0 &&
         typeof args[args.length - 1] === 'object' &&
         CustomDataSymbol in args[args.length - 1]) {
-        data$ = args[args.length - 1][CustomDataSymbol];
+        data$ = args[args.length - 1][CustomDataSymbol](rawField);
     }
     else {
-        data$ = (() => rawField);
+        data$ = rawField;
     }
-    const content$ = data$()['attributes'];
-    content$.update((data) => ({
-        ...data,
-        class: merge ? clsx(data?.['class'], className) : clsx(className),
-    }));
+    const content$ = data$['attributes'];
+    content$['class'] = merge
+        ? clsx(content$['class'], className)
+        : clsx(className);
 });
 const bottomClass = componentClass;
 function patchAsyncClass(fn) {
@@ -2377,12 +2424,12 @@ const actions = {
 };
 
 class CoreSchemaHandle extends BaseSchemaHandle {
-    inputs = asyncObjectSignal({});
-    outputs = asyncObjectSignal({});
-    attributes = asyncObjectSignal({});
-    events = asyncObjectSignal({});
-    wrappers = combineSignal([]);
-    props = asyncObjectSignal({});
+    inputs = {};
+    outputs = {};
+    attributes = {};
+    events = {};
+    wrappers = [];
+    props = {};
     alias;
     movePath;
     renderConfig;
@@ -2471,16 +2518,10 @@ class CoreSchemaHandle extends BaseSchemaHandle {
         this.formConfig.groupMode = 'reset';
     }
     enumSchema(schema) {
-        this.props.update((data) => ({
-            ...data,
-            options: data['options'] ?? schema.options,
-        }));
+        this.props['options'] = this.props['options'] ?? schema.options;
     }
     updateProps(key, value) {
-        this.props.update((data) => ({
-            ...data,
-            [key]: value,
-        }));
+        this.props[key] = value;
     }
     intersectBefore(schema) {
         if (this.childrenAsVirtualGroup) {
@@ -2535,7 +2576,8 @@ class CoreSchemaHandle extends BaseSchemaHandle {
     }
     end(schema) {
         super.end(schema);
-        this.formConfig.defaultValue = this.defaultValue;
+        this.formConfig.defaultValue =
+            this.defaultValue ?? (this.nullable ? null : undefined);
     }
 }