9f919d2c Avoid GraphQL to Go Naming Collision with "ToGoModelName" func (#2322) (closes #2321)
+
+* using ReplaceAllStringLiteral
+
+* fixing wordInfo template test
+
+* bumping linter timeout to 5m
+
+* comment cleanup
+
+* some cleanup, adding "ToGoPrivateModelName" func
+
+* adding "ToGoPrivateModelName" func
+
+* refactoring word walker impl and tests
+
+* hopefully making linter happy
+
+
+
+- 2304c104 Include docstrings on interface getters (#2317)
+
+- f5d60326 Leverage (*Imports).LookupType when generating interface field getters (#2315)
+
+
242c3ba2 Generate getters for interface fields (#2314)
+
+* Generate getters for interface fields
+
+* Changes to make models_test.go pass
+
+* Use text/template, not html/template
+
+* Re-run go generate ./...
+
+* gofmt a few files that were failing lint checks
+
+* Another gofmt straggler
+
+* Try making the "generated" match the exact whitespace github is disliking
+
+
+
+- 0d91c893 Add hackernews graphql api tutorial to other resources (#2305)
+
+- c2526ba5 Update gqlparser to v2.4.7 (#2300)
+
+- f283124d#2298: fix gqlgen extracting module name from comment line (#2299)
+
+
779d7cdd Add support for KeepAlive message in websocket client (#2293)
+
+* Add support for KeepAlive message in websocket client
+
+* rewrite if-else to switch statement
+
+
f0e9047d Hide dependencies in `tools.go` from importers (#2287)
+
+Projects that use `go mod vendor` will vendor `github.com/matryer/moq`
+despite it not being required at runtime.
+
+Moving `tools.go` to `internal` hides this import from downstream
+users and avoids `github.com/matryer/moq` being vendored.
+
+`go generate` of the mocks still works as expected.
+
+The assumption behind the import test broke, so I've pointed it at a
+different path that has no Go code. This seems to match the intent
+behind the original test for the `internal/code/..` path.
+
+
+
+- 6310e6a7 support named interface to Field.CallArgs (#2289)
+
+
30493696 fix: return the original error (#2288)
+
+* fix: return the original error
+
+close https://github.com/99designs/gqlgen/issues/2286
+
+* Update error.go
+
+
0b0e5ce4 Replace use of strings.Title with cases.Title (#2268)
+
+* github: Test more go versions
+
+* github: Fix ci tests
+
+* github: Increase verbosity, sleep
+
+* github: Drop bash
+
+* github: Test go 1.18 and newer node verisons
+
+* github: Pull out node 16 for now
+
+* github: Only lint 1.16 for now
+
+* cases: Use cases.Title over strings.Title which is deprecated
+
+* gqlgen: Remove use of deprecated strings.Title
+
+
+
+- 0c11e5fd parse at beginning of do function (#2269)
+
+- edb1c585 Update Changelog for v0.17.11
+
+- 5e6b52fd v0.17.11 postrelease bump
+
+
+
+
+
## [v0.17.11](https://github.com/99designs/gqlgen/compare/v0.17.10...v0.17.11) - 2022-07-03
- ea294c4e release v0.17.11
diff --git a/vendor/github.com/99designs/gqlgen/README.md b/vendor/github.com/99designs/gqlgen/README.md
index 0621c55b..6c61c85e 100644
--- a/vendor/github.com/99designs/gqlgen/README.md
+++ b/vendor/github.com/99designs/gqlgen/README.md
@@ -148,3 +148,4 @@ There isn't any way around this, gqlgen has no way to know what you want in a gi
- [Introducing gqlgen: a GraphQL Server Generator for Go](https://99designs.com.au/blog/engineering/gqlgen-a-graphql-server-generator-for-go/)
- [Dive into GraphQL by Iván Corrales Solera](https://medium.com/@ivan.corrales.solera/dive-into-graphql-9bfedf22e1a)
- [Sample Project built on gqlgen with Postgres by Oleg Shalygin](https://github.com/oshalygin/gqlgen-pg-todo-example)
+- [Hackernews GraphQL Server with gqlgen by Shayegan Hooshyari](https://www.howtographql.com/graphql-go/0-introduction/)
diff --git a/vendor/github.com/99designs/gqlgen/codegen/config/binder.go b/vendor/github.com/99designs/gqlgen/codegen/config/binder.go
index 90820de6..bedc23bc 100644
--- a/vendor/github.com/99designs/gqlgen/codegen/config/binder.go
+++ b/vendor/github.com/99designs/gqlgen/codegen/config/binder.go
@@ -216,7 +216,6 @@ func (t *TypeReference) IsPtr() bool {
}
// fix for https://github.com/golang/go/issues/31103 may make it possible to remove this (may still be useful)
-//
func (t *TypeReference) IsPtrToPtr() bool {
if p, isPtr := t.GO.(*types.Pointer); isPtr {
_, isPtr := p.Elem().(*types.Pointer)
diff --git a/vendor/github.com/99designs/gqlgen/codegen/config/config.go b/vendor/github.com/99designs/gqlgen/codegen/config/config.go
index 2b45c3c2..9deba8b1 100644
--- a/vendor/github.com/99designs/gqlgen/codegen/config/config.go
+++ b/vendor/github.com/99designs/gqlgen/codegen/config/config.go
@@ -1,6 +1,7 @@
package config
import (
+ "bytes"
"fmt"
"os"
"path/filepath"
@@ -11,7 +12,7 @@ import (
"github.com/99designs/gqlgen/internal/code"
"github.com/vektah/gqlparser/v2"
"github.com/vektah/gqlparser/v2/ast"
- "gopkg.in/yaml.v2"
+ "gopkg.in/yaml.v3"
)
type Config struct {
@@ -102,7 +103,10 @@ func LoadConfig(filename string) (*Config, error) {
return nil, fmt.Errorf("unable to read config: %w", err)
}
- if err := yaml.UnmarshalStrict(b, config); err != nil {
+ dec := yaml.NewDecoder(bytes.NewReader(b))
+ dec.KnownFields(true)
+
+ if err := dec.Decode(config); err != nil {
return nil, fmt.Errorf("unable to parse config: %w", err)
}
diff --git a/vendor/github.com/99designs/gqlgen/codegen/field.go b/vendor/github.com/99designs/gqlgen/codegen/field.go
index 053c86e1..a33cc18e 100644
--- a/vendor/github.com/99designs/gqlgen/codegen/field.go
+++ b/vendor/github.com/99designs/gqlgen/codegen/field.go
@@ -562,7 +562,7 @@ func (f *Field) CallArgs() string {
for _, arg := range f.Args {
tmp := "fc.Args[" + strconv.Quote(arg.Name) + "].(" + templates.CurrentImports.LookupType(arg.TypeReference.GO) + ")"
- if types.IsInterface(arg.TypeReference.GO) {
+ if iface, ok := arg.TypeReference.GO.(*types.Interface); ok && iface.Empty() {
tmp = fmt.Sprintf(`
func () interface{} {
if fc.Args["%s"] == nil {
diff --git a/vendor/github.com/99designs/gqlgen/codegen/templates/templates.go b/vendor/github.com/99designs/gqlgen/codegen/templates/templates.go
index ab39c08e..159df77c 100644
--- a/vendor/github.com/99designs/gqlgen/codegen/templates/templates.go
+++ b/vendor/github.com/99designs/gqlgen/codegen/templates/templates.go
@@ -8,10 +8,12 @@ import (
"os"
"path/filepath"
"reflect"
+ "regexp"
"runtime"
"sort"
"strconv"
"strings"
+ "sync"
"text/template"
"unicode"
@@ -58,6 +60,12 @@ type Options struct {
Packages *code.Packages
}
+var (
+ modelNamesMu sync.Mutex
+ modelNames = make(map[string]string, 0)
+ goNameRe = regexp.MustCompile("[^a-zA-Z0-9_]")
+)
+
// Render renders a gql plugin template from the given Options. Render is an
// abstraction of the text/template package that makes it easier to write gqlgen
// plugins. If Options.Template is empty, the Render function will look for `.gotpl`
@@ -188,20 +196,22 @@ func center(width int, pad string, s string) string {
func Funcs() template.FuncMap {
return template.FuncMap{
- "ucFirst": UcFirst,
- "lcFirst": LcFirst,
- "quote": strconv.Quote,
- "rawQuote": rawQuote,
- "dump": Dump,
- "ref": ref,
- "ts": TypeIdentifier,
- "call": Call,
- "prefixLines": prefixLines,
- "notNil": notNil,
- "reserveImport": CurrentImports.Reserve,
- "lookupImport": CurrentImports.Lookup,
- "go": ToGo,
- "goPrivate": ToGoPrivate,
+ "ucFirst": UcFirst,
+ "lcFirst": LcFirst,
+ "quote": strconv.Quote,
+ "rawQuote": rawQuote,
+ "dump": Dump,
+ "ref": ref,
+ "ts": TypeIdentifier,
+ "call": Call,
+ "prefixLines": prefixLines,
+ "notNil": notNil,
+ "reserveImport": CurrentImports.Reserve,
+ "lookupImport": CurrentImports.Lookup,
+ "go": ToGo,
+ "goPrivate": ToGoPrivate,
+ "goModelName": ToGoModelName,
+ "goPrivateModelName": ToGoPrivateModelName,
"add": func(a, b int) int {
return a + b
},
@@ -291,25 +301,154 @@ func Call(p *types.Func) string {
return pkg + p.Name()
}
+func resetModelNames() {
+ modelNamesMu.Lock()
+ defer modelNamesMu.Unlock()
+ modelNames = make(map[string]string, 0)
+}
+
+func buildGoModelNameKey(parts []string) string {
+ const sep = ":"
+ return strings.Join(parts, sep)
+}
+
+func goModelName(primaryToGoFunc func(string) string, parts []string) string {
+ modelNamesMu.Lock()
+ defer modelNamesMu.Unlock()
+
+ var (
+ goNameKey string
+ partLen int
+
+ nameExists = func(n string) bool {
+ for _, v := range modelNames {
+ if n == v {
+ return true
+ }
+ }
+ return false
+ }
+
+ applyToGoFunc = func(parts []string) string {
+ var out string
+ switch len(parts) {
+ case 0:
+ return ""
+ case 1:
+ return primaryToGoFunc(parts[0])
+ default:
+ out = primaryToGoFunc(parts[0])
+ }
+ for _, p := range parts[1:] {
+ out = fmt.Sprintf("%s%s", out, ToGo(p))
+ }
+ return out
+ }
+
+ applyValidGoName = func(parts []string) string {
+ var out string
+ for _, p := range parts {
+ out = fmt.Sprintf("%s%s", out, replaceInvalidCharacters(p))
+ }
+ return out
+ }
+ )
+
+ // build key for this entity
+ goNameKey = buildGoModelNameKey(parts)
+
+ // determine if we've seen this entity before, and reuse if so
+ if goName, ok := modelNames[goNameKey]; ok {
+ return goName
+ }
+
+ // attempt first pass
+ if goName := applyToGoFunc(parts); !nameExists(goName) {
+ modelNames[goNameKey] = goName
+ return goName
+ }
+
+ // determine number of parts
+ partLen = len(parts)
+
+ // if there is only 1 part, append incrementing number until no conflict
+ if partLen == 1 {
+ base := applyToGoFunc(parts)
+ for i := 0; ; i++ {
+ tmp := fmt.Sprintf("%s%d", base, i)
+ if !nameExists(tmp) {
+ modelNames[goNameKey] = tmp
+ return tmp
+ }
+ }
+ }
+
+ // best effort "pretty" name
+ for i := partLen - 1; i >= 1; i-- {
+ tmp := fmt.Sprintf("%s%s", applyToGoFunc(parts[0:i]), applyValidGoName(parts[i:]))
+ if !nameExists(tmp) {
+ modelNames[goNameKey] = tmp
+ return tmp
+ }
+ }
+
+ // finally, fallback to just adding an incrementing number
+ base := applyToGoFunc(parts)
+ for i := 0; ; i++ {
+ tmp := fmt.Sprintf("%s%d", base, i)
+ if !nameExists(tmp) {
+ modelNames[goNameKey] = tmp
+ return tmp
+ }
+ }
+}
+
+func ToGoModelName(parts ...string) string {
+ return goModelName(ToGo, parts)
+}
+
+func ToGoPrivateModelName(parts ...string) string {
+ return goModelName(ToGoPrivate, parts)
+}
+
+func replaceInvalidCharacters(in string) string {
+ return goNameRe.ReplaceAllLiteralString(in, "_")
+}
+
+func wordWalkerFunc(private bool, nameRunes *[]rune) func(*wordInfo) {
+ return func(info *wordInfo) {
+ word := info.Word
+
+ switch {
+ case private && info.WordOffset == 0:
+ if strings.ToUpper(word) == word || strings.ToLower(word) == word {
+ // ID → id, CAMEL → camel
+ word = strings.ToLower(info.Word)
+ } else {
+ // ITicket → iTicket
+ word = LcFirst(info.Word)
+ }
+
+ case info.MatchCommonInitial:
+ word = strings.ToUpper(word)
+
+ case !info.HasCommonInitial && (strings.ToUpper(word) == word || strings.ToLower(word) == word):
+ // FOO or foo → Foo
+ // FOo → FOo
+ word = UcFirst(strings.ToLower(word))
+ }
+
+ *nameRunes = append(*nameRunes, []rune(word)...)
+ }
+}
+
func ToGo(name string) string {
if name == "_" {
return "_"
}
runes := make([]rune, 0, len(name))
- wordWalker(name, func(info *wordInfo) {
- word := info.Word
- if info.MatchCommonInitial {
- word = strings.ToUpper(word)
- } else if !info.HasCommonInitial {
- if strings.ToUpper(word) == word || strings.ToLower(word) == word {
- // FOO or foo → Foo
- // FOo → FOo
- word = UcFirst(strings.ToLower(word))
- }
- }
- runes = append(runes, []rune(word)...)
- })
+ wordWalker(name, wordWalkerFunc(false, &runes))
return string(runes)
}
@@ -320,31 +459,13 @@ func ToGoPrivate(name string) string {
}
runes := make([]rune, 0, len(name))
- first := true
- wordWalker(name, func(info *wordInfo) {
- word := info.Word
- switch {
- case first:
- if strings.ToUpper(word) == word || strings.ToLower(word) == word {
- // ID → id, CAMEL → camel
- word = strings.ToLower(info.Word)
- } else {
- // ITicket → iTicket
- word = LcFirst(info.Word)
- }
- first = false
- case info.MatchCommonInitial:
- word = strings.ToUpper(word)
- case !info.HasCommonInitial:
- word = UcFirst(strings.ToLower(word))
- }
- runes = append(runes, []rune(word)...)
- })
+ wordWalker(name, wordWalkerFunc(true, &runes))
return sanitizeKeywords(string(runes))
}
type wordInfo struct {
+ WordOffset int
Word string
MatchCommonInitial bool
HasCommonInitial bool
@@ -354,7 +475,7 @@ type wordInfo struct {
// https://github.com/golang/lint/blob/06c8688daad7faa9da5a0c2f163a3d14aac986ca/lint.go#L679
func wordWalker(str string, f func(*wordInfo)) {
runes := []rune(strings.TrimFunc(str, isDelimiter))
- w, i := 0, 0 // index of start of word, scan
+ w, i, wo := 0, 0, 0 // index of start of word, scan, word offset
hasCommonInitial := false
for i+1 <= len(runes) {
eow := false // whether we hit the end of a word
@@ -402,12 +523,14 @@ func wordWalker(str string, f func(*wordInfo)) {
}
f(&wordInfo{
+ WordOffset: wo,
Word: word,
MatchCommonInitial: matchCommonInitial,
HasCommonInitial: hasCommonInitial,
})
hasCommonInitial = false
w = i
+ wo++
}
}
diff --git a/vendor/github.com/99designs/gqlgen/graphql/errcode/codes.go b/vendor/github.com/99designs/gqlgen/graphql/errcode/codes.go
index 98b95d00..4333d87e 100644
--- a/vendor/github.com/99designs/gqlgen/graphql/errcode/codes.go
+++ b/vendor/github.com/99designs/gqlgen/graphql/errcode/codes.go
@@ -29,12 +29,13 @@ func RegisterErrorType(code string, kind ErrorKind) {
}
// Set the error code on a given graphql error extension
-func Set(err *gqlerror.Error, value string) {
- if err.Extensions == nil {
- err.Extensions = map[string]interface{}{}
+func Set(err error, value string) {
+ gqlErr, _ := err.(*gqlerror.Error)
+ if gqlErr.Extensions == nil {
+ gqlErr.Extensions = map[string]interface{}{}
}
- err.Extensions["code"] = value
+ gqlErr.Extensions["code"] = value
}
// get the kind of the first non User error, defaults to User if no errors have a custom extension
diff --git a/vendor/github.com/99designs/gqlgen/graphql/error.go b/vendor/github.com/99designs/gqlgen/graphql/error.go
index 4fe520b2..f816bef6 100644
--- a/vendor/github.com/99designs/gqlgen/graphql/error.go
+++ b/vendor/github.com/99designs/gqlgen/graphql/error.go
@@ -26,7 +26,8 @@ func ErrorOnPath(ctx context.Context, err error) error {
if gqlErr.Path == nil {
gqlErr.Path = GetPath(ctx)
}
- return gqlErr
+ // Return the original error to avoid losing any attached annotation
+ return err
}
return gqlerror.WrapPath(GetPath(ctx), err)
}
diff --git a/vendor/github.com/99designs/gqlgen/graphql/executor/executor.go b/vendor/github.com/99designs/gqlgen/graphql/executor/executor.go
index 2fca58ac..d036ea6f 100644
--- a/vendor/github.com/99designs/gqlgen/graphql/executor/executor.go
+++ b/vendor/github.com/99designs/gqlgen/graphql/executor/executor.go
@@ -72,11 +72,12 @@ func (e *Executor) CreateOperationContext(ctx context.Context, params *graphql.R
return rc, gqlerror.List{err}
}
- var err *gqlerror.Error
+ var err error
rc.Variables, err = validator.VariableValues(e.es.Schema(), rc.Operation, params.Variables)
- if err != nil {
- errcode.Set(err, errcode.ValidationFailed)
- return rc, gqlerror.List{err}
+ gqlErr, _ := err.(*gqlerror.Error)
+ if gqlErr != nil {
+ errcode.Set(gqlErr, errcode.ValidationFailed)
+ return rc, gqlerror.List{gqlErr}
}
rc.Stats.Validation.End = graphql.Now()
@@ -141,7 +142,7 @@ func (e *Executor) DispatchError(ctx context.Context, list gqlerror.List) *graph
return resp
}
-func (e *Executor) PresentRecoveredError(ctx context.Context, err interface{}) *gqlerror.Error {
+func (e *Executor) PresentRecoveredError(ctx context.Context, err interface{}) error {
return e.errorPresenter(ctx, e.recoverFunc(ctx, err))
}
@@ -173,9 +174,10 @@ func (e *Executor) parseQuery(ctx context.Context, stats *graphql.Stats, query s
}
doc, err := parser.ParseQuery(&ast.Source{Input: query})
- if err != nil {
- errcode.Set(err, errcode.ParseFailed)
- return nil, gqlerror.List{err}
+ gqlErr, _ := err.(*gqlerror.Error)
+ if gqlErr != nil {
+ errcode.Set(gqlErr, errcode.ParseFailed)
+ return nil, gqlerror.List{gqlErr}
}
stats.Parsing.End = graphql.Now()
@@ -183,8 +185,9 @@ func (e *Executor) parseQuery(ctx context.Context, stats *graphql.Stats, query s
if len(doc.Operations) == 0 {
err = gqlerror.Errorf("no operation provided")
+ gqlErr, _ := err.(*gqlerror.Error)
errcode.Set(err, errcode.ValidationFailed)
- return nil, gqlerror.List{err}
+ return nil, gqlerror.List{gqlErr}
}
listErr := validator.Validate(e.es.Schema(), doc)
diff --git a/vendor/github.com/99designs/gqlgen/graphql/handler/server.go b/vendor/github.com/99designs/gqlgen/graphql/handler/server.go
index 69530bbc..b6524d8d 100644
--- a/vendor/github.com/99designs/gqlgen/graphql/handler/server.go
+++ b/vendor/github.com/99designs/gqlgen/graphql/handler/server.go
@@ -102,7 +102,8 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
defer func() {
if err := recover(); err != nil {
err := s.exec.PresentRecoveredError(r.Context(), err)
- resp := &graphql.Response{Errors: []*gqlerror.Error{err}}
+ gqlErr, _ := err.(*gqlerror.Error)
+ resp := &graphql.Response{Errors: []*gqlerror.Error{gqlErr}}
b, _ := json.Marshal(resp)
w.WriteHeader(http.StatusUnprocessableEntity)
w.Write(b)
diff --git a/vendor/github.com/99designs/gqlgen/graphql/playground/playground.go b/vendor/github.com/99designs/gqlgen/graphql/playground/playground.go
index d356729e..720e1a14 100644
--- a/vendor/github.com/99designs/gqlgen/graphql/playground/playground.go
+++ b/vendor/github.com/99designs/gqlgen/graphql/playground/playground.go
@@ -9,17 +9,19 @@ import (
var page = template.Must(template.New("graphiql").Parse(`
- {{.title}}
-
-
-
-
+ {{.title}}
+
+
+
+
+