code refactor

Author: lvan100

conf/expr.go

@@ -22,15 +22,22 @@ import (
 	"github.com/expr-lang/expr"
 )
 
-type ValidateFunc[T interface{}] func(T) bool
+// ValidateFunc defines a type for validation functions, which accept
+// a value of type T and return a boolean result.
+type ValidateFunc[T any] func(T) bool
 
+// validateFuncs holds a map of registered validation functions.
 var validateFuncs = map[string]interface{}{}
 
-func RegisterValidateFunc[T interface{}](name string, fn ValidateFunc[T]) {
+// RegisterValidateFunc registers a validation function with a specific name.
+// The function can then be used in validation expressions.
+func RegisterValidateFunc[T any](name string, fn ValidateFunc[T]) {
 	validateFuncs[name] = fn
 }
 
-// validateField validates the field with the given tag and value.
+// validateField validates a field using a validation expression (tag) and the field value (i).
+// It evaluates the expression and checks if the result is true (i.e., the validation passes).
+// If any error occurs during evaluation or if the validation fails, an error is returned.
 func validateField(tag string, i interface{}) error {
 	env := map[string]interface{}{"$": i}
 	for k, v := range validateFuncs {

gs/gs.go

@@ -32,24 +32,24 @@ import (
 )
 
 const (
-	Version = "go-spring@v1.1.3"
+	Version = "go-spring@v1.2.0.rc"
 	Website = "https://go-spring.com/"
 )
 
 /************************************ arg ***********************************/
 
 type Arg = gs.Arg
 
-// NilArg returns a ValueArg with a nil value.
-func NilArg() gs_arg.ValueArg {
-	return gs_arg.Nil()
-}
-
 // TagArg returns a TagArg with the specified tag.
 func TagArg(tag string) gs_arg.TagArg {
 	return gs_arg.TagArg{Tag: tag}
 }
 
+// NilArg returns a ValueArg with a nil value.
+func NilArg() gs_arg.ValueArg {
+	return gs_arg.Nil()
+}
+
 // ValueArg returns a ValueArg with the specified value.
 func ValueArg(v interface{}) gs_arg.ValueArg {
 	return gs_arg.Value(v)
@@ -129,7 +129,7 @@ func Or(conditions ...Condition) Condition {
 	return gs_cond.Or(conditions...)
 }
 
-// And creates a Condition that is true if all of the given Conditions are true.
+// And creates a Condition that is true if all the given Conditions are true.
 func And(conditions ...Condition) Condition {
 	return gs_cond.And(conditions...)
 }
@@ -146,36 +146,30 @@ func OnProfile(profile string) Condition {
 
 /************************************ ioc ************************************/
 
-type (
-	BeanSelector = gs.BeanSelector
-)
-
-type (
-	Properties = gs.Properties
-)
-
 type (
 	Context      = gs.Context
 	ContextAware = gs.ContextAware
 )
 
 type (
+	Properties  = gs.Properties
 	Refreshable = gs.Refreshable
 	Dync[T any] = gs_dync.Value[T]
 )
 
 type (
+	RegisteredBean = gs.RegisteredBean
+	BeanDefinition = gs.BeanDefinition
+)
+
+type (
+	BeanSelector         = gs.BeanSelector
 	BeanInitFunc         = gs.BeanInitFunc
 	BeanDestroyFunc      = gs.BeanDestroyFunc
 	BeanInitInterface    = gs.BeanInitInterface
 	BeanDestroyInterface = gs.BeanDestroyInterface
 )
 
-type (
-	RegisteredBean = gs.RegisteredBean
-	BeanDefinition = gs.BeanDefinition
-)
-
 // NewBean creates a new BeanDefinition.
 var NewBean = gs_core.NewBean
 
@@ -188,6 +182,14 @@ func BeanSelectorForType[T any]() BeanSelector {
 
 var boot *gs_app.Boot
 
+// Boot initializes and returns a [*gs_app.Boot] instance.
+func Boot() *gs_app.Boot {
+	if boot == nil {
+		boot = gs_app.NewBoot()
+	}
+	return boot
+}
+
 // bootRun runs the boot process.
 func bootRun() error {
 	if boot != nil {
@@ -199,14 +201,6 @@ func bootRun() error {
 	return nil
 }
 
-// Boot initializes and returns a [gs_app.Boot] instance.
-func Boot() *gs_app.Boot {
-	if boot == nil {
-		boot = gs_app.NewBoot()
-	}
-	return boot
-}
-
 /*********************************** app *************************************/
 
 type (
@@ -246,6 +240,11 @@ func Config() *gs_conf.AppConfig {
 	return app.P
 }
 
+// RefreshProperties refreshes the app configuration.
+func RefreshProperties(p Properties) error {
+	return app.C.RefreshProperties(p)
+}
+
 // Object registers a bean definition for a given object.
 func Object(i interface{}) *RegisteredBean {
 	b := NewBean(reflect.ValueOf(i))
@@ -284,11 +283,6 @@ func Server(objOrCtor interface{}, ctorArgs ...Arg) *RegisteredBean {
 	return app.C.Register(b)
 }
 
-// RefreshProperties refreshes the app configuration.
-func RefreshProperties(p Properties) error {
-	return app.C.RefreshProperties(p)
-}
-
 /********************************** banner ***********************************/
 
 var appBanner = `

gs/internal/gs_app/app.go

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+// Package gs_app provides a framework for building and managing Go-Spring applications.
 package gs_app
 
 import (