@mmstack/translate 20.5.11 → 20.5.13

package/fesm2022/mmstack-translate.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { computed, inject, InjectionToken, LOCALE_ID, signal, isDevMode, effect, resource, untracked, Injectable, isSignal, input, Renderer2, ElementRef, afterRenderEffect, Directive, ChangeDetectorRef } from '@angular/core';
+import { computed, inject, InjectionToken, LOCALE_ID, signal, untracked, isDevMode, effect, resource, Injectable, isSignal, input, Renderer2, ElementRef, afterRenderEffect, Directive, ChangeDetectorRef } from '@angular/core';
 import { createIntlCache, createIntl } from '@formatjs/intl';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { Router, ActivatedRoute } from '@angular/router';
@@ -55,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'];
@@ -132,9 +136,27 @@ function injectSupportedLocales() {
  * the actual locale signal used to store the current locale string
  */
 const STORE_LOCALE = signal('en-US', ...(ngDevMode ? [{ debugName: "STORE_LOCALE" }] : []));
+/**
+ * @internal
+ * @deprecated will be removed when ng23 drops
+ */
+function readLocaleUnsafe() {
+    return STORE_LOCALE();
+}
 function injectLocaleInternal() {
     return STORE_LOCALE;
 }
+function proxyToGlobalSingleton(src) {
+    const originalSet = src.set;
+    src.set = (next) => {
+        originalSet(next);
+        STORE_LOCALE.set(next);
+    };
+    src.update = (updater) => {
+        src.set(updater(untracked(src)));
+    };
+    return src;
+}
 function isDynamicConfig(cfg) {
     return !!cfg && 'localeStorage' in cfg && !!cfg.localeStorage;
 }
@@ -232,7 +254,7 @@ class TranslationStore {
         messages: this.messages(),
     }, this.cache), ...(ngDevMode ? [{ debugName: "intl" }] : []));
     constructor() {
-        this.locale = initLocale(STORE_LOCALE);
+        this.locale = proxyToGlobalSingleton(initLocale(signal('en-US')));
         const paramName = this.config?.localeParamName;
         if (paramName) {
             const param = pathParam(paramName);
@@ -426,6 +448,53 @@ function injectAddTranslations() {
     };
 }
 
+function equalLocale(a, b) {
+    return a.locale === b.locale;
+}
+function createFormatterProvider(formatterName, libraryDefaults, nonLocaleEqual) {
+    const token = new InjectionToken(`@mmstack/translate:format-${formatterName}-config`, {
+        factory: () => {
+            const loc = injectDynamicLocale();
+            return computed(() => ({
+                ...libraryDefaults,
+                locale: loc(),
+            }), { equal: equalLocale });
+        },
+    });
+    const provider = (valueOrFn) => {
+        const fnProvider = typeof valueOrFn === 'function'
+            ? valueOrFn
+            : () => valueOrFn;
+        return {
+            provide: token,
+            useFactory: () => {
+                const loc = injectDynamicLocale();
+                const providedDefaultsOrSignal = fnProvider();
+                if (isSignal(providedDefaultsOrSignal))
+                    return computed(() => ({
+                        ...libraryDefaults,
+                        ...providedDefaultsOrSignal(),
+                        locale: loc(),
+                    }), {
+                        equal: (a, b) => equalLocale(a, b) && nonLocaleEqual(a, b),
+                    });
+                const defaults = {
+                    ...libraryDefaults,
+                    ...providedDefaultsOrSignal,
+                };
+                return computed(() => ({
+                    ...defaults,
+                    locale: loc(),
+                }), {
+                    equal: equalLocale,
+                });
+            },
+        };
+    };
+    const injectFn = () => inject(token);
+    return [provider, injectFn];
+}
+
 function unwrap(value) {
     return isSignal(value) ? value() : value;
 }
@@ -452,32 +521,68 @@ function validDateOrNull(date) {
 }
 const cache$4 = new Map();
 function getFormatter$4(locale, format, timeZone) {
-    const cacheKey = `${locale}|${format}|${timeZone ?? ''}`;
+    const cacheKey = `${locale}|${typeof format === 'string' ? format : JSON.stringify(format)}|${timeZone ?? ''}`;
     let formatter = cache$4.get(cacheKey);
     if (!formatter) {
         formatter = new Intl.DateTimeFormat(locale, {
-            ...FORMAT_PRESETS[format],
+            ...(typeof format === 'string' ? FORMAT_PRESETS[format] : format),
             timeZone,
         });
         cache$4.set(cacheKey, formatter);
     }
     return formatter;
 }
-/**
- * Format a date using the current or provided locale & timezone
- * By default it is reactive to the global dynamic locale, works best when wrapped in a computed() if you need to react to locale changes
- *
- * @param date - Date to format
- * @param opt - Options for formatting
- * @returns Formatted date string
- */
-function formatDate(date, opt) {
+function formatDate(date, optOrLocale) {
     const validDate = validDateOrNull(unwrap(date));
     if (validDate === null)
         return '';
-    const unwrappedOpt = unwrap(opt);
-    const loc = unwrappedOpt?.locale ?? injectLocaleInternal()();
-    return getFormatter$4(loc, unwrappedOpt?.format ?? 'medium', unwrappedOpt?.tz).format(validDate);
+    const unwrappedArgs = unwrap(optOrLocale);
+    let locale;
+    let format = 'medium';
+    let tz;
+    if (typeof unwrappedArgs === 'string') {
+        locale = unwrappedArgs;
+    }
+    else if (unwrappedArgs && typeof unwrappedArgs === 'object') {
+        locale = unwrappedArgs.locale ?? readLocaleUnsafe();
+        format = unwrappedArgs.format ?? 'medium';
+        tz = unwrappedArgs.tz;
+    }
+    else {
+        locale = readLocaleUnsafe();
+    }
+    return getFormatter$4(locale, format, tz).format(validDate);
+}
+const [provideFormatDateDefaults, injectFormatDateOptions] = createFormatterProvider('date', {
+    format: 'medium',
+}, (a, b) => {
+    if (a.tz !== b.tz)
+        return false;
+    if (a.format === b.format)
+        return true;
+    return JSON.stringify(a.format) === JSON.stringify(b.format);
+});
+/**
+ * Inject a context-safe date formatting function tied to the current injector.
+ * Uses the libraries locale signal & provided default configuration to react to locale/config changes
+ * @example
+ * const formatDate = injectFormatDate();
+ * readonly displayDate = computed(() => formatDate(this.date()));
+ */
+function injectFormatDate() {
+    const defaults = injectFormatDateOptions();
+    return (date, optOrLocale) => {
+        if (!optOrLocale)
+            return formatDate(date, defaults());
+        const unwrapped = unwrap(optOrLocale);
+        const opt = typeof unwrapped === 'object'
+            ? { ...defaults(), ...unwrapped }
+            : {
+                ...defaults(),
+                locale: unwrapped,
+            };
+        return formatDate(date, opt);
+    };
 }
 
 const cache$3 = new Map();
@@ -495,21 +600,48 @@ function getFormatter$3(locale, type, style) {
 }
 /**
  * Format a display name using the current or provided locale
- * By default it is reactive to the global dynamic locale, works best when wrapped in a computed() if you need to react to locale changes
  *
  * @param value - The code to format
  * @param type - The type of display name to format
  * @param opt - Options for formatting
  * @returns Formatted display name string
  */
-function formatDisplayName(value, type, opt) {
-    const unwrapped = unwrap(value);
-    if (!unwrapped?.trim())
+function formatDisplayName(value, type, localeOrOpt) {
+    const unwrappedValue = unwrap(value);
+    if (!unwrappedValue?.trim())
         return '';
     const unwrappedType = unwrap(type);
-    const unwrappedOpt = unwrap(opt);
-    const locale = unwrappedOpt?.locale ?? injectLocaleInternal()();
-    return (getFormatter$3(locale, unwrappedType, unwrappedOpt?.style ?? 'long').of(unwrapped) ?? '');
+    const unwrapped = unwrap(localeOrOpt);
+    const locale = typeof unwrapped === 'string'
+        ? unwrapped
+        : (unwrapped?.locale ?? readLocaleUnsafe());
+    const opt = typeof unwrapped === 'object' ? unwrapped : undefined;
+    return (getFormatter$3(locale, unwrappedType, opt?.style ?? 'long').of(unwrappedValue) ?? '');
+}
+const [provideFormatDisplayNameDefaults, injectFormatDisplayNameDefaults] = createFormatterProvider('displayName', {
+    style: 'long',
+}, (a, b) => a.style === b.style);
+/**
+ * Inject a context-safe date formatting function tied to the current injector.
+ * Uses the libraries locale signal & provided default configuration to react to locale/config changes
+ * @example
+ * const formatDisplayName = injectFormatDisplayName();
+ * readonly region = computed(() => formatDisplayName('US', 'region'));
+ */
+function injectFormatDisplayName() {
+    const defaults = injectFormatDisplayNameDefaults();
+    return (value, type, localeOrOpt) => {
+        if (!localeOrOpt)
+            return formatDisplayName(value, type, defaults());
+        const unwrapped = unwrap(localeOrOpt);
+        const opt = typeof unwrapped === 'object'
+            ? { ...defaults(), ...unwrapped }
+            : {
+                ...defaults(),
+                locale: unwrapped,
+            };
+        return formatDisplayName(value, type, opt);
+    };
 }
 
 const cache$2 = new Map();
@@ -527,21 +659,52 @@ function getFormatter$2(locale, type, style) {
     }
     return formatter;
 }
+function formatList(value, optOrLocale) {
+    const unwrappedValue = unwrapList(value);
+    if (unwrappedValue.length === 0)
+        return '';
+    const unwrappedArgs = unwrap(optOrLocale);
+    let locale;
+    let type = 'conjunction';
+    let style = 'long';
+    if (typeof unwrappedArgs === 'string') {
+        locale = unwrappedArgs;
+    }
+    else if (unwrappedArgs && typeof unwrappedArgs === 'object') {
+        locale = unwrappedArgs.locale ?? readLocaleUnsafe();
+        type = unwrappedArgs.type ?? 'conjunction';
+        style = unwrappedArgs.style ?? 'long';
+    }
+    else {
+        locale = readLocaleUnsafe();
+    }
+    return getFormatter$2(locale, type, style).format(unwrappedValue);
+}
+const [provideFormatListDefaults, injectFormatListOptions] = createFormatterProvider('list', {
+    type: 'conjunction',
+    style: 'long',
+}, (a, b) => a.type === b.type && a.style === b.style);
 /**
- * Format a list using the current or provided locale
- * By default it is reactive to the global dynamic locale, works best when wrapped in a computed() if you need to react to locale changes
- *
- * @param value - The list to format
- * @param opt - Options for formatting
- * @returns Formatted list string
+ * Inject a context-safe list formatting function tied to the current injector.
+ * Uses the libraries locale signal & provided default configuration to react to locale/config changes
+ * @example
+ * const formatList = injectFormatList();
+ * readonly displayList = computed(() => formatList(this.items()));
  */
-function formatList(value, opt) {
-    const unwrapped = unwrapList(value);
-    if (unwrapped.length === 0)
-        return '';
-    const unwrappedOpt = unwrap(opt);
-    const loc = unwrappedOpt?.locale ?? injectLocaleInternal()();
-    return getFormatter$2(loc, unwrappedOpt?.type ?? 'conjunction', unwrappedOpt?.style ?? 'long').format(unwrapped);
+function injectFormatList() {
+    const defaults = injectFormatListOptions();
+    return (value, optOrLocale) => {
+        if (!optOrLocale)
+            return formatList(value, defaults());
+        const unwrapped = unwrap(optOrLocale);
+        const opt = typeof unwrapped === 'object'
+            ? { ...defaults(), ...unwrapped }
+            : {
+                ...defaults(),
+                locale: unwrapped,
+            };
+        return formatList(value, opt);
+    };
 }
 
 const cache$1 = new Map();
@@ -568,45 +731,151 @@ function getFormatter$1(locale, minFractionDigits, maxFractionDigits, useGroupin
     }
     return formatter;
 }
-/**
- * Format a number using the current or provided locale
- * By default it is reactive to the global dynamic locale, works best when wrapped in a computed() if you need to react to locale changes
- *
- * @param number - Number to format
- * @param opt - Options for formatting
- * @returns Formatted number string
- */
-function formatNumber(value, opt) {
-    const unwrappedOpt = unwrap(opt);
-    const unwrappedNumber = unwrapValue(value, unwrappedOpt?.fallbackToZero);
+function formatNumber(value, optOrLocale) {
+    const unwrappedArgs = unwrap(optOrLocale);
+    const isOpt = unwrappedArgs != null && typeof unwrappedArgs === 'object';
+    const fallbackToZero = isOpt ? unwrappedArgs.fallbackToZero : undefined;
+    const unwrappedNumber = unwrapValue(value, fallbackToZero);
     if (unwrappedNumber === null)
         return '';
-    const loc = unwrappedOpt?.locale ?? injectLocaleInternal()();
-    return getFormatter$1(loc, unwrappedOpt?.minFractionDigits, unwrappedOpt?.maxFractionDigits, unwrappedOpt?.useGrouping ?? true, unwrappedOpt?.notation ?? 'standard').format(unwrappedNumber);
+    let locale;
+    let notation;
+    let minFractionDigits;
+    let maxFractionDigits;
+    let useGrouping = true;
+    if (typeof unwrappedArgs === 'string') {
+        locale = unwrappedArgs;
+    }
+    else if (isOpt) {
+        locale = unwrappedArgs.locale ?? readLocaleUnsafe();
+        notation = unwrappedArgs.notation ?? 'standard';
+        minFractionDigits = unwrappedArgs.minFractionDigits;
+        maxFractionDigits = unwrappedArgs.maxFractionDigits;
+        useGrouping = unwrappedArgs.useGrouping ?? true;
+    }
+    else {
+        locale = readLocaleUnsafe();
+        notation = 'standard';
+    }
+    return getFormatter$1(locale, minFractionDigits, maxFractionDigits, useGrouping, notation).format(unwrappedNumber);
 }
+const [provideFormatNumberDefaults, injectFormatNumberOptions] = createFormatterProvider('number', {
+    notation: 'standard',
+    useGrouping: true,
+}, (a, b) => a.notation === b.notation &&
+    a.minFractionDigits === b.minFractionDigits &&
+    a.maxFractionDigits === b.maxFractionDigits &&
+    a.useGrouping === b.useGrouping &&
+    a.fallbackToZero === b.fallbackToZero);
 /**
- * Format a percentage using the current or provided locale
- * By default it is reactive to the global dynamic locale, works best when wrapped in a computed() if you need to react to locale changes
- *
- * @param number - Number to format
- * @param opt - Options for formatting
- * @returns Formatted percentage string
+ * Inject a context-safe number formatting function tied to the current injector.
+ * Uses the libraries locale signal & provided default configuration to react to locale/config changes
+ * @example
+ * const formatNumber = injectFormatNumber();
+ * readonly display = computed(() => formatNumber(this.value()));
  */
-function formatPercent(value, opt) {
-    const unwrappedOpt = unwrap(opt);
-    const unwrappedNumber = unwrapValue(value, unwrappedOpt?.fallbackToZero);
+function injectFormatNumber() {
+    const defaults = injectFormatNumberOptions();
+    return (value, optOrLocale) => {
+        if (!optOrLocale)
+            return formatNumber(value, defaults());
+        const unwrapped = unwrap(optOrLocale);
+        const opt = typeof unwrapped === 'object'
+            ? { ...defaults(), ...unwrapped }
+            : {
+                ...defaults(),
+                locale: unwrapped,
+            };
+        return formatNumber(value, opt);
+    };
+}
+function formatPercent(value, optOrLocale) {
+    const unwrappedArgs = unwrap(optOrLocale);
+    const isOpt = unwrappedArgs != null && typeof unwrappedArgs === 'object';
+    const fallbackToZero = isOpt ? unwrappedArgs.fallbackToZero : undefined;
+    const unwrappedNumber = unwrapValue(value, fallbackToZero);
     if (unwrappedNumber === null)
         return '';
-    const loc = unwrappedOpt?.locale ?? injectLocaleInternal()();
-    return getFormatter$1(loc, unwrappedOpt?.minFractionDigits, unwrappedOpt?.maxFractionDigits, undefined, undefined, undefined, undefined, 'percent').format(unwrappedNumber);
+    let locale;
+    let minFractionDigits;
+    let maxFractionDigits;
+    if (typeof unwrappedArgs === 'string') {
+        locale = unwrappedArgs;
+    }
+    else if (isOpt) {
+        locale = unwrappedArgs.locale ?? readLocaleUnsafe();
+        minFractionDigits = unwrappedArgs.minFractionDigits;
+        maxFractionDigits = unwrappedArgs.maxFractionDigits;
+    }
+    else {
+        locale = readLocaleUnsafe();
+    }
+    return getFormatter$1(locale, minFractionDigits, maxFractionDigits, undefined, undefined, undefined, undefined, 'percent').format(unwrappedNumber);
 }
-function formatCurrency(value, currency, opt) {
-    const unwrappedOpt = unwrap(opt);
-    const unwrappedValue = unwrapValue(value, unwrappedOpt?.fallbackToZero);
+const [provideFormatPercentDefaults, injectFormatPercentOptions] = createFormatterProvider('percent', {}, (a, b) => a.minFractionDigits === b.minFractionDigits &&
+    a.maxFractionDigits === b.maxFractionDigits &&
+    a.fallbackToZero === b.fallbackToZero);
+/**
+ * Inject a context-safe percent formatting function tied to the current injector.
+ * Uses the libraries locale signal & provided default configuration to react to locale/config changes
+ */
+function injectFormatPercent() {
+    const defaults = injectFormatPercentOptions();
+    return (value, optOrLocale) => {
+        if (!optOrLocale)
+            return formatPercent(value, defaults());
+        const unwrapped = unwrap(optOrLocale);
+        const opt = typeof unwrapped === 'object'
+            ? { ...defaults(), ...unwrapped }
+            : {
+                ...defaults(),
+                locale: unwrapped,
+            };
+        return formatPercent(value, opt);
+    };
+}
+function formatCurrency(value, currency, optOrLocale) {
+    const unwrappedArgs = unwrap(optOrLocale);
+    const isOpt = unwrappedArgs != null && typeof unwrappedArgs === 'object';
+    const fallbackToZero = isOpt ? unwrappedArgs.fallbackToZero : undefined;
+    const unwrappedValue = unwrapValue(value, fallbackToZero);
     if (unwrappedValue === null)
         return '';
-    const loc = unwrappedOpt?.locale ?? injectLocaleInternal()();
-    return getFormatter$1(loc, undefined, undefined, undefined, undefined, unwrap(currency), unwrappedOpt?.display ?? 'symbol', 'currency').format(unwrappedValue);
+    let locale;
+    let display = 'symbol';
+    if (typeof unwrappedArgs === 'string') {
+        locale = unwrappedArgs;
+    }
+    else if (isOpt) {
+        locale = unwrappedArgs.locale ?? readLocaleUnsafe();
+        display = unwrappedArgs.display ?? 'symbol';
+    }
+    else {
+        locale = readLocaleUnsafe();
+    }
+    return getFormatter$1(locale, undefined, undefined, undefined, undefined, unwrap(currency), display, 'currency').format(unwrappedValue);
+}
+const [provideFormatCurrencyDefaults, injectFormatCurrencyOptions] = createFormatterProvider('currency', {
+    display: 'symbol',
+}, (a, b) => a.display === b.display && a.fallbackToZero === b.fallbackToZero);
+/**
+ * Inject a context-safe currency formatting function tied to the current injector.
+ * Uses the libraries locale signal & provided default configuration to react to locale/config changes
+ */
+function injectFormatCurrency() {
+    const defaults = injectFormatCurrencyOptions();
+    return (value, currency, optOrLocale) => {
+        if (!optOrLocale)
+            return formatCurrency(value, currency, defaults());
+        const unwrapped = unwrap(optOrLocale);
+        const opt = typeof unwrapped === 'object'
+            ? { ...defaults(), ...unwrapped }
+            : {
+                ...defaults(),
+                locale: unwrapped,
+            };
+        return formatCurrency(value, currency, opt);
+    };
 }
 
 const cache = new Map();
@@ -619,16 +888,7 @@ function getFormatter(locale, style, numeric) {
     }
     return formatter;
 }
-/**
- * Format a relative time using the current or provided locale
- * By default it is reactive to the global dynamic locale, works best when wrapped in a computed() if you need to react to locale changes
- *
- * @param value - The numeric value to use in the relative time internationalization message
- * @param unit - The unit to use in the relative time internationalization message
- * @param opt - Options for formatting
- * @returns Formatted relative time string
- */
-function formatRelativeTime(value, unit, opt) {
+function formatRelativeTime(value, unit, optOrLocale) {
     const unwrappedValue = unwrap(value);
     if (unwrappedValue === null ||
         unwrappedValue === undefined ||
@@ -637,11 +897,83 @@ function formatRelativeTime(value, unit, opt) {
     const unwrappedUnit = unwrap(unit);
     if (!unwrappedUnit)
         return '';
-    const unwrappedOpt = unwrap(opt);
-    const loc = unwrappedOpt?.locale ?? injectLocaleInternal()();
-    return getFormatter(loc, unwrappedOpt?.style ?? 'long', unwrappedOpt?.numeric ?? 'always').format(unwrappedValue, unwrappedUnit);
+    const unwrappedArgs = unwrap(optOrLocale);
+    let locale;
+    let style = 'long';
+    let numeric = 'always';
+    if (typeof unwrappedArgs === 'string') {
+        locale = unwrappedArgs;
+    }
+    else if (unwrappedArgs && typeof unwrappedArgs === 'object') {
+        locale = unwrappedArgs.locale ?? readLocaleUnsafe();
+        style = unwrappedArgs.style ?? 'long';
+        numeric = unwrappedArgs.numeric ?? 'always';
+    }
+    else {
+        locale = readLocaleUnsafe();
+    }
+    return getFormatter(locale, style, numeric).format(unwrappedValue, unwrappedUnit);
+}
+const [provideFormatRelativeTimeDefaults, injectFormatRelativeTimeOptions] = createFormatterProvider('relativeTime', {
+    style: 'long',
+    numeric: 'always',
+}, (a, b) => a.style === b.style && a.numeric === b.numeric);
+/**
+ * Inject a context-safe relative time formatting function tied to the current injector.
+ * Uses the libraries locale signal & provided default configuration to react to locale/config changes
+ * @example
+ * const formatRelativeTime = injectFormatRelativeTime();
+ * readonly relativeAge = computed(() => formatRelativeTime(this.delta(), 'day'));
+ */
+function injectFormatRelativeTime() {
+    const defaults = injectFormatRelativeTimeOptions();
+    return (value, unit, optOrLocale) => {
+        if (!optOrLocale)
+            return formatRelativeTime(value, unit, defaults());
+        const unwrapped = unwrap(optOrLocale);
+        const opt = typeof unwrapped === 'object'
+            ? { ...defaults(), ...unwrapped }
+            : {
+                ...defaults(),
+                locale: unwrapped,
+            };
+        return formatRelativeTime(value, unit, opt);
+    };
 }
 
+function provideFormatDefaults(cfg) {
+    const providers = [];
+    if (cfg.date)
+        providers.push(provideFormatDateDefaults(cfg.date));
+    if (cfg.displayName)
+        providers.push(provideFormatDisplayNameDefaults(cfg.displayName));
+    if (cfg.list)
+        providers.push(provideFormatListDefaults(cfg.list));
+    if (cfg.relativeTime)
+        providers.push(provideFormatRelativeTimeDefaults(cfg.relativeTime));
+    if (cfg.number)
+        providers.push(provideFormatNumberDefaults(cfg.number));
+    if (cfg.percent)
+        providers.push(provideFormatPercentDefaults(cfg.percent));
+    if (cfg.currency)
+        providers.push(provideFormatCurrencyDefaults(cfg.currency));
+    return providers;
+}
+function injectFormatters() {
+    return {
+        date: injectFormatDate(),
+        displayName: injectFormatDisplayName(),
+        list: injectFormatList(),
+        relativeTime: injectFormatRelativeTime(),
+        number: injectFormatNumber(),
+        percent: injectFormatPercent(),
+        currency: injectFormatCurrency(),
+    };
+}
+
+/**
+ * @internal
+ */
 function injectResolveParamLocale(snapshot) {
     let locale = null;
     const paramName = injectIntlConfig()?.localeParamName;
@@ -654,7 +986,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;
             }
         }
@@ -721,44 +1053,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)
@@ -766,7 +1139,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 {
@@ -790,10 +1163,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);
@@ -814,10 +1198,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)
@@ -825,8 +1209,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)
@@ -1059,6 +1443,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;
@@ -1109,5 +1497,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, injectIntl, injectResolveParamLocale, injectSupportedLocales, injectUnsafeT, 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