fix(eslint-plugin-formatjs): fix extraction filter, fix #2238

formatjs · Oct 25, 2020 · f9f2c3e · f9f2c3e
1 parent 556cb3b
commit f9f2c3e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/packages/eslint-plugin-formatjs/tests/enforce-default-message.test.ts b/packages/eslint-plugin-formatjs/tests/enforce-default-message.test.ts
@@ -134,7 +134,19 @@ defineMessage({
     {
       code: `
             import {FormattedMessage} from 'react-intl'
-            const a = <FormattedMessage defaultMessage={defaultMessage} description="this is description"></FormattedMessage>`,
+            const a = <FormattedMessage defaultMessage={defaultMessage} description="this is description"/>`,
+      errors: [
+        {
+          message:
+            '`defaultMessage` must be a string literal (not function call or variable)',
+        },
+      ],
+      options: ['literal'],
+    },
+    {
+      code: `
+            import {FormattedMessage} from 'react-intl'
+            const a = <FormattedMessage defaultMessage={defaultMessage}/>`,
       errors: [
         {
           message:
@@ -155,5 +167,17 @@ defineMessage({
       ],
       options: ['literal'],
     },
+    {
+      code: `
+            import {FormattedMessage} from 'react-intl'
+            const a = <FormattedMessage defaultMessage={\`asf\`}/>`,
+      errors: [
+        {
+          message:
+            '`defaultMessage` must be a string literal (not function call or variable)',
+        },
+      ],
+      options: ['literal'],
+    },
   ],
 });
diff --git a/packages/eslint-plugin-formatjs/util.ts b/packages/eslint-plugin-formatjs/util.ts
@@ -169,7 +169,11 @@ function extractMessageDescriptorFromJSXElement(
         break;
     }
   }
-  if (!Object.keys(result.message).length) {
+  if (
+    !result.messagePropNode &&
+    !result.descriptionNode &&
+    !result.idPropNode
+  ) {
     return;
   }
   return [result, values];