use utils

eslint-community · Jul 4, 2022 · d7461a3 · d7461a3
1 parent af5886c
commit d7461a3
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 71 deletions.
diff --git a/lib/rules/no-missing-message-ids.js b/lib/rules/no-missing-message-ids.js
@@ -71,7 +71,7 @@ module.exports = {
             values.forEach((val) => {
               if (
                 val.type === 'Literal' &&
-                val.value !== null &&
+                typeof val.value === 'string' &&
                 val.value !== '' &&
                 !utils.getMessageIdNodeById(
                   val.value,

diff --git a/lib/rules/no-missing-placeholders.js b/lib/rules/no-missing-placeholders.js
@@ -32,18 +32,16 @@ module.exports = {
 
   create(context) {
     const sourceCode = context.getSourceCode();
+    const { scopeManager } = sourceCode;
+
     let contextIdentifiers;
 
-    // ----------------------------------------------------------------------
-    // Public
-    // ----------------------------------------------------------------------
+    const ruleInfo = utils.getRuleInfo(sourceCode);
+    const messagesNode = utils.getMessagesNode(ruleInfo, scopeManager);
 
     return {
       Program(ast) {
-        contextIdentifiers = utils.getContextIdentifiers(
-          sourceCode.scopeManager,
-          ast
-        );
+        contextIdentifiers = utils.getContextIdentifiers(scopeManager, ast);
       },
       CallExpression(node) {
         if (
@@ -57,38 +55,30 @@ module.exports = {
             return;
           }
 
-          const info = utils.getRuleInfo(sourceCode);
-          const metaNode = info.meta;
-          const messagesNode =
-            metaNode &&
-            metaNode.properties &&
-            metaNode.properties.find(
-              (p) => p.type === 'Property' && utils.getKeyName(p) === 'messages'
-            );
-
           const reportMessagesAndDataArray =
             utils.collectReportViolationAndSuggestionData(reportInfo);
 
-          // Check for any potential instances where we can use the messageId to fill in the message for convenience.
-          reportMessagesAndDataArray.forEach((obj) => {
-            if (
-              !obj.message &&
-              obj.messageId &&
-              obj.messageId.type === 'Literal'
-            ) {
-              const correspondingMessage =
-                messagesNode &&
-                messagesNode.value.properties &&
-                messagesNode.value.properties.find(
-                  (p) =>
-                    p.type === 'Property' &&
-                    utils.getKeyName(p) === obj.messageId.value
+          if (messagesNode) {
+            // Check for any potential instances where we can use the messageId to fill in the message for convenience.
+            reportMessagesAndDataArray.forEach((obj) => {
+              if (
+                !obj.message &&
+                obj.messageId &&
+                obj.messageId.type === 'Literal' &&
+                typeof obj.messageId.value === 'string'
+              ) {
+                const correspondingMessage = utils.getMessageIdNodeById(
+                  obj.messageId.value,
+                  ruleInfo,
+                  scopeManager,
+                  context.getScope()
                 );
-              if (correspondingMessage) {
-                obj.message = correspondingMessage.value;
+                if (correspondingMessage) {
+                  obj.message = correspondingMessage.value;
+                }
               }
-            }
-          });
+            });
+          }
 
           for (const { message, data } of reportMessagesAndDataArray.filter(
             (obj) => obj.message

diff --git a/lib/rules/no-unused-placeholders.js b/lib/rules/no-unused-placeholders.js
@@ -31,18 +31,16 @@ module.exports = {
 
   create(context) {
     const sourceCode = context.getSourceCode();
+    const { scopeManager } = sourceCode;
+
     let contextIdentifiers;
 
-    // ----------------------------------------------------------------------
-    // Public
-    // ----------------------------------------------------------------------
+    const ruleInfo = utils.getRuleInfo(sourceCode);
+    const messagesNode = utils.getMessagesNode(ruleInfo, scopeManager);
 
     return {
       Program(ast) {
-        contextIdentifiers = utils.getContextIdentifiers(
-          sourceCode.scopeManager,
-          ast
-        );
+        contextIdentifiers = utils.getContextIdentifiers(scopeManager, ast);
       },
       CallExpression(node) {
         if (
@@ -56,38 +54,30 @@ module.exports = {
             return;
           }
 
-          const info = utils.getRuleInfo(sourceCode);
-          const metaNode = info.meta;
-          const messagesNode =
-            metaNode &&
-            metaNode.properties &&
-            metaNode.properties.find(
-              (p) => p.type === 'Property' && utils.getKeyName(p) === 'messages'
-            );
-
           const reportMessagesAndDataArray =
             utils.collectReportViolationAndSuggestionData(reportInfo);
 
-          // Check for any potential instances where we can use the messageId to fill in the message for convenience.
-          reportMessagesAndDataArray.forEach((obj) => {
-            if (
-              !obj.message &&
-              obj.messageId &&
-              obj.messageId.type === 'Literal'
-            ) {
-              const correspondingMessage =
-                messagesNode &&
-                messagesNode.value.properties &&
-                messagesNode.value.properties.find(
-                  (p) =>
-                    p.type === 'Property' &&
-                    utils.getKeyName(p) === obj.messageId.value
+          if (messagesNode) {
+            // Check for any potential instances where we can use the messageId to fill in the message for convenience.
+            reportMessagesAndDataArray.forEach((obj) => {
+              if (
+                !obj.message &&
+                obj.messageId &&
+                obj.messageId.type === 'Literal' &&
+                typeof obj.messageId.value === 'string'
+              ) {
+                const correspondingMessage = utils.getMessageIdNodeById(
+                  obj.messageId.value,
+                  ruleInfo,
+                  scopeManager,
+                  context.getScope()
                 );
-              if (correspondingMessage) {
-                obj.message = correspondingMessage.value;
+                if (correspondingMessage) {
+                  obj.message = correspondingMessage.value;
+                }
               }
-            }
-          });
+            });
+          }
 
           for (const { message, data } of reportMessagesAndDataArray.filter(
             (obj) => obj.message

diff --git a/tests/lib/rules/no-missing-placeholders.js b/tests/lib/rules/no-missing-placeholders.js
@@ -124,7 +124,7 @@ ruleTester.run('no-missing-placeholders', rule, {
         }
       };
     `,
-    // messageId but the message property doesn't exist yet.
+    // messageId but the message doesn't exist in `meta.messages`.
     `
       module.exports = {
         meta: {
@@ -135,7 +135,7 @@ ruleTester.run('no-missing-placeholders', rule, {
         }
       };
     `,
-    // messageId but no messages object doesn't exist yet.
+    // messageId but no `meta.messages`.
     `
       module.exports = {
         meta: { },
@@ -144,6 +144,14 @@ ruleTester.run('no-missing-placeholders', rule, {
         }
       };
     `,
+    // messageId but no `meta`.
+    `
+      module.exports = {
+        create(context) {
+          context.report({ node, messageId: 'myMessageId' });
+        }
+      };
+    `,
     // messageId with correctly-used placeholder.
     `
       module.exports = {

diff --git a/tests/lib/rules/no-unused-placeholders.js b/tests/lib/rules/no-unused-placeholders.js
@@ -161,6 +161,23 @@ ruleTester.run('no-unused-placeholders', rule, {
         }
       };
     `,
+    // messageId but no `meta.messages`.
+    `
+      module.exports = {
+        meta: {},
+        create(context) {
+          context.report({ node, messageId: 'myMessageId' });
+        }
+      };
+    `,
+    // messageId but no `meta`.
+    `
+      module.exports = {
+        create(context) {
+          context.report({ node, messageId: 'myMessageId' });
+        }
+      };
+    `,
     // messageId with correctly-used placeholder.
     `
       module.exports = {