KnownArgumentNames rule now works correctly with directives

sangria-graphql · Aug 7, 2015 · d751be4 · d751be4
1 parent 1a88cb1
commit d751be4
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 8 deletions.
diff --git a/src/main/scala/sangria/validation/Violation.scala b/src/main/scala/sangria/validation/Violation.scala
@@ -84,6 +84,10 @@ case class UnknownArgViolation(argName: String, fieldName: String, typeName: Str
   lazy val errorMessage = s"Unknown argument '$argName' on field '$fieldName' of type '$typeName'.$astLocation"
 }
 
+case class UnknownDirectiveArgViolation(argName: String, dirName: String, sourceMapper: Option[SourceMapper], positions: List[Position]) extends AstNodeViolation {
+  lazy val errorMessage = s"Unknown argument '$argName' on directive '$dirName'.$astLocation"
+}
+
 case class UnknownDirectiveViolation(name: String, sourceMapper: Option[SourceMapper], positions: List[Position]) extends AstNodeViolation {
   lazy val errorMessage = s"Unknown directive '$name'.$astLocation"
 }

diff --git a/src/main/scala/sangria/validation/rules/KnownArgumentNames.scala b/src/main/scala/sangria/validation/rules/KnownArgumentNames.scala
@@ -15,14 +15,32 @@ class KnownArgumentNames extends ValidationRule {
   override def visitor(ctx: ValidationContext) = new AstValidatingVisitor {
     override val onEnter: ValidationVisit = {
       case ast.Argument(name, _, pos) =>
-        ctx.typeInfo.fieldDef match {
-          case Some(field) if !field.arguments.exists(_.name == name) =>
-            Left(Vector(UnknownArgViolation(
-              name,
-              field.name,
-              ctx.typeInfo.previousParentType.fold("")(SchemaRenderer.renderTypeName(_, topLevel = true)),
-              ctx.sourceMapper,
-              pos.toList)))
+        ctx.typeInfo.ancestors.drop(1).head match {
+          case _: ast.Field =>
+            ctx.typeInfo.fieldDef match {
+              case Some(field) if !field.arguments.exists(_.name == name) =>
+                Left(Vector(UnknownArgViolation(
+                  name,
+                  field.name,
+                  ctx.typeInfo.previousParentType.fold("")(SchemaRenderer.renderTypeName(_, topLevel = true)),
+                  ctx.sourceMapper,
+                  pos.toList)))
+              case _ =>
+                Right(Continue)
+            }
+
+          case _: ast.Directive =>
+            ctx.typeInfo.directive match {
+              case Some(dir) if !dir.arguments.exists(_.name == name) =>
+                Left(Vector(UnknownDirectiveArgViolation(
+                  name,
+                  dir.name,
+                  ctx.sourceMapper,
+                  pos.toList)))
+              case _ =>
+                Right(Continue)
+            }
+
           case _ =>
             Right(Continue)
         }

diff --git a/src/test/scala/sangria/validation/rules/KnownArgumentNamesSpec.scala b/src/test/scala/sangria/validation/rules/KnownArgumentNamesSpec.scala
@@ -59,6 +59,23 @@ class KnownArgumentNamesSpec extends WordSpec with ValidationSupport {
         }
       """)
 
+    "directive args are known" in expectPasses(
+      """
+        {
+          dog @skip(if: true)
+        }
+      """)
+
+    "undirective args are invalid" in expectFails(
+      """
+        {
+          dog @skip(unless: true)
+        }
+      """,
+      List(
+        "Unknown argument 'unless' on directive 'skip'." -> Some(Pos(3, 21))
+      ))
+
     "invalid arg name" in expectFails(
       """
         fragment invalidArgName on Dog {