@lingui/cli 5.5.0 → 5.5.2

package/dist/api/catalog/getFallbackListForLocale.js

@@ -7,8 +7,9 @@ function getFallbackListForLocale(fallbackLocales, locale) {
         const mapping = fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales[locale];
         Array.isArray(mapping) ? fL.push(...mapping) : fL.push(mapping);
     }
-    if ((fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default) && locale !== (fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default)) {
-        fL.push(fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default);
+    if (typeof (fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default) === "string" &&
+        locale !== (fallbackLocales === null || fallbackLocales === void 0 ? void 0 : fallbackLocales.default)) {
+        fL.push(fallbackLocales.default);
     }
     return fL;
 }

package/dist/api/catalog.js

@@ -248,7 +248,9 @@ function orderByMessage(messages) {
         .sort((a, b) => {
         const aMsg = messages[a].message || "";
         const bMsg = messages[b].message || "";
-        return collator.compare(aMsg, bMsg);
+        const aCtxt = messages[a].context || "";
+        const bCtxt = messages[b].context || "";
+        return collator.compare(aMsg, bMsg) || collator.compare(aCtxt, bCtxt);
     })
         .reduce((acc, key) => {
         ;

package/dist/lingui-compile.js

@@ -63,7 +63,7 @@ async function command(config, options) {
             await pool.completed(true);
         }
         finally {
-            await pool.terminate();
+            await pool.terminate(true);
         }
     }
     console.log(`Done in ${(0, ms_1.default)(Date.now() - startTime)}`);

package/dist/lingui-extract-experimental.js

@@ -65,7 +65,7 @@ async function command(linguiConfig, options) {
             await pool.completed();
         }
         finally {
-            await pool.terminate();
+            await pool.terminate(true);
         }
     }
     else {

package/dist/lingui-extract-template.js

@@ -34,7 +34,7 @@ async function command(config, options) {
     }
     finally {
         if (workerPool) {
-            await workerPool.terminate();
+            await workerPool.terminate(true);
         }
     }
     Object.entries(catalogStats).forEach(([key, value]) => {

package/dist/lingui-extract.js

@@ -43,7 +43,7 @@ async function command(config, options) {
     }
     finally {
         if (workerPool) {
-            await workerPool.terminate();
+            await workerPool.terminate(true);
         }
     }
     const doneMsg = `Done in ${(0, ms_1.default)(Date.now() - startTime)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/cli",
-  "version": "5.5.0",
+  "version": "5.5.2",
   "description": "CLI for working wit message catalogs",
   "keywords": [
     "cli",
@@ -62,12 +62,12 @@
     "@babel/parser": "^7.22.0",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "^7.21.2",
-    "@lingui/babel-plugin-extract-messages": "5.5.0",
-    "@lingui/babel-plugin-lingui-macro": "5.5.0",
-    "@lingui/conf": "5.5.0",
-    "@lingui/core": "5.5.0",
-    "@lingui/format-po": "5.5.0",
-    "@lingui/message-utils": "5.5.0",
+    "@lingui/babel-plugin-extract-messages": "5.5.2",
+    "@lingui/babel-plugin-lingui-macro": "5.5.2",
+    "@lingui/conf": "5.5.2",
+    "@lingui/core": "5.5.2",
+    "@lingui/format-po": "5.5.2",
+    "@lingui/message-utils": "5.5.2",
     "chokidar": "3.5.1",
     "cli-table": "^0.3.11",
     "commander": "^10.0.0",
@@ -95,5 +95,5 @@
     "mockdate": "^3.0.5",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "26700f071cd540651822b7f786d3c1d07c9d8625"
+  "gitHead": "197bcd9ab7eca588ba9436a2d20996f92deb7547"
 }