Merge pull request #455 from tdakkota/feat/try-go-experiment

refactor(ogen): use `go-json-experiment` instead of `encoding/json`

Author: ernado

_testdata/positive/format_gen.json

@@ -9,11 +9,11 @@ import (
 	"strings"
 
 	"github.com/go-faster/errors"
+	"github.com/go-json-experiment/json"
 
 	"github.com/ogen-go/ogen/gen"
 	"github.com/ogen-go/ogen/gen/genfs"
 	"github.com/ogen-go/ogen/internal/ogenzap"
-	"github.com/ogen-go/ogen/json"
 	"github.com/ogen-go/ogen/jsonschema"
 )
 

cmd/jschemagen/main.go

@@ -1,10 +1,11 @@
 package ogen
 
 import (
-	"encoding/json"
+	jsonv1 "encoding/json"
 	"strings"
 
 	"github.com/go-faster/jx"
+	jsonv2 "github.com/go-json-experiment/json"
 
 	"github.com/ogen-go/ogen/gen/ir"
 	"github.com/ogen-go/ogen/jsonschema"
@@ -865,8 +866,10 @@ func (s *Schema) SetDiscriminator(d *Discriminator) *Schema {
 }
 
 // SetEnum sets the Enum of the Schema.
-func (s *Schema) SetEnum(e []json.RawMessage) *Schema {
-	s.Enum = e
+func (s *Schema) SetEnum(e []jsonv1.RawMessage) *Schema {
+	for _, val := range e {
+		s.Enum = append(s.Enum, jsonv2.RawValue(val))
+	}
 	return s
 }
 
@@ -964,8 +967,8 @@ func (s *Schema) SetMinProperties(m *uint64) *Schema {
 }
 
 // SetDefault sets the Default of the Schema.
-func (s *Schema) SetDefault(d json.RawMessage) *Schema {
-	s.Default = d
+func (s *Schema) SetDefault(d jsonv1.RawMessage) *Schema {
+	s.Default = jsonv2.RawValue(d)
 	return s
 }
 
@@ -1027,11 +1030,16 @@ func (s *Schema) AsArray() *Schema {
 }
 
 // AsEnum returns a new "enum" Schema wrapping the receiver.
-func (s *Schema) AsEnum(def json.RawMessage, values ...json.RawMessage) *Schema {
+func (s *Schema) AsEnum(def jsonv1.RawMessage, values ...jsonv1.RawMessage) *Schema {
 	return &Schema{
 		Type:    s.Type,
-		Default: def,
-		Enum:    values,
+		Default: jsonv2.RawValue(def),
+		Enum: func() (r []jsonv2.RawValue) {
+			for _, val := range values {
+				r = append(r, jsonv2.RawValue(val))
+			}
+			return r
+		}(),
 	}
 }
 

dsl.go

@@ -1,9 +1,10 @@
 package ogen_test
 
 import (
-	"encoding/json"
+	jsonv1 "encoding/json"
 	"testing"
 
+	jsonv2 "github.com/go-json-experiment/json"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/ogen-go/ogen"
@@ -56,9 +57,9 @@ var (
 				ogen.DateTime().ToProperty("required_DateTime"),
 				ogen.Password().ToProperty("required_Password"),
 				ogen.Int32().AsArray().ToProperty("required_array_Int32"),
-				ogen.Int32().AsEnum(json.RawMessage("0"), json.RawMessage("0"), json.RawMessage("1")).
+				ogen.Int32().AsEnum(jsonv1.RawMessage("0"), jsonv1.RawMessage("0"), jsonv1.RawMessage("1")).
 					ToProperty("required_enum_Int32"),
-				ogen.Int32().AsEnum(json.RawMessage(`"off"`), json.RawMessage(`"0"`), json.RawMessage(`"1"`)).
+				ogen.Int32().AsEnum(jsonv1.RawMessage(`"off"`), jsonv1.RawMessage(`"0"`), jsonv1.RawMessage(`"1"`)).
 					ToProperty("required_enum_String"),
 			).
 			AddOptionalProperties(
@@ -359,7 +360,7 @@ func TestBuilder(t *testing.T) {
 		OneOf:            []*ogen.Schema{ogen.NewSchema()},
 		AnyOf:            []*ogen.Schema{ogen.NewSchema()},
 		Discriminator:    &ogen.Discriminator{PropertyName: "prop"},
-		Enum:             []json.RawMessage{json.RawMessage("0"), json.RawMessage("1")},
+		Enum:             []jsonv2.RawValue{jsonv2.RawValue("0"), jsonv2.RawValue("1")},
 		MultipleOf:       mltStr,
 		Maximum:          maxStr,
 		ExclusiveMaximum: true,
@@ -373,7 +374,7 @@ func TestBuilder(t *testing.T) {
 		UniqueItems:      true,
 		MaxProperties:    &umax,
 		MinProperties:    &umax,
-		Default:          json.RawMessage("0"),
+		Default:          jsonv2.RawValue("0"),
 	}, ogen.NewSchema().
 		SetRef("ref").
 		SetDescription("desc").
@@ -387,7 +388,7 @@ func TestBuilder(t *testing.T) {
 		SetOneOf([]*ogen.Schema{ogen.NewSchema()}).
 		SetAnyOf([]*ogen.Schema{ogen.NewSchema()}).
 		SetDiscriminator(&ogen.Discriminator{PropertyName: "prop"}).
-		SetEnum([]json.RawMessage{json.RawMessage("0"), json.RawMessage("1")}).
+		SetEnum([]jsonv1.RawMessage{jsonv1.RawMessage("0"), jsonv1.RawMessage("1")}).
 		SetMultipleOf(&mlt).
 		SetMaximum(&max).
 		SetExclusiveMaximum(true).
@@ -401,6 +402,6 @@ func TestBuilder(t *testing.T) {
 		SetUniqueItems(true).
 		SetMaxProperties(&umax).
 		SetMinProperties(&umax).
-		SetDefault(json.RawMessage("0")),
+		SetDefault(jsonv1.RawMessage("0")),
 	)
 }