临时保存

Author: chenmingyong0423

example/generic_example.go

@@ -0,0 +1,21 @@
+// Copyright 2024 chenmingyong0423
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package example
+
+type Example[T any] struct {
+	A T `opt:"-"`
+	B T
+	C int
+}

example/opt_example_gen.go

@@ -0,0 +1,31 @@
+// Generated by optioner -type Example; DO NOT EDIT
+// If you have any questions, please create issues and submit contributions at:
+// https://github.com/chenmingyong0423/go-optioner
+
+package example
+
+type ExampleOption[T any] func(*Example[T])
+
+func NewExample[T any](a T, opts ...ExampleOption[T]) *Example[T] {
+	example := &Example[T]{
+		A: a,
+	}
+
+	for _, opt := range opts {
+		opt(example)
+	}
+
+	return example
+}
+
+func WithB[T any](b T) ExampleOption {
+	return func(example *Example) {
+		example.B = b
+	}
+}
+
+func WithC[T any](c int) ExampleOption {
+	return func(example *Example) {
+		example.C = c
+	}
+}

go.mod

@@ -2,4 +2,4 @@ module github.com/chenmingyong0423/go-optioner
 
 go 1.21.0
 
-require github.com/chenmingyong0423/gkit v0.0.4 // indirect
+require github.com/chenmingyong0423/gkit v0.5.0

go.sum

@@ -1,5 +1,5 @@
-github.com/chenmingyong0423/gkit v0.0.4 h1:LEToNpfzAN3aCUxCRltfO5j7jhtRntKt9LvwzhPhayc=
-github.com/chenmingyong0423/gkit v0.0.4/go.mod h1:vyxci/+5NnMMbp+DQPs94BUwawmbNJEK1o8ezlrS3eg=
+github.com/chenmingyong0423/gkit v0.5.0 h1:efthAjro7c5ZwHqMUV0+0CFZZFgsbthYnnUrfsSMdx4=
+github.com/chenmingyong0423/gkit v0.5.0/go.mod h1:9MKV0/B3MiBCGf4fssogftFbNIGJk9a4ffm/o3+pkHw=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

options/options_generator.go

@@ -60,6 +60,7 @@ type StructInfo struct {
 	NewStructName  string
 	Fields         []FieldInfo
 	OptionalFields []FieldInfo
+	GenericParams  []FieldInfo
 
 	Imports []string
 }
@@ -101,6 +102,19 @@ func (g *Generator) parseStruct(fileName string) bool {
 			}
 			if structDecl, ok := typeSpec.Type.(*ast.StructType); ok {
 				log.Printf("Generating Struct \"%s\" \n", g.StructInfo.StructName)
+				if typeSpec.TypeParams != nil {
+					log.Println("This is a struct which contains generic type:", typeSpec.Name)
+					for _, param := range typeSpec.TypeParams.List {
+						for _, name := range param.Names {
+							typ := g.getTypeName(param.Type)
+							g.StructInfo.GenericParams = append(g.StructInfo.GenericParams, FieldInfo{
+								Name: name.Name,
+								Type: typ,
+							})
+							log.Printf("Generic parameter: %s %s\n", name.Name, typ)
+						}
+					}
+				}
 				for _, field := range structDecl.Fields.List {
 					fieldName := ""
 					if len(field.Names) == 0 {

templates/options_templates.go

@@ -29,10 +29,10 @@ import (
 )
 {{ end }}
 
-type {{ .StructName }}Option func(*{{ .StructName }})
+type {{ .StructName }}Option{{if .GenericParams}}[{{range $index, $param := .GenericParams}}{{if $index}}, {{end}}{{$param.Name}} {{$param.Type}}{{end}}]{{end}} func(*{{ .StructName }}{{if .GenericParams}}[{{range $index, $param := .GenericParams}}{{if $index}}, {{end}}{{$param.Name}}{{end}}]{{end}})
 
-func New{{ .StructName }}({{ range $index, $field := .Fields }}{{ $field.Name | bigCamelToSmallCamel }} {{ $field.Type }},{{ end }} opts ...{{ .StructName }}Option) *{{ .StructName }} {
-	{{ .NewStructName }} := &{{ .StructName }}{
+func New{{ .StructName }}{{if .GenericParams}}[{{range $index, $param := .GenericParams}}{{if $index}}, {{end}}{{$param.Name}} {{$param.Type}}{{end}}]{{end}}({{ range $index, $field := .Fields }}{{ $field.Name | bigCamelToSmallCamel }} {{ $field.Type }},{{ end }} opts ...{{ .StructName }}Option{{if .GenericParams}}[{{range $index, $param := .GenericParams}}{{if $index}}, {{end}}{{$param.Name}}{{end}}]{{end}}) *{{ .StructName }}{{if .GenericParams}}[{{range $index, $param := .GenericParams}}{{if $index}}, {{end}}{{$param.Name}}{{end}}]{{end}} {
+	{{ .NewStructName }} := &{{ .StructName }}{{if .GenericParams}}[{{range $index, $param := .GenericParams}}{{if $index}}, {{end}}{{$param.Name}}{{end}}]{{end}}{
 		{{ range $index, $field := .Fields }}{{ $field.Name }}: {{ $field.Name | bigCamelToSmallCamel }},
 		{{ end }}
 	}
@@ -46,7 +46,7 @@ func New{{ .StructName }}({{ range $index, $field := .Fields }}{{ $field.Name |
 
 {{ if .OptionalFields }}
 {{ range $field := .OptionalFields }}
-func With{{ $field.Name | capitalizeFirstLetter }}({{ $field.Name | bigCamelToSmallCamel }} {{ $field.Type }}) {{ $.StructName }}Option {
+func With{{ $field.Name | capitalizeFirstLetter }}{{if $.GenericParams}}[{{range $index, $param := $.GenericParams}}{{if $index}}, {{end}}{{$param.Name}} {{$param.Type}}{{end}}]{{end}}({{ $field.Name | bigCamelToSmallCamel }} {{ $field.Type }}) {{ $.StructName }}Option {
 	return func({{ $.NewStructName }} *{{ $.StructName }}) {
 		{{ $.NewStructName }}.{{ $field.Name }} = {{ $field.Name | bigCamelToSmallCamel }}
 	}