@intlify/core-base 11.1.2 → 11.1.4

package/dist/core-base.prod.cjs

@@ -1,5 +1,5 @@
 /*!
-  * core-base v11.1.2
+  * core-base v11.1.4
   * (c) 2025 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -8,6 +8,80 @@
 var messageCompiler = require('@intlify/message-compiler');
 var shared = require('@intlify/shared');
 
+function isMessageAST(val) {
+    return (shared.isObject(val) &&
+        resolveType(val) === 0 &&
+        (shared.hasOwn(val, 'b') || shared.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 (shared.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}`);
+}
+
 function format(ast) {
     const msg = (ctx) => formatParts(ctx, ast);
     return msg;
@@ -30,14 +104,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) {
@@ -50,14 +116,6 @@ 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) {
@@ -103,59 +161,12 @@ function formatMessagePart(ctx, node) {
             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$1(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 (shared.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 defaultOnCacheKey = (message) => message;
 let compileCache = shared.create();
 function clearCompileCache() {
     compileCache = shared.create();
 }
-function isMessageAST(val) {
-    return (shared.isObject(val) &&
-        resolveType(val) === 0 &&
-        (shared.hasOwn(val, 'b') || shared.hasOwn(val, 'body')));
-}
 function baseCompile(message, options = {}) {
     // error detecting on compile
     let detectError = false;
@@ -663,7 +674,16 @@ function resolveValue(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;
         }
@@ -705,7 +725,7 @@ function getWarnMessage(code, ...args) {
  * Intlify core-base version
  * @internal
  */
-const VERSION = '11.1.2';
+const VERSION = '11.1.4';
 const NOT_REOSLVED = -1;
 const DEFAULT_LOCALE = 'en-US';
 const MISSING_RESOLVE_VALUE = '';
@@ -1573,6 +1593,7 @@ function getMessageContextOptions(context, locale, message, options) {
 
 exports.CompileErrorCodes = messageCompiler.CompileErrorCodes;
 exports.createCompileError = messageCompiler.createCompileError;
+exports.AST_NODE_PROPS_KEYS = AST_NODE_PROPS_KEYS;
 exports.CORE_ERROR_CODES_EXTEND_POINT = CORE_ERROR_CODES_EXTEND_POINT;
 exports.CORE_WARN_CODES_EXTEND_POINT = CORE_WARN_CODES_EXTEND_POINT;
 exports.CoreErrorCodes = CoreErrorCodes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intlify/core-base",
-  "version": "11.1.2",
+  "version": "11.1.4",
   "description": "@intlify/core-base",
   "keywords": [
     "core",
@@ -33,11 +33,11 @@
   "jsdelivr": "dist/core-base.global.js",
   "types": "dist/core-base.d.ts",
   "dependencies": {
-    "@intlify/shared": "11.1.2",
-    "@intlify/message-compiler": "11.1.2"
+    "@intlify/message-compiler": "11.1.4",
+    "@intlify/shared": "11.1.4"
   },
   "devDependencies": {
-    "@intlify/devtools-types": "11.1.2"
+    "@intlify/devtools-types": "11.1.4"
   },
   "engines": {
     "node": ">= 16"