diff --git a/packages/client/package.json b/packages/client/package.json index bae2a257..cecf8448 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -18,7 +18,6 @@ "@mtcute/core": "workspace:^1.0.0", "@mtcute/file-id": "workspace:^1.0.0", "eager-async-pool": "1.0.0", - "file-type": "16.5.4", - "long": "5.2.3" + "file-type": "16.5.4" } } 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 bd760aca..89d49cde 100644 --- a/packages/client/src/methods/chats/get-chat-event-log.ts +++ b/packages/client/src/methods/chats/get-chat-event-log.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { tl } from '@mtcute/core' +import { Long, tl } from '@mtcute/core' import { TelegramClient } from '../../client' import { ChatEvent, InputPeerLike, 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 ba573e93..afdee5a1 100644 --- a/packages/client/src/methods/chats/get-chat-members.ts +++ b/packages/client/src/methods/chats/get-chat-members.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { assertNever, tl } from '@mtcute/core' +import { assertNever, Long, tl } from '@mtcute/core' import { assertTypeIs } from '@mtcute/core/utils' import { TelegramClient } from '../../client' diff --git a/packages/client/src/methods/chats/iter-chat-event-log.ts b/packages/client/src/methods/chats/iter-chat-event-log.ts index 251222ce..f754da0a 100644 --- a/packages/client/src/methods/chats/iter-chat-event-log.ts +++ b/packages/client/src/methods/chats/iter-chat-event-log.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { tl } from '@mtcute/core' +import { Long, tl } from '@mtcute/core' import { TelegramClient } from '../../client' import { ChatEvent, InputPeerLike } from '../../types' diff --git a/packages/client/src/methods/contacts/get-contacts.ts b/packages/client/src/methods/contacts/get-contacts.ts index bc1f984e..b9cb864c 100644 --- a/packages/client/src/methods/contacts/get-contacts.ts +++ b/packages/client/src/methods/contacts/get-contacts.ts @@ -1,5 +1,4 @@ -import Long from 'long' - +import { Long } from '@mtcute/core' import { assertTypeIs } from '@mtcute/core/utils' import { TelegramClient } from '../../client' diff --git a/packages/client/src/methods/contacts/import-contacts.ts b/packages/client/src/methods/contacts/import-contacts.ts index a51405bc..4de01dee 100644 --- a/packages/client/src/methods/contacts/import-contacts.ts +++ b/packages/client/src/methods/contacts/import-contacts.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { PartialOnly, tl } from '@mtcute/core' +import { Long, PartialOnly, tl } from '@mtcute/core' import { TelegramClient } from '../../client' diff --git a/packages/client/src/methods/dialogs/iter-dialogs.ts b/packages/client/src/methods/dialogs/iter-dialogs.ts index 018444ea..0885ab15 100644 --- a/packages/client/src/methods/dialogs/iter-dialogs.ts +++ b/packages/client/src/methods/dialogs/iter-dialogs.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { MtUnsupportedError, tl } from '@mtcute/core' +import { Long, MtUnsupportedError, tl } from '@mtcute/core' import { TelegramClient } from '../../client' import { Dialog, InputDialogFolder } 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 0e45ac54..ef5baaca 100644 --- a/packages/client/src/methods/files/normalize-input-media.ts +++ b/packages/client/src/methods/files/normalize-input-media.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { tl } from '@mtcute/core' +import { Long, tl } from '@mtcute/core' import { assertTypeIs } from '@mtcute/core/utils' import { fileIdToInputDocument, fileIdToInputPhoto, parseFileId, tdFileId } from '@mtcute/file-id' diff --git a/packages/client/src/methods/forums/edit-forum-topic.ts b/packages/client/src/methods/forums/edit-forum-topic.ts index 20273619..fae24f57 100644 --- a/packages/client/src/methods/forums/edit-forum-topic.ts +++ b/packages/client/src/methods/forums/edit-forum-topic.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { tl } from '@mtcute/core' +import { Long, tl } from '@mtcute/core' import { TelegramClient } from '../../client' import { InputPeerLike, Message } from '../../types' diff --git a/packages/client/src/methods/messages/close-poll.ts b/packages/client/src/methods/messages/close-poll.ts index d453f4e5..0d76ed0f 100644 --- a/packages/client/src/methods/messages/close-poll.ts +++ b/packages/client/src/methods/messages/close-poll.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { MtTypeAssertionError } from '@mtcute/core' +import { Long, MtTypeAssertionError } from '@mtcute/core' import { assertTypeIs } from '@mtcute/core/utils' import { TelegramClient } from '../../client' diff --git a/packages/client/src/methods/messages/get-history.ts b/packages/client/src/methods/messages/get-history.ts index 5e351c46..3444bbb7 100644 --- a/packages/client/src/methods/messages/get-history.ts +++ b/packages/client/src/methods/messages/get-history.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { tl } from '@mtcute/core' +import { Long, tl } from '@mtcute/core' import { assertTypeIsNot } from '@mtcute/core/utils' import { TelegramClient } from '../../client' diff --git a/packages/client/src/methods/messages/search-messages.ts b/packages/client/src/methods/messages/search-messages.ts index 88b59d90..789d5547 100644 --- a/packages/client/src/methods/messages/search-messages.ts +++ b/packages/client/src/methods/messages/search-messages.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { tl } from '@mtcute/core' +import { Long, tl } from '@mtcute/core' import { assertTypeIsNot } from '@mtcute/core/utils' import { TelegramClient } from '../../client' diff --git a/packages/client/src/methods/stickers/get-installed-stickers.ts b/packages/client/src/methods/stickers/get-installed-stickers.ts index 68601a70..82d19b9d 100644 --- a/packages/client/src/methods/stickers/get-installed-stickers.ts +++ b/packages/client/src/methods/stickers/get-installed-stickers.ts @@ -1,5 +1,4 @@ -import Long from 'long' - +import { Long } from '@mtcute/core' import { assertTypeIs } from '@mtcute/core/utils' 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 ce063fa4..65b7ed0f 100644 --- a/packages/client/src/methods/users/get-profile-photos.ts +++ b/packages/client/src/methods/users/get-profile-photos.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { tl } from '@mtcute/core' +import { Long, tl } from '@mtcute/core' import { assertTypeIs } from '@mtcute/core/utils' import { TelegramClient } from '../../client' diff --git a/packages/client/src/methods/users/resolve-peer.ts b/packages/client/src/methods/users/resolve-peer.ts index 4c9bbd2e..3f9ffe66 100644 --- a/packages/client/src/methods/users/resolve-peer.ts +++ b/packages/client/src/methods/users/resolve-peer.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { getBasicPeerType, getMarkedPeerId, MtTypeAssertionError, tl, toggleChannelIdMark } from '@mtcute/core' +import { getBasicPeerType, getMarkedPeerId, Long, MtTypeAssertionError, tl, toggleChannelIdMark } from '@mtcute/core' import { assertTypeIs } from '@mtcute/core/utils' import { TelegramClient } from '../../client' diff --git a/packages/client/src/types/media/poll.ts b/packages/client/src/types/media/poll.ts index b77c096b..0a6c870f 100644 --- a/packages/client/src/types/media/poll.ts +++ b/packages/client/src/types/media/poll.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { tl } from '@mtcute/core' +import { Long, tl } from '@mtcute/core' import { TelegramClient } from '../../client' import { makeInspectable } from '../../utils' diff --git a/packages/client/src/types/media/thumbnail.ts b/packages/client/src/types/media/thumbnail.ts index ce0a4e07..32ac0d0f 100644 --- a/packages/client/src/types/media/thumbnail.ts +++ b/packages/client/src/types/media/thumbnail.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { MtArgumentError, MtTypeAssertionError, tl } from '@mtcute/core' +import { Long, MtArgumentError, MtTypeAssertionError, tl } from '@mtcute/core' import { assertTypeIs } from '@mtcute/core/utils' import { tdFileId as td, toFileId, toUniqueFileId } from '@mtcute/file-id' diff --git a/packages/client/src/types/peers/chat-photo.ts b/packages/client/src/types/peers/chat-photo.ts index c21302b0..5154a506 100644 --- a/packages/client/src/types/peers/chat-photo.ts +++ b/packages/client/src/types/peers/chat-photo.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { MtArgumentError, tl, toggleChannelIdMark } from '@mtcute/core' +import { Long, MtArgumentError, tl, toggleChannelIdMark } from '@mtcute/core' import { tdFileId, toFileId, toUniqueFileId } from '@mtcute/file-id' import { TelegramClient } from '../../client' diff --git a/packages/client/src/types/reactions/types.ts b/packages/client/src/types/reactions/types.ts index 781ea4ac..96261992 100644 --- a/packages/client/src/types/reactions/types.ts +++ b/packages/client/src/types/reactions/types.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { MtTypeAssertionError, tl } from '@mtcute/core' +import { Long, MtTypeAssertionError, tl } from '@mtcute/core' /** * Input version of {@link ReactionEmoji}, which also accepts bare TL object diff --git a/packages/client/src/types/stories/interactive/input.ts b/packages/client/src/types/stories/interactive/input.ts index bcde91c6..5f3d825a 100644 --- a/packages/client/src/types/stories/interactive/input.ts +++ b/packages/client/src/types/stories/interactive/input.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { tl } from '@mtcute/core' +import { Long, tl } from '@mtcute/core' import { VenueSource } from '../../media' import { InputReaction, normalizeInputReaction } from '../../reactions' diff --git a/packages/client/src/utils/peer-utils.ts b/packages/client/src/utils/peer-utils.ts index f9ef01b6..b6f70398 100644 --- a/packages/client/src/utils/peer-utils.ts +++ b/packages/client/src/utils/peer-utils.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { assertNever, tl } from '@mtcute/core' +import { assertNever, Long, tl } from '@mtcute/core' import { InputPeerLike, MtInvalidPeerTypeError } from '../types' diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 641b1493..c13001d1 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -6,4 +6,8 @@ export * from './utils/peer-utils' /** @hidden */ export * from '@mtcute/tl' +/** @hidden */ export * from '@mtcute/tl-runtime' +import Long from 'long' +/** @hidden */ +export { Long } diff --git a/packages/file-id/package.json b/packages/file-id/package.json index 60ad25ee..5a21d9b5 100644 --- a/packages/file-id/package.json +++ b/packages/file-id/package.json @@ -13,7 +13,6 @@ }, "dependencies": { "@mtcute/tl-runtime": "workspace:^1.0.0", - "@mtcute/core": "workspace:^1.0.0", - "long": "5.2.3" + "@mtcute/core": "workspace:^1.0.0" } } \ No newline at end of file diff --git a/packages/file-id/src/convert.ts b/packages/file-id/src/convert.ts index 26a512c0..2c8341d7 100644 --- a/packages/file-id/src/convert.ts +++ b/packages/file-id/src/convert.ts @@ -1,6 +1,4 @@ -import Long from 'long' - -import { assertNever, getBasicPeerType, markedPeerIdToBare, tl } from '@mtcute/core' +import { assertNever, getBasicPeerType, Long, markedPeerIdToBare, tl } from '@mtcute/core' import { parseFileId } from './parse' import { tdFileId as td } from './types' diff --git a/packages/file-id/src/types.ts b/packages/file-id/src/types.ts index 139497c5..6716e813 100644 --- a/packages/file-id/src/types.ts +++ b/packages/file-id/src/types.ts @@ -1,4 +1,4 @@ -import Long from 'long' +import { Long } from '@mtcute/core' // eslint-disable-next-line @typescript-eslint/no-namespace export namespace tdFileId { diff --git a/packages/file-id/tests/parse.spec.ts b/packages/file-id/tests/parse.spec.ts index 0bf93c46..2f0c7036 100644 --- a/packages/file-id/tests/parse.spec.ts +++ b/packages/file-id/tests/parse.spec.ts @@ -1,7 +1,8 @@ import { expect } from 'chai' -import Long from 'long' import { describe, it } from 'mocha' +import { Long } from '@mtcute/core' + import { parseFileId } from '../src' import { tdFileId as td } from '../src/types' diff --git a/packages/sqlite/package.json b/packages/sqlite/package.json index 563ffcc6..c0aba2ec 100644 --- a/packages/sqlite/package.json +++ b/packages/sqlite/package.json @@ -13,8 +13,7 @@ "dependencies": { "@mtcute/core": "workspace:^1.0.0", "@mtcute/tl-runtime": "workspace:^1.0.0", - "better-sqlite3": "8.4.0", - "long": "5.2.3" + "better-sqlite3": "8.4.0" }, "devDependencies": { "@mtcute/dispatcher": "workspace:^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 474cda31..2c7db874 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -120,9 +120,6 @@ importers: file-type: specifier: 16.5.4 version: 16.5.4 - long: - specifier: 5.2.3 - version: 5.2.3 packages/core: dependencies: @@ -189,9 +186,6 @@ importers: '@mtcute/tl-runtime': specifier: workspace:^1.0.0 version: link:../tl-runtime - long: - specifier: 5.2.3 - version: 5.2.3 packages/html-parser: dependencies: @@ -284,9 +278,6 @@ importers: better-sqlite3: specifier: 8.4.0 version: 8.4.0 - long: - specifier: 5.2.3 - version: 5.2.3 devDependencies: '@mtcute/dispatcher': specifier: workspace:^1.0.0