fix: grammar error

README.md

@@ -1,13 +0,0 @@
-# Crudgen
-> Generate crud's at speed of thought
-
-## Install
-```shell
-go install git.gogacoder.ru/NTO/crudgen/cmd/crudgen@v1.0.14
-```
-
-## Run
-Specify path to internal directory 
-```shell
-crudgen -p internal
-```

cmd/crudgen/main.go

@@ -27,7 +27,7 @@ func ImplementServices(mainPkgDir string, reimplement bool) {
 func main() {
 	log.SetFlags(0)
 	projectPath := flag.String("p", ".", "project path")
-	reimplement := flag.Bool("f", false, "pass -f to allow tool to overwrite exist functions and service structure")
+	reimplement := flag.Bool("f", false, "pass -f to allow tool to overwrite existing functions and service structure")
 	flag.Parse()
 	ImplementServices(*projectPath, *reimplement)
 }

go.mod

@@ -1,13 +1,12 @@
 module git.gogacoder.ru/NTO/crudgen
 
-go 1.23.0
+go 1.22.12
-
-toolchain go1.24.1
 
 require github.com/dave/dst v0.27.3
 
 require (
-	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/mod v0.23.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/tools v0.31.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
 )

go.sum

@@ -6,9 +6,13 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=

internal/raw_templates.go

@@ -1,12 +1,7 @@
 package internal
 
 const CreateRawTemplate = `func (service *{{.ServiceName}}) Create(item {{.EntityType}}) ({{.EntityType}}, error) {
-    utils.ReplaceEmptySlicesWithNil(&item)
+    err := dal.{{.EntityType}}.Preload(field.Associations).Create(&item)
-    err := dal.{{.EntityType}}.Create(&item)
-    if err != nil {
-        return item, err
-	}
-    err = utils.AppendAssociations(database.GetInstance(), &item)
     return item, err
 }`
 
@@ -29,34 +24,16 @@ const GetByIdRawTemplate = `func (service *{{.ServiceName}}) GetById(id uint) (*
 }`
 
 const UpdateRawTemplate = `func (service *{{.ServiceName}}) Update(item {{.EntityType}}) ({{.EntityType}}, error) {
-    utils.ReplaceEmptySlicesWithNil(&item)
+    err := dal.{{.EntityType}}.Preload(field.Associations).Save(&item)
-    
-    _, err := dal.Author.Updates(&item)
-	if err != nil {
-		return item, err
-	}
-    
-    err = utils.UpdateAssociations(database.GetInstance(), &item)
-
-    if err != nil {
-		return item, err
-	}
-
     return item, err
 }`
 
-const DeleteRawTemplate = `func (service *{{.ServiceName}}) Delete(id uint) error {
+const DeleteRawTemplate = `func (service *{{.ServiceName}}) Delete(item {{.EntityType}}) ({{.EntityType}}, error) {
-    _, err := dal.{{.EntityType}}.Unscoped().Where(dal.{{.EntityType}}.Id.Eq(id)).Delete()
+    _, err := dal.{{.EntityType}}.Unscoped().Preload(field.Associations).Delete(&item)
-    return err
+    return item, err
 }`
 
 const CountRawTemplate = `func (service *{{.ServiceName}}) Count() (int64, error) {
     amount, err := dal.{{.EntityType}}.Count()
     return amount, err
 }`
-
-const SortedByOrderTemplate = `func (service *{{.ServiceName}}) SortedByOrder(fieldsSortOrder map[string]string) ([]*{{.EntityType}}, error) {
-	return utils.SortByOrder(fieldsSortOrder, {{.EntityType}}{})
-}`
-
-var implementedMethods = []string{CreateMethod, GetAllMethod, GetByIdMethod, UpdateMethod, DeleteMethod, CountMethod, SortedByOrderMethod}

internal/templates.go

@@ -8,9 +8,7 @@ type CrudTemplatesContext struct {
 
 var ServiceImports = []string{
 	"app/internal/dal",
-	"app/internal/database",
 	"app/internal/models",
-	"app/internal/utils",
 	"errors",
 	"gorm.io/gen/field",
 	"gorm.io/gorm",
@@ -22,14 +20,12 @@ const GetByIdMethod = "GetById"
 const UpdateMethod = "Update"
 const DeleteMethod = "Delete"
 const CountMethod = "Count"
-const SortedByOrderMethod = "SortedByOrder"
 
 var RawTemplates = map[string]string{
-	CreateMethod:        CreateRawTemplate,
+	CreateMethod:  CreateRawTemplate,
-	GetAllMethod:        GetAllRawTemplate,
+	GetAllMethod:  GetAllRawTemplate,
-	GetByIdMethod:       GetByIdRawTemplate,
+	GetByIdMethod: GetByIdRawTemplate,
-	UpdateMethod:        UpdateRawTemplate,
+	UpdateMethod:  UpdateRawTemplate,
-	DeleteMethod:        DeleteRawTemplate,
+	DeleteMethod:  DeleteRawTemplate,
-	CountMethod:         CountRawTemplate,
+	CountMethod:   CountRawTemplate,
-	SortedByOrderMethod: SortedByOrderTemplate,
 }

internal/writer.go

@@ -170,25 +170,9 @@ func importExists(file *dst.File, importPath string) bool {
 }
 
 func MaintainImports(file *dst.File) error {
-	var importDecl *dst.GenDecl
-	for _, decl := range file.Decls {
-		if genDecl, ok := decl.(*dst.GenDecl); ok && genDecl.Tok == token.IMPORT {
-			importDecl = genDecl
-			break
-		}
-	}
-
-	if importDecl == nil {
-		importDecl = &dst.GenDecl{
-			Tok:   token.IMPORT,
-			Specs: []dst.Spec{},
-		}
-		file.Decls = append([]dst.Decl{importDecl}, file.Decls...)
-	}
-
 	for _, importPath := range ServiceImports {
 		if !importExists(file, importPath) {
-			importDecl.Specs = append(importDecl.Specs, &dst.ImportSpec{
+			file.Imports = append(file.Imports, &dst.ImportSpec{
 				Path: &dst.BasicLit{
 					Kind:  token.STRING,
 					Value: `"` + importPath + `"`,
@@ -196,7 +180,6 @@ func MaintainImports(file *dst.File) error {
 			})
 		}
 	}
-
 	return nil
 }
 
@@ -244,7 +227,7 @@ func ImplementCrudMethods(modelName string, serviceName string, file *dst.File,
 		EntityPlural: ToPlural(modelName),
 	}
 
-	for _, methodName := range implementedMethods {
+	for _, methodName := range []string{CreateMethod, GetAllMethod, GetByIdMethod, UpdateMethod, DeleteMethod, CountMethod} {
 		methodCode := GenerateCrudMethodCode(methodName, templateContext)
 		methodDecl, err := MethodCodeToDeclaration(methodCode)
 		fmt.Printf("%s\n", methodCode)