changes:

- Fix output folder not being relative to config
- Remove OutputNamespace (Just set it in templates)
- Use filepath instead of path everywhere

Author: ZelvaMan

readme.md

@@ -19,8 +19,6 @@ Enable verbose logging with `--verbose` flag (can)
 - **OutputFolder (string)**:
     - Specifies the folder where generated code files will be saved.
     - It can be relative to current working directory
-- **OutputNamespace (string)**:
-    - Sets the namespace for the generated code.
 - **GenerateModels (boolean)**:
     - If **True** Generates models
 - **GenerateProcessors (boolean)**:

src/config.go

@@ -5,7 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 )
@@ -32,17 +31,21 @@ func GetConfig() (*Config, error) {
 	// Cli args should override config loaded from file
 	config.Command = args.command
 	config.Verbose = args.verbose
-	config.PathBase = path.Dir(args.configPath)
+	config.PathBase = filepath.Dir(args.configPath)
 
+	//All paths are relative to config file
 	config.ProcessorTemplate = filepath.Join(config.PathBase, config.ProcessorTemplate)
 	config.DbContextTemplate = filepath.Join(config.PathBase, config.DbContextTemplate)
 	config.ModelTemplate = filepath.Join(config.PathBase, config.ModelTemplate)
+	config.OutputFolder = filepath.Join(config.PathBase, config.OutputFolder)
 
 	if err != nil {
 		return nil, fmt.Errorf("getting configuration from file: %w", err)
 	}
 
 	CurrentConfig = config
+
+	VerboseLog("%+v", config)
 	return config, nil
 }
 
@@ -67,7 +70,7 @@ func readJsonConfigFile(path string) (*Config, error) {
 func parseCLIArgs() (*cliArgs, error) {
 
 	verboseFlag := flag.Bool("verbose", false, "If true it will print more stuff")
-	configPathFlag := flag.String("config", defaultConfigPath, "If true it will print more stuff")
+	configPathFlag := flag.String("config", defaultConfigPath, "Path to config file, all paths are relative it")
 	flag.Parse()
 
 	args := new(cliArgs)

src/debugginf.go

@@ -3,7 +3,7 @@ package dbGen
 import (
 	"encoding/json"
 	"os"
-	"path"
+	"path/filepath"
 	"time"
 )
 
@@ -21,7 +21,7 @@ func SaveToTempFile(functions interface{}, fileNamePrefix string) (err error) {
 		return
 	}
 
-	filename := path.Join(tempFolder, time.Now().Format("2006-01-02-15-04-05")+"-"+fileNamePrefix+".json")
+	filename := filepath.Join(tempFolder, time.Now().Format("2006-01-02-15-04-05")+"-"+fileNamePrefix+".json")
 	err = os.WriteFile(filename, saveJson, 777)
 	if err != nil {
 		return

src/generator.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"log"
 	"os"
-	"path"
 	"path/filepath"
 	"text/template"
 )
@@ -69,7 +68,7 @@ func generateDbContext(routines []Routine, hashMap *map[string]string, config *C
 		Functions: routines,
 	}
 
-	fp := path.Join(config.OutputFolder, "DbContext"+config.GeneratedFileExtension)
+	fp := filepath.Join(config.OutputFolder, "DbContext"+config.GeneratedFileExtension)
 
 	changed, err := generateFile(data, dbcontextTemplate, fp, hashMap)
 	if err != nil {
@@ -93,15 +92,15 @@ func generateModels(routines []Routine, hashMap *map[string]string, config *Conf
 		return fmt.Errorf("loading module template: %s", err)
 	}
 
-	err = os.MkdirAll(path.Join(config.OutputFolder, modelsFolder), 777)
+	err = os.MkdirAll(filepath.Join(config.OutputFolder, modelsFolder), 777)
 
 	for _, routine := range routines {
 		if !routine.HasReturn {
 			continue
 		}
 
-		relPath := path.Join(modelsFolder, routine.ModelName+config.GeneratedFileExtension)
-		filePath := path.Join(config.OutputFolder, relPath)
+		relPath := filepath.Join(modelsFolder, routine.ModelName+config.GeneratedFileExtension)
+		filePath := filepath.Join(config.OutputFolder, relPath)
 
 		changed, err := generateFile(routine, moduleTemplate, filePath, hashMap)
 		if err != nil {
@@ -124,7 +123,7 @@ func generateProcessors(routines []Routine, hashMap *map[string]string, config *
 		return fmt.Errorf("loading processor template: %s", err)
 	}
 
-	err = os.MkdirAll(path.Join(config.OutputFolder, processorsFolder), 777)
+	err = os.MkdirAll(filepath.Join(config.OutputFolder, processorsFolder), 777)
 	if err != nil {
 		return fmt.Errorf("creating processor output folder: %s", err)
 	}
@@ -133,8 +132,8 @@ func generateProcessors(routines []Routine, hashMap *map[string]string, config *
 		if !routine.HasReturn {
 			continue
 		}
-		relPath := path.Join(processorsFolder, routine.ProcessorName+config.GeneratedFileExtension)
-		filePath := path.Join(config.OutputFolder, relPath)
+		relPath := filepath.Join(processorsFolder, routine.ProcessorName+config.GeneratedFileExtension)
+		filePath := filepath.Join(config.OutputFolder, relPath)
 
 		changed, err := generateFile(routine, processorTemplate, filePath, hashMap)
 		if err != nil {

src/helpers.go

@@ -32,7 +32,8 @@ func Exit(template string, args ...any) {
 }
 
 func VerboseLog(message string, args ...any) {
-	if CurrentConfig.Verbose {
+	// to be safe, use verbose log if current config isn't set
+	if CurrentConfig == nil || CurrentConfig.Verbose {
 		if len(args) == 0 {
 			log.Print(colorBlue + message + colorReset)
 

src/types.go

@@ -39,7 +39,6 @@ type Config struct {
 	PathBase                   string         //everything should be relative to config file
 	ConnectionString           string         `json:"ConnectionString"`
 	OutputFolder               string         `json:"OutputFolder,omitempty"`
-	OutputNamespace            string         `json:"OutputNamespace,omitempty"`
 	GenerateModels             bool           `json:"GenerateModels,omitempty"`
 	GenerateProcessors         bool           `json:"GenerateProcessors,omitempty"`
 	SkipModelGenForVoidReturns bool           `json:"SkipModelGenForVoidReturns,omitempty"`

testing/db-gen.json

@@ -1,7 +1,6 @@
 {
   "ConnectionString": "postgresql://postgres:Password3000!!@localhost:5432/db_gen",
   "OutputFolder": "C:\\Testbench\\CSharp\\AspNetCoreDbGen\\AspNetCoreDbGen\\output",
-  "OutputNamespace": "Database.Generated",
   "GenerateModels": true,
   "GenerateProcessors": true,
   "SkipModelGenForVoidReturns": false,