add ampersand support

Author: samisuteria

Sources/GraphQL/Language/AST.swift

@@ -39,6 +39,7 @@ public final class Token {
         case eof = "<EOF>"
         case bang = "!"
         case dollar = "$"
+        case amp = "&"
         case openingParenthesis = "("
         case closingParenthesis = ")"
         case spread = "..."

Sources/GraphQL/Language/Lexer.swift

@@ -244,6 +244,16 @@ func readToken(lexer: Lexer, prev: Token) throws -> Token {
             column: col,
             prev: prev
         )
+    // &
+    case 38:
+        return Token(
+            kind: .amp,
+            start: position,
+            end: position + 1,
+            line: line,
+            column: col,
+            prev: prev
+        )
     // (
     case 40:
         return Token(

Sources/GraphQL/Language/Parser.swift

@@ -796,17 +796,20 @@ func parseObjectTypeDefinition(lexer: Lexer) throws -> ObjectTypeDefinition {
 }
 
 /**
- * ImplementsInterfaces : implements NamedType+
+ * ImplementsInterfaces :
+ *  - implements &? NamedType
+ *  - ImplementsInterfaces & NamedType
  */
 func parseImplementsInterfaces(lexer: Lexer) throws -> [NamedType] {
     var types: [NamedType] = []
 
     if lexer.token.value == "implements" {
         try lexer.advance()
 
+        try expectOptional(lexer: lexer, kind: .amp)
         repeat {
             types.append(try parseNamedType(lexer: lexer))
-        } while peek(lexer: lexer, kind: .name)
+        } while try expectOptional(lexer: lexer, kind: .amp) != nil || peek(lexer: lexer, kind: .name)
     }
 
     return types
@@ -1148,6 +1151,20 @@ func expect(lexer: Lexer, kind: Token.Kind) throws -> Token {
     return token
 }
 
+/**
+ * If the next token is of the given kind, return that token after advancing
+ * the lexer. Otherwise, do not change the parser state and return nil.
+ */
+@discardableResult
+func expectOptional(lexer: Lexer, kind: Token.Kind) throws -> Token? {
+    let token = lexer.token
+    if token.kind == kind {
+        try lexer.advance()
+        return token
+    }
+    return nil
+}
+
 /**
  * If the next token is a keyword with the given value, return that token after
  * advancing the lexer. Otherwise, do not change the parser state and return

Tests/GraphQLTests/LanguageTests/ParserTests.swift

@@ -110,6 +110,26 @@ class ParserTests: XCTestCase {
                 "Syntax Error GraphQL (1:9) Expected Name, found }"
             ))
         }
+
+        XCTAssertThrowsError(try parse(source: "type WithImplementsButNoTypes implements {}")) { error in
+            guard let error = error as? GraphQLError else {
+                return XCTFail()
+            }
+
+            XCTAssert(error.message.contains(
+                "Syntax Error GraphQL (1:42) Expected Name, found {"
+            ))
+        }
+
+        XCTAssertThrowsError(try parse(source: "type WithImplementsWithTrailingAmp implements AInterface & {}")) { error in
+            guard let error = error as? GraphQLError else {
+                return XCTFail()
+            }
+
+            XCTAssert(error.message.contains(
+                "Syntax Error GraphQL (1:60) Expected Name, found {"
+            ))
+        }
     }
 
     func testVariableInlineValues() throws {