fixed descrepancies

Author: coolwednesday

store/README.md

@@ -61,6 +61,7 @@ After generation, your project will have:
 
 ```
 stores/
+├── store.yaml          # Central configuration
 ├── all.go              # Store registry factory (auto-generated)
 └── user/
     ├── interface.go    # UserStore interface
@@ -156,12 +157,12 @@ models:
 
 | Field | Description | Required |
 |-------|-------------|----------|
-| `name` | Store identifier (used in registry) | Yes |
-| `package` | Go package name | Yes |
-| `output_dir` | Directory for generated files | Yes |
-| `interface` | Interface name — **recommended: `<Name>Store`** (e.g., `UserStore`) | Yes |
-| `implementation` | Implementation struct name (e.g., `userStore`) | Yes |
-| `queries` | Array of database queries | Yes |
+| `name` | Store identifier (used in registry) | **Yes** |
+| `package` | Go package name | **Yes** |
+| `output_dir` | Directory for generated files | Optional (defaults to `stores/<name>`) |
+| `interface` | Interface name — **recommended: `<Name>Store`** (e.g., `UserStore`) | Optional (defaults to `<Name>Store`) |
+| `implementation` | Implementation struct name (e.g., `userStore`) | Optional (defaults to `<name>Store`) |
+| `queries` | Array of database queries | **Yes** |
 
 > **⚠️ Naming Convention:** The registry (`stores/all.go`) automatically appends `"Store"` when building constructor calls. To avoid compilation errors, always name your interface as `<Name>Store` (e.g., `UserStore`) and the generated constructor will be `New<Name>Store()`.
 
@@ -200,7 +201,7 @@ models:
 - `delete` - DELETE queries
 
 **Return Types:**
-- `single` - Returns `(*Model, error)`
+- `single` - Returns `(Model, error)`
 - `multiple` - Returns `([]Model, error)`
 - `count` - Returns `(int64, error)`
 - `custom` - Returns `(any, error)`
@@ -264,7 +265,7 @@ package user
 import "gofr.dev/pkg/gofr"
 
 type UserStore interface {
-    GetUserByID(ctx *gofr.Context, id int64) (*User, error)
+    GetUserByID(ctx *gofr.Context, id int64) (User, error)
     GetAllUsers(ctx *gofr.Context) ([]User, error)
 }
 ```
@@ -280,9 +281,11 @@ func NewUserStore() UserStore {
     return &userStore{}
 }
 
-func (s *userStore) GetUserByID(ctx *gofr.Context, id int64) (*User, error) {
+func (s *userStore) GetUserByID(ctx *gofr.Context, id int64) (User, error) {
     // TODO: Implement query using ctx.SQL()
-    return &User{}, nil
+    var result User
+    // err := ctx.SQL().QueryRowContext(ctx, sql, id).Scan(&result.ID, ...)
+    return result, nil
 }
 ```
 

store/generator.go

@@ -307,6 +307,11 @@ func generateSingleStore(ctx *gofr.Context, cfg *Config, store *Info) error {
 		return fmt.Errorf("failed to create output directory: %w", err)
 	}
 
+	// Default implementation name if empty
+	if store.Implementation == "" {
+		store.Implementation = strings.ToLower(store.Name) + "Store"
+	}
+
 	storeConfig := &Config{
 		Version: cfg.Version,
 		Models:  cfg.Models,
@@ -974,81 +979,62 @@ func handleImportSection(lines, importsToAdd []string) []string {
 		return lines
 	}
 
-	importInsertIdx := findImportInsertionPoint(lines)
-	if importInsertIdx > 0 {
-		formattedImports := formatImports(importsToAdd)
-		return insertLines(lines, importInsertIdx, formattedImports)
-	}
+	insertIdx := findImportInsertionPoint(lines)
+	if insertIdx == -1 {
+		// No import block found, let's look for the package line
+		packageIdx := -1
 
-	return createImportSection(lines, importsToAdd)
-}
+		for i, line := range lines {
+			if strings.HasPrefix(strings.TrimSpace(line), "package ") {
+				packageIdx = i
+				break
+			}
+		}
 
-// createImportSection creates a new import section.
-func createImportSection(lines, importsToAdd []string) []string {
-	insertIdx := -1
+		if packageIdx == -1 {
+			return append([]string{"import ("}, append(importsToAdd, ")...")...)
+		}
 
-	for i, line := range lines {
-		if strings.HasPrefix(strings.TrimSpace(line), "package ") {
-			insertIdx = i + 1
-			break
+		newLines := []string{"", "import ("}
+		for _, imp := range importsToAdd {
+			newLines = append(newLines, fmt.Sprintf("    %q", canonicalizeImport(imp)))
 		}
-	}
 
-	if insertIdx == -1 {
-		insertIdx = 1
-	}
+		newLines = append(newLines, ")")
 
-	importSection := []string{""}
-	if len(importsToAdd) > 0 {
-		importSection = append(importSection, "import (")
-		formattedImports := formatImports(importsToAdd)
-		importSection = append(importSection, formattedImports...)
-		importSection = append(importSection, ")")
+		return insertLines(lines, packageIdx+1, newLines)
 	}
 
-	return insertLines(lines, insertIdx, importSection)
-}
-
-// formatImports formats a list of imports.
-func formatImports(importsToAdd []string) []string {
-	formatted := make([]string, len(importsToAdd))
-
+	formattedImports := make([]string, len(importsToAdd))
 	for i, imp := range importsToAdd {
-		formattedImp := strings.TrimSpace(imp)
-		if !strings.HasPrefix(formattedImp, `"`) {
-			formattedImp = fmt.Sprintf("%q", formattedImp)
-		}
-
-		formatted[i] = fmt.Sprintf(`    %s`, formattedImp)
+		formattedImports[i] = fmt.Sprintf("    %q", canonicalizeImport(imp))
 	}
 
-	return formatted
+	return insertLines(lines, insertIdx, formattedImports)
 }
 
 // parseExistingAllFile parses the existing all.go file.
 func parseExistingAllFile(lines []string) (existingStores, existingImports map[string]bool) {
 	existingStores = make(map[string]bool)
 	existingImports = make(map[string]bool)
-	inImportSection := false
+
+	inImport := false
 
 	for _, line := range lines {
 		trimmedLine := strings.TrimSpace(line)
 
-		if strings.Contains(trimmedLine, "import (") {
-			inImportSection = true
+		if trimmedLine == "import (" {
+			inImport = true
 			continue
 		}
 
-		if inImportSection {
-			if trimmedLine == ")" {
-				inImportSection = false
-				continue
-			}
-
-			if strings.Contains(trimmedLine, `"`) {
-				existingImports[strings.TrimSpace(trimmedLine)] = true
-			}
+		if inImport && trimmedLine == ")" {
+			inImport = false
+			continue
+		}
 
+		if inImport {
+			existingImports[trimmedLine] = true
 			continue
 		}