@formatjs/icu-messageformat-parser 2.9.8 → 2.10.1

package/index.d.ts

@@ -4,3 +4,4 @@ export declare function parse(message: string, opts?: ParserOptions): MessageFor
 export * from './types';
 export type { ParserOptions };
 export declare const _Parser: typeof Parser;
+export { isStructurallySame } from './manipulator';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._Parser = void 0;
+exports.isStructurallySame = exports._Parser = void 0;
 exports.parse = parse;
 var tslib_1 = require("tslib");
 var error_1 = require("./error");
@@ -47,3 +47,5 @@ function parse(message, opts) {
 tslib_1.__exportStar(require("./types"), exports);
 // only for testing
 exports._Parser = parser_1.Parser;
+var manipulator_1 = require("./manipulator");
+Object.defineProperty(exports, "isStructurallySame", { enumerable: true, get: function () { return manipulator_1.isStructurallySame; } });

package/lib/index.d.ts

@@ -4,3 +4,4 @@ export declare function parse(message: string, opts?: ParserOptions): MessageFor
 export * from './types';
 export type { ParserOptions };
 export declare const _Parser: typeof Parser;
+export { isStructurallySame } from './manipulator';

package/lib/index.js

@@ -43,3 +43,4 @@ export function parse(message, opts) {
 export * from './types';
 // only for testing
 export var _Parser = Parser;
+export { isStructurallySame } from './manipulator';

package/lib/manipulator.d.ts

@@ -11,3 +11,11 @@ import { MessageFormatElement } from './types';
  * @param ast AST
  */
 export declare function hoistSelectors(ast: MessageFormatElement[]): MessageFormatElement[];
+/**
+ * Check if 2 ASTs are structurally the same. This primarily means that
+ * they have the same variables with the same type
+ * @param a
+ * @param b
+ * @returns
+ */
+export declare function isStructurallySame(a: MessageFormatElement[], b: MessageFormatElement[]): boolean;

package/lib/manipulator.js

@@ -1,5 +1,5 @@
 import { __spreadArray } from "tslib";
-import { isPluralElement, isSelectElement, isTagElement, } from './types';
+import { isArgumentElement, isDateElement, isNumberElement, isPluralElement, isSelectElement, isTagElement, isTimeElement, } from './types';
 function cloneDeep(obj) {
     if (Array.isArray(obj)) {
         // @ts-expect-error meh
@@ -65,3 +65,52 @@ export function hoistSelectors(ast) {
     }
     return ast;
 }
+/**
+ * Collect all variables in an AST to Record<string, TYPE>
+ * @param ast AST to collect variables from
+ * @param vars Record of variable name to variable type
+ */
+function collectVariables(ast, vars) {
+    if (vars === void 0) { vars = new Map(); }
+    ast.forEach(function (el) {
+        if (isArgumentElement(el) ||
+            isDateElement(el) ||
+            isTimeElement(el) ||
+            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 (isPluralElement(el) || isSelectElement(el)) {
+            vars.set(el.value, el.type);
+            Object.keys(el.options).forEach(function (k) {
+                collectVariables(el.options[k].value, vars);
+            });
+        }
+        if (isTagElement(el)) {
+            vars.set(el.value, el.type);
+            collectVariables(el.children, vars);
+        }
+    });
+}
+/**
+ * Check if 2 ASTs are structurally the same. This primarily means that
+ * they have the same variables with the same type
+ * @param a
+ * @param b
+ * @returns
+ */
+export function isStructurallySame(a, b) {
+    var aVars = new Map();
+    var bVars = new Map();
+    collectVariables(a, aVars);
+    collectVariables(b, bVars);
+    if (aVars.size !== bVars.size) {
+        return false;
+    }
+    return Array.from(aVars.entries()).every(function (_a) {
+        var key = _a[0], type = _a[1];
+        return bVars.has(key) && bVars.get(key) === type;
+    });
+}

package/lib/no-parser.d.ts

@@ -1,3 +1,4 @@
 export declare function parse(): void;
 export * from './types';
 export declare const _Parser: undefined;
+export { isStructurallySame } from './manipulator';

package/lib/no-parser.js

@@ -3,3 +3,4 @@ export function parse() {
 }
 export * from './types';
 export var _Parser = undefined;
+export { isStructurallySame } from './manipulator';

package/lib/types.d.ts

@@ -62,11 +62,8 @@ export interface BaseElement<T extends TYPE> {
 }
 export type LiteralElement = BaseElement<TYPE.literal>;
 export type ArgumentElement = BaseElement<TYPE.argument>;
-export interface TagElement {
-    type: TYPE.tag;
-    value: string;
+export interface TagElement extends BaseElement<TYPE.tag> {
     children: MessageFormatElement[];
-    location?: Location;
 }
 export interface SimpleFormatElement<T extends TYPE, S extends Skeleton> extends BaseElement<T> {
     style?: string | S | null;

package/manipulator.d.ts

@@ -11,3 +11,11 @@ import { MessageFormatElement } from './types';
  * @param ast AST
  */
 export declare function hoistSelectors(ast: MessageFormatElement[]): MessageFormatElement[];
+/**
+ * Check if 2 ASTs are structurally the same. This primarily means that
+ * they have the same variables with the same type
+ * @param a
+ * @param b
+ * @returns
+ */
+export declare function isStructurallySame(a: MessageFormatElement[], b: MessageFormatElement[]): boolean;

package/manipulator.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hoistSelectors = hoistSelectors;
+exports.isStructurallySame = isStructurallySame;
 var tslib_1 = require("tslib");
 var types_1 = require("./types");
 function cloneDeep(obj) {
@@ -68,3 +69,52 @@ function hoistSelectors(ast) {
     }
     return ast;
 }
+/**
+ * Collect all variables in an AST to Record<string, TYPE>
+ * @param ast AST to collect variables from
+ * @param vars Record of variable name to variable type
+ */
+function collectVariables(ast, vars) {
+    if (vars === void 0) { vars = new Map(); }
+    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 ((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);
+            });
+        }
+        if ((0, types_1.isTagElement)(el)) {
+            vars.set(el.value, el.type);
+            collectVariables(el.children, vars);
+        }
+    });
+}
+/**
+ * Check if 2 ASTs are structurally the same. This primarily means that
+ * they have the same variables with the same type
+ * @param a
+ * @param b
+ * @returns
+ */
+function isStructurallySame(a, b) {
+    var aVars = new Map();
+    var bVars = new Map();
+    collectVariables(a, aVars);
+    collectVariables(b, bVars);
+    if (aVars.size !== bVars.size) {
+        return false;
+    }
+    return Array.from(aVars.entries()).every(function (_a) {
+        var key = _a[0], type = _a[1];
+        return bVars.has(key) && bVars.get(key) === type;
+    });
+}

package/no-parser.d.ts

@@ -1,3 +1,4 @@
 export declare function parse(): void;
 export * from './types';
 export declare const _Parser: undefined;
+export { isStructurallySame } from './manipulator';

package/no-parser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._Parser = void 0;
+exports.isStructurallySame = exports._Parser = void 0;
 exports.parse = parse;
 var tslib_1 = require("tslib");
 function parse() {
@@ -8,3 +8,5 @@ function parse() {
 }
 tslib_1.__exportStar(require("./types"), exports);
 exports._Parser = undefined;
+var manipulator_1 = require("./manipulator");
+Object.defineProperty(exports, "isStructurallySame", { enumerable: true, get: function () { return manipulator_1.isStructurallySame; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/icu-messageformat-parser",
-  "version": "2.9.8",
+  "version": "2.10.1",
   "main": "index.js",
   "module": "lib/index.js",
   "types": "index.d.ts",

package/types.d.ts

@@ -62,11 +62,8 @@ export interface BaseElement<T extends TYPE> {
 }
 export type LiteralElement = BaseElement<TYPE.literal>;
 export type ArgumentElement = BaseElement<TYPE.argument>;
-export interface TagElement {
-    type: TYPE.tag;
-    value: string;
+export interface TagElement extends BaseElement<TYPE.tag> {
     children: MessageFormatElement[];
-    location?: Location;
 }
 export interface SimpleFormatElement<T extends TYPE, S extends Skeleton> extends BaseElement<T> {
     style?: string | S | null;