diff --git a/goextVersion.go b/goextVersion.go index 8693c5e..e08c894 100644 --- a/goextVersion.go +++ b/goextVersion.go @@ -1,5 +1,5 @@ package goext -const GoextVersion = "0.0.159" +const GoextVersion = "0.0.161" -const GoextVersionTimestamp = "2023-06-10T18:35:56+0200" +const GoextVersionTimestamp = "2023-06-11T16:35:20+0200" diff --git a/wmo/reflection.go b/wmo/reflection.go index 068a801..af776fd 100644 --- a/wmo/reflection.go +++ b/wmo/reflection.go @@ -1,6 +1,7 @@ package wmo import ( + "errors" "gogs.mikescher.com/BlackForestBytes/goext/langext" "gogs.mikescher.com/BlackForestBytes/goext/reflectext" "reflect" @@ -14,7 +15,6 @@ func (c *Coll[TData]) EnsureInitializedReflection(v TData) { } rval := reflect.ValueOf(v) - for rval.Type().Kind() == reflect.Pointer { rval = rval.Elem() } @@ -69,50 +69,65 @@ func (c *Coll[TData]) initFields(prefix string, rval reflect.Value, m map[string continue } + bsontags := make([]string, 0) bsonkey, found := rsfield.Tag.Lookup("bson") if !found { continue } if strings.Contains(bsonkey, ",") { bsonkey = bsonkey[:strings.Index(bsonkey, ",")] + bsontags = strings.Split(bsonkey[strings.Index(bsonkey, ",")+1:], ",") } if bsonkey == "-" { continue } + if bsonkey == "" { + bsonkey = rsfield.Name + } + fullKey := prefix + bsonkey newIdxArr := langext.ArrCopy(idxarr) newIdxArr = append(newIdxArr, i) - if rvfield.Type().Kind() == reflect.Pointer { + if langext.InArray("inline", bsontags) && rvfield.Kind() == reflect.Struct { - m[fullKey] = fullTypeRef{ - IsPointer: true, - RealType: rvfield.Type(), - Kind: rvfield.Type().Elem().Kind(), - Type: rvfield.Type().Elem(), - UnderlyingType: reflectext.Underlying(rvfield.Type().Elem()), - Name: rsfield.Name, - Index: newIdxArr, - } + // pass-through field + c.initFields(prefix, rvfield, m, newIdxArr) } else { - m[fullKey] = fullTypeRef{ - IsPointer: false, - RealType: rvfield.Type(), - Kind: rvfield.Type().Kind(), - Type: rvfield.Type(), - UnderlyingType: reflectext.Underlying(rvfield.Type()), - Name: rsfield.Name, - Index: newIdxArr, + if rvfield.Type().Kind() == reflect.Pointer { + + m[fullKey] = fullTypeRef{ + IsPointer: true, + RealType: rvfield.Type(), + Kind: rvfield.Type().Elem().Kind(), + Type: rvfield.Type().Elem(), + UnderlyingType: reflectext.Underlying(rvfield.Type().Elem()), + Name: rsfield.Name, + Index: newIdxArr, + } + + } else { + + m[fullKey] = fullTypeRef{ + IsPointer: false, + RealType: rvfield.Type(), + Kind: rvfield.Type().Kind(), + Type: rvfield.Type(), + UnderlyingType: reflectext.Underlying(rvfield.Type()), + Name: rsfield.Name, + Index: newIdxArr, + } + } - } + if rvfield.Kind() == reflect.Struct { + c.initFields(fullKey+".", rvfield, m, newIdxArr) + } - if rvfield.Kind() == reflect.Struct { - c.initFields(fullKey+".", rvfield, m, newIdxArr) } } @@ -121,7 +136,10 @@ func (c *Coll[TData]) initFields(prefix string, rval reflect.Value, m map[string func (c *Coll[TData]) getTokenValueAsMongoType(value string, fieldName string) (any, error) { - fref := c.dataTypeMap[fieldName] + fref, err := c.getFieldType(fieldName) + if err != nil { + return nil, err + } pss := reflectext.PrimitiveStringSerializer{} @@ -131,7 +149,10 @@ func (c *Coll[TData]) getTokenValueAsMongoType(value string, fieldName string) ( func (c *Coll[TData]) getFieldValueAsTokenString(entity TData, fieldName string) (string, error) { - realValue := c.getFieldValue(entity, fieldName) + realValue, err := c.getFieldValue(entity, fieldName) + if err != nil { + return "", err + } pss := reflectext.PrimitiveStringSerializer{} @@ -139,12 +160,56 @@ func (c *Coll[TData]) getFieldValueAsTokenString(entity TData, fieldName string) } -func (c *Coll[TData]) getFieldType(fieldName string) fullTypeRef { - return c.dataTypeMap[fieldName] +func (c *Coll[TData]) getFieldType(fieldName string) (fullTypeRef, error) { + if c.isInterfaceDataType { + + for _, m := range c.implDataTypeMap { + if r, ok := m[fieldName]; ok { + return r, nil + } + } + + return fullTypeRef{}, errors.New("unknown field: '" + fieldName + "' (in any impl)") + + } else { + + if r, ok := c.dataTypeMap[fieldName]; ok { + return r, nil + } else { + return fullTypeRef{}, errors.New("unknown field: '" + fieldName + "'") + } + + } + } -func (c *Coll[TData]) getFieldValue(data TData, fieldName string) any { - fref := c.dataTypeMap[fieldName] - rval := reflect.ValueOf(data) - return rval.FieldByIndex(fref.Index).Interface() +func (c *Coll[TData]) getFieldValue(data TData, fieldName string) (any, error) { + if c.isInterfaceDataType { + + rval := reflect.ValueOf(data) + for rval.Type().Kind() == reflect.Pointer { + rval = rval.Elem() + } + + if m, ok := c.implDataTypeMap[rval.Type()]; ok { + if fref, ok := m[fieldName]; ok { + rval := reflect.ValueOf(data) + return rval.FieldByIndex(fref.Index).Interface(), nil + } else { + return nil, errors.New("unknown bson field '" + fieldName + "' in type '" + rval.Type().String() + "'") + } + } else { + return nil, errors.New("unknown TData type: '" + rval.Type().String() + "'") + } + + } else { + + if fref, ok := c.dataTypeMap[fieldName]; ok { + rval := reflect.ValueOf(data) + return rval.FieldByIndex(fref.Index).Interface(), nil + } else { + return nil, errors.New("unknown bson field '" + fieldName + "'") + } + + } } diff --git a/wmo/reflection_test.go b/wmo/reflection_test.go index 3639632..7347664 100644 --- a/wmo/reflection_test.go +++ b/wmo/reflection_test.go @@ -48,35 +48,51 @@ func TestReflectionGetFieldType(t *testing.T) { MDate: t1, } - tst.AssertEqual(t, coll.getFieldType("_id").Kind.String(), "string") - tst.AssertEqual(t, coll.getFieldType("_id").Type.String(), "wmo.IDType") - tst.AssertEqual(t, coll.getFieldType("_id").Name, "ID") - tst.AssertEqual(t, coll.getFieldType("_id").IsPointer, false) - tst.AssertEqual(t, coll.getFieldValue(d, "_id").(IDType), "1") + gft := func(k string) fullTypeRef { + v, err := coll.getFieldType(k) + if err != nil { + t.Errorf("%s: %v", "failed to getFieldType", err) + } + return v + } - tst.AssertEqual(t, coll.getFieldType("cdate").Kind.String(), "struct") - tst.AssertEqual(t, coll.getFieldType("cdate").Type.String(), "time.Time") - tst.AssertEqual(t, coll.getFieldType("cdate").Name, "CDate") - tst.AssertEqual(t, coll.getFieldType("cdate").IsPointer, false) - tst.AssertEqual(t, coll.getFieldValue(d, "cdate").(time.Time), t0) + gfv := func(k string) any { + v, err := coll.getFieldValue(d, k) + if err != nil { + t.Errorf("%s: %v", "failed to getFieldType", err) + } + return v + } - tst.AssertEqual(t, coll.getFieldType("sub.a").Kind.String(), "string") - tst.AssertEqual(t, coll.getFieldType("sub.a").Type.String(), "string") - tst.AssertEqual(t, coll.getFieldType("sub.a").Name, "A") - tst.AssertEqual(t, coll.getFieldType("sub.a").IsPointer, false) - tst.AssertEqual(t, coll.getFieldValue(d, "sub.a").(string), "2") + tst.AssertEqual(t, gft("_id").Kind.String(), "string") + tst.AssertEqual(t, gft("_id").Type.String(), "wmo.IDType") + tst.AssertEqual(t, gft("_id").Name, "ID") + tst.AssertEqual(t, gft("_id").IsPointer, false) + tst.AssertEqual(t, gfv("_id").(IDType), "1") - tst.AssertEqual(t, coll.getFieldType("str").Kind.String(), "string") - tst.AssertEqual(t, coll.getFieldType("str").Type.String(), "string") - tst.AssertEqual(t, coll.getFieldType("str").Name, "Str") - tst.AssertEqual(t, coll.getFieldType("str").IsPointer, false) - tst.AssertEqual(t, coll.getFieldValue(d, "str").(string), "3") + tst.AssertEqual(t, gft("cdate").Kind.String(), "struct") + tst.AssertEqual(t, gft("cdate").Type.String(), "time.Time") + tst.AssertEqual(t, gft("cdate").Name, "CDate") + tst.AssertEqual(t, gft("cdate").IsPointer, false) + tst.AssertEqual(t, gfv("cdate").(time.Time), t0) - tst.AssertEqual(t, coll.getFieldType("ptr").Kind.String(), "int") - tst.AssertEqual(t, coll.getFieldType("ptr").Type.String(), "int") - tst.AssertEqual(t, coll.getFieldType("ptr").Name, "Ptr") - tst.AssertEqual(t, coll.getFieldType("ptr").IsPointer, true) - tst.AssertEqual(t, *coll.getFieldValue(d, "ptr").(*int), 4) + tst.AssertEqual(t, gft("sub.a").Kind.String(), "string") + tst.AssertEqual(t, gft("sub.a").Type.String(), "string") + tst.AssertEqual(t, gft("sub.a").Name, "A") + tst.AssertEqual(t, gft("sub.a").IsPointer, false) + tst.AssertEqual(t, gfv("sub.a").(string), "2") + + tst.AssertEqual(t, gft("str").Kind.String(), "string") + tst.AssertEqual(t, gft("str").Type.String(), "string") + tst.AssertEqual(t, gft("str").Name, "Str") + tst.AssertEqual(t, gft("str").IsPointer, false) + tst.AssertEqual(t, gfv("str").(string), "3") + + tst.AssertEqual(t, gft("ptr").Kind.String(), "int") + tst.AssertEqual(t, gft("ptr").Type.String(), "int") + tst.AssertEqual(t, gft("ptr").Name, "Ptr") + tst.AssertEqual(t, gft("ptr").IsPointer, true) + tst.AssertEqual(t, *gfv("ptr").(*int), 4) } func TestReflectionGetTokenValueAsMongoType(t *testing.T) {