V2: Fix JSON error message (#849)

bufbuild · May 22, 2024 · d20225e · d20225e
1 parent 43b5dde
commit d20225e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/packages/protobuf-test/extra/msg-json-names.proto b/packages/protobuf-test/extra/msg-json-names.proto
@@ -17,12 +17,10 @@ package spec;
 
 
 message JsonNamesMessage {
-
-    string scalar_field = 1 [json_name = "scalarFieldJsonName"];
-    repeated string repeated_scalar_field = 2 [json_name = "repeatedScalarFieldJsonName"];
-
-    string a = 3;
-    string b = 4 [json_name = ""];
-    string c = 5 [json_name = "@type"];
-
+  string scalar_field = 1 [json_name = "scalarFieldJsonName"];
+  repeated string repeated_scalar_field = 2 [json_name = "repeatedScalarFieldJsonName"];
+  string a = 3;
+  string b = 4 [json_name = ""];
+  string c = 5 [json_name = "@type"];
+  string d = 6 [json_name = "1d"];
 }
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-json-names_pb.d.ts b/packages/protobuf-test/src/gen/js/extra/msg-json-names_pb.d.ts
diff --git a/packages/protobuf-test/src/gen/js/extra/msg-json-names_pb.js b/packages/protobuf-test/src/gen/js/extra/msg-json-names_pb.js
diff --git a/packages/protobuf-test/src/gen/ts/extra/msg-json-names_pb.ts b/packages/protobuf-test/src/gen/ts/extra/msg-json-names_pb.ts
diff --git a/packages/protobuf/src/to-json.ts b/packages/protobuf/src/to-json.ts
@@ -140,7 +140,7 @@ function reflectToJson(msg: ReflectMessage, opts: JsonWriteOptions): JsonValue {
     if (!msg.isSet(f)) {
       if (f.presence == LEGACY_REQUIRED) {
         throw new Error(
-          `cannot encode field ${msg.desc.typeName}.${f.name} to binary: required field not set`,
+          `cannot encode field ${msg.desc.typeName}.${f.name} to JSON: required field not set`,
         );
       }
       if (!opts.emitDefaultValues || f.presence !== IMPLICIT) {