update file suffix

Author: snowmerak

internal/executor/generate/bean.go

@@ -105,7 +105,7 @@ func BeanContainer(root string) error {
 	if err := os.MkdirAll(genPath, os.ModePerm); err != nil {
 		return err
 	}
-	f, err := os.Create(filepath.Join(genPath, "bean.container.go"))
+	f, err := os.Create(MakeGeneratedFileName(genPath, "bean", "container"))
 	if err != nil {
 		return err
 	}
@@ -251,7 +251,7 @@ func Bean(path string, beans []check.Bean) error {
 	}
 
 	{
-		ifceFilePath := filepath.Join(dir, "bean.interface.go")
+		ifceFilePath := MakeGeneratedFileName(dir, "bean", "interface")
 		ifcePkg := &model.Package{
 			Name:       packageName,
 			Interfaces: beanInterfaceValue,
@@ -269,7 +269,7 @@ func Bean(path string, beans []check.Bean) error {
 	for _, bean := range beans {
 		for _, alias := range bean.Aliases {
 			alias = strings.ToUpper(alias[:1]) + alias[1:]
-			filePath := filepath.Join(dir, strings.ToLower(alias)+".bean.go")
+			filePath := MakeGeneratedFileName(dir, strings.ToLower(alias), "bean")
 			typ := bean.Name
 			switch bean.Type {
 			case check.TypeStruct:

internal/executor/generate/errface.go

@@ -20,7 +20,7 @@ func ErrFace(root string, getters []check.Getter) error {
 		if err := func() error {
 			for structName, structData := range getter.StructMap {
 				if err := func() error {
-					f, err := os.Create(filepath.Join(dir, getter.PackageName+"."+structName+".errface.go"))
+					f, err := os.Create(MakeGeneratedFileName(dir, structName, "errface"))
 					if err != nil {
 						return err
 					}

internal/executor/generate/getter.go

@@ -14,7 +14,7 @@ func Getter(path string, getter check.Getter) error {
 	dir := filepath.Dir(path)
 
 	makeFilename := func(pkgName string, structName string) string {
-		return filepath.Join(dir, fmt.Sprintf("%s.%s.getter.go", pkgName, structName))
+		return filepath.Join(MakeGeneratedFileName(dir, pkgName, structName, "getter"))
 	}
 
 	fileMap := map[string]*model.Package{}

internal/executor/generate/model.go

@@ -154,7 +154,7 @@ func ConvertJson(path string) error {
 		return err
 	}
 
-	f, err := os.Create(path + ".go")
+	f, err := os.Create(path + "." + Suffix)
 	if err != nil {
 		return err
 	}
@@ -316,7 +316,7 @@ func ConvertYaml(path string) error {
 		return err
 	}
 
-	f, err := os.Create(path + ".go")
+	f, err := os.Create(path + "." + Suffix)
 	if err != nil {
 		return err
 	}

internal/executor/generate/option.go

@@ -143,7 +143,7 @@ func Option(path string, opts []string) error {
 				return err
 			}
 
-			f, err := os.Create(filepath.Join(dir, strings.ToLower(typeName)+".option.go"))
+			f, err := os.Create(MakeGeneratedFileName(dir, strings.ToLower(typeName), "option"))
 			if err != nil {
 				return err
 			}

internal/executor/generate/optional.go

@@ -15,7 +15,7 @@ func OptionalParameter(path string, opts []check.OptionalParameter) error {
 
 	for _, opt := range opts {
 		err := func() error {
-			f, err := os.Create(filepath.Join(dir, strings.ToLower(opt.Name)+".parameter.go"))
+			f, err := os.Create(MakeGeneratedFileName(dir, strings.ToLower(opt.Name), "parameter"))
 			if err != nil {
 				return err
 			}

internal/executor/generate/pool.go

@@ -16,7 +16,7 @@ func Pool(path string, pools []check.Pool) error {
 	for _, pool := range pools {
 		alias := strings.ToUpper(pool.Alias[:1]) + pool.Alias[1:]
 		lowerAlias := strings.ToLower(alias)
-		filePath := filepath.Join(dir, lowerAlias+".pool.go")
+		filePath := MakeGeneratedFileName(dir, lowerAlias, "pool")
 
 		typ := pool.TypeName
 		switch pool.Type {

internal/executor/generate/stream.go

@@ -11,7 +11,7 @@ import (
 
 func Stream(path string, streams []check.Stream) error {
 	for _, stream := range streams {
-		fileName := MakeGeneratedFileName(path, stream.StructName, "stream")
+		fileName := MakeGeneratedFileName(path, strings.ToLower(stream.StructName), "stream")
 
 		pkg := &model.Package{
 			Name:    stream.PackageName,

internal/executor/generate/suffix.go

@@ -7,7 +7,6 @@ import (
 
 const Suffix = "jet.go"
 
-func MakeGeneratedFileName(path string, elem ...string) string {
-	dir := filepath.Dir(path)
+func MakeGeneratedFileName(dir string, elem ...string) string {
 	return filepath.Join(dir, strings.Join(elem, ".")+"."+Suffix)
 }