feat(gen): fix gen route and always add http.Request in logic file (#159)

Author: jaronnie

.template/frame/api/app/internal/svc/service_context.go.tpl

@@ -20,3 +20,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	}
 	return sc
 }
+
+func (sc *ServiceContext) MustGetConfig() config.Config {
+	return sc.Config
+}

docs/src/faq/upgrade.md

@@ -0,0 +1,20 @@
+---
+title: 版本升级兼容
+icon: fluent-mdl2:upgrade-analysis
+star: true
+order: 2
+category: faq
+tag:
+  - faq
+---
+
+## from old to v0.30.0+
+
+add `MustGetConfig` method for `ServiceContext` return `config.Config`
+
+```go
+func (sc *ServiceContext) MustGetConfig() config.Config {
+	return sc.Config
+}
+```
+

internal/gen/genapi/patch_logic.go

@@ -79,7 +79,7 @@ func (ja *JzeroApi) patchLogic(file LogicFile) error {
 
 	if pathx.FileExists(newFilePath) {
 		_ = os.Remove(file.Path)
-		return nil
+		file.Path = newFilePath
 	}
 
 	fset := token.NewFileSet()

internal/gen/genapi/types.go

@@ -211,21 +211,12 @@ func (ja *JzeroApi) changeLogicTypes(f *ast.File, fset *token.FileSet, file Logi
 								}
 							}
 						}
-						if structType != nil && requestType == nil && !lo.Contains(names, "r") {
+						if structType != nil && !lo.Contains(names, "r") {
 							newField := &ast.Field{
 								Names: []*ast.Ident{ast.NewIdent("r")},
 								Type:  &ast.StarExpr{X: ast.NewIdent("http.Request")},
 							}
 							structType.Fields.List = append(structType.Fields.List, newField)
-						} else if structType != nil && requestType != nil && lo.Contains(names, "r") {
-							for i, v := range structType.Fields.List {
-								if len(v.Names) > 0 {
-									if v.Names[0].Name == "r" {
-										// 删除这个元素
-										structType.Fields.List = append(structType.Fields.List[:i], structType.Fields.List[i+1:]...)
-									}
-								}
-							}
 						}
 
 						if structType != nil && responseType == nil && !lo.Contains(names, "w") {
@@ -259,12 +250,12 @@ func (ja *JzeroApi) changeLogicTypes(f *ast.File, fset *token.FileSet, file Logi
 						paramNames = append(paramNames, name.Name)
 					}
 				}
-				if requestType == nil && !lo.Contains(paramNames, "r") {
+				if !lo.Contains(paramNames, "r") {
 					fn.Type.Params.List = append(fn.Type.Params.List, &ast.Field{
 						Names: []*ast.Ident{ast.NewIdent("r")},
 						Type:  &ast.StarExpr{X: ast.NewIdent("http.Request")},
 					})
-				} else if requestType != nil && lo.Contains(paramNames, "r") {
+				} else if lo.Contains(paramNames, "r") {
 					for i, v := range fn.Type.Params.List {
 						if len(v.Names) > 0 {
 							if v.Names[0].Name == "r" {
@@ -311,24 +302,13 @@ func (ja *JzeroApi) changeLogicTypes(f *ast.File, fset *token.FileSet, file Logi
 											}
 										}
 
-										if requestType == nil && !hasR {
+										if !hasR {
 											// Add new field
 											newField := &ast.KeyValueExpr{
 												Key:   ast.NewIdent("r"),
 												Value: ast.NewIdent("r"), // or any default value you want
 											}
 											compositeLit.Elts = append(compositeLit.Elts, newField)
-										} else if requestType != nil && hasR {
-											for i, v := range compositeLit.Elts {
-												if kv, ok := v.(*ast.KeyValueExpr); ok {
-													if key, ok := kv.Key.(*ast.Ident); ok {
-														if key.Name == "r" {
-															// 删除这个元素
-															compositeLit.Elts = append(compositeLit.Elts[:i], compositeLit.Elts[i+1:]...)
-														}
-													}
-												}
-											}
 										}
 
 										if responseType == nil && !hasW {
@@ -361,11 +341,7 @@ func (ja *JzeroApi) changeLogicTypes(f *ast.File, fset *token.FileSet, file Logi
 		})
 
 		// check `net/http` import
-		if requestType == nil || responseType == nil {
-			astutil.AddImport(fset, f, "net/http")
-		} else if requestType != nil && responseType != nil {
-			astutil.DeleteImport(fset, f, "net/http")
-		}
+		astutil.AddImport(fset, f, "net/http")
 	}
 	return nil
 }

pkg/gogen/gogen.go

@@ -136,14 +136,14 @@ func genRoutesConfig(dir, rootPkg string, cfg *config.Config, api *spec.ApiSpec)
 
 		var jwt string
 		if g.jwtEnabled {
-			jwt = fmt.Sprintf("\n rest.WithJwt(serverCtx.Config.%s.AccessSecret),", g.authName)
+			jwt = fmt.Sprintf("\n rest.WithJwt(serverCtx.MustGetConfig().%s.AccessSecret),", g.authName)
 		}
 		if len(g.jwtTrans) > 0 {
-			jwt = jwt + fmt.Sprintf("\n rest.WithJwtTransition(serverCtx.Config.%s.PrevSecret,serverCtx.Config.%s.Secret),", g.jwtTrans, g.jwtTrans)
+			jwt = jwt + fmt.Sprintf("\n rest.WithJwtTransition(serverCtx.MustGetConfig().%s.PrevSecret,serverCtx.MustGetConfig().%s.Secret),", g.jwtTrans, g.jwtTrans)
 		}
 		var signature, prefix string
 		if g.signatureEnabled {
-			signature = "\n rest.WithSignature(serverCtx.Config.Signature),"
+			signature = "\n rest.WithSignature(serverCtx.MustGetConfig().Signature),"
 		}
 		if len(g.prefix) > 0 {
 			prefix = fmt.Sprintf(`