Stowage/go-yaml
2
0
Fork 0
mirror of https://github.com/goccy/go-yaml.git synced 2025-10-26 19:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add Flow option for Encoder

Browse source
This commit is contained in:
Masaaki Goshima 2019-10-31 13:29:43 +09:00
parent 5e642017ee
commit e4be76e5f8
3 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
encode.go
View file

@ -28,6 +28,7 @@ type Encoder struct {
writer io.Writer
opts []EncodeOption
indent int
isFlowStyle bool
anchorPtrToNameMap map[uintptr]string
line int
@ -64,6 +65,11 @@ func (e *Encoder) Close() error {
//
// See the documentation for Marshal for details about the conversion of Go values to YAML.
func (e *Encoder) Encode(v interface{}) error {
for _, opt := range e.opts {
if err := opt(e); err != nil {
return errors.Wrapf(err, "failed to run option for encoder")
}
}
node, err := e.encodeValue(reflect.ValueOf(v), 1)
if err != nil {
return errors.Wrapf(err, "failed to encode value")
@ -225,10 +231,7 @@ func (e *Encoder) encodeBool(v bool) ast.Node {
}
func (e *Encoder) encodeSlice(value reflect.Value) (ast.Node, error) {
sequence := &ast.SequenceNode{
Start: token.New("-", "-", e.pos(e.column)),
Values: []ast.Node{},
}
sequence := ast.Sequence(token.New("-", "-", e.pos(e.column)), e.isFlowStyle)
for i := 0; i < value.Len(); i++ {
node, err := e.encodeValue(value.Index(i), e.column)
if err != nil {
@ -259,7 +262,7 @@ func (e *Encoder) encodeMapItem(item MapItem, column int) (*ast.MappingValueNode
}
func (e *Encoder) encodeMapSlice(value MapSlice, column int) (ast.Node, error) {
node := ast.Mapping(token.New("", "", e.pos(column)), false)
node := ast.Mapping(token.New("", "", e.pos(column)), e.isFlowStyle)
for _, item := range value {
value, err := e.encodeMapItem(item, column)
if err != nil {
@ -271,7 +274,7 @@ func (e *Encoder) encodeMapSlice(value MapSlice, column int) (ast.Node, error) {
}
func (e *Encoder) encodeMap(value reflect.Value, column int) ast.Node {
node := ast.Mapping(token.New("", "", e.pos(column)), false)
node := ast.Mapping(token.New("", "", e.pos(column)), e.isFlowStyle)
keys := []string{}
for _, k := range value.MapKeys() {
keys = append(keys, k.Interface().(string))
@ -345,7 +348,7 @@ func (e *Encoder) isZeroValue(v reflect.Value) bool {
}
func (e *Encoder) encodeStruct(value reflect.Value, column int) (ast.Node, error) {
node := ast.Mapping(token.New("", "", e.pos(column)), false)
node := ast.Mapping(token.New("", "", e.pos(column)), e.isFlowStyle)
structType := value.Type()
structFieldMap, err := structFieldMap(structType)
if err != nil {
@ -367,7 +370,7 @@ func (e *Encoder) encodeStruct(value reflect.Value, column int) (ast.Node, error
return nil, errors.Wrapf(err, "failed to encode value")
}
if m, ok := value.(*ast.MappingNode); ok {
if structField.IsFlow {
if !e.isFlowStyle && structField.IsFlow {
m.IsFlowStyle = true
}
for _, value := range m.Values {
@ -375,7 +378,7 @@ func (e *Encoder) encodeStruct(value reflect.Value, column int) (ast.Node, error
value.Value.GetToken().Position.Column += e.indent
}
} else if s, ok := value.(*ast.SequenceNode); ok {
if structField.IsFlow {
if !e.isFlowStyle && structField.IsFlow {
s.IsFlowStyle = true
}
}