Fix bug in UPPER titles (#8)

* Fix bug in UPPER titles

* lint

internal/cmd/jsonschema-generate-testdata/main.go

@@ -64,7 +64,7 @@ func run() error {
 				return errors.New("expected $id to be non-empty")
 			}
 			filePath := filepath.Join(outputDir, identifier)
-			if err := golden.GenerateGolden(filePath, string(data)); err != nil {
+			if err := golden.GenerateGolden(filePath, string(data)+"\n"); err != nil {
 				return err
 			}
 		}

internal/protoschema/bigquery/bigquery.go

@@ -148,7 +148,8 @@ func (p *bigQuerySchemaGenerator) generateFields(msgDesc protoreflect.MessageDes
 
 	result := make(bigquery.Schema, 0, msgDesc.Fields().Len())
 	p.seen[msgDesc.FullName()]++
-	for i := 0; i < len(msgPb.GetField()); i++ {
+	var i int
+	for ; i < len(msgPb.GetField()); i++ { // msgPb.Field may be modified in the loop.
 		fieldPb := msgPb.GetField()[i]
 		fieldDesc := msgDesc.Fields().ByNumber(protoreflect.FieldNumber(fieldPb.GetNumber()))
 		if fieldDesc == nil {

internal/protoschema/jsonschema/jsonschema.go

@@ -72,7 +72,7 @@ func (p *jsonSchemaGenerator) generateDefault(result map[string]interface{}, des
 	result["type"] = jsObject
 	p.setDescription(desc, result)
 	var properties = make(map[string]interface{})
-	for i := 0; i < desc.Fields().Len(); i++ {
+	for i := range desc.Fields().Len() {
 		field := desc.Fields().Get(i)
 		name := string(field.Name())
 		properties[name] = p.generateField(field)
@@ -147,7 +147,7 @@ func generateTitle(name protoreflect.Name) string {
 	var result strings.Builder
 	for i, chr := range name {
 		isUpper := unicode.IsUpper(chr)
-		nextIsUpper := i+1 < len(name) && unicode.IsUpper(rune(name[i+1]))
+		nextIsUpper := i+1 >= len(name) || unicode.IsUpper(rune(name[i+1]))
 		if i > 0 && isUpper && !nextIsUpper {
 			result.WriteRune(' ')
 		}
@@ -158,7 +158,7 @@ func generateTitle(name protoreflect.Name) string {
 
 func (p *jsonSchemaGenerator) generateEnumValidation(field protoreflect.FieldDescriptor, entry map[string]interface{}) {
 	var enum = make([]interface{}, 0)
-	for i := 0; i < field.Enum().Values().Len(); i++ {
+	for i := range field.Enum().Values().Len() {
 		enum = append(enum, field.Enum().Values().Get(i).Name())
 	}
 	anyOf := []map[string]interface{}{

internal/protoschema/jsonschema/jsonschema_test.go

@@ -37,7 +37,7 @@ func TestJSONSchemaGolden(t *testing.T) {
 			require.NotEmpty(t, identifier)
 
 			filePath := filepath.Join(dirPath, identifier)
-			err = golden.CheckGolden(filePath, string(data))
+			err = golden.CheckGolden(filePath, string(data)+"\n")
 			require.NoError(t, err)
 		}
 	}
@@ -52,4 +52,5 @@ func TestTitle(t *testing.T) {
 	require.Equal(t, "FOO Bar", generateTitle("FOOBar"))
 	require.Equal(t, "U Int64 Value", generateTitle("UInt64Value"))
 	require.Equal(t, "Uint64 Value", generateTitle("Uint64Value"))
+	require.Equal(t, "FOO", generateTitle("FOO"))
 }

internal/protoschema/plugin/pluginjsonschema/pluginjsonschema.go

@@ -56,7 +56,7 @@ func Handle(
 				}
 				responseWriter.AddFile(
 					identifier,
-					string(data),
+					string(data)+"\n",
 				)
 				seenIdentifiers[identifier] = true
 			}