eslint-plugin-formatjs 4.8.0 → 4.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-formatjs",
-  "version": "4.8.0",
+  "version": "4.9.1",
   "description": "ESLint plugin for formatjs",
   "main": "index.js",
   "repository": {

package/rules/enforce-placeholders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enforce-placeholders.d.ts","sourceRoot":"","sources":["enforce-placeholders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AAyH3B,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,UA4ChB,CAAA;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"enforce-placeholders.d.ts","sourceRoot":"","sources":["enforce-placeholders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AAoI3B,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,UA4ChB,CAAA;AAED,eAAe,IAAI,CAAA"}

package/rules/enforce-placeholders.js

@@ -63,7 +63,17 @@ function checkNode(context, node) {
                 }
             }
         }
-        const ast = (0, icu_messageformat_parser_1.parse)(defaultMessage, { ignoreTag: settings.ignoreTag });
+        let ast;
+        try {
+            ast = (0, icu_messageformat_parser_1.parse)(defaultMessage, { ignoreTag: settings.ignoreTag });
+        }
+        catch (e) {
+            context.report({
+                node: messageNode,
+                message: e instanceof Error ? e.message : String(e),
+            });
+            continue;
+        }
         const placeholderNames = collectPlaceholderNames(ast);
         const missingPlaceholders = [];
         placeholderNames.forEach(name => {

package/rules/no-complex-selectors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-complex-selectors.d.ts","sourceRoot":"","sources":["no-complex-selectors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AAiF3B,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,UAiDhB,CAAA;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"no-complex-selectors.d.ts","sourceRoot":"","sources":["no-complex-selectors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AAgH3B,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,UAiDhB,CAAA;AAED,eAAe,IAAI,CAAA"}

package/rules/no-complex-selectors.js

@@ -2,17 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("../util");
 const icu_messageformat_parser_1 = require("@formatjs/icu-messageformat-parser");
-const manipulator_1 = require("@formatjs/icu-messageformat-parser/manipulator");
 function calculateComplexity(ast) {
-    if (ast.length === 1) {
-        const el = ast[0];
-        if ((0, icu_messageformat_parser_1.isPluralElement)(el) || (0, icu_messageformat_parser_1.isSelectElement)(el)) {
-            return Object.keys(el.options).reduce((complexity, k) => {
-                return complexity + calculateComplexity(el.options[k].value);
-            }, 0);
+    // Dynamic programming: define a complexity function f, where:
+    //   f(plural | select) = sum(f(option) for each option) * f(next element),
+    //   f(tag) = f(first element of children) * f(next element),
+    //   f(other) = f(next element),
+    //   f(out of bound) = 1.
+    const complexityByNode = new Map();
+    return _calculate(ast, 0);
+    function _calculate(ast, index) {
+        const element = ast[index];
+        if (!element) {
+            return 1;
         }
+        const cachedComplexity = complexityByNode.get(element);
+        if (cachedComplexity !== undefined) {
+            return cachedComplexity;
+        }
+        let complexity;
+        switch (element.type) {
+            case icu_messageformat_parser_1.TYPE.plural:
+            case icu_messageformat_parser_1.TYPE.select: {
+                let sumOfOptions = 0;
+                for (const { value } of Object.values(element.options)) {
+                    sumOfOptions += _calculate(value, 0);
+                }
+                complexity = sumOfOptions * _calculate(ast, index + 1);
+                break;
+            }
+            case icu_messageformat_parser_1.TYPE.tag:
+                complexity =
+                    _calculate(element.children, 0) * _calculate(ast, index + 1);
+                break;
+            default:
+                complexity = _calculate(ast, index + 1);
+                break;
+        }
+        complexityByNode.set(element, complexity);
+        return complexity;
     }
-    return 1;
 }
 function checkNode(context, node) {
     const settings = (0, util_1.getSettings)(context);
@@ -43,8 +71,7 @@ function checkNode(context, node) {
         }
         let complexity = 0;
         try {
-            const hoistedAst = (0, manipulator_1.hoistSelectors)(ast);
-            complexity = calculateComplexity(hoistedAst);
+            complexity = calculateComplexity(ast);
         }
         catch (e) {
             context.report({