Changes:

- `GeneratedFileCase` config values renamed to match world-wide accepted terms
- Template functions: `uCamel`, `lCamel`, `snake` renamed with equivalent world-wide accepted terms
- Model template now has previous config values accessible through `Routine` variable
- New config values for folder names where generated models and processors will be placed
- Model, Processor and DbContext templates now have new variable `Config` pointing to the config values of the application

Author: FilipJakab

.editorconfig

@@ -0,0 +1,37 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = crlf
+indent_size = 2
+indent_style = tab
+insert_final_newline = true
+max_line_length = 160
+tab_width = 2
+trim_trailing_whitespace = false
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = false
+ij_smart_tabs = true
+ij_visual_guides = none
+ij_wrap_on_typing = false
+
+[*.{cs,js,css,cshtml,json,svelte,vue}]
+indent_style = tab
+indent_size = 2
+trim_trailing_whitespace = true
+end_of_line = crlf
+charset = utf-8
+ij_javascript_use_semicolon_after_statement = false
+
+[*.{xaml,html,xml,heex,exs,ex,eex}]
+indent_style = tab
+indent_size = 2
+trim_trailing_whitespace = true
+end_of_line = crlf
+charset = utf-8
+
+[*.{heex,exs,ex,eex}]
+indent_style = space
+ij_any_line_comment_at_first_column = false
+ij_any_block_comment_at_first_column = false

CHANGELOG.md

@@ -0,0 +1,24 @@
+# CHANGELOG
+
+# 0.2.2
+
+## Breaking changes!
+
+- `GeneratedFileCase` config values renamed to match world-wide accepted terms:
+  - from: `"snake"` to: `"snakecase"`
+  - from: `"lcase"` to: `"camelcase"`
+  - from: `"ucase"` to: `"pascalcase"`
+
+- Template functions: `uCamel`, `lCamel`, `snake` renamed with equivalent world-wide accepted terms:
+	- from: `"snake"` to: `"snakeCased"`
+	- from: `"lCamel"` to: `"camelCased"`
+	- from: `"uCamel"` to: `"pascalCased"`
+
+- Model template now has previous config values accessible through `Routine` variable
+
+## New features
+
+- New config values for folder names where generated models and processors will be placed
+  - `ProcessorsFolderName` with default value: `"processors"`
+  - `ModelsFolderName` with default value: `"models"`
+- Model, Processor and DbContext templates now have new variable `Config` pointing to the config values of the application

CHANGELOG.txt

@@ -17,6 +17,8 @@ type Config struct {
 	PathBase                         string         //for now just using config folder
 	ConnectionString                 string         `mapstructure:"ConnectionString"`
 	OutputFolder                     string         `mapstructure:"OutputFolder"`
+	ProcessorsFolderName             string         `mapstructure:"ProcessorsFolderName"`
+	ModelsFolderName                 string         `mapstructure:"ModelsFolderName"`
 	GenerateModels                   bool           `mapstructure:"GenerateModels"`
 	GenerateProcessors               bool           `mapstructure:"GenerateProcessors"`
 	GenerateProcessorsForVoidReturns bool           `mapstructure:"GenerateProcessorsForVoidReturns"`
@@ -51,7 +53,25 @@ var loadedConfigLocation = ""
 
 // GetAndValidateConfig gets configuration from viper
 func GetAndValidateConfig() (*Config, error) {
-	config := new(Config)
+	config := &Config{
+		PathBase:                         "",
+		ConnectionString:                 "",
+		OutputFolder:                     "",
+		ProcessorsFolderName:             "processors",
+		ModelsFolderName:                 "models",
+		GenerateModels:                   false,
+		GenerateProcessors:               false,
+		GenerateProcessorsForVoidReturns: false,
+		DbContextTemplate:                "",
+		ModelTemplate:                    "",
+		ProcessorTemplate:                "",
+		GeneratedFileExtension:           "",
+		GeneratedFileCase:                "",
+		Debug:                            false,
+		ClearOutputFolder:                false,
+		Generate:                         nil,
+		Mappings:                         nil,
+	}
 
 	err := viper.Unmarshal(config)
 	if err != nil {

src/config.go

@@ -10,13 +10,13 @@ func getTemplateFunctions() template.FuncMap {
 		"inc": func(n int) int {
 			return n + 1
 		},
-		"uCamel": func(s string) string {
+		"pascalCased": func(s string) string {
 			return strcase.UpperCamelCase(s)
 		},
-		"lCamel": func(s string) string {
+		"camelCased": func(s string) string {
 			return strcase.LowerCamelCase(s)
 		},
-		"snake": func(s string) string {
+		"snakeCased": func(s string) string {
 			return strcase.SnakeCase(s)
 		},
 	}

src/generator-functions.go

@@ -14,9 +14,6 @@ import (
 	"text/template"
 )
 
-const processorsFolder = "processors"
-const modelsFolder = "models"
-
 var ValidCaseNormalized = []string{"snakecase", "camelcase", "pascalcase"}
 
 func Generate(routines []Routine, config *Config) error {
@@ -64,19 +61,20 @@ func Generate(routines []Routine, config *Config) error {
 }
 
 func generateDbContext(routines []Routine, hashMap *map[string]string, config *Config) error {
-	dbcontextTemplate, err := parseTemplates(config.DbContextTemplate)
+	dbContextTemplate, err := parseTemplate(config.DbContextTemplate)
 	if err != nil {
 		return fmt.Errorf("loading dbContext template: %s", err)
 	}
 
 	data := &DbContextData{
+		Config:    config,
 		Functions: routines,
 	}
 
 	filename := changeCase("DbContext"+config.GeneratedFileExtension, config.GeneratedFileCase)
 	fp := filepath.Join(config.OutputFolder, filename)
 
-	changed, err := generateFile(data, dbcontextTemplate, fp, hashMap)
+	changed, err := generateFile(data, dbContextTemplate, fp, hashMap)
 	if err != nil {
 		return err
 	}
@@ -92,24 +90,28 @@ func generateDbContext(routines []Routine, hashMap *map[string]string, config *C
 }
 
 func generateModels(routines []Routine, hashMap *map[string]string, config *Config) error {
-
-	moduleTemplate, err := parseTemplates(config.ModelTemplate)
+	moduleTemplate, err := parseTemplate(config.ModelTemplate)
 	if err != nil {
 		return fmt.Errorf("loading module template: %s", err)
 	}
 
-	err = os.MkdirAll(filepath.Join(config.OutputFolder, modelsFolder), 0777)
+	err = os.MkdirAll(filepath.Join(config.OutputFolder, config.ModelsFolderName), 0777)
 
 	for _, routine := range routines {
 		if !routine.HasReturn {
 			continue
 		}
 
 		filename := changeCase(routine.ModelName+config.GeneratedFileExtension, config.GeneratedFileCase)
-		relPath := filepath.Join(modelsFolder, filename)
+		relPath := filepath.Join(config.ModelsFolderName, filename)
 		filePath := filepath.Join(config.OutputFolder, relPath)
 
-		changed, err := generateFile(routine, moduleTemplate, filePath, hashMap)
+		data := &ModelTemplateData{
+			Config:  config,
+			Routine: routine,
+		}
+
+		changed, err := generateFile(data, moduleTemplate, filePath, hashMap)
 		if err != nil {
 			return fmt.Errorf("generating models: %s", err)
 		}
@@ -125,12 +127,12 @@ func generateModels(routines []Routine, hashMap *map[string]string, config *Conf
 }
 
 func generateProcessors(routines []Routine, hashMap *map[string]string, config *Config) error {
-	processorTemplate, err := parseTemplates(config.ProcessorTemplate)
+	processorTemplate, err := parseTemplate(config.ProcessorTemplate)
 	if err != nil {
 		return fmt.Errorf("loading processor template: %s", err)
 	}
 
-	err = os.MkdirAll(filepath.Join(config.OutputFolder, processorsFolder), 0777)
+	err = os.MkdirAll(filepath.Join(config.OutputFolder, config.ProcessorsFolderName), 0777)
 	if err != nil {
 		return fmt.Errorf("creating processor output folder: %s", err)
 	}
@@ -143,10 +145,15 @@ func generateProcessors(routines []Routine, hashMap *map[string]string, config *
 		}
 
 		filename := changeCase(routine.ProcessorName+config.GeneratedFileExtension, config.GeneratedFileCase)
-		relPath := filepath.Join(processorsFolder, filename)
+		relPath := filepath.Join(config.ProcessorsFolderName, filename)
 		filePath := filepath.Join(config.OutputFolder, relPath)
 
-		changed, err := generateFile(routine, processorTemplate, filePath, hashMap)
+		data := &ProcessorTemplateData{
+			Config:  config,
+			Routine: routine,
+		}
+
+		changed, err := generateFile(data, processorTemplate, filePath, hashMap)
 		if err != nil {
 			return fmt.Errorf("generating processor %s: %s", routine.ProcessorName, err)
 		}
@@ -161,7 +168,7 @@ func generateProcessors(routines []Routine, hashMap *map[string]string, config *
 	return nil
 }
 
-func parseTemplates(templatePath string) (*template.Template, error) {
+func parseTemplate(templatePath string) (*template.Template, error) {
 	if !common.PathExists(templatePath) {
 		return nil, fmt.Errorf("template file %s does not exist", templatePath)
 

src/generator.go

@@ -25,5 +25,16 @@ type Routine struct {
 }
 
 type DbContextData struct {
+	Config    *Config
 	Functions []Routine
 }
+
+type ProcessorTemplateData struct {
+	Config  *Config
+	Routine Routine
+}
+
+type ModelTemplateData struct {
+	Config  *Config
+	Routine Routine
+}