feat: support the .yaml ext for flow files

Author: jahvon

internal/filesystem/executables.go

@@ -116,7 +116,7 @@ func findFlowFiles(logger io.Logger, workspaceCfg *workspace.Workspace) ([]strin
 				return filepath.SkipDir
 			}
 
-			if filepath.Ext(entry.Name()) == executable.FlowFileExt {
+			if executable.HasFlowFileExt(entry.Name()) {
 				cfgPaths = append(cfgPaths, path)
 			}
 		}

internal/templates/templates.go

@@ -36,7 +36,7 @@ func ProcessTemplate(
 		flowfileName = fmt.Sprintf("executables_%s", time.Now().Format("20060102150405"))
 	}
 	flowfileName = strings.ReplaceAll(strings.ToLower(flowfileName), " ", "_")
-	if !strings.HasSuffix(flowfileName, executable.FlowFileExt) {
+	if !executable.HasFlowFileExt(flowfileName) {
 		flowfileName += executable.FlowFileExt
 	}
 

types/executable/executables_test.go

@@ -309,3 +309,22 @@ var _ = Describe("ExecutableList", func() {
 		})
 	})
 })
+
+var _ = DescribeTable("HasFlowFileExt", func(file string, expected bool) {
+	Expect(executable.HasFlowFileExt(file)).To(Equal(expected))
+},
+	Entry("ends with .flow", "development.flow", true),
+	Entry("ends with .flow.yaml", "development.flow.yaml", true),
+	Entry("ends with .flow.yml", "development.flow.yml", true),
+	Entry("ends with something else", "development.txt", false),
+)
+
+var _ = DescribeTable("HasFlowFileTemplateExt", func(file string, expected bool) {
+	Expect(executable.HasFlowFileTemplateExt(file)).To(Equal(expected))
+},
+	Entry("ends with .flow.tmpl", "development.flow.tmpl", true),
+	Entry("ends with .flow.tmpl.yaml", "development.flow.tmpl.yaml", true),
+	Entry("ends with .flow.tmpl.yml", "development.flow.tmpl.yml", true),
+	Entry("ends with .flow", "development.flow", false),
+	Entry("ends with something else", "development.flow.txt", false),
+)

types/executable/flowfile.go

@@ -2,6 +2,7 @@ package executable
 
 import (
 	"fmt"
+	"regexp"
 
 	"gopkg.in/yaml.v3"
 
@@ -12,6 +13,8 @@ import (
 
 const FlowFileExt = ".flow"
 
+var FlowFileExtRegex = regexp.MustCompile(fmt.Sprintf(`%s(\.yaml|\.yml)?`, regexp.QuoteMeta(FlowFileExt)))
+
 type FlowFileList []*FlowFile
 
 func (f *FlowFile) SetContext(workspaceName, workspacePath, configPath string) {
@@ -72,3 +75,7 @@ func (l *FlowFileList) FilterByTag(tag string) FlowFileList {
 	}
 	return filteredCfgs
 }
+
+func HasFlowFileExt(file string) bool {
+	return FlowFileExtRegex.MatchString(file)
+}

types/executable/template.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"path/filepath"
+	"regexp"
 	"strings"
 
 	"github.com/flowexec/tuikit/types"
@@ -15,6 +16,8 @@ import (
 
 const FlowFileTemplateExt = ".flow.tmpl"
 
+var FlowFileTemplateExtRegex = regexp.MustCompile(fmt.Sprintf(`%s(\.yaml|\.yml)?`, regexp.QuoteMeta(FlowFileTemplateExt)))
+
 type TemplateList []*Template
 
 func (f *Field) Set(value string) {
@@ -75,10 +78,10 @@ func (t *Template) SetContext(name, location string) {
 	if name == "" {
 		fn := filepath.Base(location)
 		switch {
-		case strings.HasSuffix(fn, FlowFileTemplateExt):
-			fn = strings.TrimSuffix(fn, FlowFileTemplateExt)
-		case strings.HasSuffix(fn, FlowFileExt):
-			fn = strings.TrimSuffix(fn, FlowFileExt)
+		case HasFlowFileTemplateExt(fn):
+			fn, _, _ = strings.Cut(fn, FlowFileTemplateExt)
+		case HasFlowFileExt(fn):
+			fn, _, _ = strings.Cut(fn, FlowFileExt)
 		default:
 			fn = strings.TrimSuffix(fn, filepath.Ext(fn))
 		}
@@ -164,3 +167,7 @@ func (t TemplateList) Find(name string) *Template {
 	}
 	return nil
 }
+
+func HasFlowFileTemplateExt(file string) bool {
+	return FlowFileTemplateExtRegex.MatchString(file)
+}