Add support for '&' syntax token (#126)

Author: sungam3r

.github/workflows/test.yml

@@ -41,10 +41,13 @@ jobs:
       - name: Setup .NET Core 5.0 SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '5.0.x'
+          dotnet-version: '5.0.201'
           source-url: https://nuget.pkg.github.com/graphql-dotnet/index.json
         env:
           NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Disable MSVS Nuget Source # see https://github.com/graphql-dotnet/graphql-dotnet/issues/2422
+        if: ${{ startsWith(matrix.os, 'windows') }}
+        run: dotnet nuget disable source 'Microsoft Visual Studio Offline Packages'
       - name: Install dependencies
         working-directory: src
         run: dotnet restore

src/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>7.0.1-preview</VersionPrefix>
+    <VersionPrefix>7.1.0-preview</VersionPrefix>
     <LangVersion>8.0</LangVersion>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

src/GraphQLParser.ApiTests/GraphQL-Parser.approved.txt

@@ -455,5 +455,6 @@ namespace GraphQLParser
         STRING = 18,
         COMMENT = 19,
         UNKNOWN = 20,
+        AMPERSAND = 21,
     }
 }

src/GraphQLParser.Tests/Issue2478_GraphQL_NET.cs

@@ -0,0 +1,41 @@
+using System.Linq;
+using GraphQLParser.AST;
+using Shouldly;
+using Xunit;
+
+namespace GraphQLParser.Tests
+{
+    public class Issue2478_GraphQL_NET
+    {
+        [Theory]
+        [InlineData(IgnoreOptions.None)]
+        [InlineData(IgnoreOptions.IgnoreComments)]
+        [InlineData(IgnoreOptions.IgnoreCommentsAndLocations)]
+        public void TestSchemaWithTwoInterfaceImplemented(IgnoreOptions options)
+        {
+            string query = @"
+            type Query {
+              me: Account
+            }
+
+            interface FooInterface {
+              id: String
+            }
+
+            interface BooInterface {
+              name: String
+            }
+
+            type Account implements FooInterface & BooInterface {
+              id: String
+              name: String
+            }
+        ";
+
+            using var document = query.Parse(new ParserOptions { Ignore = options });
+            document.Definitions.Count.ShouldBe(4);
+            var def = document.Definitions.Last() as GraphQLObjectTypeDefinition;
+            def.Interfaces.Count.ShouldBe(2);
+        }
+    }
+}

src/GraphQLParser/LexerContext.cs

@@ -322,6 +322,7 @@ private void Throw_From_GetUnicodeChar2(ReadOnlySpan<char> expression)
             ':' => CreatePunctuationToken(TokenKind.COLON, 1),
             '=' => CreatePunctuationToken(TokenKind.EQUALS, 1),
             '@' => CreatePunctuationToken(TokenKind.AT, 1),
+            '&' => CreatePunctuationToken(TokenKind.AMPERSAND, 1),
             '[' => CreatePunctuationToken(TokenKind.BRACKET_L, 1),
             ']' => CreatePunctuationToken(TokenKind.BRACKET_R, 1),
             '{' => CreatePunctuationToken(TokenKind.BRACE_L, 1),

src/GraphQLParser/ParserContext.Parse.cs

@@ -567,11 +567,15 @@ private void Throw_From_ParseFragmentName()
                 types = new List<GraphQLNamedType>();
                 Advance();
 
+                // Objects that implement interfaces may be defined with an optional leading & character
+                // to aid formatting when representing a longer list of implemented interfaces
+                Skip(TokenKind.AMPERSAND);
+
                 do
                 {
                     types.Add(ParseNamedType());
                 }
-                while (Peek(TokenKind.NAME));
+                while (Skip(TokenKind.AMPERSAND));
             }
 
             return types;

src/GraphQLParser/Token.cs

@@ -63,6 +63,7 @@ public Token(TokenKind kind, ROM value, int start, int end)
             TokenKind.COLON => ":",
             TokenKind.EQUALS => "=",
             TokenKind.AT => "@",
+            TokenKind.AMPERSAND => "&",
             TokenKind.BRACKET_L => "[",
             TokenKind.BRACKET_R => "]",
             TokenKind.BRACE_L => "{",

src/GraphQLParser/TokenKind.cs

@@ -110,6 +110,11 @@ public enum TokenKind
         /// <summary>
         /// Unknown token. Something went wrong.
         /// </summary>
-        UNKNOWN = 20
+        UNKNOWN = 20,
+
+        /// <summary>
+        /// &amp;
+        /// </summary>
+        AMPERSAND = 21
     }
 }