move frameworks flag to backed

Author: Ujstor

.github/workflows/generate-linter-advanced.yml

@@ -3,9 +3,9 @@ name: Linting Generated Blueprints Advanced
 on:
   pull_request: {}
   workflow_dispatch: {}
-  push:
-    branches:
-      - cli-refactor
+  # push:
+  #   branches:
+  #     - cli-refactor
 
 jobs:
   framework_matrix:

.github/workflows/generate-linter-core.yml

@@ -3,9 +3,9 @@ name: Linting Generated Blueprints Core
 on:
   pull_request: {}
   workflow_dispatch: {}
-  push:
-    branches:
-      - cli-refactor
+  # push:
+  #   branches:
+  #     - cli-refactor
 
 jobs:
   framework_matrix:

.github/workflows/generate-linter-frontend.yml

@@ -3,9 +3,9 @@ name: Linting Generated Blueprints Advanced
 on:
   pull_request: {}
   workflow_dispatch: {}
-  push:
-    branches:
-      - cli-refactor
+  # push:
+  #   branches:
+  #     - cli-refactor
 
 jobs:
   framework_matrix:

.github/workflows/testcontainers.yml

@@ -3,9 +3,9 @@ name: Integrations Test for the Generated Blueprints
 on:
   pull_request: {}
   workflow_dispatch: {}
-  push:
-    branches:
-      - cli-refactor
+  # push:
+  #   branches:
+  #     - cli-refactor
 
 jobs:
   itests_matrix:

README.md

@@ -7,20 +7,20 @@
 </div>
 
 Go Blueprint is a CLI tool that allows users to spin up a Go project with the corresponding structure seamlessly. It also
-gives the option to integrate with one of the more popular Go frameworks (and the list is growing with new features)!
+gives the option to integrate with one of the more popular Go backends (and the list is growing with new features)!
 
 ### Why Would I use this?
 
 - Easy to set up and install
 - Have the entire Go structure already established
 - Setting up a Go HTTP server (or Fasthttp with Fiber)
-- Integrate with a popular frameworks
+- Integrate with a popular backends
 - Focus on the actual code of your application
 
 ## Table of Contents
 
 - [Install](#install)
-- [Frameworks Supported](#frameworks-supported)
+- [backends Supported](#backends-supported)
 - [Database Support](#database-support)
 - [Advanced Features](#advanced-features)
 - [Blueprint UI](#blueprint-ui)
@@ -64,18 +64,18 @@ go-blueprint create
 You can also use the provided flags to set up a project without interacting with the UI.
 
 ```bash
-go-blueprint create --name my-project --framework gin --driver postgres --git commit
+go-blueprint create --name my-project --backend gin --driver postgres --git commit
 ```
 
 See `go-blueprint create -h` for all the options and shorthands.
 
-<a id="frameworks-supported"></a>
+<a id="backends-supported"></a>
 
 <h2>
   <picture>
-    <img src="./public/frameworks.gif?raw=true" width="60px" style="margin-right: 1px;">
+    <img src="./public/backends.gif?raw=true" width="60px" style="margin-right: 1px;">
   </picture>
-  Frameworks Supported
+  backends Supported
 </h2>
 
 - [Chi](https://github.com/go-chi/chi)
@@ -152,7 +152,7 @@ Blueprint UI is a web application that allows you to create commands for the CLI
 Here's an example of setting up a project with a specific database driver:
 
 ```bash
-go-blueprint create --name my-project --framework gin --driver postgres --git commit
+go-blueprint create --name my-project --backend gin --driver postgres --git commit
 ```
 
 <p align="center">
@@ -206,7 +206,7 @@ go-blueprint create --advanced --feature react
 Or all features at once:
 
 ```bash
-go-blueprint create --name my-project --framework chi --driver mysql --advanced --feature htmx --feature githubaction --feature websocket --feature tailwind --feature docker --git commit --feature react
+go-blueprint create --name my-project --backend chi --driver mysql --advanced --feature htmx --feature githubaction --feature websocket --feature tailwind --feature docker --git commit --feature react
 ```
 
 <p align="center">

cmd/create.go

@@ -40,23 +40,34 @@ var (
 )
 
 func init() {
-	var flagFramework flags.Framework
+	var flagBackend flags.Backend
 	var flagDBDriver flags.Database
 	var frontendFrameworks flags.FrontendFramework
 	var frontendAdvanced flags.FrontendAdvanced
 	var advancedFeatures flags.AdvancedFeatures
 	var flagGit flags.Git
 	rootCmd.AddCommand(createCmd)
 
+	// Main flags
 	createCmd.Flags().StringP("name", "n", "", "Name of project to create")
-	createCmd.Flags().VarP(&flagFramework, "framework", "b", fmt.Sprintf("Framework to use. Allowed values: %s", strings.Join(flags.AllowedProjectTypes, ", ")))
+	createCmd.Flags().VarP(&flagBackend, "backend", "b", fmt.Sprintf("Backend to use. Allowed values: %s", strings.Join(flags.AllowedBackedTypes, ", ")))
 	createCmd.Flags().VarP(&flagDBDriver, "driver", "d", fmt.Sprintf("Database drivers to use. Allowed values: %s", strings.Join(flags.AllowedDBDrivers, ", ")))
+	createCmd.Flags().VarP(&flagGit, "git", "g", fmt.Sprintf("Git to use. Allowed values: %s", strings.Join(flags.AllowedGitsOptions, ", ")))
+
+	// Frontend flags group
 	createCmd.Flags().BoolP("frontend", "f", false, "Get prompts for frontend frameworks")
 	createCmd.Flags().Var(&frontendFrameworks, "frontend-framework", fmt.Sprintf("Frontend framework to use. Allowed values: %s", strings.Join(flags.AllowedFrontendTypes, ", ")))
 	createCmd.Flags().Var(&frontendAdvanced, "frontend-advanced", fmt.Sprintf("Frontend framework advanced features to use. Allowed values: %s", strings.Join(flags.AllowedFrontendAdvanced, ", ")))
+
+	// Advanced features group
 	createCmd.Flags().BoolP("advanced", "a", false, "Get prompts for advanced features")
 	createCmd.Flags().Var(&advancedFeatures, "feature", fmt.Sprintf("Advanced feature to use. Allowed values: %s", strings.Join(flags.AllowedAdvancedFeatures, ", ")))
-	createCmd.Flags().VarP(&flagGit, "git", "g", fmt.Sprintf("Git to use. Allowed values: %s", strings.Join(flags.AllowedGitsOptions, ", ")))
+
+	// Mark dependencies for frontend flags
+	createCmd.MarkFlagsRequiredTogether("frontend", "frontend-framework")
+
+	// Mark feature flag as requiring --advanced
+	createCmd.MarkFlagsRequiredTogether("advanced", "feature")
 }
 
 type Options struct {
@@ -95,7 +106,7 @@ var createCmd = &cobra.Command{
 
 		// VarP already validates the contents of the framework flag.
 		// If this flag is filled, it is always valid
-		flagFramework := flags.Framework(cmd.Flag("framework").Value.String())
+		flagBackend := flags.Backend(cmd.Flag("backend").Value.String())
 		flagDBDriver := flags.Database(cmd.Flag("driver").Value.String())
 		flagFrontendFremwork := flags.FrontendFramework(cmd.Flag("frontend-framework").Value.String())
 		flagGit := flags.Git(cmd.Flag("git").Value.String())
@@ -116,17 +127,17 @@ var createCmd = &cobra.Command{
 
 		project := &program.Project{
 			ProjectName:       flagName,
-			ProjectType:       flagFramework,
+			ProjectType:       flagBackend,
 			DBDriver:          flagDBDriver,
-			FrameworkMap:      make(map[flags.Framework]program.Framework),
+			BackendMap:        make(map[flags.Backend]program.Backend),
 			DBDriverMap:       make(map[flags.Database]program.Driver),
 			FrontendFramework: flagFrontendFremwork,
 			FrontendOptions:   make(map[string]bool),
 			AdvancedOptions:   make(map[string]bool),
 			GitOptions:        flagGit,
 		}
 
-		steps := steps.InitSteps(flagFramework, flagDBDriver, flagFrontendFremwork, flagGit)
+		steps := steps.InitSteps(flagBackend, flagDBDriver, flagFrontendFremwork, flagGit)
 		fmt.Printf("%s\n", logoStyle.Render(logo))
 
 		// Advanced option steps:
@@ -177,7 +188,7 @@ var createCmd = &cobra.Command{
 
 		if project.ProjectType == "" {
 			isInteractive = true
-			step := steps.Steps["framework"]
+			step := steps.Steps["backend"]
 			tprogram = tea.NewProgram(multiInput.InitialModelMulti(step.Options, options.ProjectType, step.Headers, project))
 			if _, err := tprogram.Run(); err != nil {
 				cobra.CheckErr(textinput.CreateErrorInputModel(err).Err())
@@ -187,11 +198,11 @@ var createCmd = &cobra.Command{
 			step.Field = options.ProjectType.Choice
 
 			// this type casting is always safe since the user interface can
-			// only pass strings that can be cast to a flags.Framework instance
-			project.ProjectType = flags.Framework(strings.ToLower(options.ProjectType.Choice))
-			err := cmd.Flag("framework").Value.Set(project.ProjectType.String())
+			// only pass strings that can be cast to a flags.Backend instance
+			project.ProjectType = flags.Backend(strings.ToLower(options.ProjectType.Choice))
+			err := cmd.Flag("backend").Value.Set(project.ProjectType.String())
 			if err != nil {
-				log.Fatal("failed to set the framework flag value", err)
+				log.Fatal("failed to set the backend flag value", err)
 			}
 		}
 
@@ -357,13 +368,13 @@ var createCmd = &cobra.Command{
 		}
 
 		if options.FrontendAdvanced.Choices["Tailwind"] && options.FrontendFramework.Choice == "Htmx" {
-			fmt.Println(endingMsgStyle.Render("• Download the tailwind standalone cli wiht Makefile target\n"))
+			fmt.Println(endingMsgStyle.Render("• Download the tailwind standalone cli with Makefile target\n"))
 			fmt.Println(endingMsgStyle.Render("• More info about the Tailwind CLI: https://tailwindcss.com/blog/standalone-cli\n"))
 		}
 
 		if options.FrontendFramework.Choice == "Htmx" {
-			fmt.Println(endingMsgStyle.Render("• Install the templ cli `go install github.com/a-h/templ/cmd/templ@latest` or use Makefile\n"))
-			fmt.Println(endingMsgStyle.Render("• Generate templ function files by running `templ generate`\n"))
+			fmt.Println(endingMsgStyle.Render("• Install the templ cli `go install github.com/a-h/templ/cmd/templ@latest`\n"))
+			fmt.Println(endingMsgStyle.Render("• Generate templ function files by running `templ generate` or use Makefile for both steps\n"))
 		}
 
 		if isInteractive {

cmd/flags/backend.go

@@ -0,0 +1,44 @@
+package flags
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Backend string
+
+// These are all the current backends supported. If you want to add one, you
+// can simply copy and paste a line here. Do not forget to also add it into the
+// AllowedBackedTypes slice too!
+const (
+	Chi             Backend = "chi"
+	Gin             Backend = "gin"
+	Fiber           Backend = "fiber"
+	GorillaMux      Backend = "gorilla/mux"
+	HttpRouter      Backend = "httprouter"
+	StandardLibrary Backend = "standard-library"
+	Echo            Backend = "echo"
+)
+
+var AllowedBackedTypes = []string{string(Chi), string(Gin), string(Fiber), string(GorillaMux), string(HttpRouter), string(StandardLibrary), string(Echo)}
+
+func (f Backend) String() string {
+	return string(f)
+}
+
+func (f *Backend) Type() string {
+	return "Backend"
+}
+
+func (f *Backend) Set(value string) error {
+	// Contains isn't available in 1.20 yet
+	// if AllowedBackedTypes.Contains(value) {
+	for _, project := range AllowedBackedTypes {
+		if project == value {
+			*f = Backend(value)
+			return nil
+		}
+	}
+
+	return fmt.Errorf("Backend to use. Allowed values: %s", strings.Join(AllowedBackedTypes, ", "))
+}

cmd/flags/frameworks.go

@@ -9,7 +9,7 @@ type FrontendFramework string
 
 // These are all the current frameworks supported. If you want to add one, you
 // can simply copy and paste a line here. Do not forget to also add it into the
-// AllowedProjectTypes slice too!
+// AllowedFrontedTypes slice too!
 const (
 	Htmx  FrontendFramework = "htmx"
 	React FrontendFramework = "react"
@@ -27,7 +27,7 @@ func (f *FrontendFramework) Type() string {
 
 func (f *FrontendFramework) Set(value string) error {
 	// Contains isn't available in 1.20 yet
-	// if AllowedProjectTypes.Contains(value) {
+	// if AllowedFrontedTypes.Contains(value) {
 	for _, frontendFrameworks := range AllowedFrontendTypes {
 		if frontendFrameworks == value {
 			*f = FrontendFramework(value)