From 48fd4f5765b1a38e480149978add68e69b83b339 Mon Sep 17 00:00:00 2001 From: deptyped Date: Wed, 1 Mar 2023 12:35:33 +0200 Subject: [PATCH] Use type-only Imports --- .eslintrc.json | 3 ++- src/bot/context.ts | 10 +++------- src/bot/features/bot-admin.feature.ts | 2 +- src/bot/features/language.feature.ts | 2 +- src/bot/features/welcome.feature.ts | 2 +- src/bot/handlers/error.handler.ts | 2 +- src/bot/handlers/unhandled.handler.ts | 4 ++-- src/bot/helpers/logging.ts | 2 +- src/bot/i18n.ts | 2 +- src/bot/index.ts | 2 +- src/bot/keyboards/change-language.keyboard.ts | 2 +- src/bot/middlewares/i18n.middleware.ts | 2 +- src/bot/middlewares/metrics.middleware.ts | 2 +- src/bot/middlewares/session.middleware.ts | 2 +- src/bot/middlewares/set-scope.middleware.ts | 2 +- src/bot/middlewares/update-logger.middleware.ts | 2 +- src/server/index.ts | 2 +- 17 files changed, 21 insertions(+), 24 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index f4e99fab..84d8fc4e 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -26,7 +26,8 @@ "prefer-arrow-callback": "off", "consistent-return": "off", "import/prefer-default-export": "off", - "import/extensions": "off" + "import/extensions": "off", + "no-underscore-dangle": "off" }, "settings": { "import/parsers": { diff --git a/src/bot/context.ts b/src/bot/context.ts index abde5140..576a9d2b 100644 --- a/src/bot/context.ts +++ b/src/bot/context.ts @@ -1,7 +1,7 @@ import { Update, UserFromGetMe } from "@grammyjs/types"; import { UserPayload } from "@prisma/client"; -import { Api, Context as DefaultContext, RawApi, SessionFlavor } from "grammy"; -import { Container } from "~/container"; +import { Context as DefaultContext, SessionFlavor, type Api } from "grammy"; +import type { Container } from "~/container"; import { Logger } from "~/logger"; import { AutoChatActionFlavor } from "@grammyjs/auto-chat-action"; @@ -65,9 +65,5 @@ export function createContextConstructor(container: Container) { }); this.scope = {}; } - } as unknown as new ( - update: Update, - api: Api, - me: UserFromGetMe - ) => Context; + } as unknown as new (update: Update, api: Api, me: UserFromGetMe) => Context; } diff --git a/src/bot/features/bot-admin.feature.ts b/src/bot/features/bot-admin.feature.ts index 77d9d75f..e93ef02f 100644 --- a/src/bot/features/bot-admin.feature.ts +++ b/src/bot/features/bot-admin.feature.ts @@ -3,7 +3,7 @@ import { Role } from "@prisma/client"; import { Composer, Keyboard } from "grammy"; import { or } from "grammy-guard"; import _ from "lodash"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; import { isAdminUser, isOwnerUser } from "~/bot/filters"; import { DEFAULT_LANGUAGE_CODE, diff --git a/src/bot/features/language.feature.ts b/src/bot/features/language.feature.ts index ba2543ca..60857065 100644 --- a/src/bot/features/language.feature.ts +++ b/src/bot/features/language.feature.ts @@ -1,6 +1,6 @@ import { Composer } from "grammy"; import { changeLanguageData } from "~/bot/callback-data"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; import { logHandle } from "~/bot/helpers/logging"; import { i18n } from "~/bot/i18n"; import { createChangeLanguageKeyboard } from "~/bot/keyboards"; diff --git a/src/bot/features/welcome.feature.ts b/src/bot/features/welcome.feature.ts index 7246591b..ae6f31b7 100644 --- a/src/bot/features/welcome.feature.ts +++ b/src/bot/features/welcome.feature.ts @@ -1,5 +1,5 @@ import { Composer } from "grammy"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; import { logHandle } from "~/bot/helpers/logging"; const composer = new Composer(); diff --git a/src/bot/handlers/error.handler.ts b/src/bot/handlers/error.handler.ts index 97994582..0dbc84ff 100644 --- a/src/bot/handlers/error.handler.ts +++ b/src/bot/handlers/error.handler.ts @@ -1,5 +1,5 @@ import { ErrorHandler } from "grammy"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; import { getFullMetadata } from "~/bot/helpers/logging"; export const errorHandler: ErrorHandler = (error) => { diff --git a/src/bot/handlers/unhandled.handler.ts b/src/bot/handlers/unhandled.handler.ts index 8e9fb373..5c495d4c 100644 --- a/src/bot/handlers/unhandled.handler.ts +++ b/src/bot/handlers/unhandled.handler.ts @@ -1,4 +1,4 @@ -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; export const unhandledHandler = (ctx: C) => - ctx.reply(ctx.t("unhandled")); + ctx.chat && ctx.reply(ctx.t("unhandled")); diff --git a/src/bot/helpers/logging.ts b/src/bot/helpers/logging.ts index d5a12706..8a1b7cf3 100644 --- a/src/bot/helpers/logging.ts +++ b/src/bot/helpers/logging.ts @@ -1,6 +1,6 @@ import { Middleware } from "grammy"; import _ from "lodash"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; import { updateHandledCounter } from "~/metrics"; export const getChatInfo = (ctx: Context) => { diff --git a/src/bot/i18n.ts b/src/bot/i18n.ts index 4afd42b0..06073c50 100644 --- a/src/bot/i18n.ts +++ b/src/bot/i18n.ts @@ -1,5 +1,5 @@ import { I18n } from "@grammyjs/i18n"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; export const i18n = new I18n({ defaultLocale: "en", diff --git a/src/bot/index.ts b/src/bot/index.ts index 952f4d70..3f638d66 100644 --- a/src/bot/index.ts +++ b/src/bot/index.ts @@ -18,7 +18,7 @@ import { setScope, updateLogger, } from "~/bot/middlewares"; -import { Container } from "~/container"; +import type { Container } from "~/container"; type Dependencies = { container: Container; diff --git a/src/bot/keyboards/change-language.keyboard.ts b/src/bot/keyboards/change-language.keyboard.ts index fd04b747..2d505f91 100644 --- a/src/bot/keyboards/change-language.keyboard.ts +++ b/src/bot/keyboards/change-language.keyboard.ts @@ -2,7 +2,7 @@ import { InlineKeyboard } from "grammy"; import ISO6391 from "iso-639-1"; import _ from "lodash"; import { changeLanguageData } from "~/bot/callback-data"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; import { i18n } from "~/bot/i18n"; export const createChangeLanguageKeyboard = async (ctx: Context) => { diff --git a/src/bot/middlewares/i18n.middleware.ts b/src/bot/middlewares/i18n.middleware.ts index 48f15e00..01bbfe89 100644 --- a/src/bot/middlewares/i18n.middleware.ts +++ b/src/bot/middlewares/i18n.middleware.ts @@ -1,5 +1,5 @@ import { Middleware } from "grammy"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; import { i18n as i18nProvider } from "~/bot/i18n"; export const i18n = (): Middleware => i18nProvider; diff --git a/src/bot/middlewares/metrics.middleware.ts b/src/bot/middlewares/metrics.middleware.ts index 93a8740e..68bb28df 100644 --- a/src/bot/middlewares/metrics.middleware.ts +++ b/src/bot/middlewares/metrics.middleware.ts @@ -1,5 +1,5 @@ import { Middleware } from "grammy"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; import { updateCounter, updateFailedCounter } from "~/metrics"; export const metrics = (): Middleware => async (ctx, next) => { diff --git a/src/bot/middlewares/session.middleware.ts b/src/bot/middlewares/session.middleware.ts index 9f2e0148..32aa1e36 100644 --- a/src/bot/middlewares/session.middleware.ts +++ b/src/bot/middlewares/session.middleware.ts @@ -1,5 +1,5 @@ import { Middleware, session as createSession, StorageAdapter } from "grammy"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; export const session = ( storage: StorageAdapter diff --git a/src/bot/middlewares/set-scope.middleware.ts b/src/bot/middlewares/set-scope.middleware.ts index b6f71364..05d34a51 100644 --- a/src/bot/middlewares/set-scope.middleware.ts +++ b/src/bot/middlewares/set-scope.middleware.ts @@ -1,5 +1,5 @@ import { Middleware } from "grammy"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; export const setScope = (): Middleware => async (ctx, next) => { if (ctx.from?.is_bot === false) { diff --git a/src/bot/middlewares/update-logger.middleware.ts b/src/bot/middlewares/update-logger.middleware.ts index 0cd7e630..6a0e9c8a 100644 --- a/src/bot/middlewares/update-logger.middleware.ts +++ b/src/bot/middlewares/update-logger.middleware.ts @@ -1,5 +1,5 @@ import { Middleware } from "grammy"; -import { Context } from "~/bot/context"; +import type { Context } from "~/bot/context"; import { getFullMetadata } from "~/bot/helpers/logging"; export const updateLogger = (): Middleware => (ctx, next) => { diff --git a/src/server/index.ts b/src/server/index.ts index b87617f4..ac9e0d83 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -3,7 +3,7 @@ import { BotError, webhookCallback } from "grammy"; import { register } from "prom-client"; import type { Bot } from "~/bot"; import { errorHandler } from "~/bot/handlers"; -import { Container } from "~/container"; +import type { Container } from "~/container"; export const createServer = async (bot: Bot, container: Container) => { const { logger, prisma } = container.items;