@intlify/core-base 9.2.0-beta.34 → 9.2.0-beta.37

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

@@ -1,9 +1,9 @@
 /*!
-  * core-base v9.2.0-beta.34
+  * core-base v9.2.0-beta.37
   * (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, isNumber, isString, isFunction, isPlainObject, toDisplayString, isArray, format, isBoolean, assign, isRegExp, warn, escapeHtml, inBrowser, mark, measure, generateCodeFrame, generateFormatCacheKey, isEmptyObject, 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,7 +325,9 @@ 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
@@ -355,13 +357,37 @@ function createMessageContext(options = {}) {
         isFunction(options.processor.interpolate)
         ? options.processor.interpolate
         : DEFAULT_INTERPOLATE;
-    const linked = (key, modifier) => {
-        const msg = message(key)(ctx);
-        return isString(modifier) ? _modifier(modifier)(msg) : msg;
-    };
     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,
@@ -540,18 +566,37 @@ function appendItemToChain(chain, target, blocks) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '9.2.0-beta.34';
+const VERSION = '9.2.0-beta.37';
 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;
@@ -887,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
@@ -1218,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 = {};
@@ -1274,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)) {
@@ -1318,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;
@@ -1363,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 = {};
@@ -1419,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);
@@ -1431,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;
@@ -1463,4 +1570,4 @@ function clearNumberFormat(ctx, locale, format) {
     }
 }
 
-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, getFallbackContext, getWarnMessage, handleMissing, initI18nDevTools, 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, 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 };

package/dist/core-base.global.js

@@ -1,5 +1,5 @@
 /*!
-  * core-base v9.2.0-beta.34
+  * core-base v9.2.0-beta.37
   * (c) 2022 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -462,6 +462,16 @@ var IntlifyCoreBase = (function (exports) {
           scnr.resetPeek();
           return ret;
       }
+      function detectModuloStart(scnr) {
+          const spaces = peekSpaces(scnr);
+          const ret = scnr.currentPeek() === "%" /* Modulo */ &&
+              scnr.peek() === "{" /* BraceLeft */;
+          scnr.resetPeek();
+          return {
+              isModulo: ret,
+              hasSpace: spaces.length > 0
+          };
+      }
       function isTextStart(scnr, reset = true) {
           const fn = (hasSpace = false, prev = '', detectModulo = false) => {
               const ch = scnr.currentPeek();
@@ -543,6 +553,15 @@ var IntlifyCoreBase = (function (exports) {
           }
           return num;
       }
+      function readModulo(scnr) {
+          skipSpaces(scnr);
+          const ch = scnr.currentChar();
+          if (ch !== "%" /* Modulo */) {
+              emitError(CompileErrorCodes.EXPECTED_TOKEN, currentPosition(), 0, ch);
+          }
+          scnr.next();
+          return "%" /* Modulo */;
+      }
       function readText(scnr) {
           let buf = '';
           while (true) {
@@ -889,13 +908,15 @@ var IntlifyCoreBase = (function (exports) {
                       context.inLinked = false;
                       return token;
                   }
+                  const { isModulo, hasSpace } = detectModuloStart(scnr);
+                  if (isModulo) {
+                      return hasSpace
+                          ? getToken(context, 0 /* Text */, readText(scnr))
+                          : getToken(context, 4 /* Modulo */, readModulo(scnr));
+                  }
                   if (isTextStart(scnr)) {
                       return getToken(context, 0 /* Text */, readText(scnr));
                   }
-                  if (ch === "%" /* Modulo */) {
-                      scnr.next();
-                      return getToken(context, 4 /* Modulo */, "%" /* Modulo */);
-                  }
                   break;
           }
           return token;
@@ -1249,6 +1270,7 @@ var IntlifyCoreBase = (function (exports) {
               const linked = node;
               traverseNode(linked.key, transformer);
               transformer.helper("linked" /* LINKED */);
+              transformer.helper("type" /* TYPE */);
               break;
           case 5 /* List */:
               transformer.helper("interpolate" /* INTERPOLATE */);
@@ -1325,6 +1347,10 @@ var IntlifyCoreBase = (function (exports) {
       if (node.modifier) {
           generator.push(`, `);
           generateNode(generator, node.modifier);
+          generator.push(`, _type`);
+      }
+      else {
+          generator.push(`, undefined, _type`);
       }
       generator.push(`)`);
   }
@@ -1776,7 +1802,9 @@ var IntlifyCoreBase = (function (exports) {
           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
@@ -1806,13 +1834,37 @@ var IntlifyCoreBase = (function (exports) {
           isFunction(options.processor.interpolate)
           ? options.processor.interpolate
           : DEFAULT_INTERPOLATE;
-      const linked = (key, modifier) => {
-          const msg = message(key)(ctx);
-          return isString(modifier) ? _modifier(modifier)(msg) : msg;
-      };
       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,
@@ -1996,18 +2048,37 @@ var IntlifyCoreBase = (function (exports) {
    * Intlify core-base version
    * @internal
    */
-  const VERSION = '9.2.0-beta.34';
+  const VERSION = '9.2.0-beta.37';
   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;
@@ -2343,7 +2414,9 @@ var IntlifyCoreBase = (function (exports) {
       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 !!
       {
           // prettier-ignore
@@ -2670,7 +2743,7 @@ var IntlifyCoreBase = (function (exports) {
       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 = {};
@@ -2725,9 +2798,32 @@ var IntlifyCoreBase = (function (exports) {
       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)) {
@@ -2769,7 +2865,14 @@ var IntlifyCoreBase = (function (exports) {
           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;
@@ -2814,7 +2917,7 @@ var IntlifyCoreBase = (function (exports) {
       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 = {};
@@ -2869,9 +2972,32 @@ var IntlifyCoreBase = (function (exports) {
       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);
@@ -2881,7 +3007,14 @@ var IntlifyCoreBase = (function (exports) {
           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;
@@ -2909,10 +3042,12 @@ var IntlifyCoreBase = (function (exports) {
   exports.CompileErrorCodes = CompileErrorCodes;
   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;