Rewrite reduce to ignorePropsValidation as some()

Author: Joachim Seminck

lib/rules/no-unused-prop-types.js

@@ -755,28 +755,21 @@ module.exports = {
      * @returns {Boolean} True if propTypes should be ignored (e.g. when a type can't be resolved, when it is imported)
      */
     function declarePropTypesForIntersectionTypeAnnotation(propTypes, declaredPropTypes) {
-      return propTypes.types.reduce((ignorePropsValidation, annotation) => {
-        // If we already decided to skip props validation then we don't have to continue processing anything else
-        if (ignorePropsValidation) {
-          return ignorePropsValidation;
+      return propTypes.types.some(annotation => {
+        if (annotation.type === 'ObjectTypeAnnotation') {
+          return declarePropTypesForObjectTypeAnnotation(annotation, declaredPropTypes);
         }
 
-        if (annotation.type === 'ObjectTypeAnnotation') {
-          ignorePropsValidation = declarePropTypesForObjectTypeAnnotation(annotation, declaredPropTypes);
-        } else {
-          const typeNode = typeScope(annotation.id.name);
-
-          if (!typeNode) {
-            ignorePropsValidation = true;
-          } else if (typeNode.type === 'IntersectionTypeAnnotation') {
-            ignorePropsValidation = declarePropTypesForIntersectionTypeAnnotation(typeNode, declaredPropTypes);
-          } else {
-            ignorePropsValidation = declarePropTypesForObjectTypeAnnotation(typeNode, declaredPropTypes);
-          }
+        const typeNode = typeScope(annotation.id.name);
+
+        if (!typeNode) {
+          return true;
+        } else if (typeNode.type === 'IntersectionTypeAnnotation') {
+          return declarePropTypesForIntersectionTypeAnnotation(typeNode, declaredPropTypes);
         }
 
-        return ignorePropsValidation;
-      }, false);
+        return declarePropTypesForObjectTypeAnnotation(typeNode, declaredPropTypes);
+      });
     }
 
     /**

lib/rules/prop-types.js

@@ -745,28 +745,21 @@ module.exports = {
      * @returns {Boolean} True if propTypes should be ignored (e.g. when a type can't be resolved, when it is imported)
      */
     function declarePropTypesForIntersectionTypeAnnotation(propTypes, declaredPropTypes) {
-      return propTypes.types.reduce((ignorePropsValidation, annotation) => {
-        // If we already decided to skip props validation then we don't have to continue processing anything else
-        if (ignorePropsValidation) {
-          return ignorePropsValidation;
+      return propTypes.types.some(annotation => {
+        if (annotation.type === 'ObjectTypeAnnotation') {
+          return declarePropTypesForObjectTypeAnnotation(annotation, declaredPropTypes);
         }
 
-        if (annotation.type === 'ObjectTypeAnnotation') {
-          ignorePropsValidation = declarePropTypesForObjectTypeAnnotation(annotation, declaredPropTypes);
-        } else {
-          const typeNode = typeScope(annotation.id.name);
+        const typeNode = typeScope(annotation.id.name);
 
-          if (!typeNode) {
-            ignorePropsValidation = true;
-          } else if (typeNode.type === 'IntersectionTypeAnnotation') {
-            ignorePropsValidation = declarePropTypesForIntersectionTypeAnnotation(typeNode, declaredPropTypes);
-          } else {
-            ignorePropsValidation = declarePropTypesForObjectTypeAnnotation(typeNode, declaredPropTypes);
-          }
+        if (!typeNode) {
+          return true;
+        } else if (typeNode.type === 'IntersectionTypeAnnotation') {
+          return declarePropTypesForIntersectionTypeAnnotation(typeNode, declaredPropTypes);
         }
 
-        return ignorePropsValidation;
-      }, false);
+        return declarePropTypesForObjectTypeAnnotation(typeNode, declaredPropTypes);
+      });
     }
 
     /**