init

Author: otk-final

cmd/init.go

@@ -3,14 +3,22 @@ package cmd
 import (
 	"codegen/internal"
 	"codegen/lang"
+	"codegen/tmpl"
 	"encoding/json"
 	"github.com/spf13/cobra"
 	"os"
-	"path"
 	"strings"
 )
 
-var initArgs = &internal.Args{}
+var initArgs = &internal.Args{
+	Name:         "swagger",
+	Endpoint:     "http://localhost:8080/v3/api-docs",
+	Output:       "src/api.ts",
+	ClientOutput: "src/client.ts",
+	Lang:         "",
+	Style:        "",
+	Version:      "",
+}
 
 func init() {
 	//init
@@ -51,13 +59,15 @@ var initCmd = &cobra.Command{
 				"structPackage": "",
 			},
 			Generics: &internal.Generics{
-				Enable:      false,
-				Expressions: map[string][]string{},
+				Enable: false,
+				Unfold: false,
+				Expressions: map[string][]string{
+					"ApiResult": {"data"},
+				},
 			},
 		}
 		//当前执行目录
-		pwd, _ := os.Getwd()
-		envFile := path.Join(pwd, defaultEnvFileName)
+		envFile := tmpl.PwdJoinPath(defaultEnvFileName)
 
 		envs := make([]*internal.Env, 0)
 		envs = append(envs, defaultEnv)

cmd/reload.go

@@ -2,12 +2,12 @@ package cmd
 
 import (
 	"codegen/internal"
+	"codegen/tmpl"
 	"encoding/json"
 	"fmt"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 	"os"
-	"path"
 	"strings"
 )
 
@@ -30,9 +30,9 @@ var reloadCmd = &cobra.Command{
 
 		//当前执行目录
 		if envFile == "" {
-			pwd, _ := os.Getwd()
-			envFile = path.Join(pwd, defaultEnvFileName)
+			envFile = defaultEnvFileName
 		}
+		envFile = tmpl.PwdJoinPath(envFile)
 
 		data, err := os.ReadFile(envFile)
 		if err != nil {

internal/cmd.go

@@ -26,11 +26,12 @@ type Args struct {
 
 type Env struct {
 	*Args
-	Ignore    []string          `json:"ignore"`
-	Filter    []string          `json:"filter"`
-	Alias     Alias             `json:"alias"`
-	Variables map[string]string `json:"variables"`
-	Generics  *Generics         `json:"generics"`
+	Ignore                []string          `json:"ignore"`
+	Filter                []string          `json:"filter"`
+	Alias                 Alias             `json:"alias"`
+	Variables             map[string]string `json:"variables"`
+	Generics              *Generics         `json:"generics"`
+	RepeatableOperationId bool              `json:"repeatable_operation_id"`
 }
 
 type Alias struct {
@@ -257,7 +258,6 @@ func (e *Executor) Run(cmd *Args) error {
 				return cmp.Compare(a.Name, b.Name)
 			})
 
-			//统一累计到参数集
 			if path.Request != nil {
 				path.Parameters = append(path.Parameters, &tmpl.Parameter{
 					Name:  "body",
@@ -279,6 +279,16 @@ func (e *Executor) Run(cmd *Args) error {
 			if path.Response != nil {
 				path.Response = findType(path.Response)
 			}
+
+			//方法名 不同Tag下 方法重名下容易生成 add_1,update_39
+			path.Name = lo.TernaryF(e.env.RepeatableOperationId, func() string {
+				return strings.FieldsFunc(path.Name, func(r rune) bool {
+					return r == '_' || r == '-'
+				})[0]
+			}, func() string {
+				return path.Name
+			})
+
 		}
 
 		api.Paths = paths

internal/writer.go

@@ -77,6 +77,7 @@ func (w *stdWriter) api(output string, name string, engine *template.Template) e
 
 	}
 
+	output = tmpl.PwdJoinPath(output)
 	dir := path.Dir(output)
 	_ = os.MkdirAll(dir, os.ModePerm)
 

tmpl/template.go

@@ -3,6 +3,8 @@ package tmpl
 import (
 	_ "embed"
 	"errors"
+	"os"
+	"path/filepath"
 	"text/template"
 )
 
@@ -35,7 +37,7 @@ func NewEngine(lang string, style string) (*template.Template, error) {
 	tp = tp.Funcs(tmplFunc)
 
 	if style != "" {
-		return tp.ParseFiles(style)
+		return tp.ParseFiles(PwdJoinPath(style))
 	}
 
 	switch lang {
@@ -55,3 +57,11 @@ func NewEngine(lang string, style string) (*template.Template, error) {
 		return nil, errors.New("invalid language")
 	}
 }
+
+func PwdJoinPath(name string) string {
+	if filepath.IsAbs(name) {
+		return filepath.Clean(name)
+	}
+	pwd, _ := os.Getwd()
+	return filepath.Join(pwd, name)
+}