Merge pull request #29 from armada45-pixel/test

1.0.7

Author: armada45-pixel

README.md

@@ -51,6 +51,7 @@ For now you can use only 2 option
 * **PutToOs** Put variable from file to os.env variable.
 * **OverRide** If already variable in same name in os.env variable will replace.
 * **OsFirst** If have os.env and env file will choose os.env.
+* **CustomType** Map for write custom default value and parser function.
 ```go
 	opt := envstruct.Options{
 		VarPtr:   &cfg,
@@ -62,6 +63,37 @@ For now you can use only 2 option
 		PutToOs: true,
 		OverRide: true,
 		OsFirst: true,
+		CustomType: map[reflect.Type]TypeDefaultBy{
+			reflect.TypeOf(Pro): {
+				ParserFunc: func(v string) (interface{}, error) {
+					searchDefault, _ := envstruct.DefaultByType[reflect.TypeOf(false)]
+					value, _ := searchDefault.ParserFunc(v)
+					if value == true {
+						return Pro, nil
+					}
+					return Dev, nil
+				},
+				ValueDefault: modeE(false),
+			},
+		},
+	}
+
+	type modeE bool
+
+	const (
+		Pro modeE = false
+		Dev modeE = true
+	)
+
+	func (m modeE) String() string {
+		if !m {
+			return "production"
+		}
+		return "development"
+	}
+
+	func (m modeE) Bool() bool {
+		return bool(m)
 	}
 ```
 ## Return
@@ -75,8 +107,8 @@ Return array of error.
 All value from your env file in here now.
 ```go
 	fmt.Println(cfg)
-  fmt.Println(cfg.Port)
-  fmt.Println(cfg.Mode)
+	fmt.Println(cfg.Port)
+	fmt.Println(cfg.Mode)
 }
 
 ```
@@ -94,17 +126,23 @@ All value from your env file in here now.
 * Change function name ( export )
 * Remove main function
 * Change module name to envstruct
+* [a6aa3b2](https://github.com/armada45-pixel/envstruct/commit/a6aa3b27764cdb3c0d810118b258251e60e38b9d#)
 
 1.0.3
-* Change set function
+* Change set function [0e6505f](https://github.com/armada45-pixel/envstruct/commit/0e6505f9f6297885737fdd774372e0e3f1a0b1d8)
 
 1.0.4
-* Add Read OS Env
+* Add Read OS Env [#4](https://github.com/armada45-pixel/envstruct/issues/4)
 
 1.0.5
-* Add Read OS First
+* Add Read OS First [#23](https://github.com/armada45-pixel/envstruct/issues/23)
 
 1.0.6
-* Add Read All in File
-* Put to OS
-* Over Ride OS
+* Add Read All in File [#8](https://github.com/armada45-pixel/envstruct/issues/8)
+* Put to OS [#5](https://github.com/armada45-pixel/envstruct/issues/5)
+* Over Ride OS [#6](https://github.com/armada45-pixel/envstruct/issues/6)
+
+1.0.7
+* Add Custom Parser function [#9](https://github.com/armada45-pixel/envstruct/issues/9)
+* Fix bug : If open only "Put to os" And "Read all" will not working. [#26](https://github.com/armada45-pixel/envstruct/issues/26)
+* Fix bug : If have any error in process prepare Variable Pointer Data won't set. [#27](https://github.com/armada45-pixel/envstruct/issues/27)

envstruct.go

@@ -1,4 +1,4 @@
-// version 1.0.6
+// version 1.0.7
 package envstruct
 
 import (
@@ -7,6 +7,8 @@ import (
 	"reflect"
 )
 
+type TypeCustomParserFunc func()
+
 type Options struct {
 	// Type : Variable Pointer
 	// Pointer Struct Variable to config key,type for read env file or os.env variable
@@ -34,6 +36,9 @@ type Options struct {
 
 	// if true = if have os.env and env file will choose os.env
 	OsFirst bool // default false
+
+	// Custom parser function for custom type
+	CustomType map[reflect.Type]TypeDefaultBy
 }
 
 func Setup(optA ...Options) (err []error) {
@@ -42,11 +47,25 @@ func Setup(optA ...Options) (err []error) {
 
 	fileName := opt.FileName
 	var varProp = typeVarProp{}
-	var errCheckVar []error
+	var ref reflect.Value
+	var errCheckVarWrongType error
+	var allParserFunc = make(map[reflect.Type]TypeDefaultBy)
 
 	if opt.VarPtr != nil {
-		varProp, errCheckVar = prepareVar(opt.VarPtr)
-		err = append(err, errCheckVar...)
+		ref, errCheckVarWrongType = checkVarType(opt.VarPtr)
+		if errCheckVarWrongType != nil {
+			err = append(err, errCheckVarWrongType)
+		} else {
+			var errCheckVar []error
+			allParserFunc = DefaultByType
+			if len(opt.CustomType) != 0 {
+				for key, value := range opt.CustomType {
+					allParserFunc[key] = value
+				}
+			}
+			varProp, errCheckVar = prepareVar(opt.VarPtr, ref, allParserFunc)
+			err = append(err, errCheckVar...)
+		}
 	}
 
 	var envMap map[string]string
@@ -58,24 +77,24 @@ func Setup(optA ...Options) (err []error) {
 			defer file.Close()
 			var errParser []error
 			varProp, envMap, errParser = parserFile(file, opt, parserFileOption{
-				varProp: varProp,
-				envMap:  make(map[string]string),
+				varProp:       varProp,
+				allParserFunc: allParserFunc,
 			})
 			err = append(err, errParser...)
 		}
 	}
 
-	// if opt.ReadOS {
-	var errParser []error
-	varProp, errParser = parserOSEnv(parserOSOption{
-		varProp: varProp,
-		opt:     opt,
-		envMap:  envMap,
-	})
-	err = append(err, errParser...)
-	// }
-
-	if len(errCheckVar) == 0 {
+	if opt.ReadOS || opt.ReadAll || opt.PutToOs || opt.OsFirst {
+		var errParser []error
+		varProp, errParser = parserOSEnv(parserOSOption{
+			varProp: varProp,
+			opt:     opt,
+			envMap:  envMap,
+		})
+		err = append(err, errParser...)
+	}
+
+	if opt.VarPtr != nil && errCheckVarWrongType == nil {
 		if errSet := setVar(varProp); len(errSet) != 0 {
 			err = append(err, errSet...)
 		}
@@ -90,20 +109,21 @@ func setVar(newVarProp typeVarProp) (err []error) {
 	for i := 0; i < refType.NumField(); i++ {
 		newProp := newVarProp.prop[i]
 		refField := ref.Field(i)
-		value := newProp.defaultValue
-		fieldee := refField
-		if newProp.didRead {
-			refTypeField := newProp.refTypeField
-			typee := refTypeField.Type
-			if typee.Kind() == reflect.Ptr {
-				typee = typee.Elem()
-				fieldee = refField.Elem()
+		if newProp.defaultIsSet || newProp.didRead {
+			value := newProp.defaultValue
+			fieldee := refField
+			if newProp.didRead {
+				refTypeField := newProp.refTypeField
+				typee := refTypeField.Type
+				if typee.Kind() == reflect.Ptr {
+					typee = typee.Elem()
+					fieldee = refField.Elem()
+				}
+				value = newProp.readValue
 			}
-			value = newProp.readValue
-		}
-		refValue := reflect.ValueOf(value)
-		fieldee.Set(refValue)
-		if !newProp.didRead && newProp.required && refValue.IsZero() {
+			refValue := reflect.ValueOf(value)
+			fieldee.Set(refValue)
+		} else if newProp.required && (refField.IsZero() && reflect.Bool != refField.Kind()) {
 			err = append(err, errors.New("Field "+refField.Type().Name()+" Required is True, But can't get any value."))
 		}
 	}

osenv.go

@@ -1,14 +1,17 @@
+// version 1.0.7
 package envstruct
 
 import (
 	"os"
+	"reflect"
 	"strings"
 )
 
 type parserOSOption struct {
-	varProp typeVarProp
-	envMap  map[string]string
-	opt     Options
+	varProp       typeVarProp
+	envMap        map[string]string
+	opt           Options
+	allParserFunc map[reflect.Kind]TypeDefaultBy
 }
 
 func parserOSEnv(opts ...parserOSOption) (varProp typeVarProp, err []error) {
@@ -28,26 +31,27 @@ func parserOSEnv(opts ...parserOSOption) (varProp typeVarProp, err []error) {
 			if opt.ReadOS {
 				prop := varProp.prop[keyProp]
 				typeVar := prop.refTypeField
-				newValue, errParserData := parserData(varProp, typeVar, keyProp, value)
+				newValue, errParserData := parserData(prop.typeProp, typeVar, value, opt.CustomType)
 				if len(errParserData) != 0 {
 					err = append(err, errParserData...)
-				}
-				if !prop.didRead || opt.OsFirst {
-					varProp.prop[keyProp] = varFieldProp{
-						defaultValue: prop.defaultValue,
-						required:     prop.required,
+				} else {
+					if !prop.didRead || opt.OsFirst {
+						varProp.prop[keyProp] = varFieldProp{
+							defaultIsSet: prop.defaultIsSet,
+							defaultValue: prop.defaultValue,
+							required:     prop.required,
+							typeProp:     prop.typeProp,
 
-						didRead:      true,
-						readValue:    newValue,
-						refTypeField: typeVar,
+							didRead:      true,
+							readValue:    newValue,
+							refTypeField: typeVar,
+						}
 					}
 				}
 			}
-			// if foundEnv && opt.OverRide {
-			// 	os.Setenv(key, fileValue)
-			// }
 		} else if foundEnv {
 			os.Setenv(key, fileValue)
+			delete(envMap, key)
 		}
 	}
 	return

parserfile.go

@@ -1,22 +1,24 @@
+// version 1.0.7
 package envstruct
 
 import (
 	"bufio"
 	"errors"
 	"io"
 	"os"
+	"reflect"
 	"regexp"
 	"strings"
 )
 
 type parserFileOption struct {
-	varProp typeVarProp
-	envMap  map[string]string
+	varProp       typeVarProp
+	allParserFunc map[reflect.Type]TypeDefaultBy
 }
 
 func parserFile(file io.Reader, opt Options, opts ...parserFileOption) (varProp typeVarProp, envMap map[string]string, err []error) {
 	varProp = opts[0].varProp
-	envMap = opts[0].envMap
+	envMap = make(map[string]string)
 
 	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
@@ -28,26 +30,28 @@ func parserFile(file io.Reader, opt Options, opts ...parserFileOption) (varProp
 				err = append(err, errLine)
 			} else {
 				keyProp, found := varProp.ENVname[key]
-				if opt.PutToOs && (found || opt.ReadAll) {
-					envMap[key] = value
-				}
 				if opt.PutToOs && opt.OverRide {
 					os.Setenv(key, value)
+				} else if opt.PutToOs && (found || opt.ReadAll) {
+					envMap[key] = value
 				}
 				if found {
 					prop := varProp.prop[keyProp]
 					typeVar := prop.refTypeField
-					newValue, errParserData := parserData(varProp, typeVar, keyProp, value)
+					newValue, errParserData := parserData(prop.typeProp, typeVar, value, opts[0].allParserFunc)
 					if len(errParserData) != 0 {
 						err = append(err, errParserData...)
-					}
-					varProp.prop[keyProp] = varFieldProp{
-						defaultValue: varProp.prop[keyProp].defaultValue,
-						required:     varProp.prop[keyProp].required,
-
-						didRead:      true,
-						readValue:    newValue,
-						refTypeField: typeVar,
+					} else {
+						varProp.prop[keyProp] = varFieldProp{
+							defaultIsSet: prop.defaultIsSet,
+							defaultValue: prop.defaultValue,
+							required:     prop.required,
+							typeProp:     prop.typeProp,
+
+							didRead:      true,
+							readValue:    newValue,
+							refTypeField: typeVar,
+						}
 					}
 				}
 			}

parservalue.go

@@ -1,21 +1,21 @@
+// version 1.0.7
 package envstruct
 
 import (
 	"errors"
 	"reflect"
 )
 
-func parserData(varProp typeVarProp, typeVar reflect.StructField, keyProp int, value string) (newValue any, err []error) {
+func parserData(typeKind reflect.Type, typeVar reflect.StructField, value string, allParserFunc map[reflect.Type]TypeDefaultBy) (newValue any, err []error) {
 
 	typeVarKind := typeVar.Type.Kind()
-	parserFunc, foundFunc := defaultBuiltInParsers[typeVarKind]
-	if !foundFunc {
+	searchDefault, found := allParserFunc[typeKind]
+	if !found {
 		err = append(err, errors.New("Parser Function For Type "+typeVarKind.String()+" In Field "+typeVar.Name+""))
 	} else {
-		parseValue, errParse := parserFunc(value)
+		parseValue, errParse := searchDefault.ParserFunc(value)
 		if errParse != nil {
 			err = append(err, errParse)
-			newValue = varProp.prop[keyProp].defaultValue
 		} else {
 			newValue = parseValue
 		}