From e2cf1848c1c70a8bbe73756e1cf530c5d70f5ce2 Mon Sep 17 00:00:00 2001 From: Stephen Haberman Date: Sat, 15 Jul 2023 10:04:25 -0500 Subject: [PATCH] fix: Bump descriptors. (#883) --- package.json | 2 +- protos/google/protobuf/compiler/plugin.ts | 73 +-- protos/google/protobuf/descriptor.ts | 608 +++++++++++++--------- protos/package.json | 4 +- protos/yarn.lock | 106 +--- yarn.lock | 10 +- 6 files changed, 420 insertions(+), 383 deletions(-) diff --git a/package.json b/package.json index 3505953cf..fad641f15 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "case-anything": "^2.1.13", "protobufjs": "^7.2.4", "ts-poet": "^6.5.0", - "ts-proto-descriptors": "1.13.0" + "ts-proto-descriptors": "1.14.0" }, "packageManager": "yarn@3.6.0" } diff --git a/protos/google/protobuf/compiler/plugin.ts b/protos/google/protobuf/compiler/plugin.ts index 3b9b09d3c..2b53409a5 100644 --- a/protos/google/protobuf/compiler/plugin.ts +++ b/protos/google/protobuf/compiler/plugin.ts @@ -274,10 +274,18 @@ export const Version = { toJSON(message: Version): unknown { const obj: any = {}; - message.major !== undefined && (obj.major = Math.round(message.major)); - message.minor !== undefined && (obj.minor = Math.round(message.minor)); - message.patch !== undefined && (obj.patch = Math.round(message.patch)); - message.suffix !== undefined && (obj.suffix = message.suffix); + if (message.major !== 0) { + obj.major = Math.round(message.major); + } + if (message.minor !== 0) { + obj.minor = Math.round(message.minor); + } + if (message.patch !== 0) { + obj.patch = Math.round(message.patch); + } + if (message.suffix !== "") { + obj.suffix = message.suffix; + } return obj; }, @@ -400,19 +408,18 @@ export const CodeGeneratorRequest = { toJSON(message: CodeGeneratorRequest): unknown { const obj: any = {}; - if (message.fileToGenerate) { - obj.fileToGenerate = message.fileToGenerate.map((e) => e); - } else { - obj.fileToGenerate = []; - } - message.parameter !== undefined && (obj.parameter = message.parameter); - if (message.protoFile) { - obj.protoFile = message.protoFile.map((e) => e ? FileDescriptorProto.toJSON(e) : undefined); - } else { - obj.protoFile = []; - } - message.compilerVersion !== undefined && - (obj.compilerVersion = message.compilerVersion ? Version.toJSON(message.compilerVersion) : undefined); + if (message.fileToGenerate?.length) { + obj.fileToGenerate = message.fileToGenerate; + } + if (message.parameter !== "") { + obj.parameter = message.parameter; + } + if (message.protoFile?.length) { + obj.protoFile = message.protoFile.map((e) => FileDescriptorProto.toJSON(e)); + } + if (message.compilerVersion !== undefined) { + obj.compilerVersion = Version.toJSON(message.compilerVersion); + } return obj; }, @@ -524,12 +531,14 @@ export const CodeGeneratorResponse = { toJSON(message: CodeGeneratorResponse): unknown { const obj: any = {}; - message.error !== undefined && (obj.error = message.error); - message.supportedFeatures !== undefined && (obj.supportedFeatures = Math.round(message.supportedFeatures)); - if (message.file) { - obj.file = message.file.map((e) => e ? CodeGeneratorResponse_File.toJSON(e) : undefined); - } else { - obj.file = []; + if (message.error !== "") { + obj.error = message.error; + } + if (message.supportedFeatures !== 0) { + obj.supportedFeatures = Math.round(message.supportedFeatures); + } + if (message.file?.length) { + obj.file = message.file.map((e) => CodeGeneratorResponse_File.toJSON(e)); } return obj; }, @@ -652,12 +661,18 @@ export const CodeGeneratorResponse_File = { toJSON(message: CodeGeneratorResponse_File): unknown { const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - message.insertionPoint !== undefined && (obj.insertionPoint = message.insertionPoint); - message.content !== undefined && (obj.content = message.content); - message.generatedCodeInfo !== undefined && (obj.generatedCodeInfo = message.generatedCodeInfo - ? GeneratedCodeInfo.toJSON(message.generatedCodeInfo) - : undefined); + if (message.name !== "") { + obj.name = message.name; + } + if (message.insertionPoint !== "") { + obj.insertionPoint = message.insertionPoint; + } + if (message.content !== "") { + obj.content = message.content; + } + if (message.generatedCodeInfo !== undefined) { + obj.generatedCodeInfo = GeneratedCodeInfo.toJSON(message.generatedCodeInfo); + } return obj; }, diff --git a/protos/google/protobuf/descriptor.ts b/protos/google/protobuf/descriptor.ts index 8300917bf..700731c80 100644 --- a/protos/google/protobuf/descriptor.ts +++ b/protos/google/protobuf/descriptor.ts @@ -1220,10 +1220,8 @@ export const FileDescriptorSet = { toJSON(message: FileDescriptorSet): unknown { const obj: any = {}; - if (message.file) { - obj.file = message.file.map((e) => e ? FileDescriptorProto.toJSON(e) : undefined); - } else { - obj.file = []; + if (message.file?.length) { + obj.file = message.file.map((e) => FileDescriptorProto.toJSON(e)); } return obj; }, @@ -1473,47 +1471,42 @@ export const FileDescriptorProto = { toJSON(message: FileDescriptorProto): unknown { const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - message.package !== undefined && (obj.package = message.package); - if (message.dependency) { - obj.dependency = message.dependency.map((e) => e); - } else { - obj.dependency = []; - } - if (message.publicDependency) { + if (message.name !== "") { + obj.name = message.name; + } + if (message.package !== "") { + obj.package = message.package; + } + if (message.dependency?.length) { + obj.dependency = message.dependency; + } + if (message.publicDependency?.length) { obj.publicDependency = message.publicDependency.map((e) => Math.round(e)); - } else { - obj.publicDependency = []; } - if (message.weakDependency) { + if (message.weakDependency?.length) { obj.weakDependency = message.weakDependency.map((e) => Math.round(e)); - } else { - obj.weakDependency = []; - } - if (message.messageType) { - obj.messageType = message.messageType.map((e) => e ? DescriptorProto.toJSON(e) : undefined); - } else { - obj.messageType = []; - } - if (message.enumType) { - obj.enumType = message.enumType.map((e) => e ? EnumDescriptorProto.toJSON(e) : undefined); - } else { - obj.enumType = []; - } - if (message.service) { - obj.service = message.service.map((e) => e ? ServiceDescriptorProto.toJSON(e) : undefined); - } else { - obj.service = []; - } - if (message.extension) { - obj.extension = message.extension.map((e) => e ? FieldDescriptorProto.toJSON(e) : undefined); - } else { - obj.extension = []; - } - message.options !== undefined && (obj.options = message.options ? FileOptions.toJSON(message.options) : undefined); - message.sourceCodeInfo !== undefined && - (obj.sourceCodeInfo = message.sourceCodeInfo ? SourceCodeInfo.toJSON(message.sourceCodeInfo) : undefined); - message.syntax !== undefined && (obj.syntax = message.syntax); + } + if (message.messageType?.length) { + obj.messageType = message.messageType.map((e) => DescriptorProto.toJSON(e)); + } + if (message.enumType?.length) { + obj.enumType = message.enumType.map((e) => EnumDescriptorProto.toJSON(e)); + } + if (message.service?.length) { + obj.service = message.service.map((e) => ServiceDescriptorProto.toJSON(e)); + } + if (message.extension?.length) { + obj.extension = message.extension.map((e) => FieldDescriptorProto.toJSON(e)); + } + if (message.options !== undefined) { + obj.options = FileOptions.toJSON(message.options); + } + if (message.sourceCodeInfo !== undefined) { + obj.sourceCodeInfo = SourceCodeInfo.toJSON(message.sourceCodeInfo); + } + if (message.syntax !== "") { + obj.syntax = message.syntax; + } return obj; }, @@ -1733,48 +1726,35 @@ export const DescriptorProto = { toJSON(message: DescriptorProto): unknown { const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - if (message.field) { - obj.field = message.field.map((e) => e ? FieldDescriptorProto.toJSON(e) : undefined); - } else { - obj.field = []; - } - if (message.extension) { - obj.extension = message.extension.map((e) => e ? FieldDescriptorProto.toJSON(e) : undefined); - } else { - obj.extension = []; - } - if (message.nestedType) { - obj.nestedType = message.nestedType.map((e) => e ? DescriptorProto.toJSON(e) : undefined); - } else { - obj.nestedType = []; - } - if (message.enumType) { - obj.enumType = message.enumType.map((e) => e ? EnumDescriptorProto.toJSON(e) : undefined); - } else { - obj.enumType = []; - } - if (message.extensionRange) { - obj.extensionRange = message.extensionRange.map((e) => e ? DescriptorProto_ExtensionRange.toJSON(e) : undefined); - } else { - obj.extensionRange = []; - } - if (message.oneofDecl) { - obj.oneofDecl = message.oneofDecl.map((e) => e ? OneofDescriptorProto.toJSON(e) : undefined); - } else { - obj.oneofDecl = []; - } - message.options !== undefined && - (obj.options = message.options ? MessageOptions.toJSON(message.options) : undefined); - if (message.reservedRange) { - obj.reservedRange = message.reservedRange.map((e) => e ? DescriptorProto_ReservedRange.toJSON(e) : undefined); - } else { - obj.reservedRange = []; - } - if (message.reservedName) { - obj.reservedName = message.reservedName.map((e) => e); - } else { - obj.reservedName = []; + if (message.name !== "") { + obj.name = message.name; + } + if (message.field?.length) { + obj.field = message.field.map((e) => FieldDescriptorProto.toJSON(e)); + } + if (message.extension?.length) { + obj.extension = message.extension.map((e) => FieldDescriptorProto.toJSON(e)); + } + if (message.nestedType?.length) { + obj.nestedType = message.nestedType.map((e) => DescriptorProto.toJSON(e)); + } + if (message.enumType?.length) { + obj.enumType = message.enumType.map((e) => EnumDescriptorProto.toJSON(e)); + } + if (message.extensionRange?.length) { + obj.extensionRange = message.extensionRange.map((e) => DescriptorProto_ExtensionRange.toJSON(e)); + } + if (message.oneofDecl?.length) { + obj.oneofDecl = message.oneofDecl.map((e) => OneofDescriptorProto.toJSON(e)); + } + if (message.options !== undefined) { + obj.options = MessageOptions.toJSON(message.options); + } + if (message.reservedRange?.length) { + obj.reservedRange = message.reservedRange.map((e) => DescriptorProto_ReservedRange.toJSON(e)); + } + if (message.reservedName?.length) { + obj.reservedName = message.reservedName; } return obj; }, @@ -1893,10 +1873,15 @@ export const DescriptorProto_ExtensionRange = { toJSON(message: DescriptorProto_ExtensionRange): unknown { const obj: any = {}; - message.start !== undefined && (obj.start = Math.round(message.start)); - message.end !== undefined && (obj.end = Math.round(message.end)); - message.options !== undefined && - (obj.options = message.options ? ExtensionRangeOptions.toJSON(message.options) : undefined); + if (message.start !== 0) { + obj.start = Math.round(message.start); + } + if (message.end !== 0) { + obj.end = Math.round(message.end); + } + if (message.options !== undefined) { + obj.options = ExtensionRangeOptions.toJSON(message.options); + } return obj; }, @@ -1993,8 +1978,12 @@ export const DescriptorProto_ReservedRange = { toJSON(message: DescriptorProto_ReservedRange): unknown { const obj: any = {}; - message.start !== undefined && (obj.start = Math.round(message.start)); - message.end !== undefined && (obj.end = Math.round(message.end)); + if (message.start !== 0) { + obj.start = Math.round(message.start); + } + if (message.end !== 0) { + obj.end = Math.round(message.end); + } return obj; }, @@ -2134,10 +2123,8 @@ export const ExtensionRangeOptions = { toJSON(message: ExtensionRangeOptions): unknown { const obj: any = {}; - if (message.uninterpretedOption) { - obj.uninterpretedOption = message.uninterpretedOption.map((e) => e ? UninterpretedOption.toJSON(e) : undefined); - } else { - obj.uninterpretedOption = []; + if (message.uninterpretedOption?.length) { + obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e)); } return obj; }, @@ -2345,17 +2332,39 @@ export const FieldDescriptorProto = { toJSON(message: FieldDescriptorProto): unknown { const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - message.number !== undefined && (obj.number = Math.round(message.number)); - message.label !== undefined && (obj.label = fieldDescriptorProto_LabelToJSON(message.label)); - message.type !== undefined && (obj.type = fieldDescriptorProto_TypeToJSON(message.type)); - message.typeName !== undefined && (obj.typeName = message.typeName); - message.extendee !== undefined && (obj.extendee = message.extendee); - message.defaultValue !== undefined && (obj.defaultValue = message.defaultValue); - message.oneofIndex !== undefined && (obj.oneofIndex = Math.round(message.oneofIndex)); - message.jsonName !== undefined && (obj.jsonName = message.jsonName); - message.options !== undefined && (obj.options = message.options ? FieldOptions.toJSON(message.options) : undefined); - message.proto3Optional !== undefined && (obj.proto3Optional = message.proto3Optional); + if (message.name !== "") { + obj.name = message.name; + } + if (message.number !== 0) { + obj.number = Math.round(message.number); + } + if (message.label !== 1) { + obj.label = fieldDescriptorProto_LabelToJSON(message.label); + } + if (message.type !== 1) { + obj.type = fieldDescriptorProto_TypeToJSON(message.type); + } + if (message.typeName !== "") { + obj.typeName = message.typeName; + } + if (message.extendee !== "") { + obj.extendee = message.extendee; + } + if (message.defaultValue !== "") { + obj.defaultValue = message.defaultValue; + } + if (message.oneofIndex !== 0) { + obj.oneofIndex = Math.round(message.oneofIndex); + } + if (message.jsonName !== "") { + obj.jsonName = message.jsonName; + } + if (message.options !== undefined) { + obj.options = FieldOptions.toJSON(message.options); + } + if (message.proto3Optional === true) { + obj.proto3Optional = message.proto3Optional; + } return obj; }, @@ -2463,8 +2472,12 @@ export const OneofDescriptorProto = { toJSON(message: OneofDescriptorProto): unknown { const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - message.options !== undefined && (obj.options = message.options ? OneofOptions.toJSON(message.options) : undefined); + if (message.name !== "") { + obj.name = message.name; + } + if (message.options !== undefined) { + obj.options = OneofOptions.toJSON(message.options); + } return obj; }, @@ -2598,24 +2611,20 @@ export const EnumDescriptorProto = { toJSON(message: EnumDescriptorProto): unknown { const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - if (message.value) { - obj.value = message.value.map((e) => e ? EnumValueDescriptorProto.toJSON(e) : undefined); - } else { - obj.value = []; - } - message.options !== undefined && (obj.options = message.options ? EnumOptions.toJSON(message.options) : undefined); - if (message.reservedRange) { - obj.reservedRange = message.reservedRange.map((e) => - e ? EnumDescriptorProto_EnumReservedRange.toJSON(e) : undefined - ); - } else { - obj.reservedRange = []; - } - if (message.reservedName) { - obj.reservedName = message.reservedName.map((e) => e); - } else { - obj.reservedName = []; + if (message.name !== "") { + obj.name = message.name; + } + if (message.value?.length) { + obj.value = message.value.map((e) => EnumValueDescriptorProto.toJSON(e)); + } + if (message.options !== undefined) { + obj.options = EnumOptions.toJSON(message.options); + } + if (message.reservedRange?.length) { + obj.reservedRange = message.reservedRange.map((e) => EnumDescriptorProto_EnumReservedRange.toJSON(e)); + } + if (message.reservedName?.length) { + obj.reservedName = message.reservedName; } return obj; }, @@ -2718,8 +2727,12 @@ export const EnumDescriptorProto_EnumReservedRange = { toJSON(message: EnumDescriptorProto_EnumReservedRange): unknown { const obj: any = {}; - message.start !== undefined && (obj.start = Math.round(message.start)); - message.end !== undefined && (obj.end = Math.round(message.end)); + if (message.start !== 0) { + obj.start = Math.round(message.start); + } + if (message.end !== 0) { + obj.end = Math.round(message.end); + } return obj; }, @@ -2829,10 +2842,15 @@ export const EnumValueDescriptorProto = { toJSON(message: EnumValueDescriptorProto): unknown { const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - message.number !== undefined && (obj.number = Math.round(message.number)); - message.options !== undefined && - (obj.options = message.options ? EnumValueOptions.toJSON(message.options) : undefined); + if (message.name !== "") { + obj.name = message.name; + } + if (message.number !== 0) { + obj.number = Math.round(message.number); + } + if (message.options !== undefined) { + obj.options = EnumValueOptions.toJSON(message.options); + } return obj; }, @@ -2943,14 +2961,15 @@ export const ServiceDescriptorProto = { toJSON(message: ServiceDescriptorProto): unknown { const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - if (message.method) { - obj.method = message.method.map((e) => e ? MethodDescriptorProto.toJSON(e) : undefined); - } else { - obj.method = []; - } - message.options !== undefined && - (obj.options = message.options ? ServiceOptions.toJSON(message.options) : undefined); + if (message.name !== "") { + obj.name = message.name; + } + if (message.method?.length) { + obj.method = message.method.map((e) => MethodDescriptorProto.toJSON(e)); + } + if (message.options !== undefined) { + obj.options = ServiceOptions.toJSON(message.options); + } return obj; }, @@ -3101,13 +3120,24 @@ export const MethodDescriptorProto = { toJSON(message: MethodDescriptorProto): unknown { const obj: any = {}; - message.name !== undefined && (obj.name = message.name); - message.inputType !== undefined && (obj.inputType = message.inputType); - message.outputType !== undefined && (obj.outputType = message.outputType); - message.options !== undefined && - (obj.options = message.options ? MethodOptions.toJSON(message.options) : undefined); - message.clientStreaming !== undefined && (obj.clientStreaming = message.clientStreaming); - message.serverStreaming !== undefined && (obj.serverStreaming = message.serverStreaming); + if (message.name !== "") { + obj.name = message.name; + } + if (message.inputType !== "") { + obj.inputType = message.inputType; + } + if (message.outputType !== "") { + obj.outputType = message.outputType; + } + if (message.options !== undefined) { + obj.options = MethodOptions.toJSON(message.options); + } + if (message.clientStreaming === true) { + obj.clientStreaming = message.clientStreaming; + } + if (message.serverStreaming === true) { + obj.serverStreaming = message.serverStreaming; + } return obj; }, @@ -3497,31 +3527,68 @@ export const FileOptions = { toJSON(message: FileOptions): unknown { const obj: any = {}; - message.javaPackage !== undefined && (obj.javaPackage = message.javaPackage); - message.javaOuterClassname !== undefined && (obj.javaOuterClassname = message.javaOuterClassname); - message.javaMultipleFiles !== undefined && (obj.javaMultipleFiles = message.javaMultipleFiles); - message.javaGenerateEqualsAndHash !== undefined && - (obj.javaGenerateEqualsAndHash = message.javaGenerateEqualsAndHash); - message.javaStringCheckUtf8 !== undefined && (obj.javaStringCheckUtf8 = message.javaStringCheckUtf8); - message.optimizeFor !== undefined && (obj.optimizeFor = fileOptions_OptimizeModeToJSON(message.optimizeFor)); - message.goPackage !== undefined && (obj.goPackage = message.goPackage); - message.ccGenericServices !== undefined && (obj.ccGenericServices = message.ccGenericServices); - message.javaGenericServices !== undefined && (obj.javaGenericServices = message.javaGenericServices); - message.pyGenericServices !== undefined && (obj.pyGenericServices = message.pyGenericServices); - message.phpGenericServices !== undefined && (obj.phpGenericServices = message.phpGenericServices); - message.deprecated !== undefined && (obj.deprecated = message.deprecated); - message.ccEnableArenas !== undefined && (obj.ccEnableArenas = message.ccEnableArenas); - message.objcClassPrefix !== undefined && (obj.objcClassPrefix = message.objcClassPrefix); - message.csharpNamespace !== undefined && (obj.csharpNamespace = message.csharpNamespace); - message.swiftPrefix !== undefined && (obj.swiftPrefix = message.swiftPrefix); - message.phpClassPrefix !== undefined && (obj.phpClassPrefix = message.phpClassPrefix); - message.phpNamespace !== undefined && (obj.phpNamespace = message.phpNamespace); - message.phpMetadataNamespace !== undefined && (obj.phpMetadataNamespace = message.phpMetadataNamespace); - message.rubyPackage !== undefined && (obj.rubyPackage = message.rubyPackage); - if (message.uninterpretedOption) { - obj.uninterpretedOption = message.uninterpretedOption.map((e) => e ? UninterpretedOption.toJSON(e) : undefined); - } else { - obj.uninterpretedOption = []; + if (message.javaPackage !== "") { + obj.javaPackage = message.javaPackage; + } + if (message.javaOuterClassname !== "") { + obj.javaOuterClassname = message.javaOuterClassname; + } + if (message.javaMultipleFiles === true) { + obj.javaMultipleFiles = message.javaMultipleFiles; + } + if (message.javaGenerateEqualsAndHash === true) { + obj.javaGenerateEqualsAndHash = message.javaGenerateEqualsAndHash; + } + if (message.javaStringCheckUtf8 === true) { + obj.javaStringCheckUtf8 = message.javaStringCheckUtf8; + } + if (message.optimizeFor !== 1) { + obj.optimizeFor = fileOptions_OptimizeModeToJSON(message.optimizeFor); + } + if (message.goPackage !== "") { + obj.goPackage = message.goPackage; + } + if (message.ccGenericServices === true) { + obj.ccGenericServices = message.ccGenericServices; + } + if (message.javaGenericServices === true) { + obj.javaGenericServices = message.javaGenericServices; + } + if (message.pyGenericServices === true) { + obj.pyGenericServices = message.pyGenericServices; + } + if (message.phpGenericServices === true) { + obj.phpGenericServices = message.phpGenericServices; + } + if (message.deprecated === true) { + obj.deprecated = message.deprecated; + } + if (message.ccEnableArenas === true) { + obj.ccEnableArenas = message.ccEnableArenas; + } + if (message.objcClassPrefix !== "") { + obj.objcClassPrefix = message.objcClassPrefix; + } + if (message.csharpNamespace !== "") { + obj.csharpNamespace = message.csharpNamespace; + } + if (message.swiftPrefix !== "") { + obj.swiftPrefix = message.swiftPrefix; + } + if (message.phpClassPrefix !== "") { + obj.phpClassPrefix = message.phpClassPrefix; + } + if (message.phpNamespace !== "") { + obj.phpNamespace = message.phpNamespace; + } + if (message.phpMetadataNamespace !== "") { + obj.phpMetadataNamespace = message.phpMetadataNamespace; + } + if (message.rubyPackage !== "") { + obj.rubyPackage = message.rubyPackage; + } + if (message.uninterpretedOption?.length) { + obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e)); } return obj; }, @@ -3733,15 +3800,20 @@ export const MessageOptions = { toJSON(message: MessageOptions): unknown { const obj: any = {}; - message.messageSetWireFormat !== undefined && (obj.messageSetWireFormat = message.messageSetWireFormat); - message.noStandardDescriptorAccessor !== undefined && - (obj.noStandardDescriptorAccessor = message.noStandardDescriptorAccessor); - message.deprecated !== undefined && (obj.deprecated = message.deprecated); - message.mapEntry !== undefined && (obj.mapEntry = message.mapEntry); - if (message.uninterpretedOption) { - obj.uninterpretedOption = message.uninterpretedOption.map((e) => e ? UninterpretedOption.toJSON(e) : undefined); - } else { - obj.uninterpretedOption = []; + if (message.messageSetWireFormat === true) { + obj.messageSetWireFormat = message.messageSetWireFormat; + } + if (message.noStandardDescriptorAccessor === true) { + obj.noStandardDescriptorAccessor = message.noStandardDescriptorAccessor; + } + if (message.deprecated === true) { + obj.deprecated = message.deprecated; + } + if (message.mapEntry === true) { + obj.mapEntry = message.mapEntry; + } + if (message.uninterpretedOption?.length) { + obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e)); } return obj; }, @@ -3951,16 +4023,26 @@ export const FieldOptions = { toJSON(message: FieldOptions): unknown { const obj: any = {}; - message.ctype !== undefined && (obj.ctype = fieldOptions_CTypeToJSON(message.ctype)); - message.packed !== undefined && (obj.packed = message.packed); - message.jstype !== undefined && (obj.jstype = fieldOptions_JSTypeToJSON(message.jstype)); - message.lazy !== undefined && (obj.lazy = message.lazy); - message.deprecated !== undefined && (obj.deprecated = message.deprecated); - message.weak !== undefined && (obj.weak = message.weak); - if (message.uninterpretedOption) { - obj.uninterpretedOption = message.uninterpretedOption.map((e) => e ? UninterpretedOption.toJSON(e) : undefined); - } else { - obj.uninterpretedOption = []; + if (message.ctype !== 0) { + obj.ctype = fieldOptions_CTypeToJSON(message.ctype); + } + if (message.packed === true) { + obj.packed = message.packed; + } + if (message.jstype !== 0) { + obj.jstype = fieldOptions_JSTypeToJSON(message.jstype); + } + if (message.lazy === true) { + obj.lazy = message.lazy; + } + if (message.deprecated === true) { + obj.deprecated = message.deprecated; + } + if (message.weak === true) { + obj.weak = message.weak; + } + if (message.uninterpretedOption?.length) { + obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e)); } return obj; }, @@ -4106,10 +4188,8 @@ export const OneofOptions = { toJSON(message: OneofOptions): unknown { const obj: any = {}; - if (message.uninterpretedOption) { - obj.uninterpretedOption = message.uninterpretedOption.map((e) => e ? UninterpretedOption.toJSON(e) : undefined); - } else { - obj.uninterpretedOption = []; + if (message.uninterpretedOption?.length) { + obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e)); } return obj; }, @@ -4271,12 +4351,14 @@ export const EnumOptions = { toJSON(message: EnumOptions): unknown { const obj: any = {}; - message.allowAlias !== undefined && (obj.allowAlias = message.allowAlias); - message.deprecated !== undefined && (obj.deprecated = message.deprecated); - if (message.uninterpretedOption) { - obj.uninterpretedOption = message.uninterpretedOption.map((e) => e ? UninterpretedOption.toJSON(e) : undefined); - } else { - obj.uninterpretedOption = []; + if (message.allowAlias === true) { + obj.allowAlias = message.allowAlias; + } + if (message.deprecated === true) { + obj.deprecated = message.deprecated; + } + if (message.uninterpretedOption?.length) { + obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e)); } return obj; }, @@ -4429,11 +4511,11 @@ export const EnumValueOptions = { toJSON(message: EnumValueOptions): unknown { const obj: any = {}; - message.deprecated !== undefined && (obj.deprecated = message.deprecated); - if (message.uninterpretedOption) { - obj.uninterpretedOption = message.uninterpretedOption.map((e) => e ? UninterpretedOption.toJSON(e) : undefined); - } else { - obj.uninterpretedOption = []; + if (message.deprecated === true) { + obj.deprecated = message.deprecated; + } + if (message.uninterpretedOption?.length) { + obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e)); } return obj; }, @@ -4585,11 +4667,11 @@ export const ServiceOptions = { toJSON(message: ServiceOptions): unknown { const obj: any = {}; - message.deprecated !== undefined && (obj.deprecated = message.deprecated); - if (message.uninterpretedOption) { - obj.uninterpretedOption = message.uninterpretedOption.map((e) => e ? UninterpretedOption.toJSON(e) : undefined); - } else { - obj.uninterpretedOption = []; + if (message.deprecated === true) { + obj.deprecated = message.deprecated; + } + if (message.uninterpretedOption?.length) { + obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e)); } return obj; }, @@ -4754,13 +4836,14 @@ export const MethodOptions = { toJSON(message: MethodOptions): unknown { const obj: any = {}; - message.deprecated !== undefined && (obj.deprecated = message.deprecated); - message.idempotencyLevel !== undefined && - (obj.idempotencyLevel = methodOptions_IdempotencyLevelToJSON(message.idempotencyLevel)); - if (message.uninterpretedOption) { - obj.uninterpretedOption = message.uninterpretedOption.map((e) => e ? UninterpretedOption.toJSON(e) : undefined); - } else { - obj.uninterpretedOption = []; + if (message.deprecated === true) { + obj.deprecated = message.deprecated; + } + if (message.idempotencyLevel !== 0) { + obj.idempotencyLevel = methodOptions_IdempotencyLevelToJSON(message.idempotencyLevel); + } + if (message.uninterpretedOption?.length) { + obj.uninterpretedOption = message.uninterpretedOption.map((e) => UninterpretedOption.toJSON(e)); } return obj; }, @@ -4922,18 +5005,27 @@ export const UninterpretedOption = { toJSON(message: UninterpretedOption): unknown { const obj: any = {}; - if (message.name) { - obj.name = message.name.map((e) => e ? UninterpretedOption_NamePart.toJSON(e) : undefined); - } else { - obj.name = []; - } - message.identifierValue !== undefined && (obj.identifierValue = message.identifierValue); - message.positiveIntValue !== undefined && (obj.positiveIntValue = Math.round(message.positiveIntValue)); - message.negativeIntValue !== undefined && (obj.negativeIntValue = Math.round(message.negativeIntValue)); - message.doubleValue !== undefined && (obj.doubleValue = message.doubleValue); - message.stringValue !== undefined && - (obj.stringValue = base64FromBytes(message.stringValue !== undefined ? message.stringValue : new Uint8Array(0))); - message.aggregateValue !== undefined && (obj.aggregateValue = message.aggregateValue); + if (message.name?.length) { + obj.name = message.name.map((e) => UninterpretedOption_NamePart.toJSON(e)); + } + if (message.identifierValue !== "") { + obj.identifierValue = message.identifierValue; + } + if (message.positiveIntValue !== 0) { + obj.positiveIntValue = Math.round(message.positiveIntValue); + } + if (message.negativeIntValue !== 0) { + obj.negativeIntValue = Math.round(message.negativeIntValue); + } + if (message.doubleValue !== 0) { + obj.doubleValue = message.doubleValue; + } + if (message.stringValue.length !== 0) { + obj.stringValue = base64FromBytes(message.stringValue); + } + if (message.aggregateValue !== "") { + obj.aggregateValue = message.aggregateValue; + } return obj; }, @@ -5035,8 +5127,12 @@ export const UninterpretedOption_NamePart = { toJSON(message: UninterpretedOption_NamePart): unknown { const obj: any = {}; - message.namePart !== undefined && (obj.namePart = message.namePart); - message.isExtension !== undefined && (obj.isExtension = message.isExtension); + if (message.namePart !== "") { + obj.namePart = message.namePart; + } + if (message.isExtension === true) { + obj.isExtension = message.isExtension; + } return obj; }, @@ -5124,10 +5220,8 @@ export const SourceCodeInfo = { toJSON(message: SourceCodeInfo): unknown { const obj: any = {}; - if (message.location) { - obj.location = message.location.map((e) => e ? SourceCodeInfo_Location.toJSON(e) : undefined); - } else { - obj.location = []; + if (message.location?.length) { + obj.location = message.location.map((e) => SourceCodeInfo_Location.toJSON(e)); } return obj; }, @@ -5283,22 +5377,20 @@ export const SourceCodeInfo_Location = { toJSON(message: SourceCodeInfo_Location): unknown { const obj: any = {}; - if (message.path) { + if (message.path?.length) { obj.path = message.path.map((e) => Math.round(e)); - } else { - obj.path = []; } - if (message.span) { + if (message.span?.length) { obj.span = message.span.map((e) => Math.round(e)); - } else { - obj.span = []; } - message.leadingComments !== undefined && (obj.leadingComments = message.leadingComments); - message.trailingComments !== undefined && (obj.trailingComments = message.trailingComments); - if (message.leadingDetachedComments) { - obj.leadingDetachedComments = message.leadingDetachedComments.map((e) => e); - } else { - obj.leadingDetachedComments = []; + if (message.leadingComments !== "") { + obj.leadingComments = message.leadingComments; + } + if (message.trailingComments !== "") { + obj.trailingComments = message.trailingComments; + } + if (message.leadingDetachedComments?.length) { + obj.leadingDetachedComments = message.leadingDetachedComments; } return obj; }, @@ -5390,10 +5482,8 @@ export const GeneratedCodeInfo = { toJSON(message: GeneratedCodeInfo): unknown { const obj: any = {}; - if (message.annotation) { - obj.annotation = message.annotation.map((e) => e ? GeneratedCodeInfo_Annotation.toJSON(e) : undefined); - } else { - obj.annotation = []; + if (message.annotation?.length) { + obj.annotation = message.annotation.map((e) => GeneratedCodeInfo_Annotation.toJSON(e)); } return obj; }, @@ -5524,14 +5614,18 @@ export const GeneratedCodeInfo_Annotation = { toJSON(message: GeneratedCodeInfo_Annotation): unknown { const obj: any = {}; - if (message.path) { + if (message.path?.length) { obj.path = message.path.map((e) => Math.round(e)); - } else { - obj.path = []; } - message.sourceFile !== undefined && (obj.sourceFile = message.sourceFile); - message.begin !== undefined && (obj.begin = Math.round(message.begin)); - message.end !== undefined && (obj.end = Math.round(message.end)); + if (message.sourceFile !== "") { + obj.sourceFile = message.sourceFile; + } + if (message.begin !== 0) { + obj.begin = Math.round(message.begin); + } + if (message.end !== 0) { + obj.end = Math.round(message.end); + } return obj; }, diff --git a/protos/package.json b/protos/package.json index eba44c2cf..bed956c1c 100644 --- a/protos/package.json +++ b/protos/package.json @@ -1,6 +1,6 @@ { "name": "ts-proto-descriptors", - "version": "1.13.0", + "version": "1.14.0", "description": "", "repository": "github:stephenh/ts-proto", "keywords": [], @@ -16,7 +16,7 @@ "protobufjs": "^7.2.4" }, "devDependencies": { - "ts-proto": "^1.153.0", + "ts-proto": "^1.155.0", "typescript": "^5.1.3" } } diff --git a/protos/yarn.lock b/protos/yarn.lock index eff8e154c..dff3ea66d 100644 --- a/protos/yarn.lock +++ b/protos/yarn.lock @@ -78,13 +78,6 @@ __metadata: languageName: node linkType: hard -"@types/long@npm:^4.0.1": - version: 4.0.1 - resolution: "@types/long@npm:4.0.1" - checksum: ff9653c33f5000d0f131fd98a950a0343e2e33107dd067a97ac4a3b9678e1a2e39ea44772ad920f54ef6e8f107f76bc92c2584ba905a0dc4253282a4101166d0 - languageName: node - linkType: hard - "@types/node@npm:>=13.7.0": version: 17.0.38 resolution: "@types/node@npm:17.0.38" @@ -92,24 +85,10 @@ __metadata: languageName: node linkType: hard -"@types/object-hash@npm:^3.0.2": - version: 3.0.2 - resolution: "@types/object-hash@npm:3.0.2" - checksum: 0332e59074e7df2e74c093a7419c05c1e1c5ae1e12d3779f3240b3031835ff045b4ac591362be0b411ace24d3b5e760386b434761c33af25904f7a3645cb3785 - languageName: node - linkType: hard - -"case-anything@npm:^2.1.10": - version: 2.1.10 - resolution: "case-anything@npm:2.1.10" - checksum: eff2769d7da178115be8ac2617ccbb850664ffd36f0a897e000d9dd5a64300141128f6a8fe024bd98ec63cc9173a72c1426bbcaac328c8a44109ce15f7c14a5e - languageName: node - linkType: hard - -"dataloader@npm:^1.4.0": - version: 1.4.0 - resolution: "dataloader@npm:1.4.0" - checksum: e2c93d43afde68980efc0cd9ff48e9851116e27a9687f863e02b56d46f7e7868cc762cd6dcbaf4197e1ca850a03651510c165c2ae24b8e9843fd894002ad0e20 +"case-anything@npm:^2.1.13": + version: 2.1.13 + resolution: "case-anything@npm:2.1.13" + checksum: c39c69d7e418337b6006a9692f13c2b257e907e867149a102e9beb7e9d2d52da14e754da1f4e4ce82a866d86d93047e522f64360bda54e7d7c308f4cdd736c3d languageName: node linkType: hard @@ -131,13 +110,6 @@ __metadata: languageName: node linkType: hard -"long@npm:^4.0.0": - version: 4.0.0 - resolution: "long@npm:4.0.0" - checksum: 16afbe8f749c7c849db1f4de4e2e6a31ac6e617cead3bdc4f9605cb703cd20e1e9fc1a7baba674ffcca57d660a6e5b53a9e236d7b25a295d3855cca79cc06744 - languageName: node - linkType: hard - "long@npm:^5.0.0": version: 5.2.3 resolution: "long@npm:5.2.3" @@ -145,37 +117,6 @@ __metadata: languageName: node linkType: hard -"object-hash@npm:^3.0.0": - version: 3.0.0 - resolution: "object-hash@npm:3.0.0" - checksum: 80b4904bb3857c52cc1bfd0b52c0352532ca12ed3b8a6ff06a90cd209dfda1b95cee059a7625eb9da29537027f68ac4619363491eedb2f5d3dddbba97494fd6c - languageName: node - linkType: hard - -"protobufjs@npm:^6.8.8": - version: 6.11.3 - resolution: "protobufjs@npm:6.11.3" - dependencies: - "@protobufjs/aspromise": ^1.1.2 - "@protobufjs/base64": ^1.1.2 - "@protobufjs/codegen": ^2.0.4 - "@protobufjs/eventemitter": ^1.1.0 - "@protobufjs/fetch": ^1.1.0 - "@protobufjs/float": ^1.0.2 - "@protobufjs/inquire": ^1.1.0 - "@protobufjs/path": ^1.1.2 - "@protobufjs/pool": ^1.1.0 - "@protobufjs/utf8": ^1.1.0 - "@types/long": ^4.0.1 - "@types/node": ">=13.7.0" - long: ^4.0.0 - bin: - pbjs: bin/pbjs - pbts: bin/pbts - checksum: 4a6ce1964167e4c45c53fd8a312d7646415c777dd31b4ba346719947b88e61654912326101f927da387d6b6473ab52a7ea4f54d6f15d63b31130ce28e2e15070 - languageName: node - linkType: hard - "protobufjs@npm:^7.2.4": version: 7.2.4 resolution: "protobufjs@npm:7.2.4" @@ -196,50 +137,37 @@ __metadata: languageName: node linkType: hard -"ts-poet@npm:^6.4.1": - version: 6.4.1 - resolution: "ts-poet@npm:6.4.1" +"ts-poet@npm:^6.5.0": + version: 6.5.0 + resolution: "ts-poet@npm:6.5.0" dependencies: dprint-node: ^1.0.7 - checksum: 2595caa15fe374b4dd5e1c09fd26b3d5e2fa24ef6153c25a41a4c01ed999682daed9e5753ead72862a099d197dc2bf8827b083632abc78754d9f0d55462f3e55 - languageName: node - linkType: hard - -"ts-proto-descriptors@npm:1.9.0": - version: 1.9.0 - resolution: "ts-proto-descriptors@npm:1.9.0" - dependencies: - long: ^4.0.0 - protobufjs: ^6.8.8 - checksum: 6818c03c7688db0ceb74d3b5108b127afa2994854113fbb599de4e7610d0c725601feb9ba0d8cd718a2f9d729172865d80d0b0797995b6515e03c5df69bf793c + checksum: 1a3705c7864cb0dc6f9305884a91a6582fdd93257977324cda8ea7e3e5dbd7525cbc3fb4d5753a088356a4b8b3fb9245d83c244740f52881725a79ab36d0d168 languageName: node linkType: hard -"ts-proto-descriptors@workspace:.": +"ts-proto-descriptors@1.13.0, ts-proto-descriptors@workspace:.": version: 0.0.0-use.local resolution: "ts-proto-descriptors@workspace:." dependencies: long: ^5.0.0 protobufjs: ^7.2.4 - ts-proto: ^1.153.0 + ts-proto: ^1.155.0 typescript: ^5.1.3 languageName: unknown linkType: soft -"ts-proto@npm:^1.153.0": - version: 1.153.0 - resolution: "ts-proto@npm:1.153.0" +"ts-proto@npm:^1.155.0": + version: 1.155.0 + resolution: "ts-proto@npm:1.155.0" dependencies: - "@types/object-hash": ^3.0.2 - case-anything: ^2.1.10 - dataloader: ^1.4.0 - object-hash: ^3.0.0 + case-anything: ^2.1.13 protobufjs: ^7.2.4 - ts-poet: ^6.4.1 - ts-proto-descriptors: 1.9.0 + ts-poet: ^6.5.0 + ts-proto-descriptors: 1.13.0 bin: protoc-gen-ts_proto: protoc-gen-ts_proto - checksum: 1c0a933f0c28f13acde9c138c2eb54cd806d4fd8869a1c06d803a23828793abc830da81c3a096a1ede4fbb26791cf8da70a2524868cc654bce22c3a43e5d1640 + checksum: e159bd3e7539c98e362fc3ab10a8bb96fabf1f9c10d80ace794608910f9ac98102f2dbcaeb075b825951dac8d0c642d69ea1bdcc7841cce79520eb7e55983ae1 languageName: node linkType: hard diff --git a/yarn.lock b/yarn.lock index 11310949d..8e844ba01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7807,13 +7807,13 @@ __metadata: languageName: node linkType: hard -"ts-proto-descriptors@npm:1.13.0": - version: 1.13.0 - resolution: "ts-proto-descriptors@npm:1.13.0" +"ts-proto-descriptors@npm:1.14.0": + version: 1.14.0 + resolution: "ts-proto-descriptors@npm:1.14.0" dependencies: long: ^5.0.0 protobufjs: ^7.2.4 - checksum: 5979d706d91cf3868a6a41ad182c679adc4ec79094d5f679a98c7e710c905f602cfe1d5d225140b98f70deaa4e920dfa3a7b259c1849e8fa1f2fde2b2ce2eb10 + checksum: 640486137fda4085d0efe1a4a47642396da958d3592e50f813585a7d64042bd4544e6154445921ba93083401179a7bca7e30ee5833ecc06a10a235eff48f93ff languageName: node linkType: hard @@ -7855,7 +7855,7 @@ __metadata: semantic-release: ^21.0.7 ts-jest: ^29.1.1 ts-poet: ^6.5.0 - ts-proto-descriptors: 1.13.0 + ts-proto-descriptors: 1.14.0 tsx: ^3.12.7 typescript: ^5.1.6 uglify-js: ^3.17.4