vue-i18n 9.3.0 → 9.4.1

package/README.md

@@ -39,10 +39,20 @@ Internationalization plugin for Vue.js
 ### For Node.js (Server-Side)
 
 - **`vue-i18n.cjs(.prod).js`**:
+  - For CommonJS usage in Node.js
   - For use in Node.js via `require()`
   - If you bundle your app with webpack with `target: 'node'` and properly externalize `vue-i18n`, this is the build that will be loaded
   - The dev/prod files are pre-built, but the appropriate file is automatically required based on `process.env.NODE_ENV`
 
+- **`vue-i18n.node.mjs`**:
+  - For ES Moudles usage in Node.js
+  - For use in Node.js via `import`
+  - The dev/prod files are pre-built, but the appropriate file is automatically required based on `process.env`<wbr/>`.NODE_ENV`
+
+
+> NOTE: ES Modules will be the future of the Node.js module system. The `vue-i18n.cjs(.prod).js` will be deprecated in the future. We recommend you would use `vue-i18n.node.mjs`. 9.3+
+
+
 ## For Bundler feature flags
 
 ### Build Feature Flags

package/dist/vue-i18n.cjs

@@ -1,5 +1,5 @@
 /*!
-  * vue-i18n v9.3.0
+  * vue-i18n v9.4.1
   * (c) 2023 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -17,7 +17,7 @@ var vue = require('vue');
  *
  * @VueI18nGeneral
  */
-const VERSION = '9.3.0';
+const VERSION = '9.4.1';
 
 const code$1 = coreBase.CoreWarnCodes.__EXTEND_POINT__;
 const inc$1 = shared.incrementer(code$1);
@@ -1751,7 +1751,7 @@ function createI18n(options = {}, VueI18nLegacy) {
     const [globalScope, __global] = createGlobal(options, __legacyMode);
     const symbol = /* #__PURE__*/ shared.makeSymbol('vue-i18n' );
     {
-        if (__legacyMode && __allowComposition) {
+        if (__legacyMode && __allowComposition && !false) {
             shared.warn(getWarnMessage(I18nWarnCodes.NOTICE_DROP_ALLOW_COMPOSITION));
         }
     }
@@ -2431,7 +2431,7 @@ function injectGlobalFields(app, composer) {
 
 // register message compiler at vue-i18n
 {
-    coreBase.registerMessageCompiler(coreBase.compileToFunction);
+    coreBase.registerMessageCompiler(coreBase.compile);
 }
 // register message resolver at vue-i18n
 coreBase.registerMessageResolver(coreBase.resolveValue);

package/dist/vue-i18n.esm-browser.js

@@ -1,5 +1,5 @@
 /*!
-  * vue-i18n v9.3.0
+  * vue-i18n v9.4.1
   * (c) 2023 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -32,7 +32,7 @@ let measure;
 }
 const RE_ARGS = /\{([0-9a-zA-Z]+)\}/g;
 /* eslint-disable */
-function format(message, ...args) {
+function format$1(message, ...args) {
     if (args.length === 1 && isObject(args[0])) {
         args = args[0];
     }
@@ -271,7 +271,7 @@ const errorMessages$2 = {
 };
 function createCompileError(code, loc, options = {}) {
     const { domain, messages, args } = options;
-    const msg = format((messages || errorMessages$2)[code] || '', ...(args || []))
+    const msg = format$1((messages || errorMessages$2)[code] || '', ...(args || []))
         ;
     const error = new SyntaxError(String(msg));
     error.code = code;
@@ -808,6 +808,8 @@ function createTokenizer(source, options = {}) {
                 ch === "%" /* TokenChars.Modulo */ ||
                 ch === "@" /* TokenChars.LinkedAlias */ ||
                 ch === "|" /* TokenChars.Pipe */ ||
+                ch === "(" /* TokenChars.ParenLeft */ ||
+                ch === ")" /* TokenChars.ParenRight */ ||
                 !ch) {
                 return buf;
             }
@@ -819,9 +821,6 @@ function createTokenizer(source, options = {}) {
                 scnr.next();
                 return fn(detect, buf);
             }
-            else if (!isIdentifierStart(ch)) {
-                return buf;
-            }
             else {
                 buf += ch;
                 scnr.next();
@@ -2120,11 +2119,6 @@ function createMessageContext(options = {}) {
     return ctx;
 }
 
-const IntlifyDevToolsHooks =  {
-    I18nInit: 'i18n:init',
-    FunctionTranslate: 'function:translate'
-};
-
 let devtools = null;
 function setDevToolsHook(hook) {
     devtools = hook;
@@ -2132,14 +2126,14 @@ function setDevToolsHook(hook) {
 function initI18nDevTools(i18n, version, meta) {
     // TODO: queue if devtools is undefined
     devtools &&
-        devtools.emit(IntlifyDevToolsHooks.I18nInit, {
+        devtools.emit("i18n:init" /* IntlifyDevToolsHooks.I18nInit */, {
             timestamp: Date.now(),
             i18n,
             version,
             meta
         });
 }
-const translateDevTools = /* #__PURE__*/ createDevToolsHook(IntlifyDevToolsHooks.FunctionTranslate);
+const translateDevTools = /* #__PURE__*/ createDevToolsHook("function:translate" /* IntlifyDevToolsHooks.FunctionTranslate */);
 function createDevToolsHook(hook) {
     return (payloads) => devtools && devtools.emit(hook, payloads);
 }
@@ -2165,7 +2159,7 @@ const warnMessages$1 = {
     [CoreWarnCodes.EXPERIMENTAL_CUSTOM_MESSAGE_COMPILER]: `This project is using Custom Message Compiler, which is an experimental feature. It may receive breaking changes or be removed in the future.`
 };
 function getWarnMessage$1(code, ...args) {
-    return format(warnMessages$1[code], ...args);
+    return format$1(warnMessages$1[code], ...args);
 }
 
 /**
@@ -2289,7 +2283,7 @@ function appendItemToChain(chain, target, blocks) {
  * Intlify core-base version
  * @internal
  */
-const VERSION$1 = '9.3.0';
+const VERSION$1 = '9.4.1';
 const NOT_REOSLVED = -1;
 const DEFAULT_LOCALE = 'en-US';
 const MISSING_RESOLVE_VALUE = '';
@@ -2514,6 +2508,66 @@ function updateFallbackLocale(ctx, locale, fallback) {
 }
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
+function format(ast) {
+    const msg = (ctx) => formatParts(ctx, ast);
+    return msg;
+}
+function formatParts(ctx, ast) {
+    const body = ast.b || ast.body;
+    if ((body.t || body.type) === 1 /* NodeTypes.Plural */) {
+        const plural = body;
+        const cases = plural.c || plural.cases;
+        return ctx.plural(cases.reduce((messages, c) => [
+            ...messages,
+            formatMessageParts(ctx, c)
+        ], []));
+    }
+    else {
+        return formatMessageParts(ctx, body);
+    }
+}
+function formatMessageParts(ctx, node) {
+    const _static = node.s || node.static;
+    if (_static) {
+        return ctx.type === 'text'
+            ? _static
+            : ctx.normalize([_static]);
+    }
+    else {
+        const messages = (node.i || node.items).reduce((acm, c) => [...acm, formatMessagePart(ctx, c)], []);
+        return ctx.normalize(messages);
+    }
+}
+function formatMessagePart(ctx, node) {
+    const type = node.t || node.type;
+    switch (type) {
+        case 3 /* NodeTypes.Text */:
+            const text = node;
+            return (text.v || text.value);
+        case 9 /* NodeTypes.Literal */:
+            const literal = node;
+            return (literal.v || literal.value);
+        case 4 /* NodeTypes.Named */:
+            const named = 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));
+        case 6 /* NodeTypes.Linked */:
+            const linked = node;
+            const modifier = linked.m || linked.modifier;
+            return ctx.linked(formatMessagePart(ctx, linked.k || linked.key), modifier ? formatMessagePart(ctx, modifier) : undefined, ctx.type);
+        case 7 /* NodeTypes.LinkedKey */:
+            const linkedKey = node;
+            return (linkedKey.v || linkedKey.value);
+        case 8 /* NodeTypes.LinkedModifier */:
+            const linkedModifier = node;
+            return (linkedModifier.v || linkedModifier.value);
+        default:
+            throw new Error(`unhandled node type on format message part: ${type}`);
+    }
+}
+
 const code$2 = CompileErrorCodes.__EXTEND_POINT__;
 const inc$2 = incrementer(code$2);
 const CoreErrorCodes = {
@@ -2538,7 +2592,7 @@ const errorMessages$1 = {
 const WARN_MESSAGE = `Detected HTML in '{source}' message. Recommend not using HTML messages to avoid XSS.`;
 function checkHtmlMessage(source, warnHtmlMessage) {
     if (warnHtmlMessage && detectHtmlTag(source)) {
-        warn(format(WARN_MESSAGE, { source }));
+        warn(format$1(WARN_MESSAGE, { source }));
     }
 }
 const defaultOnCacheKey = (message) => message;
@@ -2557,11 +2611,8 @@ function baseCompile(message, options = {}) {
     // compile with mesasge-compiler
     return { ...baseCompile$1(message, options), detectError };
 }
-function compileToFunction(message, context) {
-    if (!isString(message)) {
-        throw createCoreError(CoreErrorCodes.NOT_SUPPORT_NON_STRING_MESSAGE);
-    }
-    {
+function compile(message, context) {
+    if (isString(message)) {
         // check HTML message
         const warnHtmlMessage = isBoolean(context.warnHtmlMessage)
             ? context.warnHtmlMessage
@@ -2574,15 +2625,39 @@ function compileToFunction(message, context) {
         if (cached) {
             return cached;
         }
-        // compile
-        const { code, detectError } = baseCompile(message, context);
-        // evaluate function
-        const msg = new Function(`return ${code}`)();
+        // compile with JIT mode
+        const { ast, detectError } = baseCompile(message, {
+            ...context,
+            location: true,
+            jit: true
+        });
+        // compose message function from AST
+        const msg = format(ast);
         // if occurred compile error, don't cache
         return !detectError
             ? (compileCache[cacheKey] = msg)
             : msg;
     }
+    else {
+        if (!isMessageAST(message)) {
+            warn(`the message that is resolve with key '${context.key}' is not supported for jit compilation`);
+            return (() => message);
+        }
+        // AST case (passed from bundler)
+        const cacheKey = message.cacheKey;
+        if (cacheKey) {
+            const cached = compileCache[cacheKey];
+            if (cached) {
+                return cached;
+            }
+            // compose message function from message (AST)
+            return (compileCache[cacheKey] =
+                format(message));
+        }
+        else {
+            return format(message);
+        }
+    }
 }
 
 const NOOP_MESSAGE_FUNCTION = () => '';
@@ -3322,7 +3397,7 @@ function clearNumberFormat(ctx, locale, format) {
  *
  * @VueI18nGeneral
  */
-const VERSION = '9.3.0';
+const VERSION = '9.4.1';
 /**
  * This is only called development env
  * istanbul-ignore-next
@@ -3361,7 +3436,7 @@ const warnMessages = {
     [I18nWarnCodes.NOTICE_DROP_ALLOW_COMPOSITION]: `'allowComposition' option will be dropped in the next major version. For more information, please see 👉 https://tinyurl.com/2p97mcze`
 };
 function getWarnMessage(code, ...args) {
-    return format(warnMessages[code], ...args);
+    return format$1(warnMessages[code], ...args);
 }
 
 const code = CoreErrorCodes.__EXTEND_POINT__;
@@ -5643,7 +5718,7 @@ function createI18n(options = {}, VueI18nLegacy) {
     const [globalScope, __global] = createGlobal(options, __legacyMode);
     const symbol = /* #__PURE__*/ makeSymbol('vue-i18n' );
     {
-        if (__legacyMode && __allowComposition) {
+        if (__legacyMode && __allowComposition && !false) {
             warn(getWarnMessage(I18nWarnCodes.NOTICE_DROP_ALLOW_COMPOSITION));
         }
     }
@@ -6361,7 +6436,7 @@ function injectGlobalFields(app, composer) {
 
 // register message compiler at vue-i18n
 {
-    registerMessageCompiler(compileToFunction);
+    registerMessageCompiler(compile);
 }
 // register message resolver at vue-i18n
 registerMessageResolver(resolveValue);