@formatjs/icu-messageformat-parser 2.10.1 → 2.11.1

package/lib/manipulator.d.ts

@@ -11,6 +11,10 @@ import { MessageFormatElement } from './types';
  * @param ast AST
  */
 export declare function hoistSelectors(ast: MessageFormatElement[]): MessageFormatElement[];
+interface IsStructurallySameResult {
+    error?: Error;
+    success: boolean;
+}
 /**
  * Check if 2 ASTs are structurally the same. This primarily means that
  * they have the same variables with the same type
@@ -18,4 +22,5 @@ export declare function hoistSelectors(ast: MessageFormatElement[]): MessageForm
  * @param b
  * @returns
  */
-export declare function isStructurallySame(a: MessageFormatElement[], b: MessageFormatElement[]): boolean;
+export declare function isStructurallySame(a: MessageFormatElement[], b: MessageFormatElement[]): IsStructurallySameResult;
+export {};

package/lib/manipulator.js

@@ -1,5 +1,5 @@
 import { __spreadArray } from "tslib";
-import { isArgumentElement, isDateElement, isNumberElement, isPluralElement, isSelectElement, isTagElement, isTimeElement, } from './types';
+import { isArgumentElement, isDateElement, isNumberElement, isPluralElement, isSelectElement, isTagElement, isTimeElement, TYPE, } from './types';
 function cloneDeep(obj) {
     if (Array.isArray(obj)) {
         // @ts-expect-error meh
@@ -107,10 +107,29 @@ export function isStructurallySame(a, b) {
     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(TYPE[type], " vs ").concat(TYPE[bType])),
+            };
+        }
+        return result;
+    }, { success: true });
 }

package/manipulator.d.ts

@@ -11,6 +11,10 @@ import { MessageFormatElement } from './types';
  * @param ast AST
  */
 export declare function hoistSelectors(ast: MessageFormatElement[]): MessageFormatElement[];
+interface IsStructurallySameResult {
+    error?: Error;
+    success: boolean;
+}
 /**
  * Check if 2 ASTs are structurally the same. This primarily means that
  * they have the same variables with the same type
@@ -18,4 +22,5 @@ export declare function hoistSelectors(ast: MessageFormatElement[]): MessageForm
  * @param b
  * @returns
  */
-export declare function isStructurallySame(a: MessageFormatElement[], b: MessageFormatElement[]): boolean;
+export declare function isStructurallySame(a: MessageFormatElement[], b: MessageFormatElement[]): IsStructurallySameResult;
+export {};

package/manipulator.js

@@ -111,10 +111,29 @@ function isStructurallySame(a, b) {
     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 });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/icu-messageformat-parser",
-  "version": "2.10.1",
+  "version": "2.11.1",
   "main": "index.js",
   "module": "lib/index.js",
   "types": "index.d.ts",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "tslib": "2",
-    "@formatjs/ecma402-abstract": "2.3.2",
-    "@formatjs/icu-skeleton-parser": "1.8.12"
+    "@formatjs/ecma402-abstract": "2.3.3",
+    "@formatjs/icu-skeleton-parser": "1.8.13"
   }
 }