Skip to content

Commit

Permalink
fix: oneof=union breaks wrapper types #458 (#462)
Browse files Browse the repository at this point in the history
  • Loading branch information
boukeversteegh authored Jan 5, 2022
1 parent d66d0ba commit dd16992
Show file tree
Hide file tree
Showing 89 changed files with 1,717 additions and 857 deletions.
7 changes: 5 additions & 2 deletions integration/angular/simple-message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
},

Expand Down Expand Up @@ -81,3 +80,7 @@ if (util.Long !== Long) {
util.Long = Long as any;
configure();
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
17 changes: 8 additions & 9 deletions integration/avoid-import-conflicts/simple.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
},

Expand Down Expand Up @@ -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;
},

Expand Down Expand Up @@ -206,3 +201,7 @@ if (util.Long !== Long) {
util.Long = Long as any;
configure();
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
8 changes: 6 additions & 2 deletions integration/avoid-import-conflicts/simple2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
},

Expand Down Expand Up @@ -128,3 +128,7 @@ if (util.Long !== Long) {
util.Long = Long as any;
configure();
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
8 changes: 6 additions & 2 deletions integration/barrel-imports/bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
},

Expand Down Expand Up @@ -88,3 +88,7 @@ if (util.Long !== Long) {
util.Long = Long as any;
configure();
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
8 changes: 6 additions & 2 deletions integration/barrel-imports/foo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
},

Expand Down Expand Up @@ -89,3 +89,7 @@ if (util.Long !== Long) {
util.Long = Long as any;
configure();
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
24 changes: 14 additions & 10 deletions integration/batching-with-context/batching.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const BatchQueryRequest = {

fromJSON(object: any): BatchQueryRequest {
const message = createBaseBatchQueryRequest();
message.ids = (object.ids ?? []).map((e: any) => String(e));
message.ids = Array.isArray(object?.ids) ? object.ids.map((e: any) => String(e)) : [];
return message;
},

Expand Down Expand Up @@ -131,7 +131,7 @@ export const BatchQueryResponse = {

fromJSON(object: any): BatchQueryResponse {
const message = createBaseBatchQueryResponse();
message.entities = (object.entities ?? []).map((e: any) => Entity.fromJSON(e));
message.entities = Array.isArray(object?.entities) ? object.entities.map((e: any) => Entity.fromJSON(e)) : [];
return message;
},

Expand Down Expand Up @@ -184,7 +184,7 @@ export const BatchMapQueryRequest = {

fromJSON(object: any): BatchMapQueryRequest {
const message = createBaseBatchMapQueryRequest();
message.ids = (object.ids ?? []).map((e: any) => String(e));
message.ids = Array.isArray(object?.ids) ? object.ids.map((e: any) => String(e)) : [];
return message;
},

Expand Down Expand Up @@ -308,8 +308,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;
},

Expand Down Expand Up @@ -362,7 +362,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;
},

Expand Down Expand Up @@ -411,7 +411,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;
},

Expand Down Expand Up @@ -461,7 +461,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;
},

Expand Down Expand Up @@ -556,8 +556,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;
},

Expand Down Expand Up @@ -696,3 +696,7 @@ if (util.Long !== Long) {
util.Long = Long as any;
configure();
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
24 changes: 14 additions & 10 deletions integration/batching/batching.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export const BatchQueryRequest = {

fromJSON(object: any): BatchQueryRequest {
const message = createBaseBatchQueryRequest();
message.ids = (object.ids ?? []).map((e: any) => String(e));
message.ids = Array.isArray(object?.ids) ? object.ids.map((e: any) => String(e)) : [];
return message;
},

Expand Down Expand Up @@ -129,7 +129,7 @@ export const BatchQueryResponse = {

fromJSON(object: any): BatchQueryResponse {
const message = createBaseBatchQueryResponse();
message.entities = (object.entities ?? []).map((e: any) => Entity.fromJSON(e));
message.entities = Array.isArray(object?.entities) ? object.entities.map((e: any) => Entity.fromJSON(e)) : [];
return message;
},

Expand Down Expand Up @@ -182,7 +182,7 @@ export const BatchMapQueryRequest = {

fromJSON(object: any): BatchMapQueryRequest {
const message = createBaseBatchMapQueryRequest();
message.ids = (object.ids ?? []).map((e: any) => String(e));
message.ids = Array.isArray(object?.ids) ? object.ids.map((e: any) => String(e)) : [];
return message;
},

Expand Down Expand Up @@ -306,8 +306,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;
},

Expand Down Expand Up @@ -360,7 +360,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;
},

Expand Down Expand Up @@ -409,7 +409,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;
},

Expand Down Expand Up @@ -459,7 +459,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;
},

Expand Down Expand Up @@ -554,8 +554,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;
},

Expand Down Expand Up @@ -644,3 +644,7 @@ if (util.Long !== Long) {
util.Long = Long as any;
configure();
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
6 changes: 5 additions & 1 deletion integration/bytes-as-base64/message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
},

Expand Down Expand Up @@ -88,3 +88,7 @@ if (util.Long !== Long) {
util.Long = Long as any;
configure();
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
25 changes: 13 additions & 12 deletions integration/bytes-node/google/protobuf/wrappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export const DoubleValue = {

fromJSON(object: any): DoubleValue {
const message = createBaseDoubleValue();
message.value = object.value !== undefined && object.value !== null ? Number(object.value) : 0;
message.value = isSet(object.value) ? Number(object.value) : 0;
return message;
},

Expand Down Expand Up @@ -175,7 +175,7 @@ export const FloatValue = {

fromJSON(object: any): FloatValue {
const message = createBaseFloatValue();
message.value = object.value !== undefined && object.value !== null ? Number(object.value) : 0;
message.value = isSet(object.value) ? Number(object.value) : 0;
return message;
},

Expand Down Expand Up @@ -224,7 +224,7 @@ export const Int64Value = {

fromJSON(object: any): Int64Value {
const message = createBaseInt64Value();
message.value = object.value !== undefined && object.value !== null ? Number(object.value) : 0;
message.value = isSet(object.value) ? Number(object.value) : 0;
return message;
},

Expand Down Expand Up @@ -273,7 +273,7 @@ export const UInt64Value = {

fromJSON(object: any): UInt64Value {
const message = createBaseUInt64Value();
message.value = object.value !== undefined && object.value !== null ? Number(object.value) : 0;
message.value = isSet(object.value) ? Number(object.value) : 0;
return message;
},

Expand Down Expand Up @@ -322,7 +322,7 @@ export const Int32Value = {

fromJSON(object: any): Int32Value {
const message = createBaseInt32Value();
message.value = object.value !== undefined && object.value !== null ? Number(object.value) : 0;
message.value = isSet(object.value) ? Number(object.value) : 0;
return message;
},

Expand Down Expand Up @@ -371,7 +371,7 @@ export const UInt32Value = {

fromJSON(object: any): UInt32Value {
const message = createBaseUInt32Value();
message.value = object.value !== undefined && object.value !== null ? Number(object.value) : 0;
message.value = isSet(object.value) ? Number(object.value) : 0;
return message;
},

Expand Down Expand Up @@ -420,7 +420,7 @@ export const BoolValue = {

fromJSON(object: any): BoolValue {
const message = createBaseBoolValue();
message.value = object.value !== undefined && object.value !== null ? Boolean(object.value) : false;
message.value = isSet(object.value) ? Boolean(object.value) : false;
return message;
},

Expand Down Expand Up @@ -469,7 +469,7 @@ export const StringValue = {

fromJSON(object: any): StringValue {
const message = createBaseStringValue();
message.value = object.value !== undefined && object.value !== null ? String(object.value) : '';
message.value = isSet(object.value) ? String(object.value) : '';
return message;
},

Expand Down Expand Up @@ -518,10 +518,7 @@ export const BytesValue = {

fromJSON(object: any): BytesValue {
const message = createBaseBytesValue();
message.value =
object.value !== undefined && object.value !== null
? Buffer.from(bytesFromBase64(object.value))
: Buffer.alloc(0);
message.value = isSet(object.value) ? Buffer.from(bytesFromBase64(object.value)) : Buffer.alloc(0);
return message;
},

Expand Down Expand Up @@ -601,3 +598,7 @@ if (util.Long !== Long) {
util.Long = Long as any;
configure();
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
Loading

0 comments on commit dd16992

Please sign in to comment.