From 4a5968ec0ed174a9c6e35d2cd33904e044bf7f30 Mon Sep 17 00:00:00 2001 From: Ismail Ibragim Date: Mon, 14 Oct 2024 13:33:47 +0500 Subject: [PATCH 1/4] feat: any slice --- argument.go | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/argument.go b/argument.go index 6e988fe..dfacc22 100644 --- a/argument.go +++ b/argument.go @@ -72,6 +72,10 @@ func ArgumentStringSlice(name string, values ...string) Argument { return Argument{name, argStringSlice(values)} } +func ArgumentAnySlice(name string, values ...any) Argument { + return Argument{name, argAnySlice(values)} +} + // ArgumentCustomType returns a custom GraphQL type's argument representation, which could be a recursive structure. func ArgumentCustomType(name string, values ...Argument) Argument { return Argument{name, argumentSlice(values)} @@ -186,6 +190,31 @@ func (s argStringSlice) stringChan() <-chan string { return tokenChan } +type argAnySlice []any + +func (s argAnySlice) stringChan() <-chan string { + tokenChan := make(chan string) + go func() { + tokenChan <- "[" + for i, v := range s { + if i != 0 { + tokenChan <- "," + } + switch v.(type) { + case bool: + tokenChan <- fmt.Sprintf("%t", v) + case int: + tokenChan <- fmt.Sprintf(`%v`, v) + case string: + tokenChan <- fmt.Sprintf(`"%s"`, v) + } + } + tokenChan <- "]" + close(tokenChan) + }() + return tokenChan +} + type argumentSlice []Argument func (s argumentSlice) stringChan() <-chan string { From 1f22f95edbac592b31e54260e3e17e9e95254e87 Mon Sep 17 00:00:00 2001 From: Ismail Ibragim Date: Mon, 14 Oct 2024 13:42:11 +0500 Subject: [PATCH 2/4] feat: arg any slice tests --- argument.go | 3 +++ argument_test.go | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/argument.go b/argument.go index dfacc22..3cad790 100644 --- a/argument.go +++ b/argument.go @@ -43,6 +43,9 @@ func ArgumentAny(name string, value interface{}) (Argument, error) { case []string: return ArgumentStringSlice(name, v...), nil + case []any: + return ArgumentAnySlice(name, v...), nil + default: return Argument{}, ArgumentTypeNotSupportedErr{Value: value} } diff --git a/argument_test.go b/argument_test.go index 0471c37..744c941 100644 --- a/argument_test.go +++ b/argument_test.go @@ -31,6 +31,10 @@ func TestArgumentAny(t *testing.T) { assert.Nil(t, err) assert.Equal(t, Argument{"arg", argIntSlice([]int{1, 2})}, arg) + arg, err = ArgumentAny("arg", []any{1, "str", true}) + assert.Nil(t, err) + assert.Equal(t, Argument{"arg", argAnySlice([]any{1, "str", true})}, arg) + // Type Not Supported arg, err = ArgumentAny("arg", 1.1) assert.IsType(t, ArgumentTypeNotSupportedErr{}, err) @@ -66,6 +70,14 @@ func TestArgumentStringSlice(t *testing.T) { assert.Equal(t, Argument{"blocked", argStringSlice(nil)}, a) } +func TestArgumentAnySlice(t *testing.T) { + a := ArgumentAnySlice("blocked", "a", 12, true, " ") + assert.Equal(t, Argument{"blocked", argAnySlice([]any{"a", 12, true, " "})}, a) + + a = ArgumentAnySlice("blocked") + assert.Equal(t, Argument{"blocked", argAnySlice(nil)}, a) +} + func Test_argBool(t *testing.T) { b := argBool(true) i := 0 From 2c82d459773c03634c42fec7d12fcc1545f3dd46 Mon Sep 17 00:00:00 2001 From: Ismail Ibragim Date: Mon, 14 Oct 2024 13:50:51 +0500 Subject: [PATCH 3/4] feat: go mod file --- go.mod | 14 ++++++++++++++ go.sum | 12 ++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..e113085 --- /dev/null +++ b/go.mod @@ -0,0 +1,14 @@ +module github.com/udacity/graphb + +go 1.23.0 + +require ( + github.com/pkg/errors v0.9.1 + github.com/stretchr/testify v1.9.0 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..37a2515 --- /dev/null +++ b/go.sum @@ -0,0 +1,12 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From ab841e1121d286770432b6bb1d5873fb0d54f547 Mon Sep 17 00:00:00 2001 From: Ismail Ibragim Date: Mon, 14 Oct 2024 14:37:23 +0500 Subject: [PATCH 4/4] feat: remove mod and use interface{} --- argument.go | 6 +++--- argument_test.go | 6 +++--- go.mod | 14 -------------- go.sum | 12 ------------ 4 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 go.mod delete mode 100644 go.sum diff --git a/argument.go b/argument.go index 3cad790..a59227d 100644 --- a/argument.go +++ b/argument.go @@ -43,7 +43,7 @@ func ArgumentAny(name string, value interface{}) (Argument, error) { case []string: return ArgumentStringSlice(name, v...), nil - case []any: + case []interface{}: return ArgumentAnySlice(name, v...), nil default: @@ -75,7 +75,7 @@ func ArgumentStringSlice(name string, values ...string) Argument { return Argument{name, argStringSlice(values)} } -func ArgumentAnySlice(name string, values ...any) Argument { +func ArgumentAnySlice(name string, values ...interface{}) Argument { return Argument{name, argAnySlice(values)} } @@ -193,7 +193,7 @@ func (s argStringSlice) stringChan() <-chan string { return tokenChan } -type argAnySlice []any +type argAnySlice []interface{} func (s argAnySlice) stringChan() <-chan string { tokenChan := make(chan string) diff --git a/argument_test.go b/argument_test.go index 744c941..1ac134a 100644 --- a/argument_test.go +++ b/argument_test.go @@ -31,9 +31,9 @@ func TestArgumentAny(t *testing.T) { assert.Nil(t, err) assert.Equal(t, Argument{"arg", argIntSlice([]int{1, 2})}, arg) - arg, err = ArgumentAny("arg", []any{1, "str", true}) + arg, err = ArgumentAny("arg", []interface{}{1, "str", true}) assert.Nil(t, err) - assert.Equal(t, Argument{"arg", argAnySlice([]any{1, "str", true})}, arg) + assert.Equal(t, Argument{"arg", argAnySlice([]interface{}{1, "str", true})}, arg) // Type Not Supported arg, err = ArgumentAny("arg", 1.1) @@ -72,7 +72,7 @@ func TestArgumentStringSlice(t *testing.T) { func TestArgumentAnySlice(t *testing.T) { a := ArgumentAnySlice("blocked", "a", 12, true, " ") - assert.Equal(t, Argument{"blocked", argAnySlice([]any{"a", 12, true, " "})}, a) + assert.Equal(t, Argument{"blocked", argAnySlice([]interface{}{"a", 12, true, " "})}, a) a = ArgumentAnySlice("blocked") assert.Equal(t, Argument{"blocked", argAnySlice(nil)}, a) diff --git a/go.mod b/go.mod deleted file mode 100644 index e113085..0000000 --- a/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module github.com/udacity/graphb - -go 1.23.0 - -require ( - github.com/pkg/errors v0.9.1 - github.com/stretchr/testify v1.9.0 -) - -require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) diff --git a/go.sum b/go.sum deleted file mode 100644 index 37a2515..0000000 --- a/go.sum +++ /dev/null @@ -1,12 +0,0 @@ -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=