refactor

Author: danadajian

src/definitions/interface.ts

@@ -31,14 +31,14 @@ export function buildInterfaceDefinition(
   const classMembers = node.fields
     ?.map((fieldNode) => {
       const typeMetadata = buildTypeMetadata(fieldNode.type, schema, config);
-      return buildFieldDefinition(
+      return buildFieldDefinition({
         node,
         fieldNode,
         schema,
         config,
         typeMetadata,
-        Boolean(fieldNode.arguments?.length),
-      );
+        shouldGenerateFunctions: Boolean(fieldNode.arguments?.length),
+      });
     })
     .join("\n");
 

src/definitions/object.ts

@@ -103,15 +103,15 @@ ${getDataClassMembers({ node, fieldNodes, schema, config, shouldGenerateFunction
                 schema,
                 config,
               );
-              return buildFieldDefinition(
+              return buildFieldDefinition({
                 node,
                 fieldNode,
                 schema,
                 config,
                 typeMetadata,
                 shouldGenerateFunctions,
-                true,
-              );
+                isConstructorField: true,
+              });
             })
             .join(",\n")}\n)`
         : "";
@@ -142,14 +142,14 @@ function getDataClassMembers({
   return (fieldNodes ?? node.fields)
     ?.map((fieldNode) => {
       const typeMetadata = buildTypeMetadata(fieldNode.type, schema, config);
-      return buildFieldDefinition(
+      return buildFieldDefinition({
         node,
         fieldNode,
         schema,
         config,
         typeMetadata,
         shouldGenerateFunctions,
-      );
+      });
     })
     .join(`${shouldGenerateFunctions ? "" : ","}\n`);
 }

src/helpers/build-field-definition.ts

@@ -25,25 +25,43 @@ import { indent } from "@graphql-codegen/visitor-plugin-common";
 import { buildAnnotations } from "./build-annotations";
 import { findTypeInResolverInterfacesConfig } from "./find-type-in-resolver-interfaces-config";
 
-export function buildFieldDefinition(
-  node: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode,
-  fieldNode: FieldDefinitionNode,
-  schema: GraphQLSchema,
-  config: CodegenConfigWithDefaults,
-  typeMetadata: TypeMetadata,
-  shouldGenerateFunctions?: boolean,
-  isConstructorField?: boolean,
-) {
+export function buildFieldDefinition({
+  node,
+  fieldNode,
+  schema,
+  config,
+  typeMetadata,
+  shouldGenerateFunctions,
+  isConstructorField,
+}: {
+  node: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode;
+  fieldNode: FieldDefinitionNode;
+  schema: GraphQLSchema;
+  config: CodegenConfigWithDefaults;
+  typeMetadata: TypeMetadata;
+  shouldGenerateFunctions?: boolean;
+  isConstructorField?: boolean;
+}) {
+  const typeInResolverInterfacesConfig = findTypeInResolverInterfacesConfig(
+    node,
+    config,
+  );
   const modifier = buildFieldModifier(
     node,
     fieldNode,
     schema,
-    config,
+    typeInResolverInterfacesConfig,
     isConstructorField,
   );
   const fieldArguments = isConstructorField
     ? ""
-    : buildFieldArguments(node, fieldNode, schema, config);
+    : buildFieldArguments(
+        node,
+        fieldNode,
+        schema,
+        typeInResolverInterfacesConfig,
+        config,
+      );
   const fieldDefinition = `${modifier} ${fieldNode.name.value}${fieldArguments}`;
   const annotations = buildAnnotations({
     config,
@@ -62,10 +80,6 @@ export function buildFieldDefinition(
   const atLeastOneFieldHasNoArguments = node.fields?.some(
     (fieldNode) => !fieldNode.arguments?.length,
   );
-  const typeInResolverInterfacesConfig = findTypeInResolverInterfacesConfig(
-    node,
-    config,
-  );
   const defaultImplementation =
     !typeInResolverInterfacesConfig && atLeastOneFieldHasNoArguments
       ? fieldNode.name.value
@@ -91,13 +105,11 @@ function buildFieldModifier(
   node: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode,
   fieldNode: FieldDefinitionNode,
   schema: GraphQLSchema,
-  config: CodegenConfigWithDefaults,
+  typeInResolverInterfacesConfig: ReturnType<
+    typeof findTypeInResolverInterfacesConfig
+  >,
   isConstructorField?: boolean,
 ) {
-  const typeInResolverInterfacesConfig = findTypeInResolverInterfacesConfig(
-    node,
-    config,
-  );
   const shouldOverrideField = shouldModifyFieldWithOverride(
     node,
     fieldNode,
@@ -129,13 +141,12 @@ function buildFieldArguments(
   node: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode,
   fieldNode: FieldDefinitionNode,
   schema: GraphQLSchema,
+  typeInResolverInterfacesConfig: ReturnType<
+    typeof findTypeInResolverInterfacesConfig
+  >,
   config: CodegenConfigWithDefaults,
 ) {
-  const typeIsInResolverInterfaces = findTypeInResolverInterfacesConfig(
-    node,
-    config,
-  );
-  if (!typeIsInResolverInterfaces && !fieldNode.arguments?.length) {
+  if (!typeInResolverInterfacesConfig && !fieldNode.arguments?.length) {
     return "";
   }
   const isOverrideFunction = shouldModifyFieldWithOverride(