fix(go): marshaling tag

reearth · Dec 22, 2023 · 0d83da5 · 0d83da5
1 parent ec3e80f
commit 0d83da5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/go/marshaling.go b/go/marshaling.go
@@ -197,7 +197,7 @@ func Marshal(src any, item *Item) {
 
 		vft := vf.Type()
 		var value any
-		if m, ok := vf.Interface().(MarshalCMS); ok {
+		if m, ok := vf.Interface().(MarshalCMS); ok && m != nil {
 			value = m.MarshalCMS()
 		} else if vft.Kind() == reflect.Slice && vft.Elem().Kind() == reflect.String && vf.Len() > 0 {
 			st := reflect.TypeOf("")

diff --git a/go/marshaling_test.go b/go/marshaling_test.go
@@ -100,7 +100,7 @@ func TestMarshal(t *testing.T) {
 		GGG: []G{{ID: "1", AAA: "ggg"}},
 		HHH: []*G{{ID: "2", AAA: "hhh"}, nil},
 		JJJ: &Value{value: "foo"},
-		KKK: &Tag{ID: "tag"},
+		KKK: &Tag{Name: "tag"},
 	}
 
 	expected := &Item{

diff --git a/go/value.go b/go/value.go
@@ -73,6 +73,9 @@ func TagsFrom(j any) []Tag {
 }
 
 func (t Tag) MarshalCMS() any {
+	if t.ID == "" {
+		return t.Name
+	}
 	return t.ID
 }