@lingui/babel-plugin-extract-messages 4.0.0-next.0 → 4.0.0-next.2

package/build/index.js

@@ -18,12 +18,12 @@ function collectMessage(path, props, ctx) {
     origin: [ctx.file.opts.filename, line, column]
   });
 }
-function getTextFromExpression(t, exp, hub) {
+function getTextFromExpression(t, exp, hub, emitErrorOnVariable = true) {
   if (t.isStringLiteral(exp)) {
     return exp.value;
   }
   if (t.isBinaryExpression(exp)) {
-    return getTextFromExpression(t, exp.left, hub) + getTextFromExpression(t, exp.right, hub);
+    return getTextFromExpression(t, exp.left, hub, emitErrorOnVariable) + getTextFromExpression(t, exp.right, hub, emitErrorOnVariable);
   }
   if (t.isTemplateLiteral(exp)) {
     var _exp$quasis$, _exp$quasis$$value;
@@ -33,7 +33,9 @@ function getTextFromExpression(t, exp, hub) {
     }
     return (_exp$quasis$ = exp.quasis[0]) === null || _exp$quasis$ === void 0 ? void 0 : (_exp$quasis$$value = _exp$quasis$.value) === null || _exp$quasis$$value === void 0 ? void 0 : _exp$quasis$$value.cooked;
   }
-  console.warn(hub.buildError(exp, "Only strings or template literals could be extracted.", SyntaxError).message);
+  if (emitErrorOnVariable) {
+    console.warn(hub.buildError(exp, "Only strings or template literals could be extracted.", SyntaxError).message);
+  }
 }
 function extractFromObjectExpression(t, exp, hub, keys) {
   const props = {};
@@ -51,11 +53,6 @@ function _default({
   types: t
 }) {
   let localTransComponentName;
-
-  // We need to remember all processed nodes. When JSX expressions are
-  // replaced with CallExpressions, all children are traversed for each CallExpression.
-  // Then, i18n._ methods are visited multiple times for each parent CallExpression.
-  const visitedNodes = new WeakSet();
   function isTransComponent(node) {
     return t.isJSXElement(node) && t.isJSXIdentifier(node.openingElement.name, {
       name: localTransComponentName
@@ -121,7 +118,6 @@ function _default({
         collectMessage(path, props, ctx);
       },
       CallExpression(path, ctx) {
-        if (visitedNodes.has(path.node)) return;
         const hasComment = [path.node, path.parent].some(node => hasI18nComment(node));
         const firstArgument = path.node.arguments[0];
 
@@ -132,13 +128,9 @@ function _default({
         const isNonMacroI18n = isI18nMethod(path.node.callee) && !(firstArgument !== null && firstArgument !== void 0 && firstArgument.leadingComments);
         if (!hasComment && !isNonMacroI18n) return;
         let props = {
-          id: firstArgument.value
+          id: getTextFromExpression(t, firstArgument, ctx.file.hub, false)
         };
         if (!props.id) {
-          // don't rise warning when translating from variables
-          if (!t.isIdentifier(firstArgument)) {
-            console.warn(path.buildCodeFrameError("Missing message ID, skipping.").message);
-          }
           return;
         }
         const msgDescArg = path.node.arguments[2];
@@ -148,14 +140,12 @@ function _default({
             ...extractFromObjectExpression(t, msgDescArg, ctx.file.hub, ["message", "comment", "context"])
           };
         }
-        visitedNodes.add(path.node);
         collectMessage(path, props, ctx);
       },
       StringLiteral(path, ctx) {
-        if (!hasI18nComment(path.node) || visitedNodes.has(path.node)) {
+        if (!hasI18nComment(path.node)) {
           return;
         }
-        visitedNodes.add(path.node);
         const props = {
           id: path.node.value
         };
@@ -167,10 +157,9 @@ function _default({
       },
       // Extract message descriptors
       ObjectExpression(path, ctx) {
-        if (!hasI18nComment(path.node) || visitedNodes.has(path.node)) {
+        if (!hasI18nComment(path.node)) {
           return;
         }
-        visitedNodes.add(path.node);
         const props = extractFromObjectExpression(t, path.node, ctx.file.hub, ["id", "message", "comment", "context"]);
         if (!props.id) {
           console.warn(path.buildCodeFrameError("Missing message ID, skipping.").message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/babel-plugin-extract-messages",
-  "version": "4.0.0-next.0",
+  "version": "4.0.0-next.2",
   "description": "Babel plugin for collecting messages from source code for internationalization",
   "main": "./build/index.js",
   "author": {
@@ -41,5 +41,5 @@
     "@babel/types": "^7.20.7",
     "@lingui/jest-mocks": "^3.0.3"
   },
-  "gitHead": "637f5cf6beda9d4ebce4e15cd9fdaa23e404b660"
+  "gitHead": "556ab57e20c2ac9d384a22424c6a90c2ba0dd133"
 }