Fix parse error when argument name has input (#39)

.gitignore

@@ -8,4 +8,4 @@ gqlmerge
 .idea
 
 demo/demo.yml
-!test/*.graphql
+!test/**/*.graphql

Makefile

@@ -0,0 +1,16 @@
+SHELL = /bin/bash
+
+.PHONY: all build test
+
+all: build test
+
+build:
+	go build
+
+test: build
+	@for dir in $(shell find test -type d -name schema); do \
+		basedir=`dirname $$dir`; \
+		output="$$basedir/generated.graphql"; \
+		echo "Merging $$dir into $$output..."; \
+		./gqlmerge $$dir $$output; \
+	done

lib/lex.go

@@ -460,15 +460,24 @@ func (l *lexer) consumeToken(expected tokenType) {
 	l.skipSpace()
 }
 
-func (l *lexer) consumeIdent() (*token, *[]string) {
+func (l *lexer) consumeIdent(includings ...tokenType) (*token, *[]string) {
 	comments := []string{}
 	for {
 		tok := l.next()
 		if tok.typ == tokString || tok.typ == tokSingleLineComment || tok.typ == tokBlockString {
 			comments = append(comments, tok.String())
 			continue
 		}
-		if tok.typ != tokIdent {
+
+		isIncluded := false
+		for _, incl := range includings {
+			if tok.typ == incl {
+				isIncluded = true
+				break
+			}
+		}
+
+		if tok.typ != tokIdent && !isIncluded {
 			errorf(`%s:%d:%d: unexpected "%s"`, l.filename, l.line, l.col, tok.String())
 		}
 		l.skipSpace()

lib/parse.go

@@ -40,7 +40,7 @@ func (p *Parser) parseArgs() []*Arg {
 		p.lex.consumeToken(tokLParen)
 		for p.lex.peek() != ')' {
 			arg := Arg{}
-			name, comments := p.lex.consumeIdent()
+			name, comments := p.lex.consumeIdent(tokInput, tokType)
 			arg.Name = name.String()
 			arg.Descriptions = comments
 			p.lex.consumeToken(tokColon)

lib/parse_test.go

@@ -49,6 +49,14 @@ func TestParsing(t *testing.T) {
 	scalar DateTime # TEST
 
 	union Response = Success | Failure
+
+	input CreateLogInput {
+		text: String!
+	}
+	
+	type Mutation {
+		createLogKo(input: CreateLogInput!): String!
+	}
 `
 
 	s := Schema{}

test/arg_input/generated.graphql

@@ -0,0 +1,17 @@
+schema {
+    query: Query
+    mutation: Mutation
+    subscription: Subscription
+}
+
+type Mutation {
+    createLogKo(input: CreateLogInput!): String!
+    createLogOk(inputLog: CreateLogInput!): String!
+}
+
+
+
+
+input CreateLogInput {
+    text: String!
+}

test/generated.graphql → test/basic/generated.graphql

@@ -32,11 +32,6 @@ type User implements Node & Owner {
     avatar: Url
 }
 
-type Mutation {
-    createLogKo(inputx: CreateLogInput!): String!
-    createLogOk(inputLog: CreateLogInput!): String!
-}
-
 type UserResponse {
     ok: Boolean!
     error: String
@@ -76,7 +71,3 @@ input CreateChatInput {
     " post_id "
     postId: ID!
 }
-
-input CreateLogInput {
-    text: String!
-}