vue-i18n 9.14.2 → 9.14.4

package/dist/vue-i18n.cjs

@@ -1,6 +1,6 @@
 /*!
-  * vue-i18n v9.14.2
-  * (c) 2024 kazuya kawaguchi
+  * vue-i18n v9.14.4
+  * (c) 2025 kazuya kawaguchi
   * Released under the MIT License.
   */
 'use strict';
@@ -17,7 +17,7 @@ var vue = require('vue');
  *
  * @VueI18nGeneral
  */
-const VERSION = '9.14.2';
+const VERSION = '9.14.4';
 
 const code$1 = coreBase.CoreWarnCodes.__EXTEND_POINT__;
 const inc$1 = shared.incrementer(code$1);
@@ -121,6 +121,9 @@ function handleFlatJson(obj) {
     if (!shared.isObject(obj)) {
         return obj;
     }
+    if (coreBase.isMessageAST(obj)) {
+        return obj;
+    }
     for (const key in obj) {
         // check key
         if (!shared.hasOwn(obj, key)) {
@@ -141,6 +144,9 @@ function handleFlatJson(obj) {
             let currentObj = obj;
             let hasStringValue = false;
             for (let i = 0; i < lastIndex; i++) {
+                if (subKeys[i] === '__proto__') {
+                    throw new Error(`unsafe key: ${subKeys[i]}`);
+                }
                 if (!(subKeys[i] in currentObj)) {
                     currentObj[subKeys[i]] = shared.create();
                 }
@@ -155,12 +161,26 @@ function handleFlatJson(obj) {
             }
             // update last object value, delete old property
             if (!hasStringValue) {
-                currentObj[subKeys[lastIndex]] = obj[key];
-                delete obj[key];
+                if (!coreBase.isMessageAST(currentObj)) {
+                    currentObj[subKeys[lastIndex]] = obj[key];
+                    delete obj[key];
+                }
+                else {
+                    /**
+                     * NOTE:
+                     * if the last object is a message AST and subKeys[lastIndex] has message AST prop key, ignore to copy and key deletion
+                     */
+                    if (!coreBase.AST_NODE_PROPS_KEYS.includes(subKeys[lastIndex])) {
+                        delete obj[key];
+                    }
+                }
             }
             // recursive process value if value is also a object
-            if (shared.isObject(currentObj[subKeys[lastIndex]])) {
-                handleFlatJson(currentObj[subKeys[lastIndex]]);
+            if (!coreBase.isMessageAST(currentObj)) {
+                const target = currentObj[subKeys[lastIndex]];
+                if (shared.isObject(target)) {
+                    handleFlatJson(target);
+                }
             }
         }
     }

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

@@ -1,6 +1,6 @@
 /*!
-  * vue-i18n v9.14.2
-  * (c) 2024 kazuya kawaguchi
+  * vue-i18n v9.14.4
+  * (c) 2025 kazuya kawaguchi
   * Released under the MIT License.
   */
 import { createVNode, Text, computed, watch, getCurrentInstance, ref, shallowRef, Fragment, defineComponent, h, effectScope, inject, onMounted, onUnmounted, onBeforeMount, isRef } from 'vue';
@@ -1839,6 +1839,80 @@ function baseCompile$1(source, options = {}) {
     }
 }
 
+function isMessageAST(val) {
+    return (isObject(val) &&
+        resolveType(val) === 0 &&
+        (hasOwn(val, 'b') || hasOwn(val, 'body')));
+}
+const PROPS_BODY = ['b', 'body'];
+function resolveBody(node) {
+    return resolveProps(node, PROPS_BODY);
+}
+const PROPS_CASES = ['c', 'cases'];
+function resolveCases(node) {
+    return resolveProps(node, PROPS_CASES, []);
+}
+const PROPS_STATIC = ['s', 'static'];
+function resolveStatic(node) {
+    return resolveProps(node, PROPS_STATIC);
+}
+const PROPS_ITEMS = ['i', 'items'];
+function resolveItems(node) {
+    return resolveProps(node, PROPS_ITEMS, []);
+}
+const PROPS_TYPE = ['t', 'type'];
+function resolveType(node) {
+    return resolveProps(node, PROPS_TYPE);
+}
+const PROPS_VALUE = ['v', 'value'];
+function resolveValue$1(node, type) {
+    const resolved = resolveProps(node, PROPS_VALUE);
+    if (resolved != null) {
+        return resolved;
+    }
+    else {
+        throw createUnhandleNodeError(type);
+    }
+}
+const PROPS_MODIFIER = ['m', 'modifier'];
+function resolveLinkedModifier(node) {
+    return resolveProps(node, PROPS_MODIFIER);
+}
+const PROPS_KEY = ['k', 'key'];
+function resolveLinkedKey(node) {
+    const resolved = resolveProps(node, PROPS_KEY);
+    if (resolved) {
+        return resolved;
+    }
+    else {
+        throw createUnhandleNodeError(6 /* NodeTypes.Linked */);
+    }
+}
+function resolveProps(node, props, defaultValue) {
+    for (let i = 0; i < props.length; i++) {
+        const prop = props[i];
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (hasOwn(node, prop) && node[prop] != null) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            return node[prop];
+        }
+    }
+    return defaultValue;
+}
+const AST_NODE_PROPS_KEYS = [
+    ...PROPS_BODY,
+    ...PROPS_CASES,
+    ...PROPS_STATIC,
+    ...PROPS_ITEMS,
+    ...PROPS_KEY,
+    ...PROPS_MODIFIER,
+    ...PROPS_VALUE,
+    ...PROPS_TYPE
+];
+function createUnhandleNodeError(type) {
+    return new Error(`unhandled node type: ${type}`);
+}
+
 const pathStateMachine =  [];
 pathStateMachine[0 /* States.BEFORE_PATH */] = {
     ["w" /* PathCharTypes.WORKSPACE */]: [0 /* States.BEFORE_PATH */],
@@ -2072,7 +2146,7 @@ function resolveWithKeyValue(obj, path) {
  *
  * @VueI18nGeneral
  */
-function resolveValue$1(obj, path) {
+function resolveValue(obj, path) {
     // check object
     if (!isObject(obj)) {
         return null;
@@ -2094,7 +2168,16 @@ function resolveValue$1(obj, path) {
     let last = obj;
     let i = 0;
     while (i < len) {
-        const val = last[hit[i]];
+        const key = hit[i];
+        /**
+         * NOTE:
+         * if `key` is intlify message format AST node key and `last` is intlify message format AST, skip it.
+         * because the AST node is not a key-value structure.
+         */
+        if (AST_NODE_PROPS_KEYS.includes(key) && isMessageAST(last)) {
+            return null;
+        }
+        const val = last[key];
         if (val === undefined) {
             return null;
         }
@@ -2463,7 +2546,7 @@ function appendItemToChain(chain, target, blocks) {
  * Intlify core-base version
  * @internal
  */
-const VERSION$1 = '9.14.2';
+const VERSION$1 = '9.14.4';
 const NOT_REOSLVED = -1;
 const DEFAULT_LOCALE = 'en-US';
 const MISSING_RESOLVE_VALUE = '';
@@ -2735,14 +2818,6 @@ function formatParts(ctx, ast) {
         return formatMessageParts(ctx, body);
     }
 }
-const PROPS_BODY = ['b', 'body'];
-function resolveBody(node) {
-    return resolveProps(node, PROPS_BODY);
-}
-const PROPS_CASES = ['c', 'cases'];
-function resolveCases(node) {
-    return resolveProps(node, PROPS_CASES, []);
-}
 function formatMessageParts(ctx, node) {
     const static_ = resolveStatic(node);
     if (static_ != null) {
@@ -2755,22 +2830,14 @@ function formatMessageParts(ctx, node) {
         return ctx.normalize(messages);
     }
 }
-const PROPS_STATIC = ['s', 'static'];
-function resolveStatic(node) {
-    return resolveProps(node, PROPS_STATIC);
-}
-const PROPS_ITEMS = ['i', 'items'];
-function resolveItems(node) {
-    return resolveProps(node, PROPS_ITEMS, []);
-}
 function formatMessagePart(ctx, node) {
     const type = resolveType(node);
     switch (type) {
         case 3 /* NodeTypes.Text */: {
-            return resolveValue(node, type);
+            return resolveValue$1(node, type);
         }
         case 9 /* NodeTypes.Literal */: {
-            return resolveValue(node, type);
+            return resolveValue$1(node, type);
         }
         case 4 /* NodeTypes.Named */: {
             const named = node;
@@ -2799,57 +2866,15 @@ function formatMessagePart(ctx, node) {
             return ctx.linked(formatMessagePart(ctx, key), modifier ? formatMessagePart(ctx, modifier) : undefined, ctx.type);
         }
         case 7 /* NodeTypes.LinkedKey */: {
-            return resolveValue(node, type);
+            return resolveValue$1(node, type);
         }
         case 8 /* NodeTypes.LinkedModifier */: {
-            return resolveValue(node, type);
+            return resolveValue$1(node, type);
         }
         default:
             throw new Error(`unhandled node on format message part: ${type}`);
     }
 }
-const PROPS_TYPE = ['t', 'type'];
-function resolveType(node) {
-    return resolveProps(node, PROPS_TYPE);
-}
-const PROPS_VALUE = ['v', 'value'];
-function resolveValue(node, type) {
-    const resolved = resolveProps(node, PROPS_VALUE);
-    if (resolved) {
-        return resolved;
-    }
-    else {
-        throw createUnhandleNodeError(type);
-    }
-}
-const PROPS_MODIFIER = ['m', 'modifier'];
-function resolveLinkedModifier(node) {
-    return resolveProps(node, PROPS_MODIFIER);
-}
-const PROPS_KEY = ['k', 'key'];
-function resolveLinkedKey(node) {
-    const resolved = resolveProps(node, PROPS_KEY);
-    if (resolved) {
-        return resolved;
-    }
-    else {
-        throw createUnhandleNodeError(6 /* NodeTypes.Linked */);
-    }
-}
-function resolveProps(node, props, defaultValue) {
-    for (let i = 0; i < props.length; i++) {
-        const prop = props[i];
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        if (hasOwn(node, prop) && node[prop] != null) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            return node[prop];
-        }
-    }
-    return defaultValue;
-}
-function createUnhandleNodeError(type) {
-    return new Error(`unhandled node type: ${type}`);
-}
 
 const WARN_MESSAGE = `Detected HTML in '{source}' message. Recommend not using HTML messages to avoid XSS.`;
 function checkHtmlMessage(source, warnHtmlMessage) {
@@ -2867,11 +2892,6 @@ function onCompileWarn(_warn) {
             `(message compiler warning message: ${_warn.message})`);
     }
 }
-function isMessageAST(val) {
-    return (isObject(val) &&
-        resolveType(val) === 0 &&
-        (hasOwn(val, 'b') || hasOwn(val, 'body')));
-}
 function baseCompile(message, options = {}) {
     // error detecting on compile
     let detectError = false;
@@ -3678,7 +3698,7 @@ function clearNumberFormat(ctx, locale, format) {
  *
  * @VueI18nGeneral
  */
-const VERSION = '9.14.2';
+const VERSION = '9.14.4';
 /**
  * This is only called development env
  * istanbul-ignore-next
@@ -3793,6 +3813,9 @@ function handleFlatJson(obj) {
     if (!isObject(obj)) {
         return obj;
     }
+    if (isMessageAST(obj)) {
+        return obj;
+    }
     for (const key in obj) {
         // check key
         if (!hasOwn(obj, key)) {
@@ -3813,6 +3836,9 @@ function handleFlatJson(obj) {
             let currentObj = obj;
             let hasStringValue = false;
             for (let i = 0; i < lastIndex; i++) {
+                if (subKeys[i] === '__proto__') {
+                    throw new Error(`unsafe key: ${subKeys[i]}`);
+                }
                 if (!(subKeys[i] in currentObj)) {
                     currentObj[subKeys[i]] = create();
                 }
@@ -3827,12 +3853,26 @@ function handleFlatJson(obj) {
             }
             // update last object value, delete old property
             if (!hasStringValue) {
-                currentObj[subKeys[lastIndex]] = obj[key];
-                delete obj[key];
+                if (!isMessageAST(currentObj)) {
+                    currentObj[subKeys[lastIndex]] = obj[key];
+                    delete obj[key];
+                }
+                else {
+                    /**
+                     * NOTE:
+                     * if the last object is a message AST and subKeys[lastIndex] has message AST prop key, ignore to copy and key deletion
+                     */
+                    if (!AST_NODE_PROPS_KEYS.includes(subKeys[lastIndex])) {
+                        delete obj[key];
+                    }
+                }
             }
             // recursive process value if value is also a object
-            if (isObject(currentObj[subKeys[lastIndex]])) {
-                handleFlatJson(currentObj[subKeys[lastIndex]]);
+            if (!isMessageAST(currentObj)) {
+                const target = currentObj[subKeys[lastIndex]];
+                if (isObject(target)) {
+                    handleFlatJson(target);
+                }
             }
         }
     }
@@ -6748,7 +6788,7 @@ function injectGlobalFields(app, composer) {
     registerMessageCompiler(compile);
 }
 // register message resolver at vue-i18n
-registerMessageResolver(resolveValue$1);
+registerMessageResolver(resolveValue);
 // register fallback locale at vue-i18n
 registerLocaleFallbacker(fallbackWithLocaleChain);
 // NOTE: experimental !!