@acorex/platform 21.0.0-next.3 → 21.0.0-next.7

package/fesm2022/acorex-platform-common.mjs

@@ -4,7 +4,7 @@ import { kebabCase, merge, sortBy, cloneDeep, get, omit } from 'lodash-es';
 import { Router, ROUTES, RouterModule } from '@angular/router';
 import { AXPSessionService, AXPSessionStatus } from '@acorex/platform/auth';
 import { Subject, distinctUntilChanged, merge as merge$1 } from 'rxjs';
-import { AXPModuleProviderRegistry, AXPPlatformScope, AXPBroadcastEventService, objectKeyValueTransforms, AXPSystemActionType, AXPModuleManifestModule, AXPAppStartUpProvider, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, AXPModuleManifestRegistry } from '@acorex/platform/core';
+import { AXPPlatformScope, AXPBroadcastEventService, objectKeyValueTransforms, AXPSystemActionType, AXPModuleManifestModule, AXPAppStartUpProvider, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, AXPModuleManifestRegistry } from '@acorex/platform/core';
 import { AXTranslationService } from '@acorex/core/translation';
 import { AXPWidgetsCatalog } from '@acorex/platform/layout/widget-core';
 import { AXPopupModule, AXPopupService } from '@acorex/components/popup';
@@ -321,7 +321,6 @@ const AXP_SETTING_DEFINITION_PROVIDER = new InjectionToken('AXP_SETTING_DEFINITI
 class AXPSettingDefinitionProviderService {
     constructor() {
         this.providers = inject(AXP_SETTING_DEFINITION_PROVIDER, { optional: true });
-        this.providerRegistry = inject(AXPModuleProviderRegistry);
         this.cache = null;
     }
     async load() {
@@ -329,7 +328,7 @@ class AXPSettingDefinitionProviderService {
             return;
         }
         const context = new AXPSettingDefinitionProviderContext();
-        // Load providers from DI tokens (backward compatibility)
+        // Load providers from DI tokens
         if (Array.isArray(this.providers)) {
             for (const provider of this.providers) {
                 if (provider instanceof Promise) {
@@ -343,11 +342,6 @@ class AXPSettingDefinitionProviderService {
                 }
             }
         }
-        // Load providers from registry (manifest-based, conditionally loaded)
-        const registryProviders = this.providerRegistry.getSettingProviders();
-        for (const provider of registryProviders) {
-            await provider.provide(context);
-        }
         this.cache = context.getGroups();
     }
     async reload() {
@@ -1640,7 +1634,6 @@ class AXPMenuProviderService {
     constructor() {
         //#region ----   Dependencies   ----
         this.providers = inject(AXP_MENU_PROVIDER, { optional: true });
-        this.providerRegistry = inject(AXPModuleProviderRegistry);
         this.middlewareRegistry = inject(AXPMenuMiddlewareRegistry);
         //#endregion
         //#region ----   State   ----
@@ -1668,17 +1661,20 @@ class AXPMenuProviderService {
         }
         const items = [];
         const context = this.createMenuProviderContext(items);
-        // Load providers from DI tokens (backward compatibility)
+        // Load providers from DI tokens
         if (Array.isArray(this.providers)) {
             for (const provider of this.providers) {
-                await provider.provide(context);
+                if (provider instanceof Promise) {
+                    // If provider is a promise, resolve it
+                    const resolvedProvider = await provider;
+                    await resolvedProvider.provide(context);
+                }
+                else {
+                    // If provider is a direct instance, use it directly
+                    await provider.provide(context);
+                }
             }
         }
-        // Load providers from registry (manifest-based, conditionally loaded)
-        const registryProviders = this.providerRegistry.getMenuProviders();
-        for (const provider of registryProviders) {
-            await provider.provide(context);
-        }
         // Apply pending operations
         this.applyPendingOperations(items);
         // Sort items by priority
@@ -1698,17 +1694,20 @@ class AXPMenuProviderService {
     async rawItems() {
         const items = [];
         const context = this.createMenuProviderContext(items);
-        // Load providers from DI tokens (backward compatibility)
+        // Load providers from DI tokens
         if (Array.isArray(this.providers)) {
             for (const provider of this.providers) {
-                await provider.provide(context);
+                if (provider instanceof Promise) {
+                    // If provider is a promise, resolve it
+                    const resolvedProvider = await provider;
+                    await resolvedProvider.provide(context);
+                }
+                else {
+                    // If provider is a direct instance, use it directly
+                    await provider.provide(context);
+                }
             }
         }
-        // Load providers from registry (manifest-based, conditionally loaded)
-        const registryProviders = this.providerRegistry.getMenuProviders();
-        for (const provider of registryProviders) {
-            await provider.provide(context);
-        }
         // Apply pending operations
         this.applyPendingOperations(items);
         // Sort items by priority
@@ -2498,7 +2497,6 @@ const AXP_SEARCH_DEFINITION_PROVIDER = new InjectionToken('AXP_SEARCH_DEFINITION
 class AXPSearchDefinitionProviderService {
     constructor() {
         this.providers = inject(AXP_SEARCH_DEFINITION_PROVIDER, { optional: true });
-        this.providerRegistry = inject(AXPModuleProviderRegistry);
         this.cache = null;
     }
     async load() {
@@ -2561,7 +2559,6 @@ const AXP_SEARCH_PROVIDER = new InjectionToken('AXP_SEARCH_PROVIDER');
 class AXPSearchService {
     constructor() {
         this.providers = inject(AXP_SEARCH_PROVIDER, { optional: true });
-        this.providerRegistry = inject(AXPModuleProviderRegistry);
         this.definitionService = inject(AXPSearchDefinitionProviderService);
         this.formatService = inject(AXFormatService);
     }
@@ -2570,19 +2567,15 @@ class AXPSearchService {
         if (this.definitionService.getList().length == 0) {
             await this.definitionService.getListAsync();
         }
-        // Collect providers from both DI tokens and registry
+        // Collect providers from DI tokens
         const allProviders = [];
-        // Load from DI tokens (backward compatibility)
+        // Load from DI tokens
         if (Array.isArray(this.providers)) {
             allProviders.push(...this.providers);
         }
         else if (this.providers) {
             allProviders.push(this.providers);
         }
-        // Load from registry (manifest-based, conditionally loaded)
-        // Note: Registry stores AXPSearchCommandProvider which implements AXPSearchProvider
-        const registryProviders = this.providerRegistry.getSearchProviders();
-        allProviders.push(...registryProviders);
         if (allProviders.length === 0) {
             throw new Error('No search providers available');
         }
@@ -3106,7 +3099,7 @@ const AXP_STATUS_PROVIDERS = new InjectionToken('AXP_STATUS_PROVIDERS');
  */
 class AXPStatusDefinitionProviderService {
     //#endregion
-    //#region ----   Constructor   ----
+    //#region ----   Initialization   ----
     constructor() {
         //#region ----   Dependencies   ----
         this.providers = inject(AXP_STATUS_PROVIDERS, { optional: true }) ?? [];
@@ -3114,19 +3107,49 @@ class AXPStatusDefinitionProviderService {
         //#endregion
         //#region ----   State   ----
         this.statusMap = new Map();
-        // Register all providers in constructor (like badge service)
+        this.initializationPromise = null;
+        this.isInitialized = false;
+        this.initialize();
+    }
+    /**
+     * Initialize providers (resolve promises if needed)
+     * Called lazily on first access
+     */
+    async initialize() {
+        if (this.isInitialized) {
+            return;
+        }
+        if (this.initializationPromise) {
+            return this.initializationPromise;
+        }
+        this.initializationPromise = this._doInitialize();
+        await this.initializationPromise;
+    }
+    async _doInitialize() {
+        // Register all providers, resolving promises if needed
         for (const provider of this.providers) {
-            if (this.statusMap.has(provider.key)) {
-                console.warn(`Status with key "${provider.key}" already exists. Overwriting with new status.`);
+            let resolvedProvider;
+            if (provider instanceof Promise) {
+                // If provider is a promise, resolve it
+                resolvedProvider = await provider;
+            }
+            else {
+                // If provider is a direct instance, use it directly
+                resolvedProvider = provider;
+            }
+            if (this.statusMap.has(resolvedProvider.key)) {
+                console.warn(`Status with key "${resolvedProvider.key}" already exists. Overwriting with new status.`);
             }
-            this.statusMap.set(provider.key, provider);
+            this.statusMap.set(resolvedProvider.key, resolvedProvider);
         }
+        this.isInitialized = true;
     }
     //#endregion
     //#region ----   Public API   ----
     /**
      * Get a status provider by key
-     * Direct access from Map (no lazy load, no cache)
+     * Direct synchronous access from Map. Providers are initialized in the constructor,
+     * including lazy-loaded providers (promises) which are resolved during initialization.
      *
      * @param key - Status key (e.g., 'task-management.status')
      * @returns Status provider with all statuses and transitions, or undefined if not found
@@ -3163,7 +3186,8 @@ class AXPStatusDefinitionProviderService {
      * ```
      */
     async executeTransition(definitionKey, transition, context) {
-        const provider = this.getStatus(definitionKey);
+        await this.initialize();
+        const provider = this.statusMap.get(definitionKey);
         if (!provider) {
             throw new Error(`Status provider with key "${definitionKey}" not found.`);
         }