@intlify/core-base 11.4.7 → 11.4.9

package/dist/core-base.prod.cjs

@@ -1,5 +1,5 @@
 /*!
-  * core-base v11.4.7
+  * core-base v11.4.9
   * (c) 2026 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -310,7 +310,7 @@ function resolveLocale(locale) {
  * @remarks
  * A fallback locale function implemented with a simple fallback algorithm.
  *
- * Basically, it returns the value as specified in the `fallbackLocale` props, and is processed with the fallback inside intlify.
+ * Basically, the chain consists of `start` plus the specified fallback: for a string or array `fallbackLocale`, the value as specified in the props is used; for a map `fallbackLocale`, the map's **keys** are used and the `default` key is skipped since it is not a locale name.
  *
  * @param ctx - A {@link CoreContext | context}
  * @param fallback - A {@link FallbackLocale | fallback locale}
@@ -327,7 +327,7 @@ function fallbackWithSimple(ctx, fallback, start) {
             ...(shared.isArray(fallback)
                 ? fallback
                 : shared.isObject(fallback)
-                    ? Object.keys(fallback)
+                    ? Object.keys(fallback).filter(locale => locale !== 'default')
                     : shared.isString(fallback)
                         ? [fallback]
                         : [start])
@@ -355,29 +355,36 @@ function fallbackWithLocaleChain(ctx, fallback, start) {
     if (!context.__localeChainCache) {
         context.__localeChainCache = new Map();
     }
-    let chain = context.__localeChainCache.get(startLocale);
-    if (!chain) {
-        chain = [];
-        // first block defined by start
-        let block = [start];
-        // while any intervening block found
-        while (shared.isArray(block)) {
-            block = appendBlockToChain(chain, block, fallback);
-        }
-        // prettier-ignore
-        // last block defined by default
-        const defaults = shared.isArray(fallback) || !shared.isPlainObject(fallback)
-            ? fallback
-            : fallback['default']
-                ? fallback['default']
-                : null;
-        // convert defaults to array
-        block = shared.isString(defaults) ? [defaults] : defaults;
-        if (shared.isArray(block)) {
-            appendBlockToChain(chain, block, false);
-        }
-        context.__localeChainCache.set(startLocale, chain);
+    const fallbackKey = shared.friendlyJSONstringify(fallback);
+    let chains = context.__localeChainCache.get(startLocale);
+    if (!chains) {
+        chains = new Map();
+        context.__localeChainCache.set(startLocale, chains);
+    }
+    const cached = chains.get(fallbackKey);
+    if (cached) {
+        return cached;
+    }
+    const chain = [];
+    // first block defined by start
+    let block = [start];
+    // while any intervening block found
+    while (shared.isArray(block)) {
+        block = appendBlockToChain(chain, block, fallback);
+    }
+    // prettier-ignore
+    // last block defined by default
+    const defaults = shared.isArray(fallback) || !shared.isPlainObject(fallback)
+        ? fallback
+        : fallback['default']
+            ? fallback['default']
+            : null;
+    // convert defaults to array
+    block = shared.isString(defaults) ? [defaults] : defaults;
+    if (shared.isArray(block)) {
+        appendBlockToChain(chain, block, false);
     }
+    chains.set(fallbackKey, chain);
     return chain;
 }
 function appendBlockToChain(chain, block, blocks) {
@@ -736,7 +743,7 @@ function getWarnMessage(code, ...args) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '11.4.7';
+const VERSION = '11.4.9';
 const NOT_REOSLVED = -1;
 const DEFAULT_LOCALE = 'en-US';
 const MISSING_RESOLVE_VALUE = '';
@@ -957,9 +964,68 @@ function isImplicitFallback(targetLocale, locales) {
 }
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
+function resolveFormatLocale(context, key, locale, formats, missingWarn, fallbackWarn, type) {
+    const { fallbackLocale, localeFallbacker, onWarn } = context;
+    const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
+    fallbackLocale, locale);
+    for (let i = 0; i < locales.length; i++) {
+        const targetLocale = locales[i];
+        const format = (formats[targetLocale] || {})[key];
+        if (shared.isPlainObject(format) && shared.isString(targetLocale)) {
+            return targetLocale;
+        }
+        handleMissing(context, key, targetLocale, missingWarn, type);
+    }
+    return null;
+}
+function getFormatterCacheKey(locale, key, overrides) {
+    let id = `${locale}__${key}`;
+    if (shared.isPlainObject(overrides) && !shared.isEmptyObject(overrides)) {
+        id = `${id}__${JSON.stringify(overrides)}`;
+    }
+    return id;
+}
+function clearFormatCache(formatters, locale, format) {
+    for (const key in format) {
+        const prefix = `${locale}__${key}`;
+        for (const id of formatters.keys()) {
+            if (id === prefix || id.startsWith(`${prefix}__`)) {
+                formatters.delete(id);
+            }
+        }
+    }
+}
+function parseFormatArgs(args, options, initialOverrides, optionsKeys) {
+    const [, arg2, arg3, arg4] = args;
+    let overrides = initialOverrides;
+    if (shared.isString(arg2)) {
+        options.key = arg2;
+    }
+    else if (shared.isPlainObject(arg2)) {
+        Object.keys(arg2).forEach(key => {
+            if (optionsKeys.includes(key)) {
+                overrides[key] = arg2[key];
+            }
+            else {
+                options[key] = arg2[key];
+            }
+        });
+    }
+    if (shared.isString(arg3)) {
+        options.locale = arg3;
+    }
+    else if (shared.isPlainObject(arg3)) {
+        overrides = arg3;
+    }
+    if (shared.isPlainObject(arg4)) {
+        overrides = arg4;
+    }
+    return overrides;
+}
+
 // implementation of `datetime` function
 function datetime(context, ...args) {
-    const { datetimeFormats, unresolving, fallbackLocale, onWarn, localeFallbacker } = context;
+    const { datetimeFormats, unresolving, onWarn } = context;
     const { __datetimeFormatters } = context;
     if (!shared.isString(args[0]) && !shared.isDate(args[0]) && !shared.isNumber(args[0])) {
         return MISSING_RESOLVE_VALUE;
@@ -968,39 +1034,21 @@ function datetime(context, ...args) {
     const missingWarn = shared.isBoolean(options.missingWarn)
         ? options.missingWarn
         : context.missingWarn;
-    shared.isBoolean(options.fallbackWarn)
+    const fallbackWarn = shared.isBoolean(options.fallbackWarn)
         ? options.fallbackWarn
         : context.fallbackWarn;
     const part = !!options.part;
     const locale = getLocale(context, options);
-    const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
-    fallbackLocale, locale);
     if (!shared.isString(key) || key === '') {
         const formatter = new Intl.DateTimeFormat(locale.replace(/!/g, ''), overrides);
         return !part ? formatter.format(value) : formatter.formatToParts(value);
     }
-    // resolve format
-    let datetimeFormat = {};
-    let targetLocale;
-    let format = null;
-    const type = 'datetime format';
-    for (let i = 0; i < locales.length; i++) {
-        targetLocale = locales[i];
-        datetimeFormat =
-            datetimeFormats[targetLocale] || {};
-        format = datetimeFormat[key];
-        if (shared.isPlainObject(format))
-            break;
-        handleMissing(context, key, targetLocale, missingWarn, type); // eslint-disable-line @typescript-eslint/no-explicit-any
-    }
-    // checking format and target locale
-    if (!shared.isPlainObject(format) || !shared.isString(targetLocale)) {
+    const targetLocale = resolveFormatLocale(context, key, locale, datetimeFormats, missingWarn, fallbackWarn, 'datetime format');
+    if (!shared.isString(targetLocale)) {
         return unresolving ? NOT_REOSLVED : key;
     }
-    let id = `${targetLocale}__${key}`;
-    if (!shared.isEmptyObject(overrides)) {
-        id = `${id}__${JSON.stringify(overrides)}`;
-    }
+    const format = datetimeFormats[targetLocale][key];
+    const id = getFormatterCacheKey(targetLocale, key, overrides);
     let formatter = __datetimeFormatters.get(id);
     if (!formatter) {
         formatter = new Intl.DateTimeFormat(targetLocale, shared.assign({}, format, overrides));
@@ -1033,9 +1081,9 @@ const DATETIME_FORMAT_OPTIONS_KEYS = [
 ];
 /** @internal */
 function parseDateTimeArgs(...args) {
-    const [arg1, arg2, arg3, arg4] = args;
+    const [arg1] = args;
     const options = shared.create();
-    let overrides = shared.create();
+    const initialOverrides = shared.create();
     let value;
     if (shared.isString(arg1)) {
         // Only allow ISO strings - other date formats are often supported,
@@ -1072,45 +1120,18 @@ function parseDateTimeArgs(...args) {
     else {
         throw createCoreError(CoreErrorCodes.INVALID_ARGUMENT);
     }
-    if (shared.isString(arg2)) {
-        options.key = arg2;
-    }
-    else if (shared.isPlainObject(arg2)) {
-        Object.keys(arg2).forEach(key => {
-            if (DATETIME_FORMAT_OPTIONS_KEYS.includes(key)) {
-                overrides[key] = arg2[key];
-            }
-            else {
-                options[key] = arg2[key];
-            }
-        });
-    }
-    if (shared.isString(arg3)) {
-        options.locale = arg3;
-    }
-    else if (shared.isPlainObject(arg3)) {
-        overrides = arg3;
-    }
-    if (shared.isPlainObject(arg4)) {
-        overrides = arg4;
-    }
+    const overrides = parseFormatArgs(args, options, initialOverrides, DATETIME_FORMAT_OPTIONS_KEYS);
     return [options.key || '', value, options, overrides];
 }
 /** @internal */
 function clearDateTimeFormat(ctx, locale, format) {
     const context = ctx;
-    for (const key in format) {
-        const id = `${locale}__${key}`;
-        if (!context.__datetimeFormatters.has(id)) {
-            continue;
-        }
-        context.__datetimeFormatters.delete(id);
-    }
+    clearFormatCache(context.__datetimeFormatters, locale, format);
 }
 
 // implementation of `number` function
 function number(context, ...args) {
-    const { numberFormats, unresolving, fallbackLocale, onWarn, localeFallbacker } = context;
+    const { numberFormats, unresolving, onWarn } = context;
     const { __numberFormatters } = context;
     if (!shared.isNumber(args[0])) {
         return MISSING_RESOLVE_VALUE;
@@ -1119,39 +1140,21 @@ function number(context, ...args) {
     const missingWarn = shared.isBoolean(options.missingWarn)
         ? options.missingWarn
         : context.missingWarn;
-    shared.isBoolean(options.fallbackWarn)
+    const fallbackWarn = shared.isBoolean(options.fallbackWarn)
         ? options.fallbackWarn
         : context.fallbackWarn;
     const part = !!options.part;
     const locale = getLocale(context, options);
-    const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
-    fallbackLocale, locale);
     if (!shared.isString(key) || key === '') {
         const formatter = new Intl.NumberFormat(locale.replace(/!/g, ''), overrides);
         return !part ? formatter.format(value) : formatter.formatToParts(value);
     }
-    // resolve format
-    let numberFormat = {};
-    let targetLocale;
-    let format = null;
-    const type = 'number format';
-    for (let i = 0; i < locales.length; i++) {
-        targetLocale = locales[i];
-        numberFormat =
-            numberFormats[targetLocale] || {};
-        format = numberFormat[key];
-        if (shared.isPlainObject(format))
-            break;
-        handleMissing(context, key, targetLocale, missingWarn, type); // eslint-disable-line @typescript-eslint/no-explicit-any
-    }
-    // checking format and target locale
-    if (!shared.isPlainObject(format) || !shared.isString(targetLocale)) {
+    const targetLocale = resolveFormatLocale(context, key, locale, numberFormats, missingWarn, fallbackWarn, 'number format');
+    if (!shared.isString(targetLocale)) {
         return unresolving ? NOT_REOSLVED : key;
     }
-    let id = `${targetLocale}__${key}`;
-    if (!shared.isEmptyObject(overrides)) {
-        id = `${id}__${JSON.stringify(overrides)}`;
-    }
+    const format = numberFormats[targetLocale][key];
+    const id = getFormatterCacheKey(targetLocale, key, overrides);
     let formatter = __numberFormatters.get(id);
     if (!formatter) {
         formatter = new Intl.NumberFormat(targetLocale, shared.assign({}, format, overrides));
@@ -1184,47 +1187,20 @@ const NUMBER_FORMAT_OPTIONS_KEYS = [
 ];
 /** @internal */
 function parseNumberArgs(...args) {
-    const [arg1, arg2, arg3, arg4] = args;
+    const [arg1] = args;
     const options = shared.create();
-    let overrides = shared.create();
+    const initialOverrides = shared.create();
     if (!shared.isNumber(arg1)) {
         throw createCoreError(CoreErrorCodes.INVALID_ARGUMENT);
     }
     const value = arg1;
-    if (shared.isString(arg2)) {
-        options.key = arg2;
-    }
-    else if (shared.isPlainObject(arg2)) {
-        Object.keys(arg2).forEach(key => {
-            if (NUMBER_FORMAT_OPTIONS_KEYS.includes(key)) {
-                overrides[key] = arg2[key];
-            }
-            else {
-                options[key] = arg2[key];
-            }
-        });
-    }
-    if (shared.isString(arg3)) {
-        options.locale = arg3;
-    }
-    else if (shared.isPlainObject(arg3)) {
-        overrides = arg3;
-    }
-    if (shared.isPlainObject(arg4)) {
-        overrides = arg4;
-    }
+    const overrides = parseFormatArgs(args, options, initialOverrides, NUMBER_FORMAT_OPTIONS_KEYS);
     return [options.key || '', value, options, overrides];
 }
 /** @internal */
 function clearNumberFormat(ctx, locale, format) {
     const context = ctx;
-    for (const key in format) {
-        const id = `${locale}__${key}`;
-        if (!context.__numberFormatters.has(id)) {
-            continue;
-        }
-        context.__numberFormatters.delete(id);
-    }
+    clearFormatCache(context.__numberFormatters, locale, format);
 }
 
 const DEFAULT_MODIFIER = (str) => str;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intlify/core-base",
-  "version": "11.4.7",
+  "version": "11.4.9",
   "description": "@intlify/core-base",
   "keywords": [
     "core",
@@ -33,9 +33,9 @@
   "jsdelivr": "dist/core-base.global.js",
   "types": "dist/core-base.d.ts",
   "dependencies": {
-    "@intlify/devtools-types": "11.4.7",
-    "@intlify/message-compiler": "11.4.7",
-    "@intlify/shared": "11.4.7"
+    "@intlify/devtools-types": "11.4.9",
+    "@intlify/shared": "11.4.9",
+    "@intlify/message-compiler": "11.4.9"
   },
   "engines": {
     "node": ">= 22"