Adding duration scalar conforming to ISO8601 standard (#2800)

* Adding duration scalar * simple Duration scalar docs * using MarshalString, to add proper double quotes * adding deps and running go mod tidy on _examples * Re-organize imports Signed-off-by: Steve Coffman <[email protected]> * Fix test now that imports are sorted Signed-off-by: Steve Coffman <[email protected]> --------- Signed-off-by: Steve Coffman <[email protected]> Co-authored-by: Steve Coffman <[email protected]>
99designs · Oct 3, 2023 · 5925864 · 5925864
1 parent 37f8e4e
commit 5925864
Show file tree

Hide file tree

Showing 145 changed files with 385 additions and 200 deletions.
diff --git a/_examples/chat/chat_test.go b/_examples/chat/chat_test.go
@@ -6,10 +6,11 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/99designs/gqlgen/client"
-	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/99designs/gqlgen/client"
+	"github.com/99designs/gqlgen/graphql/handler"
 )
 
 func TestChatSubscriptions(t *testing.T) {

diff --git a/_examples/chat/server/server.go b/_examples/chat/server/server.go
@@ -6,11 +6,6 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/99designs/gqlgen/graphql/handler/extension"
-	"github.com/99designs/gqlgen/graphql/handler/transport"
-
-	"github.com/99designs/gqlgen/graphql/playground"
-
 	"github.com/gorilla/websocket"
 	"github.com/opentracing/opentracing-go"
 	"github.com/rs/cors"
@@ -20,6 +15,9 @@ import (
 
 	"github.com/99designs/gqlgen/_examples/chat"
 	"github.com/99designs/gqlgen/graphql/handler"
+	"github.com/99designs/gqlgen/graphql/handler/extension"
+	"github.com/99designs/gqlgen/graphql/handler/transport"
+	"github.com/99designs/gqlgen/graphql/playground"
 )
 
 func main() {

diff --git a/_examples/dataloader/dataloader_test.go b/_examples/dataloader/dataloader_test.go
@@ -3,10 +3,11 @@ package dataloader
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/99designs/gqlgen/graphql/introspection"
-	"github.com/stretchr/testify/require"
 )
 
 func TestTodo(t *testing.T) {

diff --git a/_examples/embedding/subdir/embedding_test.go b/_examples/embedding/subdir/embedding_test.go
@@ -3,10 +3,11 @@ package subdir
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/99designs/gqlgen/_examples/embedding/subdir/gendir"
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql/handler"
-	"github.com/stretchr/testify/require"
 )
 
 func TestEmbeddingWorks(t *testing.T) {

diff --git a/_examples/fileupload/fileupload_test.go b/_examples/fileupload/fileupload_test.go
@@ -8,12 +8,13 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/99designs/gqlgen/_examples/fileupload/model"
 	gqlclient "github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql"
 	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/99designs/gqlgen/graphql/handler/transport"
-	"github.com/stretchr/testify/require"
 )
 
 func TestFileUpload(t *testing.T) {

diff --git a/_examples/fileupload/server/server.go b/_examples/fileupload/server/server.go
@@ -7,15 +7,13 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/99designs/gqlgen/graphql/handler/extension"
-	"github.com/99designs/gqlgen/graphql/handler/transport"
-
-	"github.com/99designs/gqlgen/graphql/playground"
-
 	"github.com/99designs/gqlgen/_examples/fileupload"
 	"github.com/99designs/gqlgen/_examples/fileupload/model"
 	"github.com/99designs/gqlgen/graphql"
 	"github.com/99designs/gqlgen/graphql/handler"
+	"github.com/99designs/gqlgen/graphql/handler/extension"
+	"github.com/99designs/gqlgen/graphql/handler/transport"
+	"github.com/99designs/gqlgen/graphql/playground"
 )
 
 func main() {

diff --git a/_examples/go.mod b/_examples/go.mod
@@ -25,6 +25,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/sosodev/duration v1.1.0 // indirect
 	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/tools v0.9.3 // indirect

diff --git a/_examples/go.sum b/_examples/go.sum
@@ -48,6 +48,8 @@ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06B
 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
 github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU=
 github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
+github.com/sosodev/duration v1.1.0 h1:kQcaiGbJaIsRqgQy7VGlZrVw1giWO+lDoX3MCPnpVO4=
+github.com/sosodev/duration v1.1.0/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=

diff --git a/_examples/scalars/scalar_test.go b/_examples/scalars/scalar_test.go
@@ -4,10 +4,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/99designs/gqlgen/graphql/introspection"
-	"github.com/stretchr/testify/require"
 )
 
 type RawUser struct {

diff --git a/_examples/selection/selection.go b/_examples/selection/selection.go
@@ -7,8 +7,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/99designs/gqlgen/graphql"
 	"github.com/vektah/gqlparser/v2/ast"
+
+	"github.com/99designs/gqlgen/graphql"
 )
 
 type Resolver struct{}

diff --git a/_examples/selection/selection_test.go b/_examples/selection/selection_test.go
@@ -3,9 +3,10 @@ package selection
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql/handler"
-	"github.com/stretchr/testify/require"
 )
 
 func TestSelection(t *testing.T) {

diff --git a/_examples/starwars/resolvers.go b/_examples/starwars/resolvers.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/99designs/gqlgen/_examples/starwars/generated"
-
 	"github.com/99designs/gqlgen/_examples/starwars/models"
 )
 

diff --git a/_examples/starwars/starwars_test.go b/_examples/starwars/starwars_test.go
@@ -3,11 +3,12 @@ package starwars
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/99designs/gqlgen/_examples/starwars/generated"
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/99designs/gqlgen/graphql/introspection"
-	"github.com/stretchr/testify/require"
 )
 
 func TestStarwars(t *testing.T) {

diff --git a/_examples/todo/todo.go b/_examples/todo/todo.go
@@ -8,8 +8,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/99designs/gqlgen/graphql"
 	"github.com/mitchellh/mapstructure"
+
+	"github.com/99designs/gqlgen/graphql"
 )
 
 var (

diff --git a/_examples/todo/todo_test.go b/_examples/todo/todo_test.go
@@ -3,10 +3,11 @@ package todo
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/99designs/gqlgen/graphql/introspection"
-	"github.com/stretchr/testify/require"
 )
 
 func TestTodo(t *testing.T) {

diff --git a/_examples/type-system-extension/server/server.go b/_examples/type-system-extension/server/server.go
@@ -5,10 +5,9 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/99designs/gqlgen/graphql/playground"
-
 	extension "github.com/99designs/gqlgen/_examples/type-system-extension"
 	"github.com/99designs/gqlgen/graphql/handler"
+	"github.com/99designs/gqlgen/graphql/playground"
 )
 
 const defaultPort = "8080"

diff --git a/_examples/websocket-initfunc/server/server.go b/_examples/websocket-initfunc/server/server.go
@@ -8,14 +8,15 @@ import (
 	"os"
 	"time"
 
-	"github.com/99designs/gqlgen/graphql/handler"
-	"github.com/99designs/gqlgen/graphql/handler/extension"
-	"github.com/99designs/gqlgen/graphql/handler/transport"
-	"github.com/99designs/gqlgen/graphql/playground"
 	"github.com/go-chi/chi"
 	"github.com/gorilla/websocket"
 	"github.com/gqlgen/_examples/websocket-initfunc/server/graph"
 	"github.com/rs/cors"
+
+	"github.com/99designs/gqlgen/graphql/handler"
+	"github.com/99designs/gqlgen/graphql/handler/extension"
+	"github.com/99designs/gqlgen/graphql/handler/transport"
+	"github.com/99designs/gqlgen/graphql/playground"
 )
 
 func webSocketInit(ctx context.Context, initPayload transport.InitPayload) (context.Context, *transport.InitPayload, error) {

diff --git a/api/generate_test.go b/api/generate_test.go
@@ -5,8 +5,9 @@ import (
 	"path"
 	"testing"
 
-	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/stretchr/testify/require"
+
+	"github.com/99designs/gqlgen/codegen/config"
 )
 
 func cleanup(workDir string) {

diff --git a/api/option_test.go b/api/option_test.go
@@ -3,12 +3,13 @@ package api
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/99designs/gqlgen/plugin"
 	"github.com/99designs/gqlgen/plugin/federation"
 	"github.com/99designs/gqlgen/plugin/modelgen"
 	"github.com/99designs/gqlgen/plugin/resolvergen"
-	"github.com/stretchr/testify/require"
 )
 
 type testPlugin struct{}

diff --git a/client/client_test.go b/client/client_test.go
@@ -12,9 +12,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/99designs/gqlgen/client"
 	"github.com/mitchellh/mapstructure"
 	"github.com/stretchr/testify/require"
+
+	"github.com/99designs/gqlgen/client"
 )
 
 func TestClient(t *testing.T) {

diff --git a/client/withfilesoption_test.go b/client/withfilesoption_test.go
@@ -10,8 +10,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/99designs/gqlgen/client"
 	"github.com/stretchr/testify/require"
+
+	"github.com/99designs/gqlgen/client"
 )
 
 func TestWithFiles(t *testing.T) {

diff --git a/codegen/args.go b/codegen/args.go
@@ -5,9 +5,10 @@ import (
 	"go/types"
 	"strings"
 
+	"github.com/vektah/gqlparser/v2/ast"
+
 	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/99designs/gqlgen/codegen/templates"
-	"github.com/vektah/gqlparser/v2/ast"
 )
 
 type ArgSet struct {

diff --git a/codegen/config/binder_test.go b/codegen/config/binder_test.go
@@ -4,11 +4,11 @@ import (
 	"go/types"
 	"testing"
 
-	"github.com/99designs/gqlgen/internal/code"
-
 	"github.com/stretchr/testify/require"
 	"github.com/vektah/gqlparser/v2"
 	"github.com/vektah/gqlparser/v2/ast"
+
+	"github.com/99designs/gqlgen/internal/code"
 )
 
 func TestBindingToInvalid(t *testing.T) {

diff --git a/codegen/data_test.go b/codegen/data_test.go
@@ -3,10 +3,10 @@ package codegen
 import (
 	"testing"
 
-	"github.com/99designs/gqlgen/codegen/config"
+	"github.com/stretchr/testify/assert"
 	"github.com/vektah/gqlparser/v2/ast"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/99designs/gqlgen/codegen/config"
 )
 
 func TestData_Directives(t *testing.T) {

diff --git a/codegen/directive.go b/codegen/directive.go
@@ -5,8 +5,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/99designs/gqlgen/codegen/templates"
 	"github.com/vektah/gqlparser/v2/ast"
+
+	"github.com/99designs/gqlgen/codegen/templates"
 )
 
 type DirectiveList map[string]*Directive

diff --git a/codegen/field.go b/codegen/field.go
@@ -10,11 +10,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/99designs/gqlgen/codegen/config"
-	"github.com/99designs/gqlgen/codegen/templates"
 	"github.com/vektah/gqlparser/v2/ast"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
+
+	"github.com/99designs/gqlgen/codegen/config"
+	"github.com/99designs/gqlgen/codegen/templates"
 )
 
 type Field struct {

diff --git a/codegen/field_test.go b/codegen/field_test.go
@@ -8,9 +8,10 @@ import (
 	"go/types"
 	"testing"
 
-	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/stretchr/testify/require"
 	ast2 "github.com/vektah/gqlparser/v2/ast"
+
+	"github.com/99designs/gqlgen/codegen/config"
 )
 
 func TestFindField(t *testing.T) {

diff --git a/codegen/generate.go b/codegen/generate.go
@@ -9,9 +9,10 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/vektah/gqlparser/v2/ast"
+
 	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/99designs/gqlgen/codegen/templates"
-	"github.com/vektah/gqlparser/v2/ast"
 )
 
 //go:embed *.gotpl

diff --git a/codegen/object.go b/codegen/object.go
@@ -7,10 +7,11 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/vektah/gqlparser/v2/ast"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
+
+	"github.com/99designs/gqlgen/codegen/config"
 )
 
 type GoFieldType int

diff --git a/codegen/templates/import_test.go b/codegen/templates/import_test.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/99designs/gqlgen/internal/code"
-
 	"github.com/stretchr/testify/require"
+
+	"github.com/99designs/gqlgen/internal/code"
 )
 
 func TestImports(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ import ( @@
     	"time"
     	"github.com/99designs/gqlgen/_examples/starwars/generated"
     	"github.com/99designs/gqlgen/_examples/starwars/models"
     )
@@ Expand Down @@