Merge e91964252d into a7c2d9473e

Co-authored-by: “gowridurgad” <“hgowridurgad@github.com>

.licenses/npm/@protobuf-ts/plugin-framework.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@protobuf-ts/plugin-framework"
-version: 2.9.4
+version: 2.9.5
 type: npm
 summary: framework to create protoc plugins
 homepage: https://github.com/timostamm/protobuf-ts

.licenses/npm/@protobuf-ts/plugin.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@protobuf-ts/plugin"
-version: 2.9.4
+version: 2.9.5
 type: npm
 summary: The protocol buffer compiler plugin "protobuf-ts" generates TypeScript, gRPC-web,
   Twirp, and more.

.licenses/npm/@protobuf-ts/protoc.dep.yml

@@ -1,14 +1,14 @@
 ---
 name: "@protobuf-ts/protoc"
-version: 2.9.4
+version: 2.9.5
 type: npm
 summary: Installs the protocol buffer compiler "protoc" for you.
 homepage: https://github.com/timostamm/protobuf-ts
 license: apache-2.0
 licenses:
-- sources: LICENSE
+- sources: Auto-generated Apache-2.0 license text
   text: |2
-                                    Apache License
+                                     Apache License
                                Version 2.0, January 2004
                             http://www.apache.org/licenses/
 
@@ -44,7 +44,6 @@ licenses:
 
           "Work" shall mean the work of authorship, whether in Source or
           Object form, made available under the License, as indicated by a
-          copyright notice that is included in or attached to the work
           (an example is provided in the Appendix below).
 
           "Derivative Works" shall mean any work, whether in Source or Object
@@ -76,7 +75,6 @@ licenses:
        2. Grant of Copyright License. Subject to the terms and conditions of
           this License, each Contributor hereby grants to You a perpetual,
           worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-          copyright license to reproduce, prepare Derivative Works of,
           publicly display, publicly perform, sublicense, and distribute the
           Work and such Derivative Works in Source or Object form.
 
@@ -107,7 +105,6 @@ licenses:
           (b) You must cause any modified files to carry prominent notices
               stating that You changed the files; and
 
-          (c) You must retain, in the Source form of any Derivative Works
               that You distribute, all copyright, patent, trademark, and
               attribution notices from the Source form of the Work,
               excluding those notices that do not pertain to any part of
@@ -182,4 +179,29 @@ licenses:
           defend, and hold each Contributor harmless for any liability
           incurred by, or claims asserted against, such Contributor by reason
           of your accepting any such warranty or additional liability.
+
+       END OF TERMS AND CONDITIONS
+
+       APPENDIX: How to apply the Apache License to your work.
+
+          To apply the Apache License to your work, attach the following
+          boilerplate notice, with the fields enclosed by brackets "[]"
+          replaced with your own identifying information. (Don't include
+          the brackets!)  The text should be enclosed in the appropriate
+          comment syntax for the file format. We also recommend that a
+          file or class name and description of purpose be included on the
+          same "printed page" as the copyright notice for easier
+          identification within third-party archives.
+
+       Licensed under the Apache License, Version 2.0 (the "License");
+       you may not use this file except in compliance with the License.
+       You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
 notices: []

.licenses/npm/@protobuf-ts/runtime-rpc.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@protobuf-ts/runtime-rpc"
-version: 2.9.4
+version: 2.9.5
 type: npm
 summary: Runtime library for RPC clients generated by the protoc plugin "protobuf-ts"
 homepage: https://github.com/timostamm/protobuf-ts

.licenses/npm/@protobuf-ts/runtime.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@protobuf-ts/runtime"
-version: 2.9.4
+version: 2.9.5
 type: npm
 summary: Runtime library for code generated by the protoc plugin "protobuf-ts"
 homepage: https://github.com/timostamm/protobuf-ts

dist/cache-save/index.js

@@ -51325,12 +51325,16 @@ class ReflectionJsonReader {
                         target[localName] = field.T().internalJsonRead(jsonValue, options, target[localName]);
                         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;
                 }

dist/setup/index.js

@@ -56538,12 +56538,16 @@ class ReflectionJsonReader {
                         target[localName] = field.T().internalJsonRead(jsonValue, options, target[localName]);
                         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;
                 }

package-lock.json

@@ -1681,15 +1681,15 @@
       }
     },
     "node_modules/@protobuf-ts/plugin": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.9.4.tgz",
-      "integrity": "sha512-Db5Laq5T3mc6ERZvhIhkj1rn57/p8gbWiCKxQWbZBBl20wMuqKoHbRw4tuD7FyXi+IkwTToaNVXymv5CY3E8Rw==",
+      "version": "2.9.5",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.9.5.tgz",
+      "integrity": "sha512-KCzNRTFye837XdfPjS85gGzxgPGVDR3W8Px2G3etXuouNog9W+Cr+U0IBTFADrRWXC2x+OSNjXxrdZEiw+H5Cw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@protobuf-ts/plugin-framework": "^2.9.4",
-        "@protobuf-ts/protoc": "^2.9.4",
-        "@protobuf-ts/runtime": "^2.9.4",
-        "@protobuf-ts/runtime-rpc": "^2.9.4",
+        "@protobuf-ts/plugin-framework": "^2.9.5",
+        "@protobuf-ts/protoc": "^2.9.5",
+        "@protobuf-ts/runtime": "^2.9.5",
+        "@protobuf-ts/runtime-rpc": "^2.9.5",
         "typescript": "^3.9"
       },
       "bin": {
@@ -1698,12 +1698,12 @@
       }
     },
     "node_modules/@protobuf-ts/plugin-framework": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin-framework/-/plugin-framework-2.9.4.tgz",
-      "integrity": "sha512-9nuX1kjdMliv+Pes8dQCKyVhjKgNNfwxVHg+tx3fLXSfZZRcUHMc1PMwB9/vTvc6gBKt9QGz5ERqSqZc0++E9A==",
+      "version": "2.9.5",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin-framework/-/plugin-framework-2.9.5.tgz",
+      "integrity": "sha512-DYNQ8Ga3xwPZMfaZGRCnDOcEdQZK9MorTXngVoFLnHWEE8zLhUjFVtdkChZtTih6rl8Z6akyA7hRgj/GrJF58Q==",
       "license": "(Apache-2.0 AND BSD-3-Clause)",
       "dependencies": {
-        "@protobuf-ts/runtime": "^2.9.4",
+        "@protobuf-ts/runtime": "^2.9.5",
         "typescript": "^3.9"
       }
     },
@@ -1734,27 +1734,27 @@
       }
     },
     "node_modules/@protobuf-ts/protoc": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.9.4.tgz",
-      "integrity": "sha512-hQX+nOhFtrA+YdAXsXEDrLoGJqXHpgv4+BueYF0S9hy/Jq0VRTVlJS1Etmf4qlMt/WdigEes5LOd/LDzui4GIQ==",
+      "version": "2.9.5",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.9.5.tgz",
+      "integrity": "sha512-n6a7OHfr/Ubw483L6kNJB0wBCe/Ops0A652zB6J6nR2x1o+pjVFrMCeeQQsqxkYpQwQ8FCIETSxrMpfOBKTIvQ==",
       "license": "Apache-2.0",
       "bin": {
         "protoc": "protoc.js"
       }
     },
     "node_modules/@protobuf-ts/runtime": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.9.4.tgz",
-      "integrity": "sha512-vHRFWtJJB/SiogWDF0ypoKfRIZ41Kq+G9cEFj6Qm1eQaAhJ1LDFvgZ7Ja4tb3iLOQhz0PaoPnnOijF1qmEqTxg==",
+      "version": "2.9.5",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.9.5.tgz",
+      "integrity": "sha512-SsumigRe3IqNTCQvVZUqDQExsKF72eyAMiWlYb5Jwj3eU4z8UH7JLlSfb/Wjidz4b/chTN6zh5AXBSKl0Asm3A==",
       "license": "(Apache-2.0 AND BSD-3-Clause)"
     },
     "node_modules/@protobuf-ts/runtime-rpc": {
-      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.9.4.tgz",
-      "integrity": "sha512-y9L9JgnZxXFqH5vD4d7j9duWvIJ7AShyBRoNKJGhu9Q27qIbchfzli66H9RvrQNIFk5ER7z1Twe059WZGqERcA==",
+      "version": "2.9.5",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.9.5.tgz",
+      "integrity": "sha512-NWAb1TaV4CR+BknZr1WRVT5Ws2AupVwGgRNes4oPAFrgLNXQotDFl2E6pmsjPwME8sAgJVzeSr7bUqQVyoAK2A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@protobuf-ts/runtime": "^2.9.4"
+        "@protobuf-ts/runtime": "^2.9.5"
       }
     },
     "node_modules/@sinclair/typebox": {