@lingui/cli 4.11.0 → 4.11.2

package/dist/api/compile.js

@@ -57,12 +57,11 @@ function buildExportStatement(expression, namespace) {
         // import type { Messages } from "@lingui/core";
         const importMessagesTypeDeclaration = t.importDeclaration([t.importSpecifier(t.identifier("Messages"), t.identifier("Messages"))], t.stringLiteral("@lingui/core"));
         importMessagesTypeDeclaration.importKind = "type";
-        // Create the exported `messages` identifier with a `Messages` TS type annotation
-        const messagesIdentifier = t.identifier("messages");
-        messagesIdentifier.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier("Messages")));
-        // export const messages:Messages = { message: "Translation" }
+        // Cast the expression to `Messages`
+        const castExpression = t.tsAsExpression(expression, t.tsTypeReference(t.identifier("Messages")));
+        // export const messages = ({ message: "Translation" } as Messages)
         const exportDeclaration = t.exportNamedDeclaration(t.variableDeclaration("const", [
-            t.variableDeclarator(messagesIdentifier, expression),
+            t.variableDeclarator(t.identifier("messages"), castExpression),
         ]));
         return t.program([importMessagesTypeDeclaration, exportDeclaration]);
     }

package/dist/services/translationIO.js

@@ -9,6 +9,8 @@ const pofile_1 = __importDefault(require("pofile"));
 const https_1 = __importDefault(require("https"));
 const glob_1 = __importDefault(require("glob"));
 const date_fns_1 = require("date-fns");
+const EXPLICIT_ID_FLAG = "js-lingui-explicit-id";
+const EXPLICIT_ID_AND_CONTEXT_FLAG = "js-lingui-explicit-id-and-context";
 const getCreateHeaders = (language) => ({
     "POT-Creation-Date": (0, date_fns_1.format)(new Date(), "yyyy-MM-dd HH:mmxxxx"),
     "MIME-Version": "1.0",
@@ -141,32 +143,64 @@ function sync(config, options, successCallback, failCallback) {
     });
 }
 function createSegmentFromPoItem(item) {
-    const itemHasId = item.msgid != item.msgstr[0] && item.msgstr[0].length;
+    const itemHasExplicitId = item.extractedComments.includes(EXPLICIT_ID_FLAG);
+    const itemHasContext = item.msgctxt != null;
     const segment = {
         type: "source",
-        source: itemHasId ? item.msgstr[0] : item.msgid,
+        source: "",
         context: "",
         references: [],
         comment: "",
     };
-    if (itemHasId) {
+    // For segment.source & segment.context, we must remain compatible with projects created/synced before Lingui V4
+    if (itemHasExplicitId) {
+        segment.source = item.msgstr[0];
         segment.context = item.msgid;
     }
+    else {
+        segment.source = item.msgid;
+        if (itemHasContext) {
+            segment.context = item.msgctxt;
+        }
+    }
     if (item.references.length) {
         segment.references = item.references;
     }
+    // Since Lingui v4, when using explicit IDs, Lingui automatically adds 'js-lingui-explicit-id' to the extractedComments array
     if (item.extractedComments.length) {
         segment.comment = item.extractedComments.join(" | ");
+        if (itemHasExplicitId && itemHasContext) {
+            // segment.context is already used for the explicit ID, so we need to pass the context (for translators) in segment.comment
+            segment.comment = `${item.msgctxt} | ${segment.comment}`;
+            // Replace the flag to let us know how to recompose a target PO Item that is consistent with the source PO Item
+            segment.comment = segment.comment.replace(EXPLICIT_ID_FLAG, EXPLICIT_ID_AND_CONTEXT_FLAG);
+        }
     }
     return segment;
 }
 function createPoItemFromSegment(segment) {
+    var _a, _b;
+    const segmentHasExplicitId = (_a = segment.comment) === null || _a === void 0 ? void 0 : _a.includes(EXPLICIT_ID_FLAG);
+    const segmentHasExplicitIdAndContext = (_b = segment.comment) === null || _b === void 0 ? void 0 : _b.includes(EXPLICIT_ID_AND_CONTEXT_FLAG);
     const item = new pofile_1.default.Item();
-    item.msgid = segment.context ? segment.context : segment.source;
+    if (segmentHasExplicitId || segmentHasExplicitIdAndContext) {
+        item.msgid = segment.context;
+    }
+    else {
+        item.msgid = segment.source;
+        item.msgctxt = segment.context;
+    }
     item.msgstr = [segment.target];
     item.references =
         segment.references && segment.references.length ? segment.references : [];
-    item.extractedComments = segment.comment ? segment.comment.split(" | ") : [];
+    if (segment.comment) {
+        segment.comment = segment.comment.replace(EXPLICIT_ID_AND_CONTEXT_FLAG, EXPLICIT_ID_FLAG);
+        item.extractedComments = segment.comment ? segment.comment.split(" | ") : [];
+        // We recompose a target PO Item that is consistent with the source PO Item
+        if (segmentHasExplicitIdAndContext) {
+            item.msgctxt = item.extractedComments.shift();
+        }
+    }
     return item;
 }
 function saveSegmentsToTargetPos(config, paths, segmentsPerLocale) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "4.11.0",
+  "version": "4.11.2",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -53,11 +53,11 @@
     "@babel/parser": "^7.21.2",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "4.11.0",
-    "@lingui/conf": "4.11.0",
-    "@lingui/core": "4.11.0",
-    "@lingui/format-po": "4.11.0",
-    "@lingui/message-utils": "4.11.0",
+    "@lingui/babel-plugin-extract-messages": "4.11.2",
+    "@lingui/conf": "4.11.2",
+    "@lingui/core": "4.11.2",
+    "@lingui/format-po": "4.11.2",
+    "@lingui/message-utils": "4.11.2",
     "babel-plugin-macros": "^3.0.1",
     "chalk": "^4.1.0",
     "chokidar": "3.5.1",
@@ -80,7 +80,7 @@
   },
   "devDependencies": {
     "@lingui/jest-mocks": "*",
-    "@lingui/macro": "4.11.0",
+    "@lingui/macro": "4.11.2",
     "@types/convert-source-map": "^2.0.0",
     "@types/glob": "^8.1.0",
     "@types/micromatch": "^4.0.1",
@@ -88,5 +88,5 @@
     "mock-fs": "^5.2.0",
     "mockdate": "^3.0.5"
   },
-  "gitHead": "8668ba8ef405d99d496949ff9681247deb97063d"
+  "gitHead": "17e0af54b0b9d9577db2cef1be680a6d871611e7"
 }