@intlify/core-base 9.2.0-beta.33 → 9.2.0-beta.36

package/dist/core-base.cjs.js

@@ -1,5 +1,5 @@
 /*!
-  * core-base v9.2.0-beta.33
+  * core-base v9.2.0-beta.36
   * (c) 2022 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -328,7 +328,9 @@ 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
@@ -358,13 +360,37 @@ function createMessageContext(options = {}) {
         shared.isFunction(options.processor.interpolate)
         ? options.processor.interpolate
         : DEFAULT_INTERPOLATE;
-    const linked = (key, modifier) => {
-        const msg = message(key)(ctx);
-        return shared.isString(modifier) ? _modifier(modifier)(msg) : msg;
-    };
     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,
@@ -543,18 +569,37 @@ function appendItemToChain(chain, target, blocks) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '9.2.0-beta.33';
+const VERSION = '9.2.0-beta.36';
 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;
@@ -1271,10 +1316,32 @@ function datetime(context, ...args) {
     }
     return !part ? formatter.format(value) : formatter.formatToParts(value);
 }
+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)) {
@@ -1316,7 +1383,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;
@@ -1415,10 +1489,28 @@ function number(context, ...args) {
     }
     return !part ? formatter.format(value) : formatter.formatToParts(value);
 }
+const NUMBER_FORMAT_OPTIONS_KEYS = [
+    'localeMatcher',
+    'style',
+    'currency',
+    'currencyDisplay',
+    'currencySign',
+    'useGrouping',
+    'minimumIntegerDigits',
+    'minimumFractionDigits',
+    'maximumFractionDigits',
+    'minimumSignificantDigits',
+    'maximumSignificantDigits',
+    'compactDisplay',
+    'notation',
+    'signDisplay',
+    'unit',
+    'unitDisplay'
+];
 /** @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);
@@ -1428,7 +1520,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;

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

@@ -1,5 +1,5 @@
 /*!
-  * core-base v9.2.0-beta.33
+  * core-base v9.2.0-beta.36
   * (c) 2022 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -328,7 +328,9 @@ 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
@@ -358,13 +360,37 @@ function createMessageContext(options = {}) {
         shared.isFunction(options.processor.interpolate)
         ? options.processor.interpolate
         : DEFAULT_INTERPOLATE;
-    const linked = (key, modifier) => {
-        const msg = message(key)(ctx);
-        return shared.isString(modifier) ? _modifier(modifier)(msg) : msg;
-    };
     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,
@@ -543,18 +569,37 @@ function appendItemToChain(chain, target, blocks) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '9.2.0-beta.33';
+const VERSION = '9.2.0-beta.36';
 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;
@@ -1052,10 +1097,32 @@ function datetime(context, ...args) {
     }
     return !part ? formatter.format(value) : formatter.formatToParts(value);
 }
+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)) {
@@ -1097,7 +1164,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;
@@ -1169,10 +1243,28 @@ function number(context, ...args) {
     }
     return !part ? formatter.format(value) : formatter.formatToParts(value);
 }
+const NUMBER_FORMAT_OPTIONS_KEYS = [
+    'localeMatcher',
+    'style',
+    'currency',
+    'currencyDisplay',
+    'currencySign',
+    'useGrouping',
+    'minimumIntegerDigits',
+    'minimumFractionDigits',
+    'maximumFractionDigits',
+    'minimumSignificantDigits',
+    'maximumSignificantDigits',
+    'compactDisplay',
+    'notation',
+    'signDisplay',
+    'unit',
+    'unitDisplay'
+];
 /** @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);
@@ -1182,7 +1274,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;

package/dist/core-base.d.ts

@@ -249,9 +249,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
@@ -261,7 +261,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
@@ -384,7 +384,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;
@@ -452,6 +457,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>;
@@ -572,7 +579,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
@@ -582,7 +589,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

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

@@ -1,5 +1,5 @@
 /*!
-  * core-base v9.2.0-beta.33
+  * core-base v9.2.0-beta.36
   * (c) 2022 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -1246,6 +1246,7 @@ function traverseNode(node, transformer) {
             const linked = node;
             traverseNode(linked.key, transformer);
             transformer.helper("linked" /* LINKED */);
+            transformer.helper("type" /* TYPE */);
             break;
         case 5 /* List */:
             transformer.helper("interpolate" /* INTERPOLATE */);
@@ -1322,6 +1323,10 @@ function generateLinkedNode(generator, node) {
     if (node.modifier) {
         generator.push(`, `);
         generateNode(generator, node.modifier);
+        generator.push(`, _type`);
+    }
+    else {
+        generator.push(`, undefined, _type`);
     }
     generator.push(`)`);
 }
@@ -1773,7 +1778,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
@@ -1803,13 +1810,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,
@@ -1993,18 +2024,37 @@ function appendItemToChain(chain, target, blocks) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '9.2.0-beta.33';
+const VERSION = '9.2.0-beta.36';
 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;
@@ -2721,10 +2771,32 @@ function datetime(context, ...args) {
     }
     return !part ? formatter.format(value) : formatter.formatToParts(value);
 }
+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)) {
@@ -2766,7 +2838,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;
@@ -2865,10 +2944,28 @@ function number(context, ...args) {
     }
     return !part ? formatter.format(value) : formatter.formatToParts(value);
 }
+const NUMBER_FORMAT_OPTIONS_KEYS = [
+    'localeMatcher',
+    'style',
+    'currency',
+    'currencyDisplay',
+    'currencySign',
+    'useGrouping',
+    'minimumIntegerDigits',
+    'minimumFractionDigits',
+    'maximumFractionDigits',
+    'minimumSignificantDigits',
+    'maximumSignificantDigits',
+    'compactDisplay',
+    'notation',
+    'signDisplay',
+    'unit',
+    'unitDisplay'
+];
 /** @internal */
 function parseNumberArgs(...args) {
     const [arg1, arg2, arg3, arg4] = args;
-    let options = {};
+    const options = {};
     let overrides = {};
     if (!isNumber(arg1)) {
         throw createCoreError(CoreErrorCodes.INVALID_ARGUMENT);
@@ -2878,7 +2975,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;