@formatjs/icu-messageformat-parser 2.9.7 → 2.10.0

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,4 @@ import { MessageFormatElement } from './types';
  * @param ast AST
  */
 export declare function hoistSelectors(ast: MessageFormatElement[]): MessageFormatElement[];
+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, isLiteralElement, isNumberElement, isPluralElement, isPoundElement, isSelectElement, isTagElement, isTimeElement, } from './types';
 function cloneDeep(obj) {
     if (Array.isArray(obj)) {
         // @ts-expect-error meh
@@ -65,3 +65,93 @@ export function hoistSelectors(ast) {
     }
     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;
+    }
+    for (var key in options1) {
+        if (!options2[key]) {
+            return false;
+        }
+        if (!isStructurallySame(options1[key].value, options2[key].value)) {
+            return false;
+        }
+    }
+    return true;
+}
+export function isStructurallySame(a, b) {
+    var aWithoutLiteral = a.filter(function (el) { return !isLiteralElement(el); });
+    var bWithoutLiteral = b.filter(function (el) { return !isLiteralElement(el); });
+    if (aWithoutLiteral.length !== bWithoutLiteral.length) {
+        return false;
+    }
+    var elementsMapInA = aWithoutLiteral.reduce(function (all, el) {
+        if (isPoundElement(el)) {
+            all['#'] = el;
+            return all;
+        }
+        all[el.value] = el;
+        return all;
+    }, {});
+    var elementsMapInB = bWithoutLiteral.reduce(function (all, el) {
+        if (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 (isLiteralElement(elA) || isLiteralElement(elB)) {
+            continue;
+        }
+        if (isArgumentElement(elA) &&
+            isArgumentElement(elB) &&
+            elA.value !== elB.value) {
+            return false;
+        }
+        if (isPoundElement(elA) || isPoundElement(elB)) {
+            continue;
+        }
+        if (isDateElement(elA) ||
+            isTimeElement(elA) ||
+            isNumberElement(elA) ||
+            isDateElement(elB) ||
+            isTimeElement(elB) ||
+            isNumberElement(elB)) {
+            if (elA.value !== elB.value) {
+                return false;
+            }
+        }
+        if (isPluralElement(elA) &&
+            isPluralElement(elB) &&
+            !isStructurallySamePluralOrSelect(elA, elB)) {
+            return false;
+        }
+        if (isSelectElement(elA) &&
+            isSelectElement(elB) &&
+            isStructurallySamePluralOrSelect(elA, elB)) {
+            return false;
+        }
+        if (isTagElement(elA) && isTagElement(elB)) {
+            if (elA.value !== elB.value) {
+                return false;
+            }
+            if (!isStructurallySame(elA.children, elB.children)) {
+                return false;
+            }
+        }
+    }
+    return true;
+}

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,4 @@ import { MessageFormatElement } from './types';
  * @param ast AST
  */
 export declare function hoistSelectors(ast: MessageFormatElement[]): MessageFormatElement[];
+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,93 @@ function hoistSelectors(ast) {
     }
     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;
+    }
+    for (var key in options1) {
+        if (!options2[key]) {
+            return false;
+        }
+        if (!isStructurallySame(options1[key].value, options2[key].value)) {
+            return false;
+        }
+    }
+    return true;
+}
+function isStructurallySame(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 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;
+        }
+        if ((0, types_1.isSelectElement)(elA) &&
+            (0, types_1.isSelectElement)(elB) &&
+            isStructurallySamePluralOrSelect(elA, elB)) {
+            return false;
+        }
+        if ((0, types_1.isTagElement)(elA) && (0, types_1.isTagElement)(elB)) {
+            if (elA.value !== elB.value) {
+                return false;
+            }
+            if (!isStructurallySame(elA.children, elB.children)) {
+                return false;
+            }
+        }
+    }
+    return true;
+}

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.7",
+  "version": "2.10.0",
   "main": "index.js",
   "module": "lib/index.js",
   "types": "index.d.ts",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "tslib": "2",
-    "@formatjs/ecma402-abstract": "2.3.1",
-    "@formatjs/icu-skeleton-parser": "1.8.11"
+    "@formatjs/ecma402-abstract": "2.3.2",
+    "@formatjs/icu-skeleton-parser": "1.8.12"
   }
 }

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;