fix: oneof=union breaks wrapper types #458

stephenh · Jan 4, 2022 · 607d5cd · 607d5cd
1 parent d66d0ba
commit 607d5cd
Show file tree

Hide file tree

Showing 95 changed files with 1,402 additions and 914 deletions.
diff --git a/README.markdown b/README.markdown
@@ -354,6 +354,10 @@ Generated code will be placed in the Gradle build directory.
 
   The default behavior is `useExactTypes=true`, which makes `fromPartial` use Exact type for its argument to make TypeScript reject any unknown properties.
 
+- With `--ts_proto_opt=unwrapFromJSON=true`, the generated `fromJSON` method will expect input values for `google.protobuf.Value` and `google.protobuf.Struct` to be provided in "wrapped" format: e.g. `{"stringValue": "hello world"}` instead of just `"hello world"`. Used for compatibility with libraries that do not "unwrap" these values before encoding to JSON, for example `pbjs`. This option currently does not affect other wrapper types.
+
+  The default behavior is `unwrapFromJSON=false`, which makes `fromJSON` expect to receive native JSON values.
+
 ### Only Types
 
 If you're looking for `ts-proto` to generate only types for your Protobuf types then passing all three of `outputEncodeMethods`, `outputJsonMethods`, and `outputClientImpl` as `false` is probably what you want, i.e.:

diff --git a/integration/angular/simple-message.ts b/integration/angular/simple-message.ts
@@ -40,8 +40,7 @@ export const SimpleMessage = {
 
   fromJSON(object: any): SimpleMessage {
     const message = createBaseSimpleMessage();
-    message.numberField =
-      object.numberField !== undefined && object.numberField !== null ? Number(object.numberField) : 0;
+    message.numberField = isSet(object.numberField) ? Number(object.numberField) : 0;
     return message;
   },
 
@@ -81,3 +80,7 @@ if (util.Long !== Long) {
   util.Long = Long as any;
   configure();
 }
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
diff --git a/integration/avoid-import-conflicts/simple.ts b/integration/avoid-import-conflicts/simple.ts
@@ -96,11 +96,8 @@ export const Simple = {
 
   fromJSON(object: any): Simple {
     const message = createBaseSimple();
-    message.name = object.name !== undefined && object.name !== null ? String(object.name) : '';
-    message.otherSimple =
-      object.otherSimple !== undefined && object.otherSimple !== null
-        ? Simple2.fromJSON(object.otherSimple)
-        : undefined;
+    message.name = isSet(object.name) ? String(object.name) : '';
+    message.otherSimple = isSet(object.otherSimple) ? Simple2.fromJSON(object.otherSimple) : undefined;
     return message;
   },
 
@@ -161,10 +158,8 @@ export const SimpleEnums = {
 
   fromJSON(object: any): SimpleEnums {
     const message = createBaseSimpleEnums();
-    message.localEnum =
-      object.localEnum !== undefined && object.localEnum !== null ? simpleEnumFromJSON(object.localEnum) : 0;
-    message.importEnum =
-      object.importEnum !== undefined && object.importEnum !== null ? simpleEnumFromJSON3(object.importEnum) : 0;
+    message.localEnum = isSet(object.localEnum) ? simpleEnumFromJSON(object.localEnum) : 0;
+    message.importEnum = isSet(object.importEnum) ? simpleEnumFromJSON3(object.importEnum) : 0;
     return message;
   },
 
@@ -206,3 +201,7 @@ if (util.Long !== Long) {
   util.Long = Long as any;
   configure();
 }
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
diff --git a/integration/avoid-import-conflicts/simple2.ts b/integration/avoid-import-conflicts/simple2.ts
@@ -85,8 +85,8 @@ export const Simple = {
 
   fromJSON(object: any): Simple {
     const message = createBaseSimple();
-    message.name = object.name !== undefined && object.name !== null ? String(object.name) : '';
-    message.age = object.age !== undefined && object.age !== null ? Number(object.age) : 0;
+    message.name = isSet(object.name) ? String(object.name) : '';
+    message.age = isSet(object.age) ? Number(object.age) : 0;
     return message;
   },
 
@@ -128,3 +128,7 @@ if (util.Long !== Long) {
   util.Long = Long as any;
   configure();
 }
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
diff --git a/integration/barrel-imports/bar.ts b/integration/barrel-imports/bar.ts
@@ -45,8 +45,8 @@ export const Bar = {
 
   fromJSON(object: any): Bar {
     const message = createBaseBar();
-    message.name = object.name !== undefined && object.name !== null ? String(object.name) : '';
-    message.age = object.age !== undefined && object.age !== null ? Number(object.age) : 0;
+    message.name = isSet(object.name) ? String(object.name) : '';
+    message.age = isSet(object.age) ? Number(object.age) : 0;
     return message;
   },
 
@@ -88,3 +88,7 @@ if (util.Long !== Long) {
   util.Long = Long as any;
   configure();
 }
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
diff --git a/integration/barrel-imports/foo.ts b/integration/barrel-imports/foo.ts
@@ -46,8 +46,8 @@ export const Foo = {
 
   fromJSON(object: any): Foo {
     const message = createBaseFoo();
-    message.name = object.name !== undefined && object.name !== null ? String(object.name) : '';
-    message.bar = object.bar !== undefined && object.bar !== null ? Bar.fromJSON(object.bar) : undefined;
+    message.name = isSet(object.name) ? String(object.name) : '';
+    message.bar = isSet(object.bar) ? Bar.fromJSON(object.bar) : undefined;
     return message;
   },
 
@@ -89,3 +89,7 @@ if (util.Long !== Long) {
   util.Long = Long as any;
   configure();
 }
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
diff --git a/integration/batching-with-context/batching.ts b/integration/batching-with-context/batching.ts
@@ -78,7 +78,9 @@ export const BatchQueryRequest = {
 
   fromJSON(object: any): BatchQueryRequest {
     const message = createBaseBatchQueryRequest();
-    message.ids = (object.ids ?? []).map((e: any) => String(e));
+    if (Array.isArray(object?.ids)) {
+      message.ids = object.ids.map((e: any) => String(e));
+    }
     return message;
   },
 
@@ -131,7 +133,9 @@ export const BatchQueryResponse = {
 
   fromJSON(object: any): BatchQueryResponse {
     const message = createBaseBatchQueryResponse();
-    message.entities = (object.entities ?? []).map((e: any) => Entity.fromJSON(e));
+    if (Array.isArray(object?.entities)) {
+      message.entities = object.entities.map((e: any) => Entity.fromJSON(e));
+    }
     return message;
   },
 
@@ -184,7 +188,9 @@ export const BatchMapQueryRequest = {
 
   fromJSON(object: any): BatchMapQueryRequest {
     const message = createBaseBatchMapQueryRequest();
-    message.ids = (object.ids ?? []).map((e: any) => String(e));
+    if (Array.isArray(object?.ids)) {
+      message.ids = object.ids.map((e: any) => String(e));
+    }
     return message;
   },
 
@@ -308,8 +314,8 @@ export const BatchMapQueryResponse_EntitiesEntry = {
 
   fromJSON(object: any): BatchMapQueryResponse_EntitiesEntry {
     const message = createBaseBatchMapQueryResponse_EntitiesEntry();
-    message.key = object.key !== undefined && object.key !== null ? String(object.key) : '';
-    message.value = object.value !== undefined && object.value !== null ? Entity.fromJSON(object.value) : undefined;
+    message.key = isSet(object.key) ? String(object.key) : '';
+    message.value = isSet(object.value) ? Entity.fromJSON(object.value) : undefined;
     return message;
   },
 
@@ -362,7 +368,7 @@ export const GetOnlyMethodRequest = {
 
   fromJSON(object: any): GetOnlyMethodRequest {
     const message = createBaseGetOnlyMethodRequest();
-    message.id = object.id !== undefined && object.id !== null ? String(object.id) : '';
+    message.id = isSet(object.id) ? String(object.id) : '';
     return message;
   },
 
@@ -411,7 +417,7 @@ export const GetOnlyMethodResponse = {
 
   fromJSON(object: any): GetOnlyMethodResponse {
     const message = createBaseGetOnlyMethodResponse();
-    message.entity = object.entity !== undefined && object.entity !== null ? Entity.fromJSON(object.entity) : undefined;
+    message.entity = isSet(object.entity) ? Entity.fromJSON(object.entity) : undefined;
     return message;
   },
 
@@ -461,7 +467,7 @@ export const WriteMethodRequest = {
 
   fromJSON(object: any): WriteMethodRequest {
     const message = createBaseWriteMethodRequest();
-    message.id = object.id !== undefined && object.id !== null ? String(object.id) : '';
+    message.id = isSet(object.id) ? String(object.id) : '';
     return message;
   },
 
@@ -556,8 +562,8 @@ export const Entity = {
 
   fromJSON(object: any): Entity {
     const message = createBaseEntity();
-    message.id = object.id !== undefined && object.id !== null ? String(object.id) : '';
-    message.name = object.name !== undefined && object.name !== null ? String(object.name) : '';
+    message.id = isSet(object.id) ? String(object.id) : '';
+    message.name = isSet(object.name) ? String(object.name) : '';
     return message;
   },
 
@@ -696,3 +702,7 @@ if (util.Long !== Long) {
   util.Long = Long as any;
   configure();
 }
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
diff --git a/integration/batching/batching.ts b/integration/batching/batching.ts
@@ -76,7 +76,9 @@ export const BatchQueryRequest = {
 
   fromJSON(object: any): BatchQueryRequest {
     const message = createBaseBatchQueryRequest();
-    message.ids = (object.ids ?? []).map((e: any) => String(e));
+    if (Array.isArray(object?.ids)) {
+      message.ids = object.ids.map((e: any) => String(e));
+    }
     return message;
   },
 
@@ -129,7 +131,9 @@ export const BatchQueryResponse = {
 
   fromJSON(object: any): BatchQueryResponse {
     const message = createBaseBatchQueryResponse();
-    message.entities = (object.entities ?? []).map((e: any) => Entity.fromJSON(e));
+    if (Array.isArray(object?.entities)) {
+      message.entities = object.entities.map((e: any) => Entity.fromJSON(e));
+    }
     return message;
   },
 
@@ -182,7 +186,9 @@ export const BatchMapQueryRequest = {
 
   fromJSON(object: any): BatchMapQueryRequest {
     const message = createBaseBatchMapQueryRequest();
-    message.ids = (object.ids ?? []).map((e: any) => String(e));
+    if (Array.isArray(object?.ids)) {
+      message.ids = object.ids.map((e: any) => String(e));
+    }
     return message;
   },
 
@@ -306,8 +312,8 @@ export const BatchMapQueryResponse_EntitiesEntry = {
 
   fromJSON(object: any): BatchMapQueryResponse_EntitiesEntry {
     const message = createBaseBatchMapQueryResponse_EntitiesEntry();
-    message.key = object.key !== undefined && object.key !== null ? String(object.key) : '';
-    message.value = object.value !== undefined && object.value !== null ? Entity.fromJSON(object.value) : undefined;
+    message.key = isSet(object.key) ? String(object.key) : '';
+    message.value = isSet(object.value) ? Entity.fromJSON(object.value) : undefined;
     return message;
   },
 
@@ -360,7 +366,7 @@ export const GetOnlyMethodRequest = {
 
   fromJSON(object: any): GetOnlyMethodRequest {
     const message = createBaseGetOnlyMethodRequest();
-    message.id = object.id !== undefined && object.id !== null ? String(object.id) : '';
+    message.id = isSet(object.id) ? String(object.id) : '';
     return message;
   },
 
@@ -409,7 +415,7 @@ export const GetOnlyMethodResponse = {
 
   fromJSON(object: any): GetOnlyMethodResponse {
     const message = createBaseGetOnlyMethodResponse();
-    message.entity = object.entity !== undefined && object.entity !== null ? Entity.fromJSON(object.entity) : undefined;
+    message.entity = isSet(object.entity) ? Entity.fromJSON(object.entity) : undefined;
     return message;
   },
 
@@ -459,7 +465,7 @@ export const WriteMethodRequest = {
 
   fromJSON(object: any): WriteMethodRequest {
     const message = createBaseWriteMethodRequest();
-    message.id = object.id !== undefined && object.id !== null ? String(object.id) : '';
+    message.id = isSet(object.id) ? String(object.id) : '';
     return message;
   },
 
@@ -554,8 +560,8 @@ export const Entity = {
 
   fromJSON(object: any): Entity {
     const message = createBaseEntity();
-    message.id = object.id !== undefined && object.id !== null ? String(object.id) : '';
-    message.name = object.name !== undefined && object.name !== null ? String(object.name) : '';
+    message.id = isSet(object.id) ? String(object.id) : '';
+    message.name = isSet(object.name) ? String(object.name) : '';
     return message;
   },
 
@@ -644,3 +650,7 @@ if (util.Long !== Long) {
   util.Long = Long as any;
   configure();
 }
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
diff --git a/integration/bytes-as-base64/message.ts b/integration/bytes-as-base64/message.ts
@@ -15,7 +15,7 @@ function createBaseMessage(): Message {
 export const Message = {
   fromJSON(object: any): Message {
     const message = createBaseMessage();
-    message.data = object.data !== undefined && object.data !== null ? bytesFromBase64(object.data) : new Uint8Array();
+    message.data = isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array();
     return message;
   },
 
@@ -88,3 +88,7 @@ if (util.Long !== Long) {
   util.Long = Long as any;
   configure();
 }
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}