Skip to content

Handle empty struct as Nil #14

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

Merged
kelindar merged 1 commit into from
Sep 1, 2023
Merged

Handle empty struct as Nil #14

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
6 changes: 6 additions & 0 deletions convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ import (

// ValueOf converts the type to our value
func ValueOf(v any) Value {
if v == nil || reflect.TypeOf(v).Size() == 0 {
return Nil{}
}

switch v := v.(type) {
case Number:
return v
Expand Down Expand Up @@ -92,6 +96,8 @@ func ValueOf(v any) Value {
return sliceAsArray(v)
case nil, Nil:
return Nil{}
case struct{}:
return Nil{}
default:
out, err := json.Marshal(v)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
)

func TestValueOf(t *testing.T) {
type myNil struct{}
tests := []struct {
input any
output Value
Expand Down Expand Up @@ -48,6 +49,8 @@ func TestValueOf(t *testing.T) {
{input: []float64{1, 2, 3}, output: Numbers{1, 2, 3}},
{input: []bool{false, true}, output: Bools{false, true}},
{input: nil, output: Nil{}},
{input: struct{}{}, output: Nil{}},
{input: myNil{}, output: Nil{}},
{input: Nil{}, output: Nil{}},
{input: map[string]any{
"A": "foo",
Expand Down