[Fix] super type parameter resolving in newer @typescript-eslint/parser versions

Author: hampustagerud

lib/util/propTypes.js

@@ -41,7 +41,8 @@ function isFunctionType(node) {
  */
 function isSuperTypeParameterPropsDeclaration(node) {
   if (node && (node.type === 'ClassDeclaration' || node.type === 'ClassExpression')) {
-    if (node.superTypeParameters && node.superTypeParameters.params.length > 0) {
+    const parameters = propsUtil.getSuperTypeArguments(node);
+    if (parameters && parameters.params.length > 0) {
       return true;
     }
   }
@@ -1119,23 +1120,25 @@ module.exports = function propTypesInstructions(context, components, utils) {
   }
 
   /**
-   * Resolve the type annotation for a given class declaration node with superTypeParameters.
+   * Resolve the type annotation for a given class declaration node.
    *
    * @param {ASTNode} node The annotation or a node containing the type annotation.
    * @returns {ASTNode} The resolved type annotation for the node.
    */
   function resolveSuperParameterPropsType(node) {
     let propsParameterPosition;
+    const parameters = propsUtil.getSuperTypeArguments(node);
+
     try {
       // Flow <=0.52 had 3 required TypedParameters of which the second one is the Props.
       // Flow >=0.53 has 2 optional TypedParameters of which the first one is the Props.
       propsParameterPosition = testFlowVersion(context, '>= 0.53.0') ? 0 : 1;
     } catch (e) {
       // In case there is no flow version defined, we can safely assume that when there are 3 Props we are dealing with version <= 0.52
-      propsParameterPosition = node.superTypeParameters.params.length <= 2 ? 0 : 1;
+      propsParameterPosition = parameters.params.length <= 2 ? 0 : 1;
     }
 
-    let annotation = node.superTypeParameters.params[propsParameterPosition];
+    let annotation = parameters.params[propsParameterPosition];
     while (annotation && (annotation.type === 'TypeAnnotation' || annotation.type === 'NullableTypeAnnotation')) {
       annotation = annotation.typeAnnotation;
     }

lib/util/props.js

@@ -105,6 +105,18 @@ function getTypeArguments(node) {
   return node.typeParameters;
 }
 
+/**
+ * Returns the super type arguments of a node or super type parameters if type arguments are not available.
+ * @param {ASTNode} node The node to get the super type arguments from.
+ * @returns {ASTNode} The super type arguments or parameters of the node.
+ */
+function getSuperTypeArguments(node) {
+  if ('superTypeArguments' in node) {
+    return node.superTypeArguments;
+  }
+  return node.superTypeParameters;
+}
+
 module.exports = {
   isPropTypesDeclaration,
   isContextTypesDeclaration,
@@ -114,4 +126,5 @@ module.exports = {
   isDisplayNameDeclaration,
   isRequiredPropType,
   getTypeArguments,
+  getSuperTypeArguments,
 };