refactor

Author: danadajian

src/definitions/object.ts

@@ -98,10 +98,10 @@ export function buildObjectTypeDefinition(
     const fieldNodes = typeInResolverInterfacesConfig
       ? node.fields
       : fieldsWithArguments;
-    const hasConstructor = Boolean(constructor);
+    const abstractModifier = constructor ? "abstract " : "";
     const keyWord = constructor ? "abstract class" : "interface";
     return `${annotations}${outputRestrictionAnnotation}${keyWord} ${name}${constructor}${interfaceInheritance} {
-${getDataClassMembers({ node, fieldNodes, schema, config, shouldGenerateFunctions, hasConstructor })}
+${getDataClassMembers({ node, fieldNodes, schema, config, shouldGenerateFunctions, abstractModifier })}
 }`;
   }
 
@@ -115,15 +115,15 @@ function getDataClassMembers({
   fieldNodes,
   schema,
   config,
+  abstractModifier,
   shouldGenerateFunctions,
-  hasConstructor,
 }: {
   node: ObjectTypeDefinitionNode;
   fieldNodes?: readonly FieldDefinitionNode[];
   schema: GraphQLSchema;
   config: CodegenConfigWithDefaults;
+  abstractModifier?: string;
   shouldGenerateFunctions?: boolean;
-  hasConstructor?: boolean;
 }) {
   return (fieldNodes ?? node.fields)
     ?.map((fieldNode) => {
@@ -134,8 +134,8 @@ function getDataClassMembers({
         schema,
         config,
         typeMetadata,
+        abstractModifier,
         shouldGenerateFunctions,
-        hasConstructor,
       );
     })
     .join(`${shouldGenerateFunctions ? "" : ","}\n`);

src/helpers/build-field-definition.ts

@@ -31,15 +31,15 @@ export function buildFieldDefinition(
   schema: GraphQLSchema,
   config: CodegenConfigWithDefaults,
   typeMetadata: TypeMetadata,
+  abstractModifier: string = "",
   shouldGenerateFunctions?: boolean,
-  hasConstructor?: boolean,
 ) {
   const modifier = buildFieldModifier(
     node,
     fieldNode,
     schema,
     config,
-    hasConstructor,
+    abstractModifier,
   );
   const fieldArguments = buildFieldArguments(node, fieldNode, schema, config);
   const fieldDefinition = `${modifier} ${fieldNode.name.value}${fieldArguments}`;
@@ -80,7 +80,7 @@ function buildFieldModifier(
   fieldNode: FieldDefinitionNode,
   schema: GraphQLSchema,
   config: CodegenConfigWithDefaults,
-  hasConstructor?: boolean,
+  abstractModifier: string,
 ) {
   const typeInResolverInterfacesConfig = findTypeInResolverInterfacesConfig(
     node,
@@ -102,7 +102,6 @@ function buildFieldModifier(
   if (node.kind === Kind.INTERFACE_TYPE_DEFINITION) {
     return `${functionModifier}fun`;
   }
-  const abstractModifier = hasConstructor ? "abstract " : "";
 
   return `${abstractModifier}${overrideModifier}${functionModifier}fun`;
 }