fix: new commits

Author: upsaurav12

cmd/new.go

@@ -35,6 +35,7 @@ var newCmd = &cobra.Command{
 		dirName := args[0]
 
 		// Create the new project
+		// Renaming argument for clarity
 		createNewProject(dirName, projectRouter, tmpl, cmd.OutOrStdout())
 	},
 }
@@ -53,26 +54,35 @@ func init() {
 	newCmd.Flags().StringVar(&projectRouter, "router", "", "router of the project")
 }
 
-func createNewProject(projectName string, projectRouter string, template string, out io.Writer) {
+// Renamed 'template' to 'tmpl' for consistency with usage in newCmd.Run
+func createNewProject(projectName string, projectRouter string, tmpl string, out io.Writer) {
+	// Create the project root directory
 	err := os.Mkdir(projectName, 0755)
 	if err != nil {
 		fmt.Fprintf(out, "Error creating directory: %v\n", err)
 		return
 	}
-	// Print the template that was passed
 
-	// Always add README + Makefile from common
-	renderTemplateDir("templates/common", projectName, TemplateData{
+	// Template Data structure for rendering
+	data := TemplateData{
 		ModuleName: projectName,
 		PortName:   projectPort,
-	})
+	}
 
-	renderTemplateDir("templates/"+template+"/"+projectRouter, projectName, TemplateData{
-		ModuleName: projectName,
-		PortName:   projectPort,
-	})
+	// Always add README + Makefile from common
+	// FIX: Path corrected to "common" since templates.FS root is the templates/ directory content.
+	err = renderTemplateDir("common", projectName, data)
+	if err != nil {
+		fmt.Fprintf(out, "Error rendering common templates: %v\n", err)
+		return
+	}
+
+	// Render project specific templates (e.g., "rest/gin")
+	// FIX: Path corrected to remove redundant "templates/" prefix.
+	err = renderTemplateDir(tmpl+"/"+projectRouter, projectName, data)
+	// FIX: Correctly checking the error returned by the function call above.
 	if err != nil {
-		fmt.Fprintf(out, "Error rendering templates: %v\n", err)
+		fmt.Fprintf(out, "Error rendering project templates: %v\n", err)
 		return
 	}
 
@@ -90,26 +100,29 @@ func renderTemplateDir(templatePath, destinationPath string, data TemplateData)
 			return err
 		}
 
+		// Compute relative path (remove the base templatePath)
 		relPath, _ := filepath.Rel(templatePath, path)
 		targetPath := filepath.Join(destinationPath, strings.TrimSuffix(relPath, ".tmpl"))
 
 		if d.IsDir() {
+			// This path is necessary to create all subdirectories correctly
 			return os.MkdirAll(targetPath, 0755)
 		}
 
-		// Read file from embed.FS
+		// Read file content from the embedded filesystem
 		content, err := templates.FS.ReadFile(path)
 		if err != nil {
 			return err
 		}
 
 		// Parse template
+		// Note: filepath.Base(path) uses the original path inside the embedded FS
 		tmpl, err := template.New(filepath.Base(path)).Parse(string(content))
 		if err != nil {
 			return err
 		}
 
-		// Create destination file
+		// Write file
 		outFile, err := os.Create(targetPath)
 		if err != nil {
 			return err

templates/embed.go

@@ -2,5 +2,11 @@ package templates
 
 import "embed"
 
-//go:embed rest/**/*
+// FS contains the contents of the templates directory.
+// The //go:embed directive is crucial for embedding these files into the compiled binary.
+// Since this file is located in the 'templates' directory,
+// the paths 'common' and 'rest' correctly refer to the template folders.
+//
+//go:embed common
+//go:embed rest
 var FS embed.FS