Revert old implementation and replace by configurable flowVersion

Author: jseminck

lib/rules/prop-types.js

@@ -11,6 +11,7 @@ const has = require('has');
 const Components = require('../util/Components');
 const variable = require('../util/variable');
 const annotations = require('../util/annotations');
+const flowVersionUtil = require('../util/flowVersion');
 
 // ------------------------------------------------------------------------------
 // Constants
@@ -173,7 +174,7 @@ module.exports = {
      */
     function isSuperTypeParameterPropsDeclaration(node) {
       if (node && node.type === 'ClassDeclaration') {
-        if (node.superTypeParameters && node.superTypeParameters.params.length >= 2) {
+        if (node.superTypeParameters && node.superTypeParameters.params.length) {
           return true;
         }
       }
@@ -857,7 +858,13 @@ module.exports = {
      * @returns {ASTNode} The resolved type annotation for the node.
      */
     function resolveSuperParameterPropsType(node) {
-      let annotation = node.superTypeParameters.params[1];
+      let annotation;
+      if (flowVersionUtil.test(context, '0.53.0')) {
+        annotation = node.superTypeParameters.params[0];
+      } else {
+        annotation = node.superTypeParameters.params[1];
+      }
+
       while (annotation && (annotation.type === 'TypeAnnotation' || annotation.type === 'NullableTypeAnnotation')) {
         annotation = annotation.typeAnnotation;
       }
@@ -917,12 +924,6 @@ module.exports = {
         }
       },
 
-      TypeParameterInstantiation: function(node) {
-        if (node.params && node.params[0].type === 'GenericTypeAnnotation') {
-          markPropTypesAsDeclared(node, resolveTypeAnnotation(node.params[0]));
-        }
-      },
-
       VariableDeclarator: function(node) {
         const destructuring = node.init && node.id && node.id.type === 'ObjectPattern';
         // let {props: {firstname}} = this

lib/util/flowVersion.js

@@ -0,0 +1,28 @@
+/**
+ * @fileoverview Utility functions for Flow version configuration
+ */
+'use strict';
+
+function getFromContext(context) {
+  let confVer = '999.999.999';
+  // .eslintrc shared settings (http://eslint.org/docs/user-guide/configuring#adding-shared-settings)
+  if (context.settings.react && context.settings.react.flowVersion) {
+    confVer = context.settings.react.flowVersion;
+  }
+  confVer = /^[0-9]+\.[0-9]+$/.test(confVer) ? `${confVer}.0` : confVer;
+  return confVer.split('.').map(part => Number(part));
+}
+
+function test(context, methodVer) {
+  const confVer = getFromContext(context);
+  methodVer = methodVer.split('.').map(part => Number(part));
+  const higherMajor = methodVer[0] < confVer[0];
+  const higherMinor = methodVer[0] === confVer[0] && methodVer[1] < confVer[1];
+  const higherOrEqualPatch = methodVer[0] === confVer[0] && methodVer[1] === confVer[1] && methodVer[2] <= confVer[2];
+
+  return higherMajor || higherMinor || higherOrEqualPatch;
+}
+
+module.exports = {
+  test: test
+};

tests/lib/rules/prop-types.js

@@ -1486,6 +1486,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1499,6 +1500,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1514,6 +1516,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1534,6 +1537,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1546,6 +1550,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -1556,6 +1561,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     },
     {
@@ -1570,9 +1576,9 @@ ruleTester.run('prop-types', rule, {
           }
         }
       `,
+      settings: {react: {flowVersion: '0.53.0'}},
       parser: 'babel-eslint'
-    },
-    {
+    }, {
       code: `
         type FancyProps = {
           foo: string,
@@ -1584,6 +1590,7 @@ ruleTester.run('prop-types', rule, {
           }
         }
       `,
+      settings: {react: {flowVersion: '0.53.0'}},
       parser: 'babel-eslint'
     },
     // issue #1288
@@ -2865,6 +2872,7 @@ ruleTester.run('prop-types', rule, {
         column: 35,
         type: 'Identifier'
       }],
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2884,6 +2892,7 @@ ruleTester.run('prop-types', rule, {
         column: 13,
         type: 'Property'
       }],
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2905,6 +2914,7 @@ ruleTester.run('prop-types', rule, {
         column: 7,
         type: 'Property'
       }],
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2921,6 +2931,7 @@ ruleTester.run('prop-types', rule, {
         column: 40,
         type: 'Identifier'
       }],
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2937,6 +2948,7 @@ ruleTester.run('prop-types', rule, {
         column: 42,
         type: 'Identifier'
       }],
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: [
@@ -2955,6 +2967,7 @@ ruleTester.run('prop-types', rule, {
         column: 42,
         type: 'Identifier'
       }],
+      settings: {react: {flowVersion: '0.52.0'}},
       parser: 'babel-eslint'
     }, {
       code: `
@@ -2974,6 +2987,7 @@ ruleTester.run('prop-types', rule, {
         column: 37,
         type: 'Identifier'
       }],
+      settings: {react: {flowVersion: '0.53.0'}},
       parser: 'babel-eslint'
     }, {
       code: `
@@ -2993,6 +3007,7 @@ ruleTester.run('prop-types', rule, {
         column: 37,
         type: 'Identifier'
       }],
+      settings: {react: {flowVersion: '0.53.0'}},
       parser: 'babel-eslint'
     }
   ]