tuning: json encoding/decoding by go-json

99designs · Dec 4, 2024 · ecf08be · ecf08be
1 parent f5f8ca1
commit ecf08be
Show file tree

Hide file tree

Showing 52 changed files with 54 additions and 48 deletions.
diff --git a/_examples/go.mod b/_examples/go.mod
@@ -19,6 +19,7 @@ require (
 require (
 	github.com/agnivade/levenshtein v1.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/logrusorgru/aurora/v4 v4.0.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect

diff --git a/_examples/go.sum b/_examples/go.sum
@@ -15,6 +15,8 @@ github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54 h1:SG7nF6SRlWhcT7c
 github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
 github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
 github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=

diff --git a/client/client.go b/client/client.go
@@ -4,7 +4,7 @@ package client
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 	"net/http"

diff --git a/client/client_test.go b/client/client_test.go
@@ -2,7 +2,7 @@ package client_test
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 	"mime/multipart"

diff --git a/client/errors.go b/client/errors.go
@@ -1,6 +1,6 @@
 package client
 
-import "encoding/json"
+import "github.com/goccy/go-json"
 
 // RawJsonError is a json formatted error from a GraphQL server.
 type RawJsonError struct {

diff --git a/client/sse.go b/client/sse.go
@@ -3,7 +3,7 @@ package client
 import (
 	"bufio"
 	"context"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"net/http/httptest"
 	"net/textproto"

diff --git a/client/websocket.go b/client/websocket.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"errors"
 	"fmt"
 	"io"

diff --git a/client/withfilesoption.go b/client/withfilesoption.go
@@ -2,7 +2,7 @@ package client
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 	"mime/multipart"

diff --git a/codegen/testserver/followschema/mutation_with_custom_scalar.go b/codegen/testserver/followschema/mutation_with_custom_scalar.go
@@ -1,7 +1,7 @@
 package followschema
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"errors"
 	"io"
 	"regexp"

diff --git a/codegen/testserver/singlefile/defer_test.go b/codegen/testserver/singlefile/defer_test.go
@@ -3,7 +3,7 @@ package singlefile
 import (
 	"cmp"
 	"context"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"math/rand"
 	"reflect"
 	"slices"

diff --git a/codegen/testserver/singlefile/mutation_with_custom_scalar.go b/codegen/testserver/singlefile/mutation_with_custom_scalar.go
@@ -1,7 +1,7 @@
 package singlefile
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"errors"
 	"io"
 	"regexp"

diff --git a/docs/content/recipes/federation.md b/docs/content/recipes/federation.md
@@ -227,7 +227,7 @@ genrated resolver functions that include a new argument, `federationRequires`, t
 fields you requested in your `@requires.fields` selection set.
 
 > Note: currently it's represented as a map[string]any where the contained values are encoded with
-`encoding/json`. Eventually we will generate a typesafe model that represents these models,
+`github.com/goccy/go-json`. Eventually we will generate a typesafe model that represents these models,
 however that is a large lift. This typesafe support will be added in the future.
 
 ### Example

diff --git a/docs/content/reference/model-generation.md b/docs/content/reference/model-generation.md
@@ -11,7 +11,7 @@ advantageous, or even necessary, to have control over some aspects of this outpu
 ## json ",omitempty"
 
 By default, fields that are marked as nullable in the GraphQL schema, e.g. `field: String` rather than `field: String!`,
-have the [json ",omitempty"](https://pkg.go.dev/encoding/json#Marshal) field tag applied to them.  This is probably fine
+have the [json ",omitempty"](https://pkg.go.dev/github.com/goccy/go-json#Marshal) field tag applied to them.  This is probably fine
 if the downstream consumers of json serialized representations of this model are all written in Go, but obviously this
 is not always true.
 

diff --git a/go.mod b/go.mod
@@ -28,6 +28,7 @@ require (
 	github.com/andybalholm/cascadia v1.3.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect

diff --git a/go.sum b/go.sum
@@ -16,6 +16,8 @@ github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54 h1:SG7nF6SRlWhcT7c
 github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
 github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
 github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

diff --git a/graphql/any.go b/graphql/any.go
@@ -1,7 +1,7 @@
 package graphql
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"io"
 )
 

diff --git a/graphql/coercion.go b/graphql/coercion.go
@@ -1,7 +1,7 @@
 package graphql
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 )
 
 // CoerceList applies coercion from a single value to a list.

diff --git a/graphql/coercion_test.go b/graphql/coercion_test.go
@@ -1,7 +1,7 @@
 package graphql
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"

diff --git a/graphql/executor/testexecutor/testexecutor.go b/graphql/executor/testexecutor/testexecutor.go
@@ -3,7 +3,7 @@ package testexecutor
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"errors"
 	"fmt"
 	"io"

diff --git a/graphql/float.go b/graphql/float.go
@@ -2,7 +2,7 @@ package graphql
 
 import (
 	"context"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"errors"
 	"fmt"
 	"io"

diff --git a/graphql/handler/apollofederatedtracingv1/tracing_test.go b/graphql/handler/apollofederatedtracingv1/tracing_test.go
@@ -3,7 +3,7 @@ package apollofederatedtracingv1_test
 import (
 	"context"
 	"encoding/base64"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"io"
 	"net/http"
 	"net/http/httptest"

diff --git a/graphql/handler/apollotracing/tracer_test.go b/graphql/handler/apollotracing/tracer_test.go
@@ -1,7 +1,7 @@
 package apollotracing_test
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"io"
 	"net/http"
 	"net/http/httptest"

diff --git a/graphql/handler/debug/tracer.go b/graphql/handler/debug/tracer.go
@@ -2,7 +2,7 @@ package debug
 
 import (
 	"context"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 	"os"

diff --git a/graphql/handler/server.go b/graphql/handler/server.go
@@ -2,7 +2,7 @@ package handler
 
 import (
 	"context"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"errors"
 	"fmt"
 	"net/http"

diff --git a/graphql/handler/transport/error.go b/graphql/handler/transport/error.go
@@ -1,7 +1,7 @@
 package transport
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"net/http"
 

diff --git a/graphql/handler/transport/http_form_multipart.go b/graphql/handler/transport/http_form_multipart.go
@@ -1,7 +1,7 @@
 package transport
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"io"
 	"mime"
 	"net/http"

diff --git a/graphql/handler/transport/http_get.go b/graphql/handler/transport/http_get.go
@@ -1,7 +1,7 @@
 package transport
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"io"
 	"net/http"
 	"net/url"

diff --git a/graphql/handler/transport/http_multipart_mixed.go b/graphql/handler/transport/http_multipart_mixed.go
@@ -1,7 +1,7 @@
 package transport
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 	"log"

diff --git a/graphql/handler/transport/sse.go b/graphql/handler/transport/sse.go
@@ -1,7 +1,7 @@
 package transport
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 	"log"

diff --git a/graphql/handler/transport/util.go b/graphql/handler/transport/util.go
@@ -1,7 +1,7 @@
 package transport
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 

diff --git a/graphql/handler/transport/websocket.go b/graphql/handler/transport/websocket.go
@@ -3,7 +3,7 @@ package transport
 import (
 	"bytes"
 	"context"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"errors"
 	"fmt"
 	"log"

diff --git a/graphql/handler/transport/websocket_graphql_transport_ws.go b/graphql/handler/transport/websocket_graphql_transport_ws.go
@@ -1,7 +1,7 @@
 package transport
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 
 	"github.com/gorilla/websocket"

diff --git a/graphql/handler/transport/websocket_graphqlws.go b/graphql/handler/transport/websocket_graphqlws.go
@@ -1,7 +1,7 @@
 package transport
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 
 	"github.com/gorilla/websocket"

diff --git a/graphql/handler/transport/websocket_subprotocol.go b/graphql/handler/transport/websocket_subprotocol.go
@@ -1,7 +1,7 @@
 package transport
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"errors"
 
 	"github.com/gorilla/websocket"

diff --git a/graphql/handler/transport/websocket_test.go b/graphql/handler/transport/websocket_test.go
@@ -2,7 +2,7 @@ package transport_test
 
 import (
 	"context"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"errors"
 	"net/http"
 	"net/http/httptest"

diff --git a/graphql/id.go b/graphql/id.go
@@ -1,7 +1,7 @@
 package graphql
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 	"strconv"

diff --git a/graphql/id_test.go b/graphql/id_test.go
@@ -2,7 +2,7 @@ package graphql
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"math"
 	"testing"
 

diff --git a/graphql/int.go b/graphql/int.go
@@ -1,7 +1,7 @@
 package graphql
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 	"strconv"

diff --git a/graphql/int_test.go b/graphql/int_test.go
@@ -1,7 +1,7 @@
 package graphql
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"

diff --git a/graphql/map.go b/graphql/map.go
@@ -1,7 +1,7 @@
 package graphql
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"io"
 )

diff --git a/graphql/omittable.go b/graphql/omittable.go
@@ -1,6 +1,6 @@
 package graphql
 
-import "encoding/json"
+import "github.com/goccy/go-json"
 
 // Omittable is a wrapper around a value that also stores whether it is set
 // or not.

diff --git a/graphql/omittable_test.go b/graphql/omittable_test.go
@@ -1,7 +1,7 @@
 package graphql
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"

diff --git a/graphql/playground/apollo_sandbox_playground.go b/graphql/playground/apollo_sandbox_playground.go
@@ -1,7 +1,7 @@
 package playground
 
 import (
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 	"html/template"
 	"net/http"

diff --git a/graphql/response.go b/graphql/response.go
@@ -2,7 +2,7 @@ package graphql
 
 import (
 	"context"
-	"encoding/json"
+	"github.com/goccy/go-json"
 	"fmt"
 
 	"github.com/vektah/gqlparser/v2/ast"