Merge pull request #102 from muandane/fix/commits-struct

fix 🐛(cmd): add spacing between scope and commit type

Author: muandane

cmd/root.go

@@ -82,20 +82,25 @@ func init() {
 }
 
 func constructCommitMessage(cfg *config.Config, typeFlag, scopeFlag, messageFlag string) string {
-	typeMatch := typeFlag
+	typeMatch := typeFlag // Default to the raw typeFlag
 	for _, t := range cfg.Types {
 		if typeFlag == t.Name {
 			if !cfg.NoEmoji {
-				typeMatch = fmt.Sprintf("%s %s", t.Name, t.Emoji)
+				typeMatch = fmt.Sprintf("%s %s", t.Emoji, t.Name)
+				break
+			} else {
+				typeMatch = t.Name
+				break
 			}
-			break
 		}
 	}
 
+	commitHeader := typeMatch
 	if scopeFlag != "" {
-		return fmt.Sprintf("%s(%s): %s", typeMatch, scopeFlag, messageFlag)
+		commitHeader += fmt.Sprintf("(%s)", scopeFlag)
 	}
-	return fmt.Sprintf("%s: %s", typeMatch, messageFlag)
+
+	return fmt.Sprintf("%s: %s", commitHeader, messageFlag)
 }
 
 // commit executes a git commit with the given message and body.

main.go

@@ -6,7 +6,6 @@ import (
 )
 
 // main is the entry point of the Go program.
-//
 // It calls the Execute function from the cmd package to execute the command.
 func main() {
 	cmd.Execute()

pkg/utils/askQuestions.go

@@ -94,9 +94,11 @@ func AskQuestions(config *config.Config, presetType, presetMessage string) ([]st
 
 	commitMessage := commitType
 	if commitScope != "" {
-		commitMessage += fmt.Sprintf("(%s)", commitScope)
+		commitMessage += fmt.Sprintf(" (%s)", strings.TrimSpace(commitScope))
 	}
-	commitMessage += fmt.Sprintf(": %s", commitSubject)
+	commitMessage += fmt.Sprintf(": %s", strings.TrimSpace(commitSubject))
 
-	return []string{commitMessage, commitDescription}, nil
+	commitBody := strings.TrimSpace(commitDescription)
+
+	return []string{commitMessage, commitBody}, nil
 }