@acorex/platform 21.0.0-next.55 → 21.0.0-next.57

package/fesm2022/acorex-platform-common.mjs

@@ -596,20 +596,30 @@ class AXPSettingDefaultValuesAggregatorService {
         this.definitionService = inject(AXPSettingDefinitionProviderService);
         this.providers = inject(AXP_SETTING_DEFAULT_VALUES_PROVIDERS, { optional: true }) ?? [];
     }
-    async getDefaults() {
+    async getMerged() {
         const baseDefaults = await this.definitionService.defaultValues();
         const ordered = [...this.providers].sort((a, b) => (a.priority ?? 0) - (b.priority ?? 0));
         const merged = { ...baseDefaults };
+        const seedScopeByKey = {};
         for (const provider of ordered) {
             try {
                 const overrideMap = await provider.provide();
                 Object.assign(merged, overrideMap);
+                if (provider.scope) {
+                    for (const key of Object.keys(overrideMap)) {
+                        seedScopeByKey[key] = provider.scope;
+                    }
+                }
             }
             catch (err) {
                 console.error('AXPSettingDefaultValuesProvider failed:', err);
             }
         }
-        return merged;
+        return { defaults: merged, seedScopeByKey };
+    }
+    async getDefaults() {
+        const { defaults } = await this.getMerged();
+        return defaults;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPSettingDefaultValuesAggregatorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPSettingDefaultValuesAggregatorService, providedIn: 'root' }); }
@@ -896,14 +906,17 @@ class AXPSettingsService {
     async seedMissingDefaults() {
         const definitionService = this.injector.get(AXPSettingDefinitionProviderService);
         const aggregator = this.injector.get(AXPSettingDefaultValuesAggregatorService);
-        const [defaults, scopeByKey] = await Promise.all([aggregator.getDefaults(), definitionService.settingScopeByKey()]);
+        const [{ defaults, seedScopeByKey }, scopeByKey] = await Promise.all([
+            aggregator.getMerged(),
+            definitionService.settingScopeByKey(),
+        ]);
         const persistedKeysByScope = new Map(await Promise.all(this.providers.map(async (provider) => {
             const stored = await provider.load();
             return [provider.scope, new Set(stored.map((s) => s.key))];
         })));
         const toPersist = {};
         for (const [key, value] of Object.entries(defaults)) {
-            const scope = scopeByKey[key];
+            const scope = seedScopeByKey[key] ?? scopeByKey[key];
             if (!scope || value === undefined || persistedKeysByScope.get(scope)?.has(key)) {
                 continue;
             }