@mmstack/translate 21.1.13 → 21.1.15

package/fesm2022/mmstack-translate.mjs

@@ -3,7 +3,6 @@ import { computed, inject, InjectionToken, LOCALE_ID, signal, untracked, isDevMo
 import { createIntlCache, createIntl } from '@formatjs/intl';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { Router, ActivatedRoute } from '@angular/router';
-import { inject as inject$1 } from '@angular/core/primitives/di';
 
 const KEY_DELIM = '::MMT_DELIM::';
 function prependDelim(prefix, key) {
@@ -56,6 +55,10 @@ function createNamespace(ns, translation) {
     return namespace;
 }
 
+/**
+ * Dynamic path parameter signal, that allows resolution even when paramsInheritenceStrategy isnt always
+ * This helper depends on an internal
+ */
 function pathParam(key, route = inject(ActivatedRoute)) {
     const keySignal = typeof key === 'string' ? computed(() => key) : computed(key);
     const routerOptions = inject(Router)['options'];
@@ -143,7 +146,7 @@ function readLocaleUnsafe() {
 function injectLocaleInternal() {
     return STORE_LOCALE;
 }
-function proxyToGlobalSignleton(src) {
+function proxyToGlobalSingleton(src) {
     const originalSet = src.set;
     src.set = (next) => {
         originalSet(next);
@@ -249,7 +252,7 @@ class TranslationStore {
         messages: this.messages(),
     }, this.cache), ...(ngDevMode ? [{ debugName: "intl" }] : /* istanbul ignore next */ []));
     constructor() {
-        this.locale = proxyToGlobalSignleton(initLocale(signal('en-US')));
+        this.locale = proxyToGlobalSingleton(initLocale(signal('en-US')));
         const paramName = this.config?.localeParamName;
         if (paramName) {
             const param = pathParam(paramName);
@@ -486,7 +489,7 @@ function createFormatterProvider(formatterName, libraryDefaults, nonLocaleEqual)
             },
         };
     };
-    const injectFn = () => inject$1(token);
+    const injectFn = () => inject(token);
     return [provider, injectFn];
 }
 
@@ -630,9 +633,9 @@ function injectFormatDisplayName() {
             return formatDisplayName(value, type, defaults());
         const unwrapped = unwrap(localeOrOpt);
         const opt = typeof unwrapped === 'object'
-            ? { ...defaults, ...unwrapped }
+            ? { ...defaults(), ...unwrapped }
             : {
-                ...defaults,
+                ...defaults(),
                 locale: unwrapped,
             };
         return formatDisplayName(value, type, opt);
@@ -966,6 +969,9 @@ function injectFormatters() {
     };
 }
 
+/**
+ * @internal
+ */
 function injectResolveParamLocale(snapshot) {
     let locale = null;
     const paramName = injectIntlConfig()?.localeParamName;
@@ -978,7 +984,7 @@ function injectResolveParamLocale(snapshot) {
         if (!locale && !alwaysInheritParams) {
             let currentRoute = snapshot;
             while (currentRoute && !locale) {
-                locale = currentRoute.paramMap.get('locale');
+                locale = currentRoute.paramMap.get(paramName);
                 currentRoute = currentRoute.parent;
             }
         }
@@ -1045,44 +1051,85 @@ function createT(store, keyMap = new Map()) {
     };
     return fn;
 }
+function isCompiledTranslation(value) {
+    return (!!value &&
+        typeof value === 'object' &&
+        'flat' in value &&
+        'namespace' in value);
+}
+/**
+ * @internal exported for unit testing
+ *
+ * Unwraps a loader result to a `CompiledTranslation`. Detection order:
+ *   1. value is already a `CompiledTranslation` (has `flat` + `namespace`)
+ *   2. value has a `default` export holding a `CompiledTranslation` (ESM default)
+ *   3. value has a `translation` export holding a `CompiledTranslation` (named export)
+ */
+function resolveTranslationModule(loaded) {
+    if (isCompiledTranslation(loaded))
+        return loaded;
+    if (loaded && typeof loaded === 'object') {
+        const def = loaded.default;
+        if (isCompiledTranslation(def))
+            return def;
+        const tr = loaded.translation;
+        if (isCompiledTranslation(tr))
+            return tr;
+    }
+    throw new Error('[@mmstack/translate] Loader did not return a CompiledTranslation. Expected the value from `createNamespace` / `createTranslation`, or a module exporting one as `default` or `translation`.');
+}
 function registerNamespace(defaultTranslation, other) {
     const keyMap = new Map();
+    // Pre-wrap loaders once so the rest of the pipeline — including the
+    // dynamic-locale loader in `TranslationStore`, which reads `.namespace`
+    // and `.flat` directly off the result — always sees a `CompiledTranslation`
+    // regardless of which loader shape the caller used.
+    const unwrappedDefault = () => defaultTranslation().then(resolveTranslationModule);
+    const unwrappedOther = Object.fromEntries(Object.entries(other).map(([loc, loader]) => [
+        loc,
+        () => loader().then(resolveTranslationModule),
+    ]));
     const injectT = () => {
         const store = inject(TranslationStore);
         return addSignalFn(createT(store, keyMap), store, keyMap);
     };
+    // Tracks whether the default locale's translation has been loaded by any prior
+    // resolver call. Captured in closure across navigations on purpose — concurrent
+    // resolves may each see `false` and both queue a default preload; that's harmless
+    // because `store.register` is idempotent (same payload overwrites with the same
+    // value). Do not add locking here.
     let defaultTranslationLoaded = false;
     const resolver = async (snapshot) => {
         const store = inject(TranslationStore);
         const locale = injectResolveParamLocale(snapshot);
         const defaultLocale = injectDefaultLocale();
         const shouldPreloadDefault = injectIntlConfig()?.preloadDefaultLocale ?? false;
-        const tPromise = other[locale];
-        const promise = tPromise ?? defaultTranslation;
+        const tPromise = unwrappedOther[locale];
+        const promise = tPromise ?? unwrappedDefault;
         if (!promise && isDevMode()) {
             return console.warn(`No translation found for locale: ${locale}`);
         }
-        if (promise === defaultTranslation && defaultTranslationLoaded)
+        if (promise === unwrappedDefault && defaultTranslationLoaded)
             return;
         try {
             const promises = [promise()];
             if (shouldPreloadDefault &&
                 !defaultTranslationLoaded &&
-                promise !== defaultTranslation)
-                promises.push(defaultTranslation());
+                promise !== unwrappedDefault)
+                promises.push(unwrappedDefault());
             const translations = await Promise.allSettled(promises);
-            const fullfilled = translations.map((t) => t.status === 'fulfilled' ? t.value : null);
-            if (fullfilled.at(0) === null && fullfilled.at(1) === null)
+            const fulfilled = translations.map((t) => t.status === 'fulfilled' ? t.value : null);
+            if (fulfilled.at(0) === null && fulfilled.at(1) === null)
                 throw new Error('Failed to load translations');
-            const [t, defaultT] = fullfilled;
+            const [t, defaultT] = fulfilled;
             const ns = t?.namespace ?? defaultT?.namespace;
             if (!ns)
                 throw new Error('No namespace found in translation');
             if (isDevMode() && t && t.locale !== locale && t.locale)
                 console.warn(`Expected locale to be ${locale} but got ${t.locale}`);
             store.registerOnDemandLoaders(ns, {
-                ...other,
-                [defaultLocale]: defaultTranslation,
+                ...unwrappedOther,
+                [defaultLocale]: unwrappedDefault,
             });
             const toRegister = {};
             if (t)
@@ -1090,7 +1137,7 @@ function registerNamespace(defaultTranslation, other) {
             if (defaultT)
                 toRegister[defaultLocale] = defaultT.flat;
             store.register(ns, toRegister);
-            if (promise === defaultTranslation || defaultT)
+            if (promise === unwrappedDefault || defaultT)
                 defaultTranslationLoaded = true;
         }
         catch {
@@ -1114,10 +1161,21 @@ function registerNamespace(defaultTranslation, other) {
  */
 function registerRemoteNamespace(ns, defaultTranslation, other) {
     const keyMap = new Map();
+    // The dynamic-locale loader in TranslationStore reads `.namespace` and `.flat`
+    // off the loader result, so on-demand loaders must return CompiledTranslation.
+    // Wrap the raw remote fetchers once here at registration time rather than every
+    // resolver call.
+    const compileLoader = (loader, locale) => () => loader().then((raw) => compileTranslation(raw, ns, locale));
+    const compiledOther = Object.fromEntries(Object.entries(other).map(([loc, loader]) => [
+        loc,
+        compileLoader(loader, loc),
+    ]));
     const injectT = () => {
         const store = inject(TranslationStore);
         return addSignalFn(createT(store, keyMap), store, keyMap);
     };
+    // See `defaultTranslationLoaded` in `registerNamespace` for rationale —
+    // intentionally racy, safe via idempotent `store.register`.
     let defaultTranslationLoaded = false;
     const resolver = async (snapshot) => {
         const store = inject(TranslationStore);
@@ -1138,10 +1196,10 @@ function registerRemoteNamespace(ns, defaultTranslation, other) {
                 promise !== defaultTranslation)
                 promises.push(defaultTranslation());
             const translations = await Promise.allSettled(promises);
-            const fullfilled = translations.map((t) => t.status === 'fulfilled' ? t.value : null);
-            if (fullfilled.at(0) === null && fullfilled.at(1) === null)
+            const fulfilled = translations.map((t) => t.status === 'fulfilled' ? t.value : null);
+            if (fulfilled.at(0) === null && fulfilled.at(1) === null)
                 throw new Error('Failed to load translations');
-            const [baseT, baseDefaultT] = fullfilled;
+            const [baseT, baseDefaultT] = fulfilled;
             const t = baseT ? compileTranslation(baseT, ns, locale) : null;
             const defaultT = baseDefaultT
                 ? compileTranslation(baseDefaultT, ns, defaultLocale)
@@ -1149,8 +1207,8 @@ function registerRemoteNamespace(ns, defaultTranslation, other) {
             if (isDevMode() && t && t.locale !== locale && t.locale)
                 console.warn(`Expected locale to be ${locale} but got ${t.locale}`);
             store.registerOnDemandLoaders(ns, {
-                ...other,
-                [defaultLocale]: defaultTranslation,
+                ...compiledOther,
+                [defaultLocale]: compileLoader(defaultTranslation, defaultLocale),
             });
             const toRegister = {};
             if (t)
@@ -1373,6 +1431,10 @@ function createTransformFn() {
     const store = inject(TranslationStore);
     const t = createT(store);
     const fn = (key, variablesOrLocale, 
+    // The locale argument is unused at runtime — the active locale comes from
+    // `TranslationStore`. It exists on the signature so consumers can pass
+    // `locale()` as a pipe argument (`'key' | translate : vars : locale()`)
+    // to bust Angular's pure-pipe memoization on locale changes.
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _) => {
         const vars = typeof variablesOrLocale === 'string' ? undefined : variablesOrLocale;
@@ -1423,5 +1485,5 @@ function withParams(message) {
  * Generated bundle index. Do not edit.
  */
 
-export { Translate, Translator, canMatchLocale, compileTranslation, createNamespace, formatCurrency, formatDate, formatDisplayName, formatList, formatNumber, formatPercent, formatRelativeTime, injectAddTranslations, injectDynamicLocale, injectFormatCurrency, injectFormatDate, injectFormatDisplayName, injectFormatList, injectFormatNumber, injectFormatPercent, injectFormatRelativeTime, injectFormatters, injectIntl, injectResolveParamLocale, injectSupportedLocales, injectUnsafeT, provideFormatCurrencyDefaults, provideFormatDateDefaults, provideFormatDefaults, provideFormatDisplayNameDefaults, provideFormatListDefaults, provideFormatNumberDefaults, provideFormatPercentDefaults, provideFormatRelativeTimeDefaults, provideIntlConfig, provideMockTranslations, registerNamespace, registerRemoteNamespace, withParams };
+export { Translate, Translator, canMatchLocale, compileTranslation, createNamespace, formatCurrency, formatDate, formatDisplayName, formatList, formatNumber, formatPercent, formatRelativeTime, injectAddTranslations, injectDefaultLocale, injectDynamicLocale, injectFormatCurrency, injectFormatDate, injectFormatDisplayName, injectFormatList, injectFormatNumber, injectFormatPercent, injectFormatRelativeTime, injectFormatters, injectIntl, injectResolveParamLocale, injectSupportedLocales, injectUnsafeT, provideFormatCurrencyDefaults, provideFormatDateDefaults, provideFormatDefaults, provideFormatDisplayNameDefaults, provideFormatListDefaults, provideFormatNumberDefaults, provideFormatPercentDefaults, provideFormatRelativeTimeDefaults, provideIntlConfig, provideMockTranslations, registerNamespace, registerRemoteNamespace, withParams };
 //# sourceMappingURL=mmstack-translate.mjs.map