implement argument in selection

Author: Ganesha Danu

parse_name.go

@@ -8,7 +8,7 @@ func (l *Lexer) parseName() (string, error) {
 	var name string
 	c, err := l.read()
 	if !isAlphabet(c) {
-		return "", errors.New("first character of an identifier Name have to be an alphabet")
+		return "", errors.New("first character of an identifier Name have to be an alphabet: " + string(c))
 	}
 
 	for (isAlphabet(c) || c == '_' || isNumber(c)) &&

parse_selection.go

@@ -2,6 +2,7 @@ package gqlyzer
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/kumparan/gqlyzer/token"
 )
@@ -17,9 +18,18 @@ func (l *Lexer) parseSelection() (newSelection token.Selection, err error) {
 	}
 	newSelection.Name = name
 
+	arguments, argErr := l.parseArgumentSet()
+	if argErr == nil && len(arguments) > 0 {
+		newSelection.Arguments = arguments
+		fmt.Println("<><><><>", arguments)
+		l.cursor++
+		l.consumeWhitespace()
+	}
+
 	subSelection, subErr := l.parseSelectionSet()
 	if subErr == nil {
 		newSelection.InnerSelection = subSelection
+
 	}
 
 	return
@@ -32,7 +42,6 @@ func (l *Lexer) parseSelectionSet() (set token.SelectionSet, err error) {
 	if err != nil {
 		return
 	}
-
 	if c == '{' {
 		l.push('{')
 		l.pushFlush()
@@ -58,8 +67,8 @@ func (l *Lexer) parseSelectionSet() (set token.SelectionSet, err error) {
 			set[selection.Name] = selection
 			l.consumeWhitespace()
 			c, err = l.read()
-		}
 
+		}
 		_, err = l.popFlush()
 		if err != nil {
 			return
@@ -69,9 +78,11 @@ func (l *Lexer) parseSelectionSet() (set token.SelectionSet, err error) {
 		if err != nil {
 			return
 		}
+
 	} else {
 		return token.SelectionSet{}, nil
 	}
 
+	l.cursor++
 	return
 }

parse_selection_args.go

@@ -2,7 +2,6 @@ package gqlyzer
 
 import (
 	"errors"
-	"fmt"
 
 	"github.com/kumparan/gqlyzer/token"
 )
@@ -24,11 +23,12 @@ func (l *Lexer) parseArgument() (argument token.Argument, err error) {
 		err = errors.New("expected : but found " + string(c))
 		return
 	}
+
 	l.cursor++
 	l.consumeWhitespace()
+	c, err = l.read()
 	if subArg, err := l.parseArgumentValueObject(); err == nil {
 		argument.ObjectValue = subArg
-
 	} else if value, err := l.parseString(); err == nil {
 		argument.Value = value
 	} else {
@@ -40,9 +40,6 @@ func (l *Lexer) parseArgument() (argument token.Argument, err error) {
 		argument.Value = value
 	}
 
-	fmt.Println(">>>", argument)
-	l.cursor++
-
 	return
 }
 
@@ -53,10 +50,10 @@ func (l *Lexer) parseArgumentSet() (set token.ArgumentSet, err error) {
 	if err != nil {
 		return
 	}
-
 	if c == '(' {
 		l.push('(')
 		l.pushFlush()
+		l.push('\\')
 		if err != nil {
 			return
 		}
@@ -80,7 +77,6 @@ func (l *Lexer) parseArgumentSet() (set token.ArgumentSet, err error) {
 			l.consumeWhitespace()
 			c, err = l.read()
 		}
-
 		_, err = l.popFlush()
 		if err != nil {
 			return
@@ -116,7 +112,6 @@ func (l *Lexer) parseArgumentValueObject() (set token.ArgumentSet, err error) {
 		l.consumeWhitespace()
 		c, err = l.read()
 		for err == nil && c != '}' {
-			fmt.Println(string(c))
 			if c == ',' {
 				l.push(c)
 				l.cursor++
@@ -130,10 +125,10 @@ func (l *Lexer) parseArgumentValueObject() (set token.ArgumentSet, err error) {
 				return token.ArgumentSet{}, err
 			}
 			set[arg.Key] = arg
+			l.cursor++
 			l.consumeWhitespace()
 			c, err = l.read()
 		}
-		fmt.Println("keluar")
 		_, err = l.popFlush()
 		if err != nil {
 			return
@@ -143,12 +138,11 @@ func (l *Lexer) parseArgumentValueObject() (set token.ArgumentSet, err error) {
 		if err != nil {
 			return
 		}
-
-		fmt.Println("ga error")
+		l.cursor++
+		l.consumeWhitespace()
 	} else {
 		return token.ArgumentSet{}, errors.New("argument is not an object")
 	}
 
-	fmt.Println(">>>  set:", set)
 	return
 }

parse_selection_args_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestParseArgument(t *testing.T) {
-	t.Run("without string value", func(t *testing.T) {
+	t.Run("with string value", func(t *testing.T) {
 		l := Lexer{input: `SomeQuery: "helloworld"`}
 		l.Reset()
 		l.push('\\')
@@ -18,7 +18,7 @@ func TestParseArgument(t *testing.T) {
 		assert.Equal(t, `"helloworld"`, s.Value)
 	})
 
-	t.Run("without object value", func(t *testing.T) {
+	t.Run("with object value", func(t *testing.T) {
 		l := Lexer{input: `SomeQuery: {
 			test: "helloworld",
 			test2: "helloworld"	

parse_selection_test.go

@@ -29,6 +29,20 @@ func TestParseSelection(t *testing.T) {
 		assert.Equal(t, "SomeQuery", s.Name)
 		assert.Equal(t, "subQuery", s.InnerSelection["subQuery"].Name)
 	})
+
+	t.Run("with arguments", func(t *testing.T) {
+		l := Lexer{input: `SomeQuery(id: 123) {
+			subQuery	
+		}`}
+		l.Reset()
+		l.push('\\')
+
+		s, err := l.parseSelection()
+		assert.NoError(t, err)
+		assert.Equal(t, "SomeQuery", s.Name)
+		assert.Equal(t, "subQuery", s.InnerSelection["subQuery"].Name)
+		assert.Equal(t, "id", s.Arguments["id"].Key)
+	})
 }
 
 func TestParseSelectionSet(t *testing.T) {

stack.go

@@ -7,6 +7,8 @@ import "errors"
 func (l *Lexer) pop() rune {
 	tail := l.parseStack[len(l.parseStack)-1]
 	l.parseStack = l.parseStack[:len(l.parseStack)-1]
+
+	l.printParseStack()
 	return tail
 }
 
@@ -21,6 +23,8 @@ func (l *Lexer) popFlush() (string, error) {
 		c = l.pop()
 	}
 
+	l.printParseStack()
+
 	return result, nil
 }
 
@@ -30,11 +34,16 @@ func (l *Lexer) popCond(c rune) error {
 		return errors.New("invalid stack pop")
 	}
 	l.parseStack = l.parseStack[:len(l.parseStack)-1]
+
+	l.printParseStack()
 	return nil
 }
 
 func (l *Lexer) push(c rune) {
 	l.parseStack = append(l.parseStack, c)
+
+	l.printParseStack()
+
 }
 
 func (l *Lexer) pushString(s string) {
@@ -45,4 +54,5 @@ func (l *Lexer) pushString(s string) {
 
 func (l *Lexer) pushFlush() {
 	l.parseStack = append(l.parseStack, '#')
+
 }

token/token.go

@@ -29,6 +29,7 @@ type Selection struct {
 	Name string
 	// will be empty, if the selection have no sub field
 	InnerSelection SelectionSet
+	Arguments      ArgumentSet
 	// TODO: wont be implemented for now
 	Alias string
 }