Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhufuyi
zhufuyi committed Jun 29, 2024
1 parent 35fcea5 commit e255beb
Show file tree
Hide file tree
Showing 17 changed files with 86 additions and 122 deletions.
10 changes: 0 additions & 10 deletions cmd/sponge/commands/generate/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,16 +569,6 @@ func sqliteDSNAdaptation(dbDriver string, dsn string) string {
return dsn
}

func removeElement(slice []string, element string) []string {
result := make([]string, 0, len(slice)-1)
for _, s := range slice {
if s != element {
result = append(result, s)
}
}
return result
}

func removeElements(slice []string, elements ...string) []string {
if len(elements) == 0 {
return slice
Expand Down
24 changes: 10 additions & 14 deletions cmd/sponge/commands/generate/dao.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Examples:
outPath: outPath,
serverName: serverName,
isEmbed: sqlArgs.IsEmbed,
isExtendedApi: sqlArgs.IsExtendedApi,
isExtendedAPI: sqlArgs.IsExtendedAPI,
suitedMonoRepo: suitedMonoRepo,
}
outPath, err = g.generateCode()
Expand All @@ -126,7 +126,7 @@ using help:
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
_ = cmd.MarkFlagRequired("db-table")
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedApi, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedAPI, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().StringVarP(&serverName, "server-name", "s", "", "server name")
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
Expand All @@ -144,7 +144,7 @@ type daoGenerator struct {
codes map[string]string
outPath string
isEmbed bool
isExtendedApi bool
isExtendedAPI bool
serverName string
suitedMonoRepo bool

Expand Down Expand Up @@ -178,16 +178,16 @@ func (g *daoGenerator) generateCode() (string, error) {
switch strings.ToLower(g.dbDriver) {
case DBDriverMysql, DBDriverPostgresql, DBDriverTidb, DBDriverSqlite:
g.fields = append(g.fields, getExpectedSQLForDeletionField(g.isEmbed)...)
if g.isExtendedApi {
if g.isExtendedAPI {
var fields []replacer.Field
replaceFiles, fields = daoExtendedApi(r)
replaceFiles, fields = daoExtendedAPI(r)
g.fields = append(g.fields, fields...)
}

case DBDriverMongodb:
if g.isExtendedApi {
if g.isExtendedAPI {
var fields []replacer.Field
replaceFiles, fields = daoMongoDBExtendedApi(r)
replaceFiles, fields = daoMongoDBExtendedAPI(r)
g.fields = append(g.fields, fields...)
} else {
replaceFiles = map[string][]string{
Expand Down Expand Up @@ -220,11 +220,7 @@ func (g *daoGenerator) generateCode() (string, error) {
// set fields
func (g *daoGenerator) addFields(r replacer.Replacer) []replacer.Field {
var fields []replacer.Field

for _, field := range g.fields {
fields = append(fields, field)
}

fields = append(fields, g.fields...)
fields = append(fields, deleteFieldsMark(r, modelFile, startMark, endMark)...)
fields = append(fields, deleteFieldsMark(r, daoFile, startMark, endMark)...)
fields = append(fields, deleteFieldsMark(r, daoMgoFile, startMark, endMark)...)
Expand Down Expand Up @@ -273,7 +269,7 @@ func (g *daoGenerator) addFields(r replacer.Replacer) []replacer.Field {
return fields
}

func daoExtendedApi(r replacer.Replacer) (map[string][]string, []replacer.Field) {
func daoExtendedAPI(r replacer.Replacer) (map[string][]string, []replacer.Field) {
replaceFiles := map[string][]string{
"internal/dao": {
"userExample.go.exp", "userExample_test.go.exp",
Expand All @@ -298,7 +294,7 @@ func daoExtendedApi(r replacer.Replacer) (map[string][]string, []replacer.Field)
return replaceFiles, fields
}

func daoMongoDBExtendedApi(r replacer.Replacer) (map[string][]string, []replacer.Field) {
func daoMongoDBExtendedAPI(r replacer.Replacer) (map[string][]string, []replacer.Field) {
replaceFiles := map[string][]string{
"internal/cache": {
"userExample.go.mgo",
Expand Down
24 changes: 10 additions & 14 deletions cmd/sponge/commands/generate/handler-pb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Examples:
serverName: serverName,
dbDriver: sqlArgs.DBDriver,
isEmbed: sqlArgs.IsEmbed,
isExtendedApi: sqlArgs.IsExtendedApi,
isExtendedAPI: sqlArgs.IsExtendedAPI,
codes: codes,
outPath: outPath,
suitedMonoRepo: suitedMonoRepo,
Expand Down Expand Up @@ -125,7 +125,7 @@ using help:
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
_ = cmd.MarkFlagRequired("db-table")
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedApi, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedAPI, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
cmd.Flags().StringVarP(&outPath, "out", "o", "", "output directory, default is ./handler-pb_<time>,"+
Expand All @@ -139,7 +139,7 @@ type handlerPbGenerator struct {
serverName string
dbDriver string
isEmbed bool
isExtendedApi bool
isExtendedAPI bool
codes map[string]string
outPath string
suitedMonoRepo bool
Expand Down Expand Up @@ -187,15 +187,15 @@ func (g *handlerPbGenerator) generateCode() (string, error) {
switch strings.ToLower(g.dbDriver) {
case DBDriverMysql, DBDriverPostgresql, DBDriverTidb, DBDriverSqlite:
g.fields = append(g.fields, getExpectedSQLForDeletionField(g.isEmbed)...)
if g.isExtendedApi {
if g.isExtendedAPI {
var fields []replacer.Field
replaceFiles, fields = handlerPbExtendedApi(r)
replaceFiles, fields = handlerPbExtendedAPI(r)
g.fields = append(g.fields, fields...)
}
case DBDriverMongodb:
if g.isExtendedApi {
if g.isExtendedAPI {
var fields []replacer.Field
replaceFiles, fields = handlerPbMongoDBExtendedApi(r)
replaceFiles, fields = handlerPbMongoDBExtendedAPI(r)
g.fields = append(g.fields, fields...)
} else {
replaceFiles = map[string][]string{
Expand Down Expand Up @@ -231,11 +231,7 @@ func (g *handlerPbGenerator) generateCode() (string, error) {

func (g *handlerPbGenerator) addFields(r replacer.Replacer) []replacer.Field {
var fields []replacer.Field

for _, field := range g.fields {
fields = append(fields, field)
}

fields = append(fields, g.fields...)
fields = append(fields, deleteFieldsMark(r, modelFile, startMark, endMark)...)
fields = append(fields, deleteFieldsMark(r, daoFile, startMark, endMark)...)
fields = append(fields, deleteFieldsMark(r, daoMgoFile, startMark, endMark)...)
Expand Down Expand Up @@ -330,7 +326,7 @@ func (g *handlerPbGenerator) addFields(r replacer.Replacer) []replacer.Field {
return fields
}

func handlerPbExtendedApi(r replacer.Replacer) (map[string][]string, []replacer.Field) {
func handlerPbExtendedAPI(r replacer.Replacer) (map[string][]string, []replacer.Field) {
replaceFiles := map[string][]string{
"internal/dao": {
"userExample.go.exp", "userExample_test.go.exp",
Expand Down Expand Up @@ -375,7 +371,7 @@ func handlerPbExtendedApi(r replacer.Replacer) (map[string][]string, []replacer.
return replaceFiles, fields
}

func handlerPbMongoDBExtendedApi(r replacer.Replacer) (map[string][]string, []replacer.Field) {
func handlerPbMongoDBExtendedAPI(r replacer.Replacer) (map[string][]string, []replacer.Field) {
replaceFiles := map[string][]string{
"internal/cache": {
"userExample.go.mgo",
Expand Down
24 changes: 10 additions & 14 deletions cmd/sponge/commands/generate/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Examples:
codes: codes,
outPath: outPath,
isEmbed: sqlArgs.IsEmbed,
isExtendedApi: sqlArgs.IsExtendedApi,
isExtendedAPI: sqlArgs.IsExtendedAPI,
serverName: serverName,
suitedMonoRepo: suitedMonoRepo,
}
Expand Down Expand Up @@ -123,7 +123,7 @@ using help:
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
_ = cmd.MarkFlagRequired("db-table")
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedApi, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedAPI, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
cmd.Flags().StringVarP(&outPath, "out", "o", "", "output directory, default is ./handler_<time>, "+
Expand All @@ -139,7 +139,7 @@ type handlerGenerator struct {
outPath string
serverName string
isEmbed bool
isExtendedApi bool
isExtendedAPI bool
suitedMonoRepo bool

fields []replacer.Field
Expand Down Expand Up @@ -184,16 +184,16 @@ func (g *handlerGenerator) generateCode() (string, error) {
switch strings.ToLower(g.dbDriver) {
case DBDriverMysql, DBDriverPostgresql, DBDriverTidb, DBDriverSqlite:
g.fields = append(g.fields, getExpectedSQLForDeletionField(g.isEmbed)...)
if g.isExtendedApi {
if g.isExtendedAPI {
var fields []replacer.Field
replaceFiles, fields = handlerExtendedApi(r, codeNameHandler)
replaceFiles, fields = handlerExtendedAPI(r, codeNameHandler)
g.fields = append(g.fields, fields...)
}

case DBDriverMongodb:
if g.isExtendedApi {
if g.isExtendedAPI {
var fields []replacer.Field
replaceFiles, fields = handlerMongoDBExtendedApi(r, codeNameHandler)
replaceFiles, fields = handlerMongoDBExtendedAPI(r, codeNameHandler)
g.fields = append(g.fields, fields...)
} else {
replaceFiles = map[string][]string{
Expand Down Expand Up @@ -231,11 +231,7 @@ func (g *handlerGenerator) generateCode() (string, error) {

func (g *handlerGenerator) addFields(r replacer.Replacer) []replacer.Field {
var fields []replacer.Field

for _, field := range g.fields {
fields = append(fields, field)
}

fields = append(fields, g.fields...)
fields = append(fields, deleteFieldsMark(r, modelFile, startMark, endMark)...)
fields = append(fields, deleteFieldsMark(r, daoFile, startMark, endMark)...)
fields = append(fields, deleteFieldsMark(r, daoMgoFile, startMark, endMark)...)
Expand Down Expand Up @@ -295,7 +291,7 @@ func (g *handlerGenerator) addFields(r replacer.Replacer) []replacer.Field {
return fields
}

func handlerExtendedApi(r replacer.Replacer, codeName string) (map[string][]string, []replacer.Field) {
func handlerExtendedAPI(r replacer.Replacer, codeName string) (map[string][]string, []replacer.Field) {
replaceFiles := map[string][]string{
"internal/dao": {
"userExample.go.exp", "userExample_test.go.exp",
Expand Down Expand Up @@ -348,7 +344,7 @@ func handlerExtendedApi(r replacer.Replacer, codeName string) (map[string][]stri
return replaceFiles, fields
}

func handlerMongoDBExtendedApi(r replacer.Replacer, codeName string) (map[string][]string, []replacer.Field) {
func handlerMongoDBExtendedAPI(r replacer.Replacer, codeName string) (map[string][]string, []replacer.Field) {
replaceFiles := map[string][]string{
"internal/cache": {
"userExample.go.mgo",
Expand Down
24 changes: 10 additions & 14 deletions cmd/sponge/commands/generate/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Examples:
dbDriver: sqlArgs.DBDriver,
codes: codes,
outPath: outPath,
isExtendedApi: sqlArgs.IsExtendedApi,
isExtendedAPI: sqlArgs.IsExtendedAPI,

suitedMonoRepo: suitedMonoRepo,
}
Expand All @@ -123,7 +123,7 @@ Examples:
codes: codes,
outPath: outPath,
isEmbed: sqlArgs.IsEmbed,
isExtendedApi: sqlArgs.IsExtendedApi,
isExtendedAPI: sqlArgs.IsExtendedAPI,
serverName: serverName,

suitedMonoRepo: suitedMonoRepo,
Expand Down Expand Up @@ -160,7 +160,7 @@ using help:
cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
_ = cmd.MarkFlagRequired("db-table")
cmd.Flags().BoolVarP(&sqlArgs.IsEmbed, "embed", "e", false, "whether to embed gorm.model struct")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedApi, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedAPI, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().BoolVarP(&suitedMonoRepo, "suited-mono-repo", "l", false, "whether the generated code is suitable for mono-repo")
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
cmd.Flags().StringVarP(&repoAddr, "repo-addr", "r", "", "docker image repository address, excluding http and repository names")
Expand All @@ -179,7 +179,7 @@ type httpGenerator struct {
codes map[string]string
outPath string
isEmbed bool
isExtendedApi bool
isExtendedAPI bool
suitedMonoRepo bool

fields []replacer.Field
Expand Down Expand Up @@ -241,16 +241,16 @@ func (g *httpGenerator) generateCode() (string, error) {
switch strings.ToLower(g.dbDriver) {
case DBDriverMysql, DBDriverPostgresql, DBDriverTidb, DBDriverSqlite:
g.fields = append(g.fields, getExpectedSQLForDeletionField(g.isEmbed)...)
if g.isExtendedApi {
if g.isExtendedAPI {
var fields []replacer.Field
replaceFiles, fields = handlerExtendedApi(r, codeNameHTTP)
replaceFiles, fields = handlerExtendedAPI(r, codeNameHTTP)
g.fields = append(g.fields, fields...)
}

case DBDriverMongodb:
if g.isExtendedApi {
if g.isExtendedAPI {
var fields []replacer.Field
replaceFiles, fields = handlerMongoDBExtendedApi(r, codeNameHTTP)
replaceFiles, fields = handlerMongoDBExtendedAPI(r, codeNameHTTP)
g.fields = append(g.fields, fields...)
} else {
replaceFiles = map[string][]string{
Expand Down Expand Up @@ -297,14 +297,10 @@ func (g *httpGenerator) generateCode() (string, error) {
}

func (g *httpGenerator) addFields(r replacer.Replacer) []replacer.Field {
var fields []replacer.Field

repoHost, _ := parseImageRepoAddr(g.repoAddr)

for _, field := range g.fields {
fields = append(fields, field)
}

var fields []replacer.Field
fields = append(fields, g.fields...)
fields = append(fields, deleteFieldsMark(r, modelFile, startMark, endMark)...)
fields = append(fields, deleteFieldsMark(r, modelInitDBFile, startMark, endMark)...)
fields = append(fields, deleteFieldsMark(r, daoFile, startMark, endMark)...)
Expand Down
2 changes: 1 addition & 1 deletion cmd/sponge/commands/generate/protobuf.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ using help:
_ = cmd.MarkFlagRequired("db-table")
cmd.Flags().IntVarP(&sqlArgs.JSONNamedType, "json-name-type", "j", 1, "json tags name type, 0:snake case, 1:camel case")
cmd.Flags().BoolVarP(&sqlArgs.IsWebProto, "web-type", "w", false, "if true, the proto file include router path and swagger info")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedApi, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().BoolVarP(&sqlArgs.IsExtendedAPI, "extended-api", "a", false, "whether to generate extended crud api, additional includes: DeleteByIDs, GetByCondition, ListByIDs, ListByLatestID")
cmd.Flags().StringVarP(&outPath, "out", "o", "", "output directory, default is ./protobuf_<time>"+
" if you specify the directory where the web or microservice generated by sponge, the module-name and server-name flag can be ignored")

Expand Down
Loading

0 comments on commit e255beb

Please sign in to comment.