@intlify/bundle-utils 12.0.0-alpha.2 → 12.0.0-alpha.4

package/lib/index.cjs

@@ -2,19 +2,32 @@
 
 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 oxcParser = require('oxc-parser');
+const oxcWalker = require('oxc-walker');
 const messageCompiler = require('@intlify/message-compiler');
 const sourceMapJs = require('source-map-js');
 const jsoncEslintParser = require('jsonc-eslint-parser');
-const esbuild = require('esbuild');
+const oxcTransform = require('oxc-transform');
 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 +173,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 +209,7 @@ function generateMessageFunction(msg, options = {}, path) {
         domain: err.domain,
         location: err.location
       };
-      onError(err.message, extra);
+      onError(getCompileErrorMessage(err), extra);
       errors.push(err);
     }
   };
@@ -210,39 +231,46 @@ function mapLinesColumns(resMap, codeMaps, inSourceMap) {
       if (inMapFirstItem) {
         return;
       }
+      if (m.originalLine == null || m.originalColumn == null) {
+        return;
+      }
       inMapFirstItem = m;
     });
   }
   resMapConsumer.eachMapping((res) => {
-    if (res.originalLine == null) {
+    const resOriginalLine = res.originalLine;
+    const resOriginalColumn = res.originalColumn;
+    const resName = res.name;
+    if (resOriginalLine == null || resOriginalColumn == null || resName == null) {
       return;
     }
-    const map = codeMaps.get(res.name);
+    const map = codeMaps.get(resName);
     if (!map) {
       return;
     }
     let inMapOrigin = null;
     if (inMapConsumer) {
       inMapOrigin = inMapConsumer.originalPositionFor({
-        line: res.originalLine,
-        column: res.originalColumn - 1
+        line: resOriginalLine,
+        column: resOriginalColumn - 1
       });
       if (inMapOrigin.source == null) {
         inMapOrigin = null;
         return;
       }
     }
+    const inMapFirst = inMapFirstItem;
     const mapConsumer = new sourceMapJs.SourceMapConsumer(map);
     mapConsumer.eachMapping((m) => {
       mergedMapGenerator.addMapping({
         original: {
-          line: inMapFirstItem ? inMapFirstItem.originalLine + res.originalLine - 2 : res.originalLine,
-          column: inMapFirstItem ? inMapFirstItem.originalColumn + res.originalColumn : res.originalColumn
+          line: inMapFirst ? inMapFirst.originalLine + resOriginalLine - 2 : resOriginalLine,
+          column: inMapFirst ? inMapFirst.originalColumn + resOriginalColumn : resOriginalColumn
         },
         generated: {
-          line: inMapFirstItem ? inMapFirstItem.generatedLine + res.originalLine - 2 : res.originalLine,
+          line: inMapFirst ? inMapFirst.generatedLine + resOriginalLine - 2 : resOriginalLine,
           // map column with message format compilation code map
-          column: inMapFirstItem ? inMapFirstItem.generatedColumn + res.originalColumn + m.generatedColumn : res.originalColumn + m.generatedColumn
+          column: inMapFirst ? inMapFirst.generatedColumn + resOriginalColumn + m.generatedColumn : resOriginalColumn + m.generatedColumn
         },
         source: inMapOrigin ? inMapOrigin.source : res.source,
         name: m.name
@@ -300,7 +328,7 @@ function generateResourceAst(msg, options = {}, path) {
         domain: err.domain,
         location: err.location
       };
-      onError(err.message, extra);
+      onError(getCompileErrorMessage(err), extra);
       errors.push(err);
     }
   };
@@ -309,6 +337,41 @@ function generateResourceAst(msg, options = {}, path) {
   const code = !occured ? `${shared.friendlyJSONstringify(ast)}` : `\`${_msg}\``;
   return { code, ast, map, errors };
 }
+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 createOxcParseError(errors, source, options, offsetUnit = "utf-16") {
+  const error = errors.find((e) => e.severity === "Error") ?? errors[0];
+  const err = new Error(error.message);
+  const start = error.labels[0]?.start;
+  if (start != null) {
+    const before = offsetUnit === "utf-8" ? Buffer.from(source).subarray(0, start).toString() : source.slice(0, start);
+    err.lineNumber = before.split("\n").length;
+    err.column = before.length - before.lastIndexOf("\n");
+  }
+  return createResourceParseError(err, options);
+}
 function excludeLocales({
   messages,
   onlyLocales
@@ -324,48 +387,38 @@ function excludeLocales({
 
 class DynamicResourceError extends Error {
 }
-function generate$3(targetSource, {
-  type = "plain",
-  filename = "vue-i18n-loader.js",
-  inSourceMap = void 0,
-  locale = "",
-  isGlobal = false,
-  sourceMap = false,
-  env = "development",
-  forceStringify = false,
-  onError = void 0,
-  onWarn = void 0,
-  strictMessage = true,
-  escapeHtml = false,
-  allowDynamic = false,
-  jit = false
-}) {
+const DEFAULT_OPTIONS = {
+  type: "plain",
+  filename: "vue-i18n-loader.js",
+  inSourceMap: void 0,
+  locale: "",
+  isGlobal: false,
+  sourceMap: false,
+  env: "development",
+  forceStringify: false,
+  onError: void 0,
+  onWarn: void 0,
+  strictMessage: true,
+  escapeHtml: false,
+  allowDynamic: false,
+  jit: false
+};
+function generate$3(targetSource, options) {
   const value = Buffer.isBuffer(targetSource) ? targetSource.toString() : targetSource;
-  const options = {
-    type,
-    source: value,
-    sourceMap,
-    locale,
-    isGlobal,
-    inSourceMap,
-    env,
-    filename,
-    forceStringify,
-    onError,
-    onWarn,
-    strictMessage,
-    escapeHtml,
-    jit
-  };
-  const generator = createCodeGenerator(options);
-  const ast = acorn.parse(value, {
-    ecmaVersion: "latest",
+  const _options = Object.assign({}, DEFAULT_OPTIONS, options, { source: value });
+  const generator = createCodeGenerator(_options);
+  const { program: ast, errors } = oxcParser.parseSync(_options.filename ?? "", value, {
     sourceType: "module",
-    sourceFile: filename,
-    allowImportExportEverywhere: true
+    lang: "js",
+    // `(value)` is the value itself: `export default ({ ... })` is an object, a parenthesized
+    // message is compiled, and escodegen does not know `ParenthesizedExpression`
+    preserveParens: false
   });
+  if (errors.length > 0) {
+    throw createOxcParseError(errors, value, _options);
+  }
   const exportResult = scanAst(ast);
-  if (!allowDynamic) {
+  if (!_options.allowDynamic) {
     if (!exportResult) {
       throw new Error(`You need to define an object as the locale message with 'export default'.`);
     }
@@ -382,13 +435,13 @@ function generate$3(targetSource, {
       return {
         ast,
         code: value,
-        map: inSourceMap
+        map: _options.inSourceMap
       };
     }
   }
-  const codeMaps = _generate$2(generator, ast, options);
+  const codeMaps = _generate$2(generator, ast, _options);
   const { code, map } = generator.context();
-  const newMap = map ? mapLinesColumns(map.toJSON(), codeMaps, inSourceMap) || null : null;
+  const newMap = map ? mapLinesColumns(map.toJSON(), codeMaps, _options.inSourceMap) || null : null;
   return {
     ast,
     code,
@@ -428,16 +481,10 @@ function _generate$2(generator, node, options = {}) {
   }
   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 ...
-     */
+  oxcWalker.walk(node, {
     // @ts-ignore
-    enter(node2, _parent) {
-      if (_parent?.type != null) this.skip();
+    enter(node2, parent) {
+      if (parent?.type != null) this.skip();
       switch (node2.type) {
         case "ExportDefaultDeclaration":
           this.skip();
@@ -462,7 +509,7 @@ function _generate$2(generator, node, options = {}) {
 Variable declarations are not optimized - found ${variableDeclarations.join(", ")}`
     );
   }
-  estreeWalker.walk(node, {
+  oxcWalker.walk(node, {
     /**
      * NOTE:
      *  force cast to Node of `estree-walker@3.x`,
@@ -581,12 +628,6 @@ Variable declarations are not optimized - found ${variableDeclarations.join(", "
           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) {
@@ -667,7 +708,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(
@@ -707,6 +766,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) {
@@ -763,6 +835,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;
         }
@@ -778,6 +852,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) {
@@ -823,48 +905,18 @@ function _generate$1(generator, node, options = {}) {
   return codeMaps;
 }
 
-async function generate$1(targetSource, {
-  type = "plain",
-  filename = "vue-i18n-loader.js",
-  inSourceMap = void 0,
-  locale = "",
-  isGlobal = false,
-  sourceMap = false,
-  env = "development",
-  forceStringify = false,
-  onError = void 0,
-  onWarn = void 0,
-  strictMessage = true,
-  escapeHtml = false,
-  allowDynamic = false,
-  jit = false
-}) {
+function generate$1(targetSource, options) {
   let value = Buffer.isBuffer(targetSource) ? targetSource.toString() : targetSource;
-  const options = {
-    type,
-    source: value,
-    sourceMap,
-    locale,
-    isGlobal,
-    inSourceMap,
-    env,
-    filename,
-    forceStringify,
-    onError,
-    onWarn,
-    strictMessage,
-    escapeHtml,
-    allowDynamic,
-    jit
-  };
-  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 _options = Object.assign({}, DEFAULT_OPTIONS, options, { source: value });
+  const transformed = oxcTransform.transform(_options.filename ?? "", value, { lang: "ts" });
+  if (transformed.errors.length > 0) {
+    throw createOxcParseError(transformed.errors, value, _options, "utf-8");
+  }
+  if (transformed && transformed.code) {
+    value = transformed.code;
+    _options.source = transformed.code;
   }
-  return generate$3(value, options);
+  return generate$3(value, _options);
 }
 
 function generate(targetSource, {
@@ -883,6 +935,9 @@ function generate(targetSource, {
   jit = false
 }) {
   let value = Buffer.isBuffer(targetSource) ? targetSource.toString() : targetSource;
+  if (value.charCodeAt(0) === 65279) {
+    value = value.slice(1);
+  }
   const options = {
     type,
     source: value,
@@ -898,9 +953,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,
@@ -925,6 +1002,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 = [];
@@ -985,7 +1072,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)) {
@@ -1004,7 +1091,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.d.cts

@@ -1,6 +1,6 @@
 import { RawSourceMap } from 'source-map-js';
 import { CompileError } from '@intlify/message-compiler';
-import { Node } from 'estree';
+import { Node } from 'oxc-parser';
 import { JSONProgram } from 'jsonc-eslint-parser/lib/parser/ast';
 import { YAMLProgram } from 'yaml-eslint-parser/lib/ast';
 
@@ -61,7 +61,7 @@ declare class DynamicResourceError extends Error {
 /**
  * @internal
  */
-declare function generate$3(targetSource: string | Buffer, { type, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, onWarn, strictMessage, escapeHtml, allowDynamic, jit }: CodeGenOptions): CodeGenResult<Node>;
+declare function generate$3(targetSource: string | Buffer, options: CodeGenOptions): CodeGenResult<Node>;
 
 /**
  * Code / AST generator for i18n json/json5 resource
@@ -72,13 +72,13 @@ declare function generate$2(targetSource: string | Buffer, { type, onlyLocales,
 /**
  * Code generator for i18n ts resource
  *
- * An async wrapper for the js generator which transforms ts to js before generating
+ * A wrapper for the js generator which transforms ts to js before generating
  */
 
 /**
  * @internal
  */
-declare function generate$1(targetSource: string | Buffer, { type, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, onWarn, strictMessage, escapeHtml, allowDynamic, jit }: CodeGenOptions): Promise<CodeGenResult<Node>>;
+declare function generate$1(targetSource: string | Buffer, options: CodeGenOptions): CodeGenResult<Node>;
 
 /**
  * Code generator for i18n yaml resource
@@ -89,4 +89,5 @@ declare function generate$1(targetSource: string | Buffer, { type, filename, inS
  */
 declare function generate(targetSource: string | Buffer, { type, onlyLocales, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, strictMessage, escapeHtml, jit }: CodeGenOptions): CodeGenResult<YAMLProgram>;
 
-export { type CodeGenOptions, type CodeGenResult, type DevEnv, DynamicResourceError, type InstalledPackage, checkInstallPackage, generate$2 as generateJSON, generate$3 as generateJavaScript, generate$1 as generateTypescript, generate as generateYAML, getVueI18nVersion };
+export { DynamicResourceError, checkInstallPackage, generate$2 as generateJSON, generate$3 as generateJavaScript, generate$1 as generateTypescript, generate as generateYAML, getVueI18nVersion };
+export type { CodeGenOptions, CodeGenResult, DevEnv, InstalledPackage };

package/lib/index.d.mts

@@ -1,6 +1,6 @@
 import { RawSourceMap } from 'source-map-js';
 import { CompileError } from '@intlify/message-compiler';
-import { Node } from 'estree';
+import { Node } from 'oxc-parser';
 import { JSONProgram } from 'jsonc-eslint-parser/lib/parser/ast';
 import { YAMLProgram } from 'yaml-eslint-parser/lib/ast';
 
@@ -61,7 +61,7 @@ declare class DynamicResourceError extends Error {
 /**
  * @internal
  */
-declare function generate$3(targetSource: string | Buffer, { type, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, onWarn, strictMessage, escapeHtml, allowDynamic, jit }: CodeGenOptions): CodeGenResult<Node>;
+declare function generate$3(targetSource: string | Buffer, options: CodeGenOptions): CodeGenResult<Node>;
 
 /**
  * Code / AST generator for i18n json/json5 resource
@@ -72,13 +72,13 @@ declare function generate$2(targetSource: string | Buffer, { type, onlyLocales,
 /**
  * Code generator for i18n ts resource
  *
- * An async wrapper for the js generator which transforms ts to js before generating
+ * A wrapper for the js generator which transforms ts to js before generating
  */
 
 /**
  * @internal
  */
-declare function generate$1(targetSource: string | Buffer, { type, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, onWarn, strictMessage, escapeHtml, allowDynamic, jit }: CodeGenOptions): Promise<CodeGenResult<Node>>;
+declare function generate$1(targetSource: string | Buffer, options: CodeGenOptions): CodeGenResult<Node>;
 
 /**
  * Code generator for i18n yaml resource
@@ -89,4 +89,5 @@ declare function generate$1(targetSource: string | Buffer, { type, filename, inS
  */
 declare function generate(targetSource: string | Buffer, { type, onlyLocales, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, strictMessage, escapeHtml, jit }: CodeGenOptions): CodeGenResult<YAMLProgram>;
 
-export { type CodeGenOptions, type CodeGenResult, type DevEnv, DynamicResourceError, type InstalledPackage, checkInstallPackage, generate$2 as generateJSON, generate$3 as generateJavaScript, generate$1 as generateTypescript, generate as generateYAML, getVueI18nVersion };
+export { DynamicResourceError, checkInstallPackage, generate$2 as generateJSON, generate$3 as generateJavaScript, generate$1 as generateTypescript, generate as generateYAML, getVueI18nVersion };
+export type { CodeGenOptions, CodeGenResult, DevEnv, InstalledPackage };

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { RawSourceMap } from 'source-map-js';
 import { CompileError } from '@intlify/message-compiler';
-import { Node } from 'estree';
+import { Node } from 'oxc-parser';
 import { JSONProgram } from 'jsonc-eslint-parser/lib/parser/ast';
 import { YAMLProgram } from 'yaml-eslint-parser/lib/ast';
 
@@ -61,7 +61,7 @@ declare class DynamicResourceError extends Error {
 /**
  * @internal
  */
-declare function generate$3(targetSource: string | Buffer, { type, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, onWarn, strictMessage, escapeHtml, allowDynamic, jit }: CodeGenOptions): CodeGenResult<Node>;
+declare function generate$3(targetSource: string | Buffer, options: CodeGenOptions): CodeGenResult<Node>;
 
 /**
  * Code / AST generator for i18n json/json5 resource
@@ -72,13 +72,13 @@ declare function generate$2(targetSource: string | Buffer, { type, onlyLocales,
 /**
  * Code generator for i18n ts resource
  *
- * An async wrapper for the js generator which transforms ts to js before generating
+ * A wrapper for the js generator which transforms ts to js before generating
  */
 
 /**
  * @internal
  */
-declare function generate$1(targetSource: string | Buffer, { type, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, onWarn, strictMessage, escapeHtml, allowDynamic, jit }: CodeGenOptions): Promise<CodeGenResult<Node>>;
+declare function generate$1(targetSource: string | Buffer, options: CodeGenOptions): CodeGenResult<Node>;
 
 /**
  * Code generator for i18n yaml resource
@@ -89,4 +89,5 @@ declare function generate$1(targetSource: string | Buffer, { type, filename, inS
  */
 declare function generate(targetSource: string | Buffer, { type, onlyLocales, filename, inSourceMap, locale, isGlobal, sourceMap, env, forceStringify, onError, strictMessage, escapeHtml, jit }: CodeGenOptions): CodeGenResult<YAMLProgram>;
 
-export { type CodeGenOptions, type CodeGenResult, type DevEnv, DynamicResourceError, type InstalledPackage, checkInstallPackage, generate$2 as generateJSON, generate$3 as generateJavaScript, generate$1 as generateTypescript, generate as generateYAML, getVueI18nVersion };
+export { DynamicResourceError, checkInstallPackage, generate$2 as generateJSON, generate$3 as generateJavaScript, generate$1 as generateTypescript, generate as generateYAML, getVueI18nVersion };
+export type { CodeGenOptions, CodeGenResult, DevEnv, InstalledPackage };

package/lib/index.mjs

@@ -1,15 +1,16 @@
-import module from 'node:module';
+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 { parseSync } from 'oxc-parser';
+import { walk } from 'oxc-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';
-import { transform } from 'esbuild';
+import { transform } from 'oxc-transform';
 import { parseYAML, getStaticYAMLValue, traverseNodes as traverseNodes$1 } from 'yaml-eslint-parser';
 
-const _require = module.createRequire(import.meta.url);
+const _require = module$1.createRequire(import.meta.url);
 function checkInstallPackage(pkg, debug) {
   let installedVueI18n = false;
   try {
@@ -153,6 +154,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 +190,7 @@ function generateMessageFunction(msg, options = {}, path) {
         domain: err.domain,
         location: err.location
       };
-      onError(err.message, extra);
+      onError(getCompileErrorMessage(err), extra);
       errors.push(err);
     }
   };
@@ -203,39 +212,46 @@ function mapLinesColumns(resMap, codeMaps, inSourceMap) {
       if (inMapFirstItem) {
         return;
       }
+      if (m.originalLine == null || m.originalColumn == null) {
+        return;
+      }
       inMapFirstItem = m;
     });
   }
   resMapConsumer.eachMapping((res) => {
-    if (res.originalLine == null) {
+    const resOriginalLine = res.originalLine;
+    const resOriginalColumn = res.originalColumn;
+    const resName = res.name;
+    if (resOriginalLine == null || resOriginalColumn == null || resName == null) {
       return;
     }
-    const map = codeMaps.get(res.name);
+    const map = codeMaps.get(resName);
     if (!map) {
       return;
     }
     let inMapOrigin = null;
     if (inMapConsumer) {
       inMapOrigin = inMapConsumer.originalPositionFor({
-        line: res.originalLine,
-        column: res.originalColumn - 1
+        line: resOriginalLine,
+        column: resOriginalColumn - 1
       });
       if (inMapOrigin.source == null) {
         inMapOrigin = null;
         return;
       }
     }
+    const inMapFirst = inMapFirstItem;
     const mapConsumer = new SourceMapConsumer(map);
     mapConsumer.eachMapping((m) => {
       mergedMapGenerator.addMapping({
         original: {
-          line: inMapFirstItem ? inMapFirstItem.originalLine + res.originalLine - 2 : res.originalLine,
-          column: inMapFirstItem ? inMapFirstItem.originalColumn + res.originalColumn : res.originalColumn
+          line: inMapFirst ? inMapFirst.originalLine + resOriginalLine - 2 : resOriginalLine,
+          column: inMapFirst ? inMapFirst.originalColumn + resOriginalColumn : resOriginalColumn
         },
         generated: {
-          line: inMapFirstItem ? inMapFirstItem.generatedLine + res.originalLine - 2 : res.originalLine,
+          line: inMapFirst ? inMapFirst.generatedLine + resOriginalLine - 2 : resOriginalLine,
           // map column with message format compilation code map
-          column: inMapFirstItem ? inMapFirstItem.generatedColumn + res.originalColumn + m.generatedColumn : res.originalColumn + m.generatedColumn
+          column: inMapFirst ? inMapFirst.generatedColumn + resOriginalColumn + m.generatedColumn : resOriginalColumn + m.generatedColumn
         },
         source: inMapOrigin ? inMapOrigin.source : res.source,
         name: m.name
@@ -293,7 +309,7 @@ function generateResourceAst(msg, options = {}, path) {
         domain: err.domain,
         location: err.location
       };
-      onError(err.message, extra);
+      onError(getCompileErrorMessage(err), extra);
       errors.push(err);
     }
   };
@@ -302,6 +318,41 @@ function generateResourceAst(msg, options = {}, path) {
   const code = !occured ? `${friendlyJSONstringify(ast)}` : `\`${_msg}\``;
   return { code, ast, map, errors };
 }
+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 createOxcParseError(errors, source, options, offsetUnit = "utf-16") {
+  const error = errors.find((e) => e.severity === "Error") ?? errors[0];
+  const err = new Error(error.message);
+  const start = error.labels[0]?.start;
+  if (start != null) {
+    const before = offsetUnit === "utf-8" ? Buffer.from(source).subarray(0, start).toString() : source.slice(0, start);
+    err.lineNumber = before.split("\n").length;
+    err.column = before.length - before.lastIndexOf("\n");
+  }
+  return createResourceParseError(err, options);
+}
 function excludeLocales({
   messages,
   onlyLocales
@@ -317,48 +368,38 @@ function excludeLocales({
 
 class DynamicResourceError extends Error {
 }
-function generate$3(targetSource, {
-  type = "plain",
-  filename = "vue-i18n-loader.js",
-  inSourceMap = void 0,
-  locale = "",
-  isGlobal = false,
-  sourceMap = false,
-  env = "development",
-  forceStringify = false,
-  onError = void 0,
-  onWarn = void 0,
-  strictMessage = true,
-  escapeHtml = false,
-  allowDynamic = false,
-  jit = false
-}) {
+const DEFAULT_OPTIONS = {
+  type: "plain",
+  filename: "vue-i18n-loader.js",
+  inSourceMap: void 0,
+  locale: "",
+  isGlobal: false,
+  sourceMap: false,
+  env: "development",
+  forceStringify: false,
+  onError: void 0,
+  onWarn: void 0,
+  strictMessage: true,
+  escapeHtml: false,
+  allowDynamic: false,
+  jit: false
+};
+function generate$3(targetSource, options) {
   const value = Buffer.isBuffer(targetSource) ? targetSource.toString() : targetSource;
-  const options = {
-    type,
-    source: value,
-    sourceMap,
-    locale,
-    isGlobal,
-    inSourceMap,
-    env,
-    filename,
-    forceStringify,
-    onError,
-    onWarn,
-    strictMessage,
-    escapeHtml,
-    jit
-  };
-  const generator = createCodeGenerator(options);
-  const ast = parse(value, {
-    ecmaVersion: "latest",
+  const _options = Object.assign({}, DEFAULT_OPTIONS, options, { source: value });
+  const generator = createCodeGenerator(_options);
+  const { program: ast, errors } = parseSync(_options.filename ?? "", value, {
     sourceType: "module",
-    sourceFile: filename,
-    allowImportExportEverywhere: true
+    lang: "js",
+    // `(value)` is the value itself: `export default ({ ... })` is an object, a parenthesized
+    // message is compiled, and escodegen does not know `ParenthesizedExpression`
+    preserveParens: false
   });
+  if (errors.length > 0) {
+    throw createOxcParseError(errors, value, _options);
+  }
   const exportResult = scanAst(ast);
-  if (!allowDynamic) {
+  if (!_options.allowDynamic) {
     if (!exportResult) {
       throw new Error(`You need to define an object as the locale message with 'export default'.`);
     }
@@ -375,13 +416,13 @@ function generate$3(targetSource, {
       return {
         ast,
         code: value,
-        map: inSourceMap
+        map: _options.inSourceMap
       };
     }
   }
-  const codeMaps = _generate$2(generator, ast, options);
+  const codeMaps = _generate$2(generator, ast, _options);
   const { code, map } = generator.context();
-  const newMap = map ? mapLinesColumns(map.toJSON(), codeMaps, inSourceMap) || null : null;
+  const newMap = map ? mapLinesColumns(map.toJSON(), codeMaps, _options.inSourceMap) || null : null;
   return {
     ast,
     code,
@@ -422,15 +463,9 @@ function _generate$2(generator, node, options = {}) {
   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();
+    enter(node2, parent) {
+      if (parent?.type != null) this.skip();
       switch (node2.type) {
         case "ExportDefaultDeclaration":
           this.skip();
@@ -574,12 +609,6 @@ Variable declarations are not optimized - found ${variableDeclarations.join(", "
           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) {
@@ -660,7 +689,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(
@@ -700,6 +747,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) {
@@ -756,6 +816,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;
         }
@@ -771,6 +833,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) {
@@ -816,48 +886,18 @@ function _generate$1(generator, node, options = {}) {
   return codeMaps;
 }
 
-async function generate$1(targetSource, {
-  type = "plain",
-  filename = "vue-i18n-loader.js",
-  inSourceMap = void 0,
-  locale = "",
-  isGlobal = false,
-  sourceMap = false,
-  env = "development",
-  forceStringify = false,
-  onError = void 0,
-  onWarn = void 0,
-  strictMessage = true,
-  escapeHtml = false,
-  allowDynamic = false,
-  jit = false
-}) {
+function generate$1(targetSource, options) {
   let value = Buffer.isBuffer(targetSource) ? targetSource.toString() : targetSource;
-  const options = {
-    type,
-    source: value,
-    sourceMap,
-    locale,
-    isGlobal,
-    inSourceMap,
-    env,
-    filename,
-    forceStringify,
-    onError,
-    onWarn,
-    strictMessage,
-    escapeHtml,
-    allowDynamic,
-    jit
-  };
-  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 _options = Object.assign({}, DEFAULT_OPTIONS, options, { source: value });
+  const transformed = transform(_options.filename ?? "", value, { lang: "ts" });
+  if (transformed.errors.length > 0) {
+    throw createOxcParseError(transformed.errors, value, _options, "utf-8");
+  }
+  if (transformed && transformed.code) {
+    value = transformed.code;
+    _options.source = transformed.code;
   }
-  return generate$3(value, options);
+  return generate$3(value, _options);
 }
 
 function generate(targetSource, {
@@ -876,6 +916,9 @@ function generate(targetSource, {
   jit = false
 }) {
   let value = Buffer.isBuffer(targetSource) ? targetSource.toString() : targetSource;
+  if (value.charCodeAt(0) === 65279) {
+    value = value.slice(1);
+  }
   const options = {
     type,
     source: value,
@@ -891,9 +934,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,
@@ -918,6 +983,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 = [];
@@ -978,7 +1053,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)) {
@@ -997,7 +1072,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": "12.0.0-alpha.2",
+  "version": "12.0.0-alpha.4",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -20,21 +20,20 @@
   "dependencies": {
     "@intlify/message-compiler": "next",
     "@intlify/shared": "next",
-    "acorn": "^8.8.2",
-    "esbuild": "^0.25.1",
     "escodegen": "^2.1.0",
-    "estree-walker": "^2.0.2",
     "jsonc-eslint-parser": "^2.3.0",
+    "oxc-parser": "^0.131.0",
+    "oxc-transform": "^0.96.0",
+    "oxc-walker": "^0.7.0",
     "source-map-js": "^1.0.1",
     "yaml-eslint-parser": "^1.2.2"
   },
   "devDependencies": {
     "@types/escodegen": "^0.0.10",
-    "@types/estree": "^1.0.0",
-    "unbuild": "^3.5.0"
+    "unbuild": "^3.6.1"
   },
   "engines": {
-    "node": ">= 20"
+    "node": ">= 22.13"
   },
   "files": [
     "lib"