diff --git a/packages/proto-loader/golden-generated/echo.ts b/packages/proto-loader/golden-generated/echo.ts index 600e2864..6bc8e562 100644 --- a/packages/proto-loader/golden-generated/echo.ts +++ b/packages/proto-loader/golden-generated/echo.ts @@ -42,11 +42,15 @@ export interface ProtoGrpcType { Any: MessageTypeDefinition DescriptorProto: MessageTypeDefinition Duration: MessageTypeDefinition + Edition: EnumTypeDefinition Empty: MessageTypeDefinition EnumDescriptorProto: MessageTypeDefinition EnumOptions: MessageTypeDefinition EnumValueDescriptorProto: MessageTypeDefinition EnumValueOptions: MessageTypeDefinition + ExtensionRangeOptions: MessageTypeDefinition + FeatureSet: MessageTypeDefinition + FeatureSetDefaults: MessageTypeDefinition FieldDescriptorProto: MessageTypeDefinition FieldOptions: MessageTypeDefinition FileDescriptorProto: MessageTypeDefinition @@ -61,6 +65,7 @@ export interface ProtoGrpcType { ServiceDescriptorProto: MessageTypeDefinition ServiceOptions: MessageTypeDefinition SourceCodeInfo: MessageTypeDefinition + SymbolVisibility: EnumTypeDefinition Timestamp: MessageTypeDefinition UninterpretedOption: MessageTypeDefinition } diff --git a/packages/proto-loader/golden-generated/google/protobuf/DescriptorProto.ts b/packages/proto-loader/golden-generated/google/protobuf/DescriptorProto.ts index 5f568ca2..55acb170 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/DescriptorProto.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/DescriptorProto.ts @@ -5,15 +5,19 @@ import type { IDescriptorProto as I_google_protobuf_DescriptorProto, ODescriptor import type { IEnumDescriptorProto as I_google_protobuf_EnumDescriptorProto, OEnumDescriptorProto as O_google_protobuf_EnumDescriptorProto } from '../../google/protobuf/EnumDescriptorProto'; import type { IMessageOptions as I_google_protobuf_MessageOptions, OMessageOptions as O_google_protobuf_MessageOptions } from '../../google/protobuf/MessageOptions'; import type { IOneofDescriptorProto as I_google_protobuf_OneofDescriptorProto, OOneofDescriptorProto as O_google_protobuf_OneofDescriptorProto } from '../../google/protobuf/OneofDescriptorProto'; +import type { ISymbolVisibility as I_google_protobuf_SymbolVisibility, OSymbolVisibility as O_google_protobuf_SymbolVisibility } from '../../google/protobuf/SymbolVisibility'; +import type { IExtensionRangeOptions as I_google_protobuf_ExtensionRangeOptions, OExtensionRangeOptions as O_google_protobuf_ExtensionRangeOptions } from '../../google/protobuf/ExtensionRangeOptions'; export interface I_google_protobuf_DescriptorProto_ExtensionRange { 'start'?: (number); 'end'?: (number); + 'options'?: (I_google_protobuf_ExtensionRangeOptions | null); } export interface O_google_protobuf_DescriptorProto_ExtensionRange { 'start': (number); 'end': (number); + 'options': (O_google_protobuf_ExtensionRangeOptions | null); } export interface I_google_protobuf_DescriptorProto_ReservedRange { @@ -37,6 +41,7 @@ export interface IDescriptorProto { 'oneofDecl'?: (I_google_protobuf_OneofDescriptorProto)[]; 'reservedRange'?: (I_google_protobuf_DescriptorProto_ReservedRange)[]; 'reservedName'?: (string)[]; + 'visibility'?: (I_google_protobuf_SymbolVisibility); } export interface ODescriptorProto { @@ -50,4 +55,5 @@ export interface ODescriptorProto { 'oneofDecl': (O_google_protobuf_OneofDescriptorProto)[]; 'reservedRange': (O_google_protobuf_DescriptorProto_ReservedRange)[]; 'reservedName': (string)[]; + 'visibility': (O_google_protobuf_SymbolVisibility); } diff --git a/packages/proto-loader/golden-generated/google/protobuf/Edition.ts b/packages/proto-loader/golden-generated/google/protobuf/Edition.ts new file mode 100644 index 00000000..fef399cd --- /dev/null +++ b/packages/proto-loader/golden-generated/google/protobuf/Edition.ts @@ -0,0 +1,44 @@ +// Original file: null + +export const Edition = { + EDITION_UNKNOWN: 'EDITION_UNKNOWN', + EDITION_LEGACY: 'EDITION_LEGACY', + EDITION_PROTO2: 'EDITION_PROTO2', + EDITION_PROTO3: 'EDITION_PROTO3', + EDITION_2023: 'EDITION_2023', + EDITION_2024: 'EDITION_2024', + EDITION_1_TEST_ONLY: 'EDITION_1_TEST_ONLY', + EDITION_2_TEST_ONLY: 'EDITION_2_TEST_ONLY', + EDITION_99997_TEST_ONLY: 'EDITION_99997_TEST_ONLY', + EDITION_99998_TEST_ONLY: 'EDITION_99998_TEST_ONLY', + EDITION_99999_TEST_ONLY: 'EDITION_99999_TEST_ONLY', + EDITION_MAX: 'EDITION_MAX', +} as const; + +export type IEdition = + | 'EDITION_UNKNOWN' + | 0 + | 'EDITION_LEGACY' + | 900 + | 'EDITION_PROTO2' + | 998 + | 'EDITION_PROTO3' + | 999 + | 'EDITION_2023' + | 1000 + | 'EDITION_2024' + | 1001 + | 'EDITION_1_TEST_ONLY' + | 1 + | 'EDITION_2_TEST_ONLY' + | 2 + | 'EDITION_99997_TEST_ONLY' + | 99997 + | 'EDITION_99998_TEST_ONLY' + | 99998 + | 'EDITION_99999_TEST_ONLY' + | 99999 + | 'EDITION_MAX' + | 2147483647 + +export type OEdition = typeof Edition[keyof typeof Edition] diff --git a/packages/proto-loader/golden-generated/google/protobuf/EnumDescriptorProto.ts b/packages/proto-loader/golden-generated/google/protobuf/EnumDescriptorProto.ts index 30f52c61..8ffacbee 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/EnumDescriptorProto.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/EnumDescriptorProto.ts @@ -2,15 +2,32 @@ import type { IEnumValueDescriptorProto as I_google_protobuf_EnumValueDescriptorProto, OEnumValueDescriptorProto as O_google_protobuf_EnumValueDescriptorProto } from '../../google/protobuf/EnumValueDescriptorProto'; import type { IEnumOptions as I_google_protobuf_EnumOptions, OEnumOptions as O_google_protobuf_EnumOptions } from '../../google/protobuf/EnumOptions'; +import type { ISymbolVisibility as I_google_protobuf_SymbolVisibility, OSymbolVisibility as O_google_protobuf_SymbolVisibility } from '../../google/protobuf/SymbolVisibility'; + +export interface I_google_protobuf_EnumDescriptorProto_EnumReservedRange { + 'start'?: (number); + 'end'?: (number); +} + +export interface O_google_protobuf_EnumDescriptorProto_EnumReservedRange { + 'start': (number); + 'end': (number); +} export interface IEnumDescriptorProto { 'name'?: (string); 'value'?: (I_google_protobuf_EnumValueDescriptorProto)[]; 'options'?: (I_google_protobuf_EnumOptions | null); + 'reservedRange'?: (I_google_protobuf_EnumDescriptorProto_EnumReservedRange)[]; + 'reservedName'?: (string)[]; + 'visibility'?: (I_google_protobuf_SymbolVisibility); } export interface OEnumDescriptorProto { 'name': (string); 'value': (O_google_protobuf_EnumValueDescriptorProto)[]; 'options': (O_google_protobuf_EnumOptions | null); + 'reservedRange': (O_google_protobuf_EnumDescriptorProto_EnumReservedRange)[]; + 'reservedName': (string)[]; + 'visibility': (O_google_protobuf_SymbolVisibility); } diff --git a/packages/proto-loader/golden-generated/google/protobuf/EnumOptions.ts b/packages/proto-loader/golden-generated/google/protobuf/EnumOptions.ts index 6d2a0c2c..005e0a29 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/EnumOptions.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/EnumOptions.ts @@ -1,15 +1,26 @@ // Original file: null +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; import type { IUninterpretedOption as I_google_protobuf_UninterpretedOption, OUninterpretedOption as O_google_protobuf_UninterpretedOption } from '../../google/protobuf/UninterpretedOption'; export interface IEnumOptions { 'allowAlias'?: (boolean); 'deprecated'?: (boolean); + /** + * @deprecated + */ + 'deprecatedLegacyJsonFieldConflicts'?: (boolean); + 'features'?: (I_google_protobuf_FeatureSet | null); 'uninterpretedOption'?: (I_google_protobuf_UninterpretedOption)[]; } export interface OEnumOptions { 'allowAlias': (boolean); 'deprecated': (boolean); + /** + * @deprecated + */ + 'deprecatedLegacyJsonFieldConflicts': (boolean); + 'features': (O_google_protobuf_FeatureSet | null); 'uninterpretedOption': (O_google_protobuf_UninterpretedOption)[]; } diff --git a/packages/proto-loader/golden-generated/google/protobuf/EnumValueOptions.ts b/packages/proto-loader/golden-generated/google/protobuf/EnumValueOptions.ts index 14338111..e3c30684 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/EnumValueOptions.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/EnumValueOptions.ts @@ -1,13 +1,21 @@ // Original file: null +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; +import type { I_google_protobuf_FieldOptions_FeatureSupport, O_google_protobuf_FieldOptions_FeatureSupport } from '../../google/protobuf/FieldOptions'; import type { IUninterpretedOption as I_google_protobuf_UninterpretedOption, OUninterpretedOption as O_google_protobuf_UninterpretedOption } from '../../google/protobuf/UninterpretedOption'; export interface IEnumValueOptions { 'deprecated'?: (boolean); + 'features'?: (I_google_protobuf_FeatureSet | null); + 'debugRedact'?: (boolean); + 'featureSupport'?: (I_google_protobuf_FieldOptions_FeatureSupport | null); 'uninterpretedOption'?: (I_google_protobuf_UninterpretedOption)[]; } export interface OEnumValueOptions { 'deprecated': (boolean); + 'features': (O_google_protobuf_FeatureSet | null); + 'debugRedact': (boolean); + 'featureSupport': (O_google_protobuf_FieldOptions_FeatureSupport | null); 'uninterpretedOption': (O_google_protobuf_UninterpretedOption)[]; } diff --git a/packages/proto-loader/golden-generated/google/protobuf/ExtensionRangeOptions.ts b/packages/proto-loader/golden-generated/google/protobuf/ExtensionRangeOptions.ts new file mode 100644 index 00000000..f4366521 --- /dev/null +++ b/packages/proto-loader/golden-generated/google/protobuf/ExtensionRangeOptions.ts @@ -0,0 +1,49 @@ +// Original file: null + +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; +import type { IUninterpretedOption as I_google_protobuf_UninterpretedOption, OUninterpretedOption as O_google_protobuf_UninterpretedOption } from '../../google/protobuf/UninterpretedOption'; + +export interface I_google_protobuf_ExtensionRangeOptions_Declaration { + 'number'?: (number); + 'fullName'?: (string); + 'type'?: (string); + 'reserved'?: (boolean); + 'repeated'?: (boolean); +} + +export interface O_google_protobuf_ExtensionRangeOptions_Declaration { + 'number': (number); + 'fullName': (string); + 'type': (string); + 'reserved': (boolean); + 'repeated': (boolean); +} + +// Original file: null + +export const _google_protobuf_ExtensionRangeOptions_VerificationState = { + DECLARATION: 'DECLARATION', + UNVERIFIED: 'UNVERIFIED', +} as const; + +export type I_google_protobuf_ExtensionRangeOptions_VerificationState = + | 'DECLARATION' + | 0 + | 'UNVERIFIED' + | 1 + +export type O_google_protobuf_ExtensionRangeOptions_VerificationState = typeof _google_protobuf_ExtensionRangeOptions_VerificationState[keyof typeof _google_protobuf_ExtensionRangeOptions_VerificationState] + +export interface IExtensionRangeOptions { + 'declaration'?: (I_google_protobuf_ExtensionRangeOptions_Declaration)[]; + 'verification'?: (I_google_protobuf_ExtensionRangeOptions_VerificationState); + 'features'?: (I_google_protobuf_FeatureSet | null); + 'uninterpretedOption'?: (I_google_protobuf_UninterpretedOption)[]; +} + +export interface OExtensionRangeOptions { + 'declaration': (O_google_protobuf_ExtensionRangeOptions_Declaration)[]; + 'verification': (O_google_protobuf_ExtensionRangeOptions_VerificationState); + 'features': (O_google_protobuf_FeatureSet | null); + 'uninterpretedOption': (O_google_protobuf_UninterpretedOption)[]; +} diff --git a/packages/proto-loader/golden-generated/google/protobuf/FeatureSet.ts b/packages/proto-loader/golden-generated/google/protobuf/FeatureSet.ts new file mode 100644 index 00000000..60a65bb2 --- /dev/null +++ b/packages/proto-loader/golden-generated/google/protobuf/FeatureSet.ts @@ -0,0 +1,183 @@ +// Original file: null + + +// Original file: null + +export const _google_protobuf_FeatureSet_VisibilityFeature_DefaultSymbolVisibility = { + DEFAULT_SYMBOL_VISIBILITY_UNKNOWN: 'DEFAULT_SYMBOL_VISIBILITY_UNKNOWN', + EXPORT_ALL: 'EXPORT_ALL', + EXPORT_TOP_LEVEL: 'EXPORT_TOP_LEVEL', + LOCAL_ALL: 'LOCAL_ALL', + STRICT: 'STRICT', +} as const; + +export type I_google_protobuf_FeatureSet_VisibilityFeature_DefaultSymbolVisibility = + | 'DEFAULT_SYMBOL_VISIBILITY_UNKNOWN' + | 0 + | 'EXPORT_ALL' + | 1 + | 'EXPORT_TOP_LEVEL' + | 2 + | 'LOCAL_ALL' + | 3 + | 'STRICT' + | 4 + +export type O_google_protobuf_FeatureSet_VisibilityFeature_DefaultSymbolVisibility = typeof _google_protobuf_FeatureSet_VisibilityFeature_DefaultSymbolVisibility[keyof typeof _google_protobuf_FeatureSet_VisibilityFeature_DefaultSymbolVisibility] + +// Original file: null + +export const _google_protobuf_FeatureSet_EnforceNamingStyle = { + ENFORCE_NAMING_STYLE_UNKNOWN: 'ENFORCE_NAMING_STYLE_UNKNOWN', + STYLE2024: 'STYLE2024', + STYLE_LEGACY: 'STYLE_LEGACY', +} as const; + +export type I_google_protobuf_FeatureSet_EnforceNamingStyle = + | 'ENFORCE_NAMING_STYLE_UNKNOWN' + | 0 + | 'STYLE2024' + | 1 + | 'STYLE_LEGACY' + | 2 + +export type O_google_protobuf_FeatureSet_EnforceNamingStyle = typeof _google_protobuf_FeatureSet_EnforceNamingStyle[keyof typeof _google_protobuf_FeatureSet_EnforceNamingStyle] + +// Original file: null + +export const _google_protobuf_FeatureSet_EnumType = { + ENUM_TYPE_UNKNOWN: 'ENUM_TYPE_UNKNOWN', + OPEN: 'OPEN', + CLOSED: 'CLOSED', +} as const; + +export type I_google_protobuf_FeatureSet_EnumType = + | 'ENUM_TYPE_UNKNOWN' + | 0 + | 'OPEN' + | 1 + | 'CLOSED' + | 2 + +export type O_google_protobuf_FeatureSet_EnumType = typeof _google_protobuf_FeatureSet_EnumType[keyof typeof _google_protobuf_FeatureSet_EnumType] + +// Original file: null + +export const _google_protobuf_FeatureSet_FieldPresence = { + FIELD_PRESENCE_UNKNOWN: 'FIELD_PRESENCE_UNKNOWN', + EXPLICIT: 'EXPLICIT', + IMPLICIT: 'IMPLICIT', + LEGACY_REQUIRED: 'LEGACY_REQUIRED', +} as const; + +export type I_google_protobuf_FeatureSet_FieldPresence = + | 'FIELD_PRESENCE_UNKNOWN' + | 0 + | 'EXPLICIT' + | 1 + | 'IMPLICIT' + | 2 + | 'LEGACY_REQUIRED' + | 3 + +export type O_google_protobuf_FeatureSet_FieldPresence = typeof _google_protobuf_FeatureSet_FieldPresence[keyof typeof _google_protobuf_FeatureSet_FieldPresence] + +// Original file: null + +export const _google_protobuf_FeatureSet_JsonFormat = { + JSON_FORMAT_UNKNOWN: 'JSON_FORMAT_UNKNOWN', + ALLOW: 'ALLOW', + LEGACY_BEST_EFFORT: 'LEGACY_BEST_EFFORT', +} as const; + +export type I_google_protobuf_FeatureSet_JsonFormat = + | 'JSON_FORMAT_UNKNOWN' + | 0 + | 'ALLOW' + | 1 + | 'LEGACY_BEST_EFFORT' + | 2 + +export type O_google_protobuf_FeatureSet_JsonFormat = typeof _google_protobuf_FeatureSet_JsonFormat[keyof typeof _google_protobuf_FeatureSet_JsonFormat] + +// Original file: null + +export const _google_protobuf_FeatureSet_MessageEncoding = { + MESSAGE_ENCODING_UNKNOWN: 'MESSAGE_ENCODING_UNKNOWN', + LENGTH_PREFIXED: 'LENGTH_PREFIXED', + DELIMITED: 'DELIMITED', +} as const; + +export type I_google_protobuf_FeatureSet_MessageEncoding = + | 'MESSAGE_ENCODING_UNKNOWN' + | 0 + | 'LENGTH_PREFIXED' + | 1 + | 'DELIMITED' + | 2 + +export type O_google_protobuf_FeatureSet_MessageEncoding = typeof _google_protobuf_FeatureSet_MessageEncoding[keyof typeof _google_protobuf_FeatureSet_MessageEncoding] + +// Original file: null + +export const _google_protobuf_FeatureSet_RepeatedFieldEncoding = { + REPEATED_FIELD_ENCODING_UNKNOWN: 'REPEATED_FIELD_ENCODING_UNKNOWN', + PACKED: 'PACKED', + EXPANDED: 'EXPANDED', +} as const; + +export type I_google_protobuf_FeatureSet_RepeatedFieldEncoding = + | 'REPEATED_FIELD_ENCODING_UNKNOWN' + | 0 + | 'PACKED' + | 1 + | 'EXPANDED' + | 2 + +export type O_google_protobuf_FeatureSet_RepeatedFieldEncoding = typeof _google_protobuf_FeatureSet_RepeatedFieldEncoding[keyof typeof _google_protobuf_FeatureSet_RepeatedFieldEncoding] + +// Original file: null + +export const _google_protobuf_FeatureSet_Utf8Validation = { + UTF8_VALIDATION_UNKNOWN: 'UTF8_VALIDATION_UNKNOWN', + VERIFY: 'VERIFY', + NONE: 'NONE', +} as const; + +export type I_google_protobuf_FeatureSet_Utf8Validation = + | 'UTF8_VALIDATION_UNKNOWN' + | 0 + | 'VERIFY' + | 2 + | 'NONE' + | 3 + +export type O_google_protobuf_FeatureSet_Utf8Validation = typeof _google_protobuf_FeatureSet_Utf8Validation[keyof typeof _google_protobuf_FeatureSet_Utf8Validation] + +export interface I_google_protobuf_FeatureSet_VisibilityFeature { +} + +export interface O_google_protobuf_FeatureSet_VisibilityFeature { +} + +export interface IFeatureSet { + 'fieldPresence'?: (I_google_protobuf_FeatureSet_FieldPresence); + 'enumType'?: (I_google_protobuf_FeatureSet_EnumType); + 'repeatedFieldEncoding'?: (I_google_protobuf_FeatureSet_RepeatedFieldEncoding); + 'utf8Validation'?: (I_google_protobuf_FeatureSet_Utf8Validation); + 'messageEncoding'?: (I_google_protobuf_FeatureSet_MessageEncoding); + 'jsonFormat'?: (I_google_protobuf_FeatureSet_JsonFormat); + 'enforceNamingStyle'?: (I_google_protobuf_FeatureSet_EnforceNamingStyle); + 'defaultSymbolVisibility'?: (I_google_protobuf_FeatureSet_VisibilityFeature_DefaultSymbolVisibility); +} + +export interface OFeatureSet { + 'fieldPresence': (O_google_protobuf_FeatureSet_FieldPresence); + 'enumType': (O_google_protobuf_FeatureSet_EnumType); + 'repeatedFieldEncoding': (O_google_protobuf_FeatureSet_RepeatedFieldEncoding); + 'utf8Validation': (O_google_protobuf_FeatureSet_Utf8Validation); + 'messageEncoding': (O_google_protobuf_FeatureSet_MessageEncoding); + 'jsonFormat': (O_google_protobuf_FeatureSet_JsonFormat); + 'enforceNamingStyle': (O_google_protobuf_FeatureSet_EnforceNamingStyle); + 'defaultSymbolVisibility': (O_google_protobuf_FeatureSet_VisibilityFeature_DefaultSymbolVisibility); +} diff --git a/packages/proto-loader/golden-generated/google/protobuf/FeatureSetDefaults.ts b/packages/proto-loader/golden-generated/google/protobuf/FeatureSetDefaults.ts new file mode 100644 index 00000000..347762cd --- /dev/null +++ b/packages/proto-loader/golden-generated/google/protobuf/FeatureSetDefaults.ts @@ -0,0 +1,28 @@ +// Original file: null + +import type { IEdition as I_google_protobuf_Edition, OEdition as O_google_protobuf_Edition } from '../../google/protobuf/Edition'; +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; + +export interface I_google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault { + 'edition'?: (I_google_protobuf_Edition); + 'overridableFeatures'?: (I_google_protobuf_FeatureSet | null); + 'fixedFeatures'?: (I_google_protobuf_FeatureSet | null); +} + +export interface O_google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault { + 'edition': (O_google_protobuf_Edition); + 'overridableFeatures': (O_google_protobuf_FeatureSet | null); + 'fixedFeatures': (O_google_protobuf_FeatureSet | null); +} + +export interface IFeatureSetDefaults { + 'defaults'?: (I_google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault)[]; + 'minimumEdition'?: (I_google_protobuf_Edition); + 'maximumEdition'?: (I_google_protobuf_Edition); +} + +export interface OFeatureSetDefaults { + 'defaults': (O_google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault)[]; + 'minimumEdition': (O_google_protobuf_Edition); + 'maximumEdition': (O_google_protobuf_Edition); +} diff --git a/packages/proto-loader/golden-generated/google/protobuf/FieldDescriptorProto.ts b/packages/proto-loader/golden-generated/google/protobuf/FieldDescriptorProto.ts index 1bcb69ab..e5131143 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/FieldDescriptorProto.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/FieldDescriptorProto.ts @@ -6,17 +6,17 @@ import type { IFieldOptions as I_google_protobuf_FieldOptions, OFieldOptions as export const _google_protobuf_FieldDescriptorProto_Label = { LABEL_OPTIONAL: 'LABEL_OPTIONAL', - LABEL_REQUIRED: 'LABEL_REQUIRED', LABEL_REPEATED: 'LABEL_REPEATED', + LABEL_REQUIRED: 'LABEL_REQUIRED', } as const; export type I_google_protobuf_FieldDescriptorProto_Label = | 'LABEL_OPTIONAL' | 1 - | 'LABEL_REQUIRED' - | 2 | 'LABEL_REPEATED' | 3 + | 'LABEL_REQUIRED' + | 2 export type O_google_protobuf_FieldDescriptorProto_Label = typeof _google_protobuf_FieldDescriptorProto_Label[keyof typeof _google_protobuf_FieldDescriptorProto_Label] @@ -94,6 +94,7 @@ export interface IFieldDescriptorProto { 'options'?: (I_google_protobuf_FieldOptions | null); 'oneofIndex'?: (number); 'jsonName'?: (string); + 'proto3Optional'?: (boolean); } export interface OFieldDescriptorProto { @@ -107,4 +108,5 @@ export interface OFieldDescriptorProto { 'options': (O_google_protobuf_FieldOptions | null); 'oneofIndex': (number); 'jsonName': (string); + 'proto3Optional': (boolean); } diff --git a/packages/proto-loader/golden-generated/google/protobuf/FieldOptions.ts b/packages/proto-loader/golden-generated/google/protobuf/FieldOptions.ts index 16e532d9..77c5a304 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/FieldOptions.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/FieldOptions.ts @@ -1,7 +1,9 @@ // Original file: null +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; import type { IUninterpretedOption as I_google_protobuf_UninterpretedOption, OUninterpretedOption as O_google_protobuf_UninterpretedOption } from '../../google/protobuf/UninterpretedOption'; import type { IFieldBehavior as I_google_api_FieldBehavior, OFieldBehavior as O_google_api_FieldBehavior } from '../../google/api/FieldBehavior'; +import type { IEdition as I_google_protobuf_Edition, OEdition as O_google_protobuf_Edition } from '../../google/protobuf/Edition'; // Original file: null @@ -21,6 +23,30 @@ export type I_google_protobuf_FieldOptions_CType = export type O_google_protobuf_FieldOptions_CType = typeof _google_protobuf_FieldOptions_CType[keyof typeof _google_protobuf_FieldOptions_CType] +export interface I_google_protobuf_FieldOptions_EditionDefault { + 'edition'?: (I_google_protobuf_Edition); + 'value'?: (string); +} + +export interface O_google_protobuf_FieldOptions_EditionDefault { + 'edition': (O_google_protobuf_Edition); + 'value': (string); +} + +export interface I_google_protobuf_FieldOptions_FeatureSupport { + 'editionIntroduced'?: (I_google_protobuf_Edition); + 'editionDeprecated'?: (I_google_protobuf_Edition); + 'deprecationWarning'?: (string); + 'editionRemoved'?: (I_google_protobuf_Edition); +} + +export interface O_google_protobuf_FieldOptions_FeatureSupport { + 'editionIntroduced': (O_google_protobuf_Edition); + 'editionDeprecated': (O_google_protobuf_Edition); + 'deprecationWarning': (string); + 'editionRemoved': (O_google_protobuf_Edition); +} + // Original file: null export const _google_protobuf_FieldOptions_JSType = { @@ -39,13 +65,80 @@ export type I_google_protobuf_FieldOptions_JSType = export type O_google_protobuf_FieldOptions_JSType = typeof _google_protobuf_FieldOptions_JSType[keyof typeof _google_protobuf_FieldOptions_JSType] +// Original file: null + +export const _google_protobuf_FieldOptions_OptionRetention = { + RETENTION_UNKNOWN: 'RETENTION_UNKNOWN', + RETENTION_RUNTIME: 'RETENTION_RUNTIME', + RETENTION_SOURCE: 'RETENTION_SOURCE', +} as const; + +export type I_google_protobuf_FieldOptions_OptionRetention = + | 'RETENTION_UNKNOWN' + | 0 + | 'RETENTION_RUNTIME' + | 1 + | 'RETENTION_SOURCE' + | 2 + +export type O_google_protobuf_FieldOptions_OptionRetention = typeof _google_protobuf_FieldOptions_OptionRetention[keyof typeof _google_protobuf_FieldOptions_OptionRetention] + +// Original file: null + +export const _google_protobuf_FieldOptions_OptionTargetType = { + TARGET_TYPE_UNKNOWN: 'TARGET_TYPE_UNKNOWN', + TARGET_TYPE_FILE: 'TARGET_TYPE_FILE', + TARGET_TYPE_EXTENSION_RANGE: 'TARGET_TYPE_EXTENSION_RANGE', + TARGET_TYPE_MESSAGE: 'TARGET_TYPE_MESSAGE', + TARGET_TYPE_FIELD: 'TARGET_TYPE_FIELD', + TARGET_TYPE_ONEOF: 'TARGET_TYPE_ONEOF', + TARGET_TYPE_ENUM: 'TARGET_TYPE_ENUM', + TARGET_TYPE_ENUM_ENTRY: 'TARGET_TYPE_ENUM_ENTRY', + TARGET_TYPE_SERVICE: 'TARGET_TYPE_SERVICE', + TARGET_TYPE_METHOD: 'TARGET_TYPE_METHOD', +} as const; + +export type I_google_protobuf_FieldOptions_OptionTargetType = + | 'TARGET_TYPE_UNKNOWN' + | 0 + | 'TARGET_TYPE_FILE' + | 1 + | 'TARGET_TYPE_EXTENSION_RANGE' + | 2 + | 'TARGET_TYPE_MESSAGE' + | 3 + | 'TARGET_TYPE_FIELD' + | 4 + | 'TARGET_TYPE_ONEOF' + | 5 + | 'TARGET_TYPE_ENUM' + | 6 + | 'TARGET_TYPE_ENUM_ENTRY' + | 7 + | 'TARGET_TYPE_SERVICE' + | 8 + | 'TARGET_TYPE_METHOD' + | 9 + +export type O_google_protobuf_FieldOptions_OptionTargetType = typeof _google_protobuf_FieldOptions_OptionTargetType[keyof typeof _google_protobuf_FieldOptions_OptionTargetType] + export interface IFieldOptions { 'ctype'?: (I_google_protobuf_FieldOptions_CType); 'packed'?: (boolean); 'deprecated'?: (boolean); 'lazy'?: (boolean); 'jstype'?: (I_google_protobuf_FieldOptions_JSType); + /** + * @deprecated + */ 'weak'?: (boolean); + 'unverifiedLazy'?: (boolean); + 'debugRedact'?: (boolean); + 'retention'?: (I_google_protobuf_FieldOptions_OptionRetention); + 'targets'?: (I_google_protobuf_FieldOptions_OptionTargetType)[]; + 'editionDefaults'?: (I_google_protobuf_FieldOptions_EditionDefault)[]; + 'features'?: (I_google_protobuf_FeatureSet | null); + 'featureSupport'?: (I_google_protobuf_FieldOptions_FeatureSupport | null); 'uninterpretedOption'?: (I_google_protobuf_UninterpretedOption)[]; '.google.api.field_behavior'?: (I_google_api_FieldBehavior)[]; } @@ -56,7 +149,17 @@ export interface OFieldOptions { 'deprecated': (boolean); 'lazy': (boolean); 'jstype': (O_google_protobuf_FieldOptions_JSType); + /** + * @deprecated + */ 'weak': (boolean); + 'unverifiedLazy': (boolean); + 'debugRedact': (boolean); + 'retention': (O_google_protobuf_FieldOptions_OptionRetention); + 'targets': (O_google_protobuf_FieldOptions_OptionTargetType)[]; + 'editionDefaults': (O_google_protobuf_FieldOptions_EditionDefault)[]; + 'features': (O_google_protobuf_FeatureSet | null); + 'featureSupport': (O_google_protobuf_FieldOptions_FeatureSupport | null); 'uninterpretedOption': (O_google_protobuf_UninterpretedOption)[]; '.google.api.field_behavior': (O_google_api_FieldBehavior)[]; } diff --git a/packages/proto-loader/golden-generated/google/protobuf/FileDescriptorProto.ts b/packages/proto-loader/golden-generated/google/protobuf/FileDescriptorProto.ts index c98732f9..8fdfef74 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/FileDescriptorProto.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/FileDescriptorProto.ts @@ -6,6 +6,7 @@ import type { IServiceDescriptorProto as I_google_protobuf_ServiceDescriptorProt import type { IFieldDescriptorProto as I_google_protobuf_FieldDescriptorProto, OFieldDescriptorProto as O_google_protobuf_FieldDescriptorProto } from '../../google/protobuf/FieldDescriptorProto'; import type { IFileOptions as I_google_protobuf_FileOptions, OFileOptions as O_google_protobuf_FileOptions } from '../../google/protobuf/FileOptions'; import type { ISourceCodeInfo as I_google_protobuf_SourceCodeInfo, OSourceCodeInfo as O_google_protobuf_SourceCodeInfo } from '../../google/protobuf/SourceCodeInfo'; +import type { IEdition as I_google_protobuf_Edition, OEdition as O_google_protobuf_Edition } from '../../google/protobuf/Edition'; export interface IFileDescriptorProto { 'name'?: (string); @@ -20,6 +21,8 @@ export interface IFileDescriptorProto { 'publicDependency'?: (number)[]; 'weakDependency'?: (number)[]; 'syntax'?: (string); + 'edition'?: (I_google_protobuf_Edition); + 'optionDependency'?: (string)[]; } export interface OFileDescriptorProto { @@ -35,4 +38,6 @@ export interface OFileDescriptorProto { 'publicDependency': (number)[]; 'weakDependency': (number)[]; 'syntax': (string); + 'edition': (O_google_protobuf_Edition); + 'optionDependency': (string)[]; } diff --git a/packages/proto-loader/golden-generated/google/protobuf/FileOptions.ts b/packages/proto-loader/golden-generated/google/protobuf/FileOptions.ts index c8037402..c853fcbf 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/FileOptions.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/FileOptions.ts @@ -1,5 +1,6 @@ // Original file: null +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; import type { IUninterpretedOption as I_google_protobuf_UninterpretedOption, OUninterpretedOption as O_google_protobuf_UninterpretedOption } from '../../google/protobuf/UninterpretedOption'; // Original file: null @@ -38,6 +39,12 @@ export interface IFileOptions { 'ccEnableArenas'?: (boolean); 'objcClassPrefix'?: (string); 'csharpNamespace'?: (string); + 'swiftPrefix'?: (string); + 'phpClassPrefix'?: (string); + 'phpNamespace'?: (string); + 'phpMetadataNamespace'?: (string); + 'rubyPackage'?: (string); + 'features'?: (I_google_protobuf_FeatureSet | null); 'uninterpretedOption'?: (I_google_protobuf_UninterpretedOption)[]; } @@ -59,5 +66,11 @@ export interface OFileOptions { 'ccEnableArenas': (boolean); 'objcClassPrefix': (string); 'csharpNamespace': (string); + 'swiftPrefix': (string); + 'phpClassPrefix': (string); + 'phpNamespace': (string); + 'phpMetadataNamespace': (string); + 'rubyPackage': (string); + 'features': (O_google_protobuf_FeatureSet | null); 'uninterpretedOption': (O_google_protobuf_UninterpretedOption)[]; } diff --git a/packages/proto-loader/golden-generated/google/protobuf/GeneratedCodeInfo.ts b/packages/proto-loader/golden-generated/google/protobuf/GeneratedCodeInfo.ts index 62f9dc71..e43f2b30 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/GeneratedCodeInfo.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/GeneratedCodeInfo.ts @@ -6,6 +6,7 @@ export interface I_google_protobuf_GeneratedCodeInfo_Annotation { 'sourceFile'?: (string); 'begin'?: (number); 'end'?: (number); + 'semantic'?: (I_google_protobuf_GeneratedCodeInfo_Annotation_Semantic); } export interface O_google_protobuf_GeneratedCodeInfo_Annotation { @@ -13,8 +14,27 @@ export interface O_google_protobuf_GeneratedCodeInfo_Annotation { 'sourceFile': (string); 'begin': (number); 'end': (number); + 'semantic': (O_google_protobuf_GeneratedCodeInfo_Annotation_Semantic); } +// Original file: null + +export const _google_protobuf_GeneratedCodeInfo_Annotation_Semantic = { + NONE: 'NONE', + SET: 'SET', + ALIAS: 'ALIAS', +} as const; + +export type I_google_protobuf_GeneratedCodeInfo_Annotation_Semantic = + | 'NONE' + | 0 + | 'SET' + | 1 + | 'ALIAS' + | 2 + +export type O_google_protobuf_GeneratedCodeInfo_Annotation_Semantic = typeof _google_protobuf_GeneratedCodeInfo_Annotation_Semantic[keyof typeof _google_protobuf_GeneratedCodeInfo_Annotation_Semantic] + export interface IGeneratedCodeInfo { 'annotation'?: (I_google_protobuf_GeneratedCodeInfo_Annotation)[]; } diff --git a/packages/proto-loader/golden-generated/google/protobuf/MessageOptions.ts b/packages/proto-loader/golden-generated/google/protobuf/MessageOptions.ts index 8c8885e6..dfd256e1 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/MessageOptions.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/MessageOptions.ts @@ -1,5 +1,6 @@ // Original file: null +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; import type { IUninterpretedOption as I_google_protobuf_UninterpretedOption, OUninterpretedOption as O_google_protobuf_UninterpretedOption } from '../../google/protobuf/UninterpretedOption'; export interface IMessageOptions { @@ -7,6 +8,11 @@ export interface IMessageOptions { 'noStandardDescriptorAccessor'?: (boolean); 'deprecated'?: (boolean); 'mapEntry'?: (boolean); + /** + * @deprecated + */ + 'deprecatedLegacyJsonFieldConflicts'?: (boolean); + 'features'?: (I_google_protobuf_FeatureSet | null); 'uninterpretedOption'?: (I_google_protobuf_UninterpretedOption)[]; } @@ -15,5 +21,10 @@ export interface OMessageOptions { 'noStandardDescriptorAccessor': (boolean); 'deprecated': (boolean); 'mapEntry': (boolean); + /** + * @deprecated + */ + 'deprecatedLegacyJsonFieldConflicts': (boolean); + 'features': (O_google_protobuf_FeatureSet | null); 'uninterpretedOption': (O_google_protobuf_UninterpretedOption)[]; } diff --git a/packages/proto-loader/golden-generated/google/protobuf/MethodOptions.ts b/packages/proto-loader/golden-generated/google/protobuf/MethodOptions.ts index 5f0b6900..d83d6cf0 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/MethodOptions.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/MethodOptions.ts @@ -1,11 +1,32 @@ // Original file: null +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; import type { IUninterpretedOption as I_google_protobuf_UninterpretedOption, OUninterpretedOption as O_google_protobuf_UninterpretedOption } from '../../google/protobuf/UninterpretedOption'; import type { IOperationInfo as I_google_longrunning_OperationInfo, OOperationInfo as O_google_longrunning_OperationInfo } from '../../google/longrunning/OperationInfo'; import type { IHttpRule as I_google_api_HttpRule, OHttpRule as O_google_api_HttpRule } from '../../google/api/HttpRule'; +// Original file: null + +export const _google_protobuf_MethodOptions_IdempotencyLevel = { + IDEMPOTENCY_UNKNOWN: 'IDEMPOTENCY_UNKNOWN', + NO_SIDE_EFFECTS: 'NO_SIDE_EFFECTS', + IDEMPOTENT: 'IDEMPOTENT', +} as const; + +export type I_google_protobuf_MethodOptions_IdempotencyLevel = + | 'IDEMPOTENCY_UNKNOWN' + | 0 + | 'NO_SIDE_EFFECTS' + | 1 + | 'IDEMPOTENT' + | 2 + +export type O_google_protobuf_MethodOptions_IdempotencyLevel = typeof _google_protobuf_MethodOptions_IdempotencyLevel[keyof typeof _google_protobuf_MethodOptions_IdempotencyLevel] + export interface IMethodOptions { 'deprecated'?: (boolean); + 'idempotencyLevel'?: (I_google_protobuf_MethodOptions_IdempotencyLevel); + 'features'?: (I_google_protobuf_FeatureSet | null); 'uninterpretedOption'?: (I_google_protobuf_UninterpretedOption)[]; '.google.longrunning.operation_info'?: (I_google_longrunning_OperationInfo | null); '.google.api.method_signature'?: (string)[]; @@ -14,6 +35,8 @@ export interface IMethodOptions { export interface OMethodOptions { 'deprecated': (boolean); + 'idempotencyLevel': (O_google_protobuf_MethodOptions_IdempotencyLevel); + 'features': (O_google_protobuf_FeatureSet | null); 'uninterpretedOption': (O_google_protobuf_UninterpretedOption)[]; '.google.longrunning.operation_info': (O_google_longrunning_OperationInfo | null); '.google.api.method_signature': (string)[]; diff --git a/packages/proto-loader/golden-generated/google/protobuf/OneofOptions.ts b/packages/proto-loader/golden-generated/google/protobuf/OneofOptions.ts index 73280ad7..d4ebe27b 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/OneofOptions.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/OneofOptions.ts @@ -1,11 +1,14 @@ // Original file: null +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; import type { IUninterpretedOption as I_google_protobuf_UninterpretedOption, OUninterpretedOption as O_google_protobuf_UninterpretedOption } from '../../google/protobuf/UninterpretedOption'; export interface IOneofOptions { + 'features'?: (I_google_protobuf_FeatureSet | null); 'uninterpretedOption'?: (I_google_protobuf_UninterpretedOption)[]; } export interface OOneofOptions { + 'features': (O_google_protobuf_FeatureSet | null); 'uninterpretedOption': (O_google_protobuf_UninterpretedOption)[]; } diff --git a/packages/proto-loader/golden-generated/google/protobuf/ServiceOptions.ts b/packages/proto-loader/golden-generated/google/protobuf/ServiceOptions.ts index 0ddc8e18..f23f77d8 100644 --- a/packages/proto-loader/golden-generated/google/protobuf/ServiceOptions.ts +++ b/packages/proto-loader/golden-generated/google/protobuf/ServiceOptions.ts @@ -1,9 +1,11 @@ // Original file: null +import type { IFeatureSet as I_google_protobuf_FeatureSet, OFeatureSet as O_google_protobuf_FeatureSet } from '../../google/protobuf/FeatureSet'; import type { IUninterpretedOption as I_google_protobuf_UninterpretedOption, OUninterpretedOption as O_google_protobuf_UninterpretedOption } from '../../google/protobuf/UninterpretedOption'; export interface IServiceOptions { 'deprecated'?: (boolean); + 'features'?: (I_google_protobuf_FeatureSet | null); 'uninterpretedOption'?: (I_google_protobuf_UninterpretedOption)[]; '.google.api.default_host'?: (string); '.google.api.oauth_scopes'?: (string); @@ -11,6 +13,7 @@ export interface IServiceOptions { export interface OServiceOptions { 'deprecated': (boolean); + 'features': (O_google_protobuf_FeatureSet | null); 'uninterpretedOption': (O_google_protobuf_UninterpretedOption)[]; '.google.api.default_host': (string); '.google.api.oauth_scopes': (string); diff --git a/packages/proto-loader/golden-generated/google/protobuf/SymbolVisibility.ts b/packages/proto-loader/golden-generated/google/protobuf/SymbolVisibility.ts new file mode 100644 index 00000000..285be4d1 --- /dev/null +++ b/packages/proto-loader/golden-generated/google/protobuf/SymbolVisibility.ts @@ -0,0 +1,17 @@ +// Original file: null + +export const SymbolVisibility = { + VISIBILITY_UNSET: 'VISIBILITY_UNSET', + VISIBILITY_LOCAL: 'VISIBILITY_LOCAL', + VISIBILITY_EXPORT: 'VISIBILITY_EXPORT', +} as const; + +export type ISymbolVisibility = + | 'VISIBILITY_UNSET' + | 0 + | 'VISIBILITY_LOCAL' + | 1 + | 'VISIBILITY_EXPORT' + | 2 + +export type OSymbolVisibility = typeof SymbolVisibility[keyof typeof SymbolVisibility]