From 045a78f60a6cd708f0110b90529eb6a81f3a3422 Mon Sep 17 00:00:00 2001 From: Cory Bennett Date: Sun, 21 Aug 2016 00:23:08 -0700 Subject: [PATCH] tweak struct naming for arrays --- slipscheme.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/slipscheme.go b/slipscheme.go index 6ec5580..253f666 100644 --- a/slipscheme.go +++ b/slipscheme.go @@ -330,12 +330,18 @@ func (s *SchemaProcessor) processSchema(schema *Schema) (typeName string, err er if err != nil { return "", err } - if strings.Title(subTypeName) == subTypeName { - if strings.HasSuffix(subTypeName, "s") { - typeName = fmt.Sprintf("%ses", subTypeName) - } else { - typeName = fmt.Sprintf("%ss", subTypeName) + + typeName = camelCase(schema.Name()) + if typeName == "" { + if strings.Title(subTypeName) == subTypeName { + if strings.HasSuffix(subTypeName, "s") { + typeName = fmt.Sprintf("%ses", subTypeName) + } else { + typeName = fmt.Sprintf("%ss", subTypeName) + } } + } + if typeName != "" { typeName = strings.TrimPrefix(typeName, "*") typeData := fmt.Sprintf("%stype %s []%s\n\n", s.structComment(schema, typeName), typeName, subTypeName) if err := s.writeGoCode(typeName, typeData); err != nil {