fix(eslint-plugin-formatjs): check intl.$t function calls (#4183)

formatjs · Sep 7, 2023 · 572be8b · 572be8b
1 parent d63e778
commit 572be8b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/packages/eslint-plugin-formatjs/tests/enforce-description.test.ts b/packages/eslint-plugin-formatjs/tests/enforce-description.test.ts
@@ -12,6 +12,10 @@ defineMessage({
     `intl.formatMessage({
     defaultMessage: '{count, plural, one {#} other {# more}}',
     description: 'asd'
+})`,
+    `intl.$t({
+    defaultMessage: '{count, plural, one {#} other {# more}}',
+    description: 'asd'
 })`,
     `intl.formatMessage({
   defaultMessage: '{count, plural, one {#} other {# more}}',
@@ -65,6 +69,17 @@ description={'asd' + 'azz'}
         },
       ],
     },
+    {
+      code: `
+            intl.$t({
+                defaultMessage: '{count, plural, one {#} other {# more}}'
+            })`,
+      errors: [
+        {
+          message: '`description` has to be specified in message descriptor',
+        },
+      ],
+    },
     {
       code: `
             import {defineMessages} from 'react-intl'

diff --git a/packages/eslint-plugin-formatjs/tests/enforce-id.test.ts b/packages/eslint-plugin-formatjs/tests/enforce-id.test.ts
@@ -8,6 +8,10 @@ ruleTester.run('enforce-id', enforceId, {
       code: `intl.formatMessage({ id: 'j9qhn+', defaultMessage: '{count, plural, one {#} other {# more}}', description: 'asd'})`,
       options,
     },
+    {
+      code: `intl.$t({ id: 'j9qhn+', defaultMessage: '{count, plural, one {#} other {# more}}', description: 'asd'})`,
+      options,
+    },
     {
       code: `<FormattedMessage id="/e77jM" defaultMessage="{count, plural, one {#} other {# more}}" values={{foo: 1}} />`,
       options,
@@ -34,6 +38,20 @@ intl.formatMessage({ id: 'j9qhn+', defaultMessage: '{count, plural, one {#} othe
     },
     {
       code: `
+intl.$t({ id: 'foo', defaultMessage: '{count, plural, one {#} other {# more}}', description: 'asd'})`,
+      errors: [
+        {
+          message: `"id" does not match with hash pattern [sha512:contenthash:base64:6].
+Expected: j9qhn+
+Actual: foo`,
+        },
+      ],
+      options,
+      output: `
+intl.$t({ id: 'j9qhn+', defaultMessage: '{count, plural, one {#} other {# more}}', description: 'asd'})`,
+    },
+    {
+      code: `
 intl.formatMessage({defaultMessage: '{count, plural, one {#} other {# more}}', description: 'asd'})`,
       errors: [
         {

diff --git a/packages/eslint-plugin-formatjs/util.ts b/packages/eslint-plugin-formatjs/util.ts
@@ -68,7 +68,8 @@ export function isIntlFormatMessageCall(
     node.callee.object.type === 'Identifier' &&
     node.callee.object.name === 'intl' &&
     node.callee.property.type === 'Identifier' &&
-    node.callee.property.name === 'formatMessage' &&
+    (node.callee.property.name === 'formatMessage' ||
+      node.callee.property.name === '$t') &&
     node.arguments.length >= 1 &&
     node.arguments[0].type === 'ObjectExpression'
   )