@piying/view-angular-core 2.2.3 → 2.3.0

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

@@ -1,4 +1,4 @@
-import { signal, computed, InjectionToken, effect, inject, Injector, untracked, DestroyRef, linkedSignal, isSignal, EnvironmentInjector } from '@angular/core';
+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 rfdc from 'rfdc';
@@ -548,9 +548,7 @@ class FieldGroup extends FieldGroupbase {
     value$$ = computed(() => {
         if (this.updateOn$$() === 'submit') {
             this.submitIndex$();
-            return untracked(() => {
-                return this.#childUpdate();
-            });
+            return untracked(() => this.#childUpdate());
         }
         return this.#childUpdate();
     });
@@ -739,9 +737,7 @@ class FieldArray extends FieldGroupbase {
     value$$ = computed(() => {
         if (this.updateOn$$() === 'submit') {
             this.submitIndex$();
-            return untracked(() => {
-                return this.#childUpdate();
-            });
+            return untracked(() => this.#childUpdate());
         }
         return this.#childUpdate();
     });
@@ -816,9 +812,7 @@ class FieldLogicGroup extends FieldArray {
     value$$ = computed(() => {
         if (this.updateOn$$() === 'submit') {
             this.submitIndex$();
-            return untracked(() => {
-                return this.#childUpdate();
-            });
+            return untracked(() => this.#childUpdate());
         }
         return this.#childUpdate();
     });
@@ -1198,12 +1192,12 @@ function observableSignal(initialValue, options) {
 
 function asyncObjectSignal(initialValue, options) {
     const data$ = signal(initialValue);
-    let mapFn$ = signal(undefined);
+    const mapFn$ = signal(undefined);
     const signalList$ = signal([]);
     const value$$ = computed(() => {
         const signalList = signalList$();
         const data = data$();
-        let mapFn = mapFn$();
+        const mapFn = mapFn$();
         if (!signalList.length) {
             return mapFn ? mapFn(data) : data;
         }
@@ -1406,12 +1400,11 @@ class FormBuilder {
         new ParentMap();
     #options = inject(PI_FORM_BUILDER_OPTIONS_TOKEN);
     #injector = inject(Injector);
-    #envInjector = inject(EnvironmentInjector);
     #allFieldInitHookList = [];
     buildRoot(item) {
         const field = this.#buildControl({
             type: 'root',
-            field: { fullPath: [] },
+            field: { fullPath: [], injector: this.#injector },
             form: undefined,
             resolvedField$: item.resolvedField$,
             append: () => { },
@@ -1446,7 +1439,7 @@ class FormBuilder {
     #buildControl(parent, 
     // 单独一项
     field, index) {
-        let define = !field.type
+        const define = !field.type
             ? undefined
             : typeof field.type !== 'string'
                 ? field.type
@@ -1466,10 +1459,19 @@ class FormBuilder {
             keyPath ??= index;
         }
         const isRoot = parent.type === 'root';
+        const injector = Injector.create({
+            providers: field.providers ?? [],
+            parent: parent.field.injector,
+        });
+        parent.field.injector.get(DestroyRef).onDestroy(() => {
+            if (resolvedConfig.injector) {
+                resolvedConfig.injector.destroy();
+            }
+        });
         if (!field.nonFieldControl && (keyPath !== undefined || isRoot)) {
             control = createField(parent.form, field, keyPath, 
             // 这里也是fullPath
-            formConfig$, isRoot, this.#injector);
+            formConfig$, isRoot, injector);
         }
         const rootForm = this.#options.form$$;
         let resolvedConfig = {
@@ -1515,7 +1517,7 @@ class FormBuilder {
                 ? signal({ type: define, inputs, outputs, attributes, events })
                 : undefined,
             wrappers: field.wrappers,
-            injector: this.#envInjector,
+            injector: injector,
         };
         resolvedConfig =
             this.afterResolveConfig(field, resolvedConfig) ?? resolvedConfig;
@@ -1719,17 +1721,15 @@ class FormBuilder {
                     provide: PI_FORM_BUILDER_ALIAS_MAP,
                     useValue: new ParentMap(this.#scopeMap),
                 },
-                { provide: EnvironmentInjector, useFactory: () => injector },
             ],
-            parent: this.#envInjector,
+            parent: parent.field.injector,
         });
-        this.#envInjector.get(DestroyRef).onDestroy(() => {
-            result.injector?.destroy();
+        parent.field.injector.get(DestroyRef).onDestroy(() => {
+            injector.destroy();
         });
         const instance = injector.get(Builder);
         const result = instance.#buildControl({ ...parent, skipAppend: true }, field, index);
         this.#allFieldInitHookList.push(() => instance.allFieldInitHookCall());
-        result.injector = injector.get(EnvironmentInjector);
         return result;
     }
     #moveViewField(key, inputField) {
@@ -2065,23 +2065,21 @@ function createMapPropertyFn(key) {
     });
 }
 function createMapAsyncPropertyFn(key) {
-    return (fn) => rawConfig((rawField, _, ...args) => {
-        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];
-                }
-                else {
-                    data$ = (() => field);
-                }
-                const content$ = data$()[key];
-                content$.map(fn(field));
-            },
-        }, { position: 'bottom' }, rawField);
-    });
+    return (fn) => rawConfig((rawField, _, ...args) => 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];
+            }
+            else {
+                data$ = (() => field);
+            }
+            const content$ = data$()[key];
+            content$.map(fn(field));
+        },
+    }, { position: 'bottom' }, rawField));
 }
 const __actions = {
     inputs: {
@@ -2129,55 +2127,53 @@ const __actions = {
 };
 
 function createSetOrPatchWrappersFn(isPatch) {
-    return (wrappers) => {
-        return 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 (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;
-                })),
-                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);
-                    defaultActions.forEach((item) => {
-                        item.value(rawField, _, {
-                            [CustomDataSymbol]: define,
-                        });
-                    });
+                    return { ...item, type: type };
                 }
-                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));
-                }
-            });
+                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);
+                defaultActions.forEach((item) => {
+                    item.value(rawField, _, {
+                        [CustomDataSymbol]: define,
+                    });
+                });
+            }
+            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));
+            }
         });
-    };
+    });
 }
 function removeWrappers(removeList) {
     return rawConfig((field) => {
@@ -2338,6 +2334,24 @@ const classAction = {
     asyncComponent: patchAsyncClass,
 };
 
+function setProviders(providers) {
+    return rawConfig((field) => {
+        field.providers = providers;
+    });
+}
+function patchProviders(providers) {
+    return rawConfig((field) => {
+        field.providers ??= [];
+        field.providers.push(providers);
+    });
+}
+function changeProviders(providersFn) {
+    return rawConfig((field) => {
+        const result = providersFn(field.providers ?? []);
+        field.providers = result;
+    });
+}
+
 const actions = {
     ...__actions,
     class: classAction,
@@ -2348,6 +2362,11 @@ const actions = {
         set: setHooks,
         patch: patchHooks,
     },
+    providers: {
+        set: setProviders,
+        patch: patchProviders,
+        change: changeProviders,
+    },
 };
 
 class CoreSchemaHandle extends BaseSchemaHandle {
@@ -2369,6 +2388,7 @@ class CoreSchemaHandle extends BaseSchemaHandle {
     isTuple = false;
     nonFieldControl = false;
     hooks;
+    providers;
     lazySchema(schema) {
         super.lazySchema(schema);
         if (this.parent) {
@@ -2534,12 +2554,11 @@ function convert(obj, options) {
             },
             { provide: FindConfigToken, useFactory: FindConfigFactory },
             options.builder,
-            { provide: EnvironmentInjector, useFactory: () => injector },
         ],
         parent: options.injector,
     });
-    options.registerOnDestroy?.(() => {
-        injector.get(EnvironmentInjector).destroy();
+    options.injector.get(DestroyRef).onDestroy(() => {
+        injector.destroy();
     });
     return convertCore(obj, (item) => {
         // todo
@@ -2572,5 +2591,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, 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, classAction as ɵclassAction, 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, 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 };
 //# sourceMappingURL=piying-view-angular-core.mjs.map