@piying/view-angular-core 2.2.4 → 2.3.1

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';
@@ -60,6 +60,7 @@ const PI_FORM_BUILDER_OPTIONS_TOKEN = new InjectionToken('PI_FORM_BUILDER_OPTION
 const PI_FORM_BUILDER_ALIAS_MAP = new InjectionToken('PI_FORM_BUILDER_ALIAS_MAP');
 /** 上下文注入 */
 const PI_CONTEXT_TOKEN = new InjectionToken('PI_CONTEXT');
+const PI_VIEW_FIELD_TOKEN = new InjectionToken('PI_VIEW_FIELD_TOKEN');
 
 const clone = rfdc({ proto: false, circles: false });
 
@@ -1400,12 +1401,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: () => { },
@@ -1460,10 +1460,25 @@ class FormBuilder {
             keyPath ??= index;
         }
         const isRoot = parent.type === 'root';
+        const injector = Injector.create({
+            providers: [
+                ...(field.providers ?? []),
+                {
+                    provide: PI_VIEW_FIELD_TOKEN,
+                    useValue: () => resolvedConfig,
+                },
+            ],
+            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 = {
@@ -1509,7 +1524,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;
@@ -1713,17 +1728,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) {
@@ -2328,6 +2341,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,
@@ -2338,6 +2369,11 @@ const actions = {
         set: setHooks,
         patch: patchHooks,
     },
+    providers: {
+        set: setProviders,
+        patch: patchProviders,
+        change: changeProviders,
+    },
 };
 
 class CoreSchemaHandle extends BaseSchemaHandle {
@@ -2359,6 +2395,7 @@ class CoreSchemaHandle extends BaseSchemaHandle {
     isTuple = false;
     nonFieldControl = false;
     hooks;
+    providers;
     lazySchema(schema) {
         super.lazySchema(schema);
         if (this.parent) {
@@ -2524,12 +2561,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
@@ -2562,5 +2598,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, 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 };
 //# sourceMappingURL=piying-view-angular-core.mjs.map