@lingui/babel-plugin-extract-messages 3.17.0 → 3.17.2

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.17.2](https://github.com/lingui/js-lingui/compare/v3.17.1...v3.17.2) (2023-02-24)
+
+**Note:** Version bump only for package @lingui/babel-plugin-extract-messages
+
+
+
+
+
+## [3.17.1](https://github.com/lingui/js-lingui/compare/v3.17.0...v3.17.1) (2023-02-07)
+
+**Note:** Version bump only for package @lingui/babel-plugin-extract-messages
+
+
+
+
+
 # [3.17.0](https://github.com/lingui/js-lingui/compare/v3.16.1...v3.17.0) (2023-02-01)
 
 **Note:** Version bump only for package @lingui/babel-plugin-extract-messages

package/build/index.js

@@ -4,27 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _mkdirp = _interopRequireDefault(require("mkdirp"));
-
 var _generator = _interopRequireDefault(require("@babel/generator"));
-
 var _conf = require("@lingui/conf");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const CONFIG = Symbol("I18nConfig");
 
-const CONFIG = Symbol("I18nConfig"); // Map of messages
+// Map of messages
+const MESSAGES = Symbol("I18nMessages");
 
-const MESSAGES = Symbol("I18nMessages"); // We need to remember all processed nodes. When JSX expressions are
+// 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 VISITED = Symbol("I18nVisited");
-
 function addMessage(path, messages, {
   id,
   message: newDefault,
@@ -36,31 +30,27 @@ function addMessage(path, messages, {
   // prevent from adding undefined msgid
   if (id === undefined) return;
   const extractedComments = comment ? [comment] : [];
-
   if (context) {
     if (messages.has(context)) {
       const existingContext = messages.get(context);
-
       if (existingContext.has(id)) {
-        const message = messages.get(id); // only set/check default language when it's defined.
-
+        const 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;
         }
-
         ;
         [].push.apply(message.origin, origin);
-
         if (comment) {
           ;
           [].push.apply(message.extractedComments, [comment]);
         }
       } else {
-        existingContext.set(id, { ...props,
+        existingContext.set(id, {
+          ...props,
           message: newDefault,
           origin,
           extractedComments
@@ -69,7 +59,8 @@ function addMessage(path, messages, {
       }
     } else {
       const newContext = new Map();
-      newContext.set(id, { ...props,
+      newContext.set(id, {
+        ...props,
         message: newDefault,
         origin,
         extractedComments
@@ -78,25 +69,24 @@ function addMessage(path, messages, {
     }
   } else {
     if (messages.has(id)) {
-      const message = messages.get(id); // only set/check default language when it's defined.
+      const 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;
       }
-
       ;
       [].push.apply(message.origin, origin);
-
       if (comment) {
         ;
         [].push.apply(message.extractedComments, [comment]);
       }
     } else {
-      messages.set(id, { ...props,
+      messages.set(id, {
+        ...props,
         message: newDefault,
         origin,
         extractedComments
@@ -104,14 +94,13 @@ function addMessage(path, messages, {
     }
   }
 }
+
 /**
  * An ES6 Map type is not possible to encode with JSON.stringify,
- * so we can instead use a replacer function as an argument to 
+ * 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) {
     const object = {};
@@ -120,10 +109,8 @@ function mapReplacer(key, value) {
     });
     return object;
   }
-
   return value;
 }
-
 function extractStringContatentation(t, node, error) {
   if (t.isStringLiteral(node)) {
     return node.value;
@@ -133,51 +120,42 @@ function extractStringContatentation(t, node, error) {
     throw error;
   }
 }
-
 function extractCommentString(t, path, valuePath, valueObj) {
   if (t.isStringLiteral(valueObj)) {
     // Comment is a single line string
     return valueObj.value;
-  } // Comment is a multi-line string.
-
+  }
 
+  // Comment is a multi-line string.
   const errorIfNotAString = path.get(valuePath).buildCodeFrameError("Only strings are supported as comments.");
-
   if (t.isBinaryExpression(valueObj)) {
     return extractStringContatentation(t, valueObj, errorIfNotAString);
   } else {
     throw errorIfNotAString;
   }
 }
-
 function _default({
   types: t
 }) {
   let localTransComponentName;
-
   function isTransComponent(node) {
     return t.isJSXElement(node) && t.isJSXIdentifier(node.openingElement.name, {
       name: localTransComponentName
     });
   }
-
   const isI18nMethod = node => t.isMemberExpression(node) && t.isIdentifier(node.object, {
     name: "i18n"
   }) && t.isIdentifier(node.property, {
     name: "_"
   });
-
   function collectMessage(path, file, props) {
     const messages = file.get(MESSAGES);
     const rootDir = file.get(CONFIG).rootDir;
-
     const filename = _path.default.relative(rootDir, file.opts.filename).replace(/\\/g, "/");
-
     const line = path.node.loc ? path.node.loc.start.line : null;
     props.origin = [[filename, line]];
     addMessage(path, messages, props);
   }
-
   return {
     visitor: {
       // Get the local name of Trans component. Usually it's just `Trans`, but
@@ -190,21 +168,19 @@ function _default({
         const moduleName = node.source.value;
         if (!["@lingui/react", "@lingui/macro", "@lingui/core"].includes(moduleName)) return;
         const importDeclarations = {};
-
         if (moduleName === "@lingui/react" || moduleName === "@lingui/macro") {
           node.specifiers.forEach(specifier => {
             importDeclarations[specifier.imported.name] = specifier.local.name;
-          }); // Trans import might be missing if there's just Plural or similar macro.
-          // If there's no alias, consider it was imported as Trans.
+          });
 
+          // Trans import might be missing if there's just Plural or similar macro.
+          // If there's no alias, consider it was imported as Trans.
           localTransComponentName = importDeclarations["Trans"] || "Trans";
         }
-
         if (!node.specifiers.length) {
           path.remove();
         }
       },
-
       // Extract translation from <Trans /> component.
       JSXElement(path, {
         file
@@ -216,7 +192,6 @@ function _default({
         const attrs = node.openingElement.attributes || [];
         const props = attrs.reduce((acc, item) => {
           const key = item.name.name;
-
           if (key === "id" || key === "message" || key === "comment" || key === "context") {
             if (item.value.value) {
               acc[key] = item.value.value;
@@ -224,25 +199,19 @@ function _default({
               acc[key] = item.value.expression.value;
             }
           }
-
           return acc;
         }, {});
-
         if (!props.id) {
           // <Trans id={message} /> is valid, don't raise warning
           const idProp = attrs.filter(item => item.name.name === "id")[0];
-
           if (idProp === undefined || t.isLiteral(props.id)) {
             console.warn("Missing message ID, skipping.");
             console.warn((0, _generator.default)(node).code);
           }
-
           return;
         }
-
         collectMessage(path, file, props);
       },
-
       CallExpression(path, {
         file
       }) {
@@ -258,15 +227,12 @@ function _default({
         const props = {
           id: path.node.arguments[0].value
         };
-
         if (!props.id) {
           console.warn("Missing message ID, skipping.");
           console.warn((0, _generator.default)(path.node).code);
           return;
         }
-
         const copyOptions = ["message", "comment", "context"];
-
         if (t.isObjectExpression(path.node.arguments[2])) {
           path.node.arguments[2].properties.forEach(({
             key,
@@ -274,54 +240,43 @@ function _default({
           }, i) => {
             if (!copyOptions.includes(key.name)) return;
             let valueToExtract = value.value;
-
             if (key.name === "comment") {
               valueToExtract = extractCommentString(t, path, `arguments.2.properties.${i}.value`, value);
             }
-
             props[key.name] = valueToExtract;
           });
         }
-
         visited.add(path.node);
         collectMessage(path, file, props);
       },
-
       StringLiteral(path, {
         file
       }) {
         const visited = file.get(VISITED);
         const comment = path.node.leadingComments && path.node.leadingComments.filter(node => node.value.match(/^\s*i18n/))[0];
-
         if (!comment || visited.has(path.node)) {
           return;
         }
-
         visited.add(path.node);
         const props = {
           id: path.node.value
         };
-
         if (!props.id) {
           console.warn("Missing message ID, skipping.");
           console.warn((0, _generator.default)(path.node).code);
           return;
         }
-
         collectMessage(path, file, props);
       },
-
       // Extract message descriptors
       ObjectExpression(path, {
         file
       }) {
         const visited = file.get(VISITED);
         const comment = path.node.leadingComments && path.node.leadingComments.filter(node => node.value.match(/^\s*i18n/))[0];
-
         if (!comment || visited.has(path.node)) {
           return;
         }
-
         visited.add(path.node);
         const props = {};
         const copyProps = ["id", "message", "comment", "context"];
@@ -333,43 +288,39 @@ function _default({
         }, i) => {
           // By default, the value is just the string value of the object property.
           let valueToExtract = value.value;
-
           if (key.name === "comment") {
             valueToExtract = extractCommentString(t, path, `properties.${i}.value`, value);
           } else if (key.name === "id") {
             const isIdLiteral = !value.value && t.isTemplateLiteral(value);
-
             if (isIdLiteral) {
-              valueToExtract = value?.quasis[0]?.value?.cooked;
+              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;
             }
           }
-
           props[key.name] = valueToExtract;
         });
         collectMessage(path, file, props);
       }
-
     },
-
     pre(file) {
-      localTransComponentName = null; // Skip validation because config is loaded for each file.
-      // Config was already validated in CLI.
+      localTransComponentName = null;
 
+      // Skip validation because config is loaded for each file.
+      // Config was already validated in CLI.
       file.set(CONFIG, (0, _conf.getConfig)({
         cwd: file.opts.filename,
         skipValidation: true,
         configPath: this.opts.configPath
-      })); // Ignore else path for now. Collision is possible if other plugin is
+      }));
+
+      // Ignore else path for now. Collision is possible if other plugin is
       // using the same Symbol('I18nMessages').
       // istanbul ignore else
-
       if (!file.has(MESSAGES)) {
         file.set(MESSAGES, new Map());
       }
-
       file.set(VISITED, new WeakSet());
     },
-
     post(file) {
       /* Write catalog to directory `localeDir`/_build/`path.to.file`/`filename`.json
        * e.g: if file is src/components/App.js (relative to package.json), then
@@ -381,36 +332,26 @@ function _default({
         filename
       } = file.opts;
       const rootDir = config.rootDir;
-
       const baseDir = _path.default.dirname(_path.default.relative(rootDir, filename));
-
       const targetDir = _path.default.join(localeDir, "_build", baseDir);
-
       const messages = file.get(MESSAGES);
       const catalog = {};
-
       const baseName = _path.default.basename(filename);
-
       const catalogFilename = _path.default.join(targetDir, `${baseName}.json`);
+      _mkdirp.default.sync(targetDir);
 
-      _mkdirp.default.sync(targetDir); // no messages, skip file
-
-
+      // no messages, skip file
       if (!messages.size) {
         // clean any existing catalog
         if (_fs.default.existsSync(catalogFilename)) {
           _fs.default.writeFileSync(catalogFilename, JSON.stringify({}));
         }
-
         return;
       }
-
       messages.forEach((value, key) => {
         catalog[key] = value;
       });
-
       _fs.default.writeFileSync(catalogFilename, JSON.stringify(catalog, mapReplacer, 2));
     }
-
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/babel-plugin-extract-messages",
-  "version": "3.17.0",
+  "version": "3.17.2",
   "description": "Babel plugin for collecting messages from source code for internationalization",
   "main": "./build/index.js",
   "author": {
@@ -33,10 +33,10 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@babel/generator": "^7.11.6",
-    "@babel/runtime": "^7.11.2",
-    "@lingui/conf": "3.17.0",
+    "@babel/generator": "^7.20.14",
+    "@babel/runtime": "^7.20.13",
+    "@lingui/conf": "3.17.2",
     "mkdirp": "^1.0.4"
   },
-  "gitHead": "1c8bc46213b35b25da8fe7a80ddcf6f6a5d9d539"
+  "gitHead": "31dcab5a9a8f88bfa8b3a2c7cd12aa2d908a1d80"
 }