chore: quick update fix/version at 2025-10-28 11:54:23

Author: kooksee

.golangci.yml

@@ -1,4 +1,6 @@
 version: "2"
+issues:
+  fix: true
 linters:
   default: none
   enable:
@@ -19,11 +21,33 @@ linters:
 formatters:
   enable:
     - goimports
+    - gofmt
+    - gofumpt
+  settings:
+    gofumpt:
+      extra-rules: true
+    goimports:
+      # A list of prefixes, which, if set, checks import paths
+      # with the given prefixes are grouped after 3rd-party packages.
+      # Default: []
+      local-prefixes:
+        - github.com/pubgo/funk/v2
+    gofmt:
+      # Simplify code: gofmt with `-s` option.
+      # Default: true
+      simplify: false
+      # Apply the rewrite rules to the source before reformatting.
+      # https://pkg.go.dev/cmd/gofmt
+      # Default: []
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+        - pattern: 'a[b:len(a)]'
+          replacement: 'a[b:]'
+
   exclusions:
     paths:
       - internal/example
-      - cmds
       - vendor
-      - third_party$
-      - builtin$
       - examples$
+      - proto

assert/assert.go

@@ -7,7 +7,7 @@ import (
 	"github.com/k0kubun/pp/v3"
 )
 
-func Assert(b bool, format string, a ...interface{}) {
+func Assert(b bool, format string, a ...any) {
 	if b {
 		must(fmt.Errorf(format, a...))
 	}
@@ -21,13 +21,13 @@ func MustEqual[T any](a, b T) {
 	}
 }
 
-func If(b bool, format string, a ...interface{}) {
+func If(b bool, format string, a ...any) {
 	if b {
 		must(fmt.Errorf(format, a...))
 	}
 }
 
-func T(b bool, format string, a ...interface{}) {
+func T(b bool, format string, a ...any) {
 	if b {
 		must(fmt.Errorf(format, a...))
 	}

assert/must.go

@@ -7,15 +7,15 @@ import (
 	"runtime/debug"
 )
 
-func Must(err error, args ...interface{}) {
+func Must(err error, args ...any) {
 	if err == nil {
 		return
 	}
 
 	must(err, args...)
 }
 
-func MustFn(errFn func() error, args ...interface{}) {
+func MustFn(errFn func() error, args ...any) {
 	err := try(errFn)
 	if err == nil {
 		return
@@ -24,7 +24,7 @@ func MustFn(errFn func() error, args ...interface{}) {
 	must(err, args...)
 }
 
-func MustF(err error, msg string, args ...interface{}) {
+func MustF(err error, msg string, args ...any) {
 	if err == nil {
 		return
 	}
@@ -40,7 +40,7 @@ func Must1[T any](ret T, err error) T {
 	return ret
 }
 
-func Exit(err error, args ...interface{}) {
+func Exit(err error, args ...any) {
 	if err == nil {
 		return
 	}
@@ -50,7 +50,7 @@ func Exit(err error, args ...interface{}) {
 	os.Exit(1)
 }
 
-func ExitFn(errFn func() error, args ...interface{}) {
+func ExitFn(errFn func() error, args ...any) {
 	err := try(errFn)
 	if err == nil {
 		return
@@ -61,7 +61,7 @@ func ExitFn(errFn func() error, args ...interface{}) {
 	os.Exit(1)
 }
 
-func ExitF(err error, msg string, args ...interface{}) {
+func ExitF(err error, msg string, args ...any) {
 	if err == nil {
 		return
 	}

assert/must_test.go

@@ -66,7 +66,7 @@ func BenchmarkNoPanic(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		_ = func() (err error) {
 			assert1.Must(nil)
-			return
+			return err
 		}()
 	}
 }

assert/util.go

@@ -54,7 +54,7 @@ func must(err error, messageArgs ...any) {
 		return
 	}
 
-	var attrs = []slog.Attr{slog.Bool("panic", true)}
+	attrs := []slog.Attr{slog.Bool("panic", true)}
 	if v, ok := lo.ErrorsAs[interface {
 		ID() string
 		Error() string
@@ -100,7 +100,7 @@ func try(fn func() error) (gErr error) {
 		gErr = fmt.Errorf("assert: [fn] is nil")
 		logErr(gErr, gErr.Error())
 		debug.PrintStack()
-		return
+		return gErr
 	}
 
 	defer func() {
@@ -116,5 +116,5 @@ func try(fn func() error) (gErr error) {
 	}()
 
 	gErr = fn()
-	return
+	return gErr
 }

async/go.go

@@ -119,7 +119,7 @@ func Timeout(dur time.Duration, fn func() error) error {
 	}
 }
 
-func logErr(fn interface{}, err error) {
+func logErr(fn any, err error) {
 	if generic.IsNil(err) {
 		return
 	}

buildinfo/build.go

@@ -1,7 +1,9 @@
 package buildinfo
 
-var domain string
-var mainPath string
+var (
+	domain   string
+	mainPath string
+)
 
 // git rev-parse HEAD
 // git describe --always --abbrev=7 --dirty
@@ -23,7 +25,5 @@ var (
 	project string
 )
 
-var (
-	// release tag
-	release string
-)
+// release tag
+var release string

cmds/configcmd/cmd.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli/v3"
-	"gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v3"
 
 	"github.com/pubgo/funk/v2/assert"
 	"github.com/pubgo/funk/v2/config"

cmds/protoc-gen-go-cloudevent2/internal/gen.go

@@ -19,11 +19,13 @@ import (
 	"github.com/pubgo/funk/v2/stack"
 )
 
-var cloudeventPkg = reflect.TypeOf(cloudevent.Client{}).PkgPath()
-var jobTypesPkg = reflect.TypeOf(cloudeventpb.PushEventOptions{}).PkgPath()
-var ctxPkg = stack.CallerWithFunc(context.WithTimeout).Pkg
-var assertPkt = stack.CallerWithFunc(assert.Assert).Pkg
-var protojsonPkt = stack.CallerWithFunc(protojson.Marshal).Pkg
+var (
+	cloudeventPkg = reflect.TypeOf(cloudevent.Client{}).PkgPath()
+	jobTypesPkg   = reflect.TypeOf(cloudeventpb.PushEventOptions{}).PkgPath()
+	ctxPkg        = stack.CallerWithFunc(context.WithTimeout).Pkg
+	assertPkt     = stack.CallerWithFunc(assert.Assert).Pkg
+	protojsonPkt  = stack.CallerWithFunc(protojson.Marshal).Pkg
+)
 
 type eventInfo struct {
 	srv            *protogen.Service
@@ -54,7 +56,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 		return g
 	}
 
-	var events = make(map[string]map[string]*eventInfo)
+	events := make(map[string]map[string]*eventInfo)
 	for _, srv := range file.Services {
 		job, ok := proto.GetExtension(srv.Desc.Options(), cloudeventpb.E_Job).(*cloudeventpb.CloudEventServiceOptions)
 		if !ok || job == nil {
@@ -118,7 +120,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 
 		for _, subName := range subjectNames {
 			info := subjects[subName]
-			var keyName = fmt.Sprintf("%sCloudEventKey", info.mth.GoName)
+			keyName := fmt.Sprintf("%sCloudEventKey", info.mth.GoName)
 			genFile.Commentf("%s /%s/%s", keyName, info.srv.Desc.FullName(), info.mth.GoName)
 			genFile.Comment(strings.TrimSpace(info.mth.Comments.Leading.String()))
 			genFile.Const().
@@ -147,7 +149,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 		//}
 
 		subjectValues := lo.Values(subjects)
-		var cloudEventName = fmt.Sprintf("%sCloudEvent", subjectValues[0].srv.GoName)
+		cloudEventName := fmt.Sprintf("%sCloudEvent", subjectValues[0].srv.GoName)
 		genFile.Type().Id(cloudEventName).StructFunc(func(group *jen.Group) {
 			for _, ss := range subjectValues {
 				group.Id("On"+ss.mth.GoName).Func().Params(
@@ -165,27 +167,27 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 				jen.Id("opts").Op("...").Op("*").Qual(jobTypesPkg, "RegisterJobOptions"),
 			).BlockFunc(func(group *jen.Group) {
 			for _, ss := range subjectValues {
-				var keyName = fmt.Sprintf("%sCloudEventKey", ss.mth.GoName)
+				keyName := fmt.Sprintf("%sCloudEventKey", ss.mth.GoName)
 				group.If(jen.Id("event").Dot("On" + ss.mth.GoName)).Op("!=").Nil().BlockFunc(func(group *jen.Group) {
 					group.Qual(cloudeventPkg, "RegisterJobHandler").Call(
 						jen.Id("jobCli"),
 						jen.Id(jobKeyName),
 						jen.Id(keyName),
 						jen.Id("event").Dot("On"+ss.mth.GoName),
-						//jen.Qual(cloudeventPkg, "WrapHandler").Call(jen.Id("event").Dot(ss.mth.GoName)),
+						// jen.Qual(cloudeventPkg, "WrapHandler").Call(jen.Id("event").Dot(ss.mth.GoName)),
 						jen.Id("opts").Op("..."),
 					)
 				}).Line()
 			}
 		})
 
-		var publisher = fmt.Sprintf("%sPublisher", cloudEventName)
+		publisher := fmt.Sprintf("%sPublisher", cloudEventName)
 		genFile.Type().Id(publisher).StructFunc(func(group *jen.Group) {
 			group.Id("Client").Op("*").Qual(cloudeventPkg, "Client")
 		})
 		for _, ss := range subjectValues {
-			var mthName = fmt.Sprintf("Push%sEvent", ss.mth.GoName)
-			var keyName = fmt.Sprintf("%sCloudEventKey", ss.mth.GoName)
+			mthName := fmt.Sprintf("Push%sEvent", ss.mth.GoName)
+			keyName := fmt.Sprintf("%sCloudEventKey", ss.mth.GoName)
 			genFile.Func().
 				Params(jen.Id(fmt.Sprintf("a %s", publisher))).
 				Id(mthName).
@@ -223,7 +225,7 @@ func getSrv(data map[string]*eventInfo) *protogen.Service {
 }
 
 func getPkg(file *protogen.File, goIdent protogen.GoIdent) *jen.Statement {
-	var pkgName = ""
+	pkgName := ""
 	if file.GoImportPath != goIdent.GoImportPath {
 		pkgName = string(goIdent.GoImportPath)
 	}

cmds/protoc-gen-go-errors2/internal/gen.go

@@ -7,12 +7,18 @@ import (
 	"github.com/dave/jennifer/jen"
 	"github.com/iancoleman/strcase"
 	"github.com/pubgo/funk/v2/proto/errorpb"
+	"github.com/samber/lo"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/proto"
 )
 
 const errorPbPkg = "github.com/pubgo/funk/v2/proto/errorpb"
 
+var (
+	registerErrCodes         = lo.T2("github.com/pubgo/funk/v2/errors/errorcodes", "RegisterErrCodes")
+	supportPackageIsVersion7 = lo.T2("google.golang.org/grpc", "SupportPackageIsVersion7")
+)
+
 // GenerateFile generates a .errors.pb.go file containing service definitions.
 func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.GeneratedFile {
 	filename := file.GeneratedFilenamePrefix + ".errors.pb.go"
@@ -32,7 +38,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 	genFile.Comment("This is a compile-time assertion to ensure that this generated file")
 	genFile.Comment("is compatible with the grpc package it is being compiled against.")
 	genFile.Comment("Requires gRPC-Go v1.32.0 or later.")
-	genFile.Id("const _ =").Qual("google.golang.org/grpc", "SupportPackageIsVersion7")
+	genFile.Id("const _ =").Qual(supportPackageIsVersion7.Unpack())
 	g.Skip()
 
 	for i := range file.Enums {
@@ -93,7 +99,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 					jen.Id("Message"):    jen.Lit(rr),
 				})
 			genFile.Var().Id("_").Op("=").
-				Qual("github.com/pubgo/funk/v2/errors/errorcodes", "RegisterErrCodes").
+				Qual(registerErrCodes.Unpack()).
 				Call(jen.Id(errCodeName)).Line()
 		}
 	}