@intlify/core-base 11.2.8 → 11.3.1

package/dist/core-base.prod.cjs

@@ -1,6 +1,6 @@
 /*!
-  * core-base v11.2.8
-  * (c) 2025 kazuya kawaguchi
+  * core-base v11.3.1
+  * (c) 2026 kazuya kawaguchi
   * Released under the MIT License.
   */
 'use strict';
@@ -671,6 +671,7 @@ function resolveValue(obj, path) {
     }
     // resolve path value
     const len = hit.length;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- for generic object
     let last = obj;
     let i = 0;
     while (i < len) {
@@ -683,6 +684,12 @@ function resolveValue(obj, path) {
         if (AST_NODE_PROPS_KEYS.includes(key) && isMessageAST(last)) {
             return null;
         }
+        if (!shared.isObject(last)) {
+            return null;
+        }
+        if (!shared.hasOwn(last, key)) {
+            return null;
+        }
         const val = last[key];
         if (val === undefined) {
             return null;
@@ -703,9 +710,11 @@ const CoreWarnCodes = {
     FALLBACK_TO_NUMBER_FORMAT: 4,
     CANNOT_FORMAT_DATE: 5,
     FALLBACK_TO_DATE_FORMAT: 6,
-    EXPERIMENTAL_CUSTOM_MESSAGE_COMPILER: 7
+    EXPERIMENTAL_CUSTOM_MESSAGE_COMPILER: 7,
+    INVALID_NUMBER_ARGUMENT: 8,
+    INVALID_DATE_ARGUMENT: 9
 };
-const CORE_WARN_CODES_EXTEND_POINT = 8;
+const CORE_WARN_CODES_EXTEND_POINT = 10;
 /** @internal */
 const warnMessages = {
     [CoreWarnCodes.NOT_FOUND_KEY]: `Not found '{key}' key in '{locale}' locale messages.`,
@@ -714,7 +723,9 @@ const warnMessages = {
     [CoreWarnCodes.FALLBACK_TO_NUMBER_FORMAT]: `Fall back to number format '{key}' key with '{target}' locale.`,
     [CoreWarnCodes.CANNOT_FORMAT_DATE]: `Cannot format a date value due to not supported Intl.DateTimeFormat.`,
     [CoreWarnCodes.FALLBACK_TO_DATE_FORMAT]: `Fall back to datetime format '{key}' key with '{target}' locale.`,
-    [CoreWarnCodes.EXPERIMENTAL_CUSTOM_MESSAGE_COMPILER]: `This project is using Custom Message Compiler, which is an experimental feature. It may receive breaking changes or be removed in the future.`
+    [CoreWarnCodes.EXPERIMENTAL_CUSTOM_MESSAGE_COMPILER]: `This project is using Custom Message Compiler, which is an experimental feature. It may receive breaking changes or be removed in the future.`,
+    [CoreWarnCodes.INVALID_NUMBER_ARGUMENT]: `Invalid argument for number formatting: expected a number but received '{value}'.`,
+    [CoreWarnCodes.INVALID_DATE_ARGUMENT]: `Invalid argument for datetime formatting: expected a Date, number, or ISO string but received '{value}'.`
 };
 function getWarnMessage(code, ...args) {
     return shared.format(warnMessages[code], ...args);
@@ -725,7 +736,7 @@ function getWarnMessage(code, ...args) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '11.2.8';
+const VERSION = '11.3.1';
 const NOT_REOSLVED = -1;
 const DEFAULT_LOCALE = 'en-US';
 const MISSING_RESOLVE_VALUE = '';
@@ -950,6 +961,9 @@ function isImplicitFallback(targetLocale, locales) {
 function datetime(context, ...args) {
     const { datetimeFormats, unresolving, fallbackLocale, onWarn, localeFallbacker } = context;
     const { __datetimeFormatters } = context;
+    if (!shared.isString(args[0]) && !shared.isDate(args[0]) && !shared.isNumber(args[0])) {
+        return MISSING_RESOLVE_VALUE;
+    }
     const [key, value, options, overrides] = parseDateTimeArgs(...args);
     const missingWarn = shared.isBoolean(options.missingWarn)
         ? options.missingWarn
@@ -962,7 +976,7 @@ function datetime(context, ...args) {
     const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
     fallbackLocale, locale);
     if (!shared.isString(key) || key === '') {
-        return new Intl.DateTimeFormat(locale, overrides).format(value);
+        return new Intl.DateTimeFormat(locale.replace(/!/g, ''), overrides).format(value);
     }
     // resolve format
     let datetimeFormat = {};
@@ -1097,6 +1111,9 @@ function clearDateTimeFormat(ctx, locale, format) {
 function number(context, ...args) {
     const { numberFormats, unresolving, fallbackLocale, onWarn, localeFallbacker } = context;
     const { __numberFormatters } = context;
+    if (!shared.isNumber(args[0])) {
+        return MISSING_RESOLVE_VALUE;
+    }
     const [key, value, options, overrides] = parseNumberArgs(...args);
     const missingWarn = shared.isBoolean(options.missingWarn)
         ? options.missingWarn
@@ -1109,7 +1126,7 @@ function number(context, ...args) {
     const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
     fallbackLocale, locale);
     if (!shared.isString(key) || key === '') {
-        return new Intl.NumberFormat(locale, overrides).format(value);
+        return new Intl.NumberFormat(locale.replace(/!/g, ''), overrides).format(value);
     }
     // resolve format
     let numberFormat = {};
@@ -1215,59 +1232,43 @@ const DEFAULT_NORMALIZE = (values) => values.length === 0 ? '' : shared.join(val
 const DEFAULT_INTERPOLATE = shared.toDisplayString;
 function pluralDefault(choice, choicesLength) {
     choice = Math.abs(choice);
+    // singular (0) | plural (1)
     if (choicesLength === 2) {
         // prettier-ignore
-        return choice
-            ? choice > 1
-                ? 1
-                : 0
+        return choice === 1
+            ? 0
             : 1;
     }
-    return choice ? Math.min(choice, 2) : 0;
+    // zero (0) | singular (1) | plural (2)
+    return Math.min(choice, 2);
 }
 function getPluralIndex(options) {
     // prettier-ignore
     const index = shared.isNumber(options.pluralIndex)
         ? options.pluralIndex
         : -1;
-    // prettier-ignore
-    return options.named && (shared.isNumber(options.named.count) || shared.isNumber(options.named.n))
-        ? shared.isNumber(options.named.count)
-            ? options.named.count
-            : shared.isNumber(options.named.n)
-                ? options.named.n
-                : index
-        : index;
-}
-function normalizeNamed(pluralIndex, props) {
-    if (!props.count) {
-        props.count = pluralIndex;
-    }
-    if (!props.n) {
-        props.n = pluralIndex;
-    }
+    return shared.isNumber(options.named?.count)
+        ? options.named.count
+        : shared.isNumber(options.named?.n)
+            ? options.named.n
+            : index;
 }
 function createMessageContext(options = {}) {
     const locale = options.locale;
     const pluralIndex = getPluralIndex(options);
-    const pluralRule = shared.isObject(options.pluralRules) &&
-        shared.isString(locale) &&
-        shared.isFunction(options.pluralRules[locale])
+    const pluralRule = shared.isString(locale) && shared.isFunction(options.pluralRules?.[locale])
         ? options.pluralRules[locale]
         : pluralDefault;
-    const orgPluralRule = shared.isObject(options.pluralRules) &&
-        shared.isString(locale) &&
-        shared.isFunction(options.pluralRules[locale])
-        ? pluralDefault
-        : undefined;
-    const plural = (messages) => {
-        return messages[pluralRule(pluralIndex, messages.length, orgPluralRule)];
-    };
+    const orgPluralRule = pluralRule === pluralDefault ? undefined : pluralDefault;
+    const plural = (messages) => messages[pluralRule(pluralIndex, messages.length, orgPluralRule)];
     const _list = options.list || [];
     const list = (index) => _list[index];
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const _named = options.named || shared.create();
-    shared.isNumber(options.pluralIndex) && normalizeNamed(pluralIndex, _named);
+    const _named = options.named || shared.create(); // eslint-disable-line @typescript-eslint/no-explicit-any
+    // normalize named
+    if (shared.isNumber(options.pluralIndex)) {
+        _named.count ||= options.pluralIndex;
+        _named.n ||= options.pluralIndex;
+    }
     const named = (key) => _named[key];
     function message(key, useLinked) {
         // prettier-ignore
@@ -1285,14 +1286,13 @@ function createMessageContext(options = {}) {
     const _modifier = (name) => options.modifiers
         ? options.modifiers[name]
         : DEFAULT_MODIFIER;
-    const normalize = shared.isPlainObject(options.processor) && shared.isFunction(options.processor.normalize)
+    const normalize = shared.isFunction(options.processor?.normalize)
         ? options.processor.normalize
         : DEFAULT_NORMALIZE;
-    const interpolate = shared.isPlainObject(options.processor) &&
-        shared.isFunction(options.processor.interpolate)
+    const interpolate = shared.isFunction(options.processor?.interpolate)
         ? options.processor.interpolate
         : DEFAULT_INTERPOLATE;
-    const type = shared.isPlainObject(options.processor) && shared.isString(options.processor.type)
+    const type = shared.isString(options.processor?.type)
         ? options.processor.type
         : DEFAULT_MESSAGE_DATA_TYPE;
     const linked = (key, ...args) => {
@@ -1317,11 +1317,13 @@ function createMessageContext(options = {}) {
             }
         }
         const ret = message(key, true)(ctx);
+        // If the linked message is not resolved (empty string), fall back to the key itself
+        const resolved = ret === '' || ret === undefined ? key : ret;
         const msg = 
         // The message in vnode resolved with linked are returned as an array by processor.nomalize
-        type === 'vnode' && shared.isArray(ret) && modifier
-            ? ret[0]
-            : ret;
+        type === 'vnode' && shared.isArray(resolved) && modifier
+            ? resolved[0]
+            : resolved;
         return modifier ? _modifier(modifier)(msg, type) : msg;
     };
     const ctx = {
@@ -1539,9 +1541,7 @@ function getCompileContext(context, locale, key, source, warnHtmlMessage, onErro
         warnHtmlMessage,
         onError: (err) => {
             onError && onError(err);
-            {
-                throw err;
-            }
+            throw err;
         },
         onCacheKey: (source) => shared.generateFormatCacheKey(locale, key, source)
     };
@@ -1552,9 +1552,9 @@ function getMessageContextOptions(context, locale, message, options) {
         let val = resolveValue(message, key);
         // fallback
         if (val == null && (fallbackContext || useLinked)) {
-            const [, , message] = resolveMessageFormat(fallbackContext || context, // NOTE: if has fallbackContext, fallback to root, else if use linked, fallback to local context
+            const [format, , message] = resolveMessageFormat(fallbackContext || context, // NOTE: if has fallbackContext, fallback to root, else if use linked, fallback to local context
             key, locale, fallbackLocale, fallbackWarn, missingWarn);
-            val = resolveValue(message, key);
+            val = format ?? resolveValue(message, key);
         }
         if (shared.isString(val) || isMessageAST(val)) {
             let occurred = false;

package/package.json

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