@lingui/macro 4.4.2 → 4.6.0

package/dist/index.cjs

@@ -99,6 +99,12 @@ const COMMENT = "comment";
 const EXTRACT_MARK = "i18n";
 const CONTEXT = "context";
 
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => {
+  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 const keepSpaceRe$1 = /(?:\\(?:\r\n|\r|\n))+\s+/g;
 const keepNewLineRe = /(?:\r\n|\r|\n)+\s+/g;
 function normalizeWhitespace$1(text) {
@@ -111,17 +117,24 @@ function buildICUFromTokens(tokens) {
 }
 class MacroJs {
   constructor({ types }, opts) {
+    // Babel Types
+    __publicField$1(this, "types");
+    // Identifier of i18n object
+    __publicField$1(this, "i18nImportName");
+    __publicField$1(this, "stripNonEssentialProps");
+    __publicField$1(this, "nameMap");
+    __publicField$1(this, "nameMapReversed");
     // Positional expressions counter (e.g. for placeholders `Hello {0}, today is {1}`)
-    this._expressionIndex = makeCounter();
-    this.replacePathWithMessage = (path, tokens, linguiInstance) => {
+    __publicField$1(this, "_expressionIndex", makeCounter());
+    __publicField$1(this, "replacePathWithMessage", (path, tokens, linguiInstance) => {
       const newNode = this.createI18nCall(
         this.createMessageDescriptorFromTokens(tokens, path.node.loc),
         linguiInstance
       );
       path.replaceWith(newNode);
-    };
+    });
     // Returns a boolean indicating if the replacement requires i18n import
-    this.replacePath = (path) => {
+    __publicField$1(this, "replacePath", (path) => {
       this._expressionIndex = makeCounter();
       if (this.types.isCallExpression(path.node) && this.isDefineMessage(path.node.callee)) {
         let descriptor = this.processDescriptor(path.node.arguments[0]);
@@ -158,15 +171,15 @@ class MacroJs {
       const tokens = this.tokenizeNode(path.node);
       this.replacePathWithMessage(path, tokens);
       return true;
-    };
+    });
     /**
      * macro `t` is called with MessageDescriptor, after that
      * we create a new node to append it to i18n._
      */
-    this.replaceTAsFunction = (path, linguiInstance) => {
+    __publicField$1(this, "replaceTAsFunction", (path, linguiInstance) => {
       const descriptor = this.processDescriptor(path.node.arguments[0]);
       path.replaceWith(this.createI18nCall(descriptor, linguiInstance));
-    };
+    });
     /**
      * `processDescriptor` expand macros inside message descriptor.
      * Message descriptor is used in `defineMessage`.
@@ -185,7 +198,7 @@ class MacroJs {
      * }
      *
      */
-    this.processDescriptor = (descriptor_) => {
+    __publicField$1(this, "processDescriptor", (descriptor_) => {
       const descriptor = descriptor_;
       const messageProperty = this.getObjectPropertyByKey(descriptor, MESSAGE);
       const idProperty = this.getObjectPropertyByKey(descriptor, ID);
@@ -216,7 +229,7 @@ class MacroJs {
         properties.push(this.getObjectPropertyByKey(descriptor, COMMENT));
       }
       return this.createMessageDescriptor(properties, descriptor.loc);
-    };
+    });
     this.types = types;
     this.i18nImportName = opts.i18nImportName;
     this.stripNonEssentialProps = opts.stripNonEssentialProps;
@@ -267,15 +280,11 @@ class MacroJs {
       if (currExp) {
         argTokens = this.types.isCallExpression(currExp) ? this.tokenizeNode(currExp) : [this.tokenizeExpression(currExp)];
       }
-      return [
-        ...value ? [
-          {
-            type: "text",
-            value: this.clearBackslashes(value)
-          }
-        ] : [],
-        ...argTokens
-      ];
+      const textToken = {
+        type: "text",
+        value: this.clearBackslashes(value)
+      };
+      return [...value ? [textToken] : [], ...argTokens];
     });
   }
   tokenizeChoiceComponent(node) {
@@ -403,6 +412,12 @@ class MacroJs {
   }
 }
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 const pluralRuleRe = /(_[\d\w]+|zero|one|two|few|many|other)/;
 const jsx2icuExactChoice = (value) => value.replace(/_(\d+)/, "=$1").replace(/_(\w+)/, "$1");
 const keepSpaceRe = /\s*(?:\r\n|\r|\n)+\s*/g;
@@ -425,15 +440,19 @@ function normalizeWhitespace(text) {
 }
 class MacroJSX {
   constructor({ types }, opts) {
-    this.expressionIndex = makeCounter();
-    this.elementIndex = makeCounter();
-    this.createStringJsxAttribute = (name, value) => {
+    __publicField(this, "types");
+    __publicField(this, "expressionIndex", makeCounter());
+    __publicField(this, "elementIndex", makeCounter());
+    __publicField(this, "stripNonEssentialProps");
+    __publicField(this, "nameMap");
+    __publicField(this, "nameMapReversed");
+    __publicField(this, "createStringJsxAttribute", (name, value) => {
       return this.types.jsxAttribute(
         this.types.jsxIdentifier(name),
         this.types.jsxExpressionContainer(this.types.stringLiteral(value))
       );
-    };
-    this.replacePath = (path) => {
+    });
+    __publicField(this, "replacePath", (path) => {
       if (!path.isJSXElement()) {
         return path;
       }
@@ -526,15 +545,15 @@ class MacroJSX {
       );
       newNode.loc = path.node.loc;
       path.replaceWith(newNode);
-    };
-    this.attrName = (names, exclude = false) => {
+    });
+    __publicField(this, "attrName", (names, exclude = false) => {
       const namesRe = new RegExp("^(" + names.join("|") + ")$");
       return (attr) => {
         const name = attr.name.name;
         return exclude ? !namesRe.test(name) : namesRe.test(name);
       };
-    };
-    this.stripMacroAttributes = (path) => {
+    });
+    __publicField(this, "stripMacroAttributes", (path) => {
       const { attributes } = path.node.openingElement;
       const id = attributes.find(this.attrName([ID]));
       const message = attributes.find(this.attrName([MESSAGE]));
@@ -563,8 +582,8 @@ class MacroJSX {
         context: maybeNodeValue(context),
         attributes: attributes.filter(this.attrName(reserved, true))
       };
-    };
-    this.tokenizeNode = (path) => {
+    });
+    __publicField(this, "tokenizeNode", (path) => {
       if (this.isTransComponent(path)) {
         return this.tokenizeTrans(path);
       } else if (this.isChoiceComponent(path)) {
@@ -574,11 +593,11 @@ class MacroJSX {
       } else {
         return [this.tokenizeExpression(path)];
       }
-    };
-    this.tokenizeTrans = (path) => {
+    });
+    __publicField(this, "tokenizeTrans", (path) => {
       return path.get("children").flatMap((child) => this.tokenizeChildren(child)).filter(Boolean);
-    };
-    this.tokenizeChildren = (path) => {
+    });
+    __publicField(this, "tokenizeChildren", (path) => {
       if (path.isJSXExpressionContainer()) {
         const exp = path.get("expression");
         if (exp.isStringLiteral()) {
@@ -599,8 +618,8 @@ class MacroJSX {
       } else if (path.isJSXSpreadChild()) ; else if (path.isJSXText()) {
         return [this.tokenizeText(path.node.value)];
       } else ;
-    };
-    this.tokenizeChoiceComponent = (path) => {
+    });
+    __publicField(this, "tokenizeChoiceComponent", (path) => {
       const element = path.get("openingElement");
       const name = this.getJsxTagName(path.node);
       const format = (this.nameMapReversed.get(name) || name).toLowerCase();
@@ -665,8 +684,8 @@ class MacroJSX {
         }
       }
       return token;
-    };
-    this.tokenizeElement = (path) => {
+    });
+    __publicField(this, "tokenizeElement", (path) => {
       const name = this.elementIndex();
       return {
         type: "element",
@@ -681,15 +700,15 @@ class MacroJSX {
         },
         children: this.tokenizeTrans(path)
       };
-    };
-    this.tokenizeExpression = (path) => {
+    });
+    __publicField(this, "tokenizeExpression", (path) => {
       return {
         type: "arg",
         name: this.expressionToArgument(path),
         value: path.node
       };
-    };
-    this.tokenizeConditionalExpression = (exp) => {
+    });
+    __publicField(this, "tokenizeConditionalExpression", (exp) => {
       exp.traverse({
         JSXElement: (el) => {
           if (this.isTransComponent(el) || this.isChoiceComponent(el)) {
@@ -703,29 +722,29 @@ class MacroJSX {
         name: this.expressionToArgument(exp),
         value: exp.node
       };
-    };
-    this.tokenizeText = (value) => {
+    });
+    __publicField(this, "tokenizeText", (value) => {
       return {
         type: "text",
         value
       };
-    };
-    this.isLinguiComponent = (path, name) => {
+    });
+    __publicField(this, "isLinguiComponent", (path, name) => {
       return path.isJSXElement() && this.types.isJSXIdentifier(path.node.openingElement.name, {
         name: this.nameMap.get(name) || name
       });
-    };
-    this.isTransComponent = (path) => {
+    });
+    __publicField(this, "isTransComponent", (path) => {
       return this.isLinguiComponent(path, "Trans");
-    };
-    this.isChoiceComponent = (path) => {
+    });
+    __publicField(this, "isChoiceComponent", (path) => {
       return this.isLinguiComponent(path, "Plural") || this.isLinguiComponent(path, "Select") || this.isLinguiComponent(path, "SelectOrdinal");
-    };
-    this.getJsxTagName = (node) => {
+    });
+    __publicField(this, "getJsxTagName", (node) => {
       if (this.types.isJSXIdentifier(node.openingElement.name)) {
         return node.openingElement.name.name;
       }
-    };
+    });
     this.types = types;
     this.stripNonEssentialProps = opts.stripNonEssentialProps;
     this.nameMap = opts.nameMap;

package/dist/index.d.cts

@@ -0,0 +1,9 @@
+import { LinguiConfigNormalized } from '@lingui/conf';
+
+type LinguiMacroOpts = {
+    extract?: boolean;
+    linguiConfig?: LinguiConfigNormalized;
+};
+declare const _default: any;
+
+export { type LinguiMacroOpts, _default as default };

package/dist/index.d.mts

@@ -0,0 +1,9 @@
+import { LinguiConfigNormalized } from '@lingui/conf';
+
+type LinguiMacroOpts = {
+    extract?: boolean;
+    linguiConfig?: LinguiConfigNormalized;
+};
+declare const _default: any;
+
+export { type LinguiMacroOpts, _default as default };

package/dist/index.d.ts

@@ -6,4 +6,4 @@ type LinguiMacroOpts = {
 };
 declare const _default: any;
 
-export { LinguiMacroOpts, _default as default };
+export { type LinguiMacroOpts, _default as default };

package/dist/index.mjs

@@ -97,6 +97,12 @@ const COMMENT = "comment";
 const EXTRACT_MARK = "i18n";
 const CONTEXT = "context";
 
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => {
+  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 const keepSpaceRe$1 = /(?:\\(?:\r\n|\r|\n))+\s+/g;
 const keepNewLineRe = /(?:\r\n|\r|\n)+\s+/g;
 function normalizeWhitespace$1(text) {
@@ -109,17 +115,24 @@ function buildICUFromTokens(tokens) {
 }
 class MacroJs {
   constructor({ types }, opts) {
+    // Babel Types
+    __publicField$1(this, "types");
+    // Identifier of i18n object
+    __publicField$1(this, "i18nImportName");
+    __publicField$1(this, "stripNonEssentialProps");
+    __publicField$1(this, "nameMap");
+    __publicField$1(this, "nameMapReversed");
     // Positional expressions counter (e.g. for placeholders `Hello {0}, today is {1}`)
-    this._expressionIndex = makeCounter();
-    this.replacePathWithMessage = (path, tokens, linguiInstance) => {
+    __publicField$1(this, "_expressionIndex", makeCounter());
+    __publicField$1(this, "replacePathWithMessage", (path, tokens, linguiInstance) => {
       const newNode = this.createI18nCall(
         this.createMessageDescriptorFromTokens(tokens, path.node.loc),
         linguiInstance
       );
       path.replaceWith(newNode);
-    };
+    });
     // Returns a boolean indicating if the replacement requires i18n import
-    this.replacePath = (path) => {
+    __publicField$1(this, "replacePath", (path) => {
       this._expressionIndex = makeCounter();
       if (this.types.isCallExpression(path.node) && this.isDefineMessage(path.node.callee)) {
         let descriptor = this.processDescriptor(path.node.arguments[0]);
@@ -156,15 +169,15 @@ class MacroJs {
       const tokens = this.tokenizeNode(path.node);
       this.replacePathWithMessage(path, tokens);
       return true;
-    };
+    });
     /**
      * macro `t` is called with MessageDescriptor, after that
      * we create a new node to append it to i18n._
      */
-    this.replaceTAsFunction = (path, linguiInstance) => {
+    __publicField$1(this, "replaceTAsFunction", (path, linguiInstance) => {
       const descriptor = this.processDescriptor(path.node.arguments[0]);
       path.replaceWith(this.createI18nCall(descriptor, linguiInstance));
-    };
+    });
     /**
      * `processDescriptor` expand macros inside message descriptor.
      * Message descriptor is used in `defineMessage`.
@@ -183,7 +196,7 @@ class MacroJs {
      * }
      *
      */
-    this.processDescriptor = (descriptor_) => {
+    __publicField$1(this, "processDescriptor", (descriptor_) => {
       const descriptor = descriptor_;
       const messageProperty = this.getObjectPropertyByKey(descriptor, MESSAGE);
       const idProperty = this.getObjectPropertyByKey(descriptor, ID);
@@ -214,7 +227,7 @@ class MacroJs {
         properties.push(this.getObjectPropertyByKey(descriptor, COMMENT));
       }
       return this.createMessageDescriptor(properties, descriptor.loc);
-    };
+    });
     this.types = types;
     this.i18nImportName = opts.i18nImportName;
     this.stripNonEssentialProps = opts.stripNonEssentialProps;
@@ -265,15 +278,11 @@ class MacroJs {
       if (currExp) {
         argTokens = this.types.isCallExpression(currExp) ? this.tokenizeNode(currExp) : [this.tokenizeExpression(currExp)];
       }
-      return [
-        ...value ? [
-          {
-            type: "text",
-            value: this.clearBackslashes(value)
-          }
-        ] : [],
-        ...argTokens
-      ];
+      const textToken = {
+        type: "text",
+        value: this.clearBackslashes(value)
+      };
+      return [...value ? [textToken] : [], ...argTokens];
     });
   }
   tokenizeChoiceComponent(node) {
@@ -401,6 +410,12 @@ class MacroJs {
   }
 }
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 const pluralRuleRe = /(_[\d\w]+|zero|one|two|few|many|other)/;
 const jsx2icuExactChoice = (value) => value.replace(/_(\d+)/, "=$1").replace(/_(\w+)/, "$1");
 const keepSpaceRe = /\s*(?:\r\n|\r|\n)+\s*/g;
@@ -423,15 +438,19 @@ function normalizeWhitespace(text) {
 }
 class MacroJSX {
   constructor({ types }, opts) {
-    this.expressionIndex = makeCounter();
-    this.elementIndex = makeCounter();
-    this.createStringJsxAttribute = (name, value) => {
+    __publicField(this, "types");
+    __publicField(this, "expressionIndex", makeCounter());
+    __publicField(this, "elementIndex", makeCounter());
+    __publicField(this, "stripNonEssentialProps");
+    __publicField(this, "nameMap");
+    __publicField(this, "nameMapReversed");
+    __publicField(this, "createStringJsxAttribute", (name, value) => {
       return this.types.jsxAttribute(
         this.types.jsxIdentifier(name),
         this.types.jsxExpressionContainer(this.types.stringLiteral(value))
       );
-    };
-    this.replacePath = (path) => {
+    });
+    __publicField(this, "replacePath", (path) => {
       if (!path.isJSXElement()) {
         return path;
       }
@@ -524,15 +543,15 @@ class MacroJSX {
       );
       newNode.loc = path.node.loc;
       path.replaceWith(newNode);
-    };
-    this.attrName = (names, exclude = false) => {
+    });
+    __publicField(this, "attrName", (names, exclude = false) => {
       const namesRe = new RegExp("^(" + names.join("|") + ")$");
       return (attr) => {
         const name = attr.name.name;
         return exclude ? !namesRe.test(name) : namesRe.test(name);
       };
-    };
-    this.stripMacroAttributes = (path) => {
+    });
+    __publicField(this, "stripMacroAttributes", (path) => {
       const { attributes } = path.node.openingElement;
       const id = attributes.find(this.attrName([ID]));
       const message = attributes.find(this.attrName([MESSAGE]));
@@ -561,8 +580,8 @@ class MacroJSX {
         context: maybeNodeValue(context),
         attributes: attributes.filter(this.attrName(reserved, true))
       };
-    };
-    this.tokenizeNode = (path) => {
+    });
+    __publicField(this, "tokenizeNode", (path) => {
       if (this.isTransComponent(path)) {
         return this.tokenizeTrans(path);
       } else if (this.isChoiceComponent(path)) {
@@ -572,11 +591,11 @@ class MacroJSX {
       } else {
         return [this.tokenizeExpression(path)];
       }
-    };
-    this.tokenizeTrans = (path) => {
+    });
+    __publicField(this, "tokenizeTrans", (path) => {
       return path.get("children").flatMap((child) => this.tokenizeChildren(child)).filter(Boolean);
-    };
-    this.tokenizeChildren = (path) => {
+    });
+    __publicField(this, "tokenizeChildren", (path) => {
       if (path.isJSXExpressionContainer()) {
         const exp = path.get("expression");
         if (exp.isStringLiteral()) {
@@ -597,8 +616,8 @@ class MacroJSX {
       } else if (path.isJSXSpreadChild()) ; else if (path.isJSXText()) {
         return [this.tokenizeText(path.node.value)];
       } else ;
-    };
-    this.tokenizeChoiceComponent = (path) => {
+    });
+    __publicField(this, "tokenizeChoiceComponent", (path) => {
       const element = path.get("openingElement");
       const name = this.getJsxTagName(path.node);
       const format = (this.nameMapReversed.get(name) || name).toLowerCase();
@@ -663,8 +682,8 @@ class MacroJSX {
         }
       }
       return token;
-    };
-    this.tokenizeElement = (path) => {
+    });
+    __publicField(this, "tokenizeElement", (path) => {
       const name = this.elementIndex();
       return {
         type: "element",
@@ -679,15 +698,15 @@ class MacroJSX {
         },
         children: this.tokenizeTrans(path)
       };
-    };
-    this.tokenizeExpression = (path) => {
+    });
+    __publicField(this, "tokenizeExpression", (path) => {
       return {
         type: "arg",
         name: this.expressionToArgument(path),
         value: path.node
       };
-    };
-    this.tokenizeConditionalExpression = (exp) => {
+    });
+    __publicField(this, "tokenizeConditionalExpression", (exp) => {
       exp.traverse({
         JSXElement: (el) => {
           if (this.isTransComponent(el) || this.isChoiceComponent(el)) {
@@ -701,29 +720,29 @@ class MacroJSX {
         name: this.expressionToArgument(exp),
         value: exp.node
       };
-    };
-    this.tokenizeText = (value) => {
+    });
+    __publicField(this, "tokenizeText", (value) => {
       return {
         type: "text",
         value
       };
-    };
-    this.isLinguiComponent = (path, name) => {
+    });
+    __publicField(this, "isLinguiComponent", (path, name) => {
       return path.isJSXElement() && this.types.isJSXIdentifier(path.node.openingElement.name, {
         name: this.nameMap.get(name) || name
       });
-    };
-    this.isTransComponent = (path) => {
+    });
+    __publicField(this, "isTransComponent", (path) => {
       return this.isLinguiComponent(path, "Trans");
-    };
-    this.isChoiceComponent = (path) => {
+    });
+    __publicField(this, "isChoiceComponent", (path) => {
       return this.isLinguiComponent(path, "Plural") || this.isLinguiComponent(path, "Select") || this.isLinguiComponent(path, "SelectOrdinal");
-    };
-    this.getJsxTagName = (node) => {
+    });
+    __publicField(this, "getJsxTagName", (node) => {
       if (this.types.isJSXIdentifier(node.openingElement.name)) {
         return node.openingElement.name.name;
       }
-    };
+    });
     this.types = types;
     this.stripNonEssentialProps = opts.stripNonEssentialProps;
     this.nameMap = opts.nameMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/macro",
-  "version": "4.4.2",
+  "version": "4.6.0",
   "description": "Macro for generating messages in ICU MessageFormat syntax",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -65,9 +65,9 @@
   "dependencies": {
     "@babel/runtime": "^7.20.13",
     "@babel/types": "^7.20.7",
-    "@lingui/conf": "4.4.2",
-    "@lingui/core": "4.4.2",
-    "@lingui/message-utils": "4.4.2"
+    "@lingui/conf": "4.6.0",
+    "@lingui/core": "4.6.0",
+    "@lingui/message-utils": "4.6.0"
   },
   "peerDependencies": {
     "@lingui/react": "^4.0.0",
@@ -80,7 +80,7 @@
     "@types/babel-plugin-macros": "^2.8.5",
     "prettier": "2.8.3",
     "tsd": "^0.26.1",
-    "unbuild": "^1.1.2"
+    "unbuild": "2.0.0"
   },
-  "gitHead": "316a004ec82721fcceb8f3c4a5aeb4a48d367927"
+  "gitHead": "2afa0efb2d0cd1d47adc76e1eec9f5e57e34ae18"
 }