zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[dart-gen] Fix nullable list item issue (#3192)

Browse Source
This commit is contained in:
fondoger
2023-05-01 15:01:28 +08:00
committed by GitHub
parent b028ed058d
commit 3a66fc038f
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/goctl/api/dartgen/gendata.go
View File

@@ -60,7 +60,7 @@ class {{.Name}} {
{{if isDirectType .Type.Name}} {{if isDirectType .Type.Name}}
{{lowCamelCase .Name}} {{lowCamelCase .Name}}
{{else if isClassListType .Type.Name}} {{else if isClassListType .Type.Name}}
{{lowCamelCase .Name}}{{if isNullableType .Type.Name}}?{{end}}.map((i) => i.toJson()) {{lowCamelCase .Name}}{{if isNullableType .Type.Name}}?{{end}}.map((i) => i{{if isListItemsNullable .Type.Name}}?{{end}}.toJson())
{{else}} {{else}}
{{lowCamelCase .Name}}{{if isNullableType .Type.Name}}?{{end}}.toJson() {{lowCamelCase .Name}}{{if isNullableType .Type.Name}}?{{end}}.toJson()
{{end}} {{end}}

4
tools/goctl/api/dartgen/util.go
View File

@@ -74,6 +74,10 @@ func isClassListType(s string) bool {
return strings.HasPrefix(s, "List<") && !isAtomicType(getCoreType(s)) return strings.HasPrefix(s, "List<") && !isAtomicType(getCoreType(s))
} }
func isListItemsNullable(s string) bool {
return isListType(s) && isNullableType(getCoreType(s))
}
func isMapType(s string) bool { func isMapType(s string) bool {
return strings.HasPrefix(s, "Map<") return strings.HasPrefix(s, "Map<")
} }

1
tools/goctl/api/dartgen/vars.go
View File

@@ -8,6 +8,7 @@ var funcMap = template.FuncMap{
"isDirectType": isDirectType, "isDirectType": isDirectType,
"isNumberType": isNumberType, "isNumberType": isNumberType,
"isClassListType": isClassListType, "isClassListType": isClassListType,
"isListItemsNullable": isListItemsNullable,
"isNullableType": isNullableType, "isNullableType": isNullableType,
"appendNullCoalescing": appendNullCoalescing, "appendNullCoalescing": appendNullCoalescing,
"appendDefaultEmptyValue": appendDefaultEmptyValue, "appendDefaultEmptyValue": appendDefaultEmptyValue,