@intlify/core-base 9.4.1 → 9.6.0

package/dist/core-base.mjs

@@ -1,5 +1,5 @@
 /*!
-  * core-base v9.4.1
+  * core-base v9.6.0
   * (c) 2023 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -464,6 +464,22 @@ function getWarnMessage(code, ...args) {
     return format$1(warnMessages[code], ...args);
 }
 
+/** @internal */
+function getLocale(context, options) {
+    return options.locale != null
+        ? resolveLocale(options.locale)
+        : resolveLocale(context.locale);
+}
+let _resolveLocale;
+/** @internal */
+function resolveLocale(locale) {
+    // prettier-ignore
+    return isString(locale)
+        ? locale
+        : _resolveLocale != null && locale.resolvedOnce
+            ? _resolveLocale
+            : (_resolveLocale = locale());
+}
 /**
  * Fallback with simple implemenation
  *
@@ -585,7 +601,7 @@ function appendItemToChain(chain, target, blocks) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '9.4.1';
+const VERSION = '9.6.0';
 const NOT_REOSLVED = -1;
 const DEFAULT_LOCALE = 'en-US';
 const MISSING_RESOLVE_VALUE = '';
@@ -661,23 +677,26 @@ function createCoreContext(options = {}) {
     // setup options
     const onWarn = isFunction(options.onWarn) ? options.onWarn : warn;
     const version = isString(options.version) ? options.version : VERSION;
-    const locale = isString(options.locale) ? options.locale : DEFAULT_LOCALE;
+    const locale = isString(options.locale) || isFunction(options.locale)
+        ? options.locale
+        : DEFAULT_LOCALE;
+    const _locale = isFunction(locale) ? DEFAULT_LOCALE : locale;
     const fallbackLocale = isArray(options.fallbackLocale) ||
         isPlainObject(options.fallbackLocale) ||
         isString(options.fallbackLocale) ||
         options.fallbackLocale === false
         ? options.fallbackLocale
-        : locale;
+        : _locale;
     const messages = isPlainObject(options.messages)
         ? options.messages
-        : { [locale]: {} };
+        : { [_locale]: {} };
     const datetimeFormats = isPlainObject(options.datetimeFormats)
             ? options.datetimeFormats
-            : { [locale]: {} }
+            : { [_locale]: {} }
         ;
     const numberFormats = isPlainObject(options.numberFormats)
             ? options.numberFormats
-            : { [locale]: {} }
+            : { [_locale]: {} }
         ;
     const modifiers = assign({}, options.modifiers || {}, getDefaultLinkedModifiers());
     const pluralRules = options.pluralRules || {};
@@ -857,7 +876,7 @@ function formatMessagePart(ctx, node) {
             return ctx.interpolate(ctx.named(named.k || named.key));
         case 5 /* NodeTypes.List */:
             const list = node;
-            return ctx.interpolate(ctx.list(list.i || list.index));
+            return ctx.interpolate(ctx.list(list.i != null ? list.i : list.index));
         case 6 /* NodeTypes.Linked */:
             const linked = node;
             const modifier = linked.m || linked.modifier;
@@ -1021,7 +1040,7 @@ function translate(context, ...args) {
             ? (!messageCompiler ? () => key : key)
             : '';
     const enableDefaultMsg = fallbackFormat || defaultMsgOrKey !== '';
-    const locale = isString(options.locale) ? options.locale : context.locale;
+    const locale = getLocale(context, options);
     // escape params
     escapeParameter && escapeParams(options);
     // resolve message format
@@ -1429,7 +1448,7 @@ function datetime(context, ...args) {
         ? options.fallbackWarn
         : context.fallbackWarn;
     const part = !!options.part;
-    const locale = isString(options.locale) ? options.locale : context.locale;
+    const locale = getLocale(context, options);
     const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
     fallbackLocale, locale);
     if (!isString(key) || key === '') {
@@ -1604,7 +1623,7 @@ function number(context, ...args) {
         ? options.fallbackWarn
         : context.fallbackWarn;
     const part = !!options.part;
-    const locale = isString(options.locale) ? options.locale : context.locale;
+    const locale = getLocale(context, options);
     const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
     fallbackLocale, locale);
     if (!isString(key) || key === '') {
@@ -1735,4 +1754,4 @@ function clearNumberFormat(ctx, locale, format) {
     initFeatureFlags();
 }
 
-export { CoreErrorCodes, CoreWarnCodes, DATETIME_FORMAT_OPTIONS_KEYS, DEFAULT_LOCALE, DEFAULT_MESSAGE_DATA_TYPE, MISSING_RESOLVE_VALUE, NOT_REOSLVED, NUMBER_FORMAT_OPTIONS_KEYS, VERSION, clearCompileCache, clearDateTimeFormat, clearNumberFormat, compile, compileToFunction, createCoreContext, createCoreError, createMessageContext, datetime, fallbackWithLocaleChain, fallbackWithSimple, getAdditionalMeta, getDevToolsHook, getFallbackContext, getWarnMessage, handleMissing, initI18nDevTools, isMessageAST, isMessageFunction, isTranslateFallbackWarn, isTranslateMissingWarn, number, parse, parseDateTimeArgs, parseNumberArgs, parseTranslateArgs, registerLocaleFallbacker, registerMessageCompiler, registerMessageResolver, resolveValue, resolveWithKeyValue, setAdditionalMeta, setDevToolsHook, setFallbackContext, translate, translateDevTools, updateFallbackLocale };
+export { CoreErrorCodes, CoreWarnCodes, DATETIME_FORMAT_OPTIONS_KEYS, DEFAULT_LOCALE, DEFAULT_MESSAGE_DATA_TYPE, MISSING_RESOLVE_VALUE, NOT_REOSLVED, NUMBER_FORMAT_OPTIONS_KEYS, VERSION, clearCompileCache, clearDateTimeFormat, clearNumberFormat, compile, compileToFunction, createCoreContext, createCoreError, createMessageContext, datetime, fallbackWithLocaleChain, fallbackWithSimple, getAdditionalMeta, getDevToolsHook, getFallbackContext, getLocale, getWarnMessage, handleMissing, initI18nDevTools, isMessageAST, isMessageFunction, isTranslateFallbackWarn, isTranslateMissingWarn, number, parse, parseDateTimeArgs, parseNumberArgs, parseTranslateArgs, registerLocaleFallbacker, registerMessageCompiler, registerMessageResolver, resolveLocale, resolveValue, resolveWithKeyValue, setAdditionalMeta, setDevToolsHook, setFallbackContext, translate, translateDevTools, updateFallbackLocale };

package/dist/core-base.prod.cjs

@@ -1,5 +1,5 @@
 /*!
-  * core-base v9.4.1
+  * core-base v9.6.0
   * (c) 2023 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -449,6 +449,22 @@ function getWarnMessage(code, ...args) {
     return shared.format(warnMessages[code], ...args);
 }
 
+/** @internal */
+function getLocale(context, options) {
+    return options.locale != null
+        ? resolveLocale(options.locale)
+        : resolveLocale(context.locale);
+}
+let _resolveLocale;
+/** @internal */
+function resolveLocale(locale) {
+    // prettier-ignore
+    return shared.isString(locale)
+        ? locale
+        : _resolveLocale != null && locale.resolvedOnce
+            ? _resolveLocale
+            : (_resolveLocale = locale());
+}
 /**
  * Fallback with simple implemenation
  *
@@ -570,7 +586,7 @@ function appendItemToChain(chain, target, blocks) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '9.4.1';
+const VERSION = '9.6.0';
 const NOT_REOSLVED = -1;
 const DEFAULT_LOCALE = 'en-US';
 const MISSING_RESOLVE_VALUE = '';
@@ -646,23 +662,26 @@ function createCoreContext(options = {}) {
     // setup options
     const onWarn = shared.isFunction(options.onWarn) ? options.onWarn : shared.warn;
     const version = shared.isString(options.version) ? options.version : VERSION;
-    const locale = shared.isString(options.locale) ? options.locale : DEFAULT_LOCALE;
+    const locale = shared.isString(options.locale) || shared.isFunction(options.locale)
+        ? options.locale
+        : DEFAULT_LOCALE;
+    const _locale = shared.isFunction(locale) ? DEFAULT_LOCALE : locale;
     const fallbackLocale = shared.isArray(options.fallbackLocale) ||
         shared.isPlainObject(options.fallbackLocale) ||
         shared.isString(options.fallbackLocale) ||
         options.fallbackLocale === false
         ? options.fallbackLocale
-        : locale;
+        : _locale;
     const messages = shared.isPlainObject(options.messages)
         ? options.messages
-        : { [locale]: {} };
+        : { [_locale]: {} };
     const datetimeFormats = shared.isPlainObject(options.datetimeFormats)
             ? options.datetimeFormats
-            : { [locale]: {} }
+            : { [_locale]: {} }
         ;
     const numberFormats = shared.isPlainObject(options.numberFormats)
             ? options.numberFormats
-            : { [locale]: {} }
+            : { [_locale]: {} }
         ;
     const modifiers = shared.assign({}, options.modifiers || {}, getDefaultLinkedModifiers());
     const pluralRules = options.pluralRules || {};
@@ -810,7 +829,7 @@ function formatMessagePart(ctx, node) {
             return ctx.interpolate(ctx.named(named.k || named.key));
         case 5 /* NodeTypes.List */:
             const list = node;
-            return ctx.interpolate(ctx.list(list.i || list.index));
+            return ctx.interpolate(ctx.list(list.i != null ? list.i : list.index));
         case 6 /* NodeTypes.Linked */:
             const linked = node;
             const modifier = linked.m || linked.modifier;
@@ -961,7 +980,7 @@ function translate(context, ...args) {
             ? (!messageCompiler ? () => key : key)
             : '';
     const enableDefaultMsg = fallbackFormat || defaultMsgOrKey !== '';
-    const locale = shared.isString(options.locale) ? options.locale : context.locale;
+    const locale = getLocale(context, options);
     // escape params
     escapeParameter && escapeParams(options);
     // resolve message format
@@ -1196,7 +1215,7 @@ function datetime(context, ...args) {
         ? options.fallbackWarn
         : context.fallbackWarn;
     const part = !!options.part;
-    const locale = shared.isString(options.locale) ? options.locale : context.locale;
+    const locale = getLocale(context, options);
     const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
     fallbackLocale, locale);
     if (!shared.isString(key) || key === '') {
@@ -1343,7 +1362,7 @@ function number(context, ...args) {
         ? options.fallbackWarn
         : context.fallbackWarn;
     const part = !!options.part;
-    const locale = shared.isString(options.locale) ? options.locale : context.locale;
+    const locale = getLocale(context, options);
     const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
     fallbackLocale, locale);
     if (!shared.isString(key) || key === '') {
@@ -1471,6 +1490,7 @@ exports.fallbackWithSimple = fallbackWithSimple;
 exports.getAdditionalMeta = getAdditionalMeta;
 exports.getDevToolsHook = getDevToolsHook;
 exports.getFallbackContext = getFallbackContext;
+exports.getLocale = getLocale;
 exports.getWarnMessage = getWarnMessage;
 exports.handleMissing = handleMissing;
 exports.initI18nDevTools = initI18nDevTools;
@@ -1486,6 +1506,7 @@ exports.parseTranslateArgs = parseTranslateArgs;
 exports.registerLocaleFallbacker = registerLocaleFallbacker;
 exports.registerMessageCompiler = registerMessageCompiler;
 exports.registerMessageResolver = registerMessageResolver;
+exports.resolveLocale = resolveLocale;
 exports.resolveValue = resolveValue;
 exports.resolveWithKeyValue = resolveWithKeyValue;
 exports.setAdditionalMeta = setAdditionalMeta;

package/package.json

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