feat: resource and template

Author: zeshantech

cmd/generate/controller/controller.go

@@ -27,7 +27,7 @@ func init() {
 }
 
 func createController(cmd *cobra.Command, args []string) {
-	controllerName = args[0]
+	controllerName = utils.ConvertToSnakeCase(args[0])
 	defaultProjectDir := filepath.Join(".", "app", "modules", controllerName, "controllers")
 
 	// Check if a custom path is provided as the second argument

cmd/generate/controller/generate.go

@@ -15,7 +15,7 @@ func generateControllerFile(projectDir string) {
 	config := map[string]string{
 		"Module":                   utils.DetectModuleName(),
 		"ControllerName":           utils.ConvertToSnakeCase(controllerName),
-		"CapitalizeControllerName": utils.Capitalize(controllerName),
+		"CapitalizeControllerName": utils.ToPascalCase(controllerName),
 	}
 	utils.GenerateFileFromTemplate(templatePath, outputPath, config)
 }

cmd/generate/guard/generate.go

@@ -14,7 +14,7 @@ func generateGuardFile(projectDir string) {
 	config := map[string]string{
 		"Module":              utils.DetectModuleName(),
 		"GuardName":           utils.ConvertToSnakeCase(guardName),
-		"CapitalizeGuardName": utils.Capitalize(guardName),
+		"CapitalizeGuardName": utils.ToPascalCase(guardName),
 	}
 	utils.GenerateFileFromTemplate(templatePath, outputPath, config)
 }

cmd/generate/guard/guard.go

@@ -26,7 +26,7 @@ func init() {
 }
 
 func createGuard(cmd *cobra.Command, args []string) {
-	guardName = args[0]
+	guardName = utils.ConvertToSnakeCase(args[0])
 	defaultPath := filepath.Join(".", "app", "guards", guardName)
 
 	if len(args) > 1 {

cmd/generate/resource/generate.go

@@ -1,54 +1,81 @@
-// ./cmd/generate/resource/generate.go
 package resource
 
 import (
+	"bytes"
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
+	"text/template"
 	"time"
 
 	"github.com/briandowns/spinner"
+	"github.com/golang-programming/gincli/embedded"
 	"github.com/golang-programming/gincli/utils"
 )
 
 func generateResourceFromTemplate() {
-	templatePath := fmt.Sprintf("templates/others/%s/endpoints", strings.ToLower(transport))
-	resource := resourcePath + "/" + resourceName
-	if !createEndpoint {
-		templatePath = fmt.Sprintf("templates/others/%s/blank", strings.ToLower(transport))
-	}
+	embeddedRoot := fmt.Sprintf("templates/others/%s/%s", strings.ToLower(transport),
+		func() string {
+			if createEndpoint {
+				return "endpoints"
+			}
+			return "blank"
+		}(),
+	)
 
 	s := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
 	s.Suffix = " Creating resource..."
 	s.Start()
 	defer s.Stop()
 
-	err := filepath.Walk(templatePath, func(path string, info os.FileInfo, err error) error {
+	if err := fs.WalkDir(embedded.TemplatesFS, embeddedRoot, func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		relPath, err := filepath.Rel(embeddedRoot, path)
 		if err != nil {
 			return err
 		}
+		targetPath := filepath.Join(resourcePath, relPath)
 
-		relativePath := strings.TrimPrefix(path, templatePath)
-		targetPath := filepath.Join(resource, relativePath)
+		if d.IsDir() {
+			return os.MkdirAll(targetPath, os.ModePerm)
+		}
 
-		if strings.HasSuffix(info.Name(), ".tpl") {
+		if strings.HasSuffix(d.Name(), ".tpl") {
 			targetFile := strings.TrimSuffix(targetPath, ".tpl")
-			fmt.Print(path, targetFile)
-			utils.GenerateFileFromTemplate(path, targetFile, getConfig())
+			data, err := embedded.TemplatesFS.ReadFile(path)
+			if err != nil {
+				return fmt.Errorf("failed to read template %s: %v", path, err)
+			}
+
+			tmpl, err := template.New("").Parse(string(data))
+			if err != nil {
+				return fmt.Errorf("failed to parse template %s: %v", path, err)
+			}
+
+			var buf bytes.Buffer
+			if err := tmpl.Execute(&buf, getConfig()); err != nil {
+				return fmt.Errorf("failed to execute template %s: %v", targetFile, err)
+			}
+
+			if err := os.WriteFile(targetFile, buf.Bytes(), 0644); err != nil {
+				return fmt.Errorf("failed to write file %s: %v", targetFile, err)
+			}
 		}
 
 		return nil
-	})
-
-	if err != nil {
+	}); err != nil {
 		utils.LogError(fmt.Sprintf("Error while copying templates: %v", err))
 	}
 }
 
 func getConfig() map[string]string {
 	return map[string]string{
-		"CapitalizeResourceName": utils.Capitalize(resourceName),
+		"CapitalizeResourceName": utils.ToPascalCase(resourceName),
 		"ResourceName":           utils.ConvertToSnakeCase(resourceName),
 		"Module":                 utils.DetectModuleName(),
 	}

cmd/generate/resource/resource.go

@@ -33,7 +33,7 @@ func init() {
 }
 
 func createResource(cmd *cobra.Command, args []string) {
-	resourceName = args[0]
+	resourceName = utils.ConvertToSnakeCase(args[0])
 
 	defaultPath := filepath.Join(".", "app", "modules", resourceName)
 

cmd/generate/route/generate.go

@@ -14,7 +14,7 @@ func generateRouteFile(projectDir string) {
 	config := map[string]string{
 		"Module":              utils.DetectModuleName(),
 		"RouteName":           utils.ConvertToSnakeCase(routeName),
-		"CapitalizeRouteName": utils.Capitalize(routeName),
+		"CapitalizeRouteName": utils.ToPascalCase(routeName),
 	}
 	utils.GenerateFileFromTemplate(templatePath, outputPath, config)
 }

cmd/generate/route/route.go

@@ -27,7 +27,7 @@ func init() {
 }
 
 func createRoute(cmd *cobra.Command, args []string) {
-	routeName = args[0]
+	routeName = utils.ConvertToSnakeCase(args[0])
 	defaultProjectDir := filepath.Join(".", "app", "modules", routeName)
 
 	// Check if a custom path is provided as the second argument

cmd/generate/service/generate.go

@@ -14,7 +14,7 @@ func generateServiceFile(projectDir string) {
 	config := map[string]string{
 		"Module":                utils.DetectModuleName(),
 		"ServiceName":           utils.ConvertToSnakeCase(serviceName),
-		"CapitalizeServiceName": utils.Capitalize(serviceName),
+		"CapitalizeServiceName": utils.ToPascalCase(serviceName),
 	}
 	utils.GenerateFileFromTemplate(templatePath, outputPath, config)
 }

cmd/generate/service/service.go

@@ -27,7 +27,7 @@ func init() {
 }
 
 func createService(cmd *cobra.Command, args []string) {
-	serviceName = args[0]
+	serviceName = utils.ConvertToSnakeCase(args[0])
 	defaultProjectDir := filepath.Join(".", "app", "modules", serviceName, "services")
 
 	// Check if a custom path is provided as the second argument