refactor and update test

Author: danadajian

src/annotations/build-directive-annotations.ts

@@ -60,45 +60,22 @@ export function buildDirectiveAnnotations(
           ).join("\n") + "\n"
         );
       }
-      if (config.customDirectives) {
-        return buildCustomDirectives(directive);
+      const customDirectiveFromConfig = config.customDirectives?.find(
+        (directive) => directive === directiveName,
+      );
+      if (customDirectiveFromConfig) {
+        return buildCustomDirective(directive);
       }
       return "";
     })
     .join("");
 }
 
-function buildCustomDirectives(directive: ConstDirectiveNode) {
+function buildCustomDirective(directive: ConstDirectiveNode) {
   const directiveName = directive.name.value;
   return `@${titleCase(directiveName)}\n`;
 }
 
-function buildDirectiveArguments(
-  directive: ConstDirectiveNode,
-  argumentsToRetain: string[],
-) {
-  return argumentsToRetain
-    .map((argumentToRetain) => {
-      const argumentValueNode = directive.arguments?.find(
-        (argument) => argument.name.value === argumentToRetain,
-      )?.value;
-      if (!argumentValueNode)
-        throw new Error(
-          `Argument ${argumentToRetain} was provided in argumentsToRetain config but was not found in directive ${directive.name.value}`,
-        );
-      if (!("value" in argumentValueNode))
-        throw new Error(
-          `Directive argument ${argumentToRetain} in directive ${directive.name.value} has an unsupported type. Only INT, FLOAT, STRING, BOOLEAN, and ENUM are supported.`,
-        );
-      const argumentValue =
-        argumentValueNode.kind === Kind.STRING
-          ? `"${argumentValueNode.value}"`
-          : argumentValueNode.value;
-      return `${argumentToRetain} = ${argumentValue}`;
-    })
-    .join(", ");
-}
-
 function buildKotlinAnnotationsFromConfig(
   directive: ConstDirectiveNode,
   kotlinAnnotations: NonNullable<
@@ -107,10 +84,26 @@ function buildKotlinAnnotationsFromConfig(
 ) {
   return kotlinAnnotations.map((kotlinAnnotation) => {
     if (typeof kotlinAnnotation === "string") return kotlinAnnotation;
-    const directiveArguments = buildDirectiveArguments(
-      directive,
-      kotlinAnnotation.argumentsToRetain,
-    );
+    const directiveArguments = kotlinAnnotation.argumentsToRetain
+      ?.map((argumentToRetain) => {
+        const argumentValueNode = directive.arguments?.find(
+          (argument) => argument.name.value === argumentToRetain,
+        )?.value;
+        if (!argumentValueNode)
+          throw new Error(
+            `Argument ${argumentToRetain} was provided in argumentsToRetain config but was not found in directive ${directive.name.value}`,
+          );
+        if (!("value" in argumentValueNode))
+          throw new Error(
+            `Directive argument ${argumentToRetain} in directive ${directive.name.value} has an unsupported type. Only INT, FLOAT, STRING, BOOLEAN, and ENUM are supported.`,
+          );
+        const argumentValue =
+          argumentValueNode.kind === Kind.STRING
+            ? `"${argumentValueNode.value}"`
+            : argumentValueNode.value;
+        return `${argumentToRetain} = ${argumentValue}`;
+      })
+      .join(", ");
     return `@${kotlinAnnotation.annotationName}(${directiveArguments})`;
   });
 }

test/unit/should_generate_custom_directives/codegen.config.ts

@@ -1,7 +1,7 @@
 import { GraphQLKotlinCodegenConfig } from "../../../src/plugin";
 
 export default {
-  customDirectives: ["myCustomDirective", "myCustomDirectiveWithArgs"],
+  customDirectives: ["myCustomDirective", "myCustomDirective2"],
   extraImports: ["should_honor_directiveReplacements_config.*"],
   directiveReplacements: [
     {

test/unit/should_generate_custom_directives/expected.kt

@@ -10,7 +10,15 @@ import should_honor_directiveReplacements_config.*
 )
 annotation class MyCustomDirective
 
+@GraphQLDirective(
+    name = "MyCustomDirective2",
+    description = "",
+    locations = [graphql.introspection.Introspection.DirectiveLocation.OBJECT, graphql.introspection.Introspection.DirectiveLocation.FIELD_DEFINITION, graphql.introspection.Introspection.DirectiveLocation.INPUT_OBJECT, graphql.introspection.Introspection.DirectiveLocation.INPUT_FIELD_DEFINITION]
+)
+annotation class MyCustomDirective2
+
 @MyCustomDirective
+@MyCustomDirective2
 @SomeAnnotation1
 @GraphQLValidObjectLocations(locations = [GraphQLValidObjectLocations.Locations.OBJECT])
 data class MyTypeWithCustomDirectiveOnObject(

test/unit/should_generate_custom_directives/schema.graphql

@@ -1,9 +1,13 @@
 "A description for MyCustomDirective"
 directive @myCustomDirective on OBJECT | FIELD_DEFINITION | INPUT_OBJECT | INPUT_FIELD_DEFINITION
+directive @myCustomDirective2 on OBJECT | FIELD_DEFINITION | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
 directive @someDirective1 on OBJECT
 
-type MyTypeWithCustomDirectiveOnObject @myCustomDirective @someDirective1 {
+type MyTypeWithCustomDirectiveOnObject
+  @myCustomDirective
+  @myCustomDirective2
+  @someDirective1 {
   field: String
 }