From 7ff433ed0a1155269c4ea526e55aec736aeed907 Mon Sep 17 00:00:00 2001
From: Alina Sireneva <alina@tei.su>
Date: Sun, 24 Sep 2023 03:37:34 +0300
Subject: [PATCH] refactor: import tl from core/client, not tl

---
 packages/client/package.json                  |   1 -
 packages/client/scripts/generate-client.js    | 141 +++++-------------
 packages/client/src/client.ts                 |   3 +-
 packages/client/src/methods/auth/start.ts     |   3 +-
 .../src/methods/bots/answer-callback-query.ts |   2 +-
 .../src/methods/bots/answer-inline-query.ts   |   2 +-
 .../methods/bots/answer-pre-checkout-query.ts |   2 +-
 .../src/methods/bots/delete-my-commands.ts    |   2 +-
 .../src/methods/bots/get-bot-menu-button.ts   |   2 +-
 .../src/methods/bots/get-callback-answer.ts   |   2 +-
 .../src/methods/bots/get-game-high-scores.ts  |   2 +-
 .../src/methods/bots/get-my-commands.ts       |   2 +-
 .../methods/bots/normalize-command-scope.ts   |   3 +-
 .../src/methods/bots/set-bot-menu-button.ts   |   2 +-
 .../client/src/methods/bots/set-game-score.ts |   2 +-
 .../src/methods/bots/set-my-commands.ts       |   2 +-
 .../src/methods/bots/set-my-default-rights.ts |   2 +-
 .../client/src/methods/chats/archive-chats.ts |   3 +-
 .../src/methods/chats/delete-user-history.ts  |   2 +-
 .../src/methods/chats/edit-admin-rights.ts    |   2 +-
 .../src/methods/chats/get-chat-event-log.ts   |   3 +-
 .../src/methods/chats/get-chat-member.ts      |   2 +-
 .../src/methods/chats/get-chat-members.ts     |   3 +-
 packages/client/src/methods/chats/get-chat.ts |   3 +-
 .../client/src/methods/chats/get-full-chat.ts |   3 +-
 .../src/methods/chats/get-nearby-chats.ts     |   3 +-
 .../src/methods/chats/restrict-chat-member.ts |   2 +-
 .../client/src/methods/chats/save-draft.ts    |   2 +-
 .../chats/set-chat-default-permissions.ts     |   2 +-
 .../src/methods/chats/set-chat-photo.ts       |   3 +-
 .../src/methods/chats/unarchive-chats.ts      |   3 +-
 .../src/methods/contacts/import-contacts.ts   |   3 +-
 .../src/methods/dialogs/create-folder.ts      |   3 +-
 .../src/methods/dialogs/delete-folder.ts      |   2 +-
 .../client/src/methods/dialogs/edit-folder.ts |   3 +-
 .../client/src/methods/dialogs/find-folder.ts |   3 +-
 .../client/src/methods/dialogs/get-dialogs.ts |   3 +-
 .../client/src/methods/dialogs/get-folders.ts |   2 +-
 .../src/methods/dialogs/parse-dialogs.ts      |   3 +-
 .../src/methods/files/download-iterable.ts    |   3 +-
 .../files/normalize-file-to-document.ts       |   2 +-
 .../src/methods/files/normalize-input-file.ts |   3 +-
 .../methods/files/normalize-input-media.ts    |   2 +-
 .../client/src/methods/files/upload-file.ts   |   3 +-
 .../client/src/methods/files/upload-media.ts  |   1 +
 .../invite-links/get-invite-link-members.ts   |   2 +-
 .../methods/invite-links/get-invite-links.ts  |   2 +-
 .../methods/messages/edit-inline-message.ts   |   2 +-
 .../src/methods/messages/edit-message.ts      |   2 +-
 .../src/methods/messages/find-in-update.ts    |   3 +-
 .../src/methods/messages/forward-messages.ts  |   3 +-
 .../messages/get-discussion-message.ts        |   2 +-
 .../methods/messages/get-messages-unsafe.ts   |   3 +-
 .../src/methods/messages/get-messages.ts      |   3 +-
 .../methods/messages/get-reaction-users.ts    |   2 +-
 .../src/methods/messages/parse-entities.ts    |   3 +-
 .../src/methods/messages/search-global.ts     |   2 +-
 .../src/methods/messages/search-messages.ts   |   2 +-
 .../client/src/methods/messages/send-copy.ts  |   3 +-
 .../src/methods/messages/send-media-group.ts  |   3 +-
 .../client/src/methods/messages/send-media.ts |   3 +-
 .../src/methods/messages/send-reaction.ts     |   3 +-
 .../client/src/methods/messages/send-text.ts  |   3 +-
 .../src/methods/messages/send-typing.ts       |   3 +-
 .../src/methods/misc/init-takeout-session.ts  |   2 +-
 .../methods/stickers/add-sticker-to-set.ts    |   2 +-
 .../methods/stickers/create-sticker-set.ts    |   3 +-
 .../stickers/delete-sticker-from-set.ts       |   2 +-
 .../src/methods/stickers/get-custom-emojis.ts |   3 +-
 .../src/methods/stickers/get-sticker-set.ts   |   2 +-
 .../methods/stickers/move-sticker-in-set.ts   |   2 +-
 .../methods/stickers/set-sticker-set-thumb.ts |   2 +-
 packages/client/src/methods/updates.ts        |   3 +-
 .../methods/users/delete-profile-photos.ts    |   3 +-
 .../src/methods/users/get-profile-photos.ts   |   2 +-
 .../src/methods/users/iter-profile-photos.ts  |   2 +-
 .../src/methods/users/resolve-peer-many.ts    |   2 +-
 .../client/src/methods/users/resolve-peer.ts  |   3 +-
 .../src/methods/users/set-profile-photo.ts    |   3 +-
 packages/client/src/types/auth/sent-code.ts   |   2 +-
 .../client/src/types/auth/terms-of-service.ts |   2 +-
 .../client/src/types/bots/callback-query.ts   |   3 +-
 .../client/src/types/bots/command-scope.ts    |   2 +-
 .../client/src/types/bots/game-high-score.ts  |   2 +-
 .../client/src/types/bots/inline-query.ts     |   2 +-
 .../types/bots/input/input-inline-message.ts  |   3 +-
 .../types/bots/input/input-inline-result.ts   |   3 +-
 .../client/src/types/bots/keyboard-builder.ts |   2 +-
 packages/client/src/types/bots/keyboards.ts   |   3 +-
 .../client/src/types/calls/discard-reason.ts  |   5 +-
 packages/client/src/types/conversation.ts     |   3 +-
 .../client/src/types/files/file-location.ts   |   2 +-
 .../client/src/types/files/uploaded-file.ts   |   2 +-
 packages/client/src/types/files/utils.ts      |   2 +-
 .../client/src/types/files/web-document.ts    |   3 +-
 packages/client/src/types/media/audio.ts      |   2 +-
 packages/client/src/types/media/contact.ts    |   2 +-
 packages/client/src/types/media/dice.ts       |   2 +-
 .../client/src/types/media/document-utils.ts  |   2 +-
 packages/client/src/types/media/document.ts   |   2 +-
 packages/client/src/types/media/game.ts       |   2 +-
 .../client/src/types/media/input-media.ts     |   3 +-
 packages/client/src/types/media/invoice.ts    |   3 +-
 packages/client/src/types/media/location.ts   |   2 +-
 packages/client/src/types/media/photo.ts      |   3 +-
 packages/client/src/types/media/poll.ts       |   2 +-
 packages/client/src/types/media/sticker.ts    |   3 +-
 packages/client/src/types/media/thumbnail.ts  |   3 +-
 packages/client/src/types/media/venue.ts      |   2 +-
 packages/client/src/types/media/video.ts      |   2 +-
 packages/client/src/types/media/voice.ts      |   2 +-
 packages/client/src/types/media/web-page.ts   |   3 +-
 packages/client/src/types/messages/dialog.ts  |   3 +-
 .../src/types/messages/draft-message.ts       |   2 +-
 .../src/types/messages/message-action.ts      |   2 +-
 .../src/types/messages/message-entity.ts      |   2 +-
 .../src/types/messages/message-media.ts       |   3 +-
 packages/client/src/types/messages/message.ts |  10 +-
 .../client/src/types/messages/reactions.ts    |   3 +-
 packages/client/src/types/misc/sticker-set.ts |   3 +-
 .../client/src/types/misc/takeout-session.ts  |   3 +-
 packages/client/src/types/parser.ts           |   2 +-
 packages/client/src/types/peers/chat-event.ts |   3 +-
 .../src/types/peers/chat-invite-link.ts       |   2 +-
 .../client/src/types/peers/chat-location.ts   |   2 +-
 .../client/src/types/peers/chat-member.ts     |   2 +-
 .../src/types/peers/chat-permissions.ts       |   2 +-
 packages/client/src/types/peers/chat-photo.ts |   3 +-
 .../client/src/types/peers/chat-preview.ts    |   2 +-
 packages/client/src/types/peers/chat.ts       |   3 +-
 packages/client/src/types/peers/index.ts      |   2 +-
 .../client/src/types/peers/peers-index.ts     |   3 +-
 packages/client/src/types/peers/user.ts       |   3 +-
 .../types/updates/bot-chat-join-request.ts    |   3 +-
 .../client/src/types/updates/bot-stopped.ts   |   2 +-
 .../src/types/updates/chat-join-request.ts    |   3 +-
 .../src/types/updates/chat-member-update.ts   |   3 +-
 .../src/types/updates/chosen-inline-result.ts |   3 +-
 .../types/updates/delete-message-update.ts    |   3 +-
 .../src/types/updates/history-read-update.ts  |   3 +-
 .../client/src/types/updates/parse-update.ts  |   2 +-
 .../client/src/types/updates/poll-update.ts   |   2 +-
 .../client/src/types/updates/poll-vote.ts     |   3 +-
 .../src/types/updates/pre-checkout-query.ts   |   2 +-
 .../src/types/updates/user-status-update.ts   |   2 +-
 .../src/types/updates/user-typing-update.ts   |   3 +-
 packages/client/src/utils/inline-utils.ts     |   3 +-
 packages/client/src/utils/misc-utils.ts       |   3 +-
 packages/client/src/utils/peer-utils.ts       |   3 +-
 packages/client/src/utils/updates-utils.ts    |   3 +-
 packages/dispatcher/package.json              |   1 -
 packages/dispatcher/src/dispatcher.ts         |   2 +-
 packages/dispatcher/src/handler.ts            |   2 +-
 packages/file-id/package.json                 |   1 -
 packages/file-id/src/convert.ts               |   3 +-
 .../html-parser/tests/html-parser.spec.ts     |   3 +-
 .../tests/markdown-parser.spec.ts             |   3 +-
 pnpm-lock.yaml                                |   9 --
 158 files changed, 197 insertions(+), 346 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 7969e816..f7adfa2e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -14,7 +14,6 @@
     },
     "dependencies": {
         "@types/node": "18.16.0",
-        "@mtcute/tl": "workspace:^160.0.0",
         "@mtcute/core": "workspace:^1.0.0",
         "@mtcute/file-id": "workspace:^1.0.0",
         "eager-async-pool": "1.0.0",
diff --git a/packages/client/scripts/generate-client.js b/packages/client/scripts/generate-client.js
index a51af6bb..5199e004 100644
--- a/packages/client/scripts/generate-client.js
+++ b/packages/client/scripts/generate-client.js
@@ -31,12 +31,7 @@ ${text}`,
 
 async function addSingleMethod(state, fileName) {
     const fileFullText = await fs.promises.readFile(fileName, 'utf-8')
-    const program = ts.createSourceFile(
-        path.basename(fileName),
-        fileFullText,
-        ts.ScriptTarget.ES2018,
-        true,
-    )
+    const program = ts.createSourceFile(path.basename(fileName), fileFullText, ts.ScriptTarget.ES2018, true)
     const relPath = path.relative(targetDir, fileName).replace(/\\/g, '/') // replace path delim to unix
 
     state.files[relPath] = fileFullText
@@ -64,8 +59,7 @@ async function addSingleMethod(state, fileName) {
 
             if (
                 !stmt.importClause.namedBindings ||
-                stmt.importClause.namedBindings.kind !==
-                    ts.SyntaxKind.NamedImports
+                stmt.importClause.namedBindings.kind !== ts.SyntaxKind.NamedImports
             ) {
                 throwError(stmt, fileName, 'Only named imports are supported!')
             }
@@ -74,25 +68,16 @@ async function addSingleMethod(state, fileName) {
 
             if (module[0] === '.') {
                 // relative, need to resolve
-                const modFullPath = path.join(
-                    path.dirname(fileName),
-                    stmt.moduleSpecifier.text,
-                )
+                const modFullPath = path.join(path.dirname(fileName), stmt.moduleSpecifier.text)
                 const modPath = path.dirname(modFullPath)
                 const modName = path.basename(modFullPath)
 
-                module = path
-                    .join(path.relative(targetDir, modPath), modName)
-                    .replace(/\\/g, '/') // replace path delim to unix
+                module = path.join(path.relative(targetDir, modPath), modName).replace(/\\/g, '/') // replace path delim to unix
                 if (module[0] !== '.') module = './' + module
             }
 
             if (module === './client') {
-                throwError(
-                    stmt,
-                    fileName,
-                    "You can't copy an import from ./client",
-                )
+                throwError(stmt, fileName, "You can't copy an import from ./client")
             }
 
             if (!(module in state.imports)) {
@@ -119,9 +104,7 @@ async function addSingleMethod(state, fileName) {
                 name !== '_normalizeInputFile' &&
                 name !== '_normalizeInputMedia'
 
-            const isExported = (stmt.modifiers || []).find(
-                (mod) => mod.kind === ts.SyntaxKind.ExportKeyword,
-            )
+            const isExported = (stmt.modifiers || []).find((mod) => mod.kind === ts.SyntaxKind.ExportKeyword)
             const isInitialize = checkForFlag(stmt, '@initialize')
             const aliases = (function () {
                 const flag = checkForFlag(stmt, '@alias')
@@ -146,11 +129,7 @@ async function addSingleMethod(state, fileName) {
             }
 
             if (isInitialize && isExported) {
-                throwError(
-                    isExported,
-                    fileName,
-                    'Initialization methods must not be exported',
-                )
+                throwError(isExported, fileName, 'Initialization methods must not be exported')
             }
 
             if (isInitialize) {
@@ -171,8 +150,7 @@ async function addSingleMethod(state, fileName) {
             if (
                 isExported &&
                 (!firstArg ||
-                    (firstArg.type.getText() !== 'TelegramClient' &&
-                        firstArg.type.getText() !== 'BaseTelegramClient'))
+                    (firstArg.type.getText() !== 'TelegramClient' && firstArg.type.getText() !== 'BaseTelegramClient'))
             ) {
                 throwError(
                     firstArg || stmt.name,
@@ -183,16 +161,10 @@ async function addSingleMethod(state, fileName) {
 
             const returnsExported = (
                 stmt.body ?
-                    ts.getLeadingCommentRanges(
-                        fileFullText,
-                        stmt.body.pos + 2,
-                    ) ||
+                    ts.getLeadingCommentRanges(fileFullText, stmt.body.pos + 2) ||
                       (stmt.statements &&
                           stmt.statements.length &&
-                          ts.getLeadingCommentRanges(
-                              fileFullText,
-                              stmt.statements[0].pos,
-                          )) ||
+                          ts.getLeadingCommentRanges(fileFullText, stmt.statements[0].pos)) ||
                       [] :
                     []
             )
@@ -246,23 +218,13 @@ async function addSingleMethod(state, fileName) {
             }
 
             if (!checkForFlag(stmt, '@extension')) continue
-            const isExported = (stmt.modifiers || []).find(
-                (mod) => mod.kind === 92, /* ExportKeyword */
-            )
+            const isExported = (stmt.modifiers || []).find((mod) => mod.kind === 92 /* ExportKeyword */)
 
             if (isExported) {
-                throwError(
-                    isExported,
-                    fileName,
-                    'Extension interfaces must not be imported',
-                )
+                throwError(isExported, fileName, 'Extension interfaces must not be imported')
             }
             if (stmt.heritageClauses && stmt.heritageClauses.length) {
-                throwError(
-                    stmt.heritageClauses[0],
-                    fileName,
-                    'Extension interfaces must not be extended',
-                )
+                throwError(stmt.heritageClauses[0], fileName, 'Extension interfaces must not be extended')
             }
 
             for (const member of stmt.members || []) {
@@ -278,9 +240,7 @@ async function addSingleMethod(state, fileName) {
 }
 
 async function main() {
-    const output = fs.createWriteStream(
-        path.join(__dirname, '../src/client.ts'),
-    )
+    const output = fs.createWriteStream(path.join(__dirname, '../src/client.ts'))
     const state = {
         imports: {},
         fields: [],
@@ -302,8 +262,7 @@ async function main() {
     output.write(
         '/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging, @typescript-eslint/unified-signatures */\n' +
             '/* THIS FILE WAS AUTO-GENERATED */\n' +
-            "import { BaseTelegramClient, BaseTelegramClientOptions } from '@mtcute/core'\n" +
-            "import { tl } from '@mtcute/tl'\n",
+            "import { BaseTelegramClient, BaseTelegramClientOptions, tl } from '@mtcute/core'\n",
     )
     Object.entries(state.imports).forEach(([module, items]) => {
         items = [...items]
@@ -316,9 +275,7 @@ async function main() {
         output.write(`// from ${from}\n${code}\n`)
     })
 
-    output.write(
-        '\nexport interface TelegramClient extends BaseTelegramClient {\n',
-    )
+    output.write('\nexport interface TelegramClient extends BaseTelegramClient {\n')
 
     output.write(`/**
  * Register a raw update handler
@@ -342,9 +299,7 @@ async function main() {
  * @param name  Event name
  * @param handler  ${updates.toSentence(type, 'full')}
  */
-on(name: '${type.typeName}', handler: ((upd: ${
-    type.updateType
-}) => void)): this\n`)
+on(name: '${type.typeName}', handler: ((upd: ${type.updateType}) => void)): this\n`)
     })
 
     const printer = ts.createPrinter()
@@ -365,13 +320,9 @@ on(name: '${type.typeName}', handler: ((upd: ${
             // first let's determine the signature
             const returnType = func.type ? ': ' + func.type.getText() : ''
             const generics = func.typeParameters ?
-                `<${func.typeParameters
-                    .map((it) => it.getFullText())
-                    .join(', ')}>` :
+                `<${func.typeParameters.map((it) => it.getFullText()).join(', ')}>` :
                 ''
-            const rawParams = (func.parameters || []).filter(
-                (it) => !it.type || it.type.getText() !== 'TelegramClient',
-            )
+            const rawParams = (func.parameters || []).filter((it) => !it.type || it.type.getText() !== 'TelegramClient')
             const parameters = rawParams
                 .map((it) => {
                     if (it.initializer) {
@@ -382,33 +333,20 @@ on(name: '${type.typeName}', handler: ((upd: ${
                             // no explicit type.
                             // infer from initializer
                             if (
-                                it.initializer.kind ===
-                                    ts.SyntaxKind.TrueKeyword ||
-                                it.initializer.kind ===
-                                    ts.SyntaxKind.FalseKeyword
+                                it.initializer.kind === ts.SyntaxKind.TrueKeyword ||
+                                it.initializer.kind === ts.SyntaxKind.FalseKeyword
                             ) {
                                 it.type = { kind: ts.SyntaxKind.BooleanKeyword }
-                            } else if (
-                                it.initializer.kind ===
-                                ts.SyntaxKind.StringLiteral
-                            ) {
+                            } else if (it.initializer.kind === ts.SyntaxKind.StringLiteral) {
                                 it.type = { kind: ts.SyntaxKind.StringKeyword }
                             } else if (
-                                it.initializer.kind ===
-                                    ts.SyntaxKind.NumericLiteral ||
-                                (it.initializer.kind ===
-                                    ts.SyntaxKind.Identifier &&
-                                    (it.initializer.escapedText === 'NaN' ||
-                                        it.initializer.escapedText ===
-                                            'Infinity'))
+                                it.initializer.kind === ts.SyntaxKind.NumericLiteral ||
+                                (it.initializer.kind === ts.SyntaxKind.Identifier &&
+                                    (it.initializer.escapedText === 'NaN' || it.initializer.escapedText === 'Infinity'))
                             ) {
                                 it.type = { kind: ts.SyntaxKind.NumberKeyword }
                             } else {
-                                throwError(
-                                    it,
-                                    state.methods.used[origName],
-                                    'Cannot infer parameter type',
-                                )
+                                throwError(it, state.methods.used[origName], 'Cannot infer parameter type')
                             }
                         }
                         it.initializer = undefined
@@ -445,22 +383,17 @@ on(name: '${type.typeName}', handler: ((upd: ${
             comment = comment
                 .replace(/^\s*\/\/+\s*@alias.*$/m, '')
                 .replace(/(\n^|\/\*)\s*\*\s*@internal.*/m, '')
-                .replace(
-                    /((?:\n^|\/\*)\s*\*\s*@param )([^\s]+?)($|\s+)/gm,
-                    (_, pref, arg, post) => {
-                        const param = rawParams.find(
-                            (it) => it.name.escapedText === arg,
-                        )
-                        if (!param) return _
-                        if (!param._savedDefault) return _
+                .replace(/((?:\n^|\/\*)\s*\*\s*@param )([^\s]+?)($|\s+)/gm, (_, pref, arg, post) => {
+                    const param = rawParams.find((it) => it.name.escapedText === arg)
+                    if (!param) return _
+                    if (!param._savedDefault) return _
 
-                        if (post) {
-                            return `${pref}${arg}${post}(default: \`${param._savedDefault.trim()}\`) `
-                        }
+                    if (post) {
+                        return `${pref}${arg}${post}(default: \`${param._savedDefault.trim()}\`) `
+                    }
 
-                        return `${pref}${arg}\n*  (default: \`${param._savedDefault.trim()}\`)`
-                    },
-                )
+                    return `${pref}${arg}\n*  (default: \`${param._savedDefault.trim()}\`)`
+                })
 
             for (const name of [origName, ...aliases]) {
                 if (!hasOverloads) {
@@ -469,9 +402,7 @@ on(name: '${type.typeName}', handler: ((upd: ${
                         output.write(comment + '\n')
                     }
 
-                    output.write(
-                        `${name}${generics}(${parameters})${returnType}\n`,
-                    )
+                    output.write(`${name}${generics}(${parameters})${returnType}\n`)
                 }
 
                 if (!overload) {
diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts
index aeecc2f4..9e24647f 100644
--- a/packages/client/src/client.ts
+++ b/packages/client/src/client.ts
@@ -2,10 +2,9 @@
 /* THIS FILE WAS AUTO-GENERATED */
 import { Readable } from 'stream'
 
-import { BaseTelegramClient, BaseTelegramClientOptions, MaybeArray, MaybeAsync } from '@mtcute/core'
+import { BaseTelegramClient, BaseTelegramClientOptions, MaybeArray, MaybeAsync, tl } from '@mtcute/core'
 import { AsyncLock, ConditionVariable, Deque, Logger, SortedLinkedList } from '@mtcute/core/utils'
 import { tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { acceptTos } from './methods/auth/accept-tos'
 import { checkPassword } from './methods/auth/check-password'
diff --git a/packages/client/src/methods/auth/start.ts b/packages/client/src/methods/auth/start.ts
index 184c6c84..70aedff9 100644
--- a/packages/client/src/methods/auth/start.ts
+++ b/packages/client/src/methods/auth/start.ts
@@ -1,6 +1,5 @@
 /* eslint-disable no-console */
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { MaybeAsync, MaybeDynamic, SentCode, TermsOfService, User } from '../../types'
diff --git a/packages/client/src/methods/bots/answer-callback-query.ts b/packages/client/src/methods/bots/answer-callback-query.ts
index d5a0d6d6..012d70e4 100644
--- a/packages/client/src/methods/bots/answer-callback-query.ts
+++ b/packages/client/src/methods/bots/answer-callback-query.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/bots/answer-inline-query.ts b/packages/client/src/methods/bots/answer-inline-query.ts
index ae650eb0..cbf65c2f 100644
--- a/packages/client/src/methods/bots/answer-inline-query.ts
+++ b/packages/client/src/methods/bots/answer-inline-query.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { BotInline, InputInlineResult } from '../../types'
diff --git a/packages/client/src/methods/bots/answer-pre-checkout-query.ts b/packages/client/src/methods/bots/answer-pre-checkout-query.ts
index 8010c55a..a0e8ccc2 100644
--- a/packages/client/src/methods/bots/answer-pre-checkout-query.ts
+++ b/packages/client/src/methods/bots/answer-pre-checkout-query.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/bots/delete-my-commands.ts b/packages/client/src/methods/bots/delete-my-commands.ts
index d2be9529..2e9650d9 100644
--- a/packages/client/src/methods/bots/delete-my-commands.ts
+++ b/packages/client/src/methods/bots/delete-my-commands.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { BotCommands } from '../../types'
diff --git a/packages/client/src/methods/bots/get-bot-menu-button.ts b/packages/client/src/methods/bots/get-bot-menu-button.ts
index f008e1e2..171b2f35 100644
--- a/packages/client/src/methods/bots/get-bot-menu-button.ts
+++ b/packages/client/src/methods/bots/get-bot-menu-button.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/bots/get-callback-answer.ts b/packages/client/src/methods/bots/get-callback-answer.ts
index d2a00ae0..635716dd 100644
--- a/packages/client/src/methods/bots/get-callback-answer.ts
+++ b/packages/client/src/methods/bots/get-callback-answer.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { computeSrpParams } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/bots/get-game-high-scores.ts b/packages/client/src/methods/bots/get-game-high-scores.ts
index a14a4758..1e051138 100644
--- a/packages/client/src/methods/bots/get-game-high-scores.ts
+++ b/packages/client/src/methods/bots/get-game-high-scores.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { GameHighScore, InputPeerLike, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/bots/get-my-commands.ts b/packages/client/src/methods/bots/get-my-commands.ts
index da8c5c09..f02bb37a 100644
--- a/packages/client/src/methods/bots/get-my-commands.ts
+++ b/packages/client/src/methods/bots/get-my-commands.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { BotCommands } from '../../types'
diff --git a/packages/client/src/methods/bots/normalize-command-scope.ts b/packages/client/src/methods/bots/normalize-command-scope.ts
index b4d583d1..2fa8c8e3 100644
--- a/packages/client/src/methods/bots/normalize-command-scope.ts
+++ b/packages/client/src/methods/bots/normalize-command-scope.ts
@@ -1,5 +1,4 @@
-import { assertNever } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { assertNever, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { BotCommands } from '../../types'
diff --git a/packages/client/src/methods/bots/set-bot-menu-button.ts b/packages/client/src/methods/bots/set-bot-menu-button.ts
index fbbe005f..dcb16c0c 100644
--- a/packages/client/src/methods/bots/set-bot-menu-button.ts
+++ b/packages/client/src/methods/bots/set-bot-menu-button.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/bots/set-game-score.ts b/packages/client/src/methods/bots/set-game-score.ts
index 67eb6f37..3ce98d39 100644
--- a/packages/client/src/methods/bots/set-game-score.ts
+++ b/packages/client/src/methods/bots/set-game-score.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, Message } from '../../types'
diff --git a/packages/client/src/methods/bots/set-my-commands.ts b/packages/client/src/methods/bots/set-my-commands.ts
index 8c10ad45..f32e63d2 100644
--- a/packages/client/src/methods/bots/set-my-commands.ts
+++ b/packages/client/src/methods/bots/set-my-commands.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { BotCommands } from '../../types'
diff --git a/packages/client/src/methods/bots/set-my-default-rights.ts b/packages/client/src/methods/bots/set-my-default-rights.ts
index 017cbb1d..983b27b8 100644
--- a/packages/client/src/methods/bots/set-my-default-rights.ts
+++ b/packages/client/src/methods/bots/set-my-default-rights.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/chats/archive-chats.ts b/packages/client/src/methods/chats/archive-chats.ts
index 0de723d5..141b9aaa 100644
--- a/packages/client/src/methods/chats/archive-chats.ts
+++ b/packages/client/src/methods/chats/archive-chats.ts
@@ -1,5 +1,4 @@
-import { MaybeArray } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MaybeArray, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/chats/delete-user-history.ts b/packages/client/src/methods/chats/delete-user-history.ts
index e2c9de7e..94d3f62a 100644
--- a/packages/client/src/methods/chats/delete-user-history.ts
+++ b/packages/client/src/methods/chats/delete-user-history.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/chats/edit-admin-rights.ts b/packages/client/src/methods/chats/edit-admin-rights.ts
index 2201cc4a..65151907 100644
--- a/packages/client/src/methods/chats/edit-admin-rights.ts
+++ b/packages/client/src/methods/chats/edit-admin-rights.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/chats/get-chat-event-log.ts b/packages/client/src/methods/chats/get-chat-event-log.ts
index 37bb0644..51718c71 100644
--- a/packages/client/src/methods/chats/get-chat-event-log.ts
+++ b/packages/client/src/methods/chats/get-chat-event-log.ts
@@ -1,7 +1,6 @@
 import Long from 'long'
 
-import { assertNever, MaybeArray } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { assertNever, MaybeArray, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { ChatAction, ChatEvent, InputPeerLike, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/chats/get-chat-member.ts b/packages/client/src/methods/chats/get-chat-member.ts
index 2d20a8c1..5f11829d 100644
--- a/packages/client/src/methods/chats/get-chat-member.ts
+++ b/packages/client/src/methods/chats/get-chat-member.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { ChatMember, InputPeerLike, MtInvalidPeerTypeError, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/chats/get-chat-members.ts b/packages/client/src/methods/chats/get-chat-members.ts
index b008cf35..1fb79510 100644
--- a/packages/client/src/methods/chats/get-chat-members.ts
+++ b/packages/client/src/methods/chats/get-chat-members.ts
@@ -1,8 +1,7 @@
 import Long from 'long'
 
-import { assertNever } from '@mtcute/core'
+import { assertNever, tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { ArrayWithTotal, ChatMember, InputPeerLike, MtInvalidPeerTypeError, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/chats/get-chat.ts b/packages/client/src/methods/chats/get-chat.ts
index 7b9cf98e..376f1c54 100644
--- a/packages/client/src/methods/chats/get-chat.ts
+++ b/packages/client/src/methods/chats/get-chat.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Chat, InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/chats/get-full-chat.ts b/packages/client/src/methods/chats/get-full-chat.ts
index 7cba82cc..f20b254e 100644
--- a/packages/client/src/methods/chats/get-full-chat.ts
+++ b/packages/client/src/methods/chats/get-full-chat.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Chat, InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/chats/get-nearby-chats.ts b/packages/client/src/methods/chats/get-nearby-chats.ts
index 7c900844..646dd0d0 100644
--- a/packages/client/src/methods/chats/get-nearby-chats.ts
+++ b/packages/client/src/methods/chats/get-nearby-chats.ts
@@ -1,6 +1,5 @@
-import { getMarkedPeerId } from '@mtcute/core'
+import { getMarkedPeerId, tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { Chat } from '../../types'
diff --git a/packages/client/src/methods/chats/restrict-chat-member.ts b/packages/client/src/methods/chats/restrict-chat-member.ts
index 0e8d88ec..f7251f45 100644
--- a/packages/client/src/methods/chats/restrict-chat-member.ts
+++ b/packages/client/src/methods/chats/restrict-chat-member.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, MtInvalidPeerTypeError } from '../../types'
diff --git a/packages/client/src/methods/chats/save-draft.ts b/packages/client/src/methods/chats/save-draft.ts
index 9ed192d9..5b54cfd3 100644
--- a/packages/client/src/methods/chats/save-draft.ts
+++ b/packages/client/src/methods/chats/save-draft.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/chats/set-chat-default-permissions.ts b/packages/client/src/methods/chats/set-chat-default-permissions.ts
index 9ad5eadd..888ee92f 100644
--- a/packages/client/src/methods/chats/set-chat-default-permissions.ts
+++ b/packages/client/src/methods/chats/set-chat-default-permissions.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Chat, InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/chats/set-chat-photo.ts b/packages/client/src/methods/chats/set-chat-photo.ts
index 2f901439..54dc099e 100644
--- a/packages/client/src/methods/chats/set-chat-photo.ts
+++ b/packages/client/src/methods/chats/set-chat-photo.ts
@@ -1,6 +1,5 @@
-import { MtArgumentError } from '@mtcute/core'
+import { MtArgumentError, tl } from '@mtcute/core'
 import { fileIdToInputPhoto, tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputFileLike, InputPeerLike, isUploadedFile, MtInvalidPeerTypeError } from '../../types'
diff --git a/packages/client/src/methods/chats/unarchive-chats.ts b/packages/client/src/methods/chats/unarchive-chats.ts
index f98cc66c..149f3dd8 100644
--- a/packages/client/src/methods/chats/unarchive-chats.ts
+++ b/packages/client/src/methods/chats/unarchive-chats.ts
@@ -1,5 +1,4 @@
-import { MaybeArray } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MaybeArray, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/contacts/import-contacts.ts b/packages/client/src/methods/contacts/import-contacts.ts
index 86280413..a51405bc 100644
--- a/packages/client/src/methods/contacts/import-contacts.ts
+++ b/packages/client/src/methods/contacts/import-contacts.ts
@@ -1,7 +1,6 @@
 import Long from 'long'
 
-import { PartialOnly } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { PartialOnly, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/dialogs/create-folder.ts b/packages/client/src/methods/dialogs/create-folder.ts
index d7990d24..e0ada444 100644
--- a/packages/client/src/methods/dialogs/create-folder.ts
+++ b/packages/client/src/methods/dialogs/create-folder.ts
@@ -1,5 +1,4 @@
-import { PartialExcept } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { PartialExcept, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/dialogs/delete-folder.ts b/packages/client/src/methods/dialogs/delete-folder.ts
index 28211ef4..626f9a39 100644
--- a/packages/client/src/methods/dialogs/delete-folder.ts
+++ b/packages/client/src/methods/dialogs/delete-folder.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/dialogs/edit-folder.ts b/packages/client/src/methods/dialogs/edit-folder.ts
index 6a56bde5..6741412d 100644
--- a/packages/client/src/methods/dialogs/edit-folder.ts
+++ b/packages/client/src/methods/dialogs/edit-folder.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/dialogs/find-folder.ts b/packages/client/src/methods/dialogs/find-folder.ts
index 64dade44..5ae71b28 100644
--- a/packages/client/src/methods/dialogs/find-folder.ts
+++ b/packages/client/src/methods/dialogs/find-folder.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/dialogs/get-dialogs.ts b/packages/client/src/methods/dialogs/get-dialogs.ts
index 73d63ad8..9f60ae9e 100644
--- a/packages/client/src/methods/dialogs/get-dialogs.ts
+++ b/packages/client/src/methods/dialogs/get-dialogs.ts
@@ -1,7 +1,6 @@
 import Long from 'long'
 
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Dialog } from '../../types'
diff --git a/packages/client/src/methods/dialogs/get-folders.ts b/packages/client/src/methods/dialogs/get-folders.ts
index 6bfa8301..bf41ef59 100644
--- a/packages/client/src/methods/dialogs/get-folders.ts
+++ b/packages/client/src/methods/dialogs/get-folders.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/dialogs/parse-dialogs.ts b/packages/client/src/methods/dialogs/parse-dialogs.ts
index 3cd2e4f0..20f0c9db 100644
--- a/packages/client/src/methods/dialogs/parse-dialogs.ts
+++ b/packages/client/src/methods/dialogs/parse-dialogs.ts
@@ -1,6 +1,5 @@
-import { getMarkedPeerId } from '@mtcute/core'
+import { getMarkedPeerId, tl } from '@mtcute/core'
 import { assertTypeIsNot } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { Dialog, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/files/download-iterable.ts b/packages/client/src/methods/files/download-iterable.ts
index a67b2aad..cf5632ef 100644
--- a/packages/client/src/methods/files/download-iterable.ts
+++ b/packages/client/src/methods/files/download-iterable.ts
@@ -1,7 +1,6 @@
-import { ConnectionKind, MtArgumentError, MtUnsupportedError } from '@mtcute/core'
+import { ConnectionKind, MtArgumentError, MtUnsupportedError, tl } from '@mtcute/core'
 import { ConditionVariable } from '@mtcute/core/utils'
 import { fileIdToInputFileLocation, fileIdToInputWebFileLocation, parseFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { FileDownloadParameters, FileLocation } from '../../types'
diff --git a/packages/client/src/methods/files/normalize-file-to-document.ts b/packages/client/src/methods/files/normalize-file-to-document.ts
index 4f1e7ac7..347b7b3d 100644
--- a/packages/client/src/methods/files/normalize-file-to-document.ts
+++ b/packages/client/src/methods/files/normalize-file-to-document.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputFileLike } from '../../types'
diff --git a/packages/client/src/methods/files/normalize-input-file.ts b/packages/client/src/methods/files/normalize-input-file.ts
index af4c550b..009bdaed 100644
--- a/packages/client/src/methods/files/normalize-input-file.ts
+++ b/packages/client/src/methods/files/normalize-input-file.ts
@@ -1,6 +1,5 @@
-import { MtArgumentError } from '@mtcute/core'
+import { MtArgumentError, tl } from '@mtcute/core'
 import { tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputFileLike, isUploadedFile } from '../../types'
diff --git a/packages/client/src/methods/files/normalize-input-media.ts b/packages/client/src/methods/files/normalize-input-media.ts
index a027e9c5..924fa145 100644
--- a/packages/client/src/methods/files/normalize-input-media.ts
+++ b/packages/client/src/methods/files/normalize-input-media.ts
@@ -1,8 +1,8 @@
 import Long from 'long'
 
+import { tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
 import { fileIdToInputDocument, fileIdToInputPhoto, parseFileId, tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputMediaLike, isUploadedFile, UploadFileLike } from '../../types'
diff --git a/packages/client/src/methods/files/upload-file.ts b/packages/client/src/methods/files/upload-file.ts
index 5d0b182b..7d19fdfc 100644
--- a/packages/client/src/methods/files/upload-file.ts
+++ b/packages/client/src/methods/files/upload-file.ts
@@ -2,9 +2,8 @@ import { fromBuffer as fileTypeFromBuffer } from 'file-type'
 import type { ReadStream } from 'fs'
 import { Readable } from 'stream'
 
-import { MtArgumentError } from '@mtcute/core'
+import { MtArgumentError, tl } from '@mtcute/core'
 import { AsyncLock, randomLong } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { UploadedFile, UploadFileLike } from '../../types'
diff --git a/packages/client/src/methods/files/upload-media.ts b/packages/client/src/methods/files/upload-media.ts
index a4b8a949..fcd8fff7 100644
--- a/packages/client/src/methods/files/upload-media.ts
+++ b/packages/client/src/methods/files/upload-media.ts
@@ -83,5 +83,6 @@ export async function uploadMedia(
             throw new MtArgumentError("This media (story) can't be uploaded")
         default:
             assertNever(normMedia)
+        //          ^?
     }
 }
diff --git a/packages/client/src/methods/invite-links/get-invite-link-members.ts b/packages/client/src/methods/invite-links/get-invite-link-members.ts
index 89d931ec..28ce69c1 100644
--- a/packages/client/src/methods/invite-links/get-invite-link-members.ts
+++ b/packages/client/src/methods/invite-links/get-invite-link-members.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { ChatInviteLinkJoinedMember, InputPeerLike, PeersIndex, User } from '../../types'
diff --git a/packages/client/src/methods/invite-links/get-invite-links.ts b/packages/client/src/methods/invite-links/get-invite-links.ts
index e5ee002d..a78d80f0 100644
--- a/packages/client/src/methods/invite-links/get-invite-links.ts
+++ b/packages/client/src/methods/invite-links/get-invite-links.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { assertTypeIsNot } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { ChatInviteLink, InputPeerLike, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/messages/edit-inline-message.ts b/packages/client/src/methods/messages/edit-inline-message.ts
index 286861f3..eea9ec8c 100644
--- a/packages/client/src/methods/messages/edit-inline-message.ts
+++ b/packages/client/src/methods/messages/edit-inline-message.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { BotKeyboard, FormattedString, InputMediaLike, ReplyMarkup } from '../../types'
diff --git a/packages/client/src/methods/messages/edit-message.ts b/packages/client/src/methods/messages/edit-message.ts
index c5925d64..bfeebdfb 100644
--- a/packages/client/src/methods/messages/edit-message.ts
+++ b/packages/client/src/methods/messages/edit-message.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { BotKeyboard, FormattedString, InputMediaLike, InputPeerLike, Message, ReplyMarkup } from '../../types'
diff --git a/packages/client/src/methods/messages/find-in-update.ts b/packages/client/src/methods/messages/find-in-update.ts
index aa45def3..f379425d 100644
--- a/packages/client/src/methods/messages/find-in-update.ts
+++ b/packages/client/src/methods/messages/find-in-update.ts
@@ -1,5 +1,4 @@
-import { MtTypeAssertionError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtTypeAssertionError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Message, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/messages/forward-messages.ts b/packages/client/src/methods/messages/forward-messages.ts
index edc02394..4bf11c55 100644
--- a/packages/client/src/methods/messages/forward-messages.ts
+++ b/packages/client/src/methods/messages/forward-messages.ts
@@ -1,6 +1,5 @@
-import { MaybeArray, MtArgumentError } from '@mtcute/core'
+import { MaybeArray, MtArgumentError, tl } from '@mtcute/core'
 import { randomLong } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { FormattedString, InputMediaLike, InputPeerLike, Message, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/messages/get-discussion-message.ts b/packages/client/src/methods/messages/get-discussion-message.ts
index 090598a0..1da503b8 100644
--- a/packages/client/src/methods/messages/get-discussion-message.ts
+++ b/packages/client/src/methods/messages/get-discussion-message.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, Message, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/messages/get-messages-unsafe.ts b/packages/client/src/methods/messages/get-messages-unsafe.ts
index 8307d013..45cab3db 100644
--- a/packages/client/src/methods/messages/get-messages-unsafe.ts
+++ b/packages/client/src/methods/messages/get-messages-unsafe.ts
@@ -1,6 +1,5 @@
-import { MaybeArray } from '@mtcute/core'
+import { MaybeArray, tl } from '@mtcute/core'
 import { assertTypeIsNot } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { Message, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/messages/get-messages.ts b/packages/client/src/methods/messages/get-messages.ts
index a6c4cda5..66dec1a1 100644
--- a/packages/client/src/methods/messages/get-messages.ts
+++ b/packages/client/src/methods/messages/get-messages.ts
@@ -1,6 +1,5 @@
-import { MaybeArray } from '@mtcute/core'
+import { MaybeArray, tl } from '@mtcute/core'
 import { assertTypeIsNot } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, Message, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/messages/get-reaction-users.ts b/packages/client/src/methods/messages/get-reaction-users.ts
index 4b2c26c2..e7c5c328 100644
--- a/packages/client/src/methods/messages/get-reaction-users.ts
+++ b/packages/client/src/methods/messages/get-reaction-users.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, PeerReaction, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/messages/parse-entities.ts b/packages/client/src/methods/messages/parse-entities.ts
index e493ebc0..b58c267d 100644
--- a/packages/client/src/methods/messages/parse-entities.ts
+++ b/packages/client/src/methods/messages/parse-entities.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { FormattedString } from '../../types'
diff --git a/packages/client/src/methods/messages/search-global.ts b/packages/client/src/methods/messages/search-global.ts
index a40dc294..92dfe777 100644
--- a/packages/client/src/methods/messages/search-global.ts
+++ b/packages/client/src/methods/messages/search-global.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { assertTypeIsNot } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { Message, PeersIndex, SearchFilters } from '../../types'
diff --git a/packages/client/src/methods/messages/search-messages.ts b/packages/client/src/methods/messages/search-messages.ts
index 5ee1bd1b..f20bdc63 100644
--- a/packages/client/src/methods/messages/search-messages.ts
+++ b/packages/client/src/methods/messages/search-messages.ts
@@ -1,7 +1,7 @@
 import Long from 'long'
 
+import { tl } from '@mtcute/core'
 import { assertTypeIsNot } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, Message, PeersIndex, SearchFilters } from '../../types'
diff --git a/packages/client/src/methods/messages/send-copy.ts b/packages/client/src/methods/messages/send-copy.ts
index b1d5603b..096a854f 100644
--- a/packages/client/src/methods/messages/send-copy.ts
+++ b/packages/client/src/methods/messages/send-copy.ts
@@ -1,5 +1,4 @@
-import { getMarkedPeerId } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { getMarkedPeerId, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { FormattedString, InputPeerLike, Message, MtMessageNotFoundError, ReplyMarkup } from '../../types'
diff --git a/packages/client/src/methods/messages/send-media-group.ts b/packages/client/src/methods/messages/send-media-group.ts
index 8415cbfa..90fec4b8 100644
--- a/packages/client/src/methods/messages/send-media-group.ts
+++ b/packages/client/src/methods/messages/send-media-group.ts
@@ -1,6 +1,5 @@
-import { getMarkedPeerId, MtArgumentError } from '@mtcute/core'
+import { getMarkedPeerId, MtArgumentError, tl } from '@mtcute/core'
 import { randomLong } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputMediaLike, InputPeerLike, Message, MtMessageNotFoundError, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/messages/send-media.ts b/packages/client/src/methods/messages/send-media.ts
index ee120d16..cf1a08ac 100644
--- a/packages/client/src/methods/messages/send-media.ts
+++ b/packages/client/src/methods/messages/send-media.ts
@@ -1,6 +1,5 @@
-import { getMarkedPeerId, MtArgumentError } from '@mtcute/core'
+import { getMarkedPeerId, MtArgumentError, tl } from '@mtcute/core'
 import { randomLong } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import {
diff --git a/packages/client/src/methods/messages/send-reaction.ts b/packages/client/src/methods/messages/send-reaction.ts
index 3887c71f..840ed88a 100644
--- a/packages/client/src/methods/messages/send-reaction.ts
+++ b/packages/client/src/methods/messages/send-reaction.ts
@@ -1,7 +1,6 @@
 import Long from 'long'
 
-import { MtTypeAssertionError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtTypeAssertionError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, Message, PeersIndex } from '../../types'
diff --git a/packages/client/src/methods/messages/send-text.ts b/packages/client/src/methods/messages/send-text.ts
index e48c3993..eb3a05fb 100644
--- a/packages/client/src/methods/messages/send-text.ts
+++ b/packages/client/src/methods/messages/send-text.ts
@@ -1,6 +1,5 @@
-import { getMarkedPeerId, MtArgumentError, MtTypeAssertionError } from '@mtcute/core'
+import { getMarkedPeerId, MtArgumentError, MtTypeAssertionError, tl } from '@mtcute/core'
 import { randomLong } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import {
diff --git a/packages/client/src/methods/messages/send-typing.ts b/packages/client/src/methods/messages/send-typing.ts
index 499248e1..8abc2a59 100644
--- a/packages/client/src/methods/messages/send-typing.ts
+++ b/packages/client/src/methods/messages/send-typing.ts
@@ -1,5 +1,4 @@
-import { assertNever } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { assertNever, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, TypingStatus } from '../../types'
diff --git a/packages/client/src/methods/misc/init-takeout-session.ts b/packages/client/src/methods/misc/init-takeout-session.ts
index 6a8dbf7a..7ac340e2 100644
--- a/packages/client/src/methods/misc/init-takeout-session.ts
+++ b/packages/client/src/methods/misc/init-takeout-session.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { TakeoutSession } from '../../types'
diff --git a/packages/client/src/methods/stickers/add-sticker-to-set.ts b/packages/client/src/methods/stickers/add-sticker-to-set.ts
index b7561aab..8d37f2aa 100644
--- a/packages/client/src/methods/stickers/add-sticker-to-set.ts
+++ b/packages/client/src/methods/stickers/add-sticker-to-set.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputStickerSetItem, StickerSet } from '../../types'
diff --git a/packages/client/src/methods/stickers/create-sticker-set.ts b/packages/client/src/methods/stickers/create-sticker-set.ts
index b654ab97..d08a0744 100644
--- a/packages/client/src/methods/stickers/create-sticker-set.ts
+++ b/packages/client/src/methods/stickers/create-sticker-set.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import {
diff --git a/packages/client/src/methods/stickers/delete-sticker-from-set.ts b/packages/client/src/methods/stickers/delete-sticker-from-set.ts
index 7c92efc9..3a6c2e49 100644
--- a/packages/client/src/methods/stickers/delete-sticker-from-set.ts
+++ b/packages/client/src/methods/stickers/delete-sticker-from-set.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { fileIdToInputDocument, tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { StickerSet } from '../../types'
diff --git a/packages/client/src/methods/stickers/get-custom-emojis.ts b/packages/client/src/methods/stickers/get-custom-emojis.ts
index 2d6bb84c..a87354d8 100644
--- a/packages/client/src/methods/stickers/get-custom-emojis.ts
+++ b/packages/client/src/methods/stickers/get-custom-emojis.ts
@@ -1,6 +1,5 @@
-import { MtTypeAssertionError } from '@mtcute/core'
+import { MtTypeAssertionError, tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { Sticker } from '../../types'
diff --git a/packages/client/src/methods/stickers/get-sticker-set.ts b/packages/client/src/methods/stickers/get-sticker-set.ts
index 3861dc34..6b565b48 100644
--- a/packages/client/src/methods/stickers/get-sticker-set.ts
+++ b/packages/client/src/methods/stickers/get-sticker-set.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { StickerSet } from '../../types'
diff --git a/packages/client/src/methods/stickers/move-sticker-in-set.ts b/packages/client/src/methods/stickers/move-sticker-in-set.ts
index 393cef13..97e47e14 100644
--- a/packages/client/src/methods/stickers/move-sticker-in-set.ts
+++ b/packages/client/src/methods/stickers/move-sticker-in-set.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { fileIdToInputDocument, tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { StickerSet } from '../../types'
diff --git a/packages/client/src/methods/stickers/set-sticker-set-thumb.ts b/packages/client/src/methods/stickers/set-sticker-set-thumb.ts
index a254bbc5..c9b89803 100644
--- a/packages/client/src/methods/stickers/set-sticker-set-thumb.ts
+++ b/packages/client/src/methods/stickers/set-sticker-set-thumb.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputFileLike, StickerSet } from '../../types'
diff --git a/packages/client/src/methods/updates.ts b/packages/client/src/methods/updates.ts
index a1cfbc4b..719edc95 100644
--- a/packages/client/src/methods/updates.ts
+++ b/packages/client/src/methods/updates.ts
@@ -1,5 +1,5 @@
 /* eslint-disable max-depth */
-import { assertNever, MtArgumentError } from '@mtcute/core'
+import { assertNever, MtArgumentError, tl } from '@mtcute/core'
 import {
     AsyncLock,
     ConditionVariable,
@@ -11,7 +11,6 @@ import {
     SortedLinkedList,
     toggleChannelIdMark,
 } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../client'
 import { PeersIndex } from '../types'
diff --git a/packages/client/src/methods/users/delete-profile-photos.ts b/packages/client/src/methods/users/delete-profile-photos.ts
index dcf1d124..0f942172 100644
--- a/packages/client/src/methods/users/delete-profile-photos.ts
+++ b/packages/client/src/methods/users/delete-profile-photos.ts
@@ -1,6 +1,5 @@
-import { MaybeArray } from '@mtcute/core'
+import { MaybeArray, tl } from '@mtcute/core'
 import { fileIdToInputPhoto } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 
diff --git a/packages/client/src/methods/users/get-profile-photos.ts b/packages/client/src/methods/users/get-profile-photos.ts
index 3250ff8b..4aa8b0b5 100644
--- a/packages/client/src/methods/users/get-profile-photos.ts
+++ b/packages/client/src/methods/users/get-profile-photos.ts
@@ -1,6 +1,6 @@
 import Long from 'long'
 
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, Photo } from '../../types'
diff --git a/packages/client/src/methods/users/iter-profile-photos.ts b/packages/client/src/methods/users/iter-profile-photos.ts
index 42653bcd..c5c37847 100644
--- a/packages/client/src/methods/users/iter-profile-photos.ts
+++ b/packages/client/src/methods/users/iter-profile-photos.ts
@@ -1,6 +1,6 @@
 import Long from 'long'
 
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, Photo } from '../../types'
diff --git a/packages/client/src/methods/users/resolve-peer-many.ts b/packages/client/src/methods/users/resolve-peer-many.ts
index c535a6a7..396d8d95 100644
--- a/packages/client/src/methods/users/resolve-peer-many.ts
+++ b/packages/client/src/methods/users/resolve-peer-many.ts
@@ -1,6 +1,6 @@
 import { asyncPool } from 'eager-async-pool'
 
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike } from '../../types'
diff --git a/packages/client/src/methods/users/resolve-peer.ts b/packages/client/src/methods/users/resolve-peer.ts
index aaa5b7b1..4c9bbd2e 100644
--- a/packages/client/src/methods/users/resolve-peer.ts
+++ b/packages/client/src/methods/users/resolve-peer.ts
@@ -1,8 +1,7 @@
 import Long from 'long'
 
-import { getBasicPeerType, getMarkedPeerId, MtTypeAssertionError, toggleChannelIdMark } from '@mtcute/core'
+import { getBasicPeerType, getMarkedPeerId, MtTypeAssertionError, tl, toggleChannelIdMark } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputPeerLike, MtPeerNotFoundError } from '../../types'
diff --git a/packages/client/src/methods/users/set-profile-photo.ts b/packages/client/src/methods/users/set-profile-photo.ts
index 11933c5b..6a853c59 100644
--- a/packages/client/src/methods/users/set-profile-photo.ts
+++ b/packages/client/src/methods/users/set-profile-photo.ts
@@ -1,6 +1,5 @@
-import { MtArgumentError } from '@mtcute/core'
+import { MtArgumentError, tl } from '@mtcute/core'
 import { fileIdToInputPhoto, tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputFileLike, Photo } from '../../types'
diff --git a/packages/client/src/types/auth/sent-code.ts b/packages/client/src/types/auth/sent-code.ts
index 0ef84b28..f64d714b 100644
--- a/packages/client/src/types/auth/sent-code.ts
+++ b/packages/client/src/types/auth/sent-code.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { makeInspectable } from '../utils'
 
diff --git a/packages/client/src/types/auth/terms-of-service.ts b/packages/client/src/types/auth/terms-of-service.ts
index ab89f76a..3355a4a5 100644
--- a/packages/client/src/types/auth/terms-of-service.ts
+++ b/packages/client/src/types/auth/terms-of-service.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { MessageEntity } from '../messages'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/bots/callback-query.ts b/packages/client/src/types/bots/callback-query.ts
index 183a0dff..4ee4d33f 100644
--- a/packages/client/src/types/bots/callback-query.ts
+++ b/packages/client/src/types/bots/callback-query.ts
@@ -1,5 +1,4 @@
-import { BasicPeerType, getBasicPeerType, getMarkedPeerId, MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { BasicPeerType, getBasicPeerType, getMarkedPeerId, MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { encodeInlineMessageId } from '../../utils/inline-utils'
diff --git a/packages/client/src/types/bots/command-scope.ts b/packages/client/src/types/bots/command-scope.ts
index f21ac527..ffda9b83 100644
--- a/packages/client/src/types/bots/command-scope.ts
+++ b/packages/client/src/types/bots/command-scope.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { InputPeerLike } from '../peers'
 
diff --git a/packages/client/src/types/bots/game-high-score.ts b/packages/client/src/types/bots/game-high-score.ts
index f7dc574b..b511913d 100644
--- a/packages/client/src/types/bots/game-high-score.ts
+++ b/packages/client/src/types/bots/game-high-score.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { PeersIndex, User } from '../peers'
diff --git a/packages/client/src/types/bots/inline-query.ts b/packages/client/src/types/bots/inline-query.ts
index 9189c20e..2a4ef2b6 100644
--- a/packages/client/src/types/bots/inline-query.ts
+++ b/packages/client/src/types/bots/inline-query.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Location } from '../media'
diff --git a/packages/client/src/types/bots/input/input-inline-message.ts b/packages/client/src/types/bots/input/input-inline-message.ts
index b2d24179..55e96ab9 100644
--- a/packages/client/src/types/bots/input/input-inline-message.ts
+++ b/packages/client/src/types/bots/input/input-inline-message.ts
@@ -1,5 +1,4 @@
-import { assertNever } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { assertNever, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../../client'
 import { InputMediaContact, InputMediaGeo, InputMediaGeoLive, InputMediaVenue } from '../../media'
diff --git a/packages/client/src/types/bots/input/input-inline-result.ts b/packages/client/src/types/bots/input/input-inline-result.ts
index e290623e..63c5ec04 100644
--- a/packages/client/src/types/bots/input/input-inline-result.ts
+++ b/packages/client/src/types/bots/input/input-inline-result.ts
@@ -1,6 +1,5 @@
-import { MtArgumentError } from '@mtcute/core'
+import { MtArgumentError, tl } from '@mtcute/core'
 import { fileIdToInputDocument, fileIdToInputPhoto } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../../client'
 import { extractFileName } from '../../../utils/file-utils'
diff --git a/packages/client/src/types/bots/keyboard-builder.ts b/packages/client/src/types/bots/keyboard-builder.ts
index cb4de42d..af792734 100644
--- a/packages/client/src/types/bots/keyboard-builder.ts
+++ b/packages/client/src/types/bots/keyboard-builder.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import type { InlineKeyboardMarkup, ReplyKeyboardMarkup } from './keyboards'
 
diff --git a/packages/client/src/types/bots/keyboards.ts b/packages/client/src/types/bots/keyboards.ts
index b433cc69..85d8df3a 100644
--- a/packages/client/src/types/bots/keyboards.ts
+++ b/packages/client/src/types/bots/keyboards.ts
@@ -1,5 +1,4 @@
-import { assertNever } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { assertNever, tl } from '@mtcute/core'
 
 import { normalizeToInputUser } from '../../utils/peer-utils'
 import { BotKeyboardBuilder } from './keyboard-builder'
diff --git a/packages/client/src/types/calls/discard-reason.ts b/packages/client/src/types/calls/discard-reason.ts
index ad1eea98..83dc9a66 100644
--- a/packages/client/src/types/calls/discard-reason.ts
+++ b/packages/client/src/types/calls/discard-reason.ts
@@ -1,3 +1,5 @@
+import { assertNever, tl } from '@mtcute/core'
+
 /**
  * Phone call discard reason. Can be:
  *  - `missed`: The call was missed
@@ -5,9 +7,6 @@
  *  - `hangup`: The call was ended normally
  *  - `busy`: The call was discarded because the user is in another call
  */
-import { assertNever } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
-
 export type CallDiscardReason = 'missed' | 'disconnect' | 'hangup' | 'busy'
 
 /** @internal */
diff --git a/packages/client/src/types/conversation.ts b/packages/client/src/types/conversation.ts
index 626d689c..7654881b 100644
--- a/packages/client/src/types/conversation.ts
+++ b/packages/client/src/types/conversation.ts
@@ -1,7 +1,6 @@
 /* eslint-disable dot-notation */
-import { getMarkedPeerId, MaybeAsync, MtArgumentError, MtTimeoutError } from '@mtcute/core'
+import { getMarkedPeerId, MaybeAsync, MtArgumentError, MtTimeoutError, tl } from '@mtcute/core'
 import { AsyncLock, ControllablePromise, createControllablePromise, Deque } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../client'
 import { InputMediaLike } from './media'
diff --git a/packages/client/src/types/files/file-location.ts b/packages/client/src/types/files/file-location.ts
index 7b612e67..77591615 100644
--- a/packages/client/src/types/files/file-location.ts
+++ b/packages/client/src/types/files/file-location.ts
@@ -1,6 +1,6 @@
 import { Readable } from 'stream'
 
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/files/uploaded-file.ts b/packages/client/src/types/files/uploaded-file.ts
index 3e10a053..a8118cb2 100644
--- a/packages/client/src/types/files/uploaded-file.ts
+++ b/packages/client/src/types/files/uploaded-file.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 /**
  * Describes a file uploaded to the Telegram servers
diff --git a/packages/client/src/types/files/utils.ts b/packages/client/src/types/files/utils.ts
index 304175ea..3d4697de 100644
--- a/packages/client/src/types/files/utils.ts
+++ b/packages/client/src/types/files/utils.ts
@@ -1,8 +1,8 @@
 import type { ReadStream } from 'fs'
 import type { Readable } from 'stream'
 
+import { tl } from '@mtcute/core'
 import { tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { FileLocation } from './file-location'
 import { UploadedFile } from './uploaded-file'
diff --git a/packages/client/src/types/files/web-document.ts b/packages/client/src/types/files/web-document.ts
index ca798879..94b97d5c 100644
--- a/packages/client/src/types/files/web-document.ts
+++ b/packages/client/src/types/files/web-document.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/media/audio.ts b/packages/client/src/types/media/audio.ts
index 377a482b..afd13424 100644
--- a/packages/client/src/types/media/audio.ts
+++ b/packages/client/src/types/media/audio.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/media/contact.ts b/packages/client/src/types/media/contact.ts
index 98377c53..48737ca0 100644
--- a/packages/client/src/types/media/contact.ts
+++ b/packages/client/src/types/media/contact.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { makeInspectable } from '../utils'
 
diff --git a/packages/client/src/types/media/dice.ts b/packages/client/src/types/media/dice.ts
index f9c8c146..3e6cb6c6 100644
--- a/packages/client/src/types/media/dice.ts
+++ b/packages/client/src/types/media/dice.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { makeInspectable } from '../utils'
 
diff --git a/packages/client/src/types/media/document-utils.ts b/packages/client/src/types/media/document-utils.ts
index 5b22a666..2ff16fc5 100644
--- a/packages/client/src/types/media/document-utils.ts
+++ b/packages/client/src/types/media/document-utils.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Audio } from './audio'
diff --git a/packages/client/src/types/media/document.ts b/packages/client/src/types/media/document.ts
index c1ec6378..52897e04 100644
--- a/packages/client/src/types/media/document.ts
+++ b/packages/client/src/types/media/document.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { tdFileId as td, toFileId, toUniqueFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { FileLocation } from '../files'
diff --git a/packages/client/src/types/media/game.ts b/packages/client/src/types/media/game.ts
index 64db1ef8..e321eac6 100644
--- a/packages/client/src/types/media/game.ts
+++ b/packages/client/src/types/media/game.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/media/input-media.ts b/packages/client/src/types/media/input-media.ts
index a06bf512..c7926f5b 100644
--- a/packages/client/src/types/media/input-media.ts
+++ b/packages/client/src/types/media/input-media.ts
@@ -1,5 +1,4 @@
-import { MaybeArray } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MaybeArray, tl } from '@mtcute/core'
 
 import { InputFileLike } from '../files'
 import { FormattedString } from '../parser'
diff --git a/packages/client/src/types/media/invoice.ts b/packages/client/src/types/media/invoice.ts
index 055528d2..198094c5 100644
--- a/packages/client/src/types/media/invoice.ts
+++ b/packages/client/src/types/media/invoice.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { WebDocument } from '../files/web-document'
diff --git a/packages/client/src/types/media/location.ts b/packages/client/src/types/media/location.ts
index bc9dabe4..81ed528f 100644
--- a/packages/client/src/types/media/location.ts
+++ b/packages/client/src/types/media/location.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { FileLocation } from '../files'
diff --git a/packages/client/src/types/media/photo.ts b/packages/client/src/types/media/photo.ts
index 73980eed..472850d5 100644
--- a/packages/client/src/types/media/photo.ts
+++ b/packages/client/src/types/media/photo.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { FileLocation } from '../files'
diff --git a/packages/client/src/types/media/poll.ts b/packages/client/src/types/media/poll.ts
index 1cb012b9..ae5a4d80 100644
--- a/packages/client/src/types/media/poll.ts
+++ b/packages/client/src/types/media/poll.ts
@@ -1,6 +1,6 @@
 import Long from 'long'
 
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { MessageEntity } from '../messages'
diff --git a/packages/client/src/types/media/sticker.ts b/packages/client/src/types/media/sticker.ts
index 0dcf1764..9e25f814 100644
--- a/packages/client/src/types/media/sticker.ts
+++ b/packages/client/src/types/media/sticker.ts
@@ -1,6 +1,5 @@
-import { MtArgumentError } from '@mtcute/core'
+import { MtArgumentError, tl } from '@mtcute/core'
 import { tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { StickerSet } from '../misc'
diff --git a/packages/client/src/types/media/thumbnail.ts b/packages/client/src/types/media/thumbnail.ts
index c9c31722..5dc21921 100644
--- a/packages/client/src/types/media/thumbnail.ts
+++ b/packages/client/src/types/media/thumbnail.ts
@@ -1,9 +1,8 @@
 import Long from 'long'
 
-import { MtArgumentError, MtTypeAssertionError } from '@mtcute/core'
+import { MtArgumentError, MtTypeAssertionError, tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
 import { tdFileId as td, toFileId, toUniqueFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { inflateSvgPath, strippedPhotoToJpg, svgPathToFile } from '../../utils/file-utils'
diff --git a/packages/client/src/types/media/venue.ts b/packages/client/src/types/media/venue.ts
index 5759d02a..cb92f47e 100644
--- a/packages/client/src/types/media/venue.ts
+++ b/packages/client/src/types/media/venue.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/media/video.ts b/packages/client/src/types/media/video.ts
index 26829de8..2252a10d 100644
--- a/packages/client/src/types/media/video.ts
+++ b/packages/client/src/types/media/video.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/media/voice.ts b/packages/client/src/types/media/voice.ts
index 82040108..2ff6e7ab 100644
--- a/packages/client/src/types/media/voice.ts
+++ b/packages/client/src/types/media/voice.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { tdFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { decodeWaveform } from '../../utils/voice-utils'
diff --git a/packages/client/src/types/media/web-page.ts b/packages/client/src/types/media/web-page.ts
index 2e609348..d9499283 100644
--- a/packages/client/src/types/media/web-page.ts
+++ b/packages/client/src/types/media/web-page.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/messages/dialog.ts b/packages/client/src/types/messages/dialog.ts
index dce60760..b2f952b7 100644
--- a/packages/client/src/types/messages/dialog.ts
+++ b/packages/client/src/types/messages/dialog.ts
@@ -1,5 +1,4 @@
-import { getMarkedPeerId } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { getMarkedPeerId, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { MtMessageNotFoundError } from '../errors'
diff --git a/packages/client/src/types/messages/draft-message.ts b/packages/client/src/types/messages/draft-message.ts
index d06c03ef..c86f5ca0 100644
--- a/packages/client/src/types/messages/draft-message.ts
+++ b/packages/client/src/types/messages/draft-message.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputMediaLike } from '../media'
diff --git a/packages/client/src/types/messages/message-action.ts b/packages/client/src/types/messages/message-action.ts
index e6c365f0..f98afa83 100644
--- a/packages/client/src/types/messages/message-action.ts
+++ b/packages/client/src/types/messages/message-action.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { _callDiscardReasonFromTl, CallDiscardReason } from '../calls'
 import { Photo } from '../media'
diff --git a/packages/client/src/types/messages/message-entity.ts b/packages/client/src/types/messages/message-entity.ts
index 7957914b..3fcb7587 100644
--- a/packages/client/src/types/messages/message-entity.ts
+++ b/packages/client/src/types/messages/message-entity.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { makeInspectable } from '../utils'
 
diff --git a/packages/client/src/types/messages/message-media.ts b/packages/client/src/types/messages/message-media.ts
index effc3ad0..a1acc7b9 100644
--- a/packages/client/src/types/messages/message-media.ts
+++ b/packages/client/src/types/messages/message-media.ts
@@ -1,5 +1,4 @@
-import { MtTypeAssertionError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtTypeAssertionError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import {
diff --git a/packages/client/src/types/messages/message.ts b/packages/client/src/types/messages/message.ts
index 9cebb6fd..63bee8d4 100644
--- a/packages/client/src/types/messages/message.ts
+++ b/packages/client/src/types/messages/message.ts
@@ -1,6 +1,12 @@
-import { assertNever, getMarkedPeerId, MtArgumentError, MtTypeAssertionError, toggleChannelIdMark } from '@mtcute/core'
+import {
+    assertNever,
+    getMarkedPeerId,
+    MtArgumentError,
+    MtTypeAssertionError,
+    tl,
+    toggleChannelIdMark,
+} from '@mtcute/core'
 import { assertTypeIsNot } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { BotKeyboard, ReplyMarkup } from '../bots'
diff --git a/packages/client/src/types/messages/reactions.ts b/packages/client/src/types/messages/reactions.ts
index c80c91bb..d64291c7 100644
--- a/packages/client/src/types/messages/reactions.ts
+++ b/packages/client/src/types/messages/reactions.ts
@@ -1,6 +1,5 @@
-import { getMarkedPeerId } from '@mtcute/core'
+import { getMarkedPeerId, tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { PeersIndex, User } from '../peers'
diff --git a/packages/client/src/types/misc/sticker-set.ts b/packages/client/src/types/misc/sticker-set.ts
index 606b1c00..4976d231 100644
--- a/packages/client/src/types/misc/sticker-set.ts
+++ b/packages/client/src/types/misc/sticker-set.ts
@@ -1,6 +1,5 @@
-import { MtTypeAssertionError } from '@mtcute/core'
+import { MtTypeAssertionError, tl } from '@mtcute/core'
 import { LongMap } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { MtEmptyError } from '../errors'
diff --git a/packages/client/src/types/misc/takeout-session.ts b/packages/client/src/types/misc/takeout-session.ts
index 5a672326..63ec6b6d 100644
--- a/packages/client/src/types/misc/takeout-session.ts
+++ b/packages/client/src/types/misc/takeout-session.ts
@@ -1,5 +1,4 @@
-import { MustEqual, RpcCallOptions } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MustEqual, RpcCallOptions, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/parser.ts b/packages/client/src/types/parser.ts
index f29a90c1..3bc68b95 100644
--- a/packages/client/src/types/parser.ts
+++ b/packages/client/src/types/parser.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { MessageEntity } from '../types'
 
diff --git a/packages/client/src/types/peers/chat-event.ts b/packages/client/src/types/peers/chat-event.ts
index 262d5a71..5b4d8e87 100644
--- a/packages/client/src/types/peers/chat-event.ts
+++ b/packages/client/src/types/peers/chat-event.ts
@@ -1,5 +1,4 @@
-import { toggleChannelIdMark } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { tl, toggleChannelIdMark } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Photo } from '../media'
diff --git a/packages/client/src/types/peers/chat-invite-link.ts b/packages/client/src/types/peers/chat-invite-link.ts
index b8d58284..96e4ece6 100644
--- a/packages/client/src/types/peers/chat-invite-link.ts
+++ b/packages/client/src/types/peers/chat-invite-link.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { assertTypeIsNot } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/peers/chat-location.ts b/packages/client/src/types/peers/chat-location.ts
index ec788a7f..2289716e 100644
--- a/packages/client/src/types/peers/chat-location.ts
+++ b/packages/client/src/types/peers/chat-location.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Location } from '../media'
diff --git a/packages/client/src/types/peers/chat-member.ts b/packages/client/src/types/peers/chat-member.ts
index 2b82a0d4..55544e65 100644
--- a/packages/client/src/types/peers/chat-member.ts
+++ b/packages/client/src/types/peers/chat-member.ts
@@ -1,5 +1,5 @@
+import { tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/peers/chat-permissions.ts b/packages/client/src/types/peers/chat-permissions.ts
index 4d09349d..9261b99b 100644
--- a/packages/client/src/types/peers/chat-permissions.ts
+++ b/packages/client/src/types/peers/chat-permissions.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { makeInspectable } from '../utils'
 
diff --git a/packages/client/src/types/peers/chat-photo.ts b/packages/client/src/types/peers/chat-photo.ts
index 3e0a248e..3f5cc306 100644
--- a/packages/client/src/types/peers/chat-photo.ts
+++ b/packages/client/src/types/peers/chat-photo.ts
@@ -1,8 +1,7 @@
 import Long from 'long'
 
-import { MtArgumentError, toggleChannelIdMark } from '@mtcute/core'
+import { MtArgumentError, tl, toggleChannelIdMark } from '@mtcute/core'
 import { tdFileId, toFileId, toUniqueFileId } from '@mtcute/file-id'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { strippedPhotoToJpg } from '../../utils/file-utils'
diff --git a/packages/client/src/types/peers/chat-preview.ts b/packages/client/src/types/peers/chat-preview.ts
index 0f91fe81..4df993bd 100644
--- a/packages/client/src/types/peers/chat-preview.ts
+++ b/packages/client/src/types/peers/chat-preview.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Photo } from '../media'
diff --git a/packages/client/src/types/peers/chat.ts b/packages/client/src/types/peers/chat.ts
index 6c3856f8..d37c0ad4 100644
--- a/packages/client/src/types/peers/chat.ts
+++ b/packages/client/src/types/peers/chat.ts
@@ -1,5 +1,4 @@
-import { getMarkedPeerId, MaybeArray, MtArgumentError, MtTypeAssertionError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { getMarkedPeerId, MaybeArray, MtArgumentError, MtTypeAssertionError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { InputMediaLike } from '../media'
diff --git a/packages/client/src/types/peers/index.ts b/packages/client/src/types/peers/index.ts
index 880c63e0..2ca986a6 100644
--- a/packages/client/src/types/peers/index.ts
+++ b/packages/client/src/types/peers/index.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 export * from './chat'
 export * from './chat-event'
diff --git a/packages/client/src/types/peers/peers-index.ts b/packages/client/src/types/peers/peers-index.ts
index 086364cd..a6980a18 100644
--- a/packages/client/src/types/peers/peers-index.ts
+++ b/packages/client/src/types/peers/peers-index.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 const ERROR_MSG = 'Given peer is not available in this index. This is most likely an internal library error.'
 
diff --git a/packages/client/src/types/peers/user.ts b/packages/client/src/types/peers/user.ts
index 47abfe02..b0037cae 100644
--- a/packages/client/src/types/peers/user.ts
+++ b/packages/client/src/types/peers/user.ts
@@ -1,6 +1,5 @@
-import { MtArgumentError } from '@mtcute/core'
+import { MtArgumentError, tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { InputMediaLike } from '../media'
diff --git a/packages/client/src/types/updates/bot-chat-join-request.ts b/packages/client/src/types/updates/bot-chat-join-request.ts
index 2710cc4a..486462b1 100644
--- a/packages/client/src/types/updates/bot-chat-join-request.ts
+++ b/packages/client/src/types/updates/bot-chat-join-request.ts
@@ -1,5 +1,4 @@
-import { getBarePeerId, getMarkedPeerId } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { getBarePeerId, getMarkedPeerId, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Chat, ChatInviteLink, PeersIndex, User } from '../peers'
diff --git a/packages/client/src/types/updates/bot-stopped.ts b/packages/client/src/types/updates/bot-stopped.ts
index ad0917a7..e248029b 100644
--- a/packages/client/src/types/updates/bot-stopped.ts
+++ b/packages/client/src/types/updates/bot-stopped.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { PeersIndex, User } from '../peers'
diff --git a/packages/client/src/types/updates/chat-join-request.ts b/packages/client/src/types/updates/chat-join-request.ts
index 86a4098f..0a47b7e0 100644
--- a/packages/client/src/types/updates/chat-join-request.ts
+++ b/packages/client/src/types/updates/chat-join-request.ts
@@ -1,5 +1,4 @@
-import { getBarePeerId } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { getBarePeerId, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { ChatInviteLinkJoinedMember, PeersIndex, User } from '../peers'
diff --git a/packages/client/src/types/updates/chat-member-update.ts b/packages/client/src/types/updates/chat-member-update.ts
index aba9714e..f0425de4 100644
--- a/packages/client/src/types/updates/chat-member-update.ts
+++ b/packages/client/src/types/updates/chat-member-update.ts
@@ -1,7 +1,6 @@
 // ^^ will be looked into in MTQ-35
 
-import { getMarkedPeerId } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { getMarkedPeerId, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { Chat, ChatInviteLink, ChatMember, PeersIndex, User } from '../'
diff --git a/packages/client/src/types/updates/chosen-inline-result.ts b/packages/client/src/types/updates/chosen-inline-result.ts
index e6725a06..273257e5 100644
--- a/packages/client/src/types/updates/chosen-inline-result.ts
+++ b/packages/client/src/types/updates/chosen-inline-result.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { encodeInlineMessageId } from '../../utils/inline-utils'
diff --git a/packages/client/src/types/updates/delete-message-update.ts b/packages/client/src/types/updates/delete-message-update.ts
index e1c5fc66..3db58c02 100644
--- a/packages/client/src/types/updates/delete-message-update.ts
+++ b/packages/client/src/types/updates/delete-message-update.ts
@@ -1,5 +1,4 @@
-import { toggleChannelIdMark } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { tl, toggleChannelIdMark } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/updates/history-read-update.ts b/packages/client/src/types/updates/history-read-update.ts
index f7078430..593f2523 100644
--- a/packages/client/src/types/updates/history-read-update.ts
+++ b/packages/client/src/types/updates/history-read-update.ts
@@ -1,5 +1,4 @@
-import { getMarkedPeerId, toggleChannelIdMark } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { getMarkedPeerId, tl, toggleChannelIdMark } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { makeInspectable } from '../utils'
diff --git a/packages/client/src/types/updates/parse-update.ts b/packages/client/src/types/updates/parse-update.ts
index 387f13e5..7a809110 100644
--- a/packages/client/src/types/updates/parse-update.ts
+++ b/packages/client/src/types/updates/parse-update.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-argument */
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import {
diff --git a/packages/client/src/types/updates/poll-update.ts b/packages/client/src/types/updates/poll-update.ts
index 0d3cda95..f71585f3 100644
--- a/packages/client/src/types/updates/poll-update.ts
+++ b/packages/client/src/types/updates/poll-update.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { PeersIndex, Poll } from '../'
diff --git a/packages/client/src/types/updates/poll-vote.ts b/packages/client/src/types/updates/poll-vote.ts
index 6e4ae97d..ad7e62dd 100644
--- a/packages/client/src/types/updates/poll-vote.ts
+++ b/packages/client/src/types/updates/poll-vote.ts
@@ -1,6 +1,5 @@
-import { MtUnsupportedError } from '@mtcute/core'
+import { MtUnsupportedError, tl } from '@mtcute/core'
 import { assertTypeIs } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 import { TelegramClient } from '../../client'
 import { Chat, PeersIndex, User } from '../'
diff --git a/packages/client/src/types/updates/pre-checkout-query.ts b/packages/client/src/types/updates/pre-checkout-query.ts
index f60e4de8..64ae223f 100644
--- a/packages/client/src/types/updates/pre-checkout-query.ts
+++ b/packages/client/src/types/updates/pre-checkout-query.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { PeersIndex, User } from '../peers'
diff --git a/packages/client/src/types/updates/user-status-update.ts b/packages/client/src/types/updates/user-status-update.ts
index 23447aa8..f94edc92 100644
--- a/packages/client/src/types/updates/user-status-update.ts
+++ b/packages/client/src/types/updates/user-status-update.ts
@@ -1,4 +1,4 @@
-import { tl } from '@mtcute/tl'
+import { tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { User, UserParsedStatus, UserStatus } from '../'
diff --git a/packages/client/src/types/updates/user-typing-update.ts b/packages/client/src/types/updates/user-typing-update.ts
index 692d3629..4c4c11cf 100644
--- a/packages/client/src/types/updates/user-typing-update.ts
+++ b/packages/client/src/types/updates/user-typing-update.ts
@@ -1,5 +1,4 @@
-import { getBarePeerId, MtUnsupportedError, toggleChannelIdMark } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { getBarePeerId, MtUnsupportedError, tl, toggleChannelIdMark } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
 import { BasicPeerType, Chat, TypingStatus, User } from '../'
diff --git a/packages/client/src/utils/inline-utils.ts b/packages/client/src/utils/inline-utils.ts
index 3448ce86..a4f0431b 100644
--- a/packages/client/src/utils/inline-utils.ts
+++ b/packages/client/src/utils/inline-utils.ts
@@ -1,6 +1,5 @@
-import { assertNever, TlBinaryReader, TlBinaryWriter } from '@mtcute/core'
+import { assertNever, tl, TlBinaryReader, TlBinaryWriter } from '@mtcute/core'
 import { encodeUrlSafeBase64, parseUrlSafeBase64 } from '@mtcute/core/utils'
-import { tl } from '@mtcute/tl'
 
 /**
  * Parse TDLib style inline message ID
diff --git a/packages/client/src/utils/misc-utils.ts b/packages/client/src/utils/misc-utils.ts
index 2e4511e9..0c27becc 100644
--- a/packages/client/src/utils/misc-utils.ts
+++ b/packages/client/src/utils/misc-utils.ts
@@ -1,5 +1,4 @@
-import { MtArgumentError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtArgumentError, tl } from '@mtcute/core'
 
 import { MaybeDynamic, Message } from '../types'
 
diff --git a/packages/client/src/utils/peer-utils.ts b/packages/client/src/utils/peer-utils.ts
index 270949e9..f9ef01b6 100644
--- a/packages/client/src/utils/peer-utils.ts
+++ b/packages/client/src/utils/peer-utils.ts
@@ -1,7 +1,6 @@
 import Long from 'long'
 
-import { assertNever } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { assertNever, tl } from '@mtcute/core'
 
 import { InputPeerLike, MtInvalidPeerTypeError } from '../types'
 
diff --git a/packages/client/src/utils/updates-utils.ts b/packages/client/src/utils/updates-utils.ts
index 68384109..87672644 100644
--- a/packages/client/src/utils/updates-utils.ts
+++ b/packages/client/src/utils/updates-utils.ts
@@ -1,5 +1,4 @@
-import { MtTypeAssertionError } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { MtTypeAssertionError, tl } from '@mtcute/core'
 
 // dummy updates which are used for methods that return messages.affectedHistory.
 // that is not an update, but it carries info about pts, and we need to handle it
diff --git a/packages/dispatcher/package.json b/packages/dispatcher/package.json
index f243dbf9..7bd1817a 100644
--- a/packages/dispatcher/package.json
+++ b/packages/dispatcher/package.json
@@ -12,7 +12,6 @@
         "build": "tsc"
     },
     "dependencies": {
-        "@mtcute/tl": "workspace:^160.0.0",
         "@mtcute/core": "workspace:^1.0.0",
         "@mtcute/client": "workspace:^1.0.0",
         "events": "3.2.0"
diff --git a/packages/dispatcher/src/dispatcher.ts b/packages/dispatcher/src/dispatcher.ts
index 9c06d224..c4e3b477 100644
--- a/packages/dispatcher/src/dispatcher.ts
+++ b/packages/dispatcher/src/dispatcher.ts
@@ -22,8 +22,8 @@ import {
     TelegramClient,
     UserStatusUpdate,
     UserTypingUpdate,
+    tl,
 } from '@mtcute/client'
-import { tl } from '@mtcute/tl'
 
 import { filters, UpdateFilter } from './filters'
 // begin-codegen-imports
diff --git a/packages/dispatcher/src/handler.ts b/packages/dispatcher/src/handler.ts
index 76c9f6ea..3fbdf90b 100644
--- a/packages/dispatcher/src/handler.ts
+++ b/packages/dispatcher/src/handler.ts
@@ -15,10 +15,10 @@ import {
     PollVoteUpdate,
     PreCheckoutQuery,
     TelegramClient,
+    tl,
     UserStatusUpdate,
     UserTypingUpdate,
 } from '@mtcute/client'
-import { tl } from '@mtcute/tl'
 
 import { PropagationAction } from './propagation'
 
diff --git a/packages/file-id/package.json b/packages/file-id/package.json
index 5a1d44ed..60ad25ee 100644
--- a/packages/file-id/package.json
+++ b/packages/file-id/package.json
@@ -12,7 +12,6 @@
         "build": "tsc"
     },
     "dependencies": {
-        "@mtcute/tl": "workspace:^160.0.0",
         "@mtcute/tl-runtime": "workspace:^1.0.0",
         "@mtcute/core": "workspace:^1.0.0",
         "long": "5.2.3"
diff --git a/packages/file-id/src/convert.ts b/packages/file-id/src/convert.ts
index 2effd97a..26a512c0 100644
--- a/packages/file-id/src/convert.ts
+++ b/packages/file-id/src/convert.ts
@@ -1,7 +1,6 @@
 import Long from 'long'
 
-import { assertNever, getBasicPeerType, markedPeerIdToBare } from '@mtcute/core'
-import { tl } from '@mtcute/tl'
+import { assertNever, getBasicPeerType, markedPeerIdToBare, tl } from '@mtcute/core'
 
 import { parseFileId } from './parse'
 import { tdFileId as td } from './types'
diff --git a/packages/html-parser/tests/html-parser.spec.ts b/packages/html-parser/tests/html-parser.spec.ts
index 8a31d51c..b2f67709 100644
--- a/packages/html-parser/tests/html-parser.spec.ts
+++ b/packages/html-parser/tests/html-parser.spec.ts
@@ -2,8 +2,7 @@ import { expect } from 'chai'
 import Long from 'long'
 import { describe, it } from 'mocha'
 
-import { FormattedString, MessageEntity } from '@mtcute/client'
-import { tl } from '@mtcute/tl'
+import { FormattedString, MessageEntity, tl } from '@mtcute/client'
 
 import { html, HtmlMessageEntityParser } from '../src'
 
diff --git a/packages/markdown-parser/tests/markdown-parser.spec.ts b/packages/markdown-parser/tests/markdown-parser.spec.ts
index ebf70377..47267390 100644
--- a/packages/markdown-parser/tests/markdown-parser.spec.ts
+++ b/packages/markdown-parser/tests/markdown-parser.spec.ts
@@ -2,8 +2,7 @@ import { expect } from 'chai'
 import Long from 'long'
 import { describe, it } from 'mocha'
 
-import { FormattedString, MessageEntity } from '@mtcute/client'
-import { tl } from '@mtcute/tl'
+import { FormattedString, MessageEntity, tl } from '@mtcute/client'
 
 import { MarkdownMessageEntityParser, md } from '../src'
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f8ed3fce..4fe54ee5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -111,9 +111,6 @@ importers:
       '@mtcute/file-id':
         specifier: workspace:^1.0.0
         version: link:../file-id
-      '@mtcute/tl':
-        specifier: workspace:^160.0.0
-        version: link:../tl
       '@types/node':
         specifier: 18.16.0
         version: 18.16.0
@@ -180,9 +177,6 @@ importers:
       '@mtcute/core':
         specifier: workspace:^1.0.0
         version: link:../core
-      '@mtcute/tl':
-        specifier: workspace:^160.0.0
-        version: link:../tl
       events:
         specifier: 3.2.0
         version: 3.2.0
@@ -192,9 +186,6 @@ importers:
       '@mtcute/core':
         specifier: workspace:^1.0.0
         version: link:../core
-      '@mtcute/tl':
-        specifier: workspace:^160.0.0
-        version: link:../tl
       '@mtcute/tl-runtime':
         specifier: workspace:^1.0.0
         version: link:../tl-runtime