From ce9ee9b94e2c0d831f263efadd239b11c857872b Mon Sep 17 00:00:00 2001 From: Sebastian Pietschner <32213671+sebasptsch@users.noreply.github.com> Date: Sat, 23 Apr 2022 15:20:10 +1000 Subject: [PATCH 1/6] Revert "fixes and exploring more types" This reverts commit 9039def8fc63619441d728a38cb1185d1dcdc09d. --- src/classes/dynamicaChannel.ts | 8 +--- src/classes/event.ts | 8 ++-- src/classes/secondary.ts | 70 ++++++++++++++++------------------ src/events/autocomplete.ts | 5 ++- src/events/channelDelete.ts | 5 ++- src/events/command.ts | 5 ++- src/events/guildCreate.ts | 5 ++- src/events/guildDelete.ts | 5 ++- src/events/index.ts | 3 +- src/events/presenceUpdate.ts | 2 +- src/events/rateLimit.ts | 7 ++-- src/events/ready.ts | 5 ++- src/events/voiceStateUpdate.ts | 2 +- 13 files changed, 64 insertions(+), 66 deletions(-) diff --git a/src/classes/dynamicaChannel.ts b/src/classes/dynamicaChannel.ts index bafcd8f..4bcd59a 100644 --- a/src/classes/dynamicaChannel.ts +++ b/src/classes/dynamicaChannel.ts @@ -4,10 +4,7 @@ import { Client, Guild, VoiceChannel } from 'discord.js'; interface DynamicaChannelTypes { primary: { - prisma: Prisma.Primary & { - guild: Prisma.Guild; - secondaries: Prisma.Secondary[]; - }; + prisma: Prisma.Primary; }; secondary: { prisma: Prisma.Secondary & { guild: Prisma.Guild; primary: Prisma.Primary }; @@ -37,11 +34,10 @@ export default class DynamicaChannel { this.client = client; if (channelId) { this.id = channelId; - this.fetch(); } } - async create(...args) { + async create(...args): Promise> { return this; } async fetch(): Promise | undefined> { diff --git a/src/classes/event.ts b/src/classes/event.ts index 0c3cd82..331c9b4 100644 --- a/src/classes/event.ts +++ b/src/classes/event.ts @@ -1,9 +1,9 @@ import { ClientEvents } from 'discord.js'; -export default class Event { +export default class Event { public once: boolean; - public event: K; + public event: keyof ClientEvents; public execute: (...args) => Promise; @@ -12,12 +12,12 @@ export default class Event { return this; } - setEvent(event: K) { + setEvent(event: keyof ClientEvents) { this.event = event; return this; } - setResponse(response: (...args: ClientEvents[K]) => Promise) { + setResponse(response: (...args) => Promise) { this.execute = response; return this; } diff --git a/src/classes/secondary.ts b/src/classes/secondary.ts index c287ca6..675d5ec 100644 --- a/src/classes/secondary.ts +++ b/src/classes/secondary.ts @@ -1,4 +1,4 @@ -import DynamicaPrimary from '@classes/primary'; +import PrimaryClass from '@classes/primary'; import db from '@db'; import { Embed } from '@discordjs/builders'; import Prisma, { Primary } from '@prisma/client'; @@ -25,7 +25,7 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { * @param member guild member who created the channel * @returns */ - async create(primary: DynamicaPrimary, guild: Guild, member: GuildMember) { + async create(primary: PrimaryClass, guild: Guild, member: GuildMember) { try { await primary.fetch(); @@ -174,7 +174,7 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { const prisma = await this.fetchPrisma(); const discord = await this.fetchDiscord(); if (!discord) { - await this.delete(); + await this.deletePrisma(); return undefined; } if (!prisma) { @@ -207,11 +207,8 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { } async fetchDiscordText(): Promise { - const channel = await this.client.channels.cache.get(this.textChannel?.id); - if (!channel) { - return undefined; - } - if (channel.type !== 'GUILD_TEXT') { + const channel = await this.client.channels.cache.get(this.id); + if (!channel || channel.type !== 'GUILD_TEXT') { return undefined; } return channel; @@ -331,21 +328,29 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { try { const discord = await this.fetchDiscord(); const prisma = await this.fetchPrisma(); - const textChannel = await this.fetchDiscordText(); - if (textChannel) { - await textChannel.delete(); - } if (discord) { - await this.deleteDiscord(); + discord.delete(); } if (prisma) { - await this.deletePrisma(); + db.secondary.delete({ where: { id: this.id } }); } - console.trace(); + // if (!this.discord && !this.prisma) { + // return; + // } + // if (!this.discord && !!this.prisma) { + // await this.deletePrisma(); + // } else if (!this.prisma && !!this.discord) { + // await this.deleteDiscord(); + // } else if (this.discord && this.prisma) { + // await this.deletePrisma(); + // await this.deleteDiscord(); + // } logger.debug(`Secondary channel deleted ${this.id}.`); } catch (error) { logger.error(error); } + + await updateActivityCount(this.client); } async deletePrisma(): Promise { @@ -354,9 +359,7 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { } const prisma = await this.fetchPrisma(); if (prisma) { - await db.secondary.delete({ where: { id: this.id } }).then(() => { - updateActivityCount(this.client); - }); + await db.secondary.delete({ where: { id: this.id } }); } } @@ -368,29 +371,22 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { throw new Error('No Id defined.'); } try { - const discord = await this.fetchDiscord(); - if (discord) { - await discord.delete(); + if (!this.discord.deletable) { + throw new Error('The channel is not deletable.'); } - } catch (error) { - logger.error('Failed to delete secondary:', error); - } - } - async deleteDiscordText(): Promise { - if (!this.client) { - throw new Error('No client defined.'); - } - if (!this.id) { - throw new Error('No Id defined.'); - } - try { - const discordText = await this.fetchDiscordText(); - if (discordText) { - await discordText.delete(); + await updateActivityCount(this.client); + + await this.discord.delete(); + + if (this.textChannel) { + const textChannel = this.discord.guild.channels.cache.get( + this.prisma.textChannelId + ); + await textChannel.delete(); } } catch (error) { - logger.error('Failed to delete secondary text channel', error); + logger.error('Failed to delete secondary:', error); } } diff --git a/src/events/autocomplete.ts b/src/events/autocomplete.ts index 4a70234..cb39a80 100644 --- a/src/events/autocomplete.ts +++ b/src/events/autocomplete.ts @@ -2,11 +2,12 @@ import autocompletes from '@autocompletes'; import Autocomplete from '@classes/autocomplete'; import Event from '@classes/event'; import logger from '@utils/logger'; +import { Interaction } from 'discord.js'; -export default new Event<'interactionCreate'>() +export default new Event() .setOnce(false) .setEvent('interactionCreate') - .setResponse(async (interaction) => { + .setResponse(async (interaction: Interaction) => { if (!interaction.isAutocomplete()) return; try { const autocomplete: Autocomplete = autocompletes[interaction.commandName]; diff --git a/src/events/channelDelete.ts b/src/events/channelDelete.ts index 21e1230..356a13d 100644 --- a/src/events/channelDelete.ts +++ b/src/events/channelDelete.ts @@ -1,11 +1,12 @@ import Event from '@classes/event'; import DynamicaPrimary from '@classes/primary'; import DynamicaSecondary from '@classes/secondary'; +import { Channel, DMChannel } from 'discord.js'; -export default new Event<'channelDelete'>() +export default new Event() .setOnce(false) .setEvent('channelDelete') - .setResponse(async (channel) => { + .setResponse(async (channel: Channel | DMChannel) => { // logger.debug(channel); const primary = await new DynamicaPrimary( channel.client, diff --git a/src/events/command.ts b/src/events/command.ts index 9bdd222..b5994df 100644 --- a/src/events/command.ts +++ b/src/events/command.ts @@ -4,11 +4,12 @@ import commands from '@commands'; import checkGuild from '@preconditions/guild'; import { ErrorEmbed } from '@utils/discordEmbeds'; import logger from '@utils/logger'; +import { CacheType, Interaction } from 'discord.js'; -export default new Event<'interactionCreate'>() +export default new Event() .setOnce(false) .setEvent('interactionCreate') - .setResponse(async (interaction) => { + .setResponse(async (interaction: Interaction) => { if (!interaction.isCommand()) return; try { const command = commands[interaction.commandName]; diff --git a/src/events/guildCreate.ts b/src/events/guildCreate.ts index d13f083..bf45864 100644 --- a/src/events/guildCreate.ts +++ b/src/events/guildCreate.ts @@ -2,6 +2,7 @@ import Event from '@classes/event'; import db from '@db'; import { Embed, hyperlink } from '@discordjs/builders'; import logger from '@utils/logger'; +import { Guild } from 'discord.js'; /** * The list of basic commands to display. */ @@ -73,10 +74,10 @@ const botInfoEmbed = new Embed() iconURL: 'https://dynamica.dev/img/dynamica.png', }); -export default new Event<'guildCreate'>() +export default new Event() .setOnce(false) .setEvent('guildCreate') - .setResponse(async (guild) => { + .setResponse(async (guild: Guild) => { if (!guild.me.permissions.has('ADMINISTRATOR')) { const owner = await guild.fetchOwner(); owner.send( diff --git a/src/events/guildDelete.ts b/src/events/guildDelete.ts index edcb873..0c4481c 100644 --- a/src/events/guildDelete.ts +++ b/src/events/guildDelete.ts @@ -1,11 +1,12 @@ import Event from '@classes/event'; import db from '@db'; import logger from '@utils/logger'; +import { Guild } from 'discord.js'; -export default new Event<'guildDelete'>() +export default new Event() .setOnce(false) .setEvent('guildDelete') - .setResponse(async (guild) => { + .setResponse(async (guild: Guild) => { const manager = await guild.channels.cache.get('Dynamica Manager'); try { await manager?.delete(); diff --git a/src/events/index.ts b/src/events/index.ts index 7ba9e19..afde44a 100644 --- a/src/events/index.ts +++ b/src/events/index.ts @@ -1,5 +1,4 @@ import Event from '@/classes/event'; -import { ClientEvents } from 'discord.js'; import autocomplete from './autocomplete'; import channelDelete from './channelDelete'; import command from './command'; @@ -10,7 +9,7 @@ import ready from './ready'; import voiceStateUpdate from './voiceStateUpdate'; interface EventsInterface { - [key: string]: Event; + [key: string]: Event; } const exports: EventsInterface = { diff --git a/src/events/presenceUpdate.ts b/src/events/presenceUpdate.ts index 06690a4..cfa5e37 100644 --- a/src/events/presenceUpdate.ts +++ b/src/events/presenceUpdate.ts @@ -2,7 +2,7 @@ import Event from '@classes/event'; import DynamicaSecondary from '@classes/secondary'; import { Presence } from 'discord.js'; -export default new Event<'presenceUpdate'>() +export default new Event() .setOnce(false) .setEvent('presenceUpdate') .setResponse(async (oldPresence: Presence, newPresence: Presence) => { diff --git a/src/events/rateLimit.ts b/src/events/rateLimit.ts index 6558e5f..828ee21 100644 --- a/src/events/rateLimit.ts +++ b/src/events/rateLimit.ts @@ -1,9 +1,10 @@ import Event from '@classes/event'; import logger from '@utils/logger'; +import { RateLimitData } from 'discord.js'; -export default new Event<'rateLimit'>() +export default new Event() .setOnce(false) - .setEvent('rateLimit') - .setResponse(async (data) => { + .setEvent('guildCreate') + .setResponse(async (data: RateLimitData) => { logger.info(data); }); diff --git a/src/events/ready.ts b/src/events/ready.ts index 8c9ba69..9f1036b 100644 --- a/src/events/ready.ts +++ b/src/events/ready.ts @@ -4,11 +4,12 @@ import DynamicaSecondary from '@classes/secondary'; import db from '@db'; import updateActivityCount from '@utils'; import logger from '@utils/logger'; +import { Client } from 'discord.js'; -export default new Event<'ready'>() +export default new Event() .setOnce(true) .setEvent('ready') - .setResponse(async (client) => { + .setResponse(async (client: Client) => { try { const secondaries = await db.secondary.findMany(); const primaries = await db.primary.findMany(); diff --git a/src/events/voiceStateUpdate.ts b/src/events/voiceStateUpdate.ts index c0cf8ca..ffe2ba1 100644 --- a/src/events/voiceStateUpdate.ts +++ b/src/events/voiceStateUpdate.ts @@ -3,7 +3,7 @@ import DynamicaPrimary from '@classes/primary'; import DynamicaSecondary from '@classes/secondary'; import { VoiceState } from 'discord.js'; -export default new Event<'voiceStateUpdate'>() +export default new Event() .setOnce(false) .setEvent('voiceStateUpdate') .setResponse(async (oldVoiceState: VoiceState, newVoiceState: VoiceState) => { From 9d2beda38fbc8703beac8a6612687087872d8548 Mon Sep 17 00:00:00 2001 From: Sebastian Pietschner <32213671+sebasptsch@users.noreply.github.com> Date: Sat, 23 Apr 2022 15:20:10 +1000 Subject: [PATCH 2/6] Revert "fixes to text channels lol" This reverts commit d1dcb6836810a6daa13d1625f5c1443b3ee4bf5d. --- src/classes/dynamicaChannel.ts | 2 +- src/classes/guild.ts | 67 +++++++--------------------------- src/classes/secondary.ts | 10 ++--- src/commands/text.ts | 2 +- 4 files changed, 18 insertions(+), 63 deletions(-) diff --git a/src/classes/dynamicaChannel.ts b/src/classes/dynamicaChannel.ts index 4bcd59a..baf9e1a 100644 --- a/src/classes/dynamicaChannel.ts +++ b/src/classes/dynamicaChannel.ts @@ -7,7 +7,7 @@ interface DynamicaChannelTypes { prisma: Prisma.Primary; }; secondary: { - prisma: Prisma.Secondary & { guild: Prisma.Guild; primary: Prisma.Primary }; + prisma: Prisma.Secondary; }; } diff --git a/src/classes/guild.ts b/src/classes/guild.ts index 89fdabc..eac1885 100644 --- a/src/classes/guild.ts +++ b/src/classes/guild.ts @@ -1,7 +1,7 @@ import db from '@db'; import { Alias, Guild as PrismaGuild } from '@prisma/client'; import logger from '@utils/logger'; -import { Client, Guild as DiscordGuild, Guild } from 'discord.js'; +import { Client, Guild as DiscordGuild } from 'discord.js'; export default class DynamicaGuild { private client: Client; @@ -30,57 +30,23 @@ export default class DynamicaGuild { if (!this.id) { throw new Error('No Id defined.'); } - try { - const guild = await this.fetchPrisma(); - const discordGuild = await this.fetchDiscord(); + const guild = await db.guild.findUnique({ + where: { id: this.id }, + include: { aliases: true }, + }); + const discordGuild = await this.client.guilds.cache.get(this.id); if (guild && discordGuild) { this.prisma = guild; this.discord = discordGuild; } + return undefined; } catch (error) { logger.error("Couldn't fetch guild:", error); } return this; } - async fetchPrisma(): Promise< - PrismaGuild & { - aliases: Alias[]; - } - > { - const guild = await db.guild.findUnique({ - where: { id: this.id }, - include: { aliases: true }, - }); - if (!guild) { - logger.info('fetch prisma'); - return db.guild.create({ - data: { id: this.id }, - include: { aliases: true }, - }); - } else { - return guild; - } - } - - async fetchDiscord(): Promise { - const discord = await this.client.guilds.cache.get(this.id); - if (!discord) { - this.deletePrisma(); - return undefined; - } - return discord; - } - - async deletePrisma(): Promise { - const guild = await db.guild.findUnique({ where: { id: this.id } }); - if (!guild) { - return undefined; - } - return db.guild.delete({ where: { id: this.id } }); - } - /** * Change the setting allowing people to request to join a locked channel. * @param enabled the state to set the setting to @@ -93,7 +59,7 @@ export default class DynamicaGuild { if (!this.id) { throw new Error('No Id defined'); } - this.prisma = await db.guild.update({ + const updatedGuild = await db.guild.update({ where: { id: this.id }, include: { aliases: true, @@ -102,6 +68,8 @@ export default class DynamicaGuild { allowJoinRequests: enabled, }, }); + + this.prisma = updatedGuild; return this; } @@ -117,24 +85,15 @@ export default class DynamicaGuild { if (!this.id) { throw new Error('No Id defined'); } - this.prisma = await db.guild.update({ + const updatedGuild = await db.guild.update({ where: { id: this.id }, include: { aliases: true }, data: { textChannelsEnabled: enabled, }, }); - return this; - } - /** - * Create a guild entry in prisma - */ - async create(id: Guild['id']) { - return db.guild.create({ - data: { - id, - }, - }); + this.prisma = updatedGuild; + return this; } } diff --git a/src/classes/secondary.ts b/src/classes/secondary.ts index 675d5ec..bff6a47 100644 --- a/src/classes/secondary.ts +++ b/src/classes/secondary.ts @@ -1,7 +1,7 @@ import PrimaryClass from '@classes/primary'; import db from '@db'; import { Embed } from '@discordjs/builders'; -import Prisma, { Primary } from '@prisma/client'; +import Prisma from '@prisma/client'; import updateActivityCount from '@utils'; import formatChannelName from '@utils/format'; import logger from '@utils/logger'; @@ -10,7 +10,7 @@ import DynamicaChannel from './dynamicaChannel'; export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { /** The secondary channel as defined by prisma */ - // declare prisma: Prisma.Secondary & { guild: Guild; primary: Primary }; + declare prisma: Prisma.Secondary; /** The discord text channel */ textChannel?: TextChannel; @@ -181,8 +181,6 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { return undefined; } this.prisma = prisma; - this.prismaGuild = prisma.guild; - this.prismaPrimary = prisma.primary; this.discord = discord; if (prisma.textChannelId) { const textChannel = await this.fetchDiscordText(); @@ -196,9 +194,7 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { return this; } - async fetchPrisma(): Promise< - Prisma.Secondary & { guild: Prisma.Guild; primary: Primary } - > { + async fetchPrisma(): Promise { const prisma = await db.secondary.findUnique({ where: { id: this.id }, include: { guild: true, primary: true }, diff --git a/src/commands/text.ts b/src/commands/text.ts index 6c7385b..b141826 100644 --- a/src/commands/text.ts +++ b/src/commands/text.ts @@ -27,7 +27,7 @@ export default new Command() interaction.client, interaction.guildId ).fetch(); - await guild.setTextEnabled(state); + guild.setAllowJoin(state); await interaction.reply( `Temporary text channels ${ From 549f27449909b53b7533400b7fa424dff7fa3e5d Mon Sep 17 00:00:00 2001 From: Sebastian Pietschner <32213671+sebasptsch@users.noreply.github.com> Date: Sat, 23 Apr 2022 15:20:10 +1000 Subject: [PATCH 3/6] Revert "added dynamicachannel class" This reverts commit a713d9f1ee2d183c04aef88c7bc7dbfafb30d97c. --- .vscode/settings.json | 2 +- src/classes/dynamicaChannel.ts | 102 ---------------------- src/classes/primary.ts | 104 +++++++++++++++++++---- src/classes/secondary.ts | 150 +++++++++++++++++++-------------- 4 files changed, 178 insertions(+), 180 deletions(-) delete mode 100644 src/classes/dynamicaChannel.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index 35a6d34..554e402 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { "typescript.tsdk": "node_modules/typescript/lib", - "editor.formatOnSave": true + "editor.formatOnSave": false } diff --git a/src/classes/dynamicaChannel.ts b/src/classes/dynamicaChannel.ts deleted file mode 100644 index baf9e1a..0000000 --- a/src/classes/dynamicaChannel.ts +++ /dev/null @@ -1,102 +0,0 @@ -import logger from '@/utils/logger'; -import Prisma from '@prisma/client'; -import { Client, Guild, VoiceChannel } from 'discord.js'; - -interface DynamicaChannelTypes { - primary: { - prisma: Prisma.Primary; - }; - secondary: { - prisma: Prisma.Secondary; - }; -} - -export default class DynamicaChannel { - /** The discord channel */ - discord: VoiceChannel; - - /** The discordjs client instance */ - client: Client; - - /** The channel id as set in fetch */ - id: string; - - /** The discord guild */ - discordGuild: Guild; - - /** The prisma guild */ - prismaGuild: Prisma.Guild; - - /** The prisma entry */ - prisma: DynamicaChannelTypes[K]['prisma']; - - constructor(client: Client, channelId?: string) { - this.client = client; - if (channelId) { - this.id = channelId; - } - } - - async create(...args): Promise> { - return this; - } - async fetch(): Promise | undefined> { - if (!this.client) { - throw new Error('No client defined'); - } - if (!this.id) { - throw new Error('No id defined'); - } - const channel = await this.fetchDiscord(); - const prisma = await this.fetchPrisma(); - if (!channel) { - this.deletePrisma(); - return undefined; - } - if (!prisma) { - return undefined; - } - this.prisma = prisma; - this.discord = channel; - - return this; - } - async delete() { - this.deletePrisma(); - this.deleteDiscord(); - } - - async fetchPrisma(): Promise { - return this.prisma; - } - - /** Get the discord channel */ - async fetchDiscord(): Promise { - const channel = await this.client.channels.cache.get(this.id); - if (!channel || channel.type !== 'GUILD_VOICE') { - return undefined; - } - return channel; - } - - async deletePrisma(): Promise {} - async deleteDiscord(): Promise { - if (!this.client) { - throw new Error('No client defined.'); - } - if (!this.id) { - throw new Error('No Id defined.'); - } - try { - if (!this.discord.deletable) { - throw new Error('The channel is not deletable.'); - } - - await this.discord.delete(); - - logger.debug(`Primary channel deleted ${this.id}.`); - } catch (error) { - logger.error('Failed to delete primary:', error); - } - } -} diff --git a/src/classes/primary.ts b/src/classes/primary.ts index b7b40e1..6dd234c 100644 --- a/src/classes/primary.ts +++ b/src/classes/primary.ts @@ -1,23 +1,48 @@ import db from '@db'; import Prisma from '@prisma/client'; import logger from '@utils/logger'; -import { Guild, GuildChannel, User } from 'discord.js'; -import DynamicaChannel from './dynamicaChannel'; +import { Client, Guild, GuildChannel, User, VoiceChannel } from 'discord.js'; -export default class DynamicaPrimary extends DynamicaChannel<'primary'> { +export default class DynamicaPrimary { /** The secondary channel as defined by prisma */ - declare prisma: Prisma.Primary & { + prisma: Prisma.Primary & { guild: Prisma.Guild; secondaries: Prisma.Secondary[]; }; + /** The discord channel as defined by discord */ + discord: VoiceChannel; + + /** The discordjs client instance */ + client: Client; + + /** The channel id as set in fetch */ + id: string; + + /** The discord guild */ + discordGuild: Guild; + + /** The prisma guild */ + prismaGuild: Prisma.Guild; + + constructor(client: Client, channelId?: string) { + this.client = client; + if (channelId) { + this.id = channelId; + } + } + /** * Create a new primary channel * @param guild The guild * @param user The user who ran the command * @param section The section that the channel should be assigned to */ - async create(guild: Guild, user: User, section?: GuildChannel) { + async create( + guild: Guild, + user: User, + section?: GuildChannel + ): Promise { try { const parent = section?.id; const channel = await guild.channels.create('➕ New Session', { @@ -35,7 +60,7 @@ export default class DynamicaPrimary extends DynamicaChannel<'primary'> { logger.debug( `New primary channel ${channel.name} created by ${primary.creator}.` ); - this.id = channel.id; + this.id = channel.id await this.fetch(); } catch (error) { logger.error('Error creating new primary channel:', error); @@ -43,16 +68,48 @@ export default class DynamicaPrimary extends DynamicaChannel<'primary'> { return this; } - async fetchPrisma() { - const prisma = await db.primary.findUnique({ + /** + * Fetch the database entry and discord channels (voice and text). + * @param channelId The discord channel Id. + */ + async fetch(): Promise { + if (!this.client) { + throw new Error('No client defined'); + } + if (!this.id) { + throw new Error('No id defined'); + } + const primary = await db.primary.findUnique({ where: { id: this.id }, include: { guild: true, secondaries: true }, }); - - if (!prisma) { + if (!primary) { return undefined; } - return prisma; + try { + this.prisma = primary; + this.prismaGuild = primary.guild; + } catch (error) { + logger.error('Error fetching primary channel from database:', error); + } + try { + const channel = await this.client.channels.cache.get(this.id); + if (!channel) { + this.delete(); + return undefined; + } + if (!channel.isVoice()) { + throw new Error('Not a valid voice channel.'); + } else if (channel.type === 'GUILD_STAGE_VOICE') { + throw new Error('Not a valid voice channel (Stage)'); + } else { + this.discord = channel; + this.discordGuild = channel.guild; + } + } catch (error) { + logger.error('Error fetching primary channel from discord:', error); + } + return this; } /** @@ -85,13 +142,30 @@ export default class DynamicaPrimary extends DynamicaChannel<'primary'> { } } - async deletePrisma(): Promise { + private async deletePrisma(): Promise { if (!this.id) { throw new Error('No id defined.'); } - const prisma = await this.fetchPrisma(); - if (prisma) { - await db.primary.delete({ where: { id: this.id } }); + await db.primary.delete({ where: { id: this.id } }); + } + + private async deleteDiscord(): Promise { + if (!this.client) { + throw new Error('No client defined.'); + } + if (!this.id) { + throw new Error('No Id defined.'); + } + try { + if (!this.discord.deletable) { + throw new Error('The channel is not deletable.'); + } + + await this.discord.delete(); + + logger.debug(`Primary channel deleted ${this.id}.`); + } catch (error) { + logger.error('Failed to delete primary:', error); } } } diff --git a/src/classes/secondary.ts b/src/classes/secondary.ts index bff6a47..4e320ba 100644 --- a/src/classes/secondary.ts +++ b/src/classes/secondary.ts @@ -5,19 +5,49 @@ import Prisma from '@prisma/client'; import updateActivityCount from '@utils'; import formatChannelName from '@utils/format'; import logger from '@utils/logger'; -import { Guild, GuildMember, TextChannel, User } from 'discord.js'; -import DynamicaChannel from './dynamicaChannel'; - -export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { +import { + Client, + Guild, + GuildMember, + TextChannel, + User, + VoiceChannel, +} from 'discord.js'; + +export default class DynamicaSecondary { /** The secondary channel as defined by prisma */ - declare prisma: Prisma.Secondary; + prisma: Prisma.Secondary; + + /** The discord channel as defined by discord */ + discord: VoiceChannel; + + /** The discordjs client instance */ + client: Client; + + /** The channel id as set in fetch */ + id: string; /** The discord text channel */ textChannel?: TextChannel; + /** The prisma guild */ + prismaGuild: Prisma.Guild; + /** The prisma primary */ prismaPrimary: Prisma.Primary; + /** + * The secondary constructor + * @param client DiscordJS client instance + * @param id The channel Id + */ + constructor(client: Client, id?: string) { + this.client = client; + if (id) { + this.id = id; + } + } + /** * Create a secondary channel. * @param primary primary parent channel @@ -25,7 +55,11 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { * @param member guild member who created the channel * @returns */ - async create(primary: PrimaryClass, guild: Guild, member: GuildMember) { + async create( + primary: PrimaryClass, + guild: Guild, + member: GuildMember + ): Promise { try { await primary.fetch(); @@ -162,7 +196,7 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { * Fetch the database entry and discord channels (voice and text). * @param channelId The discord channel Id. */ - async fetch() { + async fetch(): Promise { // Variables if (!this.client) { throw new Error('No client defined'); @@ -171,49 +205,49 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { throw new Error('No Id defined'); } - const prisma = await this.fetchPrisma(); - const discord = await this.fetchDiscord(); - if (!discord) { - await this.deletePrisma(); - return undefined; - } - if (!prisma) { - return undefined; - } - this.prisma = prisma; - this.discord = discord; - if (prisma.textChannelId) { - const textChannel = await this.fetchDiscordText(); - if (textChannel) { - this.textChannel = textChannel; - } else { - logger.error(`Failed to fetch text channel ${prisma.textChannelId}`); - } - } - - return this; - } + const { id } = this; - async fetchPrisma(): Promise { const prisma = await db.secondary.findUnique({ - where: { id: this.id }, + where: { id }, include: { guild: true, primary: true }, }); - return prisma; - } - async fetchDiscordText(): Promise { - const channel = await this.client.channels.cache.get(this.id); - if (!channel || channel.type !== 'GUILD_TEXT') { + if (prisma) { + const discord = await this.client.channels.cache.get(id); + if (discord?.type === 'GUILD_VOICE') { + this.discord = discord; + } else { + await db.secondary.delete({ where: { id: prisma.id } }); + return undefined; + } + const textChannel = await this.client.channels.cache.get( + prisma.textChannelId + ); + this.prisma = prisma; + this.prismaGuild = prisma.guild; + this.prismaPrimary = prisma.primary; + if (textChannel?.type === 'GUILD_TEXT') { + this.textChannel = textChannel; + } else { + this.textChannel = undefined; + await db.secondary.update({ + where: { id }, + data: { + textChannelId: undefined, + }, + }); + } + } else { return undefined; } - return channel; + + return this; } /** * Update secondary channel, changing name if required. */ - async update() { + async update(): Promise { if (!this.client) { throw new Error('No client defined'); } @@ -236,6 +270,9 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { guildId: this.prismaGuild.id, }, }); + /** + * The discord channel to be refreshed + */ /** * The name of the creator based on the config @@ -314,33 +351,25 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { * Delete a secondary discord channel. DB & Discord Channel. */ async delete(): Promise { + await this.fetch(); if (!this.client) { throw new Error('No client defined'); } if (!this.id) { logger.debug('No id'); } - try { - const discord = await this.fetchDiscord(); - const prisma = await this.fetchPrisma(); - if (discord) { - discord.delete(); + if (!this.discord && !this.prisma) { + return; } - if (prisma) { - db.secondary.delete({ where: { id: this.id } }); + if (!this.discord && !!this.prisma) { + await this.deletePrisma(); + } else if (!this.prisma && !!this.discord) { + await this.deleteDiscord(); + } else if (this.discord && this.prisma) { + await this.deletePrisma(); + await this.deleteDiscord(); } - // if (!this.discord && !this.prisma) { - // return; - // } - // if (!this.discord && !!this.prisma) { - // await this.deletePrisma(); - // } else if (!this.prisma && !!this.discord) { - // await this.deleteDiscord(); - // } else if (this.discord && this.prisma) { - // await this.deletePrisma(); - // await this.deleteDiscord(); - // } logger.debug(`Secondary channel deleted ${this.id}.`); } catch (error) { logger.error(error); @@ -349,17 +378,14 @@ export default class DynamicaSecondary extends DynamicaChannel<'secondary'> { await updateActivityCount(this.client); } - async deletePrisma(): Promise { + private async deletePrisma(): Promise { if (!this.id) { throw new Error('No id defined.'); } - const prisma = await this.fetchPrisma(); - if (prisma) { - await db.secondary.delete({ where: { id: this.id } }); - } + await db.secondary.delete({ where: { id: this.id } }); } - async deleteDiscord(): Promise { + private async deleteDiscord(): Promise { if (!this.client) { throw new Error('No client defined.'); } From 49de976c59ad1bd239a1dc59f66cd30aa58e5eb5 Mon Sep 17 00:00:00 2001 From: Sebastian Pietschner <32213671+sebasptsch@users.noreply.github.com> Date: Sat, 23 Apr 2022 15:20:10 +1000 Subject: [PATCH 4/6] Revert "add some helpful snippets" This reverts commit c773a76ea1195378c288b77da67020956224f4ea. --- .vscode/emmet.code-snippets | 34 ------------------------------- src/classes/dynamicaEvent.ts | 4 ---- src/commands/version.ts | 3 ++- src/help/version.ts | 3 ++- src/utils/dynamicaEventManager.ts | 16 --------------- 5 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 .vscode/emmet.code-snippets diff --git a/.vscode/emmet.code-snippets b/.vscode/emmet.code-snippets deleted file mode 100644 index 0532515..0000000 --- a/.vscode/emmet.code-snippets +++ /dev/null @@ -1,34 +0,0 @@ -{ - "Command": { - "prefix": "command", - "body": [ - "import help from '@/help/version';", - "import Command from '@classes/command';", - "import { SlashCommandBuilder } from '@discordjs/builders';", - "import Discord from 'discord.js';", - "export default new Command()", - "\t.setCommandData(", - "\t\tnew SlashCommandBuilder()", - "\t\t\t.setName('version')", - "\t\t\t.setDescription('The version of the bot in use.')", - "\t)", - "\t.setHelp(help)", - "\t.setResponse(async (interaction) => {", - "\t\tinteraction.reply({", - "\t\t\tephemeral: true,", - "\t\t\tcontent: `The version of the bot is \\`${process.env.VERSION}\\`.\\nThe discord.js version is \\`${Discord.version}\\`.`,", - "\t\t});", - "\t});" - ], - "description": "Creates a command" - }, - "Help": { - "prefix": "help", - "body": [ - "import Help from '@/classes/help';", - "", - "export default new Help('Sends the running version of Dynamica.');" - ], - "description": "Creates help file" - } -} diff --git a/src/classes/dynamicaEvent.ts b/src/classes/dynamicaEvent.ts index 9300003..ed58526 100644 --- a/src/classes/dynamicaEvent.ts +++ b/src/classes/dynamicaEvent.ts @@ -9,8 +9,6 @@ type Awaitable = T | PromiseLike; /** The different events that can occur in the DynamicaEventManager */ interface DynamicaEventTypes { - /** Fires when a secondary channel has been created and is ready to be joined. */ - secondaryReady: [secondary: DynamicaSecondary, guildMember: GuildMember] /** Fired when a user joins a secondary channel. */ secondaryJoined: [secondary: DynamicaSecondary, guildMember: GuildMember] /** Fured when a user joins a primary channel. */ @@ -19,8 +17,6 @@ interface DynamicaEventTypes { secondaryLeft: [secondary: DynamicaSecondary, guildMember: GuildMember] /** Fired when a user leaves a primary channel. */ primaryLeft: [primary: DynamicaPrimary, guildMember: GuildMember] - /** Fired when a secondary channel needs to be refreshed. */ - secondaryRefresh: [secondary: DynamicaSecondary] } export class DynamicaEventManager extends EventEmitter { diff --git a/src/commands/version.ts b/src/commands/version.ts index 76b6922..8bfca4a 100644 --- a/src/commands/version.ts +++ b/src/commands/version.ts @@ -2,6 +2,7 @@ import help from '@/help/version'; import Command from '@classes/command'; import { SlashCommandBuilder } from '@discordjs/builders'; import Discord from 'discord.js'; + export default new Command() .setCommandData( new SlashCommandBuilder() @@ -14,4 +15,4 @@ export default new Command() ephemeral: true, content: `The version of the bot is \`${process.env.VERSION}\`.\nThe discord.js version is \`${Discord.version}\`.`, }); - }); \ No newline at end of file + }); diff --git a/src/help/version.ts b/src/help/version.ts index 147228d..472c295 100644 --- a/src/help/version.ts +++ b/src/help/version.ts @@ -1,2 +1,3 @@ import Help from '@/classes/help'; -export default new Help('Sends the running version of Dynamica.'); \ No newline at end of file + +export default new Help('Sends the running version of Dynamica.'); diff --git a/src/utils/dynamicaEventManager.ts b/src/utils/dynamicaEventManager.ts index 5caf745..51e7cda 100644 --- a/src/utils/dynamicaEventManager.ts +++ b/src/utils/dynamicaEventManager.ts @@ -2,20 +2,4 @@ import { DynamicaEventManager } from "@/classes/dynamicaEvent"; const dynamicaManager = new DynamicaEventManager() -dynamicaManager.on('secondaryJoined', (secondary, guildMember) => { - console.log(`${guildMember.displayName} joined ${secondary.discord.name}`); -}) -dynamicaManager.on('secondaryLeft', (secondary, guildMember) => { - console.log(`${guildMember.displayName} left ${secondary.discord.name}`); -}) -dynamicaManager.on('primaryJoined', (primary, guildMember) => { - console.log(`${guildMember.displayName} joined ${primary.discord.name}`); -}) -dynamicaManager.on('primaryLeft', (primary, guildMember) => { - console.log(`${guildMember.displayName} left ${primary.discord.name}`); -}) -dynamicaManager.on('secondaryRefresh', (secondary) => { - console.log(`${secondary.discord.name} refreshed`); -}) - export default dynamicaManager \ No newline at end of file From ee1f9458c98ca2a49c48d77f9e00be4faeba02fc Mon Sep 17 00:00:00 2001 From: Sebastian Pietschner <32213671+sebasptsch@users.noreply.github.com> Date: Sat, 23 Apr 2022 15:20:10 +1000 Subject: [PATCH 5/6] Revert "add djs version to /version" This reverts commit d2a8aecd1eda33720757213892d812bdaa626270. --- src/classes/dynamicaEvent.ts | 5 - src/commands/version.ts | 3 +- yarn.lock | 950 +++++++++++++++++------------------ 3 files changed, 461 insertions(+), 497 deletions(-) diff --git a/src/classes/dynamicaEvent.ts b/src/classes/dynamicaEvent.ts index ed58526..a6c26a0 100644 --- a/src/classes/dynamicaEvent.ts +++ b/src/classes/dynamicaEvent.ts @@ -7,15 +7,10 @@ const emitter = new EventEmitter(); type Awaitable = T | PromiseLike; -/** The different events that can occur in the DynamicaEventManager */ interface DynamicaEventTypes { - /** Fired when a user joins a secondary channel. */ secondaryJoined: [secondary: DynamicaSecondary, guildMember: GuildMember] - /** Fured when a user joins a primary channel. */ primaryJoined: [primary: DynamicaPrimary, guildMember: GuildMember] - /** Fired when a user leaves a secondary channel. */ secondaryLeft: [secondary: DynamicaSecondary, guildMember: GuildMember] - /** Fired when a user leaves a primary channel. */ primaryLeft: [primary: DynamicaPrimary, guildMember: GuildMember] } diff --git a/src/commands/version.ts b/src/commands/version.ts index 8bfca4a..9c1e307 100644 --- a/src/commands/version.ts +++ b/src/commands/version.ts @@ -1,7 +1,6 @@ import help from '@/help/version'; import Command from '@classes/command'; import { SlashCommandBuilder } from '@discordjs/builders'; -import Discord from 'discord.js'; export default new Command() .setCommandData( @@ -13,6 +12,6 @@ export default new Command() .setResponse(async (interaction) => { interaction.reply({ ephemeral: true, - content: `The version of the bot is \`${process.env.VERSION}\`.\nThe discord.js version is \`${Discord.version}\`.`, + content: `The version of the bot is \`${process.env.VERSION}\`.`, }); }); diff --git a/yarn.lock b/yarn.lock index fc435ea..0ca8c47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -94,7 +94,7 @@ "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: "@nodelib/fs.stat" "2.0.5" @@ -102,33 +102,33 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" "@prisma/client@^3.10.0": - version "3.12.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-3.12.0.tgz#a0eb49ffea5c128dd11dffb896d7139a60073d12" - integrity sha512-4NEQjUcWja/NVBvfuDFscWSk1/rXg3+wj+TSkqXCb1tKlx/bsUE00rxsvOvGg7VZ6lw1JFpGkwjwmsOIc4zvQw== + version "3.11.1" + resolved "https://registry.npmjs.org/@prisma/client/-/client-3.11.1.tgz" + integrity sha512-B3C7zQG4HbjJzUr2Zg9UVkBJutbqq9/uqkl1S138+keZCubJrwizx3RuIvGwI+s+pm3qbsyNqXiZgL3Ir0fSng== dependencies: - "@prisma/engines-version" "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" + "@prisma/engines-version" "3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9" -"@prisma/engines-version@3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980": - version "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz#829ca3d9d0d92555f44644606d4edfd45b2f5886" - integrity sha512-o+jo8d7ZEiVpcpNWUDh3fj2uPQpBxl79XE9ih9nkogJbhw6P33274SHnqheedZ7PyvPIK/mvU8MLNYgetgXPYw== +"@prisma/engines-version@3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9": + version "3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9" + resolved "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9.tgz" + integrity sha512-HkcsDniA4iNb/gi0iuyOJNAM7nD/LwQ0uJm15v360O5dee3TM4lWdSQiTYBMK6FF68ACUItmzSur7oYuUZ2zkQ== -"@prisma/engines@3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980": - version "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980.tgz#e52e364084c4d05278f62768047b788665e64a45" - integrity sha512-zULjkN8yhzS7B3yeEz4aIym4E2w1ChrV12i14pht3ePFufvsAvBSoZ+tuXMvfSoNTgBS5E4bolRzLbMmbwkkMQ== +"@prisma/engines@3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9": + version "3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9" + resolved "https://registry.npmjs.org/@prisma/engines/-/engines-3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9.tgz" + integrity sha512-MILbsGnvmnhCbFGa2/iSnsyGyazU3afzD7ldjCIeLIGKkNBMSZgA2IvpYsAXl+6qFHKGrS3B2otKfV31dwMSQw== "@sapphire/async-queue@^1.1.9": version "1.3.0" @@ -145,98 +145,98 @@ resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz" integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== -"@swc/core-android-arm-eabi@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.167.tgz#113b5c003237b15f1a5aa3881118a59cf56cd4cf" - integrity sha512-eu8RAPKWLC5i9b1NShXhKtu3b5qvv/XtdkKpXuAkb8Kjr6qQs3PwuWl+xw8tsuyOc8FVaEy70Bj2QtckvSk2SA== - -"@swc/core-android-arm64@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.167.tgz#90c16ca26e4d5a9b60120167e640ed1c2b8ed275" - integrity sha512-L6DEHm4Ki+lMokOXg/Q5kHtOXrGJZf4pHNk1UL9uOW56n602uSBn9u8AXPmKV3VBmDa+xEsFbNUUkDrfRT+txg== - -"@swc/core-darwin-arm64@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.167.tgz#6b8eaa69e51957d0ae1c8326d8b158d5d000ee5d" - integrity sha512-LayaG1CMsrTxUYH6GLA6gRUzEgu2/CrIboUgx/8CoGHSFY2Acqr1CZgE9oJ16DeVud8RX6Y1DkTcrDM5P8566w== - -"@swc/core-darwin-x64@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.167.tgz#176675e44c9318c4696302e4da39e90e9502b457" - integrity sha512-2n7bb6iqdgOiLXuS/r0MXsbZl4jGvMi+4l5Vl/6tCqyRB5SoT1gZIVDjAg4NHZYAgWMQUB1jBkSoiXkBN7kXww== - -"@swc/core-freebsd-x64@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.167.tgz#23da7fe2aa1b8075304b9fdc83d031571f160d7b" - integrity sha512-gEqCULsZhmNRl0SB1RWmhSne6vQDY72Q0LhT7A9Y4Qdnk32hQ+Fp5a6nhqGT+vD9SbPk0VG4VtQWivmxV2dfUg== - -"@swc/core-linux-arm-gnueabihf@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.167.tgz#d61c1507d2303fd3476101a7008058b5cfd17362" - integrity sha512-P+pW01nGwItOPIeMVnOCEBYrOxOc7pnfGb1+EPjasJfyQBkvUKL1K8vo02cLYqaFgsbkDDo1zkzlxXyb52wpGg== - -"@swc/core-linux-arm64-gnu@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.167.tgz#83be1b6458b3cc82a72f605e0446d5e8b376d679" - integrity sha512-tHdQH23Pc7zS8EBm5pEZ/f0SFSP9RVvL4ReWZJRkEcC8sOIazgT9vd7CJwKwQwi5pt+hKxbK2tP94oX+VP/w5A== - -"@swc/core-linux-arm64-musl@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.167.tgz#1c468ef5d2e1e079c578d4127500acd1c1843a44" - integrity sha512-avEcEq7GJ/wZAo4DLDxn+ZRoXA/VUj6yVw4oNjESG3tLY5SE17pFj5Wg3TS2SRuCaG2GJhegmogKUIKJ8be/Lg== - -"@swc/core-linux-x64-gnu@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.167.tgz#1644467a7234e94044ee630551ed10b24871f36f" - integrity sha512-OGnQ/YpHAvUOV4NJzRa9QlIC/IyXtDA2667Loexoru9nr+QM75JzfOBu4SbBllmBHDV0fJ5SDGFRZJfWj1Jr7w== - -"@swc/core-linux-x64-musl@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.167.tgz#6ad80f3d940af991b24216ccd173dda2be2249e7" - integrity sha512-o9x1qGdriSSqJ9jTgBvbCRhsG6FqVIeEzz7failEF1rg2/RUz7r0T+Cjj8WAU6Z724GHSqQKP3U1NVMZRmrvzg== - -"@swc/core-win32-arm64-msvc@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.167.tgz#e73b6cbce71883dce81b501ce25bf9cd18c16f4b" - integrity sha512-hOuO/uZCqCjZHt60NzWInv3miMNF4vunWmkCzdnfrqbZJjl5jid8Gi5NffT3E+kjJM8EwG1I/HTtpeGI11Y5SA== - -"@swc/core-win32-ia32-msvc@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.167.tgz#30ed781e8980e7451f989525d8762625c407cee9" - integrity sha512-/qY4PR5SmfEFmiyeqcHQKxn+4J2Ovvw4ProSZeC83V2WTt85Cqe6nL788vRlgHXx4FIwOXYmVxUtShA9PeiLoQ== - -"@swc/core-win32-x64-msvc@1.2.167": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.167.tgz#927778825a4ea9e9e769b144b109f31b45300444" - integrity sha512-wHhqYZG6kcEkiCJ1lGQJ4FykEYn/JLqftCTyeb6TZx9k3BcLN3RCkQrjGCX8gLclIRcKav9UhATZKEVaDfimag== +"@swc/core-android-arm-eabi@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.161.tgz#3a723984a51705a6360fefc7c7efb5a7681c8f3f" + integrity sha512-SYm08FusdMo70JaKEYE7GpJHVp020iqPL3FjYEmQ+iyhc0Id8RlMeFt7ZtIj0aYHPKudR3GljzG5FVJXmm1Iuw== + +"@swc/core-android-arm64@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.161.tgz#4d9e1b2d6a42ee767fda8ee7d46f059ab001ff0b" + integrity sha512-zk+GgVGKwIO9PsUcLZ7tG1XGGBJ/xyv5Or9/R0rQArBTGS5mvSK4d+9XrItQph8i3ECZhik3PuexmR7us6ysCw== + +"@swc/core-darwin-arm64@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.161.tgz#bdef41c63d905a1da094c6756f09ca3ff19644d1" + integrity sha512-pf65TWy9oFkWCRzRq16Ec6rglurdajWT5tv1E93Kh4izEFLvKN/Mp+8EMnqOcoAn+HEtjzp2R6NosBruV/d1Ww== + +"@swc/core-darwin-x64@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.161.tgz#96980fb8c3207f8305457864241c4a942b4d9903" + integrity sha512-QdgsY+BjYO0ngSIwR/xZn6W3iP0E/+of38Afon3maANDiKzvzsvyZm4IVTznOaxG1ZUJ/q1oKeRV/DcW7QvHiw== + +"@swc/core-freebsd-x64@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.161.tgz#8b41d589a04c1236ab0d6163cca548574925cae4" + integrity sha512-yApHncnlQNQINxxcz+Y+svlrdU3d/yaJ769eoThIQXsZTL0Il3gnhhkjJkMEigLTexpQZQOGjgYnV9HKkpYqkw== + +"@swc/core-linux-arm-gnueabihf@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.161.tgz#4d475d57fdccaab900d88195e2b4e1b990e45e21" + integrity sha512-DGSKqKSBQ42mAMmPhWkfgzXaci4RU0XgmnO1bFVkl8Yw9TaxBBBeCbLIBYJik4DehOOYic9gtXZIfEs90+oc2w== + +"@swc/core-linux-arm64-gnu@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.161.tgz#e528dd661ed85f9069a5792536a2f784cab377f8" + integrity sha512-wdEPjBLuf0bUMafURrUN11MOGs7PHnedWOFAfvyRuNf4HdfwbS2nYDpFCL4mklN8BuprxvRFWfoA+ROigexK4g== + +"@swc/core-linux-arm64-musl@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.161.tgz#928dc578ba5cd8bb26decee62d150c565a09f1f5" + integrity sha512-EPwDDlAIchv1FG1Vc2ArUGsX2b87LSEXHjF59TuOj+oXOANHnFRQa/28wHpeMYN5lHYmyjMplfn37XYLMo8BDw== + +"@swc/core-linux-x64-gnu@1.2.161": + version "1.2.161" + resolved "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.161.tgz" + integrity sha512-UE+8n2PLCojxywQd1nPbMcus/3zLQjg05Oozrvl1IkHBssk89tk2GhLujUwbFS+MoGFPKAmL+wT+9lXHavK7Og== + +"@swc/core-linux-x64-musl@1.2.161": + version "1.2.161" + resolved "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.161.tgz" + integrity sha512-mkshCdRhS5s1w1Koph/kS8EJVEmrq+/p4iLsLDozXi1RL16lzk5SYn4ppmzF/Zj9OpgJ+Nzk7kNcZMMJMVIwqw== + +"@swc/core-win32-arm64-msvc@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.161.tgz#e8e7cb5bac7319525ba297e4a2819dafc44f98d6" + integrity sha512-5ZMhPSeFJO+h0Ejoq766S25VvrooUW0RdhfcG2u7OFqhdlTXHlvryL7jdf6tILltmJxNWeAGrNE8YI+ARolTeQ== + +"@swc/core-win32-ia32-msvc@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.161.tgz#938e66e731f2d72b3dcf8af963c36a807f46286b" + integrity sha512-/c+L8bYCjg8pbx3Jbgx9Cns9nlLUpB4CmugfIdlW+2EdncyZyKu+u+D0egnOjvtlxe8BNw0889oH1Lv4p7KuhA== + +"@swc/core-win32-x64-msvc@1.2.161": + version "1.2.161" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.161.tgz#f95a8ebe77fe35a1b9e87b52628b870a706b43be" + integrity sha512-FXzZXf+kXvqgZFd+dIzD8Pcc22yejm/XNvpGTy9HZHWYLvlif+QSXrNgvX1oyMWZYT+NCVHwebKjS9FTnTMi9w== "@swc/core@^1.2.151": - version "1.2.167" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.167.tgz#4e81b34b0a9d5d21fb4c1b4676880f90c40f8cee" - integrity sha512-O7o7lw4JizrNe23ozYrN0eSXEZvoD0orERc6N56R75oAvIMPIl6pqm/QoRgpA/H41MD9DD1LkF5jmZOa/UB0OA== + version "1.2.161" + resolved "https://registry.npmjs.org/@swc/core/-/core-1.2.161.tgz" + integrity sha512-RXv1y2HDqZ4gAjdvqV0KL1Oms8vUkDgXRU5SPOEa3zMzMDNKHvRfoiBk4ZyaGzhGcr0zflqT4EADKgTB8RFNsw== optionalDependencies: - "@swc/core-android-arm-eabi" "1.2.167" - "@swc/core-android-arm64" "1.2.167" - "@swc/core-darwin-arm64" "1.2.167" - "@swc/core-darwin-x64" "1.2.167" - "@swc/core-freebsd-x64" "1.2.167" - "@swc/core-linux-arm-gnueabihf" "1.2.167" - "@swc/core-linux-arm64-gnu" "1.2.167" - "@swc/core-linux-arm64-musl" "1.2.167" - "@swc/core-linux-x64-gnu" "1.2.167" - "@swc/core-linux-x64-musl" "1.2.167" - "@swc/core-win32-arm64-msvc" "1.2.167" - "@swc/core-win32-ia32-msvc" "1.2.167" - "@swc/core-win32-x64-msvc" "1.2.167" + "@swc/core-android-arm-eabi" "1.2.161" + "@swc/core-android-arm64" "1.2.161" + "@swc/core-darwin-arm64" "1.2.161" + "@swc/core-darwin-x64" "1.2.161" + "@swc/core-freebsd-x64" "1.2.161" + "@swc/core-linux-arm-gnueabihf" "1.2.161" + "@swc/core-linux-arm64-gnu" "1.2.161" + "@swc/core-linux-arm64-musl" "1.2.161" + "@swc/core-linux-x64-gnu" "1.2.161" + "@swc/core-linux-x64-musl" "1.2.161" + "@swc/core-win32-arm64-msvc" "1.2.161" + "@swc/core-win32-ia32-msvc" "1.2.161" + "@swc/core-win32-x64-msvc" "1.2.161" "@types/json-schema@^7.0.9": version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@types/json5@^0.0.29": version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= "@types/lodash@^4.14.178": @@ -252,16 +252,11 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*": +"@types/node@*", "@types/node@^17.0.23": version "17.0.23" resolved "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz" integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== -"@types/node@^17.0.23": - version "17.0.24" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.24.tgz#20ba1bf69c1b4ab405c7a01e950c4f446b05029f" - integrity sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g== - "@types/romans@^2.0.0": version "2.0.0" resolved "https://registry.npmjs.org/@types/romans/-/romans-2.0.0.tgz" @@ -282,13 +277,13 @@ "@types/node" "*" "@typescript-eslint/eslint-plugin@^5.17.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.19.0.tgz#9608a4b6d0427104bccf132f058cba629a6553c0" - integrity sha512-w59GpFqDYGnWFim9p6TGJz7a3qWeENJuAKCqjGSx+Hq/bwq3RZwXYqy98KIfN85yDqz9mq6QXiY5h0FjGQLyEg== + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz#704eb4e75039000531255672bf1c85ee85cf1d67" + integrity sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ== dependencies: - "@typescript-eslint/scope-manager" "5.19.0" - "@typescript-eslint/type-utils" "5.19.0" - "@typescript-eslint/utils" "5.19.0" + "@typescript-eslint/scope-manager" "5.17.0" + "@typescript-eslint/type-utils" "5.17.0" + "@typescript-eslint/utils" "5.17.0" debug "^4.3.2" functional-red-black-tree "^1.0.1" ignore "^5.1.8" @@ -297,68 +292,68 @@ tsutils "^3.21.0" "@typescript-eslint/parser@^5.17.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.19.0.tgz#05e587c1492868929b931afa0cb5579b0f728e75" - integrity sha512-yhktJjMCJX8BSBczh1F/uY8wGRYrBeyn84kH6oyqdIJwTGKmzX5Qiq49LRQ0Jh0LXnWijEziSo6BRqny8nqLVQ== + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.17.0.tgz#7def77d5bcd8458d12d52909118cf3f0a45f89d5" + integrity sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig== dependencies: - "@typescript-eslint/scope-manager" "5.19.0" - "@typescript-eslint/types" "5.19.0" - "@typescript-eslint/typescript-estree" "5.19.0" + "@typescript-eslint/scope-manager" "5.17.0" + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/typescript-estree" "5.17.0" debug "^4.3.2" -"@typescript-eslint/scope-manager@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.19.0.tgz#97e59b0bcbcb54dbcdfba96fc103b9020bbe9cb4" - integrity sha512-Fz+VrjLmwq5fbQn5W7cIJZ066HxLMKvDEmf4eu1tZ8O956aoX45jAuBB76miAECMTODyUxH61AQM7q4/GOMQ5g== +"@typescript-eslint/scope-manager@5.17.0": + version "5.17.0" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz" + integrity sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w== dependencies: - "@typescript-eslint/types" "5.19.0" - "@typescript-eslint/visitor-keys" "5.19.0" + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/visitor-keys" "5.17.0" -"@typescript-eslint/type-utils@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.19.0.tgz#80f2125b0dfe82494bbae1ea99f1c0186d420282" - integrity sha512-O6XQ4RI4rQcBGshTQAYBUIGsKqrKeuIOz9v8bckXZnSeXjn/1+BDZndHLe10UplQeJLXDNbaZYrAytKNQO2T4Q== +"@typescript-eslint/type-utils@5.17.0": + version "5.17.0" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz" + integrity sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg== dependencies: - "@typescript-eslint/utils" "5.19.0" + "@typescript-eslint/utils" "5.17.0" debug "^4.3.2" tsutils "^3.21.0" -"@typescript-eslint/types@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.19.0.tgz#12d3d600d754259da771806ee8b2c842d3be8d12" - integrity sha512-zR1ithF4Iyq1wLwkDcT+qFnhs8L5VUtjgac212ftiOP/ZZUOCuuF2DeGiZZGQXGoHA50OreZqLH5NjDcDqn34w== +"@typescript-eslint/types@5.17.0": + version "5.17.0" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.17.0.tgz" + integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw== -"@typescript-eslint/typescript-estree@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.19.0.tgz#fc987b8f62883f9ea6a5b488bdbcd20d33c0025f" - integrity sha512-dRPuD4ocXdaE1BM/dNR21elSEUPKaWgowCA0bqJ6YbYkvtrPVEvZ+zqcX5a8ECYn3q5iBSSUcBBD42ubaOp0Hw== +"@typescript-eslint/typescript-estree@5.17.0": + version "5.17.0" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz" + integrity sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg== dependencies: - "@typescript-eslint/types" "5.19.0" - "@typescript-eslint/visitor-keys" "5.19.0" + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/visitor-keys" "5.17.0" debug "^4.3.2" globby "^11.0.4" is-glob "^4.0.3" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/utils@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.19.0.tgz#fe87f1e3003d9973ec361ed10d36b4342f1ded1e" - integrity sha512-ZuEckdupXpXamKvFz/Ql8YnePh2ZWcwz7APICzJL985Rp5C2AYcHO62oJzIqNhAMtMK6XvrlBTZeNG8n7gS3lQ== +"@typescript-eslint/utils@5.17.0": + version "5.17.0" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.17.0.tgz" + integrity sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.19.0" - "@typescript-eslint/types" "5.19.0" - "@typescript-eslint/typescript-estree" "5.19.0" + "@typescript-eslint/scope-manager" "5.17.0" + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/typescript-estree" "5.17.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.19.0": - version "5.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.19.0.tgz#c84ebc7f6c744707a361ca5ec7f7f64cd85b8af6" - integrity sha512-Ym7zZoMDZcAKWsULi2s7UMLREdVQdScPQ/fKWMYefarCztWlHPFVJo8racf8R0Gc8FAEJ2eD4of8As1oFtnQlQ== +"@typescript-eslint/visitor-keys@5.17.0": + version "5.17.0" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz" + integrity sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA== dependencies: - "@typescript-eslint/types" "5.19.0" + "@typescript-eslint/types" "5.17.0" eslint-visitor-keys "^3.0.0" acorn-jsx@^5.3.1: @@ -417,12 +412,12 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: any-promise@^1.0.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz" integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= anymatch@~3.1.2: version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" @@ -437,7 +432,7 @@ argparse@^1.0.7: array-includes@^3.1.4: version "3.1.4" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" + resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz" integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== dependencies: call-bind "^1.0.2" @@ -448,18 +443,17 @@ array-includes@^3.1.4: array-union@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== array.prototype.flat@^1.2.5: - version "1.3.0" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b" - integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw== + version "1.2.5" + resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz" + integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.19.2" - es-shim-unscopables "^1.0.0" + es-abstract "^1.19.0" astral-regex@^2.0.0: version "2.0.0" @@ -473,12 +467,12 @@ asynckit@^0.4.0: balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== binary-extensions@^2.0.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== bindings@^1.5.0: @@ -490,7 +484,7 @@ bindings@^1.5.0: brace-expansion@^1.1.7: version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== dependencies: balanced-match "^1.0.0" @@ -498,7 +492,7 @@ brace-expansion@^1.1.7: braces@^3.0.2, braces@~3.0.2: version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: fill-range "^7.0.1" @@ -512,19 +506,19 @@ bufferutil@^4.0.6: bundle-require@^3.0.2: version "3.0.4" - resolved "https://registry.yarnpkg.com/bundle-require/-/bundle-require-3.0.4.tgz#2b52ba77d99c0a586b5854cd21d36954e63cc110" + resolved "https://registry.npmjs.org/bundle-require/-/bundle-require-3.0.4.tgz" integrity sha512-VXG6epB1yrLAvWVQpl92qF347/UXmncQj7J3U8kZEbdVZ1ZkQyr4hYeL/9RvcE8vVVdp53dY78Fd/3pqfRqI1A== dependencies: load-tsconfig "^0.2.0" cac@^6.7.12: version "6.7.12" - resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.12.tgz#6fb5ea2ff50bd01490dbda497f4ae75a99415193" + resolved "https://registry.npmjs.org/cac/-/cac-6.7.12.tgz" integrity sha512-rM7E2ygtMkJqD9c7WnFU6fruFcN3xe4FM5yUmgxhZzIKJk4uHl9U/fhwdajGFQbQuv43FAUo1Fe8gX/oIKDeSA== call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: function-bind "^1.1.1" @@ -554,7 +548,7 @@ chalk@^4.0.0: chokidar@^3.5.1: version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== dependencies: anymatch "~3.1.2" @@ -600,12 +594,12 @@ combined-stream@^1.0.8: commander@^4.0.0: version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + resolved "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== concat-map@0.0.1: version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= confusing-browser-globals@^1.0.10: @@ -624,14 +618,14 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3: debug@^2.6.9: version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" debug@^3.2.7: version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" @@ -649,12 +643,11 @@ deep-is@^0.1.3: integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== define-properties@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + version "1.1.3" + resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== dependencies: - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" + object-keys "^1.0.12" delayed-stream@~1.0.0: version "1.0.0" @@ -663,7 +656,7 @@ delayed-stream@~1.0.0: dir-glob@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz" integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== dependencies: path-type "^4.0.0" @@ -695,7 +688,7 @@ discord.js@^13.3.1: doctrine@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz" integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== dependencies: esutils "^2.0.2" @@ -744,10 +737,10 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.19.1, es-abstract@^1.19.2: - version "1.19.5" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.5.tgz#a2cb01eb87f724e815b278b0dd0d00f36ca9a7f1" - integrity sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA== +es-abstract@^1.19.0, es-abstract@^1.19.1: + version "1.19.2" + resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz" + integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -760,7 +753,7 @@ es-abstract@^1.19.1, es-abstract@^1.19.2: is-callable "^1.2.4" is-negative-zero "^2.0.2" is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" + is-shared-array-buffer "^1.0.1" is-string "^1.0.7" is-weakref "^1.0.2" object-inspect "^1.12.0" @@ -770,147 +763,140 @@ es-abstract@^1.19.1, es-abstract@^1.19.2: string.prototype.trimstart "^1.0.4" unbox-primitive "^1.0.1" -es-shim-unscopables@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" - integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== - dependencies: - has "^1.0.3" - es-to-primitive@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz" integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== dependencies: is-callable "^1.1.4" is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-android-64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.36.tgz#fc5f95ce78c8c3d790fa16bc71bd904f2bb42aa1" - integrity sha512-jwpBhF1jmo0tVCYC/ORzVN+hyVcNZUWuozGcLHfod0RJCedTDTvR4nwlTXdx1gtncDqjk33itjO+27OZHbiavw== - -esbuild-android-arm64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.36.tgz#44356fbb9f8de82a5cdf11849e011dfb3ad0a8a8" - integrity sha512-/hYkyFe7x7Yapmfv4X/tBmyKnggUmdQmlvZ8ZlBnV4+PjisrEhAvC3yWpURuD9XoB8Wa1d5dGkTsF53pIvpjsg== - -esbuild-darwin-64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.36.tgz#3d9324b21489c70141665c2e740d6e84f16f725d" - integrity sha512-kkl6qmV0dTpyIMKagluzYqlc1vO0ecgpviK/7jwPbRDEv5fejRTaBBEE2KxEQbTHcLhiiDbhG7d5UybZWo/1zQ== - -esbuild-darwin-arm64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.36.tgz#2a8040c2e465131e5281034f3c72405e643cb7b2" - integrity sha512-q8fY4r2Sx6P0Pr3VUm//eFYKVk07C5MHcEinU1BjyFnuYz4IxR/03uBbDwluR6ILIHnZTE7AkTUWIdidRi1Jjw== - -esbuild-freebsd-64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.36.tgz#d82c387b4d01fe9e8631f97d41eb54f2dbeb68a3" - integrity sha512-Hn8AYuxXXRptybPqoMkga4HRFE7/XmhtlQjXFHoAIhKUPPMeJH35GYEUWGbjteai9FLFvBAjEAlwEtSGxnqWww== - -esbuild-freebsd-arm64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.36.tgz#e8ce2e6c697da6c7ecd0cc0ac821d47c5ab68529" - integrity sha512-S3C0attylLLRiCcHiJd036eDEMOY32+h8P+jJ3kTcfhJANNjP0TNBNL30TZmEdOSx/820HJFgRrqpNAvTbjnDA== - -esbuild-linux-32@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.36.tgz#a4a261e2af91986ea62451f2db712a556cb38a15" - integrity sha512-Eh9OkyTrEZn9WGO4xkI3OPPpUX7p/3QYvdG0lL4rfr73Ap2HAr6D9lP59VMF64Ex01LhHSXwIsFG/8AQjh6eNw== - -esbuild-linux-64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.36.tgz#4a9500f9197e2c8fcb884a511d2c9d4c2debde72" - integrity sha512-vFVFS5ve7PuwlfgoWNyRccGDi2QTNkQo/2k5U5ttVD0jRFaMlc8UQee708fOZA6zTCDy5RWsT5MJw3sl2X6KDg== - -esbuild-linux-arm64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.36.tgz#c91c21e25b315464bd7da867365dd1dae14ca176" - integrity sha512-24Vq1M7FdpSmaTYuu1w0Hdhiqkbto1I5Pjyi+4Cdw5fJKGlwQuw+hWynTcRI/cOZxBcBpP21gND7W27gHAiftw== - -esbuild-linux-arm@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.36.tgz#90e23bca2e6e549affbbe994f80ba3bb6c4d934a" - integrity sha512-NhgU4n+NCsYgt7Hy61PCquEz5aevI6VjQvxwBxtxrooXsxt5b2xtOUXYZe04JxqQo+XZk3d1gcr7pbV9MAQ/Lg== - -esbuild-linux-mips64le@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.36.tgz#40e11afb08353ff24709fc89e4db0f866bc131d2" - integrity sha512-hZUeTXvppJN+5rEz2EjsOFM9F1bZt7/d2FUM1lmQo//rXh1RTFYzhC0txn7WV0/jCC7SvrGRaRz0NMsRPf8SIA== - -esbuild-linux-ppc64le@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.36.tgz#9e8a588c513d06cc3859f9dcc52e5fdfce8a1a5e" - integrity sha512-1Bg3QgzZjO+QtPhP9VeIBhAduHEc2kzU43MzBnMwpLSZ890azr4/A9Dganun8nsqD/1TBcqhId0z4mFDO8FAvg== - -esbuild-linux-riscv64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.36.tgz#e578c09b23b3b97652e60e3692bfda628b541f06" - integrity sha512-dOE5pt3cOdqEhaufDRzNCHf5BSwxgygVak9UR7PH7KPVHwSTDAZHDoEjblxLqjJYpc5XaU9+gKJ9F8mp9r5I4A== - -esbuild-linux-s390x@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.36.tgz#3c9dab40d0d69932ffded0fd7317bb403626c9bc" - integrity sha512-g4FMdh//BBGTfVHjF6MO7Cz8gqRoDPzXWxRvWkJoGroKA18G9m0wddvPbEqcQf5Tbt2vSc1CIgag7cXwTmoTXg== - -esbuild-netbsd-64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.36.tgz#e27847f6d506218291619b8c1e121ecd97628494" - integrity sha512-UB2bVImxkWk4vjnP62ehFNZ73lQY1xcnL5ZNYF3x0AG+j8HgdkNF05v67YJdCIuUJpBuTyCK8LORCYo9onSW+A== - -esbuild-openbsd-64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.36.tgz#c94c04c557fae516872a586eae67423da6d2fabb" - integrity sha512-NvGB2Chf8GxuleXRGk8e9zD3aSdRO5kLt9coTQbCg7WMGXeX471sBgh4kSg8pjx0yTXRt0MlrUDnjVYnetyivg== - -esbuild-sunos-64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.36.tgz#9b79febc0df65a30f1c9bd63047d1675511bf99d" - integrity sha512-VkUZS5ftTSjhRjuRLp+v78auMO3PZBXu6xl4ajomGenEm2/rGuWlhFSjB7YbBNErOchj51Jb2OK8lKAo8qdmsQ== - -esbuild-windows-32@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.36.tgz#910d11936c8d2122ffdd3275e5b28d8a4e1240ec" - integrity sha512-bIar+A6hdytJjZrDxfMBUSEHHLfx3ynoEZXx/39nxy86pX/w249WZm8Bm0dtOAByAf4Z6qV0LsnTIJHiIqbw0w== - -esbuild-windows-64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.36.tgz#21b4ce8b42a4efc63f4b58ec617f1302448aad26" - integrity sha512-+p4MuRZekVChAeueT1Y9LGkxrT5x7YYJxYE8ZOTcEfeUUN43vktSn6hUNsvxzzATrSgq5QqRdllkVBxWZg7KqQ== - -esbuild-windows-arm64@0.14.36: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.36.tgz#ba21546fecb7297667d0052d00150de22c044b24" - integrity sha512-fBB4WlDqV1m18EF/aheGYQkQZHfPHiHJSBYzXIo8yKehek+0BtBwo/4PNwKGJ5T0YK0oc8pBKjgwPbzSrPLb+Q== - -esbuild@^0.14.25: - version "0.14.36" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.36.tgz#0023a73eab57886ac5605df16ee421e471a971b3" - integrity sha512-HhFHPiRXGYOCRlrhpiVDYKcFJRdO0sBElZ668M4lh2ER0YgnkLxECuFe7uWCf23FrcLc59Pqr7dHkTqmRPDHmw== +esbuild-android-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.29.tgz#c0960c84c9b832bade20831515e89d32549d4769" + integrity sha512-tJuaN33SVZyiHxRaVTo1pwW+rn3qetJX/SRuc/83rrKYtyZG0XfsQ1ao1nEudIt9w37ZSNXR236xEfm2C43sbw== + +esbuild-android-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.29.tgz#8eceb3abe5abde5489d6a5cbe6a7c1044f71115f" + integrity sha512-D74dCv6yYnMTlofVy1JKiLM5JdVSQd60/rQfJSDP9qvRAI0laPXIG/IXY1RG6jobmFMUfL38PbFnCqyI/6fPXg== + +esbuild-darwin-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.29.tgz#26f3f14102310ecb8f2d9351c5b7a47a60d2cc8a" + integrity sha512-+CJaRvfTkzs9t+CjGa0Oa28WoXa7EeLutQhxus+fFcu0MHhsBhlmeWHac3Cc/Sf/xPi1b2ccDFfzGYJCfV0RrA== + +esbuild-darwin-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.29.tgz#6d2d89dfd937992649239711ed5b86e51b13bd89" + integrity sha512-5Wgz/+zK+8X2ZW7vIbwoZ613Vfr4A8HmIs1XdzRmdC1kG0n5EG5fvKk/jUxhNlrYPx1gSY7XadQ3l4xAManPSw== + +esbuild-freebsd-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.29.tgz#2cb41a0765d0040f0838280a213c81bbe62d6394" + integrity sha512-VTfS7Bm9QA12JK1YXF8+WyYOfvD7WMpbArtDj6bGJ5Sy5xp01c/q70Arkn596aGcGj0TvQRplaaCIrfBG1Wdtg== + +esbuild-freebsd-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.29.tgz#e1b79fbb63eaeff324cf05519efa7ff12ce4586a" + integrity sha512-WP5L4ejwLWWvd3Fo2J5mlXvG3zQHaw5N1KxFGnUc4+2ZFZknP0ST63i0IQhpJLgEJwnQpXv2uZlU1iWZjFqEIg== + +esbuild-linux-32@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.29.tgz#a4a5a0b165b15081bc3227986e10dd4943edb7d6" + integrity sha512-4myeOvFmQBWdI2U1dEBe2DCSpaZyjdQtmjUY11Zu2eQg4ynqLb8Y5mNjNU9UN063aVsCYYfbs8jbken/PjyidA== + +esbuild-linux-64@0.14.29: + version "0.14.29" + resolved "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.29.tgz" + integrity sha512-iaEuLhssReAKE7HMwxwFJFn7D/EXEs43fFy5CJeA4DGmU6JHh0qVJD2p/UP46DvUXLRKXsXw0i+kv5TdJ1w5pg== + +esbuild-linux-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.29.tgz#d1a23993b26cb1f63f740329b2fc09218e498bd1" + integrity sha512-KYf7s8wDfUy+kjKymW3twyGT14OABjGHRkm9gPJ0z4BuvqljfOOUbq9qT3JYFnZJHOgkr29atT//hcdD0Pi7Mw== + +esbuild-linux-arm@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.29.tgz#a7e2fea558525eab812b1fe27d7a2659cd1bb723" + integrity sha512-OXa9D9QL1hwrAnYYAHt/cXAuSCmoSqYfTW/0CEY0LgJNyTxJKtqc5mlwjAZAvgyjmha0auS/sQ0bXfGf2wAokQ== + +esbuild-linux-mips64le@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.29.tgz#e708c527f0785574e400828cdbed3d9b17b5ddff" + integrity sha512-05jPtWQMsZ1aMGfHOvnR5KrTvigPbU35BtuItSSWLI2sJu5VrM8Pr9Owym4wPvA4153DFcOJ1EPN/2ujcDt54g== + +esbuild-linux-ppc64le@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.29.tgz#0137d1b38beae36a57176ef45e90740e734df502" + integrity sha512-FYhBqn4Ir9xG+f6B5VIQVbRuM4S6qwy29dDNYFPoxLRnwTEKToIYIUESN1qHyUmIbfO0YB4phG2JDV2JDN9Kgw== + +esbuild-linux-riscv64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.29.tgz#a2f73235347a58029dcacf0fb91c9eb8bebc8abb" + integrity sha512-eqZMqPehkb4nZcffnuOpXJQdGURGd6GXQ4ZsDHSWyIUaA+V4FpMBe+5zMPtXRD2N4BtyzVvnBko6K8IWWr36ew== + +esbuild-linux-s390x@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.29.tgz#0f7310ff1daec463ead9b9e26b7aa083a9f9f1ee" + integrity sha512-o7EYajF1rC/4ho7kpSG3gENVx0o2SsHm7cJ5fvewWB/TEczWU7teDgusGSujxCYcMottE3zqa423VTglNTYhjg== + +esbuild-netbsd-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.29.tgz#ba9a0d9cb8aed73b684825126927f75d4fe44ff9" + integrity sha512-/esN6tb6OBSot6+JxgeOZeBk6P8V/WdR3GKBFeFpSqhgw4wx7xWUqPrdx4XNpBVO7X4Ipw9SAqgBrWHlXfddww== + +esbuild-openbsd-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.29.tgz#36dbe2c32d899106791b5f3af73f359213f71b8a" + integrity sha512-jUTdDzhEKrD0pLpjmk0UxwlfNJNg/D50vdwhrVcW/D26Vg0hVbthMfb19PJMatzclbK7cmgk1Nu0eNS+abzoHw== + +esbuild-sunos-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.29.tgz#e5f857c121441ec63bf9b399a2131409a7d344e5" + integrity sha512-EfhQN/XO+TBHTbkxwsxwA7EfiTHFe+MNDfxcf0nj97moCppD9JHPq48MLtOaDcuvrTYOcrMdJVeqmmeQ7doTcg== + +esbuild-windows-32@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.29.tgz#9c2f1ab071a828f3901d1d79d205982a74bdda6e" + integrity sha512-uoyb0YAJ6uWH4PYuYjfGNjvgLlb5t6b3zIaGmpWPOjgpr1Nb3SJtQiK4YCPGhONgfg2v6DcJgSbOteuKXhwqAw== + +esbuild-windows-64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.29.tgz#85fbce7c2492521896451b98d649a7db93e52667" + integrity sha512-X9cW/Wl95QjsH8WUyr3NqbmfdU72jCp71cH3pwPvI4CgBM2IeOUDdbt6oIGljPu2bf5eGDIo8K3Y3vvXCCTd8A== + +esbuild-windows-arm64@0.14.29: + version "0.14.29" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.29.tgz#0aa7a9a1bc43a63350bcf574d94b639176f065b5" + integrity sha512-+O/PI+68fbUZPpl3eXhqGHTGK7DjLcexNnyJqtLZXOFwoAjaXlS5UBCvVcR3o2va+AqZTj8o6URaz8D2K+yfQQ== + +esbuild@^0.14.2: + version "0.14.29" + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.14.29.tgz" + integrity sha512-SQS8cO8xFEqevYlrHt6exIhK853Me4nZ4aMW6ieysInLa0FMAL+AKs87HYNRtR2YWRcEIqoXAHh+Ytt5/66qpg== optionalDependencies: - esbuild-android-64 "0.14.36" - esbuild-android-arm64 "0.14.36" - esbuild-darwin-64 "0.14.36" - esbuild-darwin-arm64 "0.14.36" - esbuild-freebsd-64 "0.14.36" - esbuild-freebsd-arm64 "0.14.36" - esbuild-linux-32 "0.14.36" - esbuild-linux-64 "0.14.36" - esbuild-linux-arm "0.14.36" - esbuild-linux-arm64 "0.14.36" - esbuild-linux-mips64le "0.14.36" - esbuild-linux-ppc64le "0.14.36" - esbuild-linux-riscv64 "0.14.36" - esbuild-linux-s390x "0.14.36" - esbuild-netbsd-64 "0.14.36" - esbuild-openbsd-64 "0.14.36" - esbuild-sunos-64 "0.14.36" - esbuild-windows-32 "0.14.36" - esbuild-windows-64 "0.14.36" - esbuild-windows-arm64 "0.14.36" + esbuild-android-64 "0.14.29" + esbuild-android-arm64 "0.14.29" + esbuild-darwin-64 "0.14.29" + esbuild-darwin-arm64 "0.14.29" + esbuild-freebsd-64 "0.14.29" + esbuild-freebsd-arm64 "0.14.29" + esbuild-linux-32 "0.14.29" + esbuild-linux-64 "0.14.29" + esbuild-linux-arm "0.14.29" + esbuild-linux-arm64 "0.14.29" + esbuild-linux-mips64le "0.14.29" + esbuild-linux-ppc64le "0.14.29" + esbuild-linux-riscv64 "0.14.29" + esbuild-linux-s390x "0.14.29" + esbuild-netbsd-64 "0.14.29" + esbuild-openbsd-64 "0.14.29" + esbuild-sunos-64 "0.14.29" + esbuild-windows-32 "0.14.29" + esbuild-windows-64 "0.14.29" + esbuild-windows-arm64 "0.14.29" escape-string-regexp@^1.0.5: version "1.0.5" @@ -933,9 +919,9 @@ eslint-config-airbnb-base@^15.0.0: semver "^6.3.0" eslint-config-airbnb-typescript@^16.1.4: - version "16.2.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-16.2.0.tgz#9193fafd62f1cbf444895f4495eae334baf3265b" - integrity sha512-OUaMPZpTOZGKd5tXOjJ9PRU4iYNW/Z5DoHIynjsVK/FpkWdiY5+nxQW6TiJAlLwVI1l53xUOrnlZWtVBVQzuWA== + version "16.1.4" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-16.1.4.tgz#ac8553a55080cce34aa1ab5625564b4faf5a5f1c" + integrity sha512-dfm2cEaYXh4mCYd+RyJO8+PQfd5/zp8WwrCeRznly5qD9W5tal3KTjgdInYWuEAdwWnNJxWcmQ/HFiA4bfkM1g== dependencies: eslint-config-airbnb-base "^15.0.0" @@ -946,16 +932,16 @@ eslint-config-prettier@^8.5.0: eslint-import-resolver-node@^0.3.6: version "0.3.6" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz" integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== dependencies: debug "^3.2.7" resolve "^1.20.0" eslint-import-resolver-typescript@^2.7.0: - version "2.7.1" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz#a90a4a1c80da8d632df25994c4c5fdcdd02b8751" - integrity sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ== + version "2.7.0" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.0.tgz#1f9d391b636dccdbaa4a3b1a87eb9a8237e23963" + integrity sha512-MNHS3u5pebvROX4MjGP9coda589ZGfL1SqdxUV4kSrcclfDRWvNE2D+eljbnWVMvWDVRgT89nhscMHPKYGcObQ== dependencies: debug "^4.3.4" glob "^7.2.0" @@ -963,32 +949,32 @@ eslint-import-resolver-typescript@^2.7.0: resolve "^1.22.0" tsconfig-paths "^3.14.1" -eslint-module-utils@^2.7.3: +eslint-module-utils@^2.7.2: version "2.7.3" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" + resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz" integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== dependencies: debug "^3.2.7" find-up "^2.1.0" eslint-plugin-import@^2.25.4: - version "2.26.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" - integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== + version "2.25.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" + integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.3" + eslint-module-utils "^2.7.2" has "^1.0.3" - is-core-module "^2.8.1" + is-core-module "^2.8.0" is-glob "^4.0.3" - minimatch "^3.1.2" + minimatch "^3.0.4" object.values "^1.1.5" - resolve "^1.22.0" - tsconfig-paths "^3.14.1" + resolve "^1.20.0" + tsconfig-paths "^3.12.0" eslint-plugin-prettier@^4.0.0: version "4.0.0" @@ -999,7 +985,7 @@ eslint-plugin-prettier@^4.0.0: eslint-scope@^5.1.1: version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: esrecurse "^4.3.0" @@ -1014,7 +1000,7 @@ eslint-utils@^2.1.0: eslint-utils@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz" integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== dependencies: eslint-visitor-keys "^2.0.0" @@ -1026,12 +1012,12 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: eslint-visitor-keys@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint-visitor-keys@^3.0.0: version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== eslint@^7.32.0: @@ -1103,14 +1089,14 @@ esquery@^1.4.0: esrecurse@^4.3.0: version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: estraverse "^5.2.0" estraverse@^4.1.1: version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== estraverse@^5.1.0, estraverse@^5.2.0: @@ -1120,7 +1106,7 @@ estraverse@^5.1.0, estraverse@^5.2.0: esutils@^2.0.2: version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== event-stream@=3.3.4: @@ -1138,7 +1124,7 @@ event-stream@=3.3.4: execa@^5.0.0: version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== dependencies: cross-spawn "^7.0.3" @@ -1163,7 +1149,7 @@ fast-diff@^1.1.2: fast-glob@^3.2.9: version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== dependencies: "@nodelib/fs.stat" "^2.0.2" @@ -1184,7 +1170,7 @@ fast-levenshtein@^2.0.6: fastq@^1.6.0: version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + resolved "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz" integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== dependencies: reusify "^1.0.4" @@ -1210,7 +1196,7 @@ file-uri-to-path@1.0.0: fill-range@^7.0.1: version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz" integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== dependencies: to-regex-range "^5.0.1" @@ -1260,7 +1246,7 @@ from@~0: fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@~2.3.2: @@ -1270,12 +1256,12 @@ fsevents@~2.3.2: function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== functional-red-black-tree@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= fuse.js@^6.5.3: @@ -1285,7 +1271,7 @@ fuse.js@^6.5.3: get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== dependencies: function-bind "^1.1.1" @@ -1294,12 +1280,12 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: get-stream@^6.0.0: version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== get-symbol-description@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz" integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== dependencies: call-bind "^1.0.2" @@ -1307,14 +1293,14 @@ get-symbol-description@^1.0.0: glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" glob@7.1.6: version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" @@ -1345,7 +1331,7 @@ globals@^13.6.0, globals@^13.9.0: globby@^11.0.3, globby@^11.0.4: version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== dependencies: array-union "^2.1.0" @@ -1367,7 +1353,7 @@ graphql@^16.3.0: has-bigints@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz" integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== has-flag@^3.0.0: @@ -1380,35 +1366,28 @@ has-flag@^4.0.0: resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== - dependencies: - get-intrinsic "^1.1.1" - has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-tostringtag@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz" integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== dependencies: has-symbols "^1.0.2" has@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" human-signals@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== ignore@^4.0.6: @@ -1418,7 +1397,7 @@ ignore@^4.0.6: ignore@^5.1.8, ignore@^5.2.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== import-fresh@^3.0.0, import-fresh@^3.2.1: @@ -1436,7 +1415,7 @@ imurmurhash@^0.1.4: inflight@^1.0.4: version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= dependencies: once "^1.3.0" @@ -1444,12 +1423,12 @@ inflight@^1.0.4: inherits@2: version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== internal-slot@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz" integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== dependencies: get-intrinsic "^1.1.0" @@ -1463,21 +1442,21 @@ is-arrayish@^0.2.1: is-bigint@^1.0.1: version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz" integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== dependencies: has-bigints "^1.0.1" is-binary-path@~2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz" integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== dependencies: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz" integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: call-bind "^1.0.2" @@ -1485,26 +1464,26 @@ is-boolean-object@^1.1.0: is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-core-module@^2.8.1: +is-core-module@^2.8.0, is-core-module@^2.8.1: version "2.8.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== dependencies: has "^1.0.3" is-date-object@^1.0.1: version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== dependencies: has-tostringtag "^1.0.0" is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^3.0.0: @@ -1521,70 +1500,68 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: is-negative-zero@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== + version "1.0.6" + resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== dependencies: has-tostringtag "^1.0.0" is-number@^7.0.0: version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== is-regex@^1.1.4: version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== - dependencies: - call-bind "^1.0.2" +is-shared-array-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz" + integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== is-stream@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz" integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== dependencies: has-tostringtag "^1.0.0" is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz" integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: has-symbols "^1.0.2" is-weakref@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz" integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== dependencies: call-bind "^1.0.2" isexe@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= joycon@^3.0.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03" + resolved "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz" integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw== js-tokens@^4.0.0: @@ -1622,7 +1599,7 @@ json-stable-stringify-without-jsonify@^1.0.1: json5@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz" integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== dependencies: minimist "^1.2.0" @@ -1637,12 +1614,12 @@ levn@^0.4.1: lilconfig@^2.0.5: version "2.0.5" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25" + resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz" integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg== lines-and-columns@^1.1.6: version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== load-json-file@^4.0.0: @@ -1657,12 +1634,12 @@ load-json-file@^4.0.0: load-tsconfig@^0.2.0: version "0.2.3" - resolved "https://registry.yarnpkg.com/load-tsconfig/-/load-tsconfig-0.2.3.tgz#08af3e7744943caab0c75f8af7f1703639c3ef1f" + resolved "https://registry.npmjs.org/load-tsconfig/-/load-tsconfig-0.2.3.tgz" integrity sha512-iyT2MXws+dc2Wi6o3grCFtGXpeMvHmJqS27sMPGtV2eUu4PeFnG+33I8BlFK1t1NWMjOpcx9bridn5yxLDX2gQ== locate-path@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz" integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= dependencies: p-locate "^2.0.0" @@ -1685,7 +1662,7 @@ lodash@^4.17.21: lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz" integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== dependencies: yallist "^4.0.0" @@ -1697,17 +1674,17 @@ map-stream@~0.1.0: merge-stream@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== micromatch@^4.0.4: version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: braces "^3.0.2" @@ -1727,39 +1704,39 @@ mime-types@^2.1.12: mimic-fn@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -minimatch@^3.0.4, minimatch@^3.1.2: +minimatch@^3.0.4: version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" minimist@^1.2.0, minimist@^1.2.6: version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== ms@2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= ms@2.1.2: version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== ms@^2.1.1: version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== mz@^2.7.0: version "2.7.0" - resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz" integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== dependencies: any-promise "^1.0.0" @@ -1795,34 +1772,34 @@ node-gyp-build@^4.3.0: normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== npm-run-path@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== dependencies: path-key "^3.0.0" object-assign@^4.0.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= object-inspect@^1.12.0, object-inspect@^1.9.0: version "1.12.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== -object-keys@^1.1.1: +object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== object.assign@^4.1.2: version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== dependencies: call-bind "^1.0.0" @@ -1841,7 +1818,7 @@ object.entries@^1.1.5: object.values@^1.1.5: version "1.1.5" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz" integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== dependencies: call-bind "^1.0.2" @@ -1850,14 +1827,14 @@ object.values@^1.1.5: once@^1.3.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= dependencies: wrappy "1" onetime@^5.1.2: version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" @@ -1876,21 +1853,21 @@ optionator@^0.9.1: p-limit@^1.1.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz" integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== dependencies: p-try "^1.0.0" p-locate@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz" integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= dependencies: p-limit "^1.1.0" p-try@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz" integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= parent-module@^1.0.0: @@ -1910,27 +1887,27 @@ parse-json@^4.0.0: path-exists@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= path-is-absolute@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.7: version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-type@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pause-stream@0.0.11: @@ -1942,7 +1919,7 @@ pause-stream@0.0.11: picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pify@^3.0.0: @@ -1952,7 +1929,7 @@ pify@^3.0.0: pirates@^4.0.1: version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" + resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== pkg-conf@^2.1.0: @@ -1965,7 +1942,7 @@ pkg-conf@^2.1.0: postcss-load-config@^3.0.1: version "3.1.4" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" + resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz" integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== dependencies: lilconfig "^2.0.5" @@ -1989,16 +1966,16 @@ prettier-plugin-organize-imports@^2.3.4: integrity sha512-R8o23sf5iVL/U71h9SFUdhdOEPsi3nm42FD/oDYIZ2PQa4TNWWuWecxln6jlIQzpZTDMUeO1NicJP6lLn2TtRw== prettier@^2.5.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" - integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== + version "2.6.1" + resolved "https://registry.npmjs.org/prettier/-/prettier-2.6.1.tgz" + integrity sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A== prisma@^3.10.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-3.12.0.tgz#9675e0e72407122759d3eadcb6d27cdccd3497bd" - integrity sha512-ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg== + version "3.11.1" + resolved "https://registry.npmjs.org/prisma/-/prisma-3.11.1.tgz" + integrity sha512-aYn8bQwt1xwR2oSsVNHT4PXU7EhsThIwmpNB/MNUaaMx5OPLTro6VdNJe/sJssXFLxhamfWeMjwmpXjljo6xkg== dependencies: - "@prisma/engines" "3.12.0-37.22b822189f46ef0dc5c5b503368d1bee01213980" + "@prisma/engines" "3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9" progress@^2.0.0: version "2.0.3" @@ -2019,12 +1996,12 @@ punycode@^2.1.0: queue-microtask@^1.2.2: version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== readdirp@~3.6.0: version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" @@ -2046,12 +2023,12 @@ resolve-from@^4.0.0: resolve-from@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve@^1.20.0, resolve@^1.22.0: version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz" integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== dependencies: is-core-module "^2.8.1" @@ -2060,7 +2037,7 @@ resolve@^1.20.0, resolve@^1.22.0: reusify@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== rimraf@^3.0.2: @@ -2071,20 +2048,20 @@ rimraf@^3.0.2: glob "^7.1.3" rollup@^2.60.0: - version "2.70.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.2.tgz#808d206a8851628a065097b7ba2053bd83ba0c0d" - integrity sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg== + version "2.70.1" + resolved "https://registry.npmjs.org/rollup/-/rollup-2.70.1.tgz" + integrity sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA== optionalDependencies: fsevents "~2.3.2" romans@^2.0.3: - version "2.0.7" - resolved "https://registry.yarnpkg.com/romans/-/romans-2.0.7.tgz#07694c7923ca304a831a60da1f3a2dc032a8cb67" - integrity sha512-CdePLY/O9H3HAgt/o97QbIcRxM3q5xFvyclam17Y4bLTiYFVtcW7Yfyr5gnTZNQcLGwdAp//3ro01eOe+x3Buw== + version "2.0.5" + resolved "https://registry.npmjs.org/romans/-/romans-2.0.5.tgz" + integrity sha512-7Oj6zFVyF7fXG3t4Hx4sC4SFfTzuZZgS/rtYLvCoTS2H4d55+NyY23XpG5JvXCjm8x/jOklZQIkftz5MH8D5Cg== run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== dependencies: queue-microtask "^1.2.2" @@ -2094,35 +2071,28 @@ semver@^6.3.0: resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1: +semver@^7.2.1, semver@^7.3.5: version "7.3.5" resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" -semver@^7.3.5: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== - dependencies: - lru-cache "^6.0.0" - shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== dependencies: shebang-regex "^3.0.0" shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== side-channel@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== dependencies: call-bind "^1.0.0" @@ -2131,7 +2101,7 @@ side-channel@^1.0.4: signal-exit@^3.0.3: version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== signale@^1.4.0: @@ -2145,7 +2115,7 @@ signale@^1.4.0: slash@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== slice-ansi@^4.0.0: @@ -2159,7 +2129,7 @@ slice-ansi@^4.0.0: source-map@^0.7.3: version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== split@0.3: @@ -2197,7 +2167,7 @@ string-width@^4.2.3: string.prototype.trimend@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz" integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== dependencies: call-bind "^1.0.2" @@ -2205,7 +2175,7 @@ string.prototype.trimend@^1.0.4: string.prototype.trimstart@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz" integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== dependencies: call-bind "^1.0.2" @@ -2220,12 +2190,12 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: strip-bom@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= strip-final-newline@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: @@ -2234,9 +2204,9 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== sucrase@^3.20.3: - version "3.21.0" - resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.21.0.tgz#6a5affdbe716b22e4dc99c57d366ad0d216444b9" - integrity sha512-FjAhMJjDcifARI7bZej0Bi1yekjWQHoEvWIXhLPwDhC6O4iZ5PtGb86WV56riW87hzpgB13wwBKO9vKAiWu5VQ== + version "3.20.3" + resolved "https://registry.npmjs.org/sucrase/-/sucrase-3.20.3.tgz" + integrity sha512-azqwq0/Bs6RzLAdb4dXxsCgMtAaD2hzmUr4UhSfsxO46JFPAwMnnb441B/qsudZiS6Ylea3JXZe3Q497lsgXzQ== dependencies: commander "^4.0.0" glob "7.1.6" @@ -2261,7 +2231,7 @@ supports-color@^7.1.0: supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== table@^6.0.9: @@ -2282,14 +2252,14 @@ text-table@^0.2.0: thenify-all@^1.0.0: version "1.6.0" - resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + resolved "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz" integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= dependencies: thenify ">= 3.1.0 < 4" "thenify@>= 3.1.0 < 4": version "3.3.1" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz" integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== dependencies: any-promise "^1.0.0" @@ -2301,7 +2271,7 @@ through@2, through@~2.3, through@~2.3.1: to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== dependencies: is-number "^7.0.0" @@ -2313,12 +2283,12 @@ tr46@~0.0.3: tree-kill@^1.2.2: version "1.2.2" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" + resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz" integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== ts-interface-checker@^0.1.9: version "0.1.13" - resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" + resolved "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz" integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== ts-mixer@^6.0.0: @@ -2337,9 +2307,9 @@ tsc-watch@^4.6.2: string-argv "^0.1.1" strip-ansi "^6.0.0" -tsconfig-paths@^3.14.1: +tsconfig-paths@^3.12.0, tsconfig-paths@^3.14.1: version "3.14.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" + resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz" integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== dependencies: "@types/json5" "^0.0.29" @@ -2349,7 +2319,7 @@ tsconfig-paths@^3.14.1: tslib@^1.8.1: version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.3.1: @@ -2358,15 +2328,15 @@ tslib@^2.3.1: integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== tsup@^5.12.1: - version "5.12.5" - resolved "https://registry.yarnpkg.com/tsup/-/tsup-5.12.5.tgz#3cb67b568d5ea7460756469329f8533f933bf815" - integrity sha512-lKwzJsB49sDto51QjqOB4SdiBLKRvgTymEBuBCovcksdDwFEz3esrkbf3m497PXntUKVTzcgOfPdTgknMtvufw== + version "5.12.1" + resolved "https://registry.npmjs.org/tsup/-/tsup-5.12.1.tgz" + integrity sha512-vI7E4T6+6n5guQ9UKUOkQmzd1n4V9abGK71lbnzJMLJspbkNby5zlwWvgvHafLdYCb1WXpjFuqqmNLjBA0Wz3g== dependencies: bundle-require "^3.0.2" cac "^6.7.12" chokidar "^3.5.1" debug "^4.3.1" - esbuild "^0.14.25" + esbuild "^0.14.2" execa "^5.0.0" globby "^11.0.3" joycon "^3.0.1" @@ -2379,7 +2349,7 @@ tsup@^5.12.1: tsutils@^3.21.0: version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz" integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== dependencies: tslib "^1.8.1" @@ -2403,7 +2373,7 @@ typescript@^4.5.4: unbox-primitive@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz" integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== dependencies: function-bind "^1.1.1" @@ -2445,7 +2415,7 @@ whatwg-url@^5.0.0: which-boxed-primitive@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz" integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== dependencies: is-bigint "^1.0.1" @@ -2456,7 +2426,7 @@ which-boxed-primitive@^1.0.2: which@^2.0.1: version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" @@ -2468,7 +2438,7 @@ word-wrap@^1.2.3: wrappy@1: version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= ws@^8.4.0: @@ -2478,12 +2448,12 @@ ws@^8.4.0: yallist@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yaml@^1.10.2: version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== zlib-sync@^0.1.7: From c4ce3e0c1ef9bfe5315b7e20f7c19f80608e4ac0 Mon Sep 17 00:00:00 2001 From: Sebastian Pietschner <32213671+sebasptsch@users.noreply.github.com> Date: Sat, 23 Apr 2022 15:20:10 +1000 Subject: [PATCH 6/6] Revert "started adding an events system because that voiceStateUpdate file is horrible" This reverts commit 06d8d642dd289e0870c13004dbb6f0bd4d19013b. --- src/classes/dynamicaEvent.ts | 60 ------------------------------- src/utils/dynamicaEventManager.ts | 5 --- 2 files changed, 65 deletions(-) delete mode 100644 src/classes/dynamicaEvent.ts delete mode 100644 src/utils/dynamicaEventManager.ts diff --git a/src/classes/dynamicaEvent.ts b/src/classes/dynamicaEvent.ts deleted file mode 100644 index a6c26a0..0000000 --- a/src/classes/dynamicaEvent.ts +++ /dev/null @@ -1,60 +0,0 @@ -// create a custom event emitter with typesafe emitters -import { CommandInteraction, GuildMember } from 'discord.js'; -import { EventEmitter } from 'events'; -import DynamicaPrimary from './primary'; -import DynamicaSecondary from './secondary'; -const emitter = new EventEmitter(); - -type Awaitable = T | PromiseLike; - -interface DynamicaEventTypes { - secondaryJoined: [secondary: DynamicaSecondary, guildMember: GuildMember] - primaryJoined: [primary: DynamicaPrimary, guildMember: GuildMember] - secondaryLeft: [secondary: DynamicaSecondary, guildMember: GuildMember] - primaryLeft: [primary: DynamicaPrimary, guildMember: GuildMember] -} - -export class DynamicaEventManager extends EventEmitter { - constructor() { - super(); - } - emit(event: K, listener: (...args: DynamicaEventTypes[K]) => Awaitable) { - return super.emit(event, listener); - } - on(event: K, listener: (...args: DynamicaEventTypes[K]) => Awaitable) { - return super.on(event, listener); - } - once(event: K, listener: (...args: DynamicaEventTypes[K]) => Awaitable) { - return super.once(event, listener); - } - prependListener(event: K, listener: (...args: DynamicaEventTypes[K]) => Awaitable) { - return super.prependListener(event, listener); - } - prependOnceListener(event: K, listener: (...args: DynamicaEventTypes[K]) => Awaitable) { - return super.prependOnceListener(event, listener); - } - removeListener(event: K, listener: (...args: DynamicaEventTypes[K]) => Awaitable) { - return super.removeListener(event, listener); - } - removeAllListeners(event?: keyof DynamicaEventTypes) { - return super.removeAllListeners(event); - } - off(event: K, listener: (...args: DynamicaEventTypes[K]) => Awaitable) { - return super.off(event, listener); - } - listeners(event: keyof DynamicaEventTypes) { - return super.listeners(event); - } - rawListeners(event: keyof DynamicaEventTypes) { - return super.rawListeners(event); - } - listenerCount(event: keyof DynamicaEventTypes): number { - return super.listenerCount(event); - } - eventNames(): Array { - return super.eventNames().map((event) => event as keyof DynamicaEventTypes); - } -} - - -emitter.emit('event', 'hello', 'world'); \ No newline at end of file diff --git a/src/utils/dynamicaEventManager.ts b/src/utils/dynamicaEventManager.ts deleted file mode 100644 index 51e7cda..0000000 --- a/src/utils/dynamicaEventManager.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { DynamicaEventManager } from "@/classes/dynamicaEvent"; - -const dynamicaManager = new DynamicaEventManager() - -export default dynamicaManager \ No newline at end of file