diff --git a/package.json b/package.json index f77a710..aea9135 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "card-drop", "version": "0.8.0", - "type": "module", "main": "./dist/bot.js", "typings": "./dist", "scripts": { @@ -43,6 +42,7 @@ "jest": "^29.0.0", "jest-mock-extended": "^3.0.0", "jimp": "^0.22.12", + "minimatch": "9.0.5", "mysql": "^2.18.1", "ts-jest": "^29.0.0", "typeorm": "0.3.20", diff --git a/src/Functions/CardMetadataFunction.ts b/src/Functions/CardMetadataFunction.ts index f0c090d..a2499d9 100644 --- a/src/Functions/CardMetadataFunction.ts +++ b/src/Functions/CardMetadataFunction.ts @@ -1,10 +1,10 @@ import { readFileSync } from "fs"; import path from "path"; -import Config from "../database/entities/app/Config.js"; +import Config from "../database/entities/app/Config"; import { glob } from "glob"; -import { SeriesMetadata } from "../contracts/SeriesMetadata.js"; -import { CoreClient } from "../client/client.js"; -import AppLogger from "../client/appLogger.js"; +import { SeriesMetadata } from "../contracts/SeriesMetadata"; +import { CoreClient } from "../client/client"; +import AppLogger from "../client/appLogger"; export interface CardMetadataResult { IsSuccess: boolean; diff --git a/src/bot.ts b/src/bot.ts index 1f64cf9..e5e25a3 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -1,7 +1,7 @@ import * as dotenv from "dotenv"; -import { CoreClient } from "./client/client.js"; +import { CoreClient } from "./client/client"; import { IntentsBitField } from "discord.js"; -import Registry from "./registry.js"; +import Registry from "./registry"; import { existsSync } from "fs"; import { ExecException, exec } from "child_process"; diff --git a/src/buttonEvents/Claim.ts b/src/buttonEvents/Claim.ts index 82837da..4d5d97a 100644 --- a/src/buttonEvents/Claim.ts +++ b/src/buttonEvents/Claim.ts @@ -1,12 +1,12 @@ import { ButtonInteraction } from "discord.js"; -import { ButtonEvent } from "../type/buttonEvent.js"; -import Inventory from "../database/entities/app/Inventory.js"; -import { CoreClient } from "../client/client.js"; -import { default as eClaim } from "../database/entities/app/Claim.js"; -import AppLogger from "../client/appLogger.js"; -import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata.js"; -import User from "../database/entities/app/User.js"; -import CardConstants from "../constants/CardConstants.js"; +import { ButtonEvent } from "../type/buttonEvent"; +import Inventory from "../database/entities/app/Inventory"; +import { CoreClient } from "../client/client"; +import { default as eClaim } from "../database/entities/app/Claim"; +import AppLogger from "../client/appLogger"; +import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata"; +import User from "../database/entities/app/User"; +import CardConstants from "../constants/CardConstants"; export default class Claim extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { diff --git a/src/buttonEvents/Inventory.ts b/src/buttonEvents/Inventory.ts index b5961a9..8356305 100644 --- a/src/buttonEvents/Inventory.ts +++ b/src/buttonEvents/Inventory.ts @@ -1,7 +1,7 @@ import { ButtonInteraction } from "discord.js"; -import { ButtonEvent } from "../type/buttonEvent.js"; -import InventoryHelper from "../helpers/InventoryHelper.js"; -import AppLogger from "../client/appLogger.js"; +import { ButtonEvent } from "../type/buttonEvent"; +import InventoryHelper from "../helpers/InventoryHelper"; +import AppLogger from "../client/appLogger"; export default class Inventory extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts index a94c33c..12578db 100644 --- a/src/buttonEvents/Reroll.ts +++ b/src/buttonEvents/Reroll.ts @@ -1,15 +1,15 @@ import { AttachmentBuilder, ButtonInteraction } from "discord.js"; -import { ButtonEvent } from "../type/buttonEvent.js"; +import { ButtonEvent } from "../type/buttonEvent"; import { readFileSync } from "fs"; import { v4 } from "uuid"; -import { CoreClient } from "../client/client.js"; -import Inventory from "../database/entities/app/Inventory.js"; -import Config from "../database/entities/app/Config.js"; -import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata.js"; +import { CoreClient } from "../client/client"; +import Inventory from "../database/entities/app/Inventory"; +import Config from "../database/entities/app/Config"; +import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata"; import path from "path"; -import AppLogger from "../client/appLogger.js"; -import User from "../database/entities/app/User.js"; -import CardConstants from "../constants/CardConstants.js"; +import AppLogger from "../client/appLogger"; +import User from "../database/entities/app/User"; +import CardConstants from "../constants/CardConstants"; export default class Reroll extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { diff --git a/src/buttonEvents/Sacrifice.ts b/src/buttonEvents/Sacrifice.ts index 63ffdf1..a82ba81 100644 --- a/src/buttonEvents/Sacrifice.ts +++ b/src/buttonEvents/Sacrifice.ts @@ -1,10 +1,10 @@ import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, EmbedBuilder } from "discord.js"; -import { ButtonEvent } from "../type/buttonEvent.js"; -import Inventory from "../database/entities/app/Inventory.js"; -import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata.js"; -import { CardRarityToString, GetSacrificeAmount } from "../constants/CardRarity.js"; -import EmbedColours from "../constants/EmbedColours.js"; -import User from "../database/entities/app/User.js"; +import { ButtonEvent } from "../type/buttonEvent"; +import Inventory from "../database/entities/app/Inventory"; +import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata"; +import { CardRarityToString, GetSacrificeAmount } from "../constants/CardRarity"; +import EmbedColours from "../constants/EmbedColours"; +import User from "../database/entities/app/User"; export default class Sacrifice extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { diff --git a/src/buttonEvents/Series.ts b/src/buttonEvents/Series.ts index 9fcb6ab..80e03cd 100644 --- a/src/buttonEvents/Series.ts +++ b/src/buttonEvents/Series.ts @@ -1,7 +1,7 @@ import { ButtonInteraction } from "discord.js"; -import { ButtonEvent } from "../type/buttonEvent.js"; -import AppLogger from "../client/appLogger.js"; -import SeriesHelper from "../helpers/SeriesHelper.js"; +import { ButtonEvent } from "../type/buttonEvent"; +import AppLogger from "../client/appLogger"; +import SeriesHelper from "../helpers/SeriesHelper"; export default class Series extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { diff --git a/src/buttonEvents/Trade.ts b/src/buttonEvents/Trade.ts index c9b2736..d0d7b38 100644 --- a/src/buttonEvents/Trade.ts +++ b/src/buttonEvents/Trade.ts @@ -1,9 +1,9 @@ import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, EmbedBuilder } from "discord.js"; -import { ButtonEvent } from "../type/buttonEvent.js"; -import { CoreClient } from "../client/client.js"; -import Inventory from "../database/entities/app/Inventory.js"; -import EmbedColours from "../constants/EmbedColours.js"; -import AppLogger from "../client/appLogger.js"; +import { ButtonEvent } from "../type/buttonEvent"; +import { CoreClient } from "../client/client"; +import Inventory from "../database/entities/app/Inventory"; +import EmbedColours from "../constants/EmbedColours"; +import AppLogger from "../client/appLogger"; export default class Trade extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { diff --git a/src/buttonEvents/View.ts b/src/buttonEvents/View.ts index 8c133ba..2351b51 100644 --- a/src/buttonEvents/View.ts +++ b/src/buttonEvents/View.ts @@ -1,6 +1,6 @@ import {ButtonInteraction} from "discord.js"; -import {ButtonEvent} from "../type/buttonEvent.js"; -import CardSearchHelper from "../helpers/CardSearchHelper.js"; +import {ButtonEvent} from "../type/buttonEvent"; +import CardSearchHelper from "../helpers/CardSearchHelper"; export default class View extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { diff --git a/src/client/client.ts b/src/client/client.ts index fe64ca9..117bdb9 100644 --- a/src/client/client.ts +++ b/src/client/client.ts @@ -1,22 +1,22 @@ import { Client, DMChannel, Guild, GuildBan, GuildMember, Message, NonThreadGuildBasedChannel, PartialGuildMember, PartialMessage } from "discord.js"; import * as dotenv from "dotenv"; -import ICommandItem from "../contracts/ICommandItem.js"; -import EventExecutors from "../contracts/EventExecutors.js"; -import { Command } from "../type/command.js"; +import ICommandItem from "../contracts/ICommandItem"; +import EventExecutors from "../contracts/EventExecutors"; +import { Command } from "../type/command"; -import { Events } from "./events.js"; -import { Util } from "./util.js"; -import IButtonEventItem from "../contracts/ButtonEventItem.js"; -import { ButtonEvent } from "../type/buttonEvent.js"; -import AppDataSource from "../database/dataSources/appDataSource.js"; -import { Environment } from "../constants/Environment.js"; -import Webhooks from "../webhooks.js"; -import CardMetadataFunction from "../Functions/CardMetadataFunction.js"; -import { SeriesMetadata } from "../contracts/SeriesMetadata.js"; -import AppLogger from "./appLogger.js"; -import TimerHelper from "../helpers/TimerHelper.js"; -import GiveCurrency from "../timers/GiveCurrency.js"; -import PurgeClaims from "../timers/PurgeClaims.js"; +import { Events } from "./events"; +import { Util } from "./util"; +import IButtonEventItem from "../contracts/ButtonEventItem"; +import { ButtonEvent } from "../type/buttonEvent"; +import AppDataSource from "../database/dataSources/appDataSource"; +import { Environment } from "../constants/Environment"; +import Webhooks from "../webhooks"; +import CardMetadataFunction from "../Functions/CardMetadataFunction"; +import { SeriesMetadata } from "../contracts/SeriesMetadata"; +import AppLogger from "./appLogger"; +import TimerHelper from "../helpers/TimerHelper"; +import GiveCurrency from "../timers/GiveCurrency"; +import PurgeClaims from "../timers/PurgeClaims"; export class CoreClient extends Client { private static _commandItems: ICommandItem[]; diff --git a/src/client/events.ts b/src/client/events.ts index 4067d4b..f02fb9c 100644 --- a/src/client/events.ts +++ b/src/client/events.ts @@ -1,8 +1,8 @@ import { Interaction } from "discord.js"; -import ChatInputCommand from "./interactionCreate/ChatInputCommand.js"; -import Button from "./interactionCreate/Button.js"; -import AppLogger from "./appLogger.js"; -import NewUserDiscovery from "./interactionCreate/middleware/NewUserDiscovery.js"; +import ChatInputCommand from "./interactionCreate/ChatInputCommand"; +import Button from "./interactionCreate/Button"; +import AppLogger from "./appLogger"; +import NewUserDiscovery from "./interactionCreate/middleware/NewUserDiscovery"; export class Events { public async onInteractionCreate(interaction: Interaction) { diff --git a/src/client/interactionCreate/Button.ts b/src/client/interactionCreate/Button.ts index d80d3c0..b8abbfc 100644 --- a/src/client/interactionCreate/Button.ts +++ b/src/client/interactionCreate/Button.ts @@ -1,6 +1,6 @@ import { ButtonInteraction } from "discord.js"; -import { CoreClient } from "../client.js"; -import AppLogger from "../appLogger.js"; +import { CoreClient } from "../client"; +import AppLogger from "../appLogger"; export default class Button { public static async onButtonClicked(interaction: ButtonInteraction) { diff --git a/src/client/interactionCreate/ChatInputCommand.ts b/src/client/interactionCreate/ChatInputCommand.ts index 33d2ce4..47f7b37 100644 --- a/src/client/interactionCreate/ChatInputCommand.ts +++ b/src/client/interactionCreate/ChatInputCommand.ts @@ -1,7 +1,7 @@ import { Interaction } from "discord.js"; -import { CoreClient } from "../client.js"; -import ICommandItem from "../../contracts/ICommandItem.js"; -import AppLogger from "../appLogger.js"; +import { CoreClient } from "../client"; +import ICommandItem from "../../contracts/ICommandItem"; +import AppLogger from "../appLogger"; export default class ChatInputCommand { public static async onChatInput(interaction: Interaction) { diff --git a/src/client/interactionCreate/middleware/NewUserDiscovery.ts b/src/client/interactionCreate/middleware/NewUserDiscovery.ts index c467997..dcbe75a 100644 --- a/src/client/interactionCreate/middleware/NewUserDiscovery.ts +++ b/src/client/interactionCreate/middleware/NewUserDiscovery.ts @@ -1,7 +1,7 @@ import { Interaction } from "discord.js"; -import User from "../../../database/entities/app/User.js"; -import CardConstants from "../../../constants/CardConstants.js"; -import AppLogger from "../../appLogger.js"; +import User from "../../../database/entities/app/User"; +import CardConstants from "../../../constants/CardConstants"; +import AppLogger from "../../appLogger"; export default async function NewUserDiscovery(interaction: Interaction) { const existingUser = await User.FetchOneById(User, interaction.user.id); diff --git a/src/client/util.ts b/src/client/util.ts index 8ec54b1..47daa3d 100644 --- a/src/client/util.ts +++ b/src/client/util.ts @@ -1,7 +1,7 @@ import { Client, REST, Routes, SlashCommandBuilder } from "discord.js"; -import EventExecutors from "../contracts/EventExecutors.js"; -import { CoreClient } from "./client.js"; -import AppLogger from "./appLogger.js"; +import EventExecutors from "../contracts/EventExecutors"; +import { CoreClient } from "./client"; +import AppLogger from "./appLogger"; export class Util { public loadSlashCommands(client: Client) { diff --git a/src/commands/about.ts b/src/commands/about.ts index bdffcf1..3bfcdac 100644 --- a/src/commands/about.ts +++ b/src/commands/about.ts @@ -1,6 +1,6 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder, SlashCommandBuilder } from "discord.js"; -import EmbedColours from "../constants/EmbedColours.js"; -import { Command } from "../type/command.js"; +import EmbedColours from "../constants/EmbedColours"; +import { Command } from "../type/command"; export default class About extends Command { constructor() { diff --git a/src/commands/allbalance.ts b/src/commands/allbalance.ts index eb339a0..0874e54 100644 --- a/src/commands/allbalance.ts +++ b/src/commands/allbalance.ts @@ -1,7 +1,7 @@ import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js"; -import EmbedColours from "../constants/EmbedColours.js"; -import { Command } from "../type/command.js"; -import User from "../database/entities/app/User.js"; +import EmbedColours from "../constants/EmbedColours"; +import { Command } from "../type/command"; +import User from "../database/entities/app/User"; export default class AllBalance extends Command { constructor() { diff --git a/src/commands/balance.ts b/src/commands/balance.ts index 959273f..c8f087c 100644 --- a/src/commands/balance.ts +++ b/src/commands/balance.ts @@ -1,7 +1,7 @@ import { CommandInteraction, EmbedBuilder, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; -import User from "../database/entities/app/User.js"; -import EmbedColours from "../constants/EmbedColours.js"; +import { Command } from "../type/command"; +import User from "../database/entities/app/User"; +import EmbedColours from "../constants/EmbedColours"; export default class Balance extends Command { constructor() { diff --git a/src/commands/daily.ts b/src/commands/daily.ts index 29adcbe..65d69fc 100644 --- a/src/commands/daily.ts +++ b/src/commands/daily.ts @@ -1,8 +1,8 @@ import { CommandInteraction, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; -import User from "../database/entities/app/User.js"; -import CardConstants from "../constants/CardConstants.js"; -import TimeLengthInput from "../helpers/TimeLengthInput.js"; +import { Command } from "../type/command"; +import User from "../database/entities/app/User"; +import CardConstants from "../constants/CardConstants"; +import TimeLengthInput from "../helpers/TimeLengthInput"; export default class Daily extends Command { constructor() { diff --git a/src/commands/drop.ts b/src/commands/drop.ts index 1470a92..6f74d3a 100644 --- a/src/commands/drop.ts +++ b/src/commands/drop.ts @@ -1,15 +1,15 @@ import { AttachmentBuilder, CommandInteraction, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; +import { Command } from "../type/command"; import { readFileSync } from "fs"; -import { CoreClient } from "../client/client.js"; +import { CoreClient } from "../client/client"; import { v4 } from "uuid"; -import Inventory from "../database/entities/app/Inventory.js"; -import Config from "../database/entities/app/Config.js"; -import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata.js"; +import Inventory from "../database/entities/app/Inventory"; +import Config from "../database/entities/app/Config"; +import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata"; import path from "path"; -import AppLogger from "../client/appLogger.js"; -import User from "../database/entities/app/User.js"; -import CardConstants from "../constants/CardConstants.js"; +import AppLogger from "../client/appLogger"; +import User from "../database/entities/app/User"; +import CardConstants from "../constants/CardConstants"; export default class Drop extends Command { constructor() { diff --git a/src/commands/gdrivesync.ts b/src/commands/gdrivesync.ts index 53faa05..b02c873 100644 --- a/src/commands/gdrivesync.ts +++ b/src/commands/gdrivesync.ts @@ -1,10 +1,10 @@ import { CacheType, CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; +import { Command } from "../type/command"; import { ExecException, exec } from "child_process"; -import { CoreClient } from "../client/client.js"; -import Config from "../database/entities/app/Config.js"; -import CardMetadataFunction from "../Functions/CardMetadataFunction.js"; -import AppLogger from "../client/appLogger.js"; +import { CoreClient } from "../client/client"; +import Config from "../database/entities/app/Config"; +import CardMetadataFunction from "../Functions/CardMetadataFunction"; +import AppLogger from "../client/appLogger"; export default class Gdrivesync extends Command { constructor() { diff --git a/src/commands/give.ts b/src/commands/give.ts index 3c97398..3ffbe8f 100644 --- a/src/commands/give.ts +++ b/src/commands/give.ts @@ -1,11 +1,11 @@ import { CacheType, CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; -import { CoreClient } from "../client/client.js"; -import Config from "../database/entities/app/Config.js"; -import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata.js"; -import Inventory from "../database/entities/app/Inventory.js"; -import AppLogger from "../client/appLogger.js"; -import User from "../database/entities/app/User.js"; +import { Command } from "../type/command"; +import { CoreClient } from "../client/client"; +import Config from "../database/entities/app/Config"; +import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata"; +import Inventory from "../database/entities/app/Inventory"; +import AppLogger from "../client/appLogger"; +import User from "../database/entities/app/User"; export default class Give extends Command { constructor() { diff --git a/src/commands/inventory.ts b/src/commands/inventory.ts index 87d4e95..8d2ef2c 100644 --- a/src/commands/inventory.ts +++ b/src/commands/inventory.ts @@ -1,7 +1,7 @@ import { CommandInteraction, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; -import InventoryHelper from "../helpers/InventoryHelper.js"; -import AppLogger from "../client/appLogger.js"; +import { Command } from "../type/command"; +import InventoryHelper from "../helpers/InventoryHelper"; +import AppLogger from "../client/appLogger"; export default class Inventory extends Command { constructor() { diff --git a/src/commands/resync.ts b/src/commands/resync.ts index 36d70dd..f90c96c 100644 --- a/src/commands/resync.ts +++ b/src/commands/resync.ts @@ -1,8 +1,8 @@ import { CacheType, CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; -import Config from "../database/entities/app/Config.js"; -import CardMetadataFunction from "../Functions/CardMetadataFunction.js"; -import AppLogger from "../client/appLogger.js"; +import { Command } from "../type/command"; +import Config from "../database/entities/app/Config"; +import CardMetadataFunction from "../Functions/CardMetadataFunction"; +import AppLogger from "../client/appLogger"; export default class Resync extends Command { constructor() { diff --git a/src/commands/sacrifice.ts b/src/commands/sacrifice.ts index 24cc87a..4d1c51a 100644 --- a/src/commands/sacrifice.ts +++ b/src/commands/sacrifice.ts @@ -1,9 +1,9 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CacheType, CommandInteraction, EmbedBuilder, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; -import Inventory from "../database/entities/app/Inventory.js"; -import { CardRarityToString, GetSacrificeAmount } from "../constants/CardRarity.js"; -import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata.js"; -import EmbedColours from "../constants/EmbedColours.js"; +import { Command } from "../type/command"; +import Inventory from "../database/entities/app/Inventory"; +import { CardRarityToString, GetSacrificeAmount } from "../constants/CardRarity"; +import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata"; +import EmbedColours from "../constants/EmbedColours"; export default class Sacrifice extends Command { constructor() { diff --git a/src/commands/series.ts b/src/commands/series.ts index 5d74bd3..e268db9 100644 --- a/src/commands/series.ts +++ b/src/commands/series.ts @@ -1,8 +1,8 @@ import { CommandInteraction, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; -import { CoreClient } from "../client/client.js"; -import AppLogger from "../client/appLogger.js"; -import SeriesHelper from "../helpers/SeriesHelper.js"; +import { Command } from "../type/command"; +import { CoreClient } from "../client/client"; +import AppLogger from "../client/appLogger"; +import SeriesHelper from "../helpers/SeriesHelper"; export default class Series extends Command { constructor() { diff --git a/src/commands/stage/dropnumber.ts b/src/commands/stage/dropnumber.ts index ad4105c..0642327 100644 --- a/src/commands/stage/dropnumber.ts +++ b/src/commands/stage/dropnumber.ts @@ -1,11 +1,11 @@ import { AttachmentBuilder, CacheType, CommandInteraction, DiscordAPIError, SlashCommandBuilder } from "discord.js"; -import { Command } from "../../type/command.js"; +import { Command } from "../../type/command"; import { readFileSync } from "fs"; -import Inventory from "../../database/entities/app/Inventory.js"; +import Inventory from "../../database/entities/app/Inventory"; import { v4 } from "uuid"; -import { CoreClient } from "../../client/client.js"; +import { CoreClient } from "../../client/client"; import path from "path"; -import CardDropHelperMetadata from "../../helpers/CardDropHelperMetadata.js"; +import CardDropHelperMetadata from "../../helpers/CardDropHelperMetadata"; export default class Dropnumber extends Command { constructor() { diff --git a/src/commands/stage/droprarity.ts b/src/commands/stage/droprarity.ts index 78ddb18..be0a62d 100644 --- a/src/commands/stage/droprarity.ts +++ b/src/commands/stage/droprarity.ts @@ -1,11 +1,11 @@ import { AttachmentBuilder, CacheType, CommandInteraction, DiscordAPIError, SlashCommandBuilder } from "discord.js"; -import { Command } from "../../type/command.js"; -import { CardRarity, CardRarityParse } from "../../constants/CardRarity.js"; +import { Command } from "../../type/command"; +import { CardRarity, CardRarityParse } from "../../constants/CardRarity"; import { readFileSync } from "fs"; -import Inventory from "../../database/entities/app/Inventory.js"; +import Inventory from "../../database/entities/app/Inventory"; import { v4 } from "uuid"; -import { CoreClient } from "../../client/client.js"; -import CardDropHelperMetadata from "../../helpers/CardDropHelperMetadata.js"; +import { CoreClient } from "../../client/client"; +import CardDropHelperMetadata from "../../helpers/CardDropHelperMetadata"; import path from "path"; export default class Droprarity extends Command { diff --git a/src/commands/trade.ts b/src/commands/trade.ts index 6f0f937..569e88f 100644 --- a/src/commands/trade.ts +++ b/src/commands/trade.ts @@ -1,9 +1,9 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; -import Inventory from "../database/entities/app/Inventory.js"; -import { CoreClient } from "../client/client.js"; -import EmbedColours from "../constants/EmbedColours.js"; -import AppLogger from "../client/appLogger.js"; +import { Command } from "../type/command"; +import Inventory from "../database/entities/app/Inventory"; +import { CoreClient } from "../client/client"; +import EmbedColours from "../constants/EmbedColours"; +import AppLogger from "../client/appLogger"; export default class Trade extends Command { constructor() { diff --git a/src/commands/view.ts b/src/commands/view.ts index ba3e2af..6ed1e18 100644 --- a/src/commands/view.ts +++ b/src/commands/view.ts @@ -1,12 +1,12 @@ import { AttachmentBuilder, CommandInteraction, DiscordAPIError, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command.js"; -import { CoreClient } from "../client/client.js"; +import { Command } from "../type/command"; +import { CoreClient } from "../client/client"; import { readFileSync } from "fs"; import path from "path"; -import Inventory from "../database/entities/app/Inventory.js"; -import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata.js"; -import AppLogger from "../client/appLogger.js"; -import CardSearchHelper from "../helpers/CardSearchHelper.js"; +import Inventory from "../database/entities/app/Inventory"; +import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata"; +import AppLogger from "../client/appLogger"; +import CardSearchHelper from "../helpers/CardSearchHelper"; export default class View extends Command { constructor() { diff --git a/src/constants/CardRarity.ts b/src/constants/CardRarity.ts index 169c0f6..8817172 100644 --- a/src/constants/CardRarity.ts +++ b/src/constants/CardRarity.ts @@ -1,4 +1,4 @@ -import EmbedColours from "./EmbedColours.js"; +import EmbedColours from "./EmbedColours"; export enum CardRarity { Unknown, diff --git a/src/contracts/AppBaseEntity.ts b/src/contracts/AppBaseEntity.ts index c55b5bc..43bed74 100644 --- a/src/contracts/AppBaseEntity.ts +++ b/src/contracts/AppBaseEntity.ts @@ -1,6 +1,6 @@ import { Column, DeepPartial, EntityTarget, PrimaryColumn, ObjectLiteral, FindOptionsWhere } from "typeorm"; import { v4 } from "uuid"; -import AppDataSource from "../database/dataSources/appDataSource.js"; +import AppDataSource from "../database/dataSources/appDataSource"; export default class AppBaseEntity { constructor() { diff --git a/src/contracts/ButtonEventItem.ts b/src/contracts/ButtonEventItem.ts index dbf5593..e139334 100644 --- a/src/contracts/ButtonEventItem.ts +++ b/src/contracts/ButtonEventItem.ts @@ -1,5 +1,5 @@ -import { Environment } from "../constants/Environment.js"; -import { ButtonEvent } from "../type/buttonEvent.js"; +import { Environment } from "../constants/Environment"; +import { ButtonEvent } from "../type/buttonEvent"; interface ButtonEventItem { ButtonId: string, diff --git a/src/contracts/ICommandItem.ts b/src/contracts/ICommandItem.ts index ed3e874..0524a8d 100644 --- a/src/contracts/ICommandItem.ts +++ b/src/contracts/ICommandItem.ts @@ -1,5 +1,5 @@ -import { Environment } from "../constants/Environment.js"; -import { Command } from "../type/command.js"; +import { Environment } from "../constants/Environment"; +import { Command } from "../type/command"; interface ICommandItem { Name: string, diff --git a/src/contracts/SeriesMetadata.ts b/src/contracts/SeriesMetadata.ts index 80493b9..4a989bc 100644 --- a/src/contracts/SeriesMetadata.ts +++ b/src/contracts/SeriesMetadata.ts @@ -1,4 +1,4 @@ -import { CardRarity } from "../constants/CardRarity.js"; +import { CardRarity } from "../constants/CardRarity"; export interface SeriesMetadata { id: number, diff --git a/src/database/entities/app/Claim.ts b/src/database/entities/app/Claim.ts index b5be5f2..7cdee38 100644 --- a/src/database/entities/app/Claim.ts +++ b/src/database/entities/app/Claim.ts @@ -1,7 +1,7 @@ import { Column, Entity, ManyToOne } from "typeorm"; -import AppBaseEntity from "../../../contracts/AppBaseEntity.js"; -import Inventory from "./Inventory.js"; -import AppDataSource from "../../dataSources/appDataSource.js"; +import AppBaseEntity from "../../../contracts/AppBaseEntity"; +import Inventory from "./Inventory"; +import AppDataSource from "../../dataSources/appDataSource"; @Entity() export default class Claim extends AppBaseEntity { diff --git a/src/database/entities/app/Config.ts b/src/database/entities/app/Config.ts index d1c0464..e97728a 100644 --- a/src/database/entities/app/Config.ts +++ b/src/database/entities/app/Config.ts @@ -1,6 +1,6 @@ import { Column, Entity } from "typeorm"; -import AppBaseEntity from "../../../contracts/AppBaseEntity.js"; -import AppDataSource from "../../dataSources/appDataSource.js"; +import AppBaseEntity from "../../../contracts/AppBaseEntity"; +import AppDataSource from "../../dataSources/appDataSource"; @Entity() export default class Config extends AppBaseEntity { diff --git a/src/database/entities/app/Inventory.ts b/src/database/entities/app/Inventory.ts index 5057873..7d659fe 100644 --- a/src/database/entities/app/Inventory.ts +++ b/src/database/entities/app/Inventory.ts @@ -1,7 +1,7 @@ import { Column, Entity, OneToMany } from "typeorm"; -import AppBaseEntity from "../../../contracts/AppBaseEntity.js"; -import AppDataSource from "../../dataSources/appDataSource.js"; -import Claim from "./Claim.js"; +import AppBaseEntity from "../../../contracts/AppBaseEntity"; +import AppDataSource from "../../dataSources/appDataSource"; +import Claim from "./Claim"; @Entity() export default class Inventory extends AppBaseEntity { diff --git a/src/database/entities/app/User.ts b/src/database/entities/app/User.ts index 198d36c..c3d8437 100644 --- a/src/database/entities/app/User.ts +++ b/src/database/entities/app/User.ts @@ -1,5 +1,5 @@ import { Column, Entity } from "typeorm"; -import AppBaseEntity from "../../../contracts/AppBaseEntity.js"; +import AppBaseEntity from "../../../contracts/AppBaseEntity"; @Entity() export default class User extends AppBaseEntity { diff --git a/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts b/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts index 90bba90..ed048c7 100644 --- a/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts +++ b/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts @@ -1,5 +1,5 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -import MigrationHelper from "../../../../helpers/MigrationHelper.js"; +import MigrationHelper from "../../../../helpers/MigrationHelper"; export class CreateClaim1694609771821 implements MigrationInterface { diff --git a/src/database/migrations/app/0.1/1693769942868-CreateBase.ts b/src/database/migrations/app/0.1/1693769942868-CreateBase.ts index 8b259fe..006aa55 100644 --- a/src/database/migrations/app/0.1/1693769942868-CreateBase.ts +++ b/src/database/migrations/app/0.1/1693769942868-CreateBase.ts @@ -1,5 +1,5 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -import MigrationHelper from "../../../../helpers/MigrationHelper.js"; +import MigrationHelper from "../../../../helpers/MigrationHelper"; export class CreateBase1693769942868 implements MigrationInterface { diff --git a/src/database/migrations/app/0.2/1699814500650-createConfig.ts b/src/database/migrations/app/0.2/1699814500650-createConfig.ts index 820865f..2725eee 100644 --- a/src/database/migrations/app/0.2/1699814500650-createConfig.ts +++ b/src/database/migrations/app/0.2/1699814500650-createConfig.ts @@ -1,5 +1,5 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -import MigrationHelper from "../../../../helpers/MigrationHelper.js"; +import MigrationHelper from "../../../../helpers/MigrationHelper"; export class CreateConfig1699814500650 implements MigrationInterface { diff --git a/src/database/migrations/app/0.6/1713289062969-user.ts b/src/database/migrations/app/0.6/1713289062969-user.ts index 6adb810..151db88 100644 --- a/src/database/migrations/app/0.6/1713289062969-user.ts +++ b/src/database/migrations/app/0.6/1713289062969-user.ts @@ -1,5 +1,5 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -import MigrationHelper from "../../../../helpers/MigrationHelper.js"; +import MigrationHelper from "../../../../helpers/MigrationHelper"; export class User1713289062969 implements MigrationInterface { diff --git a/src/database/migrations/app/0.6/1715967355818-daily.ts b/src/database/migrations/app/0.6/1715967355818-daily.ts index b9b7c79..1c81d18 100644 --- a/src/database/migrations/app/0.6/1715967355818-daily.ts +++ b/src/database/migrations/app/0.6/1715967355818-daily.ts @@ -1,5 +1,5 @@ import { MigrationInterface, QueryRunner } from "typeorm"; -import MigrationHelper from "../../../../helpers/MigrationHelper.js"; +import MigrationHelper from "../../../../helpers/MigrationHelper"; export class Daily1715967355818 implements MigrationInterface { diff --git a/src/helpers/CardDropHelperMetadata.ts b/src/helpers/CardDropHelperMetadata.ts index 3d4a57e..84bcdfa 100644 --- a/src/helpers/CardDropHelperMetadata.ts +++ b/src/helpers/CardDropHelperMetadata.ts @@ -1,10 +1,10 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js"; -import { CardRarity, CardRarityToColour, CardRarityToString } from "../constants/CardRarity.js"; -import CardRarityChances from "../constants/CardRarityChances.js"; -import { DropResult } from "../contracts/SeriesMetadata.js"; -import { CoreClient } from "../client/client.js"; -import AppLogger from "../client/appLogger.js"; -import CardConstants from "../constants/CardConstants.js"; +import { CardRarity, CardRarityToColour, CardRarityToString } from "../constants/CardRarity"; +import CardRarityChances from "../constants/CardRarityChances"; +import { DropResult } from "../contracts/SeriesMetadata"; +import { CoreClient } from "../client/client"; +import AppLogger from "../client/appLogger"; +import CardConstants from "../constants/CardConstants"; export default class CardDropHelperMetadata { public static GetRandomCard(): DropResult | undefined { diff --git a/src/helpers/CardSearchHelper.ts b/src/helpers/CardSearchHelper.ts index afd00de..874caa4 100644 --- a/src/helpers/CardSearchHelper.ts +++ b/src/helpers/CardSearchHelper.ts @@ -1,11 +1,11 @@ import {ActionRowBuilder, AttachmentBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder} from "discord.js"; import {Fzf} from "fzf"; -import {CoreClient} from "../client/client.js"; -import CardDropHelperMetadata from "./CardDropHelperMetadata.js"; -import Inventory from "../database/entities/app/Inventory.js"; +import {CoreClient} from "../client/client"; +import CardDropHelperMetadata from "./CardDropHelperMetadata"; +import Inventory from "../database/entities/app/Inventory"; import {readFileSync} from "fs"; import path from "path"; -import AppLogger from "../client/appLogger.js"; +import AppLogger from "../client/appLogger"; interface ReturnedPage { embed: EmbedBuilder, diff --git a/src/helpers/ImageHelper.ts b/src/helpers/ImageHelper.ts index c8f3b34..be3d083 100644 --- a/src/helpers/ImageHelper.ts +++ b/src/helpers/ImageHelper.ts @@ -1,8 +1,8 @@ import {createCanvas, loadImage} from "canvas"; import path from "path"; -import AppLogger from "../client/appLogger.js"; +import AppLogger from "../client/appLogger"; import {existsSync} from "fs"; -import Inventory from "../database/entities/app/Inventory.js"; +import Inventory from "../database/entities/app/Inventory"; import Jimp from "jimp"; interface CardInput { diff --git a/src/helpers/InventoryHelper.ts b/src/helpers/InventoryHelper.ts index fd6cca9..8b8ffa1 100644 --- a/src/helpers/InventoryHelper.ts +++ b/src/helpers/InventoryHelper.ts @@ -1,11 +1,11 @@ import { ActionRowBuilder, AttachmentBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js"; -import Inventory from "../database/entities/app/Inventory.js"; -import { CoreClient } from "../client/client.js"; -import EmbedColours from "../constants/EmbedColours.js"; -import { CardRarity, CardRarityToString } from "../constants/CardRarity.js"; +import Inventory from "../database/entities/app/Inventory"; +import { CoreClient } from "../client/client"; +import EmbedColours from "../constants/EmbedColours"; +import { CardRarity, CardRarityToString } from "../constants/CardRarity"; import cloneDeep from "clone-deep"; -import AppLogger from "../client/appLogger.js"; -import ImageHelper from "./ImageHelper.js"; +import AppLogger from "../client/appLogger"; +import ImageHelper from "./ImageHelper"; interface InventoryPage { id: number, diff --git a/src/helpers/SeriesHelper.ts b/src/helpers/SeriesHelper.ts index 2296a67..c3a22d6 100644 --- a/src/helpers/SeriesHelper.ts +++ b/src/helpers/SeriesHelper.ts @@ -1,10 +1,10 @@ import { ActionRowBuilder, AttachmentBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js"; -import AppLogger from "../client/appLogger.js"; +import AppLogger from "../client/appLogger"; import cloneDeep from "clone-deep"; -import { CoreClient } from "../client/client.js"; -import EmbedColours from "../constants/EmbedColours.js"; -import { CardRarityToString } from "../constants/CardRarity.js"; -import ImageHelper from "./ImageHelper.js"; +import { CoreClient } from "../client/client"; +import EmbedColours from "../constants/EmbedColours"; +import { CardRarityToString } from "../constants/CardRarity"; +import ImageHelper from "./ImageHelper"; export default class SeriesHelper { public static async GenerateSeriesViewPage(seriesId: number, page: number, userId: string): Promise<{ embed: EmbedBuilder, row: ActionRowBuilder, image: AttachmentBuilder } | null> { diff --git a/src/helpers/TimeLengthInput.ts b/src/helpers/TimeLengthInput.ts index e43c2a1..d1d8734 100644 --- a/src/helpers/TimeLengthInput.ts +++ b/src/helpers/TimeLengthInput.ts @@ -1,4 +1,4 @@ -import StringTools from "./StringTools.js"; +import StringTools from "./StringTools"; export default class TimeLengthInput { public readonly value: string; diff --git a/src/helpers/TimerHelper.ts b/src/helpers/TimerHelper.ts index 669021f..535a6a7 100644 --- a/src/helpers/TimerHelper.ts +++ b/src/helpers/TimerHelper.ts @@ -1,6 +1,6 @@ import { CronJob } from "cron"; import { v4 } from "uuid"; -import { Primitive } from "../type/primitive.js"; +import { Primitive } from "../type/primitive"; interface Timer { id: string; diff --git a/src/hooks/ReloadDB.ts b/src/hooks/ReloadDB.ts index 4322ecb..9d99df7 100644 --- a/src/hooks/ReloadDB.ts +++ b/src/hooks/ReloadDB.ts @@ -1,6 +1,6 @@ import { Request, Response } from "express"; -import CardMetadataFunction from "../Functions/CardMetadataFunction.js"; -import AppLogger from "../client/appLogger.js"; +import CardMetadataFunction from "../Functions/CardMetadataFunction"; +import AppLogger from "../client/appLogger"; export default async function ReloadDB(req: Request, res: Response) { AppLogger.LogInfo("Hooks/ReloadDB", "Reloading Card DB..."); diff --git a/src/registry.ts b/src/registry.ts index 6d472b2..20787af 100644 --- a/src/registry.ts +++ b/src/registry.ts @@ -1,33 +1,33 @@ -import { CoreClient } from "./client/client.js"; -import { Environment } from "./constants/Environment.js"; +import { CoreClient } from "./client/client"; +import { Environment } from "./constants/Environment"; // Global Command Imports -import About from "./commands/about.js"; -import AllBalance from "./commands/allbalance.js"; -import Balance from "./commands/balance.js"; -import Daily from "./commands/daily.js"; -import Drop from "./commands/drop.js"; -import Gdrivesync from "./commands/gdrivesync.js"; -import Give from "./commands/give.js"; -import Inventory from "./commands/inventory.js"; -import Resync from "./commands/resync.js"; -import Sacrifice from "./commands/sacrifice.js"; -import Series from "./commands/series.js"; -import Trade from "./commands/trade.js"; -import View from "./commands/view.js"; +import About from "./commands/about"; +import AllBalance from "./commands/allbalance"; +import Balance from "./commands/balance"; +import Daily from "./commands/daily"; +import Drop from "./commands/drop"; +import Gdrivesync from "./commands/gdrivesync"; +import Give from "./commands/give"; +import Inventory from "./commands/inventory"; +import Resync from "./commands/resync"; +import Sacrifice from "./commands/sacrifice"; +import Series from "./commands/series"; +import Trade from "./commands/trade"; +import View from "./commands/view"; // Test Command Imports -import Dropnumber from "./commands/stage/dropnumber.js"; -import Droprarity from "./commands/stage/droprarity.js"; +import Dropnumber from "./commands/stage/dropnumber"; +import Droprarity from "./commands/stage/droprarity"; // Button Event Imports -import Claim from "./buttonEvents/Claim.js"; -import InventoryButtonEvent from "./buttonEvents/Inventory.js"; -import Reroll from "./buttonEvents/Reroll.js"; -import SacrificeButtonEvent from "./buttonEvents/Sacrifice.js"; -import SeriesEvent from "./buttonEvents/Series.js"; -import TradeButtonEvent from "./buttonEvents/Trade.js"; -import ViewButtonEvent from "./buttonEvents/View.js"; +import Claim from "./buttonEvents/Claim"; +import InventoryButtonEvent from "./buttonEvents/Inventory"; +import Reroll from "./buttonEvents/Reroll"; +import SacrificeButtonEvent from "./buttonEvents/Sacrifice"; +import SeriesEvent from "./buttonEvents/Series"; +import TradeButtonEvent from "./buttonEvents/Trade"; +import ViewButtonEvent from "./buttonEvents/View"; export default class Registry { public static RegisterCommands() { diff --git a/src/timers/GiveCurrency.ts b/src/timers/GiveCurrency.ts index ae716fa..93e48d1 100644 --- a/src/timers/GiveCurrency.ts +++ b/src/timers/GiveCurrency.ts @@ -1,6 +1,6 @@ -import AppLogger from "../client/appLogger.js"; -import CardConstants from "../constants/CardConstants.js"; -import User from "../database/entities/app/User.js"; +import AppLogger from "../client/appLogger"; +import CardConstants from "../constants/CardConstants"; +import User from "../database/entities/app/User"; export default async function GiveCurrency() { AppLogger.LogDebug("Timers/GiveCurrency", "Giving currency to every known user"); diff --git a/src/timers/PurgeClaims.ts b/src/timers/PurgeClaims.ts index bcc16ba..a0ed9d0 100644 --- a/src/timers/PurgeClaims.ts +++ b/src/timers/PurgeClaims.ts @@ -1,5 +1,5 @@ -import AppLogger from "../client/appLogger.js"; -import Claim from "../database/entities/app/Claim.js"; +import AppLogger from "../client/appLogger"; +import Claim from "../database/entities/app/Claim"; export default async function PurgeClaims() { const claims = await Claim.FetchAll(Claim); diff --git a/src/webhooks.ts b/src/webhooks.ts index 300f9f3..0b99816 100644 --- a/src/webhooks.ts +++ b/src/webhooks.ts @@ -1,7 +1,7 @@ import bodyParser from "body-parser"; import express, { Application } from "express"; -import ReloadDB from "./hooks/ReloadDB.js"; -import AppLogger from "./client/appLogger.js"; +import ReloadDB from "./hooks/ReloadDB"; +import AppLogger from "./client/appLogger"; export default class Webhooks { private app: Application; diff --git a/tsconfig.json b/tsconfig.json index 7d06da4..26dd40f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ /* Basic Options */ // "incremental": true, /* Enable incremental compilation */ "target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */ - "module": "es2020", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ + "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ // "lib": [], /* Specify library files to be included in the compilation. */ // "allowJs": true, /* Allow javascript files to be compiled. */ // "checkJs": true, /* Report errors in .js files. */ @@ -44,7 +44,7 @@ // "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */ /* Module Resolution Options */ - "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ diff --git a/yarn.lock b/yarn.lock index 7fe5baa..50273b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1247,11 +1247,11 @@ integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w== "@types/node@*": - version "22.2.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.2.0.tgz#7cf046a99f0ba4d628ad3088cb21f790df9b0c5b" - integrity sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ== + version "20.14.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.9.tgz#12e8e765ab27f8c421a1820c99f5f313a933b420" + integrity sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg== dependencies: - undici-types "~6.13.0" + undici-types "~5.26.4" "@types/node@16.9.1": version "16.9.1" @@ -1259,9 +1259,9 @@ integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g== "@types/node@^20.0.0": - version "20.14.15" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.15.tgz#e59477ab7bc7db1f80c85540bfd192a0becc588b" - integrity sha512-Fz1xDMCF/B00/tYSVMlmK7hVeLh7jE5f3B7X1/hmV0MJBwE27KlS7EvD/Yp+z1lm8mVhwV5w+n8jOZG8AfTlKw== + version "20.14.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.14.tgz#6b655d4a88623b0edb98300bb9dd2107225f885e" + integrity sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ== dependencies: undici-types "~5.26.4" @@ -1332,9 +1332,9 @@ integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ== "@types/yargs@^17.0.8": - version "17.0.33" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d" - integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA== + version "17.0.32" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229" + integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog== dependencies: "@types/yargs-parser" "*" @@ -2018,7 +2018,7 @@ chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -2601,13 +2601,6 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@^3.1.10: - version "3.1.10" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" - integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== - dependencies: - jake "^10.8.5" - electron-to-chromium@^1.4.668: version "1.4.788" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.788.tgz#a3545959d5cfa0a266d3e551386c040be34e7e06" @@ -3021,13 +3014,6 @@ file-type@^16.5.4: strtok3 "^6.2.4" token-types "^4.1.1" -filelist@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" - integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== - dependencies: - minimatch "^5.0.1" - fill-range@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" @@ -3976,16 +3962,6 @@ jackspeak@^3.1.2: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" -jake@^10.8.5: - version "10.9.2" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.2.tgz#6ae487e6a69afec3a5e167628996b59f35ae2b7f" - integrity sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA== - dependencies: - async "^3.2.3" - chalk "^4.0.2" - filelist "^1.0.4" - minimatch "^3.1.2" - jest-changed-files@^29.7.0: version "29.7.0" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a" @@ -4807,6 +4783,13 @@ minimatch@9.0.3: dependencies: brace-expansion "^2.0.1" +minimatch@9.0.5, minimatch@^9.0.4: + version "9.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" + integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== + dependencies: + brace-expansion "^2.0.1" + minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -4814,13 +4797,6 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" -minimatch@^5.0.1: - version "5.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" - integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== - dependencies: - brace-expansion "^2.0.1" - minimatch@^9.0.0: version "9.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" @@ -4828,13 +4804,6 @@ minimatch@^9.0.0: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.4: - version "9.0.5" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" - integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== - dependencies: - brace-expansion "^2.0.1" - minimist@^1.2.0: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" @@ -5903,12 +5872,12 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.5, semver@^7.3.7, semver@^7.5.4: +semver@^7.3.5, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4: version "7.6.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== -semver@^7.5.3, semver@^7.6.0: +semver@^7.6.0: version "7.6.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== @@ -6456,12 +6425,11 @@ ts-essentials@^10.0.0: integrity sha512-77FHNJEyysF9+1s4G6eejuA1lxw7uMchT3ZPy3CIbh7GIunffpshtM8pTe5G6N5dpOzNevqRHew859ceLWVBfw== ts-jest@^29.0.0: - version "29.2.4" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.4.tgz#38ccf487407d7a63054a72689f6f99b075e296e5" - integrity sha512-3d6tgDyhCI29HlpwIq87sNuI+3Q6GLTTCeYRHCs7vDz+/3GCMwEtV9jezLyl4ZtnBgx00I7hm8PCP8cTksMGrw== + version "29.1.5" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.5.tgz#d6c0471cc78bffa2cb4664a0a6741ef36cfe8f69" + integrity sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg== dependencies: bs-logger "0.x" - ejs "^3.1.10" fast-json-stable-stringify "2.x" jest-util "^29.0.0" json5 "^2.2.3" @@ -6593,11 +6561,6 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -undici-types@~6.13.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5" - integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg== - undici@6.13.0: version "6.13.0" resolved "https://registry.yarnpkg.com/undici/-/undici-6.13.0.tgz#7edbf4b7f3aac5f8a681d515151bf55cb3589d72"