Fix default-props-match-prop-types type annotations detection with ESLint 3

Author: yannickcr

lib/rules/default-props-match-prop-types.js

@@ -41,6 +41,9 @@ module.exports = {
     const configuration = context.options[0] || {};
     const allowRequiredDefaults = configuration.allowRequiredDefaults || false;
     const propWrapperFunctions = new Set(context.settings.propWrapperFunctions || []);
+    // Used to track the type annotations in scope.
+    // Necessary because babel's scopes do not track type annotations.
+    let stack = null;
 
     /**
      * Try to resolve the node passed in to a variable in the current scope. If the node passed in is not
@@ -62,6 +65,22 @@ module.exports = {
       return node;
     }
 
+    /**
+     * Helper for accessing the current scope in the stack.
+     * @param {string} key The name of the identifier to access. If omitted, returns the full scope.
+     * @param {ASTNode} value If provided sets the new value for the identifier.
+     * @returns {Object|ASTNode} Either the whole scope or the ASTNode associated with the given identifier.
+     */
+    function typeScope(key, value) {
+      if (arguments.length === 0) {
+        return stack[stack.length - 1];
+      } else if (arguments.length === 1) {
+        return stack[stack.length - 1][key];
+      }
+      stack[stack.length - 1][key] = value;
+      return value;
+    }
+
     /**
      * Tries to find the definition of a GenericTypeAnnotation in the current scope.
      * @param  {ASTNode}      node The node GenericTypeAnnotation node to resolve.
@@ -72,7 +91,7 @@ module.exports = {
         return null;
       }
 
-      return variableUtil.findVariableByName(context, node.id.name);
+      return variableUtil.findVariableByName(context, node.id.name) || typeScope(node.id.name);
     }
 
     function resolveUnionTypeAnnotation(node) {
@@ -551,12 +570,29 @@ module.exports = {
         });
       },
 
+      TypeAlias: function(node) {
+        typeScope(node.id.name, node.right);
+      },
+
+      Program: function() {
+        stack = [{}];
+      },
+
+      BlockStatement: function () {
+        stack.push(Object.create(typeScope()));
+      },
+
+      'BlockStatement:exit': function () {
+        stack.pop();
+      },
+
       // Check for type annotations in stateless components
       FunctionDeclaration: handleStatelessComponent,
       ArrowFunctionExpression: handleStatelessComponent,
       FunctionExpression: handleStatelessComponent,
 
       'Program:exit': function() {
+        stack = null;
         const list = components.list();
 
         for (const component in list) {