feat: 重构 pkg/ast/provider 模块,优化代码组织逻辑和功能实现
## 主要改进 ### 架构重构 - 将单体 provider.go 拆分为多个专门的模块文件 - 实现了清晰的职责分离和模块化设计 - 遵循 SOLID 原则,提高代码可维护性 ### 新增功能 - **验证规则系统**: 实现了完整的 provider 验证框架 - **报告生成器**: 支持多种格式的验证报告 (JSON/HTML/Markdown/Text) - **解析器优化**: 重新设计了解析流程,提高性能和可扩展性 - **错误处理**: 增强了错误处理和诊断能力 ### 修复关键 Bug - 修复 @provider(job) 注解缺失 __job 注入参数的问题 - 统一了 job 和 cronjob 模式的处理逻辑 - 确保了 provider 生成的正确性和一致性 ### 代码质量提升 - 添加了完整的测试套件 - 引入了 golangci-lint 代码质量检查 - 优化了代码格式和结构 - 增加了详细的文档和规范 ### 文件结构优化 ``` pkg/ast/provider/ ├── types.go # 类型定义 ├── parser.go # 解析器实现 ├── validator.go # 验证规则 ├── report_generator.go # 报告生成 ├── renderer.go # 渲染器 ├── comment_parser.go # 注解解析 ├── modes.go # 模式定义 ├── errors.go # 错误处理 └── validator_test.go # 测试文件 ``` ### 兼容性 - 保持向后兼容性 - 支持现有的所有 provider 模式 - 优化了 API 设计和用户体验 This completes the implementation of T025-T029 tasks following TDD principles, including validation rules implementation and critical bug fixes.
This commit is contained in:
@@ -40,25 +40,6 @@ var scalarTypes = []string{
|
||||
"complex128",
|
||||
}
|
||||
|
||||
type InjectParam struct {
|
||||
Star string
|
||||
Type string
|
||||
Package string
|
||||
PackageAlias string
|
||||
}
|
||||
type Provider struct {
|
||||
StructName string
|
||||
ReturnType string
|
||||
Mode string
|
||||
ProviderGroup string
|
||||
GrpcRegisterFunc string
|
||||
NeedPrepareFunc bool
|
||||
InjectParams map[string]InjectParam
|
||||
Imports map[string]string
|
||||
PkgName string
|
||||
ProviderFile string
|
||||
}
|
||||
|
||||
func atomPackage(suffix string) string {
|
||||
root := "go.ipao.vip/atom"
|
||||
if suffix != "" {
|
||||
@@ -115,6 +96,7 @@ func Parse(source string) []Provider {
|
||||
provider := Provider{
|
||||
InjectParams: make(map[string]InjectParam),
|
||||
Imports: make(map[string]string),
|
||||
Mode: ProviderModeBasic, // Default mode
|
||||
}
|
||||
|
||||
decl, ok := decl.(*ast.GenDecl)
|
||||
@@ -260,7 +242,7 @@ func Parse(source string) []Provider {
|
||||
provider.ProviderFile = filepath.Join(filepath.Dir(source), "provider.gen.go")
|
||||
|
||||
if providerDoc.Mode == "grpc" {
|
||||
provider.Mode = "grpc"
|
||||
provider.Mode = ProviderModeGrpc
|
||||
|
||||
modePkg := gomod.GetModuleName() + "/providers/grpc"
|
||||
|
||||
@@ -281,7 +263,7 @@ func Parse(source string) []Provider {
|
||||
}
|
||||
|
||||
if providerDoc.Mode == "event" {
|
||||
provider.Mode = "event"
|
||||
provider.Mode = ProviderModeEvent
|
||||
|
||||
modePkg := gomod.GetModuleName() + "/providers/event"
|
||||
|
||||
@@ -300,8 +282,22 @@ func Parse(source string) []Provider {
|
||||
}
|
||||
}
|
||||
|
||||
if providerDoc.Mode == "job" || providerDoc.Mode == "cronjob" {
|
||||
provider.Mode = providerDoc.Mode
|
||||
if providerDoc.Mode == "job" {
|
||||
provider.Mode = ProviderModeJob
|
||||
|
||||
modePkg := gomod.GetModuleName() + "/providers/job"
|
||||
|
||||
provider.Imports["github.com/riverqueue/river"] = ""
|
||||
provider.Imports[modePkg] = ""
|
||||
|
||||
provider.InjectParams["__job"] = InjectParam{
|
||||
Star: "*",
|
||||
Type: "Job",
|
||||
Package: modePkg,
|
||||
PackageAlias: "job",
|
||||
}
|
||||
} else if providerDoc.Mode == "cronjob" {
|
||||
provider.Mode = ProviderModeCronJob
|
||||
|
||||
modePkg := gomod.GetModuleName() + "/providers/job"
|
||||
|
||||
@@ -322,7 +318,7 @@ func Parse(source string) []Provider {
|
||||
}
|
||||
|
||||
if providerDoc.Mode == "model" {
|
||||
provider.Mode = "model"
|
||||
provider.Mode = ProviderModeModel
|
||||
|
||||
provider.ProviderGroup = "atom.GroupInitial"
|
||||
provider.ReturnType = "contracts.Initial"
|
||||
@@ -336,14 +332,6 @@ func Parse(source string) []Provider {
|
||||
return providers
|
||||
}
|
||||
|
||||
// @provider(mode):[except|only] [returnType] [group]
|
||||
type ProviderDescribe struct {
|
||||
IsOnly bool
|
||||
Mode string // job
|
||||
ReturnType string
|
||||
Group string
|
||||
}
|
||||
|
||||
func (p ProviderDescribe) String() {
|
||||
// log.Infof("[%s] %s => ONLY: %+v, EXCEPT: %+v, Type: %s, Group: %s", source, declType.Name.Name, onlyMode, exceptMode, provider.ReturnType, provider.ProviderGroup)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user