@intlify/bundle-utils 11.2.5 → 11.2.7

package/lib/index.cjs

@@ -3,8 +3,6 @@
 const module$1 = require('node:module');
 const shared = require('@intlify/shared');
 const acorn = require('acorn');
-const escodegen = require('escodegen');
-const estreeWalker = require('estree-walker');
 const messageCompiler = require('@intlify/message-compiler');
 const sourceMapJs = require('source-map-js');
 const jsoncEslintParser = require('jsonc-eslint-parser');
@@ -14,7 +12,20 @@ const yamlEslintParser = require('yaml-eslint-parser');
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
+function _interopNamespaceCompat(e) {
+  if (e && typeof e === 'object' && 'default' in e) return e;
+  const n = Object.create(null);
+  if (e) {
+    for (const k in e) {
+      n[k] = e[k];
+    }
+  }
+  n.default = e;
+  return n;
+}
+
 const module__default = /*#__PURE__*/_interopDefaultCompat(module$1);
+const messageCompiler__namespace = /*#__PURE__*/_interopNamespaceCompat(messageCompiler);
 
 const _require = module__default.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
 function checkInstallPackage(pkg, debug) {
@@ -160,6 +171,14 @@ const ON_ERROR_NOOP = () => {
 function parsePath(path) {
   return path ? path.join(".") : "";
 }
+const COMPILE_ERROR_MESSAGES = messageCompiler__namespace.errorMessages;
+function getCompileErrorMessage(err) {
+  if (err.message !== String(err.code)) {
+    return err.message;
+  }
+  const text = COMPILE_ERROR_MESSAGES?.[err.code];
+  return text ? text.replace(/:\s*\\?'?\{\d+\}'?/g, "") : err.message;
+}
 function generateMessageFunction(msg, options = {}, path) {
   const env = options.env != null ? options.env : "development";
   const strictMessage = shared.isBoolean(options.strictMessage) ? options.strictMessage : true;
@@ -188,7 +207,7 @@ function generateMessageFunction(msg, options = {}, path) {
         domain: err.domain,
         location: err.location
       };
-      onError(err.message, extra);
+      onError(getCompileErrorMessage(err), extra);
       errors.push(err);
     }
   };
@@ -300,7 +319,7 @@ function generateResourceAst(msg, options = {}, path) {
         domain: err.domain,
         location: err.location
       };
-      onError(err.message, extra);
+      onError(getCompileErrorMessage(err), extra);
       errors.push(err);
     }
   };
@@ -341,6 +360,30 @@ function filterMultiLocaleMessages(messages, shouldKeep) {
   }
   return result;
 }
+function describeResource({ type, filename }) {
+  return type === "sfc" ? `the i18n custom block of ${filename}` : `${filename}`;
+}
+function describeValue(value) {
+  if (Array.isArray(value)) return "an array";
+  if (value === void 0) return "undefined";
+  return `a ${typeof value}`;
+}
+function stringifyValue(value) {
+  if (typeof value === "number") return Object.is(value, -0) ? "-0" : String(value);
+  if (value === void 0) return "undefined";
+  return JSON.stringify(value);
+}
+function createResourceError(message, options) {
+  return new Error(`${message} in ${describeResource(options)}.`);
+}
+function createResourceParseError(err, options, columnOffset = 0) {
+  if (!(err instanceof Error)) return err;
+  const { lineNumber, column } = err;
+  const position = lineNumber != null ? ` (${lineNumber}:${column + columnOffset})` : "";
+  return new SyntaxError(`${err.message} in ${describeResource(options)}${position}`, {
+    cause: err
+  });
+}
 function excludeLocales({
   messages,
   onlyLocales
@@ -433,222 +476,121 @@ function scanAst(ast) {
   return false;
 }
 function _generate$2(generator, node, options = {}) {
-  const propsCountStack = [];
-  const pathStack = [];
-  const itemsCountStack = [];
-  const skipStack = [];
   const { forceStringify } = generator.context();
   const codeMaps = /* @__PURE__ */ new Map();
   const { type, sourceMap, isGlobal, locale, jit } = options;
+  const source = options.source ?? "";
   const _codegenFn = jit ? generateResourceAst : generateMessageFunction;
-  function codegenFn(value) {
-    const { code, map } = _codegenFn(value, options, pathStack);
+  function codegenFn(value, path) {
+    const { code, map } = _codegenFn(value, options, path);
     sourceMap && map != null && codeMaps.set(value, map);
     return code;
   }
   const componentNamespace = "_Component";
   const variableDeclarations = [];
-  estreeWalker.walk(node, {
-    /**
-     * NOTE:
-     *  force cast to Node of `estree-walker@3.x`,
-     *  because `estree-walker@3.x` is not dual packages,
-     *  so it's support only esm only ...
-     */
-    // @ts-ignore
-    enter(node2, _parent) {
-      if (_parent?.type != null) this.skip();
-      switch (node2.type) {
-        case "ExportDefaultDeclaration":
-          this.skip();
-          break;
-        case "ImportDeclaration":
-          generator.push(options.source?.slice(node2.start, node2.end));
-          generator.newline();
-          break;
-        case "VariableDeclaration":
-          generator.push(options.source?.slice(node2.start, node2.end));
-          generator.newline();
-          variableDeclarations.push(
-            ...node2.declarations.map((x) => `\`${x.id.name}\``)
-          );
-          break;
-      }
+  const { body } = node;
+  const exportDefault = body.find(
+    (statement) => statement.type === "ExportDefaultDeclaration"
+  );
+  const resource = exportDefault.declaration;
+  for (const statement of body) {
+    if (statement === exportDefault) continue;
+    generator.push(sourceOf(source, statement));
+    generator.newline();
+    if (statement.type === "VariableDeclaration") {
+      variableDeclarations.push(
+        ...statement.declarations.map((x) => `\`${x.id.name}\``)
+      );
     }
-  });
+  }
   if (variableDeclarations.length > 0) {
     options?.onWarn?.(
       `
 Variable declarations are not optimized - found ${variableDeclarations.join(", ")}`
     );
   }
-  estreeWalker.walk(node, {
-    /**
-     * NOTE:
-     *  force cast to Node of `estree-walker@3.x`,
-     *  because `estree-walker@3.x` is not dual packages,
-     *  so it's support only esm only ...
-     */
-    // @ts-ignore
-    enter(node2, parent) {
-      if (parent?.type === "Program") {
-        switch (node2.type) {
-          case "ImportDeclaration":
-          case "VariableDeclaration":
-          case "VariableDeclarator":
-            this.skip();
+  const messages = [];
+  function collect(value, path) {
+    if (value.type === "ObjectExpression") {
+      for (const property of value.properties) {
+        if (property.type === "Property" && property.kind === "init" && !property.method && !property.shorthand) {
+          collect(property.value, [...path, keyOf(source, property)]);
         }
-      } else if (parent?.type === "ArrayExpression") {
-        const lastIndex = itemsCountStack.length - 1;
-        const currentCount = parent.elements.length - itemsCountStack[lastIndex];
-        pathStack.push(currentCount.toString());
-        itemsCountStack[lastIndex] = --itemsCountStack[lastIndex];
-      } else if (parent?.type === "ObjectExpression") {
-        const lastIndex = propsCountStack.length - 1;
-        propsCountStack[lastIndex] = --propsCountStack[lastIndex];
-      }
-      switch (node2.type) {
-        case "Program":
-          if (type === "plain") {
-            generator.push(`const resource = `);
-          } else if (type === "sfc") {
-            const localeName = JSON.stringify(locale ?? '""');
-            const variableName = !isGlobal ? "__i18n" : "__i18nGlobal";
-            generator.push(`export default function (Component) {`);
-            generator.indent();
-            generator.pushline(`const ${componentNamespace} = Component`);
-            generator.pushline(
-              `${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
-            );
-            generator.push(`${componentNamespace}.${variableName}.push({`);
-            generator.indent();
-            generator.pushline(`"locale": ${localeName},`);
-            generator.push(`"resource": `);
-          }
-          break;
-        case "ObjectExpression":
-          generator.push("{");
-          generator.indent();
-          propsCountStack.push(node2.properties.length);
-          break;
-        case "ArrayExpression":
-          generator.push("[");
-          generator.indent();
-          itemsCountStack.push(node2.elements.length);
-          break;
-        case "Property":
-          if (parent?.type !== "ObjectExpression") break;
-          if (node2.key.type !== "Literal" && node2.key.type !== "Identifier") break;
-          const name = node2.key.type === "Literal" ? String(node2.key.value) : node2.key.name;
-          const strName = JSON.stringify(name);
-          if (isJSONablePrimitiveLiteral(node2.value)) {
-            generator.push(`${strName}: `);
-            pathStack.push(name);
-            const value = getValue(node2.value);
-            const strValue = JSON.stringify(value);
-            if (node2.value.type === "Literal" && shared.isString(node2.value.value) || node2.value.type === "TemplateLiteral") {
-              generator.push(codegenFn(value), node2.value, value);
-            } else if (forceStringify) {
-              generator.push(codegenFn(strValue), node2.value, strValue);
-            } else {
-              generator.push(strValue);
-            }
-            skipStack.push(false);
-          } else if (node2.value.type === "ArrayExpression" || node2.value.type === "ObjectExpression") {
-            generator.push(`${strName}: `);
-            pathStack.push(name);
-            skipStack.push(false);
-          } else if (node2.value.type === "FunctionExpression" || node2.value.type === "ArrowFunctionExpression") {
-            generator.push(`${strName}: `);
-            pathStack.push(name);
-            const code = escodegen.generate(node2.value, {
-              format: { compact: true }
-            });
-            generator.push(code, node2.value, code);
-            skipStack.push(false);
-          } else {
-            const skipProperty = "regex" in node2.value;
-            if (!skipProperty && node2.type === "Property") {
-              const identifierName = node2.value.type === "Identifier" && String(node2.value.name) || node2.value.type === "Literal" && String(node2.value.value);
-              generator.push(`${strName}: ${identifierName || name}`);
-              skipStack.push(false);
-            } else {
-              skipStack.push(true);
-            }
-          }
-          break;
-        case "SpreadElement":
-          const spreadIdentifier = node2.argument.type === "Identifier" && String(node2.argument.name) || node2.argument.type === "Literal" && String(node2.argument.value);
-          generator.push(`...${spreadIdentifier}`);
-          break;
-        default:
-          if (parent?.type === "ArrayExpression") {
-            if (isJSONablePrimitiveLiteral(node2)) {
-              const value = getValue(node2);
-              const strValue = JSON.stringify(value);
-              if (node2.type === "Literal" && shared.isString(node2.value) || node2.type === "TemplateLiteral") {
-                generator.push(codegenFn(value), node2, value);
-              } else if (forceStringify) {
-                generator.push(codegenFn(strValue), node2, strValue);
-              } else {
-                generator.push(strValue);
-              }
-              skipStack.push(false);
-            } else {
-              skipStack.push(true);
-            }
-          }
-          break;
       }
-    },
-    /**
-     * NOTE:
-     *  force cast to Node of `estree-walker@3.x`,
-     *  because `estree-walker@3.x` is not dual packages,
-     *  so it's support only esm only ...
-     */
-    // @ts-ignore
-    leave(node2, parent) {
-      switch (node2.type) {
-        case "Program":
-          if (type === "plain") {
-            generator.push("\n");
-            generator.push("export default resource");
-          } else if (type === "sfc") {
-            generator.deindent();
-            generator.push("})");
-            generator.deindent();
-            generator.pushline("}");
-          }
-          break;
-        case "ObjectExpression":
-          if (propsCountStack[propsCountStack.length - 1] === 0) {
-            pathStack.pop();
-            propsCountStack.pop();
-          }
-          generator.deindent();
-          generator.push("}");
-          break;
-        case "ArrayExpression":
-          if (itemsCountStack[itemsCountStack.length - 1] === 0) {
-            pathStack.pop();
-            itemsCountStack.pop();
-          }
-          generator.deindent();
-          generator.push("]");
-          break;
-      }
-      if (parent?.type === "ArrayExpression" || parent?.type === "ObjectExpression") {
-        const stackArr = node2.type === "Property" ? propsCountStack : itemsCountStack;
-        if (stackArr[stackArr.length - 1] !== 0) {
-          pathStack.pop();
-          !skipStack.pop() && generator.pushline(",");
+    } else if (value.type === "ArrayExpression") {
+      value.elements.forEach((element, index) => {
+        if (element != null && element.type !== "SpreadElement") {
+          collect(element, [...path, String(index)]);
         }
+      });
+    } else if (isMessageLiteral(value)) {
+      const message = getValue(value);
+      if (shared.isString(message)) {
+        messages.push({ node: value, value: message, code: codegenFn(message, path) });
+      } else if (forceStringify) {
+        const strMessage = JSON.stringify(message);
+        messages.push({ node: value, value: strMessage, code: codegenFn(strMessage, path) });
       }
     }
-  });
+  }
+  collect(resource, []);
+  if (type === "plain") {
+    generator.push(`const resource = `);
+  } else if (type === "sfc") {
+    const localeName = JSON.stringify(locale ?? '""');
+    const variableName = !isGlobal ? "__i18n" : "__i18nGlobal";
+    generator.push(`export default function (Component) {`);
+    generator.indent();
+    generator.pushline(`const ${componentNamespace} = Component`);
+    generator.pushline(
+      `${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
+    );
+    generator.push(`${componentNamespace}.${variableName}.push({`);
+    generator.indent();
+    generator.pushline(`"locale": ${localeName},`);
+    generator.push(`"resource": `);
+  }
+  let offset = rangeOf(resource).start;
+  for (const message of messages) {
+    generator.push(source.slice(offset, rangeOf(message.node).start));
+    generator.push(message.code, message.node, message.value);
+    offset = rangeOf(message.node).end;
+  }
+  generator.push(source.slice(offset, rangeOf(resource).end));
+  if (type === "plain") {
+    generator.push("\n");
+    generator.push("export default resource");
+  } else if (type === "sfc") {
+    generator.deindent();
+    generator.push("})");
+    generator.deindent();
+    generator.pushline("}");
+  }
   return codeMaps;
 }
+function rangeOf(node) {
+  return node;
+}
+function sourceOf(source, node) {
+  const { start, end } = rangeOf(node);
+  return source.slice(start, end);
+}
+function keyOf(source, property) {
+  const { key } = property;
+  if (property.computed) {
+    return sourceOf(source, key);
+  }
+  return key.type === "Identifier" ? key.name : String(key.value);
+}
+function isMessageLiteral(node) {
+  if (node.type === "Literal" && "regex" in node) {
+    return false;
+  }
+  if (node.type === "TemplateLiteral" && node.expressions.length > 0) {
+    return false;
+  }
+  return isJSONablePrimitiveLiteral(node);
+}
 function isJSONablePrimitiveLiteral(node) {
   return node.type === "Literal" && (shared.isString(node.value) || shared.isNumber(node.value) || shared.isBoolean(node.value) || node.value === null) || node.type === "TemplateLiteral";
 }
@@ -688,7 +630,25 @@ function generate$2(targetSource, {
     escapeHtml,
     jit
   };
-  let ast = jsoncEslintParser.parseJSON(value, { filePath: filename });
+  let ast;
+  try {
+    ast = jsoncEslintParser.parseJSON(value, { filePath: filename });
+  } catch (err) {
+    throw createResourceParseError(err, options);
+  }
+  const root = ast.body[0].expression;
+  if (root.type !== "JSONObjectExpression") {
+    const rootValue = jsoncEslintParser.getStaticJSONValue(root);
+    if (rootValue !== null) {
+      throw createResourceError(
+        `You need to define an object as the locale messages at the top level, but got ${describeValue(rootValue)}`,
+        options
+      );
+    }
+    value = JSON.stringify({});
+    ast = jsoncEslintParser.parseJSON(value, { filePath: filename });
+    options.source = void 0;
+  }
   if (!locale && type === "sfc" && onlyLocales?.length) {
     const messages = jsoncEslintParser.getStaticJSONValue(ast);
     value = JSON.stringify(
@@ -736,6 +696,19 @@ function _generate$1(generator, node, options = {}) {
     sourceMap && map != null && codeMaps.set(value, map);
     return code;
   }
+  function pushExpressionValue(node2) {
+    const value = jsoncEslintParser.getStaticJSONValue(node2);
+    if (shared.isString(value)) {
+      generator.push(codegenFn(value), node2, value);
+      return;
+    }
+    const strValue = stringifyValue(value);
+    if (forceStringify) {
+      generator.push(codegenFn(strValue), node2, strValue);
+    } else {
+      generator.push(strValue);
+    }
+  }
   const componentNamespace = "_Component";
   jsoncEslintParser.traverseNodes(node, {
     enterNode(node2, parent) {
@@ -792,6 +765,8 @@ function _generate$1(generator, node, options = {}) {
             } else {
               generator.push(strValue2);
             }
+          } else if (node2.value.type !== "JSONObjectExpression" && node2.value.type !== "JSONArrayExpression") {
+            pushExpressionValue(node2.value);
           }
           break;
         }
@@ -807,6 +782,14 @@ function _generate$1(generator, node, options = {}) {
             generator.push(strValue);
           }
           break;
+        case "JSONUnaryExpression":
+        case "JSONIdentifier":
+        case "JSONTemplateLiteral":
+        case "JSONBinaryExpression":
+          if (parent.type === "JSONArrayExpression") {
+            pushExpressionValue(node2);
+          }
+          break;
       }
     },
     leaveNode(node2, parent) {
@@ -857,12 +840,10 @@ async function generate$1(targetSource, options) {
   const _options = Object.assign({}, DEFAULT_OPTIONS, options, {
     source: value
   });
-  if (_options.filename && /.[c|m]?ts$/.test(_options.filename)) {
-    const transformed = await esbuild.transform(value, { loader: "ts" });
-    if (transformed && transformed.code) {
-      value = transformed.code;
-      _options.source = transformed.code;
-    }
+  const transformed = await esbuild.transform(value, { loader: "ts" });
+  if (transformed && transformed.code) {
+    value = transformed.code;
+    _options.source = transformed.code;
   }
   return generate$3(value, _options);
 }
@@ -884,6 +865,9 @@ function generate(targetSource, {
   usedKeyFilter = void 0
 }) {
   let value = Buffer.isBuffer(targetSource) ? targetSource.toString() : targetSource;
+  if (value.charCodeAt(0) === 65279) {
+    value = value.slice(1);
+  }
   const options = {
     type,
     source: value,
@@ -899,9 +883,31 @@ function generate(targetSource, {
     escapeHtml,
     jit
   };
-  let ast = yamlEslintParser.parseYAML(value, { filePath: filename });
+  let ast;
+  try {
+    ast = yamlEslintParser.parseYAML(value, { filePath: filename });
+  } catch (err) {
+    throw createResourceParseError(err, options, 1);
+  }
+  const rootDocument = getRootDocument(ast, options);
+  const content = rootDocument?.content;
+  const root = content?.type === "YAMLWithMeta" ? content.value : content;
+  if (root?.type !== "YAMLMapping") {
+    const isAlias = root?.type === "YAMLAlias";
+    const rootValue = rootDocument == null || isAlias ? null : yamlEslintParser.getStaticYAMLValue(rootDocument);
+    if (isAlias || rootValue !== null) {
+      const actual = isAlias ? "an alias" : describeValue(rootValue);
+      throw createResourceError(
+        `You need to define an object as the locale messages at the top level, but got ${actual}`,
+        options
+      );
+    }
+    value = JSON.stringify({});
+    ast = yamlEslintParser.parseYAML(value, { filePath: filename });
+    options.source = void 0;
+  }
   if (!locale && type === "sfc" && onlyLocales?.length) {
-    const messages = yamlEslintParser.getStaticYAMLValue(ast);
+    const messages = yamlEslintParser.getStaticYAMLValue(getRootDocument(ast, options));
     value = JSON.stringify(
       excludeLocales({
         messages,
@@ -917,7 +923,7 @@ function generate(targetSource, {
     options.source = void 0;
   }
   if (usedKeyFilter) {
-    const messages = yamlEslintParser.getStaticYAMLValue(ast);
+    const messages = yamlEslintParser.getStaticYAMLValue(getRootDocument(ast, options));
     const isMultiLocale = !locale && type === "sfc";
     const filtered = isMultiLocale ? filterMultiLocaleMessages(messages, usedKeyFilter) : filterMessageKeys(messages, usedKeyFilter);
     value = JSON.stringify(filtered);
@@ -934,6 +940,16 @@ function generate(targetSource, {
     map: newMap != null ? newMap : void 0
   };
 }
+function getRootDocument(ast, options) {
+  const documents = ast.body.filter((doc) => doc.content != null);
+  if (documents.length > 1) {
+    throw createResourceError(
+      `You need to define the locale messages in a single YAML document, but got ${documents.length} documents`,
+      options
+    );
+  }
+  return documents[0] ?? null;
+}
 function _generate(generator, node, options = {}) {
   const propsCountStack = [];
   const pathStack = [];
@@ -994,7 +1010,7 @@ function _generate(generator, node, options = {}) {
             const name = node2.key.value;
             const value = node2.value.value;
             const strName = JSON.stringify(name);
-            const strValue = JSON.stringify(value);
+            const strValue = stringifyValue(value);
             name && pathStack.push(name.toString());
             generator.push(`${strName}: `);
             if (shared.isString(value)) {
@@ -1013,7 +1029,7 @@ function _generate(generator, node, options = {}) {
         case "YAMLScalar":
           if (parent.type === "YAMLSequence") {
             const value = node2.value;
-            const strValue = JSON.stringify(value);
+            const strValue = stringifyValue(value);
             if (shared.isString(value)) {
               generator.push(codegenFn(value), node2, value);
             } else if (forceStringify) {

package/lib/index.mjs

@@ -1,8 +1,7 @@
 import module$1 from 'node:module';
 import { isBoolean, format, escapeHtml, friendlyJSONstringify, isString, isNumber } from '@intlify/shared';
 import { parse } from 'acorn';
-import { generate as generate$4 } from 'escodegen';
-import { walk } from 'estree-walker';
+import * as messageCompiler from '@intlify/message-compiler';
 import { LOCATION_STUB, detectHtmlTag, baseCompile } from '@intlify/message-compiler';
 import { SourceMapGenerator, SourceMapConsumer } from 'source-map-js';
 import { parseJSON, getStaticJSONValue, traverseNodes } from 'jsonc-eslint-parser';
@@ -153,6 +152,14 @@ const ON_ERROR_NOOP = () => {
 function parsePath(path) {
   return path ? path.join(".") : "";
 }
+const COMPILE_ERROR_MESSAGES = messageCompiler.errorMessages;
+function getCompileErrorMessage(err) {
+  if (err.message !== String(err.code)) {
+    return err.message;
+  }
+  const text = COMPILE_ERROR_MESSAGES?.[err.code];
+  return text ? text.replace(/:\s*\\?'?\{\d+\}'?/g, "") : err.message;
+}
 function generateMessageFunction(msg, options = {}, path) {
   const env = options.env != null ? options.env : "development";
   const strictMessage = isBoolean(options.strictMessage) ? options.strictMessage : true;
@@ -181,7 +188,7 @@ function generateMessageFunction(msg, options = {}, path) {
         domain: err.domain,
         location: err.location
       };
-      onError(err.message, extra);
+      onError(getCompileErrorMessage(err), extra);
       errors.push(err);
     }
   };
@@ -293,7 +300,7 @@ function generateResourceAst(msg, options = {}, path) {
         domain: err.domain,
         location: err.location
       };
-      onError(err.message, extra);
+      onError(getCompileErrorMessage(err), extra);
       errors.push(err);
     }
   };
@@ -334,6 +341,30 @@ function filterMultiLocaleMessages(messages, shouldKeep) {
   }
   return result;
 }
+function describeResource({ type, filename }) {
+  return type === "sfc" ? `the i18n custom block of ${filename}` : `${filename}`;
+}
+function describeValue(value) {
+  if (Array.isArray(value)) return "an array";
+  if (value === void 0) return "undefined";
+  return `a ${typeof value}`;
+}
+function stringifyValue(value) {
+  if (typeof value === "number") return Object.is(value, -0) ? "-0" : String(value);
+  if (value === void 0) return "undefined";
+  return JSON.stringify(value);
+}
+function createResourceError(message, options) {
+  return new Error(`${message} in ${describeResource(options)}.`);
+}
+function createResourceParseError(err, options, columnOffset = 0) {
+  if (!(err instanceof Error)) return err;
+  const { lineNumber, column } = err;
+  const position = lineNumber != null ? ` (${lineNumber}:${column + columnOffset})` : "";
+  return new SyntaxError(`${err.message} in ${describeResource(options)}${position}`, {
+    cause: err
+  });
+}
 function excludeLocales({
   messages,
   onlyLocales
@@ -426,222 +457,121 @@ function scanAst(ast) {
   return false;
 }
 function _generate$2(generator, node, options = {}) {
-  const propsCountStack = [];
-  const pathStack = [];
-  const itemsCountStack = [];
-  const skipStack = [];
   const { forceStringify } = generator.context();
   const codeMaps = /* @__PURE__ */ new Map();
   const { type, sourceMap, isGlobal, locale, jit } = options;
+  const source = options.source ?? "";
   const _codegenFn = jit ? generateResourceAst : generateMessageFunction;
-  function codegenFn(value) {
-    const { code, map } = _codegenFn(value, options, pathStack);
+  function codegenFn(value, path) {
+    const { code, map } = _codegenFn(value, options, path);
     sourceMap && map != null && codeMaps.set(value, map);
     return code;
   }
   const componentNamespace = "_Component";
   const variableDeclarations = [];
-  walk(node, {
-    /**
-     * NOTE:
-     *  force cast to Node of `estree-walker@3.x`,
-     *  because `estree-walker@3.x` is not dual packages,
-     *  so it's support only esm only ...
-     */
-    // @ts-ignore
-    enter(node2, _parent) {
-      if (_parent?.type != null) this.skip();
-      switch (node2.type) {
-        case "ExportDefaultDeclaration":
-          this.skip();
-          break;
-        case "ImportDeclaration":
-          generator.push(options.source?.slice(node2.start, node2.end));
-          generator.newline();
-          break;
-        case "VariableDeclaration":
-          generator.push(options.source?.slice(node2.start, node2.end));
-          generator.newline();
-          variableDeclarations.push(
-            ...node2.declarations.map((x) => `\`${x.id.name}\``)
-          );
-          break;
-      }
+  const { body } = node;
+  const exportDefault = body.find(
+    (statement) => statement.type === "ExportDefaultDeclaration"
+  );
+  const resource = exportDefault.declaration;
+  for (const statement of body) {
+    if (statement === exportDefault) continue;
+    generator.push(sourceOf(source, statement));
+    generator.newline();
+    if (statement.type === "VariableDeclaration") {
+      variableDeclarations.push(
+        ...statement.declarations.map((x) => `\`${x.id.name}\``)
+      );
     }
-  });
+  }
   if (variableDeclarations.length > 0) {
     options?.onWarn?.(
       `
 Variable declarations are not optimized - found ${variableDeclarations.join(", ")}`
     );
   }
-  walk(node, {
-    /**
-     * NOTE:
-     *  force cast to Node of `estree-walker@3.x`,
-     *  because `estree-walker@3.x` is not dual packages,
-     *  so it's support only esm only ...
-     */
-    // @ts-ignore
-    enter(node2, parent) {
-      if (parent?.type === "Program") {
-        switch (node2.type) {
-          case "ImportDeclaration":
-          case "VariableDeclaration":
-          case "VariableDeclarator":
-            this.skip();
+  const messages = [];
+  function collect(value, path) {
+    if (value.type === "ObjectExpression") {
+      for (const property of value.properties) {
+        if (property.type === "Property" && property.kind === "init" && !property.method && !property.shorthand) {
+          collect(property.value, [...path, keyOf(source, property)]);
         }
-      } else if (parent?.type === "ArrayExpression") {
-        const lastIndex = itemsCountStack.length - 1;
-        const currentCount = parent.elements.length - itemsCountStack[lastIndex];
-        pathStack.push(currentCount.toString());
-        itemsCountStack[lastIndex] = --itemsCountStack[lastIndex];
-      } else if (parent?.type === "ObjectExpression") {
-        const lastIndex = propsCountStack.length - 1;
-        propsCountStack[lastIndex] = --propsCountStack[lastIndex];
-      }
-      switch (node2.type) {
-        case "Program":
-          if (type === "plain") {
-            generator.push(`const resource = `);
-          } else if (type === "sfc") {
-            const localeName = JSON.stringify(locale ?? '""');
-            const variableName = !isGlobal ? "__i18n" : "__i18nGlobal";
-            generator.push(`export default function (Component) {`);
-            generator.indent();
-            generator.pushline(`const ${componentNamespace} = Component`);
-            generator.pushline(
-              `${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
-            );
-            generator.push(`${componentNamespace}.${variableName}.push({`);
-            generator.indent();
-            generator.pushline(`"locale": ${localeName},`);
-            generator.push(`"resource": `);
-          }
-          break;
-        case "ObjectExpression":
-          generator.push("{");
-          generator.indent();
-          propsCountStack.push(node2.properties.length);
-          break;
-        case "ArrayExpression":
-          generator.push("[");
-          generator.indent();
-          itemsCountStack.push(node2.elements.length);
-          break;
-        case "Property":
-          if (parent?.type !== "ObjectExpression") break;
-          if (node2.key.type !== "Literal" && node2.key.type !== "Identifier") break;
-          const name = node2.key.type === "Literal" ? String(node2.key.value) : node2.key.name;
-          const strName = JSON.stringify(name);
-          if (isJSONablePrimitiveLiteral(node2.value)) {
-            generator.push(`${strName}: `);
-            pathStack.push(name);
-            const value = getValue(node2.value);
-            const strValue = JSON.stringify(value);
-            if (node2.value.type === "Literal" && isString(node2.value.value) || node2.value.type === "TemplateLiteral") {
-              generator.push(codegenFn(value), node2.value, value);
-            } else if (forceStringify) {
-              generator.push(codegenFn(strValue), node2.value, strValue);
-            } else {
-              generator.push(strValue);
-            }
-            skipStack.push(false);
-          } else if (node2.value.type === "ArrayExpression" || node2.value.type === "ObjectExpression") {
-            generator.push(`${strName}: `);
-            pathStack.push(name);
-            skipStack.push(false);
-          } else if (node2.value.type === "FunctionExpression" || node2.value.type === "ArrowFunctionExpression") {
-            generator.push(`${strName}: `);
-            pathStack.push(name);
-            const code = generate$4(node2.value, {
-              format: { compact: true }
-            });
-            generator.push(code, node2.value, code);
-            skipStack.push(false);
-          } else {
-            const skipProperty = "regex" in node2.value;
-            if (!skipProperty && node2.type === "Property") {
-              const identifierName = node2.value.type === "Identifier" && String(node2.value.name) || node2.value.type === "Literal" && String(node2.value.value);
-              generator.push(`${strName}: ${identifierName || name}`);
-              skipStack.push(false);
-            } else {
-              skipStack.push(true);
-            }
-          }
-          break;
-        case "SpreadElement":
-          const spreadIdentifier = node2.argument.type === "Identifier" && String(node2.argument.name) || node2.argument.type === "Literal" && String(node2.argument.value);
-          generator.push(`...${spreadIdentifier}`);
-          break;
-        default:
-          if (parent?.type === "ArrayExpression") {
-            if (isJSONablePrimitiveLiteral(node2)) {
-              const value = getValue(node2);
-              const strValue = JSON.stringify(value);
-              if (node2.type === "Literal" && isString(node2.value) || node2.type === "TemplateLiteral") {
-                generator.push(codegenFn(value), node2, value);
-              } else if (forceStringify) {
-                generator.push(codegenFn(strValue), node2, strValue);
-              } else {
-                generator.push(strValue);
-              }
-              skipStack.push(false);
-            } else {
-              skipStack.push(true);
-            }
-          }
-          break;
-      }
-    },
-    /**
-     * NOTE:
-     *  force cast to Node of `estree-walker@3.x`,
-     *  because `estree-walker@3.x` is not dual packages,
-     *  so it's support only esm only ...
-     */
-    // @ts-ignore
-    leave(node2, parent) {
-      switch (node2.type) {
-        case "Program":
-          if (type === "plain") {
-            generator.push("\n");
-            generator.push("export default resource");
-          } else if (type === "sfc") {
-            generator.deindent();
-            generator.push("})");
-            generator.deindent();
-            generator.pushline("}");
-          }
-          break;
-        case "ObjectExpression":
-          if (propsCountStack[propsCountStack.length - 1] === 0) {
-            pathStack.pop();
-            propsCountStack.pop();
-          }
-          generator.deindent();
-          generator.push("}");
-          break;
-        case "ArrayExpression":
-          if (itemsCountStack[itemsCountStack.length - 1] === 0) {
-            pathStack.pop();
-            itemsCountStack.pop();
-          }
-          generator.deindent();
-          generator.push("]");
-          break;
       }
-      if (parent?.type === "ArrayExpression" || parent?.type === "ObjectExpression") {
-        const stackArr = node2.type === "Property" ? propsCountStack : itemsCountStack;
-        if (stackArr[stackArr.length - 1] !== 0) {
-          pathStack.pop();
-          !skipStack.pop() && generator.pushline(",");
+    } else if (value.type === "ArrayExpression") {
+      value.elements.forEach((element, index) => {
+        if (element != null && element.type !== "SpreadElement") {
+          collect(element, [...path, String(index)]);
         }
+      });
+    } else if (isMessageLiteral(value)) {
+      const message = getValue(value);
+      if (isString(message)) {
+        messages.push({ node: value, value: message, code: codegenFn(message, path) });
+      } else if (forceStringify) {
+        const strMessage = JSON.stringify(message);
+        messages.push({ node: value, value: strMessage, code: codegenFn(strMessage, path) });
       }
     }
-  });
+  }
+  collect(resource, []);
+  if (type === "plain") {
+    generator.push(`const resource = `);
+  } else if (type === "sfc") {
+    const localeName = JSON.stringify(locale ?? '""');
+    const variableName = !isGlobal ? "__i18n" : "__i18nGlobal";
+    generator.push(`export default function (Component) {`);
+    generator.indent();
+    generator.pushline(`const ${componentNamespace} = Component`);
+    generator.pushline(
+      `${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
+    );
+    generator.push(`${componentNamespace}.${variableName}.push({`);
+    generator.indent();
+    generator.pushline(`"locale": ${localeName},`);
+    generator.push(`"resource": `);
+  }
+  let offset = rangeOf(resource).start;
+  for (const message of messages) {
+    generator.push(source.slice(offset, rangeOf(message.node).start));
+    generator.push(message.code, message.node, message.value);
+    offset = rangeOf(message.node).end;
+  }
+  generator.push(source.slice(offset, rangeOf(resource).end));
+  if (type === "plain") {
+    generator.push("\n");
+    generator.push("export default resource");
+  } else if (type === "sfc") {
+    generator.deindent();
+    generator.push("})");
+    generator.deindent();
+    generator.pushline("}");
+  }
   return codeMaps;
 }
+function rangeOf(node) {
+  return node;
+}
+function sourceOf(source, node) {
+  const { start, end } = rangeOf(node);
+  return source.slice(start, end);
+}
+function keyOf(source, property) {
+  const { key } = property;
+  if (property.computed) {
+    return sourceOf(source, key);
+  }
+  return key.type === "Identifier" ? key.name : String(key.value);
+}
+function isMessageLiteral(node) {
+  if (node.type === "Literal" && "regex" in node) {
+    return false;
+  }
+  if (node.type === "TemplateLiteral" && node.expressions.length > 0) {
+    return false;
+  }
+  return isJSONablePrimitiveLiteral(node);
+}
 function isJSONablePrimitiveLiteral(node) {
   return node.type === "Literal" && (isString(node.value) || isNumber(node.value) || isBoolean(node.value) || node.value === null) || node.type === "TemplateLiteral";
 }
@@ -681,7 +611,25 @@ function generate$2(targetSource, {
     escapeHtml,
     jit
   };
-  let ast = parseJSON(value, { filePath: filename });
+  let ast;
+  try {
+    ast = parseJSON(value, { filePath: filename });
+  } catch (err) {
+    throw createResourceParseError(err, options);
+  }
+  const root = ast.body[0].expression;
+  if (root.type !== "JSONObjectExpression") {
+    const rootValue = getStaticJSONValue(root);
+    if (rootValue !== null) {
+      throw createResourceError(
+        `You need to define an object as the locale messages at the top level, but got ${describeValue(rootValue)}`,
+        options
+      );
+    }
+    value = JSON.stringify({});
+    ast = parseJSON(value, { filePath: filename });
+    options.source = void 0;
+  }
   if (!locale && type === "sfc" && onlyLocales?.length) {
     const messages = getStaticJSONValue(ast);
     value = JSON.stringify(
@@ -729,6 +677,19 @@ function _generate$1(generator, node, options = {}) {
     sourceMap && map != null && codeMaps.set(value, map);
     return code;
   }
+  function pushExpressionValue(node2) {
+    const value = getStaticJSONValue(node2);
+    if (isString(value)) {
+      generator.push(codegenFn(value), node2, value);
+      return;
+    }
+    const strValue = stringifyValue(value);
+    if (forceStringify) {
+      generator.push(codegenFn(strValue), node2, strValue);
+    } else {
+      generator.push(strValue);
+    }
+  }
   const componentNamespace = "_Component";
   traverseNodes(node, {
     enterNode(node2, parent) {
@@ -785,6 +746,8 @@ function _generate$1(generator, node, options = {}) {
             } else {
               generator.push(strValue2);
             }
+          } else if (node2.value.type !== "JSONObjectExpression" && node2.value.type !== "JSONArrayExpression") {
+            pushExpressionValue(node2.value);
           }
           break;
         }
@@ -800,6 +763,14 @@ function _generate$1(generator, node, options = {}) {
             generator.push(strValue);
           }
           break;
+        case "JSONUnaryExpression":
+        case "JSONIdentifier":
+        case "JSONTemplateLiteral":
+        case "JSONBinaryExpression":
+          if (parent.type === "JSONArrayExpression") {
+            pushExpressionValue(node2);
+          }
+          break;
       }
     },
     leaveNode(node2, parent) {
@@ -850,12 +821,10 @@ async function generate$1(targetSource, options) {
   const _options = Object.assign({}, DEFAULT_OPTIONS, options, {
     source: value
   });
-  if (_options.filename && /.[c|m]?ts$/.test(_options.filename)) {
-    const transformed = await transform(value, { loader: "ts" });
-    if (transformed && transformed.code) {
-      value = transformed.code;
-      _options.source = transformed.code;
-    }
+  const transformed = await transform(value, { loader: "ts" });
+  if (transformed && transformed.code) {
+    value = transformed.code;
+    _options.source = transformed.code;
   }
   return generate$3(value, _options);
 }
@@ -877,6 +846,9 @@ function generate(targetSource, {
   usedKeyFilter = void 0
 }) {
   let value = Buffer.isBuffer(targetSource) ? targetSource.toString() : targetSource;
+  if (value.charCodeAt(0) === 65279) {
+    value = value.slice(1);
+  }
   const options = {
     type,
     source: value,
@@ -892,9 +864,31 @@ function generate(targetSource, {
     escapeHtml,
     jit
   };
-  let ast = parseYAML(value, { filePath: filename });
+  let ast;
+  try {
+    ast = parseYAML(value, { filePath: filename });
+  } catch (err) {
+    throw createResourceParseError(err, options, 1);
+  }
+  const rootDocument = getRootDocument(ast, options);
+  const content = rootDocument?.content;
+  const root = content?.type === "YAMLWithMeta" ? content.value : content;
+  if (root?.type !== "YAMLMapping") {
+    const isAlias = root?.type === "YAMLAlias";
+    const rootValue = rootDocument == null || isAlias ? null : getStaticYAMLValue(rootDocument);
+    if (isAlias || rootValue !== null) {
+      const actual = isAlias ? "an alias" : describeValue(rootValue);
+      throw createResourceError(
+        `You need to define an object as the locale messages at the top level, but got ${actual}`,
+        options
+      );
+    }
+    value = JSON.stringify({});
+    ast = parseYAML(value, { filePath: filename });
+    options.source = void 0;
+  }
   if (!locale && type === "sfc" && onlyLocales?.length) {
-    const messages = getStaticYAMLValue(ast);
+    const messages = getStaticYAMLValue(getRootDocument(ast, options));
     value = JSON.stringify(
       excludeLocales({
         messages,
@@ -910,7 +904,7 @@ function generate(targetSource, {
     options.source = void 0;
   }
   if (usedKeyFilter) {
-    const messages = getStaticYAMLValue(ast);
+    const messages = getStaticYAMLValue(getRootDocument(ast, options));
     const isMultiLocale = !locale && type === "sfc";
     const filtered = isMultiLocale ? filterMultiLocaleMessages(messages, usedKeyFilter) : filterMessageKeys(messages, usedKeyFilter);
     value = JSON.stringify(filtered);
@@ -927,6 +921,16 @@ function generate(targetSource, {
     map: newMap != null ? newMap : void 0
   };
 }
+function getRootDocument(ast, options) {
+  const documents = ast.body.filter((doc) => doc.content != null);
+  if (documents.length > 1) {
+    throw createResourceError(
+      `You need to define the locale messages in a single YAML document, but got ${documents.length} documents`,
+      options
+    );
+  }
+  return documents[0] ?? null;
+}
 function _generate(generator, node, options = {}) {
   const propsCountStack = [];
   const pathStack = [];
@@ -987,7 +991,7 @@ function _generate(generator, node, options = {}) {
             const name = node2.key.value;
             const value = node2.value.value;
             const strName = JSON.stringify(name);
-            const strValue = JSON.stringify(value);
+            const strValue = stringifyValue(value);
             name && pathStack.push(name.toString());
             generator.push(`${strName}: `);
             if (isString(value)) {
@@ -1006,7 +1010,7 @@ function _generate(generator, node, options = {}) {
         case "YAMLScalar":
           if (parent.type === "YAMLSequence") {
             const value = node2.value;
-            const strValue = JSON.stringify(value);
+            const strValue = stringifyValue(value);
             if (isString(value)) {
               generator.push(codegenFn(value), node2, value);
             } else if (forceStringify) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@intlify/bundle-utils",
   "description": "Bundle utilities for Intlify project",
-  "version": "11.2.5",
+  "version": "11.2.7",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -18,18 +18,15 @@
     }
   },
   "dependencies": {
-    "@intlify/message-compiler": "~11.4.2",
-    "@intlify/shared": "~11.4.2",
+    "@intlify/message-compiler": "~11.4.15",
+    "@intlify/shared": "~11.4.15",
     "acorn": "^8.8.2",
     "esbuild": "^0.25.4",
-    "escodegen": "^2.1.0",
-    "estree-walker": "^2.0.2",
     "jsonc-eslint-parser": "^2.3.0",
     "source-map-js": "^1.2.1",
     "yaml-eslint-parser": "^1.2.2"
   },
   "devDependencies": {
-    "@types/escodegen": "^0.0.10",
     "@types/estree": "^1.0.0",
     "unbuild": "^3.6.1"
   },