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

handling hidden scalars

Browse Source
This commit is contained in:
Jan Halfar 2016-10-18 19:07:33 +02:00
parent 76a667423a
commit 0a766e15d8
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
typescript.go
View File

@ -23,19 +23,17 @@ func (f *Field) tsName() string {
} }
func (v *Value) tsType(mappings config.TypeScriptMappings, scalarTypes map[string]*Scalar, ts *code) { func (v *Value) tsType(mappings config.TypeScriptMappings, scalarTypes map[string]*Scalar, ts *code) {
switch true { switch true {
case v.Map != nil: case v.Map != nil:
ts.app("{[index:" + v.Map.KeyType + "]:") ts.app("{[index:" + v.Map.KeyType + "]:")
v.Map.Value.tsType(mappings, scalarTypes, ts) v.Map.Value.tsType(mappings, scalarTypes, ts)
ts.app("}") ts.app("}")
return
case v.Array != nil: case v.Array != nil:
v.Array.Value.tsType(mappings, scalarTypes, ts) v.Array.Value.tsType(mappings, scalarTypes, ts)
ts.app("[]") ts.app("[]")
return
case v.Scalar != nil: case v.Scalar != nil:
ts.app(string(v.Scalar.Type)) ts.app(string(v.Scalar.Type))
return
case v.StructType != nil: case v.StructType != nil:
if len(v.StructType.Package) > 0 { if len(v.StructType.Package) > 0 {
mapping, ok := mappings[v.StructType.Package] mapping, ok := mappings[v.StructType.Package]
@ -43,31 +41,36 @@ func (v *Value) tsType(mappings config.TypeScriptMappings, scalarTypes map[strin
if ok { if ok {
tsModule = mapping.TypeScriptModule tsModule = mapping.TypeScriptModule
} }
scalarName := v.StructType.FullName()
// is it a hdden scalar ?!
hiddenScalar, ok := scalarTypes[scalarName]
if ok {
ts.app(tsTypeFromScalarType(hiddenScalar.Type))
return
}
ts.app(tsModule + "." + v.StructType.Name) ts.app(tsModule + "." + v.StructType.Name)
return return
} }
ts.app(v.StructType.Name) ts.app(v.StructType.Name)
return
case v.Struct != nil: case v.Struct != nil:
//v.Struct.Value.tsType(mappings, ts) //v.Struct.Value.tsType(mappings, ts)
ts.l("{").ind(1) ts.l("{").ind(1)
renderStructFields(v.Struct.Fields, mappings, scalarTypes, ts) renderStructFields(v.Struct.Fields, mappings, scalarTypes, ts)
ts.ind(-1).app("}") ts.ind(-1).app("}")
return
case len(v.ScalarType) > 0: case len(v.ScalarType) > 0:
switch v.ScalarType { ts.app(tsTypeFromScalarType(v.ScalarType))
case ScalarTypeBool:
ts.app("boolean")
return
default:
ts.app(string(v.ScalarType))
return
}
default: default:
ts.app("any") ts.app("any")
return
} }
return
}
func tsTypeFromScalarType(scalarType ScalarType) string {
switch scalarType {
case ScalarTypeBool:
return "boolean"
}
return string(scalarType)
} }
func renderStructFields(fields []*Field, mappings config.TypeScriptMappings, scalarTypes map[string]*Scalar, ts *code) { func renderStructFields(fields []*Field, mappings config.TypeScriptMappings, scalarTypes map[string]*Scalar, ts *code) {
@ -96,6 +99,7 @@ func renderStruct(str *Struct, mappings config.TypeScriptMappings, scalarTypes m
} }
func renderService(service *Service, mappings config.TypeScriptMappings, scalarTypes map[string]*Scalar, ts *code) error { func renderService(service *Service, mappings config.TypeScriptMappings, scalarTypes map[string]*Scalar, ts *code) error {
jsonDump(scalarTypes)
clientName := service.Name + "Client" clientName := service.Name + "Client"
ts.l("export class " + clientName + " {").ind(1). ts.l("export class " + clientName + " {").ind(1).
l("static defaultInst = new " + clientName + ";"). l("static defaultInst = new " + clientName + ";").