Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle string option for time types similar to other types #118

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Handle string option for time types similar to other types #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions arshal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4396,6 +4396,15 @@ func TestMarshal(t *testing.T) {
D2: 12*time.Hour + 34*time.Minute + 56*time.Second + 78*time.Millisecond + 90*time.Microsecond + 12*time.Nanosecond,
},
want: `{"D1":45296078090012,"D2":"12h34m56.078090012s","D3":0,"D4":"0","D5":0,"D6":"0","D7":0,"D8":"0","D9":0,"D10":"0","D11":"0:00:00"}`,
}, {
name: jsontest.Name("Duration/MapKey"),
in: map[time.Duration]string{time.Second: ""},
want: `{"1s":""}`,
}, {
name: jsontest.Name("Duration/MapKey/Legacy"),
opts: []Options{jsonflags.FormatTimeWithLegacySemantics | 1},
in: map[time.Duration]string{time.Second: ""},
want: `{"1000000000":""}`,
}, {
name: jsontest.Name("Time/Zero"),
in: struct {
Expand Down Expand Up @@ -8859,6 +8868,17 @@ func TestUnmarshal(t *testing.T) {
D1: 12*time.Hour + 34*time.Minute + 56*time.Second + 78*time.Millisecond + 90*time.Microsecond + 12*time.Nanosecond,
D2: 12*time.Hour + 34*time.Minute + 56*time.Second + 78*time.Millisecond + 90*time.Microsecond + 12*time.Nanosecond,
}),
}, {
name: jsontest.Name("Duration/MapKey"),
inBuf: `{"1s":""}`,
inVal: new(map[time.Duration]string),
want: addr(map[time.Duration]string{time.Second: ""}),
}, {
name: jsontest.Name("Duration/MapKey/Legacy"),
opts: []Options{jsonflags.FormatTimeWithLegacySemantics | 1},
inBuf: `{"1000000000":""}`,
inVal: new(map[time.Duration]string),
want: addr(map[time.Duration]string{time.Second: ""}),
}, {
name: jsontest.Name("Duration/IgnoreInvalidFormat"),
opts: []Options{invalidFormatOption},
Expand Down Expand Up @@ -8954,22 +8974,18 @@ func TestUnmarshal(t *testing.T) {
time.Unix(-23225777755, 6).UTC(),
}),
}, {
name: jsontest.Name("Time/Format/UnixString"),
name: jsontest.Name("Time/Format/UnixString/InvalidNumber"),
inBuf: `{
"T23": -23225777754.999999994,
"T25": -23225777754999.999994,
"T27": -23225777754999999.994,
"T29": -23225777754999999994
}`,
inVal: new(structTimeFormat),
want: addr(structTimeFormat{
T23: time.Unix(-23225777755, 6).UTC(),
T25: time.Unix(-23225777755, 6).UTC(),
T27: time.Unix(-23225777755, 6).UTC(),
T29: time.Unix(-23225777755, 6).UTC(),
}),
inVal: new(structTimeFormat),
want: new(structTimeFormat),
wantErr: EU(nil).withPos(`{`+"\n\t\t\t"+`"T23": `, "/T23").withType('0', timeTimeType),
}, {
name: jsontest.Name("Time/Format/UnixString/Invalid"),
name: jsontest.Name("Time/Format/UnixString/InvalidString"),
inBuf: `{
"T22": "-23225777754.999999994",
"T24": "-23225777754999.999994",
Expand Down
14 changes: 8 additions & 6 deletions arshal_time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {

// TODO(https://go.dev/issue/62121): Use reflect.Value.AssertTo.
m.td = *va.Addr().Interface().(*time.Duration)
k := stringOrNumberKind(!m.isNumeric() || mo.Flags.Get(jsonflags.StringifyNumbers))
k := stringOrNumberKind(!m.isNumeric() || xe.Tokens.Last.NeedObjectName() || mo.Flags.Get(jsonflags.StringifyNumbers))
if err := xe.AppendRaw(k, true, m.appendMarshal); err != nil {
if !isSyntacticError(err) && !export.IsIOError(err) {
err = newMarshalErrorBefore(enc, t, err)
Expand All @@ -75,6 +75,7 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
return unmarshalNano(dec, va, uo)
}

stringify := !u.isNumeric() || xd.Tokens.Last.NeedObjectName() || uo.Flags.Get(jsonflags.StringifyNumbers)
var flags jsonwire.ValueFlags
td := va.Addr().Interface().(*time.Duration)
val, err := xd.ReadValue(&flags)
Expand All @@ -88,7 +89,7 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
}
return nil
case '"':
if u.isNumeric() && !uo.Flags.Get(jsonflags.StringifyNumbers) {
if !stringify {
break
}
val = jsonwire.UnquoteMayCopy(val, flags.IsVerbatim())
Expand All @@ -98,7 +99,7 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
*td = u.td
return nil
case '0':
if !u.isNumeric() {
if stringify {
break
}
if err := u.unmarshal(val); err != nil {
Expand All @@ -122,7 +123,7 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {

// TODO(https://go.dev/issue/62121): Use reflect.Value.AssertTo.
m.tt = *va.Addr().Interface().(*time.Time)
k := stringOrNumberKind(!m.isNumeric() || mo.Flags.Get(jsonflags.StringifyNumbers))
k := stringOrNumberKind(!m.isNumeric() || xe.Tokens.Last.NeedObjectName() || mo.Flags.Get(jsonflags.StringifyNumbers))
if err := xe.AppendRaw(k, !m.hasCustomFormat(), m.appendMarshal); err != nil {
if mo.Flags.Get(jsonflags.ReportErrorsWithLegacySemantics) {
return internal.NewMarshalerError(va.Addr().Interface(), err, "MarshalJSON") // unlike unmarshal, always wrapped
Expand All @@ -145,6 +146,7 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
u.looseRFC3339 = true
}

stringify := !u.isNumeric() || xd.Tokens.Last.NeedObjectName() || uo.Flags.Get(jsonflags.StringifyNumbers)
var flags jsonwire.ValueFlags
tt := va.Addr().Interface().(*time.Time)
val, err := xd.ReadValue(&flags)
Expand All @@ -158,7 +160,7 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
}
return nil
case '"':
if u.isNumeric() && !uo.Flags.Get(jsonflags.StringifyNumbers) {
if !stringify {
break
}
val = jsonwire.UnquoteMayCopy(val, flags.IsVerbatim())
Expand All @@ -171,7 +173,7 @@ func makeTimeArshaler(fncs *arshaler, t reflect.Type) *arshaler {
*tt = u.tt
return nil
case '0':
if !u.isNumeric() {
if stringify {
break
}
if err := u.unmarshal(val); err != nil {
Expand Down
Loading