Fix Required.Proto2.JsonInput.AllFieldAcceptNull conformance (#653)

timostamm · Jul 8, 2024 · 91917f6 · 91917f6
1 parent 1798e0d
commit 91917f6
Show file tree

Hide file tree

Showing 38 changed files with 1,161 additions and 445 deletions.
diff --git a/packages/runtime/src/reflection-json-reader.ts b/packages/runtime/src/reflection-json-reader.ts
@@ -186,13 +186,17 @@ export class ReflectionJsonReader {
                         break;
 
                     case "enum":
+                        if (jsonValue === null)
+                            continue;
                         let val = this.enum(field.T(), jsonValue, field.name, options.ignoreUnknownFields);
                         if (val === false)
                             continue;
                         target[localName] = val;
                         break;
 
                     case "scalar":
+                        if (jsonValue === null)
+                            continue;
                         target[localName] = this.scalar(jsonValue, field.T, field.L, field.name);
                         break;
                 }

diff --git a/packages/test-conformance/download-conformance-runner.bash b/packages/test-conformance/download-conformance-runner.bash
@@ -4,7 +4,7 @@ if [ -f "bin/conformance_test_runner" ]; then
   exit 0;
 fi
 
-GOOGLE_PROTOBUF_VERSION=22.3
+GOOGLE_PROTOBUF_VERSION=27.2
 UNAME_OS=$(uname -s)
 if [[ "$UNAME_OS" == "Darwin" ]]; then
   PLATFORM=osx-x86_64

diff --git a/...s/test-conformance/src/gen/optimize_code_size-long_type_bigint/conformance/conformance.ts b/...s/test-conformance/src/gen/optimize_code_size-long_type_bigint/conformance/conformance.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_bigint,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_bigint,optimize_code_size,generate_dependencies
 // @generated from protobuf file "conformance/conformance.proto" (package "conformance", syntax proto3)
 // tslint:disable
 //

diff --git a/packages/test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/any.ts b/packages/test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/any.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_bigint,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_bigint,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/any.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //

diff --git a/.../test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/duration.ts b/.../test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/duration.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_bigint,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_bigint,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/duration.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //

diff --git a/...est-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/field_mask.ts b/...est-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/field_mask.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_bigint,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_bigint,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/field_mask.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //
@@ -260,8 +260,9 @@ class FieldMask$Type extends MessageType<FieldMask> {
      * Encode `FieldMask` to JSON object.
      */
     internalJsonWrite(message: FieldMask, options: JsonWriteOptions): JsonValue {
+        const invalidFieldMaskJsonRegex = /[A-Z]|(_([.0-9_]|$))/g;
         return message.paths.map(p => {
-            if (p.match(/_[0-9]?_/g) || p.match(/[A-Z]/g))
+            if (invalidFieldMaskJsonRegex.test(p))
                 throw new Error("Unable to encode FieldMask to JSON. lowerCamelCase of path name \"" + p + "\" is irreversible.");
             return lowerCamelCase(p);
         }).join(",");
@@ -280,7 +281,7 @@ class FieldMask$Type extends MessageType<FieldMask> {
             if (str.includes("_"))
                 throw new Error("Unable to parse FieldMask from JSON. Path names must be lowerCamelCase.");
             let sc = str.replace(/[A-Z]/g, letter => "_" + letter.toLowerCase());
-            return (sc[0] === "_") ? sc.substring(1) : sc;
+            return sc;
         };
         target.paths = json.split(",").map(camelToSnake);
         return target;

diff --git a/...es/test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/struct.ts b/...es/test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/struct.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_bigint,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_bigint,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/struct.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //

diff --git a/...mance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/test_messages_proto2.ts b/...mance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/test_messages_proto2.ts
diff --git a/...mance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/test_messages_proto3.ts b/...mance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/test_messages_proto3.ts
diff --git a/...test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/timestamp.ts b/...test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/timestamp.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_bigint,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_bigint,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/timestamp.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //

diff --git a/.../test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/wrappers.ts b/.../test-conformance/src/gen/optimize_code_size-long_type_bigint/google/protobuf/wrappers.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_bigint,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_bigint,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/wrappers.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //

diff --git a/...s/test-conformance/src/gen/optimize_code_size-long_type_string/conformance/conformance.ts b/...s/test-conformance/src/gen/optimize_code_size-long_type_string/conformance/conformance.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_string,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_string,optimize_code_size,generate_dependencies
 // @generated from protobuf file "conformance/conformance.proto" (package "conformance", syntax proto3)
 // tslint:disable
 //

diff --git a/packages/test-conformance/src/gen/optimize_code_size-long_type_string/google/protobuf/any.ts b/packages/test-conformance/src/gen/optimize_code_size-long_type_string/google/protobuf/any.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_string,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_string,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/any.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //

diff --git a/.../test-conformance/src/gen/optimize_code_size-long_type_string/google/protobuf/duration.ts b/.../test-conformance/src/gen/optimize_code_size-long_type_string/google/protobuf/duration.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_string,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_string,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/duration.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //

diff --git a/...est-conformance/src/gen/optimize_code_size-long_type_string/google/protobuf/field_mask.ts b/...est-conformance/src/gen/optimize_code_size-long_type_string/google/protobuf/field_mask.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_string,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_string,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/field_mask.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //
@@ -260,8 +260,9 @@ class FieldMask$Type extends MessageType<FieldMask> {
      * Encode `FieldMask` to JSON object.
      */
     internalJsonWrite(message: FieldMask, options: JsonWriteOptions): JsonValue {
+        const invalidFieldMaskJsonRegex = /[A-Z]|(_([.0-9_]|$))/g;
         return message.paths.map(p => {
-            if (p.match(/_[0-9]?_/g) || p.match(/[A-Z]/g))
+            if (invalidFieldMaskJsonRegex.test(p))
                 throw new Error("Unable to encode FieldMask to JSON. lowerCamelCase of path name \"" + p + "\" is irreversible.");
             return lowerCamelCase(p);
         }).join(",");
@@ -280,7 +281,7 @@ class FieldMask$Type extends MessageType<FieldMask> {
             if (str.includes("_"))
                 throw new Error("Unable to parse FieldMask from JSON. Path names must be lowerCamelCase.");
             let sc = str.replace(/[A-Z]/g, letter => "_" + letter.toLowerCase());
-            return (sc[0] === "_") ? sc.substring(1) : sc;
+            return sc;
         };
         target.paths = json.split(",").map(camelToSnake);
         return target;

diff --git a/...es/test-conformance/src/gen/optimize_code_size-long_type_string/google/protobuf/struct.ts b/...es/test-conformance/src/gen/optimize_code_size-long_type_string/google/protobuf/struct.ts
@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.0 with parameter long_type_string,optimize_code_size,generate_dependencies
+// @generated by protobuf-ts 2.9.4 with parameter long_type_string,optimize_code_size,generate_dependencies
 // @generated from protobuf file "google/protobuf/struct.proto" (package "google.protobuf", syntax proto3)
 // tslint:disable
 //