refactor: refactor template methods and structs for improved readability

- Refactor `buildTemplate` method to separate template creation and delimiter setting for better readability
- Reformat `AddFromStringsFuncsWithOptions` and `AddFromFilesFuncsWithOptions` functions to use multi-line parameters for improved readability
- Group related struct fields in `templateBuilder` initialization for better code organization
- Convert type definitions to a single `type` block in `multitemplate.go` for better structure
- Reformat `AddFromStringsFuncsWithOptions` and `AddFromFilesFuncsWithOptions` methods in `multitemplate.go` to use multi-line parameters and template creation for better readability
- Update `Renderer` interface to use multi-line parameters for `AddFromStringsFuncsWithOptions` and `AddFromFilesFuncsWithOptions` methods for improved readability

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

Author: appleboy

dynamic.go

@@ -66,23 +66,36 @@ func (tb templateBuilder) buildTemplate() *template.Template {
 	case templateType:
 		return tb.tmpl.Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter)
 	case filesTemplateType:
-		return template.Must(template.ParseFiles(tb.files...)).Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter)
+		tmpl := template.Must(template.ParseFiles(tb.files...))
+		return tmpl.Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter)
 	case globTemplateType:
-		return template.Must(template.ParseGlob(tb.glob)).Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter)
+		tmpl := template.Must(template.ParseGlob(tb.glob))
+		return tmpl.Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter)
 	case fsTemplateType:
-		return template.Must(template.ParseFS(tb.fsys, tb.files...)).Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter)
+		tmpl := template.Must(template.ParseFS(tb.fsys, tb.files...))
+		return tmpl.Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter)
 	case fsFuncTemplateType:
-		return template.Must(template.New(tb.templateName).Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter).Funcs(tb.funcMap).ParseFS(tb.fsys, tb.files...))
+		tmpl := template.New(tb.templateName).
+			Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter).
+			Funcs(tb.funcMap)
+		return template.Must(tmpl.ParseFS(tb.fsys, tb.files...))
 	case stringTemplateType:
-		return template.Must(template.New(tb.templateName).Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter).Parse(tb.templateString))
+		tmpl := template.New(tb.templateName).
+			Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter)
+		return template.Must(tmpl.Parse(tb.templateString))
 	case stringFuncTemplateType:
-		tmpl := template.New(tb.templateName).Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter).Funcs(tb.funcMap)
+		tmpl := template.New(tb.templateName).
+			Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter).
+			Funcs(tb.funcMap)
 		for _, ts := range tb.templateStrings {
 			tmpl = template.Must(tmpl.Parse(ts))
 		}
 		return tmpl
 	case filesFuncTemplateType:
-		return template.Must(template.New(tb.templateName).Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter).Funcs(tb.funcMap).ParseFiles(tb.files...))
+		tmpl := template.New(tb.templateName).
+			Delims(tb.options.LeftDelimiter, tb.options.RightDelimiter).
+			Funcs(tb.funcMap)
+		return template.Must(tmpl.ParseFiles(tb.files...))
 	default:
 		panic("Invalid builder type for dynamic template")
 	}
@@ -188,9 +201,15 @@ func (r DynamicRender) AddFromStringsFuncs(
 }
 
 // AddFromStringsFuncsWithOptions supply add template from strings with options
-func (r DynamicRender) AddFromStringsFuncsWithOptions(name string, funcMap template.FuncMap, options TemplateOptions, templateStrings ...string) *template.Template {
+func (r DynamicRender) AddFromStringsFuncsWithOptions(
+	name string,
+	funcMap template.FuncMap,
+	options TemplateOptions,
+	templateStrings ...string,
+) *template.Template {
 	builder := &templateBuilder{
-		templateName: name, funcMap: funcMap,
+		templateName:    name,
+		funcMap:         funcMap,
 		templateStrings: templateStrings,
 		options:         options,
 	}
@@ -209,9 +228,19 @@ func (r DynamicRender) AddFromFilesFuncs(name string, funcMap template.FuncMap,
 }
 
 // AddFromFilesFuncs supply add template from file callback func
-func (r DynamicRender) AddFromFilesFuncsWithOptions(name string, funcMap template.FuncMap, options TemplateOptions, files ...string) *template.Template {
+func (r DynamicRender) AddFromFilesFuncsWithOptions(
+	name string,
+	funcMap template.FuncMap,
+	options TemplateOptions,
+	files ...string,
+) *template.Template {
 	tname := filepath.Base(files[0])
-	builder := &templateBuilder{templateName: tname, funcMap: funcMap, files: files, options: options}
+	builder := &templateBuilder{
+		templateName: tname,
+		funcMap:      funcMap,
+		files:        files,
+		options:      options,
+	}
 	builder.buildType = filesFuncTemplateType
 	r[name] = builder
 	return builder.buildTemplate()

multitemplate.go

@@ -10,11 +10,13 @@ import (
 )
 
 // Render type
-type Render map[string]*template.Template
-type TemplateOptions struct {
-	LeftDelimiter  string
-	RightDelimiter string
-}
+type (
+	Render          map[string]*template.Template
+	TemplateOptions struct {
+		LeftDelimiter  string
+		RightDelimiter string
+	}
+)
 
 type TemplateOption func(*TemplateOptions)
 
@@ -132,11 +134,20 @@ func (r Render) AddFromStringsFuncs(
 }
 
 // AddFromStringsFuncsWithOptions supply add template from strings with options
-func (r Render) AddFromStringsFuncsWithOptions(name string, funcMap template.FuncMap, options TemplateOptions, templateStrings ...string) *template.Template {
-	tmpl := template.New(name).Delims(options.LeftDelimiter, options.RightDelimiter).Funcs(funcMap)
+func (r Render) AddFromStringsFuncsWithOptions(
+	name string,
+	funcMap template.FuncMap,
+	options TemplateOptions,
+	templateStrings ...string,
+) *template.Template {
+	tmpl := template.New(name).
+		Delims(options.LeftDelimiter, options.RightDelimiter).
+		Funcs(funcMap)
 
 	for _, ts := range templateStrings {
-		tmpl = template.Must(tmpl.Parse(ts)).Delims(options.LeftDelimiter, options.RightDelimiter)
+		tmpl = template.Must(
+			tmpl.Parse(ts),
+		).Delims(options.LeftDelimiter, options.RightDelimiter)
 	}
 
 	r.Add(name, tmpl)
@@ -152,9 +163,19 @@ func (r Render) AddFromFilesFuncs(name string, funcMap template.FuncMap, files .
 }
 
 // AddFromFilesFuncsWithOptions supply add template from file callback func with options
-func (r Render) AddFromFilesFuncsWithOptions(name string, funcMap template.FuncMap, options TemplateOptions, files ...string) *template.Template {
+func (r Render) AddFromFilesFuncsWithOptions(
+	name string,
+	funcMap template.FuncMap,
+	options TemplateOptions,
+	files ...string,
+) *template.Template {
 	tname := filepath.Base(files[0])
-	tmpl := template.Must(template.New(tname).Delims(options.LeftDelimiter, options.RightDelimiter).Funcs(funcMap).ParseFiles(files...))
+	tmpl := template.Must(
+		template.New(tname).
+			Delims(options.LeftDelimiter, options.RightDelimiter).
+			Funcs(funcMap).
+			ParseFiles(files...),
+	)
 	r.Add(name, tmpl)
 	return tmpl
 }

renderer.go

@@ -20,7 +20,17 @@ type Renderer interface {
 	AddFromFSFuncs(name string, funcMap template.FuncMap, fsys fs.FS, files ...string) *template.Template
 	AddFromString(name, templateString string) *template.Template
 	AddFromStringsFuncs(name string, funcMap template.FuncMap, templateStrings ...string) *template.Template
-	AddFromStringsFuncsWithOptions(name string, funcMap template.FuncMap, options TemplateOptions, templateStrings ...string) *template.Template
+	AddFromStringsFuncsWithOptions(
+		name string,
+		funcMap template.FuncMap,
+		options TemplateOptions,
+		templateStrings ...string,
+	) *template.Template
 	AddFromFilesFuncs(name string, funcMap template.FuncMap, files ...string) *template.Template
-	AddFromFilesFuncsWithOptions(name string, funcMap template.FuncMap, options TemplateOptions, files ...string) *template.Template
+	AddFromFilesFuncsWithOptions(
+		name string,
+		funcMap template.FuncMap,
+		options TemplateOptions,
+		files ...string,
+	) *template.Template
 }