0x4a52466c696e74 8 months ago
parent
commit
715c242789
4 changed files with 12 additions and 17 deletions
  1. 2 6
      case.go
  2. 5 6
      fielder.go
  3. 3 3
      serialize.go
  4. 2 2
      z_test.go

+ 2 - 6
case.go

@@ -1,11 +1,6 @@
 package rest
 
-import (
-	"bytes"
-	"strings"
-	"unicode"
-)
-
+/*
 // CamelToSnake преобразует строку из CamelCase в snake_case.
 func camelToSnake(s string) string {
 	var result bytes.Buffer
@@ -24,3 +19,4 @@ func camelToSnake(s string) string {
 
 	return result.String()
 }
+*/

+ 5 - 6
fielder.go

@@ -44,7 +44,7 @@ func fieldsDefault(t reflect.Type) (res []any) {
 		// проверяем тег, если он есть
 		tag := fType.Tag.Get("rest")
 		if len(tag) > 0 && (strings.Contains(tag, "default") || strings.Contains(tag, "fixed")) {
-			res = append(res, camelToSnake(fType.Name))
+			res = append(res, fType.Name)
 		}
 	}
 	return
@@ -56,7 +56,7 @@ func fieldsFixed(t reflect.Type) (res []any) {
 		// проверяем тег, если он есть
 		tag := fType.Tag.Get("rest")
 		if len(tag) > 0 && strings.Contains(tag, "fixed") {
-			res = append(res, camelToSnake(fType.Name))
+			res = append(res, fType.Name)
 		}
 	}
 	return
@@ -66,7 +66,7 @@ func parseName(val reflect.Value) (res *Field, err error) {
 	switch val.Kind() {
 	case reflect.String:
 		return &Field{
-			Name: camelToSnake(val.String()),
+			Name: val.String(),
 		}, nil
 	case reflect.Map:
 		jm := make(json.Map)
@@ -80,7 +80,6 @@ func parseName(val reflect.Value) (res *Field, err error) {
 			err = fmt.Errorf("name is empty")
 			return
 		}
-		name = camelToSnake(name)
 		fields := jm.Slice("fields", nil)
 		res = &Field{
 			Name:  name,
@@ -134,7 +133,7 @@ func fieldVal(val reflect.Value, fieldName string, files RequestFiles, names ...
 			var field reflect.Value
 			for i := 0; i < val.NumField(); i++ {
 				f := val.Type().Field(i)
-				if camelToSnake(f.Name) == rField.Name {
+				if f.Name == rField.Name {
 					tag := f.Tag.Get("rest")
 					if len(tag) > 0 && strings.Contains(tag, "ignore") {
 						return true
@@ -267,7 +266,7 @@ func FieldNames(s any) (FieldNamesList, error) {
 	// Перебираем поля структуры
 	for i := 0; i < t.NumField(); i++ {
 		field := t.Field(i)
-		fields = append(fields, camelToSnake(field.Name))
+		fields = append(fields, field.Name)
 	}
 	return fields, nil
 }

+ 3 - 3
serialize.go

@@ -124,11 +124,11 @@ loop:
 		switch from.Kind() {
 		case reflect.Struct:
 			if rVal = from.FieldByName(fType.Name); !rVal.IsValid() {
-				rVal = from.FieldByName(camelToSnake(fType.Name))
+				rVal = from.FieldByName(fType.Name)
 			}
 		case reflect.Map:
 			if rVal = from.MapIndex(reflect.ValueOf(fType.Name)); !rVal.IsValid() {
-				rVal = from.MapIndex(reflect.ValueOf(camelToSnake(fType.Name)))
+				rVal = from.MapIndex(reflect.ValueOf(fType.Name))
 			}
 		default:
 			return NewError(
@@ -180,7 +180,7 @@ func parseMap(from, to reflect.Value, fieldName string) IErrorArgs {
 			if err := parseType(fromVal, toVal.Addr(), iFieldName); err != nil {
 				return err
 			}
-			fName := camelToSnake(from.Type().Field(i).Name)
+			fName := from.Type().Field(i).Name
 			to.SetMapIndex(reflect.ValueOf(fName), toVal)
 		}
 	default:

+ 2 - 2
z_test.go

@@ -31,11 +31,11 @@ func TestFieldsDefault(t *testing.T) {
 
 func TestFielderName(t *testing.T) {
 	name := "Name"
-	if field, err := parseName(reflect.ValueOf(name)); field.Name != camelToSnake(name) || err != nil {
+	if field, err := parseName(reflect.ValueOf(name)); field.Name != name || err != nil {
 		if err != nil {
 			t.Error(err)
 		}
-		t.Errorf("expected %v, real %v", camelToSnake(name), field.Name)
+		t.Errorf("expected %v, real %v", name, field.Name)
 	}
 	obj := json.Map{
 		"name": "Object",