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

package/core/index.d.ts

@@ -2127,7 +2127,7 @@ declare class AXPExpressionEvaluatorScopeProviderContext {
 type AXPExpressionEvaluatorScopeProviders = AXPExpressionEvaluatorScopeProvider[] | (() => AXPExpressionEvaluatorScopeProvider[]);
 declare const AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER: InjectionToken<AXPExpressionEvaluatorScopeProviders>;
 declare class AXPExpressionEvaluatorScopeProviderService {
-    private readonly injector;
+    private providers;
     private cache;
     private load;
     getScopesAsync(): Promise<AXPExpressionEvaluatorScope>;

package/fesm2022/acorex-platform-core.mjs

@@ -1,5 +1,5 @@
 import * as i0 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 { 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 { 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';
@@ -655,8 +655,6 @@ function getSmart(obj, smartPath) {
     });
 }
 function extractValue(value, key = 'id') {
-    console.log('value', value);
-    console.log('key', key);
     if (isNil(value)) {
         return null;
     }
@@ -915,21 +913,17 @@ class AXPExpressionEvaluatorScopeProviderContext {
 const AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER = new InjectionToken('AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER');
 class AXPExpressionEvaluatorScopeProviderService {
     constructor() {
-        this.injector = inject(Injector);
+        this.providers = inject(AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, { optional: true });
         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();
-        for (const provider of providers) {
-            await provider.provide(context);
+        if (Array.isArray(this.providers)) {
+            for (const provider of this.providers) {
+                await provider.provide(context);
+            }
         }
         this.cache = context.getScopes();
     }