@lingui/babel-plugin-extract-messages 3.12.0 → 3.13.2

package/index.js

@@ -38,35 +38,107 @@ function addMessage(path, messages, _ref) {
       newDefault = _ref.message,
       origin = _ref.origin,
       comment = _ref.comment,
-      props = (0, _objectWithoutProperties2.default)(_ref, ["id", "message", "origin", "comment"]);
+      context = _ref.context,
+      props = (0, _objectWithoutProperties2.default)(_ref, ["id", "message", "origin", "comment", "context"]);
   // prevent from adding undefined msgid
   if (id === undefined) return;
+  var extractedComments = comment ? [comment] : [];
 
-  if (messages.has(id)) {
-    var message = messages.get(id); // only set/check default language when it's defined.
+  if (context) {
+    if (messages.has(context)) {
+      var existingContext = messages.get(context);
 
-    if (message.message && newDefault && message.message !== newDefault) {
-      throw path.buildCodeFrameError("Different defaults for the same message ID.");
-    }
+      if (existingContext.has(id)) {
+        var message = messages.get(id); // only set/check default language when it's defined.
+
+        if (message.message && newDefault && message.message !== newDefault) {
+          throw path.buildCodeFrameError("Different defaults for the same message ID.");
+        }
 
-    if (newDefault) {
-      message.message = newDefault;
+        if (newDefault) {
+          message.message = newDefault;
+        }
+
+        ;
+        [].push.apply(message.origin, origin);
+
+        if (comment) {
+          ;
+          [].push.apply(message.extractedComments, [comment]);
+        }
+      } else {
+        existingContext.set(id, _objectSpread(_objectSpread({}, props), {}, {
+          message: newDefault,
+          origin: origin,
+          extractedComments: extractedComments
+        }));
+        messages.set(context, existingContext);
+      }
+    } else {
+      var newContext = new Map();
+      newContext.set(id, _objectSpread(_objectSpread({}, props), {}, {
+        message: newDefault,
+        origin: origin,
+        extractedComments: extractedComments
+      }));
+      messages.set(context, newContext);
     }
+  } else {
+    if (messages.has(id)) {
+      var _message = messages.get(id); // only set/check default language when it's defined.
 
-    ;
-    [].push.apply(message.origin, origin);
 
-    if (comment) {
+      if (_message.message && newDefault && _message.message !== newDefault) {
+        throw path.buildCodeFrameError("Different defaults for the same message ID.");
+      }
+
+      if (newDefault) {
+        _message.message = newDefault;
+      }
+
       ;
-      [].push.apply(message.extractedComments, [comment]);
+      [].push.apply(_message.origin, origin);
+
+      if (comment) {
+        ;
+        [].push.apply(_message.extractedComments, [comment]);
+      }
+    } else {
+      messages.set(id, _objectSpread(_objectSpread({}, props), {}, {
+        message: newDefault,
+        origin: origin,
+        extractedComments: extractedComments
+      }));
     }
+  }
+}
+/**
+ * An ES6 Map type is not possible to encode with JSON.stringify,
+ * so we can instead use a replacer function as an argument to 
+ * tell the JSON parser how to serialize / deserialize the Maps
+ * it encounters.
+ */
+
+
+function mapReplacer(key, value) {
+  if (value instanceof Map) {
+    var object = {};
+    value.forEach(function (v, k) {
+      return object[k] = v;
+    });
+    return object;
+  }
+
+  return value;
+}
+
+function extractStringContatentation(t, node, error) {
+  if (t.isStringLiteral(node)) {
+    return node.value;
+  } else if (t.isBinaryExpression(node)) {
+    return extractStringContatentation(t, node.left, error) + extractStringContatentation(t, node.right, error);
   } else {
-    var extractedComments = comment ? [comment] : [];
-    messages.set(id, _objectSpread(_objectSpread({}, props), {}, {
-      message: newDefault,
-      origin: origin,
-      extractedComments: extractedComments
-    }));
+    throw error;
   }
 }
 
@@ -132,7 +204,7 @@ function _default(_ref2) {
         var props = attrs.reduce(function (acc, item) {
           var key = item.name.name;
 
-          if (key === "id" || key === "message" || key === "comment") {
+          if (key === "id" || key === "message" || key === "comment" || key === "context") {
             if (item.value.value) {
               acc[key] = item.value.value;
             } else if (item.value.expression && t.isStringLiteral(item.value.expression)) {
@@ -180,7 +252,7 @@ function _default(_ref2) {
           return;
         }
 
-        var copyOptions = ["message", "comment"];
+        var copyOptions = ["message", "comment", "context"];
 
         if (t.isObjectExpression(path.node.arguments[2])) {
           path.node.arguments[2].properties.forEach(function (property) {
@@ -230,22 +302,36 @@ function _default(_ref2) {
 
         visited.add(path.node);
         var props = {};
-        var copyProps = ["id", "message", "comment"];
+        var copyProps = ["id", "message", "comment", "context"];
         path.node.properties.filter(function (_ref8) {
           var key = _ref8.key;
           return copyProps.indexOf(key.name) !== -1;
         }).forEach(function (_ref9, i) {
-          var _value$quasis$, _value$quasis$$value;
-
           var key = _ref9.key,
               value = _ref9.value;
+          // By default, the value is just the string value of the object property.
+          var valueToExtract = value.value;
 
           if (key.name === "comment" && !t.isStringLiteral(value)) {
-            throw path.get("properties.".concat(i, ".value")).buildCodeFrameError("Only strings are supported as comments.");
+            // Comments can be single or multi-line strings.
+            var errorIfNotAString = path.get("properties.".concat(i, ".value")).buildCodeFrameError("Only strings are supported as comments.");
+
+            if (t.isBinaryExpression(value)) {
+              valueToExtract = extractStringContatentation(t, value, errorIfNotAString);
+            } else {
+              throw errorIfNotAString;
+            }
+          } else if (key.name === "id") {
+            var isIdLiteral = !value.value && t.isTemplateLiteral(value);
+
+            if (isIdLiteral) {
+              var _value$quasis$, _value$quasis$$value;
+
+              valueToExtract = value === null || value === void 0 ? void 0 : (_value$quasis$ = value.quasis[0]) === null || _value$quasis$ === void 0 ? void 0 : (_value$quasis$$value = _value$quasis$.value) === null || _value$quasis$$value === void 0 ? void 0 : _value$quasis$$value.cooked;
+            }
           }
 
-          var isIdLiteral = !value.value && key.name === "id" && t.isTemplateLiteral(value);
-          props[key.name] = isIdLiteral ? value === null || value === void 0 ? void 0 : (_value$quasis$ = value.quasis[0]) === null || _value$quasis$ === void 0 ? void 0 : (_value$quasis$$value = _value$quasis$.value) === null || _value$quasis$$value === void 0 ? void 0 : _value$quasis$$value.cooked : value.value;
+          props[key.name] = valueToExtract;
         });
         collectMessage(path, file, props);
       }
@@ -305,7 +391,7 @@ function _default(_ref2) {
         catalog[key] = value;
       });
 
-      _fs.default.writeFileSync(catalogFilename, JSON.stringify(catalog, null, 2));
+      _fs.default.writeFileSync(catalogFilename, JSON.stringify(catalog, mapReplacer, 2));
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/babel-plugin-extract-messages",
-  "version": "3.12.0",
+  "version": "3.13.2",
   "description": "Babel plugin for collecting messages from source code for internationalization",
   "main": "index.js",
   "author": {
@@ -30,7 +30,7 @@
   "dependencies": {
     "@babel/generator": "^7.11.6",
     "@babel/runtime": "^7.11.2",
-    "@lingui/conf": "^3.12.0",
+    "@lingui/conf": "^3.13.2",
     "mkdirp": "^1.0.4"
   }
 }