reading float32 from float64 without error

changed_fields.go

@@ -1,12 +1,18 @@
 package meta
 
+import "bytes"
+
 type ChangedFields struct {
 	fieldNames map[string]struct{}
+	fieldsKey  *bytes.Buffer
 }
 
 func NewChangedFields(fieldCount int) ChangedFields {
+	keyBuffer := bytes.NewBuffer(make([]byte, 0, fieldCount*2))
+
 	cf := ChangedFields{
 		fieldNames: make(map[string]struct{}, fieldCount),
+		fieldsKey:  keyBuffer,
 	}
 	return cf
 }
@@ -32,7 +38,12 @@ func (cf *ChangedFields) SetChanged(fields ...string) {
 	}
 
 	for _, field := range fields {
+		if _, exists := cf.fieldNames[field]; exists {
+			continue
+		}
+
 		cf.fieldNames[field] = struct{}{}
+		cf.fieldsKey.WriteString(field)
 	}
 }
 
@@ -43,3 +54,7 @@ func (cf ChangedFields) Empty() bool {
 func (cf ChangedFields) IsNil() bool {
 	return cf.fieldNames == nil
 }
+
+func (cf ChangedFields) GetFieldsKey() string {
+	return cf.fieldsKey.String()
+}

changed_fields_test.go

@@ -0,0 +1,33 @@
+package meta
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestChangedFields(t *testing.T) {
+	t.Run("#SetChanged", func(t *testing.T) {
+		changedFields := NewChangedFields(3)
+
+		expectedFieldsMap := map[string]struct{}{
+			"a": {},
+			"b": {},
+			"c": {},
+		}
+
+		changedFields.SetChanged("a", "b", "c", "a")
+
+		assert.Equal(t, expectedFieldsMap, changedFields.fieldNames)
+	})
+
+	t.Run("#GetFieldsKey", func(t *testing.T) {
+		changedFields := NewChangedFields(3)
+		changedFields.SetChanged("b", "c", "a")
+		expectedKey := "bca"
+
+		actualKey := changedFields.GetFieldsKey()
+
+		assert.Equal(t, expectedKey, actualKey)
+	})
+}

fields_mask_test.go

@@ -3,7 +3,7 @@ package meta_test
 import (
 	"testing"
 
-	"git.bit5.ru/backend/meta/v3"
+	"git.bit5.ru/backend/meta/v5"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

go.mod

@@ -1,4 +1,4 @@
-module git.bit5.ru/backend/meta/v3
+module git.bit5.ru/backend/meta/v5
 
 go 1.20
 

interface.go

@@ -22,6 +22,9 @@ type Reader interface {
 	BeginContainer(field string) error
 	EndContainer() error
 
+	BeginCollection(field string) error
+	EndCollection() error
+
 	ContainerSize() (int, error)
 	IsContainerAssoc() (bool, error)
 
@@ -69,6 +72,7 @@ type Readable interface {
 type Writable interface {
 	Write(Writer) error
 	WriteFields(Writer) error
+	FieldsCount() int
 }
 
 type Struct interface {
@@ -77,9 +81,21 @@ type Struct interface {
 	Writable
 }
 
+type StructFactory func(classId uint32) (Readable, error)
+
 type Bitmasked interface {
 	FieldChanged(index uint64) bool
 	SetFieldChanged(index uint64)
 	HasChangedFields() bool
 	FieldsMask() FieldsMask
 }
+
+type WritableClass interface {
+	Class
+	Writable
+}
+
+type ReadableWritable interface {
+	Readable
+	Writable
+}

meta.go

@@ -0,0 +1,53 @@
+package meta
+
+const classField = "$id"
+
+func ReadGeneric(r Reader, createFunc StructFactory, field string) (Readable, error) {
+	if err := r.BeginContainer(field); err != nil {
+		return nil, err
+	}
+	size, err := r.ContainerSize()
+	if err != nil {
+		return nil, err
+	}
+	if size == 0 {
+		if err := r.EndContainer(); err != nil {
+			return nil, err
+		}
+
+		return nil, nil
+	}
+
+	var classId uint32
+	if err := r.ReadUint32(&classId, classField); err != nil {
+		return nil, err
+	}
+
+	s, err := createFunc(classId)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := s.ReadFields(r); err != nil {
+		return nil, err
+	}
+
+	if err := r.EndContainer(); err != nil {
+		return nil, err
+	}
+
+	return s, nil
+}
+
+func WriteGeneric(w Writer, s WritableClass, field string) error {
+	if err := w.BeginContainer(s.FieldsCount()+1, field); err != nil {
+		return err
+	}
+	if err := w.WriteUint32(s.ClassId(), classField); err != nil {
+		return err
+	}
+	if err := s.WriteFields(w); err != nil {
+		return err
+	}
+	return w.EndContainer()
+}

msgpack_assoc_reader.go

@@ -0,0 +1,629 @@
+package meta
+
+import (
+	"bytes"
+	"io"
+
+	"github.com/pkg/errors"
+	"github.com/vmihailenco/msgpack/v5"
+	"github.com/vmihailenco/msgpack/v5/msgpcode"
+)
+
+type msgpackAssocReader struct {
+	dec   *msgpack.Decoder
+	stack []assocReadContainer
+	curr  assocReadContainer
+}
+
+type assocReadContainer struct {
+	started bool
+	length  int
+	assoc   bool
+	values  map[string]msgpack.RawMessage
+	reader  io.Reader
+	readCnt int
+}
+
+func NewMsgpackAssocReader(r io.Reader) Reader {
+	return &msgpackAssocReader{
+		dec:   msgpack.NewDecoder(r),
+		stack: make([]assocReadContainer, 0, 2),
+		curr: assocReadContainer{
+			reader: r,
+		},
+	}
+}
+
+func (rd *msgpackAssocReader) readField() (string, error) {
+	field, err := rd.dec.DecodeString()
+	if err != nil {
+		return "", errors.WithStack(err)
+	}
+	return field, nil
+}
+
+func (rd *msgpackAssocReader) ReadInt8(v *int8, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeInt8(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeInt8(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeInt8(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadInt16(v *int16, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeInt16(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeInt16(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeInt16(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadInt32(v *int32, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeInt32(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeInt32(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeInt32(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadInt64(v *int64, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeInt64(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeInt64(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeInt64(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadUint8(v *uint8, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeUint8(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeUint8(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeUint8(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadUint16(v *uint16, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeUint16(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeUint16(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeUint16(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadUint32(v *uint32, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeUint32(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeUint32(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeUint32(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadUint64(v *uint64, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeUint64(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeUint64(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeUint64(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadBool(v *bool, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeBool(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeBool(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeBool(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadFloat32(v *float32, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeFloat32(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeFloat32(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeFloat32(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadFloat64(v *float64, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeFloat64(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeFloat64(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeFloat64(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadString(v *string, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeString(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeString(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeString(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) ReadBytes(v *[]byte, targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return decodeBytes(rd.dec, v)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		dec := msgpack.NewDecoder(bytes.NewReader(b))
+		return decodeBytes(dec, v)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return decodeBytes(rd.dec, v)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) BeginContainer(targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return rd.beginContainer(targetField)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		rd.dec.Reset(bytes.NewReader(b))
+		return rd.beginContainer(targetField)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return rd.beginContainer(targetField)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) EndContainer() error {
+	return rd.endContainer()
+}
+
+func (rd *msgpackAssocReader) BeginCollection(targetField string) error {
+	if !rd.curr.started || !rd.curr.assoc {
+		return rd.beginCollection(targetField)
+	}
+
+	if b, ok := rd.curr.values[targetField]; ok {
+		rd.dec.Reset(bytes.NewReader(b))
+		return rd.beginCollection(targetField)
+	}
+
+	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
+		field, err := rd.readField()
+		if err != nil {
+			return err
+		}
+		if field == targetField {
+			rd.curr.readCnt = i + 1
+			return rd.beginCollection(targetField)
+		}
+
+		raw, err := rd.dec.DecodeRaw()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.curr.values[field] = raw
+		rd.curr.readCnt = i + 1
+	}
+
+	return FieldNotFound
+}
+
+func (rd *msgpackAssocReader) EndCollection() error {
+	return rd.endContainer()
+}
+
+func (rd *msgpackAssocReader) ContainerSize() (int, error) {
+	return rd.curr.length, nil
+}
+
+func (rd *msgpackAssocReader) IsContainerAssoc() (bool, error) {
+	return rd.curr.assoc, nil
+}
+
+func (rd *msgpackAssocReader) Skip() error {
+	return errors.WithStack(rd.dec.Skip())
+}
+
+func (rd *msgpackAssocReader) TryReadMask() (bool, FieldsMask, error) {
+	if rd.curr.assoc {
+		return false, FieldsMask{}, nil
+	}
+
+	maskLen, err := rd.dec.DecodeArrayLen()
+	if err != nil {
+		if err == io.EOF {
+			return false, FieldsMask{}, nil
+		}
+		return false, FieldsMask{}, errors.WithStack(err)
+	}
+
+	var mask FieldsMask
+	for i := 0; i < maskLen; i++ {
+		maskPart, err := rd.dec.DecodeUint64()
+		if err != nil {
+			return false, FieldsMask{}, errors.WithStack(err)
+		}
+		mask.SetPartFromUint64(i, maskPart)
+	}
+
+	return true, mask, nil
+}
+
+func (rd *msgpackAssocReader) beginContainer(field string) error {
+	code, err := rd.dec.PeekCode()
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	switch {
+	case code == msgpcode.Nil:
+		if err := rd.dec.DecodeNil(); err != nil {
+			return errors.WithStack(err)
+		}
+		rd.stack = append(rd.stack, rd.curr)
+		rd.curr = assocReadContainer{
+			started: true,
+			length:  0,
+			assoc:   true,
+			values:  make(map[string]msgpack.RawMessage),
+			reader:  rd.dec.Buffered(),
+		}
+
+	case msgpcode.IsFixedMap(code), code == msgpcode.Map16, code == msgpcode.Map32:
+		l, err := rd.dec.DecodeMapLen()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.stack = append(rd.stack, rd.curr)
+		rd.curr = assocReadContainer{
+			started: true,
+			length:  l,
+			assoc:   true,
+			values:  make(map[string]msgpack.RawMessage, l),
+			reader:  rd.dec.Buffered(),
+		}
+
+	default:
+		return errors.Errorf("field `%s` is not a map", field)
+	}
+	return nil
+}
+
+func (rd *msgpackAssocReader) beginCollection(field string) error {
+	code, err := rd.dec.PeekCode()
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	switch {
+	case msgpcode.IsFixedArray(code), code == msgpcode.Array16, code == msgpcode.Array32:
+		l, err := rd.dec.DecodeArrayLen()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.stack = append(rd.stack, rd.curr)
+		rd.curr = assocReadContainer{
+			started: true,
+			length:  l,
+			assoc:   false,
+			reader:  rd.dec.Buffered(),
+		}
+
+	default:
+		return errors.Errorf("field `%s` is not an array", field)
+	}
+	return nil
+}
+
+func (rd *msgpackAssocReader) endContainer() error {
+	if len(rd.stack) == 0 {
+		return NoOpenContainer
+	}
+	rd.curr = rd.stack[len(rd.stack)-1]
+	rd.stack = rd.stack[:len(rd.stack)-1]
+	rd.dec.Reset(rd.curr.reader)
+	return nil
+}

msgpack_assoc_reader_test.go

@@ -0,0 +1,120 @@
+package meta_test
+
+import (
+	"bytes"
+	"encoding/hex"
+	"testing"
+
+	"git.bit5.ru/backend/meta/v5"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAssocMsgpackReader(t *testing.T) {
+	t.Run("reading parent", func(t *testing.T) {
+		// {"f1":"blabla","f3":[2,4,6],"f2":{"field":1},"f4":[{"field":10},{"field":1024}],"f5":null}
+		src := "85A26631A6626C61626C61A2663393020406A2663281A56669656C6401A266349281A56669656C640A81A56669656C64CD0400A26635C0"
+
+		expected := TestParent{
+			Field1: "blabla",
+			Field2: TestFoo{
+				Field: 1,
+			},
+			Field3: []int8{2, 4, 6},
+			Field4: []TestFoo{
+				{Field: 10},
+				{Field: 1024},
+			},
+		}
+
+		data, err := hex.DecodeString(src)
+		require.NoError(t, err)
+
+		rdr := meta.NewMsgpackAssocReader(bytes.NewReader(data))
+
+		var actual TestParent
+		readErr := actual.Read(rdr)
+		require.NoError(t, readErr)
+		require.EqualValues(t, expected, actual)
+	})
+
+	t.Run("reading child", func(t *testing.T) {
+		// {"f":"qwerty","f1":"blabla","f3":[2,4,6],"f2":{"field":1},"f4":[{"field":10},{"field":1024}]}
+		src := "85A166A6717765727479A26631A6626C61626C61A2663393020406A2663281A56669656C6401A266349281A56669656C640A81A56669656C64CD0400"
+
+		expected := TestChild{
+			Field: "qwerty",
+			TestParent: TestParent{
+				Field1: "blabla",
+				Field2: TestFoo{
+					Field: 1,
+				},
+				Field3: []int8{2, 4, 6},
+				Field4: []TestFoo{
+					{Field: 10},
+					{Field: 1024},
+				},
+			},
+		}
+
+		data, err := hex.DecodeString(src)
+		require.NoError(t, err)
+
+		rdr := meta.NewMsgpackAssocReader(bytes.NewReader(data))
+
+		var actual TestChild
+		readErr := actual.Read(rdr)
+		require.NoError(t, readErr)
+		require.EqualValues(t, expected, actual)
+	})
+
+	t.Run("fail reading parent as array", func(t *testing.T) {
+		// ["blabla",[1],[2,4,6],[[10],[1024]],null]
+		src := "95A6626C61626C6191019302040692910A91CD0400C0"
+
+		expected := TestParent{}
+
+		data, err := hex.DecodeString(src)
+		require.NoError(t, err)
+
+		rdr := meta.NewMsgpackAssocReader(bytes.NewReader(data))
+
+		var actual TestParent
+		readErr := actual.Read(rdr)
+		require.ErrorContains(t, readErr, "field `` is not a map")
+		require.EqualValues(t, expected, actual)
+	})
+
+	t.Run("fail reading parent as array with maps", func(t *testing.T) {
+		// ["blabla",{"field":1},[2,4,6],[{"field":10},{"field":1024}],null]
+		src := "95A6626C61626C6181A56669656C6401930204069281A56669656C640A81A56669656C64CD0400C0"
+
+		expected := TestParent{}
+
+		data, err := hex.DecodeString(src)
+		require.NoError(t, err)
+
+		rdr := meta.NewMsgpackAssocReader(bytes.NewReader(data))
+
+		var actual TestParent
+		readErr := actual.Read(rdr)
+		require.ErrorContains(t, readErr, "field `` is not a map")
+		require.EqualValues(t, expected, actual)
+	})
+
+	t.Run("fail reading child as array", func(t *testing.T) {
+		// ["blabla",[1],[2,4,6],[[10],[1024]],null,"qwerty"]
+		src := "96A6626C61626C6191019302040692910A91CD0400C0A6717765727479"
+
+		expected := TestChild{}
+
+		data, err := hex.DecodeString(src)
+		require.NoError(t, err)
+
+		rdr := meta.NewMsgpackAssocReader(bytes.NewReader(data))
+
+		var actual TestChild
+		readErr := actual.Read(rdr)
+		require.ErrorContains(t, readErr, "field `` is not a map")
+		require.EqualValues(t, expected, actual)
+	})
+}

msgpack_assoc_writer_test.go

@@ -5,7 +5,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"git.bit5.ru/backend/meta/v3"
+	"git.bit5.ru/backend/meta/v5"
 	"github.com/stretchr/testify/require"
 )
 

msgpack_reader.go

@@ -1,7 +1,6 @@
 package meta
 
 import (
-	"bytes"
 	"io"
 
 	"github.com/pkg/errors"
@@ -9,6 +8,11 @@ import (
 	"github.com/vmihailenco/msgpack/v5/msgpcode"
 )
 
+var (
+	FieldNotFound   = errors.New("field not found")
+	NoOpenContainer = errors.New("there is no open container")
+)
+
 type msgpackReader struct {
 	dec   *msgpack.Decoder
 	stack []readContainer
@@ -16,500 +20,83 @@ type msgpackReader struct {
 }
 
 type readContainer struct {
-	started bool
 	length int
-	assoc   bool
-	values  map[string]msgpack.RawMessage
-	reader  io.Reader
-	readCnt int
 }
 
 func NewMsgpackReader(r io.Reader) Reader {
 	return &msgpackReader{
 		dec:   msgpack.NewDecoder(r),
 		stack: make([]readContainer, 0, 2),
-		curr: readContainer{
-			reader: r,
-		},
+		curr:  readContainer{},
 	}
 }
 
-func (rd *msgpackReader) readField() (string, error) {
-	field, err := rd.dec.DecodeString()
-	if err != nil {
-		return "", errors.WithStack(err)
-	}
-	return field, nil
-}
-
 func (rd *msgpackReader) ReadInt8(v *int8, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeInt8(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeInt8(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeInt8(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadInt16(v *int16, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeInt16(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeInt16(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeInt16(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadInt32(v *int32, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeInt32(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeInt32(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeInt32(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadInt64(v *int64, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeInt64(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeInt64(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeInt64(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadUint8(v *uint8, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeUint8(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeUint8(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeUint8(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadUint16(v *uint16, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeUint16(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeUint16(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeUint16(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadUint32(v *uint32, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeUint32(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeUint32(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeUint32(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadUint64(v *uint64, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeUint64(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeUint64(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeUint64(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadBool(v *bool, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeBool(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeBool(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeBool(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadFloat32(v *float32, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeFloat32(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeFloat32(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeFloat32(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadFloat64(v *float64, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeFloat64(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeFloat64(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeFloat64(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadString(v *string, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeString(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeString(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeString(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) ReadBytes(v *[]byte, targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return decodeBytes(rd.dec, v)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		dec := msgpack.NewDecoder(bytes.NewReader(b))
-		return decodeBytes(dec, v)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return decodeBytes(rd.dec, v)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
 }
 
 func (rd *msgpackReader) BeginContainer(targetField string) error {
-	if !rd.curr.started || !rd.curr.assoc {
 	return rd.beginContainer(targetField)
-	}
-
-	if b, ok := rd.curr.values[targetField]; ok {
-		rd.dec.Reset(bytes.NewReader(b))
-		return rd.beginContainer(targetField)
-	}
-
-	for i := rd.curr.readCnt; i < rd.curr.length; i++ {
-		field, err := rd.readField()
-		if err != nil {
-			return err
-		}
-		if field == targetField {
-			rd.curr.readCnt = i + 1
-			return rd.beginContainer(targetField)
-		}
-
-		raw, err := rd.dec.DecodeRaw()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.curr.values[field] = raw
-	}
-
-	return errors.Errorf("field `%s` not found", targetField)
-}
-
-func (rd *msgpackReader) beginContainer(field string) error {
-	code, err := rd.dec.PeekCode()
-	if err != nil {
-		return errors.WithStack(err)
-	}
-
-	switch {
-	case msgpcode.IsFixedMap(code), code == msgpcode.Map16, code == msgpcode.Map32:
-		l, err := rd.dec.DecodeMapLen()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.stack = append(rd.stack, rd.curr)
-		rd.curr = readContainer{
-			started: true,
-			length:  l,
-			assoc:   true,
-			values:  make(map[string]msgpack.RawMessage, l),
-			reader:  rd.dec.Buffered(),
-		}
-
-	case msgpcode.IsFixedArray(code), code == msgpcode.Array16, code == msgpcode.Array32:
-		l, err := rd.dec.DecodeArrayLen()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		rd.stack = append(rd.stack, rd.curr)
-		rd.curr = readContainer{
-			started: true,
-			length:  l,
-			assoc:   false,
-			reader:  rd.dec.Buffered(),
-		}
-
-	default:
-		return errors.Errorf("there is no container for field `%s`", field)
-	}
-	return nil
 }
 
 func (rd *msgpackReader) EndContainer() error {
-	if len(rd.stack) == 0 {
-		return errors.New("there is no open containers")
-	}
-	rd.curr = rd.stack[len(rd.stack)-1]
-	rd.stack = rd.stack[:len(rd.stack)-1]
-	rd.dec.Reset(rd.curr.reader)
-	return nil
+	return rd.endContainer()
+}
+
+func (rd *msgpackReader) BeginCollection(targetField string) error {
+	return rd.beginContainer(targetField)
+}
+
+func (rd *msgpackReader) EndCollection() error {
+	return rd.endContainer()
 }
 
 func (rd *msgpackReader) ContainerSize() (int, error) {
@@ -517,7 +104,7 @@ func (rd *msgpackReader) ContainerSize() (int, error) {
 }
 
 func (rd *msgpackReader) IsContainerAssoc() (bool, error) {
-	return rd.curr.assoc, nil
+	return false, nil
 }
 
 func (rd *msgpackReader) Skip() error {
@@ -525,25 +112,15 @@ func (rd *msgpackReader) Skip() error {
 }
 
 func (rd *msgpackReader) TryReadMask() (bool, FieldsMask, error) {
-	code, err := rd.dec.PeekCode()
+	maskLen, err := rd.dec.DecodeArrayLen()
 	if err != nil {
-		return false, FieldsMask{}, errors.WithStack(err)
-	}
-
-	if code != msgpcode.Nil {
+		if err == io.EOF {
 			return false, FieldsMask{}, nil
 		}
-
-	if err := rd.dec.Skip(); err != nil {
 		return false, FieldsMask{}, errors.WithStack(err)
 	}
 
 	var mask FieldsMask
-	maskLen, err := rd.dec.DecodeArrayLen()
-	if err != nil {
-		return false, FieldsMask{}, errors.WithStack(err)
-	}
-
 	for i := 0; i < maskLen; i++ {
 		maskPart, err := rd.dec.DecodeUint64()
 		if err != nil {
@@ -555,6 +132,47 @@ func (rd *msgpackReader) TryReadMask() (bool, FieldsMask, error) {
 	return true, mask, nil
 }
 
+func (rd *msgpackReader) beginContainer(field string) error {
+	code, err := rd.dec.PeekCode()
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	switch {
+	case code == msgpcode.Nil:
+		if err := rd.dec.DecodeNil(); err != nil {
+			return errors.WithStack(err)
+		}
+		rd.stack = append(rd.stack, rd.curr)
+		rd.curr = readContainer{
+			length: 0,
+		}
+
+	case msgpcode.IsFixedArray(code), code == msgpcode.Array16, code == msgpcode.Array32:
+		l, err := rd.dec.DecodeArrayLen()
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		rd.stack = append(rd.stack, rd.curr)
+		rd.curr = readContainer{
+			length: l,
+		}
+
+	default:
+		return errors.Errorf("field `%s` is not an array", field)
+	}
+	return nil
+}
+
+func (rd *msgpackReader) endContainer() error {
+	if len(rd.stack) == 0 {
+		return NoOpenContainer
+	}
+	rd.curr = rd.stack[len(rd.stack)-1]
+	rd.stack = rd.stack[:len(rd.stack)-1]
+	return nil
+}
+
 func decodeUint8(dec *msgpack.Decoder, v *uint8) error {
 	tmp, err := dec.DecodeUint8()
 	if err != nil {
@@ -637,6 +255,21 @@ func decodeBool(dec *msgpack.Decoder, v *bool) error {
 }
 
 func decodeFloat32(dec *msgpack.Decoder, v *float32) error {
+	code, err := dec.PeekCode()
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	if code == msgpcode.Double {
+		var tmp float64
+		if err := decodeFloat64(dec, &tmp); err != nil {
+			return err
+		}
+
+		*v = float32(tmp)
+		return nil
+	}
+
 	tmp, err := dec.DecodeFloat32()
 	if err != nil {
 		return errors.WithStack(err)

msgpack_reader_test.go

@@ -5,14 +5,14 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"git.bit5.ru/backend/meta/v3"
+	"git.bit5.ru/backend/meta/v5"
 	"github.com/stretchr/testify/require"
 )
 
 func TestMsgpackReader(t *testing.T) {
-	t.Run("reading struct as map", func(t *testing.T) {
-		// {"f1":"blabla","f3":[2,4,6],"f2":{"field":1},"f4":[{"field":10},{"field":1024}]}
-		src := "84a26631a6626c61626c61a2663393020406a2663281a56669656c6401a266349281a56669656c640a81a56669656c64cd0400"
+	t.Run("reading parent", func(t *testing.T) {
+		// ["blabla",[1],[2,4,6],[[10],[1024]],null]
+		src := "95A6626C61626C6191019302040692910A91CD0400C0"
 
 		expected := TestParent{
 			Field1: "blabla",
@@ -37,20 +37,61 @@ func TestMsgpackReader(t *testing.T) {
 		require.EqualValues(t, expected, actual)
 	})
 
-	t.Run("reading struct as array with maps", func(t *testing.T) {
+	t.Run("reading child", func(t *testing.T) {
+		// ["blabla",[1],[2,4,6],[[10],[1024]],null,"qwerty"]
+		src := "96A6626C61626C6191019302040692910A91CD0400C0A6717765727479"
+
+		expected := TestChild{
+			Field: "qwerty",
+			TestParent: TestParent{
+				Field1: "blabla",
+				Field2: TestFoo{
+					Field: 1,
+				},
+				Field3: []int8{2, 4, 6},
+				Field4: []TestFoo{
+					{Field: 10},
+					{Field: 1024},
+				},
+			},
+		}
+
+		data, err := hex.DecodeString(src)
+		require.NoError(t, err)
+
+		rdr := meta.NewMsgpackReader(bytes.NewReader(data))
+
+		var actual TestChild
+		readErr := actual.Read(rdr)
+		require.NoError(t, readErr)
+		require.EqualValues(t, expected, actual)
+	})
+
+	t.Run("fail reading parent as map", func(t *testing.T) {
+		// {"f1":"blabla","f3":[2,4,6],"f2":{"field":1},"f4":[{"field":10},{"field":1024}]}
+		src := "84a26631a6626c61626c61a2663393020406a2663281a56669656c6401a266349281a56669656c640a81a56669656c64cd0400"
+
+		expected := TestParent{}
+
+		data, err := hex.DecodeString(src)
+		require.NoError(t, err)
+
+		rdr := meta.NewMsgpackReader(bytes.NewReader(data))
+
+		var actual TestParent
+		readErr := actual.Read(rdr)
+		require.ErrorContains(t, readErr, "field `` is not an array")
+		require.EqualValues(t, expected, actual)
+	})
+
+	t.Run("fail reading parent as array with maps", func(t *testing.T) {
 		// ["blabla",{"field":1},[2,4,6],[{"field":10},{"field":1024}]]
 		src := "94a6626c61626c6181a56669656c6401930204069281a56669656c640a81a56669656c64cd0400"
 
 		expected := TestParent{
 			Field1: "blabla",
-			Field2: TestFoo{
-				Field: 1,
-			},
-			Field3: []int8{2, 4, 6},
-			Field4: []TestFoo{
-				{Field: 10},
-				{Field: 1024},
-			},
+			Field3: []int8{},
+			Field4: []TestFoo{},
 		}
 
 		data, err := hex.DecodeString(src)
@@ -60,55 +101,15 @@ func TestMsgpackReader(t *testing.T) {
 
 		var actual TestParent
 		readErr := actual.Read(rdr)
-		require.NoError(t, readErr)
+		require.ErrorContains(t, readErr, "field `f2` is not an array")
 		require.EqualValues(t, expected, actual)
 	})
 
-	t.Run("reading struct only as array", func(t *testing.T) {
-		// ["blabla",[1],[2,4,6],[[10],[1024]]]
-		src := "94a6626c61626c6191019302040692910a91cd0400"
-
-		expected := TestParent{
-			Field1: "blabla",
-			Field2: TestFoo{
-				Field: 1,
-			},
-			Field3: []int8{2, 4, 6},
-			Field4: []TestFoo{
-				{Field: 10},
-				{Field: 1024},
-			},
-		}
-
-		data, err := hex.DecodeString(src)
-		require.NoError(t, err)
-
-		rdr := meta.NewMsgpackReader(bytes.NewReader(data))
-
-		var actual TestParent
-		readErr := actual.Read(rdr)
-		require.NoError(t, readErr)
-		require.EqualValues(t, expected, actual)
-	})
-
-	t.Run("reading child struct as map", func(t *testing.T) {
+	t.Run("fail reading child struct as map", func(t *testing.T) {
 		// {"f":"qwerty","f1":"blabla","f3":[2,4,6],"f2":{"field":1},"f4":[{"field":10},{"field":1024}]}
 		src := "85a166a6717765727479a26631a6626c61626c61a2663393020406a2663281a56669656c6401a266349281a56669656c640a81a56669656c64cd0400"
 
-		expected := TestChild{
-			Field: "qwerty",
-			TestParent: TestParent{
-				Field1: "blabla",
-				Field2: TestFoo{
-					Field: 1,
-				},
-				Field3: []int8{2, 4, 6},
-				Field4: []TestFoo{
-					{Field: 10},
-					{Field: 1024},
-				},
-			},
-		}
+		expected := TestChild{}
 
 		data, err := hex.DecodeString(src)
 		require.NoError(t, err)
@@ -117,37 +118,7 @@ func TestMsgpackReader(t *testing.T) {
 
 		var actual TestChild
 		readErr := actual.Read(rdr)
-		require.NoError(t, readErr)
-		require.EqualValues(t, expected, actual)
-	})
-
-	t.Run("reading child struct as array", func(t *testing.T) {
-		// ["blabla",[1],[2,4,6],[[10],[1024]],"qwerty"]
-		src := "95a6626c61626c6191019302040692910a91cd0400a6717765727479"
-
-		expected := TestChild{
-			Field: "qwerty",
-			TestParent: TestParent{
-				Field1: "blabla",
-				Field2: TestFoo{
-					Field: 1,
-				},
-				Field3: []int8{2, 4, 6},
-				Field4: []TestFoo{
-					{Field: 10},
-					{Field: 1024},
-				},
-			},
-		}
-
-		data, err := hex.DecodeString(src)
-		require.NoError(t, err)
-
-		rdr := meta.NewMsgpackReader(bytes.NewReader(data))
-
-		var actual TestChild
-		readErr := actual.Read(rdr)
-		require.NoError(t, readErr)
+		require.ErrorContains(t, readErr, "field `` is not an array")
 		require.EqualValues(t, expected, actual)
 	})
 }

msgpack_writer_test.go

@@ -5,7 +5,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"git.bit5.ru/backend/meta/v3"
+	"git.bit5.ru/backend/meta/v5"
 	"github.com/stretchr/testify/require"
 )
 

structs_test.go

@@ -1,14 +1,40 @@
 package meta_test
 
 import (
-	"git.bit5.ru/backend/meta/v3"
+	"git.bit5.ru/backend/meta/v5"
+	"github.com/pkg/errors"
 )
 
+func CreateTestParent(id uint32) (meta.Readable, error) {
+	if id == 111 {
+		return &TestParent{}, nil
+	}
+	return nil, errors.Errorf("wrong id")
+}
+
 type TestParent struct {
 	Field1 string      `json:"f1" msgpack:"f1"`
 	Field2 TestFoo     `json:"f2" msgpack:"f2"`
 	Field3 []int8      `json:"f3" msgpack:"f3"`
 	Field4 []TestFoo   `json:"f4" msgpack:"f4"`
+	Field5 ITestParent `json:"f5" msgpack:"f5"`
+}
+
+type ITestParent interface {
+	meta.Struct
+	PtrTestParent() *TestParent
+}
+
+func (s *TestParent) PtrTestParent() *TestParent {
+	return s
+}
+
+func (s *TestParent) ClassId() uint32 {
+	return 111
+}
+
+func (s *TestParent) ClassName() string {
+	return "TestParent"
 }
 
 func (s *TestParent) Reset() {
@@ -26,6 +52,8 @@ func (s *TestParent) Reset() {
 		s.Field4 = s.Field4[:0]
 	}
 
+	s.Field5 = nil
+
 }
 
 func (s *TestParent) Read(reader meta.Reader) error {
@@ -46,8 +74,8 @@ func (s *TestParent) ReadFields(reader meta.Reader) error {
 		return err
 	}
 
-	if contSize < 4 {
-		contSize = 4
+	if contSize < 5 {
+		contSize = 5
 	}
 
 	if contSize <= 0 {
@@ -79,7 +107,7 @@ func (s *TestParent) ReadFields(reader meta.Reader) error {
 	}
 
 	contSize--
-	if err := reader.BeginContainer("f3"); err != nil {
+	if err := reader.BeginCollection("f3"); err != nil {
 		return err
 	}
 	field3Size, err := reader.ContainerSize()
@@ -94,7 +122,7 @@ func (s *TestParent) ReadFields(reader meta.Reader) error {
 
 		s.Field3 = append(s.Field3, tmpField3)
 	}
-	if err := reader.EndContainer(); err != nil {
+	if err := reader.EndCollection(); err != nil {
 		return err
 	}
 
@@ -103,7 +131,7 @@ func (s *TestParent) ReadFields(reader meta.Reader) error {
 	}
 
 	contSize--
-	if err := reader.BeginContainer("f4"); err != nil {
+	if err := reader.BeginCollection("f4"); err != nil {
 		return err
 	}
 	field4Size, err := reader.ContainerSize()
@@ -124,10 +152,25 @@ func (s *TestParent) ReadFields(reader meta.Reader) error {
 
 		s.Field4 = append(s.Field4, tmpField4)
 	}
-	if err := reader.EndContainer(); err != nil {
+	if err := reader.EndCollection(); err != nil {
 		return err
 	}
 
+	if contSize <= 0 {
+		return nil
+	}
+
+	contSize--
+	if v, err := meta.ReadGeneric(reader, CreateTestParent, "f5"); err != nil {
+		if err != meta.FieldNotFound {
+			return err
+		}
+	} else {
+		if v != nil {
+			s.Field5 = v.(ITestParent)
+		}
+	}
+
 	return nil
 }
 
@@ -191,6 +234,10 @@ func (s *TestParent) WriteFields(writer meta.Writer) error {
 	return nil
 }
 
+func (s *TestParent) FieldsCount() int {
+	return 5
+}
+
 type TestChild struct {
 	TestParent