@intlify/bundle-utils 5.1.0 → 5.1.2

package/lib/js.js

@@ -2,15 +2,11 @@
 /**
  * Code generator for i18n js resource
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const shared_1 = require("@intlify/shared");
 const acorn_1 = require("acorn");
 const estree_walker_1 = require("estree-walker");
-const esquery_1 = __importDefault(require("esquery"));
 const codegen_1 = require("./codegen");
 /**
  * @internal
@@ -42,20 +38,18 @@ function generate(targetSource, { type = 'plain', bridge = false, exportESM = fa
         sourceFile: filename,
         allowImportExportEverywhere: true
     });
-    const astExportDefaultWithObject = (0, esquery_1.default)(ast, 'Program:has(ExportDefaultDeclaration):has(ObjectExpression)');
-    console.log('astExportDefaultWithObject', astExportDefaultWithObject);
+    const exportResult = scanAst(ast);
     if (!allowDynamic) {
-        if (!astExportDefaultWithObject.length) {
+        // if (!astExportDefaultWithObject.length) {
+        if (!exportResult || exportResult !== 'object') {
             throw new Error(`You need to define an object as the locale message with 'export default'.`);
         }
     }
     else {
-        const astExportDefault = (0, esquery_1.default)(ast, 'Program:has(ExportDefaultDeclaration)');
-        if (!astExportDefault.length) {
+        if (!exportResult) {
             throw new Error(`You need to define 'export default' that will return the locale messages.`);
         }
-        console.log('astExportDefault', astExportDefault);
-        if (!astExportDefaultWithObject.length) {
+        if (exportResult !== 'object') {
             /**
              * NOTE:
              *  If `allowDynamic` is `true`, do not transform the code by this function, return it as is.
@@ -88,6 +82,29 @@ function generate(targetSource, { type = 'plain', bridge = false, exportESM = fa
     };
 }
 exports.generate = generate;
+function scanAst(ast) {
+    if (ast.type !== 'Program') {
+        throw new Error('Invalid AST: does not have Program node');
+    }
+    let ret = false;
+    for (const node of ast.body) {
+        if (node.type === 'ExportDefaultDeclaration') {
+            if (node.declaration.type === 'ObjectExpression') {
+                ret = 'object';
+                break;
+            }
+            else if (node.declaration.type === 'FunctionDeclaration') {
+                ret = 'function';
+                break;
+            }
+            else if (node.declaration.type === 'ArrowFunctionExpression') {
+                ret = 'arrow-function';
+                break;
+            }
+        }
+    }
+    return ret;
+}
 function generateNode(generator, node, options, injector) {
     const propsCountStack = [];
     const pathStack = [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@intlify/bundle-utils",
   "description": "Bundle utilities for Intlify project",
-  "version": "5.1.0",
+  "version": "5.1.2",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -21,14 +21,12 @@
     "@intlify/message-compiler": "next",
     "@intlify/shared": "next",
     "acorn": "^8.8.2",
-    "esquery": "^1.5.0",
     "estree-walker": "^2.0.2",
     "jsonc-eslint-parser": "^1.0.1",
     "source-map": "0.6.1",
     "yaml-eslint-parser": "^0.3.2"
   },
   "devDependencies": {
-    "@types/esquery": "^1.0.2",
     "@types/estree": "^1.0.0"
   },
   "engines": {