foomo/gotsrpc
1
0
Fork 0
mirror of https://github.com/foomo/gotsrpc.git synced 2025-10-16 12:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27 from globusdigital/v1

Browse Source 
feat: add scalar type generation
This commit is contained in:
Kevin Franklin Kim 2022-08-16 12:21:07 +02:00 committed by GitHub
commit 6d65df09cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
typescript.go
View File

@ -51,22 +51,30 @@ func (v *Value) tsType(mappings config.TypeScriptMappings, scalarTypes map[strin
return
}
hiddenStruct, okHiddenStruct := structs[scalarName]
if okHiddenStruct && hiddenStruct.Array != nil {
if hiddenStruct.Array.Value.StructType != nil {
hiddenMapping, hiddenMappingOK := mappings[hiddenStruct.Array.Value.StructType.Package]
if hiddenStruct, ok := structs[scalarName]; ok && hiddenStruct.Array != nil {
switch {
case hiddenStruct.Array.Value.StructType != nil:
var tsModule string
if hiddenMappingOK {
if hiddenMapping, ok := mappings[hiddenStruct.Array.Value.StructType.Package]; ok {
tsModule = hiddenMapping.TypeScriptModule
}
ts.app(tsModule + "." + hiddenStruct.Array.Value.StructType.Name + "[]")
return
}
if hiddenStruct.Array.Value.StructType == nil {
case hiddenStruct.Array.Value.Scalar != nil:
var tsModule string
if hiddenMapping, ok := mappings[hiddenStruct.Array.Value.Scalar.Package]; ok {
tsModule = hiddenMapping.TypeScriptModule
}
ts.app(tsModule + "." + hiddenStruct.Name)
return
case hiddenStruct.Array.Value.StructType == nil:
if hiddenStruct.Array.Value.GoScalarType == "byte" { // this fixes types like primitive.ID [12]byte
ts.app(tsTypeFromScalarType(hiddenStruct.Array.Value.ScalarType))
}
return
}
}
@ -115,7 +123,12 @@ func renderStructFields(fields []*Field, mappings config.TypeScriptMappings, sca
func renderTypescriptStruct(str *Struct, mappings config.TypeScriptMappings, scalarTypes map[string]*Scalar, structs map[string]*Struct, ts *code) error {
if str.Array != nil {
// skipping array type
if str.Array.Value != nil && str.Array.Value.Scalar != nil && str.Array.Value.Scalar.Type != "" {
ts.l("// " + str.FullName())
ts.l("export type " + str.Name + " = " + str.Array.Value.Scalar.Name + "[]")
ts.l("export type " + str.Array.Value.Scalar.Name + " = " + string(str.Array.Value.Scalar.Type))
}
return nil
}
ts.l("// " + str.FullName())