buildReactDeclarationTypes to always return an object

Author: Joachim Seminck

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

@@ -359,7 +359,7 @@ module.exports = {
         value.callee.object &&
         hasCustomValidator(value.callee.object.name)
       ) {
-        return true;
+        return {};
       }
 
       if (
@@ -387,23 +387,20 @@ module.exports = {
         switch (callName) {
           case 'shape':
             if (skipShapeProps) {
-              return true;
+              return {};
             }
 
             if (argument.type !== 'ObjectExpression') {
               // Invalid proptype or cannot analyse statically
-              return true;
+              return {};
             }
             const shapeTypeDefinition = {
               type: 'shape',
               children: []
             };
             iterateProperties(argument.properties, (childKey, childValue) => {
               const fullName = [parentName, childKey].join('.');
-              let types = buildReactDeclarationTypes(childValue, fullName);
-              if (types === true) {
-                types = {};
-              }
+              const types = buildReactDeclarationTypes(childValue, fullName);
               types.fullName = fullName;
               types.name = childKey;
               types.node = childValue;
@@ -413,10 +410,7 @@ module.exports = {
           case 'arrayOf':
           case 'objectOf':
             const fullName = [parentName, '*'].join('.');
-            let child = buildReactDeclarationTypes(argument, fullName);
-            if (child === true) {
-              child = {};
-            }
+            const child = buildReactDeclarationTypes(argument, fullName);
             child.fullName = fullName;
             child.name = '__ANY_KEY__';
             child.node = argument;
@@ -430,7 +424,7 @@ module.exports = {
               !argument.elements.length
             ) {
               // Invalid proptype or cannot analyse statically
-              return true;
+              return {};
             }
             const unionTypeDefinition = {
               type: 'union',
@@ -439,7 +433,7 @@ module.exports = {
             for (let i = 0, j = argument.elements.length; i < j; i++) {
               const type = buildReactDeclarationTypes(argument.elements[i], parentName);
               // keep only complex type
-              if (type !== true) {
+              if (Object.keys(type).length > 0) {
                 if (type.children === true) {
                   // every child is accepted for one type, abort type analysis
                   unionTypeDefinition.children = true;
@@ -451,7 +445,7 @@ module.exports = {
             }
             if (unionTypeDefinition.length === 0) {
               // no complex type found, simply accept everything
-              return true;
+              return {};
             }
             return unionTypeDefinition;
           case 'instanceOf':
@@ -462,11 +456,11 @@ module.exports = {
             };
           case 'oneOf':
           default:
-            return true;
+            return {};
         }
       }
       // Unknown property or accepts everything (any, object, ...)
-      return true;
+      return {};
     }
 
     /**
@@ -792,10 +786,7 @@ module.exports = {
               ignorePropsValidation = true;
               return;
             }
-            let types = buildReactDeclarationTypes(value, key);
-            if (types === true) {
-              types = {};
-            }
+            const types = buildReactDeclarationTypes(value, key);
             types.fullName = key;
             types.name = key;
             types.node = value;

lib/rules/prop-types.js

@@ -262,7 +262,7 @@ module.exports = {
           // If it's a computed property, we can't make any further analysis, but is valid
           return key === '__COMPUTED_PROP__';
         }
-        if (propType === true || typeof propType === 'object' && Object.keys(propType).length === 0) {
+        if (typeof propType === 'object' && Object.keys(propType).length === 0) {
           return true;
         }
         // Consider every children as declared
@@ -379,7 +379,7 @@ module.exports = {
      * Creates the representation of the React propTypes for the component.
      * The representation is used to verify nested used properties.
      * @param {ASTNode} value Node of the PropTypes for the desired property
-     * @return {Object|Boolean} The representation of the declaration, true means
+     * @return {Object} The representation of the declaration, empty object means
      *    the property is declared without the need for further analysis.
      */
     function buildReactDeclarationTypes(value) {
@@ -389,7 +389,7 @@ module.exports = {
         value.callee.object &&
         hasCustomValidator(value.callee.object.name)
       ) {
-        return true;
+        return {};
       }
 
       if (
@@ -418,7 +418,7 @@ module.exports = {
           case 'shape':
             if (argument.type !== 'ObjectExpression') {
               // Invalid proptype or cannot analyse statically
-              return true;
+              return {};
             }
             const shapeTypeDefinition = {
               type: 'shape',
@@ -442,7 +442,7 @@ module.exports = {
               !argument.elements.length
             ) {
               // Invalid proptype or cannot analyse statically
-              return true;
+              return {};
             }
             const unionTypeDefinition = {
               type: 'union',
@@ -451,7 +451,7 @@ module.exports = {
             for (let i = 0, j = argument.elements.length; i < j; i++) {
               const type = buildReactDeclarationTypes(argument.elements[i]);
               // keep only complex type
-              if (type !== true) {
+              if (Object.keys(type).length > 0) {
                 if (type.children === true) {
                   // every child is accepted for one type, abort type analysis
                   unionTypeDefinition.children = true;
@@ -463,7 +463,7 @@ module.exports = {
             }
             if (unionTypeDefinition.length === 0) {
               // no complex type found, simply accept everything
-              return true;
+              return {};
             }
             return unionTypeDefinition;
           case 'instanceOf':
@@ -474,11 +474,11 @@ module.exports = {
             };
           case 'oneOf':
           default:
-            return true;
+            return {};
         }
       }
       // Unknown property or accepts everything (any, object, ...)
-      return true;
+      return {};
     }
 
     /**