fix: fix cmd template

things-go · Sep 26, 2024 · ea6bfee · ea6bfee
1 parent ed767fd
commit ea6bfee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/cmd/dyngen/command/template.go b/cmd/dyngen/command/template.go
@@ -14,11 +14,11 @@ var Static embed.FS
 
 var TemplateFuncs = template.FuncMap{
 	"add":            func(a, b int) int { return a + b },
-	"snakecase":      utils.SnakeCase,
-	"kebabcase":      utils.Kebab,
-	"pascalcase":     utils.PascalCase,
-	"smallcamelcase": utils.SmallCamelCase,
-	"stylename":      utils.StyleName,
+	"snakeCase":      utils.SnakeCase,
+	"kebabCase":      utils.Kebab,
+	"pascalCase":     utils.PascalCase,
+	"smallCamelCase": utils.SmallCamelCase,
+	"styleName":      utils.StyleName,
 }
 var (
 	tpl = template.Must(template.New("components").

diff --git a/cmd/dyngen/command/template/dal_gorm.tpl b/cmd/dyngen/command/template/dal_gorm.tpl
@@ -13,7 +13,7 @@ import (
 )
 
 {{- $e := .Entity}}
-{{- $stName := pascalcase $e.Name}}
+{{- $stName := pascalCase $e.Name}}
 {{- $mdPrefix := .ModelPrefix}}
 {{- $queryPrefix := .QueryPrefix}}
 {{- $mdName := printf "%s%s" $mdPrefix $stName}}

diff --git a/cmd/dyngen/command/template/dal_query.tpl b/cmd/dyngen/command/template/dal_query.tpl
@@ -2,36 +2,36 @@ package {{.Package}}
 
 {{- $style := .Style}}
 {{- $e := .Entity}}
-{{- $stName := pascalcase $e.Name}}
+{{- $stName := pascalCase $e.Name}}
 
 type Update{{$stName}}ByPartial struct {
 {{- range $f := $e.Fields}}
-    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if ne $f.GoName "Id"}}*{{- end}}{{$f.Type.Ident}} `json:"{{stylename $style $f.ColumnName}}"`
+    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if ne $f.GoName "Id"}}*{{- end}}{{$f.Type.Ident}} `json:"{{styleName $style $f.ColumnName}}"`
 {{- end}}
 }
 
 type Get{{$stName}}ByFilter struct {
 {{- range $f := $e.Fields}}
-    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if eq $f.Type.Type 1 }}*{{- end}}{{$f.Type.Ident}} `json:"{{stylename $style $f.ColumnName}}"`
+    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if eq $f.Type.Type 1 }}*{{- end}}{{$f.Type.Ident}} `json:"{{styleName $style $f.ColumnName}}"`
 {{- end}}
 }
 
 type Exist{{$stName}}ByFilter struct {
 {{- range $f := $e.Fields}}
-    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if eq $f.Type.Type 1 }}*{{- end}}{{$f.Type.Ident}} `json:"{{stylename $style $f.ColumnName}}"`
+    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if eq $f.Type.Type 1 }}*{{- end}}{{$f.Type.Ident}} `json:"{{styleName $style $f.ColumnName}}"`
 {{- end}}
 }
 
 type List{{$stName}}ByFilter struct {
 {{- range $f := $e.Fields}}
-    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if eq $f.Type.Type 1 }}*{{- end}}{{$f.Type.Ident}} `json:"{{stylename $style $f.ColumnName}}"`
+    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if eq $f.Type.Type 1 }}*{{- end}}{{$f.Type.Ident}} `json:"{{styleName $style $f.ColumnName}}"`
 {{- end}}
     Page    int64 `json:"page"`
     PerPage int64 `json:"perPage"`
 }
 
 type PluckId{{$stName}}ByFilter struct {
 {{- range $f := $e.Fields}}
-    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if eq $f.Type.Type 1 }}*{{- end}}{{$f.Type.Ident}} `json:"{{stylename $style $f.ColumnName}}"`
+    {{if or (eq $f.GoName "CreatedAt") (eq $f.GoName "UpdatedAt") (eq $f.GoName "DeletedAt")}}// {{end}}{{$f.GoName}} {{if eq $f.Type.Type 1 }}*{{- end}}{{$f.Type.Ident}} `json:"{{styleName $style $f.ColumnName}}"`
 {{- end}}
 }
diff --git a/cmd/dyngen/command/template/dal_rapier.tpl b/cmd/dyngen/command/template/dal_rapier.tpl
@@ -14,7 +14,7 @@ import (
 )
 
 {{- $e := .Entity}}
-{{- $stName := pascalcase $e.Name}}
+{{- $stName := pascalCase $e.Name}}
 {{- $mdPrefix := .ModelPrefix}}
 {{- $queryPrefix := .QueryPrefix}}
 {{- $repoPrefix := .RepoPrefix}}