[Refactor] extract super type arguments with a utility

Author: hampustagerud

lib/util/propTypes.js

@@ -41,7 +41,7 @@ function isFunctionType(node) {
  */
 function isSuperTypeParameterPropsDeclaration(node) {
   if (node && (node.type === 'ClassDeclaration' || node.type === 'ClassExpression')) {
-    const parameters = node.superTypeParameters || node.superTypeArguments;
+    const parameters = propsUtil.getSuperTypeArguments(node);
     if (parameters && parameters.params.length > 0) {
       return true;
     }
@@ -1127,7 +1127,7 @@ module.exports = function propTypesInstructions(context, components, utils) {
    */
   function resolveSuperParameterPropsType(node) {
     let propsParameterPosition;
-    const parameters = node.superTypeParameters || node.superTypeArguments;
+    const parameters = propsUtil.getSuperTypeArguments(node);
 
     try {
       // Flow <=0.52 had 3 required TypedParameters of which the second one is the Props.

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,
 };