feat(generators): generate option-validator-auto (#191)

ref(generators): optimise source code container reportall/verify  (#191)

ref(generators): generate top level code (#191)

.golangci.yml

@@ -58,4 +58,8 @@ linters:
     - wsl
 
 run:
+  skip-dirs:
+    - /generators/gola/templates
+  skip-files:
+    - .*\.tmpl$
   issues-exit-code: 1

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
   "cSpell.words": [
+    "beezledub",
     "bindnative",
     "bodyclose",
     "colors",
@@ -11,6 +12,7 @@
     "errcheck",
     "exportloopref",
     "extendio",
+    "faydeaudeau",
     "fieldalignment",
     "foobar",
     "goconst",
@@ -32,6 +34,7 @@
     "ipnet",
     "linters",
     "nakedret",
+    "nolint",
     "nolintlint",
     "paramset",
     "prealloc",
@@ -45,11 +48,15 @@
     "stylecheck",
     "templatise",
     "thelper",
+    "tmpl",
     "tparallel",
     "unconvert",
     "unparam",
     "vactive",
     "Validatable",
     "varcheck"
-  ]
+  ],
+  "files.associations": {
+    "**/*.tmpl": "go"
+  }
 }

Taskfile.yml

@@ -76,12 +76,17 @@ tasks:
   ov-gen-t:
     cmds:
       - mkdir -p {{.GEN_TEST_OUTPUT_DIR}}
-      - cobrass-gen -test -cwd ./
+      - cobrass-gen -test -cwd ./ -templates generators/gola -write
+      - go fmt ./generators/gola/out/assistant/*.go
 
   ov-gen:
     cmds:
       - go generate ./...
 
+  clear-gen-t:
+    cmds:
+      - rm -f ./generators/gola/out/assistant/*auto*.go
+
   # === build/deploy code generator ===========================
 
   b-gen-linux:
@@ -97,7 +102,7 @@ tasks:
       - GOOS={{.TARGET_OS}} GOARCH={{.TARGET_ARCH}} go build -o {{.DIST_DIR}}/{{.TARGET_OS}}/{{.GEN_BINARY_NAME}} -v {{.APPLICATION_ENTRY}}
 
     sources:
-      - ./generators/gola/*.go
+      - ./generators/gola/**/*.go
 
     generates:
       - "{{.DIST_DIR}}/{{.TARGET_OS}}/{{.GEN_BINARY_NAME}}"

generate.go

@@ -1,3 +1,3 @@
 package cobrass
 
-//go:generate cobrass-gen -cwd ./
+//go:generate cobrass-gen -cwd ./ -templates gola/templates/

generators/gola/gen/main.go

@@ -17,11 +17,12 @@ const (
 )
 
 var (
-	testFlag           = flag.Bool("test", false, "generate code in test location?")
-	cwdFlag            = flag.String("cwd", "", "current working directory")
-	testPath           = filepath.Join("generators", "gola", "out", "assistant")
-	sourcePath         = filepath.Join("src", "assistant")
-	outputPathNotFound = "Output path '%v', not found"
+	testFlag         = flag.Bool("test", false, "generate code in test location?")
+	cwdFlag          = flag.String("cwd", "", "current working directory")
+	templatesSubPath = flag.String("templates", "", "templates sub path")
+	write            = flag.Bool("write", false, "write generated code?")
+	testPath         = filepath.Join("generators", "gola", "out", "assistant")
+	sourcePath       = filepath.Join("src", "assistant")
 )
 
 func Usage() {
@@ -42,9 +43,6 @@ func fail(reason string, callback ...func()) {
 	os.Exit(outputPathNotFoundExitCode)
 }
 
-// ???
-// https://askgolang.com/how-to-get-current-directory-in-golang/
-
 func main() {
 	flag.Usage = Usage
 	flag.Parse()
@@ -58,18 +56,18 @@ func main() {
 	absolutePath, _ := filepath.Abs(*cwdFlag)
 	absolutePath = filepath.Join(absolutePath, outputPath)
 
-	if !utils.FileExists(absolutePath) {
+	if !utils.FolderExists(absolutePath) {
 		callback := func() {
 			fmt.Printf("💥 --->      CWD: '%v' \n", *cwdFlag)
 			fmt.Printf("💥 --->   OUTPUT: '%v' \n", outputPath)
 			fmt.Printf("💥 ---> RESOLVED: '%v' \n", absolutePath)
 		}
-		fail(fmt.Sprintf(outputPathNotFound, absolutePath), callback)
+		fail(fmt.Sprintf("Output path '%v', not found", absolutePath), callback)
 
 		return
 	}
 
-	sourceCode := gola.NewSourceCodeContainer()
+	sourceCode := gola.NewSourceCodeContainer(absolutePath, *templatesSubPath)
 	mode := lo.Ternary(*testFlag, "🧪 Test", "🎁 Source")
 
 	fmt.Printf("☑️ --->      CWD: '%v' \n", *cwdFlag)
@@ -78,12 +76,12 @@ func main() {
 	fmt.Printf("---> 🐲 cobrass generator (%v, to: %v)\n", mode, absolutePath)
 
 	if !*testFlag {
-		if sourceCode.AnyMissing(absolutePath) {
-			sourceCode.Verify(absolutePath, func(entry *gola.SourceCodeData) {
-				exists := entry.Exists(absolutePath)
+		if sourceCode.AnyMissing() {
+			sourceCode.Verify(func(entry *gola.SourceCodeData) {
+				exists := entry.Exists()
 				indicator := lo.Ternary(exists, "✔️", "❌")
 				status := lo.Ternary(exists, "exists", "missing")
-				path := entry.FullPath(absolutePath)
+				path := entry.FullPath()
 				message := fmt.Sprintf("%v source file: '%v' %v", indicator, path, status)
 
 				fmt.Printf("%v\n", message)
@@ -93,17 +91,7 @@ func main() {
 		}
 	}
 
-	sourceCode.Generator().Run()
-
-	logicalEnum := gola.LogicalType{
-		TypeName:           "Enum",
-		GoType:             "string",
-		DisplayType:        "enum",
-		UnderlyingTypeName: "String",
-		FlagName:           "Format",
-		Short:              "f",
-		Def:                "xml",
+	if err := sourceCode.Generator(*write).Run(); err != nil {
+		fail(err.Error())
 	}
-
-	fmt.Printf("---> 🐲 cobrass generator (enum: %+v)\n", logicalEnum)
 }

generators/gola/gola-defs.go

@@ -0,0 +1,6 @@
+package gola
+
+type executionInfo struct {
+	Spec      *TypeSpec
+	Operators Operators
+}

generators/gola/gomega-matchers_test.go

@@ -28,7 +28,7 @@ func (m *AreAllSourceCodeFilesPresentMatcher) Match(actual interface{}) (bool, e
 		return false, fmt.Errorf("matcher expected a SourceCodeContainer value (actual: '%v')", actual)
 	}
 
-	return !sourceCode.AnyMissing(m.directory), nil
+	return !sourceCode.AnyMissing(), nil
 }
 
 func (m *AreAllSourceCodeFilesPresentMatcher) report(
@@ -41,11 +41,11 @@ func (m *AreAllSourceCodeFilesPresentMatcher) report(
 		fmt.Sprintf("🔥 Expected all source code files %vto be present\n", not),
 	)
 
-	sourceCode.ReportAll(func(entry *gola.SourceCodeData) {
-		exists := entry.Exists(m.directory)
+	sourceCode.ForEach(func(entry *gola.SourceCodeData) {
+		exists := entry.Exists()
 		indicator := lo.Ternary(exists, "✔️", "❌")
 		status := lo.Ternary(exists, "exists", "missing")
-		path := entry.FullPath(m.directory)
+		path := entry.FullPath()
 		message := fmt.Sprintf("%v source file: '%v' %v\n", indicator, path, status)
 		builder.WriteString(message)
 	})