@lingui/macro 3.13.0 → 3.13.3

package/global.d.ts

@@ -119,9 +119,9 @@ declare module "@lingui/macro" {
    * ```
    * import { selectOrdinal } from "@lingui/macro";
    * const message = selectOrdinal(count, {
-   *    one: "1st",
-   *    two: "2nd",
-   *    few: "3rd",
+   *    one: "#st",
+   *    two: "#nd",
+   *    few: "#rd",
    *    other: "#th",
    * });
    * ```
@@ -159,13 +159,6 @@ declare module "@lingui/macro" {
     choices: Record<string, string> & BasicType
   ): string
 
-  /**
-   * Defines multiple messages for extraction
-   */
-  export function defineMessages<M extends Record<string, MessageDescriptor>>(
-    messages: M
-  ): M
-
   /**
    * Define a message for later use
    *

package/index.d.ts

@@ -111,9 +111,9 @@ export function plural(value: number | string, options: ChoiceOptions): string
  * ```
  * import { selectOrdinal } from "@lingui/macro";
  * const message = selectOrdinal(count, {
- *    one: "1st",
- *    two: "2nd",
- *    few: "3rd",
+ *    one: "#st",
+ *    two: "#nd",
+ *    few: "#rd",
  *    other: "#th",
  * });
  * ```
@@ -148,15 +148,6 @@ export function selectOrdinal(
  */
 export function select(value: string, choices: ChoiceOptions): string
 
-/**
- * Defines multiple messages for extraction
- *
- * @see {@link defineMessage} for more details
- */
-export function defineMessages<M extends Record<string, MessageDescriptor>>(
-  messages: M
-): M
-
 /**
  * Define a message for later use
  *
@@ -181,6 +172,7 @@ export type TransProps = {
   comment?: string
   values?: Record<string, unknown>
   context?: string
+  children?: React.ReactNode
   component?: React.ComponentType<TransRenderProps>
   render?: (props: TransRenderProps) => ReactElement<any, any> | null
 }

package/index.js

@@ -147,7 +147,6 @@ function alreadyVisited(path) {
 
 function getMacroType(tagName) {
   switch (tagName) {
-    case "defineMessages":
     case "defineMessage":
     case "arg":
     case "t":

package/macroJsx.js

@@ -66,6 +66,13 @@ var MacroJSX = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "types", void 0);
     (0, _defineProperty2.default)(this, "expressionIndex", void 0);
     (0, _defineProperty2.default)(this, "elementIndex", void 0);
+    (0, _defineProperty2.default)(this, "safeJsxAttribute", function (name, value) {
+      // Quoted JSX attributes use XML-style escapes instead of JavaScript-style escapes.
+      // This means that <Trans id="Say \"hi\"!" /> is invalid, but <Trans id={"Say \"hi\"!"} /> is valid.
+      // We could consider removing this condition and always wrap in a jsxExpressionContainer.
+      var attributeValue = value.includes('"') ? _this.types.jsxExpressionContainer(_this.types.stringLiteral(value)) : _this.types.stringLiteral(value);
+      return _this.types.jsxAttribute(_this.types.jsxIdentifier(name), attributeValue);
+    });
     (0, _defineProperty2.default)(this, "replacePath", function (path) {
       var tokens = _this.tokenizeNode(path.node);
 
@@ -93,11 +100,11 @@ var MacroJSX = /*#__PURE__*/function () {
 
         if (process.env.NODE_ENV !== "production") {
           if (message) {
-            attributes.push(_this.types.jsxAttribute(_this.types.jsxIdentifier(_constants.MESSAGE), _this.types.stringLiteral(message)));
+            attributes.push(_this.safeJsxAttribute(_constants.MESSAGE, message));
           }
         }
       } else {
-        attributes.push(_this.types.jsxAttribute(_this.types.jsxIdentifier(_constants.ID), _this.types.stringLiteral(message)));
+        attributes.push(_this.safeJsxAttribute(_constants.ID, message));
       }
 
       if (process.env.NODE_ENV !== "production") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/macro",
-  "version": "3.13.0",
+  "version": "3.13.3",
   "description": "Macro for generating messages in ICU MessageFormat syntax",
   "main": "index.js",
   "author": {
@@ -30,10 +30,12 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@lingui/conf": "^3.13.0",
+    "@lingui/conf": "^3.13.3",
     "ramda": "^0.27.1"
   },
   "peerDependencies": {
+    "@lingui/core": "^3.13.0",
+    "@lingui/react": "^3.13.0",
     "babel-plugin-macros": "2 || 3"
   }
 }