Merge pull request #8 from mukezhz/feature/align-to-wesionary-template

Feature/align to wesionary template
mukezhz · Jan 11, 2024 · d079a2b · d079a2b
2 parents edab464 + 6973595
commit d079a2b
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 30 deletions.
diff --git a/cmd/new_module.go b/cmd/new_module.go
@@ -13,8 +13,8 @@ import (
 )
 
 var newModuleCmd = &cobra.Command{
-	Use:   "gen features [name]",
-	Short: "Create a new features",
+	Use:   "gen module [name]",
+	Short: "Create a new domain",
 	Args:  cobra.MaximumNArgs(2),
 	Run:   createModule,
 }
@@ -35,7 +35,7 @@ func createModule(_ *cobra.Command, args []string) {
 		fmt.Println("Error finding Git root:", err)
 		return
 	}
-	mainModulePath := filepath.Join(projectPath, "domain", "features", "module.go")
+	mainModulePath := filepath.Join(projectPath, "domain", "module.go")
 	var moduleName string
 	if len(args) == 1 {
 		questions := []terminal.ProjectQuestion{
@@ -59,7 +59,7 @@ func createModule(_ *cobra.Command, args []string) {
 	data := utility.GetModuleDataFromModuleName(moduleName, projectModule.Module, projectModule.GoVersion)
 
 	// Define the directory structure
-	targetRoot := filepath.Join(".", "domain", "features", data.PackageName)
+	targetRoot := filepath.Join(".", "domain", data.PackageName)
 	templatePath := filepath.Join(".", "templates", "wesionary", "module")
 
 	err = utility.GenerateFiles(templatesFS, templatePath, targetRoot, data)

diff --git a/pkg/utility/ast.go b/pkg/utility/ast.go
@@ -15,7 +15,7 @@ import (
 )
 
 func ImportPackage(node *ast.File, projectModule, packageName string) {
-	path := filepath.Join(projectModule, "domain", "features", packageName)
+	path := filepath.Join(projectModule, "domain", packageName)
 	importSpec := &ast.ImportSpec{
 		Path: &ast.BasicLit{
 			Kind:  token.STRING,
@@ -59,17 +59,10 @@ func AddAnotherFxOptionsInModule(path, module, projectModule string) string {
 		switch x := n.(type) {
 		case *ast.CallExpr:
 			if sel, ok := x.Fun.(*ast.SelectorExpr); ok {
-				if sel.Sel.Name == "Module" {
-					x.Args = append(x.Args, &ast.CallExpr{
-						Fun: &ast.SelectorExpr{
-							X:   ast.NewIdent("fx"),
-							Sel: ast.NewIdent("Options"),
-						},
-						Args: []ast.Expr{
-							ast.NewIdent(module + ".Module"),
-						},
-						Rparen: token.Pos(1),
-					})
+				if sel.Sel.Name == "Options" {
+					x.Args = append(x.Args, []ast.Expr{
+						ast.NewIdent(module + ".Module"),
+					}...)
 				}
 			}
 		}
@@ -82,7 +75,7 @@ func AddAnotherFxOptionsInModule(path, module, projectModule string) string {
 		fmt.Println(err)
 	}
 	formattedCode := buf.String()
-	providerToInsert := fmt.Sprintf("fx.Options(%v.Module),", module)
+	providerToInsert := fmt.Sprintf("%v.Module,", module)
 	formattedCode = strings.Replace(formattedCode, providerToInsert, "\n\t"+providerToInsert, 1)
 	return formattedCode
 }

diff --git a/templates/wesionary/project/domain/features/module.tmpl b/templates/wesionary/project/domain/features/module.tmpl
diff --git a/...ect/domain/features/hello/controller.tmpl → ...nary/project/domain/hello/controller.tmpl b/...ect/domain/features/hello/controller.tmpl → ...nary/project/domain/hello/controller.tmpl
diff --git a/.../project/domain/features/hello/model.tmpl → ...wesionary/project/domain/hello/model.tmpl b/.../project/domain/features/hello/model.tmpl → ...wesionary/project/domain/hello/model.tmpl
diff --git a/...project/domain/features/hello/module.tmpl → ...esionary/project/domain/hello/module.tmpl b/...project/domain/features/hello/module.tmpl → ...esionary/project/domain/hello/module.tmpl
diff --git a/...ect/domain/features/hello/repository.tmpl → ...nary/project/domain/hello/repository.tmpl b/...ect/domain/features/hello/repository.tmpl → ...nary/project/domain/hello/repository.tmpl
diff --git a/.../project/domain/features/hello/route.tmpl → ...wesionary/project/domain/hello/route.tmpl b/.../project/domain/features/hello/route.tmpl → ...wesionary/project/domain/hello/route.tmpl
diff --git a/...roject/domain/features/hello/service.tmpl → ...sionary/project/domain/hello/service.tmpl b/...roject/domain/features/hello/service.tmpl → ...sionary/project/domain/hello/service.tmpl
diff --git a/templates/wesionary/project/domain/module.tmpl b/templates/wesionary/project/domain/module.tmpl
@@ -1,13 +1,13 @@
 package domain
 
 import (
-    "{{.ProjectModuleName}}/domain/features"
+    "{{.ProjectModuleName}}/domain/hello"
     "{{.ProjectModuleName}}/domain/middlewares"
 
     "go.uber.org/fx"
 )
 
 var Module = fx.Options(
 	middlewares.Module,
-	features.Module,
+	hello.Module,
 )