diff --git a/eslint.config.js b/eslint.config.js index 42c77be1..1a585fbe 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -115,16 +115,12 @@ module.exports = antfu( ['^node:'], // Packages. // Things that start with a letter (or digit or underscore), or `@` followed by a letter. - ['^@\\w'], + ['^@?\\w'], // Internal packages. // Things that start with `@/`. + ['^@/\\w'], + // Other imports ['^\\w'], - // Absolute imports and other imports such as Vue-style `@/foo`. - // Anything not matched in another group. - ['^'], - // Relative imports. - // Anything that starts with a dot. - ['^\\.'], // TypeScript import assignments. ['^\\u0001', '^\\u0002'], ], diff --git a/src/api/controllers/bot.ts b/src/api/controllers/bot.ts index 67ae4d54..3fc3af62 100644 --- a/src/api/controllers/bot.ts +++ b/src/api/controllers/bot.ts @@ -1,7 +1,6 @@ import { BodyParams, Controller, Delete, Get, PathParams, Post, UseBefore } from '@tsed/common' import { NotFound, Unauthorized } from '@tsed/exceptions' import { Required } from '@tsed/schema' - import { BaseGuildTextChannel, BaseGuildVoiceChannel, ChannelType, NewsChannel, PermissionsBitField } from 'discord.js' import { Client, MetadataStorage } from 'discordx' diff --git a/src/api/controllers/database.ts b/src/api/controllers/database.ts index e964d56c..e51aaf7f 100644 --- a/src/api/controllers/database.ts +++ b/src/api/controllers/database.ts @@ -1,7 +1,6 @@ import { BodyParams, Controller, Get, Post, UseBefore } from '@tsed/common' import { InternalServerError } from '@tsed/exceptions' import { Required } from '@tsed/schema' - import { injectable } from 'tsyringe' import { DevAuthenticated } from '@/api/middlewares' diff --git a/src/api/controllers/health.ts b/src/api/controllers/health.ts index 5d523513..9e7932d0 100644 --- a/src/api/controllers/health.ts +++ b/src/api/controllers/health.ts @@ -1,5 +1,4 @@ import { Controller, Get, UseBefore } from '@tsed/common' - import { Client } from 'discordx' import { Data } from '@/entities' diff --git a/src/api/middlewares/botOnline.ts b/src/api/middlewares/botOnline.ts index 54e4b73b..8f2ea05e 100644 --- a/src/api/middlewares/botOnline.ts +++ b/src/api/middlewares/botOnline.ts @@ -1,6 +1,5 @@ import { Middleware } from '@tsed/common' import { InternalServerError } from '@tsed/exceptions' - import { Client } from 'discordx' import { resolveDependencies } from '@/utils/functions' diff --git a/src/api/middlewares/devAuthenticated.ts b/src/api/middlewares/devAuthenticated.ts index e2e54ec4..cb309e81 100644 --- a/src/api/middlewares/devAuthenticated.ts +++ b/src/api/middlewares/devAuthenticated.ts @@ -2,7 +2,6 @@ import process from 'node:process' import { Context, Middleware, PlatformContext } from '@tsed/common' import { BadRequest, Unauthorized } from '@tsed/exceptions' - import DiscordOauth2 from 'discord-oauth2' import { Store } from '@/services' diff --git a/src/api/middlewares/log.ts b/src/api/middlewares/log.ts index d01d66a4..bde43bee 100644 --- a/src/api/middlewares/log.ts +++ b/src/api/middlewares/log.ts @@ -1,5 +1,4 @@ import { Context, Middleware, PlatformContext } from '@tsed/common' - import chalk from 'chalk' import { Logger } from '@/services' diff --git a/src/api/server.ts b/src/api/server.ts index f2474736..37dd5d8e 100644 --- a/src/api/server.ts +++ b/src/api/server.ts @@ -5,7 +5,6 @@ import process from 'node:process' import { MikroORM, UseRequestContext } from '@mikro-orm/core' import { Inject, PlatformAcceptMimesMiddleware, PlatformApplication } from '@tsed/common' import { PlatformExpress } from '@tsed/platform-express' - import bodyParser from 'body-parser' import { singleton } from 'tsyringe' diff --git a/src/commands/Admin/prefix.ts b/src/commands/Admin/prefix.ts index b088711c..5284aef7 100644 --- a/src/commands/Admin/prefix.ts +++ b/src/commands/Admin/prefix.ts @@ -1,5 +1,4 @@ import { Category } from '@discordx/utilities' - import { ApplicationCommandOptionType, CommandInteraction } from 'discord.js' import { Client } from 'discordx' import { injectable } from 'tsyringe' diff --git a/src/commands/General/help.ts b/src/commands/General/help.ts index d53aafec..58a6893a 100644 --- a/src/commands/General/help.ts +++ b/src/commands/General/help.ts @@ -1,5 +1,4 @@ import { Category } from '@discordx/utilities' - import { ActionRowBuilder, APISelectMenuOption, CommandInteraction, EmbedBuilder, StringSelectMenuBuilder, StringSelectMenuInteraction } from 'discord.js' import { Client, MetadataStorage, SelectMenuComponent } from 'discordx' import { TranslationFunctions } from 'src/i18n/i18n-types' diff --git a/src/commands/General/info.ts b/src/commands/General/info.ts index 34362d0c..bcb7a770 100644 --- a/src/commands/General/info.ts +++ b/src/commands/General/info.ts @@ -1,5 +1,4 @@ import { Category } from '@discordx/utilities' - import dayjs from 'dayjs' import relativeTime from 'dayjs/plugin/relativeTime' import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder, EmbedField } from 'discord.js' diff --git a/src/commands/General/invite.ts b/src/commands/General/invite.ts index b2ae919a..96be1689 100644 --- a/src/commands/General/invite.ts +++ b/src/commands/General/invite.ts @@ -1,5 +1,4 @@ import { Category } from '@discordx/utilities' - import { CommandInteraction, EmbedBuilder } from 'discord.js' import { Client } from 'discordx' diff --git a/src/commands/General/ping.ts b/src/commands/General/ping.ts index ed475380..3a45b8a8 100644 --- a/src/commands/General/ping.ts +++ b/src/commands/General/ping.ts @@ -1,5 +1,4 @@ import { Category } from '@discordx/utilities' - import { CommandInteraction, Message } from 'discord.js' import { Client } from 'discordx' diff --git a/src/commands/General/stats.ts b/src/commands/General/stats.ts index 51c37922..36b1d1f2 100644 --- a/src/commands/General/stats.ts +++ b/src/commands/General/stats.ts @@ -3,7 +3,6 @@ import { PaginationType, } from '@discordx/pagination' import { Category } from '@discordx/utilities' - import { ApplicationCommandOptionType, CommandInteraction, EmbedBuilder, User } from 'discord.js' import { Client } from 'discordx' import { injectable } from 'tsyringe' diff --git a/src/guards/requestContextIsolator.ts b/src/guards/requestContextIsolator.ts index 77c25c04..38b871eb 100644 --- a/src/guards/requestContextIsolator.ts +++ b/src/guards/requestContextIsolator.ts @@ -1,5 +1,4 @@ import { RequestContext } from '@mikro-orm/core' - import { GuardFunction } from 'discordx' import { Database } from '@/services' diff --git a/src/main.ts b/src/main.ts index 8803575d..eaec4d09 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,7 +5,6 @@ import process from 'node:process' import { resolve } from '@discordx/importer' import { RequestContext } from '@mikro-orm/core' - import chalk from 'chalk' import chokidar from 'chokidar' import discordLogs from 'discord-logs' diff --git a/src/services/Database.ts b/src/services/Database.ts index 897b1fdf..510c0f92 100644 --- a/src/services/Database.ts +++ b/src/services/Database.ts @@ -2,7 +2,6 @@ import fs from 'node:fs' import process from 'node:process' import { EntityName, MikroORM, Options } from '@mikro-orm/core' - import fastFolderSizeSync from 'fast-folder-size/sync' import { backup, restore } from 'saveqlite' import { delay, inject, singleton } from 'tsyringe' diff --git a/src/services/PluginsManager.ts b/src/services/PluginsManager.ts index 53356af1..e5ad87ad 100644 --- a/src/services/PluginsManager.ts +++ b/src/services/PluginsManager.ts @@ -3,7 +3,6 @@ import { sep } from 'node:path' import { resolve } from '@discordx/importer' import { AnyEntity, EntityClass } from '@mikro-orm/core' - import { singleton } from 'tsyringe' import { BaseTranslation } from 'typesafe-i18n' import { ImportLocaleMapping, storeTranslationsToDisk } from 'typesafe-i18n/importer' diff --git a/src/services/Stats.ts b/src/services/Stats.ts index ca9be77d..2073933a 100644 --- a/src/services/Stats.ts +++ b/src/services/Stats.ts @@ -1,7 +1,6 @@ import process from 'node:process' import { EntityRepository } from '@mikro-orm/core' - import { constant } from 'case' import { Client, SimpleCommandMessage } from 'discordx' import osu from 'node-os-utils' diff --git a/src/utils/classes/Plugin.ts b/src/utils/classes/Plugin.ts index f4b4a9db..57dca5da 100644 --- a/src/utils/classes/Plugin.ts +++ b/src/utils/classes/Plugin.ts @@ -3,7 +3,6 @@ import { sep } from 'node:path' import { importx, resolve } from '@discordx/importer' import { AnyEntity, EntityClass } from '@mikro-orm/core' - import semver from 'semver' import { BaseTranslation } from 'typesafe-i18n'