@acorex/core 21.0.1-next.57 → 21.0.1-next.59

package/fesm2022/acorex-core-translation.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injectable, TemplateRef, ViewContainerRef, Directive, Pipe, provideAppInitializer, NgModule } from '@angular/core';
 import { get } from 'lodash-es';
-import { of, tap, shareReplay, firstValueFrom, BehaviorSubject, switchMap, from, map } from 'rxjs';
+import { of, tap, shareReplay, firstValueFrom, BehaviorSubject, distinctUntilChanged, switchMap, from } from 'rxjs';
 import { AXEventService, AXSystemEvents } from '@acorex/core/events';
 import { AXLocaleService } from '@acorex/core/locale';
 import { waitFor } from '@acorex/core/utils';
@@ -157,10 +157,10 @@ class AXTranslationLoaderService {
     getFallbackScopes(scope) {
         return this.config.fallbacks?.scopes?.[scope] ?? [];
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationLoaderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationLoaderService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationLoaderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationLoaderService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationLoaderService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationLoaderService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -215,36 +215,18 @@ function escapeRegExp(string) {
 class TranslationResolverService {
     constructor() {
         this.loaderService = inject(AXTranslationLoaderService);
-        this.cache = new Map();
-        this.inflight = new Map();
         this.parser = new TranslationParserService();
     }
     async resolve(lang, scope, key, params) {
-        const cacheKey = `${lang}:${scope}`;
-        // Load and cache if not present
-        if (!this.cache.has(cacheKey)) {
-            if (!this.inflight.has(cacheKey)) {
-                const fetchPromise = firstValueFrom(this.loaderService.load(lang, scope));
-                this.inflight.set(cacheKey, fetchPromise);
-                try {
-                    const data = await fetchPromise;
-                    this.cache.set(cacheKey, data);
-                }
-                finally {
-                    this.inflight.delete(cacheKey);
-                }
-            }
-            else {
-                await this.inflight.get(cacheKey);
-            }
+        let result = this.loaderService.peek(lang, scope, key);
+        if (result == null) {
+            await firstValueFrom(this.loaderService.load(lang, scope));
+            result = this.loaderService.peek(lang, scope, key);
         }
-        const translations = this.cache.get(cacheKey);
-        if (!translations) {
-            console.warn(`Translations not found for ${cacheKey} after attempting to load.`);
+        if (result == null) {
             const unresolvedResult = key;
             return this.format(unresolvedResult, params);
         }
-        let result = get(translations, key, key);
         // Recursively resolve references
         if (typeof result === 'string' && this.parser.isExpression(result)) {
             const tokens = this.parser.parse(result, lang, scope);
@@ -284,6 +266,57 @@ class TranslationResolverService {
     }
 }
 
+const LOCALE_KEY_REGEX = /^(\*-\*|[a-z]{2}-[A-Z]{2})$/;
+function resolveMultiLanguageValue(value, locale) {
+    return value[locale] ?? value['en-US'] ?? Object.values(value).find((item) => item != null) ?? '';
+}
+function isValidMultiLanguageObject(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return false;
+    }
+    const entries = Object.entries(value);
+    if (!entries.length) {
+        return false;
+    }
+    return entries.every(([key, entryValue]) => LOCALE_KEY_REGEX.test(key) && typeof entryValue === 'string');
+}
+/**
+ * Resolves {@link AXMultiLanguageString} to a single string for the given locale.
+ * Fallback order: `currentLocale` → `en-US` → first map value.
+ */
+function resolveMultiLanguageString(content, currentLocale) {
+    if (content == null || content === '') {
+        return '';
+    }
+    if (typeof content === 'string') {
+        return content;
+    }
+    if (!isValidMultiLanguageObject(content)) {
+        return String(content);
+    }
+    return resolveMultiLanguageValue(content, currentLocale);
+}
+/**
+ * Creates an {@link AXMultiLanguageMap} with `en-US` and `fa-IR` entries.
+ * Use for seed data, tests, and demos that supply English and Persian copy explicitly.
+ */
+function createMultiLanguageString(enUs, faIr) {
+    return { 'en-US': enUs, 'fa-IR': faIr };
+}
+/**
+ * True when there is no displayable text in any locale (plain string or ML map).
+ */
+function isEffectivelyEmptyLocalizedValue(value) {
+    if (value == null)
+        return true;
+    if (typeof value === 'string')
+        return value.trim() === '';
+    if (typeof value !== 'object' || Array.isArray(value))
+        return false;
+    const record = value;
+    return Object.values(record).every((v) => v == null || String(v).trim() === '');
+}
+
 let singletonInstance;
 function translateSync(key, options) {
     return singletonInstance.translateSync(key, options);
@@ -298,6 +331,7 @@ class AXTranslationService {
         this.resolver = new TranslationResolverService();
         this.activeLang = new BehaviorSubject(this.config.defaults.lang);
         this.langChanges$ = this.activeLang.asObservable();
+        this.currentLocale$ = this.langChanges$.pipe(distinctUntilChanged());
         singletonInstance = this;
         this.localeService.profileChanged$.subscribe((locale) => {
             if (locale?.localeInfo?.code) {
@@ -320,37 +354,55 @@ class AXTranslationService {
     getDefaultLang() {
         return this.config.defaults.lang;
     }
-    translate$(text, options) {
-        if (!text) {
-            return of('');
+    resolve(value, locale) {
+        if (value == null) {
+            return '';
         }
-        const staticOptions = { ...options };
-        const staticScope = staticOptions.scope ?? this.config.defaults.scope;
-        return this.langChanges$.pipe(switchMap((lang) => {
-            return from(this.translateAsync(text, {
-                ...staticOptions,
-                lang: staticOptions.lang ?? lang,
-                scope: staticScope,
+        if (typeof value === 'string') {
+            return value;
+        }
+        if (!isValidMultiLanguageObject(value)) {
+            return '';
+        }
+        return resolveMultiLanguageValue(value, locale ?? this.getActiveLang());
+    }
+    toLocaleMap(value, activeLocale = this.getActiveLang()) {
+        if (isValidMultiLanguageObject(value)) {
+            return { ...value };
+        }
+        return {
+            [activeLocale]: typeof value === 'string' ? value : '',
+        };
+    }
+    translate$(value, options) {
+        if (isValidMultiLanguageObject(value)) {
+            return this.langChanges$.pipe(switchMap((activeLang) => {
+                const targetLang = options?.lang ?? activeLang;
+                const selectedValue = resolveMultiLanguageValue(value, targetLang);
+                const scope = options?.scope ?? this.config.defaults.scope;
+                return from(this.translateAsync(selectedValue, {
+                    ...options,
+                    lang: targetLang,
+                    scope,
+                }));
             }));
-        }), shareReplay({ bufferSize: 1, refCount: true }));
+        }
+        return this.translateValue$(value, options);
     }
     async translateAsync(text, options) {
-        const lang = options?.lang ?? this.getActiveLang() ?? this.config.defaults.lang;
-        const scope = options?.scope ?? this.config.defaults.scope;
+        const { lang, scope } = this.resolveContext(options);
         const params = options?.params;
         if (!this.parser.isExpression(text)) {
-            const resolved = await this.resolver.resolve(lang, scope, text, params);
-            return this.resolver.format(resolved, params);
+            return this.resolver.resolve(lang, scope, text, params);
         }
         const tokens = this.parser.parse(text, lang, scope);
         const results = await Promise.all(tokens.map((token) => this.resolver
             .resolve(token.lang ?? lang, token.scope ?? scope, token.key, params)
-            .then((translated) => [token.fullMatch, this.resolver.format(translated, params)])));
+            .then((translated) => [token.fullMatch, translated])));
         return results.reduce((output, [match, translated]) => output.replace(match, translated), text);
     }
     translateSync(text, options) {
-        const lang = options?.lang ?? this.getActiveLang() ?? this.config.defaults.lang;
-        const scope = options?.scope ?? this.config.defaults.scope;
+        const { lang, scope } = this.resolveContext(options);
         const params = options?.params;
         const waitForLoad = options?.waitForLoad ?? false;
         const timeoutMs = options?.timeoutMs ?? 100;
@@ -376,10 +428,40 @@ class AXTranslationService {
         }
         return result;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationService, providedIn: 'root' }); }
+    translateValue$(text, options) {
+        if (!text) {
+            return of('');
+        }
+        const staticOptions = { ...options };
+        const staticScope = staticOptions.scope ?? this.config.defaults.scope;
+        return this.langChanges$.pipe(switchMap((lang) => {
+            return from(this.translateAsync(text, {
+                ...staticOptions,
+                lang: staticOptions.lang ?? lang,
+                scope: staticScope,
+            }));
+        }), shareReplay({ bufferSize: 1, refCount: true }));
+    }
+    resolveContext(options) {
+        return {
+            lang: options?.lang ?? this.getActiveLang() ?? this.config.defaults.lang,
+            scope: options?.scope ?? this.config.defaults.scope,
+        };
+    }
+    isValidMultiLanguageObject(value) {
+        if (!value || typeof value !== 'object' || Array.isArray(value)) {
+            return false;
+        }
+        const entries = Object.entries(value);
+        if (!entries.length) {
+            return false;
+        }
+        return entries.every(([key, entryValue]) => LOCALE_KEY_REGEX.test(key) && typeof entryValue === 'string');
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -413,45 +495,28 @@ class AXTranslatorDirective {
         this.vc.clear();
         this.vc.createEmbeddedView(this.templateRef, { $implicit: t });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslatorDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
-    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.3.3", type: AXTranslatorDirective, isStandalone: true, selector: "[translate]", ngImport: i0 }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslatorDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "21.1.3", type: AXTranslatorDirective, isStandalone: true, selector: "[translate]", ngImport: i0 }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslatorDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslatorDirective, decorators: [{
             type: Directive,
             args: [{ selector: '[translate]' }]
         }] });
 
-const LOCALE_KEY_REGEX = /^(\*-\*|[a-z]{2}-[A-Z]{2})$/;
 class AXTranslatorPipe {
     constructor() {
         this.service = inject(AXTranslationService);
     }
     transform(value, options) {
         if (!value) {
-            return of(''); // Return an empty observable if the key is not provided
-        }
-        if (this.isMultiLanguageMap(value)) {
-            return this.service.langChanges$.pipe(map((activeLang) => this.resolveMultiLanguageValue(value, options?.lang ?? activeLang)));
+            return of('');
         }
         return this.service.translate$(value, options);
     }
-    isMultiLanguageMap(value) {
-        if (!value || typeof value !== 'object' || Array.isArray(value)) {
-            return false;
-        }
-        const entries = Object.entries(value);
-        if (!entries.length) {
-            return false;
-        }
-        return entries.every(([key, entryValue]) => LOCALE_KEY_REGEX.test(key) && typeof entryValue === 'string');
-    }
-    resolveMultiLanguageValue(value, locale) {
-        return value[locale] ?? value['en-US'] ?? Object.values(value).find((item) => item != null) ?? '';
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslatorPipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe }); }
-    static { this.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "20.3.3", ngImport: i0, type: AXTranslatorPipe, isStandalone: true, name: "translate" }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslatorPipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe }); }
+    static { this.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "21.1.3", ngImport: i0, type: AXTranslatorPipe, isStandalone: true, name: "translate" }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslatorPipe, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslatorPipe, decorators: [{
             type: Pipe,
             args: [{
                     name: 'translate',
@@ -465,16 +530,16 @@ function initializeApp(translatorService) {
     };
 }
 class AXTranslationModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationModule, imports: [AXTranslatorPipe, AXTranslatorDirective], exports: [AXTranslatorPipe, AXTranslatorDirective] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationModule, providers: [
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationModule, imports: [AXTranslatorPipe, AXTranslatorDirective], exports: [AXTranslatorPipe, AXTranslatorDirective] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationModule, providers: [
             provideAppInitializer(() => {
                 const initializerFn = initializeApp(inject(AXTranslationLoaderService));
                 return initializerFn();
             }),
         ] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImport: i0, type: AXTranslationModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AXTranslationModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [AXTranslatorPipe, AXTranslatorDirective],
@@ -492,5 +557,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AXTranslationDefaultConfig, AXTranslationLoaderDefault, AXTranslationModule, AXTranslationService, AXTranslatorDirective, AXTranslatorPipe, AX_TRANSLATION_CONFIG, AX_TRANSLATION_LOADER, loadTranslationScope, translateSync, translationConfig };
+export { AXTranslationDefaultConfig, AXTranslationLoaderDefault, AXTranslationModule, AXTranslationService, AXTranslatorDirective, AXTranslatorPipe, AX_TRANSLATION_CONFIG, AX_TRANSLATION_LOADER, LOCALE_KEY_REGEX, createMultiLanguageString, isEffectivelyEmptyLocalizedValue, isValidMultiLanguageObject, loadTranslationScope, resolveMultiLanguageString, resolveMultiLanguageValue, translateSync, translationConfig };
 //# sourceMappingURL=acorex-core-translation.mjs.map