@formatjs/cli 6.4.2 → 6.5.0

package/bin/formatjs

@@ -12469,88 +12469,60 @@ var require_manipulator = __commonJS({
       }
       return ast;
     }
-    function isStructurallySamePluralOrSelect(el1, el2) {
-      var options1 = el1.options;
-      var options2 = el2.options;
-      if (Object.keys(options1).length !== Object.keys(options2).length) {
-        return false;
+    function collectVariables(ast, vars) {
+      if (vars === void 0) {
+        vars = /* @__PURE__ */ new Map();
       }
-      for (var key in options1) {
-        if (!options2[key]) {
-          return false;
+      ast.forEach(function(el) {
+        if ((0, types_1.isArgumentElement)(el) || (0, types_1.isDateElement)(el) || (0, types_1.isTimeElement)(el) || (0, types_1.isNumberElement)(el)) {
+          if (el.value in vars && vars.get(el.value) !== el.type) {
+            throw new Error("Variable ".concat(el.value, " has conflicting types"));
+          }
+          vars.set(el.value, el.type);
         }
-        if (!isStructurallySame2(options1[key].value, options2[key].value)) {
-          return false;
+        if ((0, types_1.isPluralElement)(el) || (0, types_1.isSelectElement)(el)) {
+          vars.set(el.value, el.type);
+          Object.keys(el.options).forEach(function(k) {
+            collectVariables(el.options[k].value, vars);
+          });
         }
-      }
-      return true;
+        if ((0, types_1.isTagElement)(el)) {
+          vars.set(el.value, el.type);
+          collectVariables(el.children, vars);
+        }
+      });
     }
     function isStructurallySame2(a, b) {
-      var aWithoutLiteral = a.filter(function(el) {
-        return !(0, types_1.isLiteralElement)(el);
-      });
-      var bWithoutLiteral = b.filter(function(el) {
-        return !(0, types_1.isLiteralElement)(el);
-      });
-      if (aWithoutLiteral.length !== bWithoutLiteral.length) {
-        return false;
+      var aVars = /* @__PURE__ */ new Map();
+      var bVars = /* @__PURE__ */ new Map();
+      collectVariables(a, aVars);
+      collectVariables(b, bVars);
+      if (aVars.size !== bVars.size) {
+        return {
+          success: false,
+          error: new Error("Different number of variables: [".concat(Array.from(aVars.keys()).join(", "), "] vs [").concat(Array.from(bVars.keys()).join(", "), "]"))
+        };
       }
-      var elementsMapInA = aWithoutLiteral.reduce(function(all, el) {
-        if ((0, types_1.isPoundElement)(el)) {
-          all["#"] = el;
-          return all;
-        }
-        all[el.value] = el;
-        return all;
-      }, {});
-      var elementsMapInB = bWithoutLiteral.reduce(function(all, el) {
-        if ((0, types_1.isPoundElement)(el)) {
-          all["#"] = el;
-          return all;
-        }
-        all[el.value] = el;
-        return all;
-      }, {});
-      for (var _i = 0, _a = Object.keys(elementsMapInA); _i < _a.length; _i++) {
-        var varName = _a[_i];
-        var elA = elementsMapInA[varName];
-        var elB = elementsMapInB[varName];
-        if (!elB) {
-          return false;
-        }
-        if (elA.type !== elB.type) {
-          return false;
-        }
-        if ((0, types_1.isLiteralElement)(elA) || (0, types_1.isLiteralElement)(elB)) {
-          continue;
-        }
-        if ((0, types_1.isArgumentElement)(elA) && (0, types_1.isArgumentElement)(elB) && elA.value !== elB.value) {
-          return false;
-        }
-        if ((0, types_1.isPoundElement)(elA) || (0, types_1.isPoundElement)(elB)) {
-          continue;
-        }
-        if ((0, types_1.isDateElement)(elA) || (0, types_1.isTimeElement)(elA) || (0, types_1.isNumberElement)(elA) || (0, types_1.isDateElement)(elB) || (0, types_1.isTimeElement)(elB) || (0, types_1.isNumberElement)(elB)) {
-          if (elA.value !== elB.value) {
-            return false;
-          }
-        }
-        if ((0, types_1.isPluralElement)(elA) && (0, types_1.isPluralElement)(elB) && !isStructurallySamePluralOrSelect(elA, elB)) {
-          return false;
+      return Array.from(aVars.entries()).reduce(function(result, _a) {
+        var key = _a[0], type = _a[1];
+        if (!result.success) {
+          return result;
         }
-        if ((0, types_1.isSelectElement)(elA) && (0, types_1.isSelectElement)(elB) && isStructurallySamePluralOrSelect(elA, elB)) {
-          return false;
+        var bType = bVars.get(key);
+        if (bType == null) {
+          return {
+            success: false,
+            error: new Error("Missing variable ".concat(key, " in message"))
+          };
         }
-        if ((0, types_1.isTagElement)(elA) && (0, types_1.isTagElement)(elB)) {
-          if (elA.value !== elB.value) {
-            return false;
-          }
-          if (!isStructurallySame2(elA.children, elB.children)) {
-            return false;
-          }
+        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 true;
+        return result;
+      }, { success: true });
     }
   }
 });
@@ -228049,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;
     }
@@ -228070,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.2",
+  "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.2"
+    "@formatjs/cli-lib": "7.2.0"
   },
   "peerDependencies": {
     "@glimmer/env": "^0.1.7",