@lingui/macro 3.16.1 → 3.17.1

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.17.1](https://github.com/lingui/js-lingui/compare/v3.17.0...v3.17.1) (2023-02-07)
+
+
+### Bug Fixes
+
+* **build:** undeclared dependencies ([#1391](https://github.com/lingui/js-lingui/issues/1391)) ([f390ca4](https://github.com/lingui/js-lingui/commit/f390ca4517144344fcbbbf9c73a42a1a17d0e519))
+
+
+
+
+
+# [3.17.0](https://github.com/lingui/js-lingui/compare/v3.16.1...v3.17.0) (2023-02-01)
+
+
+### Bug Fixes
+
+* **macro:** JS macros don't strip non-essential props in production ([#1389](https://github.com/lingui/js-lingui/issues/1389)) ([0ff55d6](https://github.com/lingui/js-lingui/commit/0ff55d606e4eba496548675e42c744d0d872d838))
+
+
+### Features
+
+* **macro:** throw useful error message if macro used without a plugin ([#1355](https://github.com/lingui/js-lingui/issues/1355)) ([7d55904](https://github.com/lingui/js-lingui/commit/7d55904bb76fae384558945863423145978b9bd6))
+
+
+
+
+
 ## [3.16.1](https://github.com/lingui/js-lingui/compare/v3.16.0...v3.16.1) (2023-01-24)
 
 **Note:** Version bump only for package @lingui/macro

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Tomáš Ehrlich
+Copyright (c) 2017-2022 Tomáš Ehrlich, (c) 2022-2023 Crowdin.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -40,8 +40,8 @@ const message = i18n._(t`Hello, my name is ${name} and today is ${date(now)}`)
 
 [license]: https://github.com/lingui/js-lingui/blob/main/LICENSE
 [linguijs]: https://github.com/lingui/js-lingui
-[documentation]: https://lingui.js.org/
-[reference]: https://lingui.js.org/ref/macro/
+[documentation]: https://lingui.dev
+[reference]: https://lingui.dev/ref/macro/
 [package]: https://www.npmjs.com/package/@lingui/macro
 [badge-downloads]: https://img.shields.io/npm/dw/@lingui/macro.svg
 [badge-version]: https://img.shields.io/npm/v/@lingui/macro.svg

package/build/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Tomáš Ehrlich
+Copyright (c) 2017-2022 Tomáš Ehrlich, (c) 2022-2023 Crowdin.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CONTEXT = exports.EXTRACT_MARK = exports.COMMENT = exports.MESSAGE = exports.ID = void 0;
+exports.MESSAGE = exports.ID = exports.EXTRACT_MARK = exports.CONTEXT = exports.COMMENT = void 0;
 const ID = "id";
 exports.ID = ID;
 const MESSAGE = "message";

package/build/global.d.ts

@@ -72,9 +72,7 @@ declare module "@lingui/macro" {
    * const message = t(i18n)({ message: `Hello ${name}` });
    * ```
    */
-  export function t(
-    i18n: I18n
-  ): {
+  export function t(i18n: I18n): {
     (literals: TemplateStringsArray, ...placeholders: any[]): string
     (descriptor: MessageDescriptor): string
   }

package/build/icu.js

@@ -4,20 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _types = require("@babel/types");
-
 const metaOptions = ["id", "comment", "props"];
 const escapedMetaOptionsRe = new RegExp(`^_(${metaOptions.join("|")})$`);
-
 class ICUMessageFormat {
   fromTokens(tokens) {
-    return (Array.isArray(tokens) ? tokens : [tokens]).map(token => this.processToken(token)).filter(Boolean).reduce((props, message) => ({ ...message,
+    return (Array.isArray(tokens) ? tokens : [tokens]).map(token => this.processToken(token)).filter(Boolean).reduce((props, message) => ({
+      ...message,
       message: props.message + message.message,
-      values: { ...props.values,
+      values: {
+        ...props.values,
         ...message.values
       },
-      jsxElements: { ...props.jsxElements,
+      jsxElements: {
+        ...props.jsxElements,
         ...message.jsxElements
       }
     }), {
@@ -26,10 +26,8 @@ class ICUMessageFormat {
       jsxElements: {}
     });
   }
-
   processToken(token) {
     const jsxElements = {};
-
     if (token.type === "text") {
       return {
         message: token.value
@@ -38,11 +36,9 @@ class ICUMessageFormat {
       if (token.value !== undefined && (0, _types.isJSXEmptyExpression)(token.value)) {
         return null;
       }
-
       const values = token.value !== undefined ? {
         [token.name]: token.value
       } : {};
-
       switch (token.format) {
         case "plural":
         case "select":
@@ -50,12 +46,10 @@ class ICUMessageFormat {
           const formatOptions = Object.keys(token.options).filter(key => token.options[key] != null).map(key => {
             let value = token.options[key];
             key = key.replace(escapedMetaOptionsRe, "$1");
-
             if (key === "offset") {
               // offset has special syntax `offset:number`
               return `offset:${value}`;
             }
-
             if (typeof value !== "string") {
               // process tokens from nested formatters
               const {
@@ -67,7 +61,6 @@ class ICUMessageFormat {
               Object.assign(jsxElements, childJsxElements);
               value = message;
             }
-
             return `${key} {${value}}`;
           }).join(" ");
           return {
@@ -75,7 +68,6 @@ class ICUMessageFormat {
             values,
             jsxElements
           };
-
         default:
           return {
             message: `{${token.name}}`,
@@ -104,10 +96,7 @@ class ICUMessageFormat {
         jsxElements
       };
     }
-
     throw new Error(`Unknown token type ${token.type}`);
   }
-
 }
-
 exports.default = ICUMessageFormat;

package/build/index.d.ts

@@ -77,9 +77,7 @@ export function t(
  * const message = t(i18n)({ message: `Hello ${name}` });
  * ```
  */
-export function t(
-  i18n: I18n
-): {
+export function t(i18n: I18n): {
   (literals: TemplateStringsArray, ...placeholders: any[]): string
   (descriptor: MessageDescriptor): string
 }

package/build/index.js

@@ -4,23 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _babelPluginMacros = require("babel-plugin-macros");
-
 var _conf = require("@lingui/conf");
-
 var _macroJs = _interopRequireDefault(require("./macroJs"));
-
 var _macroJsx = _interopRequireDefault(require("./macroJsx"));
-
 var _types = require("@babel/types");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const config = (0, _conf.getConfig)({
   configPath: process.env.LINGUI_CONFIG
 });
-
 const getSymbolSource = name => {
   if (Array.isArray(config.runtimeConfigModule)) {
     if (name === "i18n") {
@@ -36,10 +28,10 @@ const getSymbolSource = name => {
     }
   }
 };
-
 const [i18nImportModule, i18nImportName = "i18n"] = getSymbolSource("i18n");
 const [TransImportModule, TransImportName = "Trans"] = getSymbolSource("Trans");
-
+const jsMacroTags = new Set(["defineMessage", "arg", "t", "plural", "select", "selectOrdinal"]);
+const jsxMacroTags = new Set(["Trans", "Plural", "Select", "SelectOrdinal"]);
 function macro({
   references,
   state,
@@ -50,21 +42,17 @@ function macro({
   let needsI18nImport = false;
   Object.keys(references).forEach(tagName => {
     const nodes = references[tagName];
-    const macroType = getMacroType(tagName);
-
-    if (macroType == null) {
-      throw nodes[0].buildCodeFrameError(`Unknown macro ${tagName}`);
-    }
-
-    if (macroType === "js") {
+    if (jsMacroTags.has(tagName)) {
       nodes.forEach(node => {
         jsNodes.push(node.parentPath);
       });
-    } else {
+    } else if (jsxMacroTags.has(tagName)) {
       nodes.forEach(node => {
         // identifier.openingElement.jsxElement
         jsxNodes.push(node.parentPath.parentPath);
       });
+    } else {
+      throw nodes[0].buildCodeFrameError(`Unknown macro ${tagName}`);
     }
   });
   jsNodes.filter(isRootPath(jsNodes)).forEach(path => {
@@ -79,30 +67,27 @@ function macro({
     const macro = new _macroJsx.default(babel);
     macro.replacePath(path);
   });
-
   if (needsI18nImport) {
     addImport(babel, state, i18nImportModule, i18nImportName);
   }
-
   if (jsxNodes.length) {
     addImport(babel, state, TransImportModule, TransImportName);
   }
-
   if (process.env.LINGUI_EXTRACT === "1") {
     return {
       keepImports: true
     };
   }
 }
-
 function addImport(babel, state, module, importName) {
   const {
     types: t
   } = babel;
-  const linguiImport = state.file.path.node.body.find(importNode => t.isImportDeclaration(importNode) && importNode.source.value === module && // https://github.com/lingui/js-lingui/issues/777
+  const linguiImport = state.file.path.node.body.find(importNode => t.isImportDeclaration(importNode) && importNode.source.value === module &&
+  // https://github.com/lingui/js-lingui/issues/777
   importNode.importKind !== "type");
-  const tIdentifier = t.identifier(importName); // Handle adding the import or altering the existing import
-
+  const tIdentifier = t.identifier(importName);
+  // Handle adding the import or altering the existing import
   if (linguiImport) {
     if (linguiImport.specifiers.findIndex(specifier => (0, _types.isImportSpecifier)(specifier) && (0, _types.isIdentifier)(specifier.imported, {
       name: importName
@@ -113,7 +98,6 @@ function addImport(babel, state, module, importName) {
     state.file.path.node.body.unshift(t.importDeclaration([t.importSpecifier(tIdentifier, tIdentifier)], t.stringLiteral(module)));
   }
 }
-
 function isRootPath(allPath) {
   return node => function traverse(path) {
     if (!path.parentPath) {
@@ -123,9 +107,7 @@ function isRootPath(allPath) {
     }
   }(node);
 }
-
 const alreadyVisitedCache = new WeakSet();
-
 const alreadyVisited = path => {
   if (alreadyVisitedCache.has(path)) {
     return true;
@@ -134,25 +116,12 @@ const alreadyVisited = path => {
     return false;
   }
 };
-
-function getMacroType(tagName) {
-  switch (tagName) {
-    case "defineMessage":
-    case "arg":
-    case "t":
-    case "plural":
-    case "select":
-    case "selectOrdinal":
-      return "js";
-
-    case "Trans":
-    case "Plural":
-    case "Select":
-    case "SelectOrdinal":
-      return "jsx";
-  }
-}
-
+[...jsMacroTags, ...jsxMacroTags].forEach(name => {
+  Object.defineProperty(module.exports, name, {
+    get() {
+      throw new Error(`The macro you imported from "@lingui/macro" is being executed outside the context of compilation with babel-plugin-macros. ` + `This indicates that you don't have the babel plugin "babel-plugin-macros" configured correctly. ` + `Please see the documentation for how to configure babel-plugin-macros properly: ` + "https://github.com/kentcdodds/babel-plugin-macros/blob/main/other/docs/user.md");
+    }
+  });
+});
 var _default = (0, _babelPluginMacros.createMacro)(macro);
-
 exports.default = _default;

package/build/macroJs.js

@@ -4,36 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var R = _interopRequireWildcard(require("ramda"));
-
 var _types = require("@babel/types");
-
 var _icu = _interopRequireDefault(require("./icu"));
-
 var _utils = require("./utils");
-
 var _constants = require("./constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const keepSpaceRe = /(?:\\(?:\r\n|\r|\n))+\s+/g;
 const keepNewLineRe = /(?:\r\n|\r|\n)+\s+/g;
-
 function normalizeWhitespace(text) {
   return text.replace(keepSpaceRe, " ").replace(keepNewLineRe, "\n").trim();
 }
-
 class MacroJs {
   // Babel Types
+
   // Identifier of i18n object
+
   // Positional expressions counter (e.g. for placeholders `Hello {0}, today is {1}`)
   _expressionIndex = (0, _utils.makeCounter)();
-
   constructor({
     types
   }, {
@@ -42,36 +32,34 @@ class MacroJs {
     this.types = types;
     this.i18nImportName = i18nImportName;
   }
-
   replacePathWithMessage = (path, {
     message,
     values
   }, linguiInstance) => {
     const args = [];
     args.push(isString(message) ? this.types.stringLiteral(message) : message);
-
     if (Object.keys(values).length) {
       const valuesObject = Object.keys(values).map(key => this.types.objectProperty(this.types.identifier(key), values[key]));
       args.push(this.types.objectExpression(valuesObject));
     }
+    const newNode = this.types.callExpression(this.types.memberExpression(linguiInstance ?? this.types.identifier(this.i18nImportName), this.types.identifier("_")), args);
 
-    const newNode = this.types.callExpression(this.types.memberExpression(linguiInstance ?? this.types.identifier(this.i18nImportName), this.types.identifier("_")), args); // preserve line number
-
+    // preserve line number
     newNode.loc = path.node.loc;
     path.addComment("leading", _constants.EXTRACT_MARK);
     path.replaceWith(newNode);
-  }; // Returns a boolean indicating if the replacement requires i18n import
+  };
 
+  // Returns a boolean indicating if the replacement requires i18n import
   replacePath = path => {
     // reset the expression counter
     this._expressionIndex = (0, _utils.makeCounter)();
-
     if (this.isDefineMessage(path.node)) {
       this.replaceDefineMessage(path);
       return true;
-    } // t(i18nInstance)`Message` -> i18nInstance._('Message')
-
+    }
 
+    // t(i18nInstance)`Message` -> i18nInstance._('Message')
     if (this.types.isCallExpression(path.node) && this.types.isTaggedTemplateExpression(path.parentPath.node) && this.types.isIdentifier(path.node.arguments[0]) && this.isIdentifier(path.node.callee, "t")) {
       // Use the first argument as i18n instance instead of the default i18n instance
       const i18nInstance = path.node.arguments[0];
@@ -87,20 +75,18 @@ class MacroJs {
         values
       }, i18nInstance);
       return false;
-    } // t(i18nInstance)(messageDescriptor) -> i18nInstance._(messageDescriptor)
-
+    }
 
+    // t(i18nInstance)(messageDescriptor) -> i18nInstance._(messageDescriptor)
     if (this.types.isCallExpression(path.node) && this.types.isCallExpression(path.parentPath.node) && this.types.isIdentifier(path.node.arguments[0]) && this.isIdentifier(path.node.callee, "t")) {
       const i18nInstance = path.node.arguments[0];
       this.replaceTAsFunction(path.parentPath, i18nInstance);
       return false;
     }
-
     if (this.types.isCallExpression(path.node) && this.isIdentifier(path.node.callee, "t")) {
       this.replaceTAsFunction(path);
       return true;
     }
-
     const tokens = this.tokenizeNode(path.node);
     const messageFormat = new _icu.default();
     const {
@@ -114,6 +100,7 @@ class MacroJs {
     });
     return true;
   };
+
   /**
    * macro `defineMessage` is called with MessageDescriptor. The only
    * thing that happens is that any macros used in `message` property
@@ -135,23 +122,23 @@ class MacroJs {
    * }
    *
    */
-
   replaceDefineMessage = path => {
     // reset the expression counter
     this._expressionIndex = (0, _utils.makeCounter)();
-    const descriptor = this.processDescriptor(path.node.arguments[0]);
+    let descriptor = this.processDescriptor(path.node.arguments[0]);
     path.replaceWith(descriptor);
   };
+
   /**
    * macro `t` is called with MessageDescriptor, after that
    * we create a new node to append it to i18n._
    */
-
   replaceTAsFunction = (path, linguiInstance) => {
-    const descriptor = this.processDescriptor(path.node.arguments[0]);
+    let descriptor = this.processDescriptor(path.node.arguments[0]);
     const newNode = this.types.callExpression(this.types.memberExpression(linguiInstance ?? this.types.identifier(this.i18nImportName), this.types.identifier("_")), [descriptor]);
     path.replaceWith(newNode);
   };
+
   /**
    * `processDescriptor` expand macros inside message descriptor.
    * Message descriptor is used in `defineMessage`.
@@ -169,23 +156,21 @@ class MacroJs {
    * }
    *
    */
-
   processDescriptor = descriptor_ => {
     const descriptor = descriptor_;
     this.types.addComment(descriptor, "leading", _constants.EXTRACT_MARK);
     const messageIndex = descriptor.properties.findIndex(property => (0, _types.isObjectProperty)(property) && this.isIdentifier(property.key, _constants.MESSAGE));
-
     if (messageIndex === -1) {
       return descriptor;
-    } // if there's `message` property, replace macros with formatted message
+    }
 
+    // if there's `message` property, replace macros with formatted message
+    const node = descriptor.properties[messageIndex];
 
-    const node = descriptor.properties[messageIndex]; // Inside message descriptor the `t` macro in `message` prop is optional.
+    // Inside message descriptor the `t` macro in `message` prop is optional.
     // Template strings are always processed as if they were wrapped by `t`.
-
     const tokens = this.types.isTemplateLiteral(node.value) ? this.tokenizeTemplateLiteral(node.value) : this.tokenizeNode(node.value, true);
     let messageNode = node.value;
-
     if (tokens != null) {
       const messageFormat = new _icu.default();
       const {
@@ -195,11 +180,14 @@ class MacroJs {
       const message = normalizeWhitespace(messageRaw);
       messageNode = this.types.stringLiteral(message);
       this.addValues(descriptor.properties, values);
-    } // Don't override custom ID
-
+    }
 
+    // Don't override custom ID
     const hasId = descriptor.properties.findIndex(property => (0, _types.isObjectProperty)(property) && this.isIdentifier(property.key, _constants.ID)) !== -1;
     descriptor.properties[messageIndex] = this.types.objectProperty(this.types.identifier(hasId ? _constants.MESSAGE : _constants.ID), messageNode);
+    if (process.env.NODE_ENV === "production") {
+      descriptor.properties = descriptor.properties.filter(property => (0, _types.isObjectProperty)(property) && !this.isIdentifier(property.key, _constants.MESSAGE) && (0, _types.isObjectProperty)(property) && !this.isIdentifier(property.key, _constants.COMMENT));
+    }
     return descriptor;
   };
   addValues = (obj, values) => {
@@ -213,19 +201,20 @@ class MacroJs {
       return this.tokenizeTemplateLiteral(node);
     } else if (this.isChoiceMethod(node)) {
       // plural, select and selectOrdinal
-      return [this.tokenizeChoiceComponent(node)]; // } else if (isFormatMethod(node.callee)) {
+      return [this.tokenizeChoiceComponent(node)];
+      // } else if (isFormatMethod(node.callee)) {
       //   // date, number
       //   return transformFormatMethod(node, file, props, root)
     } else if (!ignoreExpression) {
       return this.tokenizeExpression(node);
     }
   };
+
   /**
    * `node` is a TemplateLiteral. node.quasi contains
    * text chunks and node.expressions contains expressions.
    * Both arrays must be zipped together to get the final list of tokens.
    */
-
   tokenizeTemplateLiteral = node => {
     const tokenize = R.pipe(R.evolve({
       quasis: R.map(text => {
@@ -246,30 +235,29 @@ class MacroJs {
   };
   tokenizeChoiceComponent = node => {
     const format = node.callee.name.toLowerCase();
-    const token = { ...this.tokenizeExpression(node.arguments[0]),
+    const token = {
+      ...this.tokenizeExpression(node.arguments[0]),
       format,
       options: {
         offset: undefined
       }
     };
     const props = node.arguments[1].properties;
-
     for (const attr of props) {
       const {
         key,
         value: attrValue
-      } = attr; // name is either:
+      } = attr;
+
+      // name is either:
       // NumericLiteral => convert to `={number}`
       // StringLiteral => key.value
       // Identifier => key.name
-
       const name = this.types.isNumericLiteral(key) ? `=${key.value}` : key.name || key.value;
-
       if (format !== "select" && name === "offset") {
         token.options.offset = attrValue.value;
       } else {
         let value;
-
         if (this.types.isTemplateLiteral(attrValue)) {
           value = this.tokenizeTemplateLiteral(attrValue);
         } else if (this.types.isCallExpression(attrValue)) {
@@ -277,11 +265,9 @@ class MacroJs {
         } else {
           value = attrValue.value;
         }
-
         token.options[name] = value;
       }
     }
-
     return token;
   };
   tokenizeExpression = node => {
@@ -292,7 +278,6 @@ class MacroJs {
         value: undefined
       };
     }
-
     return {
       type: "arg",
       name: this.expressionToArgument(node),
@@ -308,19 +293,18 @@ class MacroJs {
       return String(this._expressionIndex());
     }
   };
+
   /**
    * We clean '//\` ' to just '`'
    */
-
   clearBackslashes(value) {
     // if not we replace the extra scaped literals
     return value.replace(/\\`/g, "`");
   }
+
   /**
    * Custom matchers
    */
-
-
   isIdentifier = (node, name) => {
     return this.types.isIdentifier(node, {
       name
@@ -339,7 +323,5 @@ class MacroJs {
     return this.types.isCallExpression(node) && (this.isIdentifier(node.callee, "plural") || this.isIdentifier(node.callee, "select") || this.isIdentifier(node.callee, "selectOrdinal"));
   };
 }
-
 exports.default = MacroJs;
-
 const isString = s => typeof s === "string";

package/build/macroJsx.js

@@ -3,32 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeWhitespace = normalizeWhitespace;
 exports.default = void 0;
-
+exports.normalizeWhitespace = normalizeWhitespace;
 var R = _interopRequireWildcard(require("ramda"));
-
 var _icu = _interopRequireDefault(require("./icu"));
-
 var _utils = require("./utils");
-
 var _constants = require("./constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const pluralRuleRe = /(_[\d\w]+|zero|one|two|few|many|other)/;
+const jsx2icuExactChoice = value => value.replace(/_(\d+)/, "=$1").replace(/_(\w+)/, "$1");
 
-const jsx2icuExactChoice = value => value.replace(/_(\d+)/, "=$1").replace(/_(\w+)/, "$1"); // replace whitespace before/after newline with single space
-
-
-const keepSpaceRe = /\s*(?:\r\n|\r|\n)+\s*/g; // remove whitespace before/after tag or expression
-
+// replace whitespace before/after newline with single space
+const keepSpaceRe = /\s*(?:\r\n|\r|\n)+\s*/g;
+// remove whitespace before/after tag or expression
 const stripAroundTagsRe = /(?:([>}])(?:\r\n|\r|\n)+\s*|(?:\r\n|\r|\n)+\s*(?=[<{]))/g;
-
 function maybeNodeValue(node) {
   if (!node) return null;
   if (node.type === "StringLiteral") return node.value;
@@ -37,23 +27,21 @@ function maybeNodeValue(node) {
   if (node.type === "TemplateLiteral" && node.expressions.length === 0) return node.quasis[0].value.raw;
   return null;
 }
-
 function normalizeWhitespace(text) {
-  return text.replace(stripAroundTagsRe, "$1").replace(keepSpaceRe, " ") // keep escaped newlines
-  .replace(/\\n/g, "\n").replace(/\\s/g, " ") // we remove trailing whitespace inside Plural
+  return text.replace(stripAroundTagsRe, "$1").replace(keepSpaceRe, " ")
+  // keep escaped newlines
+  .replace(/\\n/g, "\n").replace(/\\s/g, " ")
+  // we remove trailing whitespace inside Plural
   .replace(/(\s+})/gm, "}").trim();
 }
-
 class MacroJSX {
   expressionIndex = (0, _utils.makeCounter)();
   elementIndex = (0, _utils.makeCounter)();
-
   constructor({
     types
   }) {
     this.types = types;
   }
-
   safeJsxAttribute = (name, value) => {
     // This handles quoted JSX attributes and html entities.
     return this.types.jsxAttribute(this.types.jsxIdentifier(name), this.types.jsxExpressionContainer(this.types.stringLiteral(value)));
@@ -73,14 +61,12 @@ class MacroJSX {
       comment,
       context
     } = this.stripMacroAttributes(path.node);
-
     if (!id && !message) {
       return;
     } else if (id && id !== message) {
       // If `id` prop already exists and generated ID is different,
       // add it as a `default` prop
       attributes.push(this.types.jsxAttribute(this.types.jsxIdentifier(_constants.ID), this.types.stringLiteral(id)));
-
       if (process.env.NODE_ENV !== "production") {
         if (message) {
           attributes.push(this.safeJsxAttribute(_constants.MESSAGE, message));
@@ -89,38 +75,26 @@ class MacroJSX {
     } else {
       attributes.push(this.safeJsxAttribute(_constants.ID, message));
     }
-
     if (process.env.NODE_ENV !== "production") {
       if (comment) {
         attributes.push(this.types.jsxAttribute(this.types.jsxIdentifier(_constants.COMMENT), this.types.stringLiteral(comment)));
       }
     }
-
     if (context) {
       attributes.push(this.types.jsxAttribute(this.types.jsxIdentifier(_constants.CONTEXT), this.types.stringLiteral(context)));
-    } // Parameters for variable substitution
-
+    }
 
+    // Parameters for variable substitution
     const valuesObject = Object.keys(values).map(key => this.types.objectProperty(this.types.identifier(key), values[key]));
-
     if (valuesObject.length) {
       attributes.push(this.types.jsxAttribute(this.types.jsxIdentifier("values"), this.types.jsxExpressionContainer(this.types.objectExpression(valuesObject))));
-    } // Inline elements
-
+    }
 
+    // Inline elements
     if (Object.keys(jsxElements).length) {
       attributes.push(this.types.jsxAttribute(this.types.jsxIdentifier("components"), this.types.jsxExpressionContainer(this.types.objectExpression(Object.keys(jsxElements).map(key => this.types.objectProperty(this.types.identifier(key), jsxElements[key]))))));
     }
-
-    const newNode = this.types.jsxElement(this.types.jsxOpeningElement(this.types.jsxIdentifier("Trans"), attributes,
-    /*selfClosing*/
-    true),
-    /*closingElement*/
-    null,
-    /*children*/
-    [],
-    /*selfClosing*/
-    true);
+    const newNode = this.types.jsxElement(this.types.jsxOpeningElement(this.types.jsxIdentifier("Trans"), attributes, /*selfClosing*/true), /*closingElement*/null, /*children*/[], /*selfClosing*/true);
     newNode.loc = path.node.loc;
     path.replaceWith(newNode);
   };
@@ -140,12 +114,11 @@ class MacroJSX {
     const comment = attributes.filter(this.attrName([_constants.COMMENT]))[0];
     const context = attributes.filter(this.attrName([_constants.CONTEXT]))[0];
     let reserved = [_constants.ID, _constants.MESSAGE, _constants.COMMENT, _constants.CONTEXT];
-
-    if (this.isI18nComponent(node)) {// no reserved prop names
+    if (this.isI18nComponent(node)) {
+      // no reserved prop names
     } else if (this.isChoiceComponent(node)) {
       reserved = [...reserved, "_\\w+", "_\\d+", "zero", "one", "two", "few", "many", "other", "value", "offset"];
     }
-
     return {
       id: maybeNodeValue(id),
       message: maybeNodeValue(message),
@@ -173,7 +146,6 @@ class MacroJSX {
   tokenizeChildren = node => {
     if (this.types.isJSXExpressionContainer(node)) {
       const exp = node.expression;
-
       if (this.types.isStringLiteral(exp)) {
         // Escape forced newlines to keep them in message.
         return {
@@ -181,7 +153,8 @@ class MacroJSX {
           value: exp.value.replace(/\n/g, "\\n")
         };
       } else if (this.types.isTemplateLiteral(exp)) {
-        const tokenize = R.pipe( // Don"t output tokens without text.
+        const tokenize = R.pipe(
+        // Don"t output tokens without text.
         R.evolve({
           quasis: R.map(text => {
             // if it's an unicode we keep the cooked value because it's the parsed value by babel (without unicode chars)
@@ -201,17 +174,20 @@ class MacroJSX {
       }
     } else if (this.types.isJSXElement(node)) {
       return this.tokenizeNode(node);
-    } else if (this.types.isJSXSpreadChild(node)) {// just do nothing
+    } else if (this.types.isJSXSpreadChild(node)) {
+      // just do nothing
     } else if (this.types.isJSXText(node)) {
       return this.tokenizeText(node.value);
-    } else {// impossible path
+    } else {
+      // impossible path
       // return this.tokenizeText(node.value)
     }
   };
   tokenizeChoiceComponent = node => {
     const element = node.openingElement;
     const format = this.getJsxTagName(node).toLowerCase();
-    const props = element.attributes.filter(this.attrName([_constants.ID, _constants.COMMENT, _constants.MESSAGE, _constants.CONTEXT, "key", // we remove <Trans /> react props that are not useful for translation
+    const props = element.attributes.filter(this.attrName([_constants.ID, _constants.COMMENT, _constants.MESSAGE, _constants.CONTEXT, "key",
+    // we remove <Trans /> react props that are not useful for translation
     "render", "component", "components"], true));
     const token = {
       type: "arg",
@@ -222,18 +198,14 @@ class MacroJSX {
         offset: undefined
       }
     };
-
     for (const attr of props) {
       if (this.types.isJSXSpreadAttribute(attr)) {
         continue;
       }
-
       if (this.types.isJSXNamespacedName(attr.name)) {
         continue;
       }
-
       const name = attr.name.name;
-
       if (name === "value") {
         const exp = this.types.isLiteral(attr.value) ? attr.value : attr.value.expression;
         token.name = this.expressionToArgument(exp);
@@ -243,13 +215,11 @@ class MacroJSX {
         token.options.offset = this.types.isStringLiteral(attr.value) ? attr.value.value : attr.value.expression.value;
       } else {
         let value;
-
         if (this.types.isStringLiteral(attr.value)) {
           value = attr.value.extra.raw.replace(/(["'])(.*)\1/, "$2");
         } else {
           value = this.tokenizeChildren(attr.value);
         }
-
         if (pluralRuleRe.test(name)) {
           token.options[jsx2icuExactChoice(name)] = value;
         } else {
@@ -257,7 +227,6 @@ class MacroJSX {
         }
       }
     }
-
     return token;
   };
   tokenizeElement = node => {
@@ -287,24 +256,21 @@ class MacroJSX {
       value
     };
   };
-
   expressionToArgument(exp) {
     return this.types.isIdentifier(exp) ? exp.name : String(this.expressionIndex());
   }
+
   /**
    * We clean '//\` ' to just '`'
    **/
-
-
   clearBackslashes(value) {
     // if not we replace the extra scaped literals
     return value.replace(/\\`/g, "`");
   }
+
   /**
    * Custom matchers
    */
-
-
   isIdentifier = (node, name) => {
     return this.types.isIdentifier(node, {
       name
@@ -324,5 +290,4 @@ class MacroJSX {
     }
   };
 }
-
 exports.default = MacroJSX;

package/build/utils.js

@@ -3,15 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.zip = zip;
 exports.makeCounter = void 0;
-
+exports.zip = zip;
 var R = _interopRequireWildcard(require("ramda"));
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
  * Custom zip method which takes length of the larger array
  * (usually zip functions use the `smaller` length, discarding values in larger array)
@@ -19,7 +15,5 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 function zip(a, b) {
   return R.range(0, Math.max(a.length, b.length)).map(index => [a[index], b[index]]);
 }
-
 const makeCounter = (index = 0) => () => index++;
-
 exports.makeCounter = makeCounter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/macro",
-  "version": "3.16.1",
+  "version": "3.17.1",
   "description": "Macro for generating messages in ICU MessageFormat syntax",
   "main": "./build/index.js",
   "author": {
@@ -27,8 +27,9 @@
     "build/"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.11.2",
-    "@lingui/conf": "3.16.1",
+    "@babel/runtime": "^7.20.13",
+    "@babel/types": "^7.20.7",
+    "@lingui/conf": "3.17.1",
     "ramda": "^0.27.1"
   },
   "peerDependencies": {
@@ -39,5 +40,5 @@
   "devDependencies": {
     "@types/babel-plugin-macros": "^2.8.5"
   },
-  "gitHead": "bae762a1ef15d0a4d883bc8c1837603b4e79175e"
+  "gitHead": "76ef4e8d1c668578ce2c3829ebf35d22ca5e679c"
 }