eslint-plugin-formatjs 4.4.0 → 4.6.0

package/index.js

@@ -34,7 +34,7 @@ const plugin = {
         'no-multiple-plurals': no_multiple_plurals_1.default,
         'no-multiple-whitespaces': no_multiple_whitespaces_1.default,
         'no-offset': no_offset_1.default,
-        'no-useless-message': no_useless_message_1.default
-    }
+        'no-useless-message': no_useless_message_1.default,
+    },
 };
 module.exports = plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-formatjs",
-  "version": "4.4.0",
+  "version": "4.6.0",
   "description": "ESLint plugin for formatjs",
   "main": "index.js",
   "repository": {
@@ -20,15 +20,16 @@
   },
   "homepage": "https://github.com/formatjs/formatjs#readme",
   "dependencies": {
-    "@formatjs/icu-messageformat-parser": "2.1.14",
-    "@formatjs/ts-transformer": "3.11.5",
+    "@formatjs/icu-messageformat-parser": "2.2.0",
+    "@formatjs/ts-transformer": "3.11.6",
     "@types/eslint": "7 || 8",
     "@types/picomatch": "^2.3.0",
-    "@typescript-eslint/typescript-estree": "^5.9.1",
-    "emoji-regex": "^10.0.0",
+    "@typescript-eslint/typescript-estree": "5.45.0",
+    "emoji-regex": "^10.2.1",
     "picomatch": "^2.3.1",
-    "tslib": "^2.4.0",
-    "typescript": "^4.7"
+    "tslib": "2.4.0",
+    "typescript": "^4.7",
+    "unicode-emoji-utils": "^1.1.1"
   },
   "peerDependencies": {
     "eslint": "7 || 8"

package/rules/no-emoji.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-emoji.d.ts","sourceRoot":"","sources":["no-emoji.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AA2B3B,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,UA8BhB,CAAA;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"no-emoji.d.ts","sourceRoot":"","sources":["no-emoji.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AA+E3B,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,UA0ChB,CAAA;AAED,eAAe,IAAI,CAAA"}

package/rules/no-emoji.js

@@ -1,23 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const util_1 = require("../util");
-const emoji_regex_1 = tslib_1.__importDefault(require("emoji-regex"));
-const EMOJI_REGEX = emoji_regex_1.default();
+const unicode_emoji_utils_1 = require("unicode-emoji-utils");
 function checkNode(context, node) {
     const msgs = (0, util_1.extractMessages)(node, (0, util_1.getSettings)(context));
+    let allowedEmojis = [];
+    let versionAbove;
+    const [emojiConfig] = context.options;
+    if (emojiConfig?.versionAbove &&
+        (0, unicode_emoji_utils_1.isValidEmojiVersion)(emojiConfig.versionAbove) &&
+        !versionAbove &&
+        allowedEmojis.length === 0) {
+        versionAbove = emojiConfig.versionAbove;
+        allowedEmojis = (0, unicode_emoji_utils_1.getAllEmojis)((0, unicode_emoji_utils_1.filterEmojis)(versionAbove));
+    }
     for (const [{ message: { defaultMessage }, messageNode, },] of msgs) {
         if (!defaultMessage || !messageNode) {
             continue;
         }
-        if (EMOJI_REGEX.test(defaultMessage)) {
-            context.report({
-                node: messageNode,
-                message: 'Emojis are not allowed',
-            });
+        if ((0, unicode_emoji_utils_1.hasEmoji)(defaultMessage)) {
+            if (versionAbove) {
+                for (const emoji of (0, unicode_emoji_utils_1.extractEmojis)(defaultMessage)) {
+                    if (!allowedEmojis.includes(emoji)) {
+                        context.report({
+                            node: messageNode,
+                            messageId: 'notAllowedAboveVersion',
+                            data: {
+                                versionAbove,
+                                emoji,
+                            },
+                        });
+                    }
+                }
+            }
+            else {
+                context.report({
+                    node: messageNode,
+                    messageId: 'notAllowed',
+                });
+            }
         }
     }
 }
+const versionAboveEnums = [
+    '0.6',
+    '0.7',
+    '1.0',
+    '2.0',
+    '3.0',
+    '4.0',
+    '5.0',
+    '11.0',
+    '12.0',
+    '12.1',
+    '13.0',
+    '13.1',
+    '14.0',
+    '15.0',
+];
 const rule = {
     meta: {
         type: 'problem',
@@ -28,6 +68,17 @@ const rule = {
             url: 'https://formatjs.io/docs/tooling/linter#no-emoji',
         },
         fixable: 'code',
+        schema: [
+            {
+                type: 'object',
+                properties: { versionAbove: { type: 'string', enum: versionAboveEnums } },
+                additionalProperties: false,
+            },
+        ],
+        messages: {
+            notAllowed: 'Emojis are not allowed',
+            notAllowedAboveVersion: 'Emojis above version {{versionAbove}} are not allowed - Emoji: {{emoji}}',
+        },
     },
     create(context) {
         const callExpressionVisitor = (node) => checkNode(context, node);

package/rules/no-literal-string-in-jsx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"no-literal-string-in-jsx.d.ts","sourceRoot":"","sources":["no-literal-string-in-jsx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AAqDhC,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,UAuKhB,CAAA;AAED,eAAe,IAAI,CAAA"}
+{"version":3,"file":"no-literal-string-in-jsx.d.ts","sourceRoot":"","sources":["no-literal-string-in-jsx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AAqDhC,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,UA0KhB,CAAA;AAED,eAAe,IAAI,CAAA"}

package/rules/no-literal-string-in-jsx.js

@@ -7,8 +7,8 @@ const propMatcherSchema = {
     type: 'array',
     items: {
         type: 'array',
-        items: [{ type: 'string' }, { type: 'string' }]
-    }
+        items: [{ type: 'string' }, { type: 'string' }],
+    },
 };
 const defaultPropIncludePattern = [
     ['*', 'aria-{label,description,details,errormessage}'],
@@ -41,7 +41,7 @@ const rule = {
             description: 'Disallow untranslated literal strings without translation.',
             category: 'Errors',
             recommended: false,
-            url: 'https://formatjs.io/docs/tooling/linter#no-literal-string-in-jsx'
+            url: 'https://formatjs.io/docs/tooling/linter#no-literal-string-in-jsx',
         },
         schema: [
             {
@@ -51,16 +51,16 @@ const rule = {
                         type: 'object',
                         properties: {
                             include: {
-                                ...propMatcherSchema
+                                ...propMatcherSchema,
                             },
                             exclude: {
-                                ...propMatcherSchema
-                            }
-                        }
-                    }
-                }
+                                ...propMatcherSchema,
+                            },
+                        },
+                    },
+                },
             },
-        ]
+        ],
     },
     // TODO: Vue support
     create(context) {
@@ -109,7 +109,7 @@ const rule = {
                     (node.quasis.length > 1 || node.quasis[0].value.raw.length > 0))) {
                 context.report({
                     node: node,
-                    message: 'Cannot have untranslated text in JSX'
+                    message: 'Cannot have untranslated text in JSX',
                 });
             }
             else if (node.type === 'BinaryExpression' && node.operator === '+') {
@@ -120,6 +120,10 @@ const rule = {
                 checkJSXExpression(node.consequent);
                 checkJSXExpression(node.alternate);
             }
+            else if (node.type === 'LogicalExpression') {
+                checkJSXExpression(node.left);
+                checkJSXExpression(node.right);
+            }
         };
         return {
             JSXElement: (node) => {
@@ -146,7 +150,7 @@ const rule = {
                     node.value.value.length > 0) {
                     context.report({
                         node: node,
-                        message: 'Cannot have untranslated text in JSX'
+                        message: 'Cannot have untranslated text in JSX',
                     });
                 }
                 else if (node.value.type === 'JSXExpressionContainer' &&
@@ -161,7 +165,7 @@ const rule = {
                 }
                 context.report({
                     node: node,
-                    message: 'Cannot have untranslated text in JSX'
+                    message: 'Cannot have untranslated text in JSX',
                 });
             },
             // Children expression container
@@ -169,8 +173,8 @@ const rule = {
                 if (node.expression.type !== 'JSXEmptyExpression') {
                     checkJSXExpression(node.expression);
                 }
-            }
+            },
         };
-    }
+    },
 };
 exports.default = rule;

package/rules/no-useless-message.js

@@ -50,13 +50,13 @@ function checkNode(context, node) {
         }
         try {
             verifyAst((0, icu_messageformat_parser_1.parse)(defaultMessage, {
-                ignoreTag: settings.ignoreTag
+                ignoreTag: settings.ignoreTag,
             }));
         }
         catch (e) {
             context.report({
                 node: messageNode,
-                message: e instanceof Error ? e.message : String(e)
+                message: e instanceof Error ? e.message : String(e),
             });
         }
     }
@@ -67,23 +67,23 @@ const rule = {
         docs: {
             description: 'Disallow unnecessary formatted message',
             recommended: true,
-            url: 'https://formatjs.io/docs/tooling/linter#no-useless-message'
+            url: 'https://formatjs.io/docs/tooling/linter#no-useless-message',
         },
-        fixable: 'code'
+        fixable: 'code',
     },
     create(context) {
         const callExpressionVisitor = (node) => checkNode(context, node);
         if (context.parserServices.defineTemplateBodyVisitor) {
             return context.parserServices.defineTemplateBodyVisitor({
-                CallExpression: callExpressionVisitor
+                CallExpression: callExpressionVisitor,
             }, {
-                CallExpression: callExpressionVisitor
+                CallExpression: callExpressionVisitor,
             });
         }
         return {
             JSXOpeningElement: (node) => checkNode(context, node),
-            CallExpression: callExpressionVisitor
+            CallExpression: callExpressionVisitor,
         };
-    }
+    },
 };
 exports.default = rule;