Fix bug in UPPER titles

bufbuild · Mar 21, 2024 · 53ed547 · 53ed547
1 parent 051a418
commit 53ed547
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 26 deletions.
diff --git a/internal/cmd/jsonschema-generate-testdata/main.go b/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
 			}
 		}

diff --git a/internal/protoschema/jsonschema/jsonschema.go b/internal/protoschema/jsonschema/jsonschema.go
@@ -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(' ')
 		}

diff --git a/internal/protoschema/jsonschema/jsonschema_test.go b/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"))
 }
diff --git a/internal/protoschema/plugin/pluginjsonschema/pluginjsonschema.go b/internal/protoschema/plugin/pluginjsonschema/pluginjsonschema.go
@@ -56,7 +56,7 @@ func Handle(
 				}
 				responseWriter.AddFile(
 					identifier,
-					string(data),
+					string(data)+"\n",
 				)
 				seenIdentifiers[identifier] = true
 			}

diff --git a/internal/testdata/jsonschema/buf.protoschema.test.v1.BigQueryWellknownTypeTest.schema.json b/internal/testdata/jsonschema/buf.protoschema.test.v1.BigQueryWellknownTypeTest.schema.json
diff --git a/internal/testdata/jsonschema/buf.protoschema.test.v1.CustomBigQuery.schema.json b/internal/testdata/jsonschema/buf.protoschema.test.v1.CustomBigQuery.schema.json
diff --git a/internal/testdata/jsonschema/buf.protoschema.test.v1.CustomOptions.schema.json b/internal/testdata/jsonschema/buf.protoschema.test.v1.CustomOptions.schema.json
diff --git a/internal/testdata/jsonschema/buf.protoschema.test.v1.NestedReference.schema.json b/internal/testdata/jsonschema/buf.protoschema.test.v1.NestedReference.schema.json
diff --git a/...nal/testdata/jsonschema/bufext.cel.expr.conformance.proto3.NestedTestAllTypes.schema.json b/...nal/testdata/jsonschema/bufext.cel.expr.conformance.proto3.NestedTestAllTypes.schema.json
diff --git a/...data/jsonschema/bufext.cel.expr.conformance.proto3.TestAllTypes.NestedMessage.schema.json b/...data/jsonschema/bufext.cel.expr.conformance.proto3.TestAllTypes.NestedMessage.schema.json
diff --git a/internal/testdata/jsonschema/bufext.cel.expr.conformance.proto3.TestAllTypes.schema.json b/internal/testdata/jsonschema/bufext.cel.expr.conformance.proto3.TestAllTypes.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.Any.schema.json b/internal/testdata/jsonschema/google.protobuf.Any.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.BoolValue.schema.json b/internal/testdata/jsonschema/google.protobuf.BoolValue.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.BytesValue.schema.json b/internal/testdata/jsonschema/google.protobuf.BytesValue.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.DoubleValue.schema.json b/internal/testdata/jsonschema/google.protobuf.DoubleValue.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.Duration.schema.json b/internal/testdata/jsonschema/google.protobuf.Duration.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.FloatValue.schema.json b/internal/testdata/jsonschema/google.protobuf.FloatValue.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.Int32Value.schema.json b/internal/testdata/jsonschema/google.protobuf.Int32Value.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.Int64Value.schema.json b/internal/testdata/jsonschema/google.protobuf.Int64Value.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.ListValue.schema.json b/internal/testdata/jsonschema/google.protobuf.ListValue.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.StringValue.schema.json b/internal/testdata/jsonschema/google.protobuf.StringValue.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.Struct.schema.json b/internal/testdata/jsonschema/google.protobuf.Struct.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.Timestamp.schema.json b/internal/testdata/jsonschema/google.protobuf.Timestamp.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.UInt32Value.schema.json b/internal/testdata/jsonschema/google.protobuf.UInt32Value.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.UInt64Value.schema.json b/internal/testdata/jsonschema/google.protobuf.UInt64Value.schema.json
diff --git a/internal/testdata/jsonschema/google.protobuf.Value.schema.json b/internal/testdata/jsonschema/google.protobuf.Value.schema.json