Fix property name as type (#45)

.github/workflows/check-diff.yml

@@ -20,6 +20,14 @@ jobs:
       uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go-version}}
+
+    - name: Run make build
+      run: |
+        make build
+
+    - name: Run make test
+      run: |
+        make test
 
     - name: Run make check-diff
       run: |

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## v0.2.11
 
 - Fixed mis-used rune `[` instead of tokLBracket https://github.com/mununki/gqlmerge/pull/41
+- Fixed merge error when the property name as `type` https://github.com/mununki/gqlmerge/pull/45
 
 ## v0.2.10
 

Makefile

@@ -7,15 +7,15 @@ all: build test check-diff
 build:
 	go build
 
-test: build
+test:
 	@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; \
+		./gqlmerge $$dir $$output || exit 1; \
 	done
 
-check-diff: build test
+check-diff:
 	@if git diff --exit-code --quiet -- '*.graphql'; then \
 		echo "Ok"; \
 	else \

lib/schema.go

@@ -197,7 +197,7 @@ func (s *Schema) Parse(p *Parser) {
 				fd.Filename = p.lex.filename
 				fd.Line = p.lex.line
 				fd.Column = p.lex.col
-				name, comments := p.lex.consumeIdent()
+				name, comments := p.lex.consumeIdent(tokInput, tokType)
 				fd.Name = name.String()
 				fd.Descriptions = comments
 
@@ -291,7 +291,7 @@ func (s *Schema) Parse(p *Parser) {
 				fd.Filename = p.lex.filename
 				fd.Line = p.lex.line
 				fd.Column = p.lex.col
-				name, comments := p.lex.consumeIdent()
+				name, comments := p.lex.consumeIdent(tokInput, tokType)
 				fd.Name = name.String()
 				fd.Descriptions = comments
 				p.lex.consumeToken(tokColon)
@@ -372,7 +372,7 @@ func (s *Schema) Parse(p *Parser) {
 					fd.Filename = p.lex.filename
 					fd.Line = p.lex.line
 					fd.Column = p.lex.col
-					name, comments := p.lex.consumeIdent()
+					name, comments := p.lex.consumeIdent(tokInput, tokType)
 					fd.Name = name.String()
 					fd.Descriptions = comments
 

test/property_type/generated.graphql

@@ -0,0 +1,22 @@
+schema {
+    query: Query
+    mutation: Mutation
+    subscription: Subscription
+}
+
+type SomePayload {
+    type: String!
+    someKey: String!
+}
+
+
+
+interface I {
+    type: String!
+    input: String!
+}
+
+input I {
+    type: String!
+    input: String!
+}

test/property_type/schema/Input.graphql

@@ -0,0 +1,4 @@
+input I {
+  type: String!
+  input: String!
+}

test/property_type/schema/Interface.graphql

@@ -0,0 +1,4 @@
+interface I {
+  type: String!
+  input: String!
+}