@intlify/core-base 9.2.0-beta.8 → 9.2.1

package/dist/core-base.esm-bundler.js

@@ -1,9 +1,9 @@
 /*!
-  * core-base v9.2.0-beta.8
-  * (c) 2021 kazuya kawaguchi
+  * core-base v9.2.1
+  * (c) 2022 kazuya kawaguchi
   * Released under the MIT License.
   */
-import { isObject, isNumber, isString, isFunction, isPlainObject, toDisplayString, format, isArray, isBoolean, assign, isRegExp, warn, escapeHtml, inBrowser, mark, measure, generateCodeFrame, generateFormatCacheKey, isEmptyObject, isDate, getGlobalThis } from '@intlify/shared';
+import { isObject, isString, isFunction, isNumber, isPlainObject, toDisplayString, isArray, format, isBoolean, assign, isRegExp, warn, escapeHtml, inBrowser, mark, measure, isEmptyObject, generateCodeFrame, generateFormatCacheKey, isDate, getGlobalThis } from '@intlify/shared';
 import { defaultOnError, baseCompile, CompileErrorCodes, createCompileError } from '@intlify/message-compiler';
 export { CompileErrorCodes, createCompileError } from '@intlify/message-compiler';
 import { IntlifyDevToolsHooks } from '@intlify/devtools-if';
@@ -325,14 +325,15 @@ function createMessageContext(options = {}) {
         isFunction(options.pluralRules[locale])
         ? pluralDefault
         : undefined;
-    const plural = (messages) => messages[pluralRule(pluralIndex, messages.length, orgPluralRule)];
+    const plural = (messages) => {
+        return 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 || {};
     isNumber(options.pluralIndex) && normalizeNamed(pluralIndex, _named);
     const named = (key) => _named[key];
-    // TODO: need to design resolve message function?
     function message(key) {
         // prettier-ignore
         const msg = isFunction(options.messages)
@@ -359,15 +360,39 @@ function createMessageContext(options = {}) {
     const type = isPlainObject(options.processor) && isString(options.processor.type)
         ? options.processor.type
         : DEFAULT_MESSAGE_DATA_TYPE;
+    const linked = (key, ...args) => {
+        const [arg1, arg2] = args;
+        let type = 'text';
+        let modifier = '';
+        if (args.length === 1) {
+            if (isObject(arg1)) {
+                modifier = arg1.modifier || modifier;
+                type = arg1.type || type;
+            }
+            else if (isString(arg1)) {
+                modifier = arg1 || modifier;
+            }
+        }
+        else if (args.length === 2) {
+            if (isString(arg1)) {
+                modifier = arg1 || modifier;
+            }
+            if (isString(arg2)) {
+                type = arg2 || type;
+            }
+        }
+        let msg = message(key)(ctx);
+        // The message in vnode resolved with linked are returned as an array by processor.nomalize
+        if (type === 'vnode' && isArray(msg) && modifier) {
+            msg = msg[0];
+        }
+        return modifier ? _modifier(modifier)(msg, type) : msg;
+    };
     const ctx = {
         ["list" /* LIST */]: list,
         ["named" /* NAMED */]: named,
         ["plural" /* PLURAL */]: plural,
-        ["linked" /* LINKED */]: (key, modifier) => {
-            // TODO: should check `key`
-            const msg = message(key)(ctx);
-            return isString(modifier) ? _modifier(modifier)(msg) : msg;
-        },
+        ["linked" /* LINKED */]: linked,
         ["message" /* MESSAGE */]: message,
         ["type" /* TYPE */]: type,
         ["interpolate" /* INTERPOLATE */]: interpolate,
@@ -541,18 +566,37 @@ function appendItemToChain(chain, target, blocks) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '9.2.0-beta.8';
+const VERSION = '9.2.1';
 const NOT_REOSLVED = -1;
 const DEFAULT_LOCALE = 'en-US';
 const MISSING_RESOLVE_VALUE = '';
+const capitalize = (str) => `${str.charAt(0).toLocaleUpperCase()}${str.substr(1)}`;
 function getDefaultLinkedModifiers() {
     return {
-        upper: (val) => (isString(val) ? val.toUpperCase() : val),
-        lower: (val) => (isString(val) ? val.toLowerCase() : val),
-        // prettier-ignore
-        capitalize: (val) => (isString(val)
-            ? `${val.charAt(0).toLocaleUpperCase()}${val.substr(1)}`
-            : val)
+        upper: (val, type) => {
+            // prettier-ignore
+            return type === 'text' && isString(val)
+                ? val.toUpperCase()
+                : type === 'vnode' && isObject(val) && '__v_isVNode' in val
+                    ? val.children.toUpperCase()
+                    : val;
+        },
+        lower: (val, type) => {
+            // prettier-ignore
+            return type === 'text' && isString(val)
+                ? val.toLowerCase()
+                : type === 'vnode' && isObject(val) && '__v_isVNode' in val
+                    ? val.children.toLowerCase()
+                    : val;
+        },
+        capitalize: (val, type) => {
+            // prettier-ignore
+            return (type === 'text' && isString(val)
+                ? capitalize(val)
+                : type === 'vnode' && isObject(val) && '__v_isVNode' in val
+                    ? capitalize(val.children)
+                    : val);
+        }
     };
 }
 let _compiler;
@@ -587,6 +631,11 @@ const setAdditionalMeta =  (meta) => {
     _additionalMeta = meta;
 };
 const getAdditionalMeta =  () => _additionalMeta;
+let _fallbackContext = null;
+const setFallbackContext = (context) => {
+    _fallbackContext = context;
+};
+const getFallbackContext = () => _fallbackContext;
 // ID for CoreContext
 let _cid = 0;
 function createCoreContext(options = {}) {
@@ -638,6 +687,9 @@ function createCoreContext(options = {}) {
     const localeFallbacker = isFunction(options.localeFallbacker)
         ? options.localeFallbacker
         : _fallbacker || fallbackWithSimple;
+    const fallbackContext = isObject(options.fallbackContext)
+        ? options.fallbackContext
+        : undefined;
     const onWarn = isFunction(options.onWarn) ? options.onWarn : warn;
     // setup internal options
     const internalOptions = options;
@@ -671,6 +723,7 @@ function createCoreContext(options = {}) {
         messageCompiler,
         messageResolver,
         localeFallbacker,
+        fallbackContext,
         onWarn,
         __meta
     };
@@ -778,7 +831,7 @@ function compileToFunction(source, options = {}) {
 }
 
 let code = CompileErrorCodes.__EXTEND_POINT__;
-const inc = () => code++;
+const inc = () => ++code;
 const CoreErrorCodes = {
     INVALID_ARGUMENT: code,
     INVALID_DATE_ARGUMENT: inc(),
@@ -800,7 +853,7 @@ const NOOP_MESSAGE_FUNCTION = () => '';
 const isMessageFunction = (val) => isFunction(val);
 // implementation of `translate` function
 function translate(context, ...args) {
-    const { fallbackFormat, postTranslation, unresolving, fallbackLocale, messages } = context;
+    const { fallbackFormat, postTranslation, unresolving, messageCompiler, fallbackLocale, messages } = context;
     const [key, options] = parseTranslateArgs(...args);
     const missingWarn = isBoolean(options.missingWarn)
         ? options.missingWarn
@@ -816,9 +869,9 @@ function translate(context, ...args) {
     const defaultMsgOrKey = isString(options.default) || isBoolean(options.default) // default by function option
         ? !isBoolean(options.default)
             ? options.default
-            : key
+            : (!messageCompiler ? () => key : key)
         : fallbackFormat // default by `fallbackFormat` option
-            ? key
+            ? (!messageCompiler ? () => key : key)
             : '';
     const enableDefaultMsg = fallbackFormat || defaultMsgOrKey !== '';
     const locale = isString(options.locale) ? options.locale : context.locale;
@@ -826,13 +879,19 @@ function translate(context, ...args) {
     escapeParameter && escapeParams(options);
     // resolve message format
     // eslint-disable-next-line prefer-const
-    let [format, targetLocale, message] = !resolvedMessage
+    let [formatScope, targetLocale, message] = !resolvedMessage
         ? resolveMessageFormat(context, key, locale, fallbackLocale, fallbackWarn, missingWarn)
         : [
             key,
             locale,
             messages[locale] || {}
         ];
+    // NOTE:
+    //  Fix to work around `ssrTransfrom` bug in Vite.
+    //  https://github.com/vitejs/vite/issues/4306
+    //  To get around this, use temporary variables.
+    //  https://github.com/nuxt/framework/issues/1461#issuecomment-954606243
+    let format = formatScope;
     // if you use default message, set it as message format!
     let cacheBaseKey = key;
     if (!resolvedMessage &&
@@ -873,7 +932,9 @@ function translate(context, ...args) {
     const msgContext = createMessageContext(ctxOptions);
     const messaged = evaluateMessage(context, msg, msgContext);
     // if use post translation option, proceed it with handler
-    const ret = postTranslation ? postTranslation(messaged) : messaged;
+    const ret = postTranslation
+        ? postTranslation(messaged, key)
+        : messaged;
     // NOTE: experimental !!
     if ((process.env.NODE_ENV !== 'production') || __INTLIFY_PROD_DEVTOOLS__) {
         // prettier-ignore
@@ -996,6 +1057,12 @@ function compileMessageFormat(context, key, targetLocale, format, cacheBaseKey,
         msg.key = msg.key || key;
         return msg;
     }
+    if (messageCompiler == null) {
+        const msg = (() => format);
+        msg.locale = targetLocale;
+        msg.key = key;
+        return msg;
+    }
     // for vue-devtools timeline event
     let start = null;
     let startTag;
@@ -1125,9 +1192,14 @@ function getCompileOptions(context, locale, key, source, warnHtmlMessage, errorD
     };
 }
 function getMessageContextOptions(context, locale, message, options) {
-    const { modifiers, pluralRules, messageResolver: resolveValue } = context;
+    const { modifiers, pluralRules, messageResolver: resolveValue, fallbackLocale, fallbackWarn, missingWarn, fallbackContext } = context;
     const resolveMessage = (key) => {
-        const val = resolveValue(message, key);
+        let val = resolveValue(message, key);
+        // fallback to root context
+        if (val == null && fallbackContext) {
+            const [, , message] = resolveMessageFormat(fallbackContext, key, locale, fallbackLocale, fallbackWarn, missingWarn);
+            val = resolveValue(message, key);
+        }
         if (isString(val)) {
             let occurred = false;
             const errorDetector = () => {
@@ -1193,7 +1265,7 @@ function datetime(context, ...args) {
     const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
     fallbackLocale, locale);
     if (!isString(key) || key === '') {
-        return new Intl.DateTimeFormat(locale).format(value);
+        return new Intl.DateTimeFormat(locale, overrides).format(value);
     }
     // resolve format
     let datetimeFormat = {};
@@ -1249,9 +1321,32 @@ function datetime(context, ...args) {
     return !part ? formatter.format(value) : formatter.formatToParts(value);
 }
 /** @internal */
+const DATETIME_FORMAT_OPTIONS_KEYS = [
+    'localeMatcher',
+    'weekday',
+    'era',
+    'year',
+    'month',
+    'day',
+    'hour',
+    'minute',
+    'second',
+    'timeZoneName',
+    'formatMatcher',
+    'hour12',
+    'timeZone',
+    'dateStyle',
+    'timeStyle',
+    'calendar',
+    'dayPeriod',
+    'numberingSystem',
+    'hourCycle',
+    'fractionalSecondDigits'
+];
+/** @internal */
 function parseDateTimeArgs(...args) {
     const [arg1, arg2, arg3, arg4] = args;
-    let options = {};
+    const options = {};
     let overrides = {};
     let value;
     if (isString(arg1)) {
@@ -1293,7 +1388,14 @@ function parseDateTimeArgs(...args) {
         options.key = arg2;
     }
     else if (isPlainObject(arg2)) {
-        options = arg2;
+        Object.keys(arg2).forEach(key => {
+            if (DATETIME_FORMAT_OPTIONS_KEYS.includes(key)) {
+                overrides[key] = arg2[key];
+            }
+            else {
+                options[key] = arg2[key];
+            }
+        });
     }
     if (isString(arg3)) {
         options.locale = arg3;
@@ -1338,7 +1440,7 @@ function number(context, ...args) {
     const locales = localeFallbacker(context, // eslint-disable-line @typescript-eslint/no-explicit-any
     fallbackLocale, locale);
     if (!isString(key) || key === '') {
-        return new Intl.NumberFormat(locale).format(value);
+        return new Intl.NumberFormat(locale, overrides).format(value);
     }
     // resolve format
     let numberFormat = {};
@@ -1394,9 +1496,32 @@ function number(context, ...args) {
     return !part ? formatter.format(value) : formatter.formatToParts(value);
 }
 /** @internal */
+const NUMBER_FORMAT_OPTIONS_KEYS = [
+    'localeMatcher',
+    'style',
+    'currency',
+    'currencyDisplay',
+    'currencySign',
+    'useGrouping',
+    'minimumIntegerDigits',
+    'minimumFractionDigits',
+    'maximumFractionDigits',
+    'minimumSignificantDigits',
+    'maximumSignificantDigits',
+    'compactDisplay',
+    'notation',
+    'signDisplay',
+    'unit',
+    'unitDisplay',
+    'roundingMode',
+    'roundingPriority',
+    'roundingIncrement',
+    'trailingZeroDisplay'
+];
+/** @internal */
 function parseNumberArgs(...args) {
     const [arg1, arg2, arg3, arg4] = args;
-    let options = {};
+    const options = {};
     let overrides = {};
     if (!isNumber(arg1)) {
         throw createCoreError(CoreErrorCodes.INVALID_ARGUMENT);
@@ -1406,7 +1531,14 @@ function parseNumberArgs(...args) {
         options.key = arg2;
     }
     else if (isPlainObject(arg2)) {
-        options = arg2;
+        Object.keys(arg2).forEach(key => {
+            if (NUMBER_FORMAT_OPTIONS_KEYS.includes(key)) {
+                overrides[key] = arg2[key];
+            }
+            else {
+                options[key] = arg2[key];
+            }
+        });
     }
     if (isString(arg3)) {
         options.locale = arg3;
@@ -1431,10 +1563,11 @@ function clearNumberFormat(ctx, locale, format) {
     }
 }
 
+// TODO: we could not exports for Node native ES Moudles yet...
 {
     if (typeof __INTLIFY_PROD_DEVTOOLS__ !== 'boolean') {
         getGlobalThis().__INTLIFY_PROD_DEVTOOLS__ = false;
     }
 }
 
-export { CoreErrorCodes, CoreWarnCodes, DEFAULT_LOCALE, DEFAULT_MESSAGE_DATA_TYPE, MISSING_RESOLVE_VALUE, NOT_REOSLVED, VERSION, clearCompileCache, clearDateTimeFormat, clearNumberFormat, compileToFunction, createCoreContext, createCoreError, createMessageContext, datetime, fallbackWithLocaleChain, fallbackWithSimple, getAdditionalMeta, getDevToolsHook, getWarnMessage, handleMissing, initI18nDevTools, isMessageFunction, isTranslateFallbackWarn, isTranslateMissingWarn, number, parse, parseDateTimeArgs, parseNumberArgs, parseTranslateArgs, registerLocaleFallbacker, registerMessageCompiler, registerMessageResolver, resolveValue, resolveWithKeyValue, setAdditionalMeta, setDevToolsHook, 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, compileToFunction, createCoreContext, createCoreError, createMessageContext, datetime, fallbackWithLocaleChain, fallbackWithSimple, getAdditionalMeta, getDevToolsHook, getFallbackContext, getWarnMessage, handleMissing, initI18nDevTools, isMessageFunction, isTranslateFallbackWarn, isTranslateMissingWarn, number, parse, parseDateTimeArgs, parseNumberArgs, parseTranslateArgs, registerLocaleFallbacker, registerMessageCompiler, registerMessageResolver, resolveValue, resolveWithKeyValue, setAdditionalMeta, setDevToolsHook, setFallbackContext, translate, translateDevTools, updateFallbackLocale };