@formatjs/cli 6.4.3 → 6.5.0

package/bin/formatjs

@@ -12498,12 +12498,31 @@ var require_manipulator = __commonJS({
       collectVariables(a, aVars);
       collectVariables(b, bVars);
       if (aVars.size !== bVars.size) {
-        return false;
+        return {
+          success: false,
+          error: new Error("Different number of variables: [".concat(Array.from(aVars.keys()).join(", "), "] vs [").concat(Array.from(bVars.keys()).join(", "), "]"))
+        };
       }
-      return Array.from(aVars.entries()).every(function(_a) {
+      return Array.from(aVars.entries()).reduce(function(result, _a) {
         var key = _a[0], type = _a[1];
-        return bVars.has(key) && bVars.get(key) === type;
-      });
+        if (!result.success) {
+          return result;
+        }
+        var bType = bVars.get(key);
+        if (bType == null) {
+          return {
+            success: false,
+            error: new Error("Missing variable ".concat(key, " in message"))
+          };
+        }
+        if (bType !== type) {
+          return {
+            success: false,
+            error: new Error("Variable ".concat(key, " has conflicting types: ").concat(types_1.TYPE[type], " vs ").concat(types_1.TYPE[bType]))
+          };
+        }
+        return result;
+      }, { success: true });
     }
   }
 });
@@ -228002,19 +228021,25 @@ async function checkStructuralEquality(translationFilesContents, sourceLocale) {
   }, {});
   return Object.entries(translationFilesContents).filter(([locale]) => locale !== sourceLocale).reduce((result, [locale, content]) => {
     const localeMessages = flatten(content);
-    const problematicKeys = Object.keys(enUSMessages).filter((k) => {
+    const problematicKeys = Object.keys(enUSMessages).map((k) => {
       if (!localeMessages[k]) {
-        return false;
+        return { key: k, success: true };
       }
       const enUSMessage = enUSMessages[k];
       try {
         const localeMessage = (0, import_icu_messageformat_parser4.parse)(localeMessages[k]);
-        return !(0, import_icu_messageformat_parser4.isStructurallySame)(enUSMessage, localeMessage);
+        return {
+          key: k,
+          ...(0, import_icu_messageformat_parser4.isStructurallySame)(enUSMessage, localeMessage)
+        };
       } catch (e) {
-        (0, import_console.error)("Error comparing message", k, enUSMessage, localeMessages[k], e);
-        return true;
+        return {
+          key: k,
+          success: false,
+          error: e instanceof Error ? e : new Error(String(e))
+        };
       }
-    });
+    }).filter((s) => !s.success);
     if (!problematicKeys.length) {
       return result;
     }
@@ -228023,8 +228048,10 @@ async function checkStructuralEquality(translationFilesContents, sourceLocale) {
       `These translation keys for locale ${locale} are structurally different from ${sourceLocale}:
 `
     );
-    problematicKeys.forEach((r) => writeStderr(`${r}
-`));
+    problematicKeys.forEach(
+      ({ key, error: error2 }) => writeStderr(`${key}: ${error2 == null ? void 0 : error2.message}
+`)
+    );
     return false;
   }, true);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/cli",
-  "version": "6.4.3",
+  "version": "6.5.0",
   "description": "A CLI for formatjs.",
   "keywords": [
     "intl",
@@ -33,7 +33,7 @@
     "url": "https://github.com/formatjs/formatjs/issues"
   },
   "devDependencies": {
-    "@formatjs/cli-lib": "7.1.3"
+    "@formatjs/cli-lib": "7.2.0"
   },
   "peerDependencies": {
     "@glimmer/env": "^0.1.7",