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:
@@ -1,14 +1,14 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
apg "go.ipao.vip/atomctl/v2/pkg/postgres"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
|
||||
"go.ipao.vip/gen"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
"github.com/pkg/errors"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
apg "go.ipao.vip/atomctl/v2/pkg/postgres"
|
||||
"go.ipao.vip/atomctl/v2/pkg/utils/gomod"
|
||||
"go.ipao.vip/gen"
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func CommandGenModel(root *cobra.Command) {
|
||||
@@ -29,38 +29,38 @@ func CommandGenModel(root *cobra.Command) {
|
||||
|
||||
示例:
|
||||
atomctl gen -c config.toml model`,
|
||||
RunE: commandGenModelE,
|
||||
RunE: commandGenModelE,
|
||||
}
|
||||
|
||||
root.AddCommand(cmd)
|
||||
}
|
||||
|
||||
func commandGenModelE(cmd *cobra.Command, args []string) error {
|
||||
if err := gomod.Parse("go.mod"); err != nil {
|
||||
return errors.Wrap(err, "parse go.mod")
|
||||
}
|
||||
if err := gomod.Parse("go.mod"); err != nil {
|
||||
return errors.Wrap(err, "parse go.mod")
|
||||
}
|
||||
|
||||
cfgFile := cmd.Flag("config").Value.String()
|
||||
if cfgFile == "" {
|
||||
cfgFile = "config.toml"
|
||||
}
|
||||
cfgFile := cmd.Flag("config").Value.String()
|
||||
if cfgFile == "" {
|
||||
cfgFile = "config.toml"
|
||||
}
|
||||
|
||||
sqlDB, conf, err := apg.GetDB(cfgFile)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "load database config")
|
||||
}
|
||||
defer sqlDB.Close()
|
||||
sqlDB, conf, err := apg.GetDB(cfgFile)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "load database config")
|
||||
}
|
||||
defer sqlDB.Close()
|
||||
|
||||
dsn := conf.DSN()
|
||||
log.Infof("parsed DSN: %s (schema=%s)", dsn, conf.Schema)
|
||||
dsn := conf.DSN()
|
||||
log.Infof("parsed DSN: %s (schema=%s)", dsn, conf.Schema)
|
||||
|
||||
db, err := gorm.Open(postgres.New(postgres.Config{DSN: dsn}))
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "open database with dsn: %s", dsn)
|
||||
}
|
||||
db, err := gorm.Open(postgres.New(postgres.Config{DSN: dsn}))
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "open database with dsn: %s", dsn)
|
||||
}
|
||||
|
||||
// 默认同包同目录生成到 ./database
|
||||
gen.GenerateWithDefault(db, "./database/.transform.yaml")
|
||||
|
||||
return nil
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user