Clean up and code review

jsx-eslint · Aug 5, 2018 · 2cfaaba · 2cfaaba
1 parent bf675a9
commit 2cfaaba
Show file tree

Hide file tree

Showing 4 changed files with 554 additions and 535 deletions.
diff --git a/lib/rules/no-unused-prop-types.js b/lib/rules/no-unused-prop-types.js
@@ -466,7 +466,7 @@ module.exports = {
           return;
         }
 
-        if (prop.node && !isPropUsed(component, prop, key)) {
+        if (prop.node && !isPropUsed(component, prop)) {
           context.report(
             prop.node,
             UNUSED_MESSAGE, {
@@ -523,8 +523,8 @@ module.exports = {
         return;
       }
 
-      Object.values(propTypes).forEach(propType => {
-        const node = propType.node;
+      Object.keys(propTypes).forEach(key => {
+        const node = propTypes[key].node;
 
         if (node && (
           node.type === 'ArrowFunctionExpression'

diff --git a/lib/rules/prop-types.js b/lib/rules/prop-types.js
@@ -187,7 +187,6 @@ module.exports = {
           // If it's a computed property, we can't make any further analysis, but is valid
           return key === '__COMPUTED_PROP__';
         }
-
         if (typeof propType === 'object' && !propType.type) {
           return true;
         }

diff --git a/lib/util/Components.js b/lib/util/Components.js
@@ -695,7 +695,7 @@ function componentRule(rule, context) {
   // Update the provided rule instructions to add the component detection
   const ruleInstructions = rule(context, components, utils);
   const updatedRuleInstructions = util._extend({}, ruleInstructions);
-  const propTypesInstructions = propTypes.instructions(context, components, utils);
+  const propTypesInstructions = propTypes(context, components, utils);
   const allKeys = new Set(Object.keys(detectionInstructions).concat(Object.keys(propTypesInstructions)));
   allKeys.forEach(instruction => {
     updatedRuleInstructions[instruction] = function(node) {