feat: [#702] apply fieldalignment & modernize fixes

auth/access/response.go

@@ -11,8 +11,8 @@ func NewDenyResponse(message string) access.Response {
 }
 
 type ResponseImpl struct {
-	allowed bool
 	message string
+	allowed bool
 }
 
 func (r *ResponseImpl) Allowed() bool {

auth/auth.go

@@ -20,8 +20,8 @@ type Auth struct {
 	contractsauth.GuardDriver
 	config           config.Config
 	ctx              http.Context
-	defaultGuardName string
 	log              log.Log
+	defaultGuardName string
 }
 
 func NewAuth(ctx http.Context, config config.Config, log log.Log) (*Auth, error) {

auth/jwt_guard_test.go

@@ -321,7 +321,7 @@ func (s *JwtGuardTestSuite) TestUser_Success() {
 	s.Nil(err)
 
 	var user User
-	s.mockUserProvider.EXPECT().RetriveByID(&user, "1").RunAndReturn(func(user interface{}, id interface{}) error {
+	s.mockUserProvider.EXPECT().RetriveByID(&user, "1").RunAndReturn(func(user any, id any) error {
 		user.(*User).ID = 1
 		return nil
 	}).Once()
@@ -367,7 +367,7 @@ func (s *JwtGuardTestSuite) TestUser_Success_MultipleParse() {
 	s.Equal("2", payload.Key)
 
 	var user1 User
-	s.mockUserProvider.EXPECT().RetriveByID(&user1, "1").RunAndReturn(func(user interface{}, id interface{}) error {
+	s.mockUserProvider.EXPECT().RetriveByID(&user1, "1").RunAndReturn(func(user any, id any) error {
 		user.(*User).ID = 1
 		return nil
 	}).Once()
@@ -377,7 +377,7 @@ func (s *JwtGuardTestSuite) TestUser_Success_MultipleParse() {
 	s.Equal(uint(1), user1.ID)
 
 	var user2 User
-	s.mockUserProvider.EXPECT().RetriveByID(&user2, "2").RunAndReturn(func(user interface{}, id interface{}) error {
+	s.mockUserProvider.EXPECT().RetriveByID(&user2, "2").RunAndReturn(func(user any, id any) error {
 		user.(*User).ID = 2
 		return nil
 	}).Once()
@@ -504,7 +504,7 @@ func (r *Context) Err() error {
 	return r.ctx.Err()
 }
 
-func (r *Context) Value(key interface{}) any {
+func (r *Context) Value(key any) any {
 	if k, ok := key.(string); ok {
 		r.mu.RLock()
 		v, ok := r.values[k]

auth/session_guard.go

@@ -14,8 +14,8 @@ import (
 type SessionGuard struct {
 	session  contractsession.Session
 	ctx      http.Context
-	guard    string
 	provider contractsauth.UserProvider
+	guard    string
 }
 
 func NewSessionGuard(ctx http.Context, name string, userProvider contractsauth.UserProvider) (contractsauth.GuardDriver, error) {

cache/lock.go

@@ -8,8 +8,8 @@ import (
 
 type Lock struct {
 	store contractscache.Driver
-	key   string
 	time  *time.Duration
+	key   string
 	get   bool
 }
 

cache/memory_test.go

@@ -72,7 +72,7 @@ func (s *MemoryTestSuite) TestDecrementWithConcurrent() {
 	s.Nil(err)
 
 	var wg sync.WaitGroup
-	for i := 0; i < 1000; i++ {
+	for range 1000 {
 		wg.Add(1)
 		go func() {
 			_, err = s.memory.Decrement("decrement_concurrent", 1)
@@ -180,7 +180,7 @@ func (s *MemoryTestSuite) TestIncrementWithConcurrent() {
 	s.Nil(err)
 
 	var wg sync.WaitGroup
-	for i := 0; i < 1000; i++ {
+	for range 1000 {
 		wg.Add(1)
 		go func() {
 			_, err = s.memory.Increment("increment_concurrent", 1)

console/cli_helper.go

@@ -232,12 +232,9 @@ func lexicographicLess(i, j string) bool {
 	iRunes := []rune(i)
 	jRunes := []rune(j)
 
-	lenShared := len(iRunes)
-	if lenShared > len(jRunes) {
-		lenShared = len(jRunes)
-	}
+	lenShared := min(len(iRunes), len(jRunes))
 
-	for index := 0; index < lenShared; index++ {
+	for index := range lenShared {
 		ir := iRunes[index]
 		jr := jRunes[index]
 
@@ -297,7 +294,7 @@ func onUsageError(_ context.Context, _ *cli.Command, err error, _ bool) error {
 	return err
 }
 
-func printHelpCustom(out io.Writer, templ string, data interface{}, _ map[string]interface{}) {
+func printHelpCustom(out io.Writer, templ string, data any, _ map[string]any) {
 	funcMap := template.FuncMap{
 		"capitalize":         capitalize,
 		"colorize":           colorize,

contracts/auth/auth.go

@@ -42,10 +42,10 @@ type UserProvider interface {
 }
 
 type Payload struct {
-	Guard    string
-	Key      string
 	ExpireAt time.Time
 	IssuedAt time.Time
+	Guard    string
+	Key      string
 }
 
 type GuardFunc func(ctx http.Context, name string, userProvider UserProvider) (GuardDriver, error)

contracts/console/command.go

@@ -92,75 +92,75 @@ type Progress interface {
 type Choice struct {
 	// Key the choice key.
 	Key string
-	// Selected determines if the choice is selected.
-	Selected bool
 	// Value the choice value.
 	Value string
+	// Selected determines if the choice is selected.
+	Selected bool
 }
 
 type AskOption struct {
+	// Validate the input validation function.
+	Validate func(string) error
 	// Default the default value for the input.
 	Default string
 	// Description the input description.
 	Description string
+	// Placeholder the input placeholder.
+	Placeholder string
+	// Prompt the prompt message.(use for single line input)
+	Prompt string
 	// Lines the number of lines for the input.(use for multiple lines text)
 	Lines int
 	// Limit the character limit for the input.
 	Limit int
 	// Multiple determines if input is single line or multiple lines text
 	Multiple bool
-	// Placeholder the input placeholder.
-	Placeholder string
-	// Prompt the prompt message.(use for single line input)
-	Prompt string
-	// Validate the input validation function.
-	Validate func(string) error
 }
 
 type ChoiceOption struct {
+	// Validate the input validation function.
+	Validate func(string) error
 	// Default the default value for the input.
 	Default string
 	// Description the input description.
 	Description string
-	// Validate the input validation function.
-	Validate func(string) error
 }
 
 type ConfirmOption struct {
 	// Affirmative label for the affirmative button.
 	Affirmative string
-	// Default the default value for the input.
-	Default bool
 	// Description the input description.
 	Description string
 	// Negative label for the negative button.
 	Negative string
+	// Default the default value for the input.
+	Default bool
 }
 
 type SecretOption struct {
+	// Validate the input validation function.
+	Validate func(string) error
 	// Default the default value for the input.
 	Default string
 	// Description the input description.
 	Description string
-	// Limit the character limit for the input.
-	Limit int
 	// Placeholder the input placeholder.
 	Placeholder string
-	// Validate the input validation function.
-	Validate func(string) error
+	// Limit the character limit for the input.
+	Limit int
 }
 
 type MultiSelectOption struct {
-	// Default the default value for the input.
-	Default []string
+	// Validate the input validation function.
+	Validate func([]string) error
 	// Description the input description.
 	Description string
-	// Filterable determines if the choices can be filtered.
-	Filterable bool
+	// Default the default value for the input.
+	Default []string
 	// Limit the number of choices that can be selected.
 	Limit int
-	// Validate the input validation function.
-	Validate func([]string) error
+	// Filterable determines if the choices can be filtered.
+	Filterable bool
 }
 
 type SpinnerOption struct {

contracts/console/command/command.go

@@ -25,9 +25,9 @@ type Flag interface {
 
 type BoolFlag struct {
 	Name               string
+	Usage              string
 	Aliases            []string
 	DisableDefaultText bool
-	Usage              string
 	Required           bool
 	Value              bool
 }
@@ -38,10 +38,10 @@ func (receiver *BoolFlag) Type() string {
 
 type Float64Flag struct {
 	Name     string
-	Aliases  []string
 	Usage    string
-	Required bool
+	Aliases  []string
 	Value    float64
+	Required bool
 }
 
 func (receiver *Float64Flag) Type() string {
@@ -50,10 +50,10 @@ func (receiver *Float64Flag) Type() string {
 
 type Float64SliceFlag struct {
 	Name     string
-	Aliases  []string
 	Usage    string
-	Required bool
+	Aliases  []string
 	Value    []float64
+	Required bool
 }
 
 func (receiver *Float64SliceFlag) Type() string {
@@ -62,10 +62,10 @@ func (receiver *Float64SliceFlag) Type() string {
 
 type IntFlag struct {
 	Name     string
-	Aliases  []string
 	Usage    string
-	Required bool
+	Aliases  []string
 	Value    int
+	Required bool
 }
 
 func (receiver *IntFlag) Type() string {
@@ -74,10 +74,10 @@ func (receiver *IntFlag) Type() string {
 
 type IntSliceFlag struct {
 	Name     string
-	Aliases  []string
 	Usage    string
-	Required bool
+	Aliases  []string
 	Value    []int
+	Required bool
 }
 
 func (receiver *IntSliceFlag) Type() string {
@@ -86,10 +86,10 @@ func (receiver *IntSliceFlag) Type() string {
 
 type Int64Flag struct {
 	Name     string
-	Aliases  []string
 	Usage    string
-	Required bool
+	Aliases  []string
 	Value    int64
+	Required bool
 }
 
 func (receiver *Int64Flag) Type() string {
@@ -98,10 +98,10 @@ func (receiver *Int64Flag) Type() string {
 
 type Int64SliceFlag struct {
 	Name     string
-	Aliases  []string
 	Usage    string
-	Required bool
+	Aliases  []string
 	Value    []int64
+	Required bool
 }
 
 func (receiver *Int64SliceFlag) Type() string {
@@ -110,10 +110,10 @@ func (receiver *Int64SliceFlag) Type() string {
 
 type StringFlag struct {
 	Name     string
-	Aliases  []string
 	Usage    string
-	Required bool
 	Value    string
+	Aliases  []string
+	Required bool
 }
 
 func (receiver *StringFlag) Type() string {
@@ -122,10 +122,10 @@ func (receiver *StringFlag) Type() string {
 
 type StringSliceFlag struct {
 	Name     string
-	Aliases  []string
 	Usage    string
-	Required bool
+	Aliases  []string
 	Value    []string
+	Required bool
 }
 
 func (receiver *StringSliceFlag) Type() string {

contracts/database/config.go

@@ -8,23 +8,23 @@ type Pool struct {
 }
 
 type Config struct {
+	Dialector    gorm.Dialector
+	NameReplacer Replacer
 	Charset      string
 	Connection   string
 	Dsn          string
 	Database     string
-	Dialector    gorm.Dialector
 	Driver       string
 	Host         string
-	NameReplacer Replacer
-	NoLowerCase  bool
 	Password     string
-	Port         int
 	Prefix       string
 	Schema       string
-	Singular     bool
 	Sslmode      string
 	Timezone     string
 	Username     string
+	Port         int
+	NoLowerCase  bool
+	Singular     bool
 }
 
 // Replacer replacer interface like strings.Replacer

contracts/database/driver/column.go

@@ -78,13 +78,13 @@ type ColumnDefinition interface {
 }
 
 type Column struct {
-	Autoincrement bool
 	Collation     string
 	Comment       string
 	Default       string
 	Extra         string
 	Name          string
-	Nullable      bool
 	Type          string
 	TypeName      string
+	Autoincrement bool
+	Nullable      bool
 }

contracts/database/driver/conditions.go

@@ -40,9 +40,9 @@ type Join struct {
 }
 
 type Where struct {
-	Type  WhereType
 	Query any
 	Args  []any
+	Type  WhereType
 	Or    bool
 	IsNot bool
 }