From 33405fd7d4fb18d7cef4756eceba26e205fac5fe Mon Sep 17 00:00:00 2001 From: LTS20050703 <87189679+lts20050703@users.noreply.github.com> Date: Wed, 16 Mar 2022 11:28:58 +0700 Subject: [PATCH] optionalize transformer (#2108) --- transformers/activity.ts | 3 ++- transformers/application.ts | 3 ++- transformers/applicationCommand.ts | 3 ++- transformers/applicationCommandPermission.ts | 4 +++- transformers/attachment.ts | 3 ++- transformers/auditlogEntry.ts | 3 ++- transformers/channel.ts | 5 ++--- transformers/component.ts | 3 +-- transformers/emoji.ts | 3 ++- transformers/gatewayBot.ts | 3 ++- transformers/guild.ts | 3 ++- transformers/integration.ts | 3 ++- transformers/interaction.ts | 5 +++-- transformers/invite.ts | 3 ++- transformers/member.ts | 5 +++-- transformers/message.ts | 3 ++- transformers/presence.ts | 3 ++- transformers/role.ts | 3 ++- transformers/scheduledEvent.ts | 3 ++- transformers/stageInstance.ts | 3 ++- transformers/sticker.ts | 3 ++- transformers/team.ts | 3 ++- transformers/threadMember.ts | 5 +++-- transformers/voiceRegion.ts | 3 ++- transformers/voiceState.ts | 3 ++- transformers/webhook.ts | 3 ++- transformers/welcomeScreen.ts | 3 ++- transformers/widget.ts | 3 ++- 28 files changed, 59 insertions(+), 34 deletions(-) diff --git a/transformers/activity.ts b/transformers/activity.ts index f641bfd1b..ed5ac02ad 100644 --- a/transformers/activity.ts +++ b/transformers/activity.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordActivity } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformActivity(bot: Bot, payload: DiscordActivity) { return { @@ -35,4 +36,4 @@ export function transformActivity(bot: Bot, payload: DiscordActivity) { }; } -export interface Activity extends ReturnType {} +export interface Activity extends Optionalize> {} diff --git a/transformers/application.ts b/transformers/application.ts index 81afc8e31..816430b67 100644 --- a/transformers/application.ts +++ b/transformers/application.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordApplication } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformApplication(bot: Bot, payload: DiscordApplication) { return { @@ -25,4 +26,4 @@ export function transformApplication(bot: Bot, payload: DiscordApplication) { }; } -export interface Application extends ReturnType {} +export interface Application extends Optionalize> {} diff --git a/transformers/applicationCommand.ts b/transformers/applicationCommand.ts index ed1c2581b..a81d7a3a7 100644 --- a/transformers/applicationCommand.ts +++ b/transformers/applicationCommand.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordApplicationCommand } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformApplicationCommand( bot: Bot, @@ -19,4 +20,4 @@ export function transformApplicationCommand( }; } -export interface ApplicationCommand extends ReturnType {} +export interface ApplicationCommand extends Optionalize> {} diff --git a/transformers/applicationCommandPermission.ts b/transformers/applicationCommandPermission.ts index 79a5ddd64..e3ac04632 100644 --- a/transformers/applicationCommandPermission.ts +++ b/transformers/applicationCommandPermission.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordGuildApplicationCommandPermissions } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformApplicationCommandPermission( bot: Bot, @@ -17,4 +18,5 @@ export function transformApplicationCommandPermission( }; } -export interface ApplicationCommandPermission extends ReturnType {} +export interface ApplicationCommandPermission + extends Optionalize> {} diff --git a/transformers/attachment.ts b/transformers/attachment.ts index 5bb25b1cc..1f4892bf2 100644 --- a/transformers/attachment.ts +++ b/transformers/attachment.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordAttachment } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformAttachment(bot: Bot, payload: DiscordAttachment) { return { @@ -15,4 +16,4 @@ export function transformAttachment(bot: Bot, payload: DiscordAttachment) { }; } -export interface Attachment extends ReturnType {} +export interface Attachment extends Optionalize> {} diff --git a/transformers/auditlogEntry.ts b/transformers/auditlogEntry.ts index dff135f24..d9069114b 100644 --- a/transformers/auditlogEntry.ts +++ b/transformers/auditlogEntry.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordAuditLogEntry } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformAuditlogEntry( bot: Bot, @@ -130,4 +131,4 @@ export function transformAuditlogEntry( }; } -export interface AuditLogEntry extends ReturnType {} +export interface AuditLogEntry extends Optionalize> {} diff --git a/transformers/channel.ts b/transformers/channel.ts index 455ccd5ad..eeebc42e6 100644 --- a/transformers/channel.ts +++ b/transformers/channel.ts @@ -1,7 +1,6 @@ import { Bot } from "../bot.ts"; -import { Collection } from "../util/collection.ts"; -import { ChannelTypes } from "../types/shared.ts"; import { DiscordChannel } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; const Mask = (1n << 64n) - 1n; @@ -68,4 +67,4 @@ export function transformChannel( }; } -export interface Channel extends ReturnType {} +export interface Channel extends Optionalize> {} diff --git a/transformers/component.ts b/transformers/component.ts index 6d157e81b..ed7af3698 100644 --- a/transformers/component.ts +++ b/transformers/component.ts @@ -1,6 +1,6 @@ import { Bot } from "../bot.ts"; import { ButtonStyles, MessageComponentTypes, TextStyles } from "../mod.ts"; -import { DiscordComponent, DiscordSelectOption } from "../types/discord.ts"; +import { DiscordComponent } from "../types/discord.ts"; export function transformComponent(bot: Bot, payload: DiscordComponent): Component { return { @@ -37,7 +37,6 @@ export function transformComponent(bot: Bot, payload: DiscordComponent): Compone }; } -// export interface Component extends ReturnType {}; // THIS TRANSFORMER HAS A CIRCULAR REFERENCE TO CALL ITSELF FOR COMPONENTS SO AN AUTOMATED TYPE CAN NOT BE CREATED! export interface Component { diff --git a/transformers/emoji.ts b/transformers/emoji.ts index 150980a48..152c8bb8a 100644 --- a/transformers/emoji.ts +++ b/transformers/emoji.ts @@ -1,6 +1,7 @@ import { Bot } from "../bot.ts"; import { DiscordEmoji } from "../types/discord.ts"; import { EmojiToggles } from "./toggles/emoji.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformEmoji(bot: Bot, payload: DiscordEmoji) { return { @@ -12,4 +13,4 @@ export function transformEmoji(bot: Bot, payload: DiscordEmoji) { }; } -export interface Emoji extends ReturnType {} +export interface Emoji extends Optionalize> {} diff --git a/transformers/gatewayBot.ts b/transformers/gatewayBot.ts index 9ae4260b4..4be4b9d6b 100644 --- a/transformers/gatewayBot.ts +++ b/transformers/gatewayBot.ts @@ -1,4 +1,5 @@ import { DiscordGetGatewayBot } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformGatewayBot(payload: DiscordGetGatewayBot) { return { @@ -13,4 +14,4 @@ export function transformGatewayBot(payload: DiscordGetGatewayBot) { }; } -export interface GetGatewayBot extends ReturnType {} +export interface GetGatewayBot extends Optionalize> {} diff --git a/transformers/guild.ts b/transformers/guild.ts index c5defd90f..7e2028595 100644 --- a/transformers/guild.ts +++ b/transformers/guild.ts @@ -1,6 +1,7 @@ import { Bot } from "../bot.ts"; import { Collection } from "../util/collection.ts"; import { DiscordGuild } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformGuild( bot: Bot, @@ -96,4 +97,4 @@ export function transformGuild( }; } -export interface Guild extends ReturnType {} +export interface Guild extends Optionalize> {} diff --git a/transformers/integration.ts b/transformers/integration.ts index a3ddfd208..6ce238a63 100644 --- a/transformers/integration.ts +++ b/transformers/integration.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordIntegrationCreateUpdate } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformIntegration(bot: Bot, payload: DiscordIntegrationCreateUpdate) { return { @@ -34,4 +35,4 @@ export function transformIntegration(bot: Bot, payload: DiscordIntegrationCreate }; } -export interface Integration extends ReturnType {} +export interface Integration extends Optionalize> {} diff --git a/transformers/interaction.ts b/transformers/interaction.ts index 89de1993c..6a89a6b46 100644 --- a/transformers/interaction.ts +++ b/transformers/interaction.ts @@ -6,6 +6,7 @@ import { Attachment } from "./attachment.ts"; import { Member, User } from "./member.ts"; import { Message } from "./message.ts"; import { Role } from "./role.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformInteraction(bot: Bot, payload: DiscordInteraction) { const guildId = payload.guild_id ? bot.transformers.snowflake(payload.guild_id) : undefined; @@ -128,5 +129,5 @@ export function transformInteractionDataResolved( return transformed; } -export interface Interaction extends ReturnType {} -export interface InteractionDataResolved extends ReturnType {} +export interface Interaction extends Optionalize> {} +export interface InteractionDataResolved extends Optionalize> {} diff --git a/transformers/invite.ts b/transformers/invite.ts index 23d42947e..8b12a7af4 100644 --- a/transformers/invite.ts +++ b/transformers/invite.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordInviteCreate } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformInvite(bot: Bot, invite: DiscordInviteCreate) { return { @@ -33,4 +34,4 @@ export function transformInvite(bot: Bot, invite: DiscordInviteCreate) { }; } -export interface Invite extends ReturnType {} +export interface Invite extends Optionalize> {} diff --git a/transformers/member.ts b/transformers/member.ts index 6b39629e9..5a102d5fc 100644 --- a/transformers/member.ts +++ b/transformers/member.ts @@ -2,6 +2,7 @@ import type { Bot } from "../bot.ts"; import { DiscordMember, DiscordUser } from "../types/discord.ts"; import { MemberToggles } from "./toggles/member.ts"; import { UserToggles } from "./toggles/user.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformUser(bot: Bot, payload: DiscordUser) { return { @@ -40,5 +41,5 @@ export function transformMember( }; } -export interface Member extends ReturnType {} -export interface User extends ReturnType {} +export interface Member extends Optionalize> {} +export interface User extends Optionalize> {} diff --git a/transformers/message.ts b/transformers/message.ts index 27717da78..291c671ea 100644 --- a/transformers/message.ts +++ b/transformers/message.ts @@ -2,6 +2,7 @@ import { Bot } from "../bot.ts"; import { DiscordMessage } from "../types/discord.ts"; import { CHANNEL_MENTION_REGEX } from "../util/constants.ts"; import { MemberToggles } from "./toggles/member.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformMessage(bot: Bot, payload: DiscordMessage) { const guildId = payload.guild_id ? bot.transformers.snowflake(payload.guild_id) : undefined; @@ -102,4 +103,4 @@ export function transformMessage(bot: Bot, payload: DiscordMessage) { }; } -export interface Message extends ReturnType {} +export interface Message extends Optionalize> {} diff --git a/transformers/presence.ts b/transformers/presence.ts index 292732410..27a0fdd25 100644 --- a/transformers/presence.ts +++ b/transformers/presence.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordPresenceUpdate } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export const statusTypes = { online: 0, @@ -21,5 +22,5 @@ export function transformPresence(bot: Bot, payload: DiscordPresenceUpdate) { }; } -export interface PresenceUpdate extends ReturnType {} +export interface PresenceUpdate extends Optionalize> {} export type StatusTypes = keyof typeof statusTypes; diff --git a/transformers/role.ts b/transformers/role.ts index c16ff25b3..2e94b8492 100644 --- a/transformers/role.ts +++ b/transformers/role.ts @@ -1,6 +1,7 @@ import { Bot } from "../bot.ts"; import { DiscordRole } from "../types/discord.ts"; import { RoleToggles } from "./toggles/role.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformRole( bot: Bot, @@ -26,4 +27,4 @@ export function transformRole( }; } -export interface Role extends ReturnType {} +export interface Role extends Optionalize> {} diff --git a/transformers/scheduledEvent.ts b/transformers/scheduledEvent.ts index a2959a73d..c0d888e12 100644 --- a/transformers/scheduledEvent.ts +++ b/transformers/scheduledEvent.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordScheduledEvent } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformScheduledEvent( bot: Bot, @@ -26,4 +27,4 @@ export function transformScheduledEvent( }; } -export interface ScheduledEvent extends ReturnType {} +export interface ScheduledEvent extends Optionalize> {} diff --git a/transformers/stageInstance.ts b/transformers/stageInstance.ts index 9f62b0f54..45a45d8f3 100644 --- a/transformers/stageInstance.ts +++ b/transformers/stageInstance.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordStageInstance } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformStageInstance( bot: Bot, @@ -13,4 +14,4 @@ export function transformStageInstance( }; } -export interface StageInstance extends ReturnType {} +export interface StageInstance extends Optionalize> {} diff --git a/transformers/sticker.ts b/transformers/sticker.ts index 9c03c1429..e3d9d9812 100644 --- a/transformers/sticker.ts +++ b/transformers/sticker.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordSticker } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformSticker(bot: Bot, payload: DiscordSticker) { return { @@ -17,4 +18,4 @@ export function transformSticker(bot: Bot, payload: DiscordSticker) { }; } -export interface Sticker extends ReturnType {} +export interface Sticker extends Optionalize> {} diff --git a/transformers/team.ts b/transformers/team.ts index f20fa4633..3115c863a 100644 --- a/transformers/team.ts +++ b/transformers/team.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordTeam } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformTeam(bot: Bot, payload: DiscordTeam) { const id = bot.transformers.snowflake(payload.id); @@ -19,4 +20,4 @@ export function transformTeam(bot: Bot, payload: DiscordTeam) { }; } -export interface Team extends ReturnType {} +export interface Team extends Optionalize> {} diff --git a/transformers/threadMember.ts b/transformers/threadMember.ts index e46ea5b98..dc0ec0416 100644 --- a/transformers/threadMember.ts +++ b/transformers/threadMember.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordThreadMember, DiscordThreadMemberGuildCreate } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformThreadMember( bot: Bot, @@ -21,5 +22,5 @@ export function transformThreadMemberGuildCreate( }; } -export interface ThreadMember extends ReturnType {} -export interface ThreadMemberGuildCreate extends ReturnType {} +export interface ThreadMember extends Optionalize> {} +export interface ThreadMemberGuildCreate extends Optionalize> {} diff --git a/transformers/voiceRegion.ts b/transformers/voiceRegion.ts index 238987b67..80d527f36 100644 --- a/transformers/voiceRegion.ts +++ b/transformers/voiceRegion.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordVoiceRegion } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformVoiceRegion(bot: Bot, payload: DiscordVoiceRegion) { return { @@ -11,4 +12,4 @@ export function transformVoiceRegion(bot: Bot, payload: DiscordVoiceRegion) { }; } -export interface VoiceRegions extends ReturnType {} +export interface VoiceRegions extends Optionalize> {} diff --git a/transformers/voiceState.ts b/transformers/voiceState.ts index 5cd1579f6..9d094dc54 100644 --- a/transformers/voiceState.ts +++ b/transformers/voiceState.ts @@ -1,6 +1,7 @@ import { Bot } from "../bot.ts"; import { DiscordVoiceState } from "../types/discord.ts"; import { VoiceStateToggles } from "./toggles/voice.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformVoiceState( bot: Bot, @@ -21,4 +22,4 @@ export function transformVoiceState( }; } -export interface VoiceState extends ReturnType {} +export interface VoiceState extends Optionalize> {} diff --git a/transformers/webhook.ts b/transformers/webhook.ts index 53ee1525f..00745501c 100644 --- a/transformers/webhook.ts +++ b/transformers/webhook.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordWebhook } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformWebhook(bot: Bot, payload: DiscordWebhook) { return { @@ -31,4 +32,4 @@ export function transformWebhook(bot: Bot, payload: DiscordWebhook) { }; } -export interface Webhook extends ReturnType {} +export interface Webhook extends Optionalize> {} diff --git a/transformers/welcomeScreen.ts b/transformers/welcomeScreen.ts index aff525982..05435806e 100644 --- a/transformers/welcomeScreen.ts +++ b/transformers/welcomeScreen.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordWelcomeScreen } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformWelcomeScreen( bot: Bot, @@ -16,4 +17,4 @@ export function transformWelcomeScreen( }; } -export interface WelcomeScreen extends ReturnType {} +export interface WelcomeScreen extends Optionalize> {} diff --git a/transformers/widget.ts b/transformers/widget.ts index 569b73d2e..45337e17d 100644 --- a/transformers/widget.ts +++ b/transformers/widget.ts @@ -1,5 +1,6 @@ import { Bot } from "../bot.ts"; import { DiscordGuildWidget } from "../types/discord.ts"; +import { Optionalize } from "../types/shared.ts"; export function transformWidget(bot: Bot, payload: DiscordGuildWidget) { return { @@ -23,4 +24,4 @@ export function transformWidget(bot: Bot, payload: DiscordGuildWidget) { }; } -export interface GuildWidget extends ReturnType {} +export interface GuildWidget extends Optionalize> {}