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

package/dist/core-base.cjs.prod.js

@@ -1,6 +1,6 @@
 /*!
-  * 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.
   */
 'use strict';
@@ -328,14 +328,15 @@ function createMessageContext(options = {}) {
         shared.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 || {};
     shared.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 = shared.isFunction(options.messages)
@@ -362,15 +363,39 @@ function createMessageContext(options = {}) {
     const type = shared.isPlainObject(options.processor) && shared.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 (shared.isObject(arg1)) {
+                modifier = arg1.modifier || modifier;
+                type = arg1.type || type;
+            }
+            else if (shared.isString(arg1)) {
+                modifier = arg1 || modifier;
+            }
+        }
+        else if (args.length === 2) {
+            if (shared.isString(arg1)) {
+                modifier = arg1 || modifier;
+            }
+            if (shared.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' && shared.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 shared.isString(modifier) ? _modifier(modifier)(msg) : msg;
-        },
+        ["linked" /* LINKED */]: linked,
         ["message" /* MESSAGE */]: message,
         ["type" /* TYPE */]: type,
         ["interpolate" /* INTERPOLATE */]: interpolate,
@@ -544,18 +569,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) => (shared.isString(val) ? val.toUpperCase() : val),
-        lower: (val) => (shared.isString(val) ? val.toLowerCase() : val),
-        // prettier-ignore
-        capitalize: (val) => (shared.isString(val)
-            ? `${val.charAt(0).toLocaleUpperCase()}${val.substr(1)}`
-            : val)
+        upper: (val, type) => {
+            // prettier-ignore
+            return type === 'text' && shared.isString(val)
+                ? val.toUpperCase()
+                : type === 'vnode' && shared.isObject(val) && '__v_isVNode' in val
+                    ? val.children.toUpperCase()
+                    : val;
+        },
+        lower: (val, type) => {
+            // prettier-ignore
+            return type === 'text' && shared.isString(val)
+                ? val.toLowerCase()
+                : type === 'vnode' && shared.isObject(val) && '__v_isVNode' in val
+                    ? val.children.toLowerCase()
+                    : val;
+        },
+        capitalize: (val, type) => {
+            // prettier-ignore
+            return (type === 'text' && shared.isString(val)
+                ? capitalize(val)
+                : type === 'vnode' && shared.isObject(val) && '__v_isVNode' in val
+                    ? capitalize(val.children)
+                    : val);
+        }
     };
 }
 let _compiler;
@@ -590,6 +634,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 = {}) {
@@ -641,6 +690,9 @@ function createCoreContext(options = {}) {
     const localeFallbacker = shared.isFunction(options.localeFallbacker)
         ? options.localeFallbacker
         : _fallbacker || fallbackWithSimple;
+    const fallbackContext = shared.isObject(options.fallbackContext)
+        ? options.fallbackContext
+        : undefined;
     const onWarn = shared.isFunction(options.onWarn) ? options.onWarn : shared.warn;
     // setup internal options
     const internalOptions = options;
@@ -674,6 +726,7 @@ function createCoreContext(options = {}) {
         messageCompiler,
         messageResolver,
         localeFallbacker,
+        fallbackContext,
         onWarn,
         __meta
     };
@@ -743,7 +796,7 @@ function compileToFunction(source, options = {}) {
 }
 
 let code = messageCompiler.CompileErrorCodes.__EXTEND_POINT__;
-const inc = () => code++;
+const inc = () => ++code;
 const CoreErrorCodes = {
     INVALID_ARGUMENT: code,
     INVALID_DATE_ARGUMENT: inc(),
@@ -765,7 +818,7 @@ const NOOP_MESSAGE_FUNCTION = () => '';
 const isMessageFunction = (val) => shared.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 = shared.isBoolean(options.missingWarn)
         ? options.missingWarn
@@ -781,9 +834,9 @@ function translate(context, ...args) {
     const defaultMsgOrKey = shared.isString(options.default) || shared.isBoolean(options.default) // default by function option
         ? !shared.isBoolean(options.default)
             ? options.default
-            : key
+            : (!messageCompiler ? () => key : key)
         : fallbackFormat // default by `fallbackFormat` option
-            ? key
+            ? (!messageCompiler ? () => key : key)
             : '';
     const enableDefaultMsg = fallbackFormat || defaultMsgOrKey !== '';
     const locale = shared.isString(options.locale) ? options.locale : context.locale;
@@ -791,13 +844,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 &&
@@ -831,7 +890,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;
     return ret;
 }
 function escapeParams(options) {
@@ -879,6 +940,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;
+    }
     const msg = messageCompiler(format, getCompileOptions(context, targetLocale, cacheBaseKey, format, warnHtmlMessage, errorDetector));
     msg.locale = targetLocale;
     msg.key = key;
@@ -938,9 +1005,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 (shared.isString(val)) {
             let occurred = false;
             const errorDetector = () => {
@@ -996,7 +1068,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).format(value);
+        return new Intl.DateTimeFormat(locale, overrides).format(value);
     }
     // resolve format
     let datetimeFormat = {};
@@ -1028,9 +1100,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 (shared.isString(arg1)) {
@@ -1072,7 +1167,14 @@ function parseDateTimeArgs(...args) {
         options.key = arg2;
     }
     else if (shared.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 (shared.isString(arg3)) {
         options.locale = arg3;
@@ -1113,7 +1215,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).format(value);
+        return new Intl.NumberFormat(locale, overrides).format(value);
     }
     // resolve format
     let numberFormat = {};
@@ -1145,9 +1247,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 (!shared.isNumber(arg1)) {
         throw createCoreError(CoreErrorCodes.INVALID_ARGUMENT);
@@ -1157,7 +1282,14 @@ function parseNumberArgs(...args) {
         options.key = arg2;
     }
     else if (shared.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 (shared.isString(arg3)) {
         options.locale = arg3;
@@ -1186,10 +1318,12 @@ exports.CompileErrorCodes = messageCompiler.CompileErrorCodes;
 exports.createCompileError = messageCompiler.createCompileError;
 exports.CoreErrorCodes = CoreErrorCodes;
 exports.CoreWarnCodes = CoreWarnCodes;
+exports.DATETIME_FORMAT_OPTIONS_KEYS = DATETIME_FORMAT_OPTIONS_KEYS;
 exports.DEFAULT_LOCALE = DEFAULT_LOCALE;
 exports.DEFAULT_MESSAGE_DATA_TYPE = DEFAULT_MESSAGE_DATA_TYPE;
 exports.MISSING_RESOLVE_VALUE = MISSING_RESOLVE_VALUE;
 exports.NOT_REOSLVED = NOT_REOSLVED;
+exports.NUMBER_FORMAT_OPTIONS_KEYS = NUMBER_FORMAT_OPTIONS_KEYS;
 exports.VERSION = VERSION;
 exports.clearCompileCache = clearCompileCache;
 exports.clearDateTimeFormat = clearDateTimeFormat;
@@ -1203,6 +1337,7 @@ exports.fallbackWithLocaleChain = fallbackWithLocaleChain;
 exports.fallbackWithSimple = fallbackWithSimple;
 exports.getAdditionalMeta = getAdditionalMeta;
 exports.getDevToolsHook = getDevToolsHook;
+exports.getFallbackContext = getFallbackContext;
 exports.getWarnMessage = getWarnMessage;
 exports.handleMissing = handleMissing;
 exports.initI18nDevTools = initI18nDevTools;
@@ -1221,6 +1356,7 @@ exports.resolveValue = resolveValue;
 exports.resolveWithKeyValue = resolveWithKeyValue;
 exports.setAdditionalMeta = setAdditionalMeta;
 exports.setDevToolsHook = setDevToolsHook;
+exports.setFallbackContext = setFallbackContext;
 exports.translate = translate;
 exports.translateDevTools = translateDevTools;
 exports.updateFallbackLocale = updateFallbackLocale;

package/dist/core-base.d.ts

@@ -35,7 +35,9 @@ export declare interface CoreCommonContext<Message = string, Locales = 'en-US'>
     onWarn(msg: string, err?: Error): void;
 }
 
-export declare type CoreContext<Message = string, Messages = {}, DateTimeFormats = {}, NumberFormats = {}, ResourceLocales = PickupLocales<NonNullable<Messages>> | PickupLocales<NonNullable<DateTimeFormats>> | PickupLocales<NonNullable<NumberFormats>>, Locales = [ResourceLocales] extends [never] ? Locale : ResourceLocales> = CoreCommonContext<Message, Locales> & CoreTranslationContext<NonNullable<Messages>, Message> & CoreDateTimeContext<NonNullable<DateTimeFormats>> & CoreNumberContext<NonNullable<NumberFormats>>;
+export declare type CoreContext<Message = string, Messages = {}, DateTimeFormats = {}, NumberFormats = {}, ResourceLocales = PickupLocales<NonNullable<Messages>> | PickupLocales<NonNullable<DateTimeFormats>> | PickupLocales<NonNullable<NumberFormats>>, Locales = [ResourceLocales] extends [never] ? Locale : ResourceLocales> = CoreCommonContext<Message, Locales> & CoreTranslationContext<NonNullable<Messages>, Message> & CoreDateTimeContext<NonNullable<DateTimeFormats>> & CoreNumberContext<NonNullable<NumberFormats>> & {
+    fallbackContext?: CoreContext<Message, Messages, DateTimeFormats, NumberFormats, ResourceLocales, Locales>;
+};
 
 export declare interface CoreDateTimeContext<DateTimeFormats = {}> {
     datetimeFormats: {
@@ -132,6 +134,7 @@ export declare interface CoreOptions<Message = string, Schema extends {
     messageCompiler?: MessageCompiler<Message>;
     messageResolver?: MessageResolver;
     localeFallbacker?: LocaleFallbacker;
+    fallbackContext?: CoreContext<Message, MessagesLocales, DateTimeFormatsLocales, NumberFormatsLocales>;
     onWarn?: (msg: string, err?: Error) => void;
 }
 
@@ -196,6 +199,8 @@ export declare function datetime<Context extends CoreContext<Message, {}, Contex
 
 export declare function datetime<Context extends CoreContext<Message, {}, Context['datetimeFormats'], {}>, Value extends number | string | Date = number, Key extends string = string, ResourceKeys extends PickupFormatKeys<Context['datetimeFormats']> = PickupFormatKeys<Context['datetimeFormats']>, Message = string>(context: Context, value: Value, keyOrOptions: Key | ResourceKeys | DateTimeOptions<Key | ResourceKeys, Context['locale']>, locale: Context['locale'], override: Intl.DateTimeFormatOptions): string | number | Intl.DateTimeFormatPart[];
 
+/* Excluded from this release type: DATETIME_FORMAT_OPTIONS_KEYS */
+
 export declare type DateTimeDigital = 'numeric' | '2-digit';
 
 export declare type DateTimeFormat = {
@@ -246,9 +251,9 @@ export declare type DateTimeHumanReadable = 'long' | 'short' | 'narrow';
  *    datetime(context, value, { key: 'short', part: true })
  *
  *    // orverride context.datetimeFormats[locale] options with functino options
- *    datetime(cnotext, value, 'short', { currency: 'EUR' })
- *    datetime(cnotext, value, 'short', 'ja-JP', { currency: 'EUR' })
- *    datetime(context, value, { key: 'short', part: true }, { currency: 'EUR'})
+ *    datetime(cnotext, value, 'short', { year: '2-digit' })
+ *    datetime(cnotext, value, 'short', 'ja-JP', { year: '2-digit' })
+ *    datetime(context, value, { key: 'short', part: true, year: '2-digit' })
  */
 /**
  * DateTime options
@@ -258,7 +263,7 @@ export declare type DateTimeHumanReadable = 'long' | 'short' | 'narrow';
  *
  * @VueI18nGeneral
  */
-export declare interface DateTimeOptions<Key = string, Locales = Locale> {
+export declare interface DateTimeOptions<Key = string, Locales = Locale> extends Intl.DateTimeFormatOptions {
     /**
      * @remarks
      * The target format key
@@ -354,6 +359,8 @@ export declare const getAdditionalMeta: () => MetaInfo | null;
 
 export declare function getDevToolsHook(): IntlifyDevToolsEmitter | null;
 
+export declare const getFallbackContext: () => CoreContext | null;
+
 export declare function getWarnMessage(code: CoreWarnCodes, ...args: unknown[]): string;
 
 /* Excluded from this release type: handleMissing */
@@ -379,7 +386,12 @@ export declare type LinkedModifiers<T = string> = {
     [key: string]: LinkedModify<T>;
 };
 
-export declare type LinkedModify<T = string> = (value: T) => MessageType<T>;
+export declare type LinkedModify<T = string> = (value: T, type: string) => MessageType<T>;
+
+export declare interface LinkedOptions {
+    type?: string;
+    modifier?: string;
+}
 
 /** @VueI18nGeneral */
 export declare type Locale = string;
@@ -447,6 +459,8 @@ export declare interface MessageContext<T = string> {
     named(key: string): unknown;
     plural(messages: T[]): T;
     linked(key: Path, modifier?: string): MessageType<T>;
+    linked(key: Path, modifier?: string, type?: string): MessageType<T>;
+    linked(key: Path, optoins?: LinkedOptions): MessageType<T>;
     message(key: Path): MessageFunction<T>;
     type: string;
     interpolate: MessageInterpolate<T>;
@@ -519,6 +533,8 @@ export declare function number<Context extends CoreContext<Message, {}, {}, Cont
 
 export declare function number<Context extends CoreContext<Message, {}, {}, Context['numberFormats']>, Value extends number = number, Key extends string = string, ResourceKeys extends PickupFormatKeys<Context['numberFormats']> = PickupFormatKeys<Context['numberFormats']>, Message = string>(context: Context, value: Value, keyOrOptions: Key | ResourceKeys | NumberOptions<Key | ResourceKeys, Context['locale']>, locale: Context['locale'], override: Intl.NumberFormatOptions): string | number | Intl.NumberFormatPart[];
 
+/* Excluded from this release type: NUMBER_FORMAT_OPTIONS_KEYS */
+
 export declare type NumberFormat = {
     [key: string]: NumberFormatOptions;
 };
@@ -567,7 +583,7 @@ export declare type NumberFormatToPartsResult = {
  *    // orverride context.numberFormats[locale] options with functino options
  *    number(cnotext, value, 'currency', { year: '2-digit' })
  *    number(cnotext, value, 'currency', 'ja-JP', { year: '2-digit' })
- *    number(context, value, { key: 'currenty', part: true }, { year: '2-digit'})
+ *    number(context, value, { key: 'currenty', locale: 'ja-JP', part: true, year: '2-digit'})
  */
 /**
  * Number Options
@@ -577,7 +593,7 @@ export declare type NumberFormatToPartsResult = {
  *
  * @VueI18nGeneral
  */
-export declare interface NumberOptions<Key = string, Locales = Locale> {
+export declare interface NumberOptions<Key = string, Locales = Locale> extends Intl.NumberFormatOptions {
     /**
      * @remarks
      * The target format key
@@ -649,7 +665,7 @@ export declare type PluralizationRules = {
 };
 
 /** @VueI18nGeneral */
-export declare type PostTranslationHandler<Message = string> = (translated: MessageType<Message>) => MessageType<Message>;
+export declare type PostTranslationHandler<Message = string> = (translated: MessageType<Message>, key: string) => MessageType<Message>;
 
 /**
  * Register the locale fallbacker
@@ -737,6 +753,8 @@ export declare const setAdditionalMeta: (meta: MetaInfo | null) => void;
 
 export declare function setDevToolsHook(hook: IntlifyDevToolsEmitter | null): void;
 
+export declare const setFallbackContext: (context: CoreContext | null) => void;
+
 export declare interface SpecificDateTimeFormatOptions extends Intl.DateTimeFormatOptions {
     year?: DateTimeDigital;
     month?: DateTimeDigital | DateTimeHumanReadable;