Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Type Error when map contains string enums #382 #529

Merged
merged 4 commits into from
Mar 13, 2022
Merged

fix: Type Error when map contains string enums #382 #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df4c95d
fix: Type Error when map contains string enums
boukeversteegh Mar 7, 2022
1eb4ba4
regenerate ts
boukeversteegh Mar 7, 2022
5a9f8cf
update bins
boukeversteegh Mar 7, 2022
a8bc488
Refactor detectMapType to return keyField+valueField as well.
stephenh Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified integration/const-enum/const-enum.bin
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions integration/const-enum/const-enum.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ message DividerData {
}

DividerType type = 1;
map<string, DividerType> typeMap = 2;
}
100 changes: 99 additions & 1 deletion integration/const-enum/const-enum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const protobufPackage = '';

export interface DividerData {
type: DividerData_DividerType;
typeMap: { [key: string]: DividerData_DividerType };
}

export const enum DividerData_DividerType {
Expand Down Expand Up @@ -67,15 +68,23 @@ export function dividerData_DividerTypeToNumber(object: DividerData_DividerType)
}
}

export interface DividerData_TypeMapEntry {
key: string;
value: DividerData_DividerType;
}

function createBaseDividerData(): DividerData {
return { type: DividerData_DividerType.DOUBLE };
return { type: DividerData_DividerType.DOUBLE, typeMap: {} };
}

export const DividerData = {
encode(message: DividerData, writer: Writer = Writer.create()): Writer {
if (message.type !== DividerData_DividerType.DOUBLE) {
writer.uint32(8).int32(dividerData_DividerTypeToNumber(message.type));
}
Object.entries(message.typeMap).forEach(([key, value]) => {
DividerData_TypeMapEntry.encode({ key: key as any, value }, writer.uint32(18).fork()).ldelim();
});
return writer;
},

Expand All @@ -89,6 +98,12 @@ export const DividerData = {
case 1:
message.type = dividerData_DividerTypeFromJSON(reader.int32());
break;
case 2:
const entry2 = DividerData_TypeMapEntry.decode(reader, reader.uint32());
if (entry2.value !== undefined) {
message.typeMap[entry2.key] = entry2.value;
}
break;
default:
reader.skipType(tag & 7);
break;
Expand All @@ -100,18 +115,97 @@ export const DividerData = {
fromJSON(object: any): DividerData {
return {
type: isSet(object.type) ? dividerData_DividerTypeFromJSON(object.type) : DividerData_DividerType.DOUBLE,
typeMap: isObject(object.typeMap)
? Object.entries(object.typeMap).reduce<{ [key: string]: DividerData_DividerType }>((acc, [key, value]) => {
acc[key] = value as DividerData_DividerType;
return acc;
}, {})
: {},
};
},

toJSON(message: DividerData): unknown {
const obj: any = {};
message.type !== undefined && (obj.type = dividerData_DividerTypeToJSON(message.type));
obj.typeMap = {};
if (message.typeMap) {
Object.entries(message.typeMap).forEach(([k, v]) => {
obj.typeMap[k] = dividerData_DividerTypeToJSON(v);
});
}
return obj;
},

fromPartial<I extends Exact<DeepPartial<DividerData>, I>>(object: I): DividerData {
const message = createBaseDividerData();
message.type = object.type ?? DividerData_DividerType.DOUBLE;
message.typeMap = Object.entries(object.typeMap ?? {}).reduce<{ [key: string]: DividerData_DividerType }>(
(acc, [key, value]) => {
if (value !== undefined) {
acc[key] = value as DividerData_DividerType;
}
return acc;
},
{}
);
return message;
},
};

function createBaseDividerData_TypeMapEntry(): DividerData_TypeMapEntry {
return { key: '', value: DividerData_DividerType.DOUBLE };
}

export const DividerData_TypeMapEntry = {
encode(message: DividerData_TypeMapEntry, writer: Writer = Writer.create()): Writer {
if (message.key !== '') {
writer.uint32(10).string(message.key);
}
if (message.value !== DividerData_DividerType.DOUBLE) {
writer.uint32(16).int32(dividerData_DividerTypeToNumber(message.value));
}
return writer;
},

decode(input: Reader | Uint8Array, length?: number): DividerData_TypeMapEntry {
const reader = input instanceof Reader ? input : new Reader(input);
let end = length === undefined ? reader.len : reader.pos + length;
const message = createBaseDividerData_TypeMapEntry();
while (reader.pos < end) {
const tag = reader.uint32();
switch (tag >>> 3) {
case 1:
message.key = reader.string();
break;
case 2:
message.value = dividerData_DividerTypeFromJSON(reader.int32());
break;
default:
reader.skipType(tag & 7);
break;
}
}
return message;
},

fromJSON(object: any): DividerData_TypeMapEntry {
return {
key: isSet(object.key) ? String(object.key) : '',
value: isSet(object.value) ? dividerData_DividerTypeFromJSON(object.value) : DividerData_DividerType.DOUBLE,
};
},

toJSON(message: DividerData_TypeMapEntry): unknown {
const obj: any = {};
message.key !== undefined && (obj.key = message.key);
message.value !== undefined && (obj.value = dividerData_DividerTypeToJSON(message.value));
return obj;
},

fromPartial<I extends Exact<DeepPartial<DividerData_TypeMapEntry>, I>>(object: I): DividerData_TypeMapEntry {
const message = createBaseDividerData_TypeMapEntry();
message.key = object.key ?? '';
message.value = object.value ?? DividerData_DividerType.DOUBLE;
return message;
},
};
Expand Down Expand Up @@ -140,6 +234,10 @@ if (util.Long !== Long) {
configure();
}

function isObject(value: any): boolean {
return typeof value === 'object' && value !== null;
}

function isSet(value: any): boolean {
return value !== null && value !== undefined;
}
4 changes: 2 additions & 2 deletions integration/grpc-js/google/protobuf/struct.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ export interface Struct_FieldsEntry {
/**
* `Value` represents a dynamically typed value which can be either
* null, a number, a string, a boolean, a recursive struct value, or a
* list of values. A producer of value is expected to set one of these
* variants. Absence of any variant indicates an error.
* list of values. A producer of value is expected to set one of that
* variants, absence of any variant indicates an error.
*
* The JSON representation for `Value` is JSON value.
*/
Expand Down
Binary file modified integration/grpc-js/google/protobuf/wrappers.bin
View file
Open in desktop
Binary file not shown.
Binary file modified integration/grpc-js/simple.bin
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions integration/meta-typings/google/protobuf/timestamp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'seconds',
options: undefined,
proto3Optional: false,
},
{
Expand All @@ -190,6 +191,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'nanos',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -198,6 +200,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand Down
18 changes: 18 additions & 0 deletions integration/meta-typings/google/protobuf/wrappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'value',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -409,6 +410,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand All @@ -425,6 +427,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'value',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -433,6 +436,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand All @@ -449,6 +453,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'value',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -457,6 +462,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand All @@ -473,6 +479,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'value',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -481,6 +488,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand All @@ -497,6 +505,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'value',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -505,6 +514,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand All @@ -521,6 +531,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'value',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -529,6 +540,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand All @@ -545,6 +557,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'value',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -553,6 +566,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand All @@ -569,6 +583,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'value',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -577,6 +592,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand All @@ -593,6 +609,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'value',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -601,6 +618,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand Down
4 changes: 4 additions & 0 deletions integration/meta-typings/google/type/date.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'year',
options: undefined,
proto3Optional: false,
},
{
Expand All @@ -118,6 +119,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'month',
options: undefined,
proto3Optional: false,
},
{
Expand All @@ -130,6 +132,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'day',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -138,6 +141,7 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
Expand Down
3 changes: 3 additions & 0 deletions integration/meta-typings/import_dir/thing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export const protoMetadata: ProtoMetadata = {
defaultValue: '',
oneofIndex: 0,
jsonName: 'createdAt',
options: undefined,
proto3Optional: false,
},
],
Expand All @@ -76,13 +77,15 @@ export const protoMetadata: ProtoMetadata = {
enumType: [],
extensionRange: [],
oneofDecl: [],
options: undefined,
reservedRange: [],
reservedName: [],
},
],
enumType: [],
service: [],
extension: [],
options: undefined,
sourceCodeInfo: { location: [] },
syntax: 'proto3',
}),
Expand Down
Loading