Fixed subtypes and union types generation, new enums added (#1213)

* Fixed subtypes and union types generation, new enums added

* Added changes description

.butcher/types/BotCommandScope/subtypes.yml

@@ -0,0 +1 @@
+discriminator: "type"

.butcher/types/BotCommandScopeAllChatAdministrators/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - BotCommandScope

.butcher/types/BotCommandScopeAllGroupChats/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - BotCommandScope

.butcher/types/BotCommandScopeAllPrivateChats/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - BotCommandScope

.butcher/types/BotCommandScopeChat/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - BotCommandScope

.butcher/types/BotCommandScopeChatAdministrators/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - BotCommandScope

.butcher/types/BotCommandScopeChatMember/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - BotCommandScope

.butcher/types/BotCommandScopeDefault/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - BotCommandScope

.butcher/types/ChatMember/extend.yml

@@ -1,27 +0,0 @@
-define:
-  - type: "String"
-    description: "The member's status in the chat"
-    html_description: "<td>The member's status in the chat</td>"
-    rst_description: "The member's status in the chat"
-    name: "status"
-    required: true
-
-clone:
-  - ChatMemberOwner:
-      exclude:
-        - status
-  - ChatMemberAdministrator:
-      exclude:
-        - status
-  - ChatMemberMember:
-      exclude:
-        - status
-  - ChatMemberRestricted:
-      exclude:
-        - status
-  - ChatMemberLeft:
-      exclude:
-        - status
-  - ChatMemberBanned:
-      exclude:
-        - status

.butcher/types/ChatMember/subtypes.yml

@@ -0,0 +1 @@
+discriminator: "status"

.butcher/types/ChatMemberAdministrator/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - ChatMember

.butcher/types/ChatMemberBanned/replace.yml

@@ -1,5 +1,3 @@
-bases:
-  - ChatMember
 annotations:
   until_date:
     parsed_type:

.butcher/types/ChatMemberLeft/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - ChatMember

.butcher/types/ChatMemberMember/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - ChatMember

.butcher/types/ChatMemberOwner/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - ChatMember

.butcher/types/ChatMemberRestricted/replace.yml

@@ -1,5 +1,3 @@
-bases:
-  - ChatMember
 annotations:
   until_date:
     parsed_type:

.butcher/types/ChatMemberUpdated/replace.yml

@@ -3,32 +3,3 @@ annotations:
     parsed_type:
       type: std
       name: datetime.datetime
-  old_chat_member: &chat-member-type
-    parsed_type:
-      type: union
-      items:
-        - type: entity
-          references:
-            category: types
-            name: ChatMemberOwner
-        - type: entity
-          references:
-            category: types
-            name: ChatMemberAdministrator
-        - type: entity
-          references:
-            category: types
-            name: ChatMemberMember
-        - type: entity
-          references:
-            category: types
-            name: ChatMemberRestricted
-        - type: entity
-          references:
-            category: types
-            name: ChatMemberLeft
-        - type: entity
-          references:
-            category: types
-            name: ChatMemberBanned
-  new_chat_member: *chat-member-type

.butcher/types/InlineQueryResult/subtypes.yml

@@ -0,0 +1 @@
+discriminator: "type"

.butcher/types/InlineQueryResultArticle/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InlineQueryResult

.butcher/types/InlineQueryResultAudio/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultCachedAudio/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultCachedDocument/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultCachedGif/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultCachedMpeg4Gif/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultCachedPhoto/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultCachedSticker/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InlineQueryResult

.butcher/types/InlineQueryResultCachedVideo/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultCachedVoice/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultContact/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InlineQueryResult

.butcher/types/InlineQueryResultDocument/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultGame/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InlineQueryResult

.butcher/types/InlineQueryResultGif/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultLocation/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InlineQueryResult

.butcher/types/InlineQueryResultMpeg4Gif/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultPhoto/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultVenue/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InlineQueryResult

.butcher/types/InlineQueryResultVideo/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InlineQueryResult
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InlineQueryResultVoice/replace.yml

@@ -1,5 +1,3 @@
-bases:
-  - InlineQueryResult
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InputContactMessageContent/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InputMessageContent

.butcher/types/InputInvoiceMessageContent/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InputMessageContent

.butcher/types/InputLocationMessageContent/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InputMessageContent

.butcher/types/InputMedia/subtypes.yml

@@ -0,0 +1 @@
+discriminator: "type"

.butcher/types/InputMediaAnimation/replace.yml

@@ -1,5 +1,3 @@
-bases:
-  - InputMedia
 annotations:
   media:
     parsed_type:

.butcher/types/InputMediaAudio/replace.yml

@@ -1,5 +1,3 @@
-bases:
-  - InputMedia
 annotations:
   media:
     parsed_type:

.butcher/types/InputMediaDocument/replace.yml

@@ -1,5 +1,3 @@
-bases:
-  - InputMedia
 annotations:
   media:
     parsed_type:

.butcher/types/InputMediaPhoto/replace.yml

@@ -1,5 +1,3 @@
-bases:
-  - InputMedia
 annotations:
   media:
     parsed_type:

.butcher/types/InputMediaVideo/replace.yml

@@ -1,5 +1,3 @@
-bases:
-  - InputMedia
 annotations:
   media:
     parsed_type:

.butcher/types/InputMessageContent/subtypes.yml

@@ -0,0 +1 @@
+{ }

.butcher/types/InputTextMessageContent/replace.yml

@@ -1,6 +1,3 @@
-bases:
-  - InputMessageContent
-
 annotations:
   parse_mode:
     value: UNSET_PARSE_MODE

.butcher/types/InputVenueMessageContent/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - InputMessageContent

.butcher/types/MenuButton/subtypes.yml

@@ -0,0 +1 @@
+discriminator: "type"

.butcher/types/MenuButtonCommands/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - MenuButton

.butcher/types/MenuButtonDefault/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - MenuButton

.butcher/types/MenuButtonWebApp/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - MenuButton

.butcher/types/PassportElementError/subtypes.yml

@@ -0,0 +1 @@
+discriminator: "source"

.butcher/types/PassportElementErrorDataField/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - PassportElementError

.butcher/types/PassportElementErrorFile/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - PassportElementError

.butcher/types/PassportElementErrorFiles/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - PassportElementError

.butcher/types/PassportElementErrorFrontSide/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - PassportElementError

.butcher/types/PassportElementErrorReverseSide/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - PassportElementError

.butcher/types/PassportElementErrorSelfie/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - PassportElementError

.butcher/types/PassportElementErrorTranslationFile/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - PassportElementError

.butcher/types/PassportElementErrorTranslationFiles/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - PassportElementError

.butcher/types/PassportElementErrorUnspecified/replace.yml

@@ -1,2 +0,0 @@
-bases:
-  - PassportElementError