Merge pull request #123 from samisuteria/samisuteria/extended-kitchen-sink

Update Schema Kitchen Sink Parsing + Tests

Author: NeedleInAJayStack

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 = "..."
@@ -1102,6 +1103,11 @@ extension SchemaDefinition: TypeSystemDefinition {}
 extension TypeExtensionDefinition: TypeSystemDefinition {}
 extension SchemaExtensionDefinition: TypeSystemDefinition {}
 extension DirectiveDefinition: TypeSystemDefinition {}
+extension InterfaceExtensionDefinition: TypeSystemDefinition {}
+extension ScalarExtensionDefinition: TypeSystemDefinition {}
+extension UnionExtensionDefinition: TypeSystemDefinition {}
+extension EnumExtensionDefinition: TypeSystemDefinition {}
+extension InputObjectExtensionDefinition: TypeSystemDefinition {}
 
 public func == (lhs: TypeSystemDefinition, rhs: TypeSystemDefinition) -> Bool {
     switch lhs {
@@ -1125,6 +1131,26 @@ public func == (lhs: TypeSystemDefinition, rhs: TypeSystemDefinition) -> Bool {
         if let r = rhs as? SchemaExtensionDefinition {
             return l == r
         }
+    case let l as InterfaceExtensionDefinition:
+        if let r = rhs as? InterfaceExtensionDefinition {
+            return l == r
+        }
+    case let l as ScalarExtensionDefinition:
+        if let r = rhs as? ScalarExtensionDefinition {
+            return l == r
+        }
+    case let l as UnionExtensionDefinition:
+        if let r = rhs as? UnionExtensionDefinition {
+            return l == r
+        }
+    case let l as EnumExtensionDefinition:
+        if let r = rhs as? EnumExtensionDefinition {
+            return l == r
+        }
+    case let l as InputObjectExtensionDefinition:
+        if let r = rhs as? InputObjectExtensionDefinition {
+            return l == r
+        }
     default:
         return false
     }
@@ -1566,26 +1592,120 @@ extension SchemaExtensionDefinition: Equatable {
     }
 }
 
+public final class InterfaceExtensionDefinition {
+    public let kind: Kind = .interfaceExtensionDefinition
+    public let loc: Location?
+    public let definition: InterfaceTypeDefinition
+
+    init(loc: Location? = nil, definition: InterfaceTypeDefinition) {
+        self.loc = loc
+        self.definition = definition
+    }
+}
+
+extension InterfaceExtensionDefinition: Equatable {
+    public static func == (
+        lhs: InterfaceExtensionDefinition,
+        rhs: InterfaceExtensionDefinition
+    ) -> Bool {
+        return lhs.definition == rhs.definition
+    }
+}
+
+public final class ScalarExtensionDefinition {
+    public let kind: Kind = .scalarExtensionDefinition
+    public let loc: Location?
+    public let definition: ScalarTypeDefinition
+
+    init(loc: Location? = nil, definition: ScalarTypeDefinition) {
+        self.loc = loc
+        self.definition = definition
+    }
+}
+
+extension ScalarExtensionDefinition: Equatable {
+    public static func == (lhs: ScalarExtensionDefinition, rhs: ScalarExtensionDefinition) -> Bool {
+        return lhs.definition == rhs.definition
+    }
+}
+
+public final class UnionExtensionDefinition {
+    public let kind: Kind = .unionExtensionDefinition
+    public let loc: Location?
+    public let definition: UnionTypeDefinition
+
+    init(loc: Location? = nil, definition: UnionTypeDefinition) {
+        self.loc = loc
+        self.definition = definition
+    }
+}
+
+extension UnionExtensionDefinition: Equatable {
+    public static func == (lhs: UnionExtensionDefinition, rhs: UnionExtensionDefinition) -> Bool {
+        return lhs.definition == rhs.definition
+    }
+}
+
+public final class EnumExtensionDefinition {
+    public let kind: Kind = .enumExtensionDefinition
+    public let loc: Location?
+    public let definition: EnumTypeDefinition
+
+    init(loc: Location? = nil, definition: EnumTypeDefinition) {
+        self.loc = loc
+        self.definition = definition
+    }
+}
+
+extension EnumExtensionDefinition: Equatable {
+    public static func == (lhs: EnumExtensionDefinition, rhs: EnumExtensionDefinition) -> Bool {
+        return lhs.definition == rhs.definition
+    }
+}
+
+public final class InputObjectExtensionDefinition {
+    public let kind: Kind = .inputObjectExtensionDefinition
+    public let loc: Location?
+    public let definition: InputObjectTypeDefinition
+
+    init(loc: Location? = nil, definition: InputObjectTypeDefinition) {
+        self.loc = loc
+        self.definition = definition
+    }
+}
+
+extension InputObjectExtensionDefinition: Equatable {
+    public static func == (
+        lhs: InputObjectExtensionDefinition,
+        rhs: InputObjectExtensionDefinition
+    ) -> Bool {
+        return lhs.definition == rhs.definition
+    }
+}
+
 public final class DirectiveDefinition {
     public let kind: Kind = .directiveDefinition
     public let loc: Location?
     public let description: StringValue?
     public let name: Name
     public let arguments: [InputValueDefinition]
     public let locations: [Name]
+    public let repeatable: Bool
 
     init(
         loc: Location? = nil,
         description: StringValue? = nil,
         name: Name,
         arguments: [InputValueDefinition] = [],
-        locations: [Name]
+        locations: [Name],
+        repeatable: Bool = false
     ) {
         self.loc = loc
         self.name = name
         self.description = description
         self.arguments = arguments
         self.locations = locations
+        self.repeatable = repeatable
     }
 }
 

Sources/GraphQL/Language/Kinds.swift

@@ -37,4 +37,9 @@ public enum Kind {
     case typeExtensionDefinition
     case directiveDefinition
     case schemaExtensionDefinition
+    case interfaceExtensionDefinition
+    case scalarExtensionDefinition
+    case unionExtensionDefinition
+    case enumExtensionDefinition
+    case inputObjectExtensionDefinition
 }

Sources/GraphQL/Language/Lexer.swift

@@ -46,6 +46,22 @@ func advanceLexer(lexer: Lexer) throws -> Token {
     return token
 }
 
+/**
+ * Returns a non-empty list of parse nodes, determined by the parseFn.
+ * This list may begin with a lex token of delimiterKind followed by items separated by lex tokens of tokenKind.
+ * Advances the parser to the next lex token after last item in the list.
+ */
+func delimitedMany<T>(lexer: Lexer, kind: Token.Kind, parseFn: (Lexer) throws -> T) throws -> [T] {
+    _ = try expectOptional(lexer: lexer, kind: kind)
+
+    var nodes: [T] = []
+    repeat {
+        try nodes.append(parseFn(lexer))
+    } while try expectOptional(lexer: lexer, kind: kind) != nil
+
+    return nodes
+}
+
 /**
  * The return type of createLexer.
  */
@@ -244,6 +260,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(