@acorex/platform 21.0.0-next.16 → 21.0.0-next.18

package/fesm2022/acorex-platform-core.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injectable, Directive, computed, ChangeDetectionStrategy, Component, input, ElementRef, Injector, ViewContainerRef, signal, effect, runInInjectionContext, Optional, Inject, NgModule, EventEmitter, HostListener, Output, provideAppInitializer, Pipe } from '@angular/core';
+import { InjectionToken, inject, Injectable, Directive, computed, Injector, ChangeDetectionStrategy, Component, input, ElementRef, ViewContainerRef, signal, effect, runInInjectionContext, Optional, Inject, NgModule, EventEmitter, HostListener, Output, provideAppInitializer, Pipe } from '@angular/core';
 import { get, isPlainObject, set, isNil, isEmpty, isArray, merge, isObjectLike, transform, isEqual, differenceWith, union, cloneDeep, sortBy, isUndefined, endsWith, startsWith, includes, lte, gte, lt, gt, orderBy } from 'lodash-es';
 import { signalStore, withState, withComputed, withMethods, patchState } from '@ngrx/signals';
 import * as i1 from '@acorex/components/skeleton';
@@ -913,17 +913,21 @@ class AXPExpressionEvaluatorScopeProviderContext {
 const AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER = new InjectionToken('AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER');
 class AXPExpressionEvaluatorScopeProviderService {
     constructor() {
-        this.providers = inject(AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, { optional: true });
+        this.injector = inject(Injector);
         this.cache = null;
     }
     async load() {
         if (this.cache)
             return;
+        const raw = this.injector.get(AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, [], { optional: true });
+        const providers = Array.isArray(raw)
+            ? raw
+            : typeof raw === 'function'
+                ? raw()
+                : [];
         const context = new AXPExpressionEvaluatorScopeProviderContext();
-        if (Array.isArray(this.providers)) {
-            for (const provider of this.providers) {
-                await provider.provide(context);
-            }
+        for (const provider of providers) {
+            await provider.provide(context);
         }
         this.cache = context.getScopes();
     }