@grom.js/effect-tg 0.10.0 → 0.11.0

package/README.md

@@ -1,7 +1,9 @@
 # effect-tg
 
-[![Effectful](https://img.shields.io/badge/Effectful-%23000?style=flat&logo=effect&logoColor=%23fff)](https://effect.website/)
-[![npm](https://img.shields.io/npm/v/%40grom.js%2Feffect-tg?style=flat&logo=npm&logoColor=%23BB443E&logoSize=auto&label=%C2%A0&labelColor=%23fff&color=%23BB443E)](https://www.npmjs.com/package/@grom.js/effect-tg)
+[![Effectful](https://img.shields.io/badge/Yes.-%23fff?style=flat&logo=effect&logoColor=%23000&logoSize=auto&label=Effect%3F&labelColor=%23fff&color=%23000)](https://effect.website/)
+[![Bot API](https://img.shields.io/badge/v9.4-%23fff?style=flat&logo=telegram&logoColor=%2325A3E1&logoSize=auto&label=Bot%20API&labelColor=%23fff&color=%2325A3E1)](https://core.telegram.org/bots/api)
+[![npm](https://img.shields.io/npm/v/%40grom.js%2Feffect-tg?style=flat&logo=npm&logoColor=%23BB443E&logoSize=auto&label=Latest&labelColor=%23fff&color=%23BB443E)](https://www.npmjs.com/package/@grom.js/effect-tg)
+[![codecov](https://img.shields.io/codecov/c/github/grom-dev/effect-tg?style=flat&logo=codecov&logoColor=%23f07&label=Coverage&labelColor=%23fff&color=%23f07)](https://codecov.io/gh/grom-dev/effect-tg)
 
 Effectful library for crafting Telegram bots.
 
@@ -9,6 +11,8 @@ Effectful library for crafting Telegram bots.
 
 - Modular design to build with [Effect](https://effect.website).
 - Complete type definitions for [Bot API](https://core.telegram.org/bots/api) methods and types.
+- Composable API for [sending messages](#sending-messages).
+- [JSX syntax](#jsx-syntax) support for creating formatted text.
 
 ## Installation
 
@@ -18,6 +22,9 @@ npm install @grom.js/effect-tg
 
 # Install Effect dependencies
 npm install effect @effect/platform
+
+# Install JSX runtime for formatted text
+npm install @grom.js/tgx
 ```
 
 ## Working with Bot API
@@ -66,7 +73,7 @@ const program = Effect.gen(function* () {
 `BotApi` has a layered architecture:
 
 ```
-┌• BotApi — typed interface that delegates calls to `BotApiTransport`.
+┌• BotApi — typed interface that delegates calls to BotApiTransport.
 └─┬• BotApiTransport — serializes parameters, sends HTTP requests, parses responses.
   ├──• BotApiUrl — constructs endpoint URLs to methods and files.
   └──• HttpClient — performs HTTP requests.
@@ -78,41 +85,37 @@ This design enables:
 - **Testability**: Mock implementation of `BotApiTransport` or `HttpClient` to test your bot.
 - **Portability:** Provide different `BotApiUrl` to run a bot on test environment or with local Bot API server.
 
-**Example:** Constructing `BotApi` layer.
+**Example:** Constructing `BotApi` layer with method call tracing.
 
 ```ts
 import { FetchHttpClient } from '@effect/platform'
-import { BotApi, BotApiTransport, BotApiUrl } from '@grom.js/effect-tg'
+import { BotApi } from '@grom.js/effect-tg'
 import { Config, Effect, Layer } from 'effect'
 
-// Use a shortcut to construct BotApi
 const BotApiLive = Layer.provide(
-  BotApi.layerConfig({ token: Config.redacted('BOT_TOKEN') }),
+  BotApi.layerConfig({
+    token: Config.redacted('BOT_TOKEN'),
+    environment: 'prod',
+    transformTransport: transport => ({
+      sendRequest: (method, params) =>
+        transport.sendRequest(method, params).pipe(
+          Effect.withSpan(method),
+        ),
+    }),
+  }),
   FetchHttpClient.layer
 )
-
-// Or provide all layers manually
-const BotApiLive = BotApi.layer.pipe(
-  Layer.provide(BotApiTransport.layer),
-  Layer.provide(
-    Layer.effect(
-      BotApiUrl.BotApiUrl,
-      Effect.map(Config.string('BOT_API_TOKEN'), BotApiUrl.makeProd)
-    ),
-  ),
-  Layer.provide(FetchHttpClient.layer),
-)
 ```
 
 ### Error handling
 
 Failed `BotApi` method calls result in `BotApiError`, which is a union of tagged errors with additional information:
 
-- `TransportError` — HTTP or network failure. `cause` property contains the original error from `HttpClient`.
-- `RateLimited` — bot has exceeded flood limit. `retryAfter` property contains the duration to wait before retry.
-- `GroupUpgraded` — group has been migrated to supergroup. `supergroup` property contains an object with the new ID.
-- `MethodFailed` — response was unsuccessful, but the exact reason could not be determined. `possibleReason` property contains common failure reasons as string literals, determined by error code and description, which are subject to change.
-- `InternalServerError` — Bot API server failed with 5xx error code.
+- **`TransportError`** — HTTP or network failure. The `cause` property contains the original error from `HttpClient`.
+- **`RateLimited`** — bot has exceeded the flood limit. The `retryAfter` property contains the duration to wait before the next attempt.
+- **`GroupUpgraded`** — group has been migrated to a supergroup. The `supergroup` property contains an object with the ID of the new supergroup.
+- **`MethodFailed`** — response was unsuccessful, but the exact reason could not be determined. The `possibleReason` property contains a string literal representing one of the common failure reasons. It is determined by the error code and description of the Bot API response, which are subject to change.
+- **`InternalServerError`** — Bot API server failed with a 5xx error code.
 
 All errors except `TransportError` also have `response` property that contains the original response from Bot API.
 
@@ -132,7 +135,7 @@ const program = BotApi.callMethod('doSomething').pipe(
         RateLimited: ({ retryAfter }) =>
           Effect.logError(`Try again in ${Duration.format(retryAfter)}`),
         GroupUpgraded: ({ supergroup }) =>
-          Effect.logError(`Group now has a new ID: ${supergroup.id}`),
+          Effect.logError(`Group is now a supergroup with ID: ${supergroup.id}`),
         MethodFailed: ({ possibleReason, response }) =>
           Match.value(possibleReason).pipe(
             Match.when('BotBlockedByUser', () =>
@@ -171,3 +174,358 @@ type GiftsCollector = (
   BotApi.BotApi
 >
 ```
+
+## Sending messages
+
+One of the most common tasks for a messenger bot is sending messages.
+
+Bot API exposes multiple methods for sending a message, each corresponding to a different content type:
+
+- `sendMessage` for text;
+- `sendPhoto` for photos;
+- `sendVideo` for videos;
+- and so on.
+
+`Send` module provides a unified, more composable way to send messages of all kinds.
+
+### Basic usage
+
+To send a message, you need:
+
+- **Content** — content of the message to be sent.
+- **Dialog** — target chat and topic where the message will be sent.
+- **Markup** — (optional) markup for replying to the message.
+- **Reply** — (optional) information about the message being replied to.
+- **Options** — (optional) additional options for sending the message.
+
+`Send.sendMessage` function accepts mentioned parameters and returns an `Effect` that sends a message, automatically choosing the appropriate Bot API method based on the content type.
+
+**Example:** Sending messages using `Send.sendMessage`.
+
+```ts
+import { Content, Dialog, File, Markup, Reply, Send, Text } from '@grom.js/effect-tg'
+import { Effect } from 'effect'
+
+const program = Effect.gen(function* () {
+  // Plain text to a user
+  const greeting = yield* Send.sendMessage({
+    content: Content.text(Text.plain('Hey! Wanna roll a dice?')),
+    dialog: Dialog.user(382713),
+  })
+
+  // Photo with formatted caption and inline keyboard
+  yield* Send.sendMessage({
+    content: Content.photo(
+      File.External(new URL('https://cataas.com/cat')),
+      { caption: Text.html('<b>Cat of the day</b>\n<i>Rate this cat:</i>') },
+    ),
+    dialog: Dialog.user(382713),
+    markup: Markup.inlineKeyboard([
+      [Markup.InlineButton.callback('❤️', 'rate_love')],
+      [Markup.InlineButton.callback('👎', 'rate_nope')],
+    ]),
+  })
+
+  // Reply with a dice
+  const roll = yield* Send.sendMessage({
+    content: Content.dice('🎲'),
+    dialog: Dialog.user(382713),
+    reply: Reply.toMessage(greeting),
+  })
+
+  const rolled = roll.dice!.value
+  if (rolled === 6) {
+    // DM channel
+    yield* Send.sendMessage({
+      content: Content.text(Text.plain(`User 382713 rolled ${rolled}.`)),
+      dialog: Dialog.channel(100200).directMessages(42),
+    })
+  }
+  else {
+    // Send silently
+    yield* Send.sendMessage({
+      content: Content.text(Text.plain(`You rolled ${rolled}. Disappointing.`)),
+      dialog: Dialog.user(382713),
+      options: Send.options({ disableNotification: true })
+    })
+  }
+})
+```
+
+#### Content
+
+`Content` module provides constructors for creating objects that represent the content of a message. `Send.sendMessage` uses the content type to choose the appropriate Bot API method automatically.
+
+| Constructor            | Bot API method  | Description            |
+| ---------------------- | --------------- | ---------------------- |
+| `Content.text`         | `sendMessage`   | Text                   |
+| `Content.photo`        | `sendPhoto`     | Photo                  |
+| `Content.video`        | `sendVideo`     | Video                  |
+| `Content.animation`    | `sendAnimation` | GIF or video w/o sound |
+| `Content.audio`        | `sendAudio`     | Audio file             |
+| `Content.voice`        | `sendVoice`     | Voice note             |
+| `Content.videoNote`    | `sendVideoNote` | Round video note       |
+| `Content.document`     | `sendDocument`  | File of any type       |
+| `Content.sticker`      | `sendSticker`   | Sticker                |
+| `Content.location`     | `sendLocation`  | Static location        |
+| `Content.liveLocation` | `sendLocation`  | Live location          |
+| `Content.venue`        | `sendVenue`     | Venue with address     |
+| `Content.contact`      | `sendContact`   | Phone contact          |
+| `Content.dice`         | `sendDice`      | Random dice            |
+
+#### Dialog
+
+`Dialog` module provides utilities for creating target chats:
+
+- `Dialog.user(id)` — private chat with a user.
+- `Dialog.group(id)` — chat of a (basic) group.
+- `Dialog.supergroup(id)` — supergroup chat.
+- `Dialog.channel(id)` — channel.
+
+To target a specific topic, chain a method on the peer:
+
+- `Dialog.user(id).topic(topicId)` — topic in a private chat.
+- `Dialog.supergroup(id).topic(topicId)` — topic in a forum supergroup.
+- `Dialog.channel(id).directMessages(topicId)` — channel direct messages.
+
+`Dialog.ofMessage` helper extracts the dialog from an incoming `Message` object.
+
+##### Dialog and peer IDs
+
+Bot API uses a single integer to encode peer type with its ID — [dialog ID](https://core.telegram.org/api/bots/ids).
+
+This may not be a problem for user IDs, since user IDs map to the same dialog IDs.
+However, this may cause some defects when working with other peers.
+For example, to send a message to a channel with ID `3011378744`, you need to set `chat_id` parameter to `-1003011378744`.
+
+To prevent this confusion, `Dialog` module defines **branded types** that distinguish peer IDs from dialog IDs at the type level:
+
+- `UserId` — number representing a user ID.
+- `GroupId` — number representing a group ID.
+- `ChannelId` — number representing a channel ID.
+- `SupergroupId` — alias to `ChannelId`, since supergroups share ID space with channels.
+- `DialogId` — number encoding peer type and peer ID.
+
+Constructors like `Dialog.user`, `Dialog.channel`, etc. validate and encode IDs internally, so you rarely need to convert manually. When you do, `Dialog` module exports conversion utilities:
+
+- `Dialog.decodeDialogId(dialogId)` — decodes a dialog ID into peer type and peer ID.
+- `Dialog.decodePeerId(peer, dialogId)` — extracts a typed peer ID from a dialog ID.
+- `Dialog.encodePeerId(peer, id)` — encodes a peer type and ID into a dialog ID.
+
+#### Markup
+
+`Markup` module provides reply markup types and constructors:
+
+- `Markup.inlineKeyboard(rows)` — inline keyboard attached to the message.
+- `Markup.replyKeyboard(rows, options?)` — custom keyboard for quick reply or other action.
+- `Markup.replyKeyboardRemove()` — hide a previously shown reply keyboard.
+- `Markup.forceReply()` — forces Telegram client to reply to the message.
+
+**Example:** Creating reply markups.
+
+```ts
+import { Markup } from '@grom.js/effect-tg'
+
+const inline = Markup.inlineKeyboard([
+  [Markup.InlineButton.callback('Like', 'liked')],
+  [Markup.InlineButton.url('Source code', 'https://github.com/grom-dev/effect-tg')],
+])
+
+const reply = Markup.replyKeyboard(
+  [
+    ['Option A', 'Option B'],
+    [Markup.ReplyButton.requestContact('Share phone')],
+  ],
+  { oneTime: true, resizable: true }
+)
+```
+
+### Prepared messages
+
+`Send.message` creates a `MessageToSend` — prepared message that bundles content, markup, reply, and options.
+
+`MessageToSend` is also an `Effect`, which means:
+
+- It can be piped to chain modifiers that customize markup, reply, and options.
+- It can be executed to send the message. To be sent, `Send.TargetDialog` service should be provided.
+
+**Example:** Creating and sending prepared messages.
+
+```ts
+import { Content, Dialog, Send, Text } from '@grom.js/effect-tg'
+import { Effect } from 'effect'
+
+// Reusable template
+const welcomeMessage = Send.message(
+  Content.text(Text.html('<b>Welcome!</b> Thanks for joining.'))
+).pipe(
+  Send.withMarkup(
+    Markup.replyKeyboard([
+      [Markup.ReplyButton.text('Effect?')],
+      [Markup.ReplyButton.text('Die.')],
+    ]),
+  ),
+)
+
+// Send to different dialogs
+const greet1 = Effect.gen(function* () {
+  yield* welcomeMessage.pipe(Send.to(Dialog.user(123)))
+  yield* welcomeMessage.pipe(Send.to(Dialog.channel(321)))
+})
+
+// Send to the same dialog with different options
+const greet2 = Effect.gen(function* () {
+  yield* welcomeMessage.pipe(Send.withoutNotification)
+  yield* welcomeMessage.pipe(Send.withContentProtection)
+}).pipe(
+  Send.to(Dialog.supergroup(4).topic(2)),
+)
+```
+
+### Composing options
+
+Chain modifiers on a `MessageToSend` to customize its behavior:
+
+- `withMarkup`/`withoutMarkup` — set/remove reply markup.
+- `withReply`/`withoutReply` — set/remove reply options.
+- `withNotification`/`withoutNotification` — enable/disable notification sound.
+- `withContentProtection`/`withoutContentProtection` — prevent/allow forwarding and saving.
+- `withPaidBroadcast`/`withoutPaidBroadcast` — enable/disable paid broadcast.
+- `withOptions` — merge with the new send options.
+
+**Example:** Chaining modifiers on a prepared message.
+
+```ts
+import { Content, Markup, Send, Text } from '@grom.js/effect-tg'
+
+const secretPromo = Send.message(Content.text(Text.plain('Shh!'))).pipe(
+  Send.withMarkup(
+    Markup.inlineKeyboard([
+      [Markup.InlineButton.copyText('Copy promo', 'EFFECT_TG')],
+    ]),
+  ),
+  Send.withoutNotification,
+  Send.withContentProtection,
+)
+```
+
+### Text formatting
+
+`Text` module provides utilities for creating [formatted text](https://core.telegram.org/bots/api#formatting-options) to be used in text messages and captions.
+
+**Example:** Formatting text with `Text` module.
+
+```tsx
+import { Text } from '@grom.js/effect-tg'
+
+// Plain text — sent as is
+Text.plain('*Not bold*. _Not italic_.')
+
+// HTML — sent with 'HTML' parse mode
+Text.html('<b>Bold</b> and <i>italic</i>.')
+
+// Markdown — sent with 'MarkdownV2' parse mode
+Text.markdown('*Bold* and _italic_.')
+```
+
+#### JSX syntax
+
+`Text` module also allows to compose formatted text with JSX.
+
+Benefits of using JSX:
+
+- **Validation**: JSX is validated during compilation, so you can't specify invalid HTML or Markdown.
+- **Composability**: JSX allows composing formatted text with custom components.
+- **Auto-escaping**: JSX escapes special characters, saving you from \<s\>bAd\</s\> \_iNpUtS\_.
+- **Type safety**: LSP hints and type checking for text entities and custom components.
+
+`Text.tgx` function accepts a JSX element and returns an instance of `Text.Tgx`, which can then be used as a content of a message.
+
+**Example:** Composing reusable messages with JSX.
+
+```tsx
+import type { PropsWithChildren } from '@grom.js/tgx/types'
+import { Content, Dialog, Send, Text } from '@grom.js/effect-tg'
+import { pipe } from 'effect'
+
+// Reusable component for a key-value field
+const Field = (props: PropsWithChildren<{ label: string }>) => (
+  <><b>{props.label}:</b> {props.children}{'\n'}</>
+)
+
+// Simple component for convenience
+const RocketEmoji = () => (
+  <emoji id="5445284980978621387" alt="🚀" />
+)
+
+// Component that renders a deploy summary
+const DeploySummary = (props: {
+  service: string
+  version: string
+  env: string
+  author: string
+  url: string
+}) => (
+  <>
+    <RocketEmoji /> <b>Deploy to <i>{props.env}</i></b>
+    {'\n\n'}
+    <Field label="Service"><code>{props.service}</code></Field>
+    <Field label="Version"><code>{props.version}</code></Field>
+    <Field label="Author">{props.author}</Field>
+    {'\n'}
+    <a href={props.url}>View in dashboard</a>
+    {'\n\n'}
+    <blockquote expandable>
+      Changelog:{'\n'}
+      - Fix rate limiting on /api/submit{'\n'}
+      - Add retry logic for webhook delivery{'\n'}
+      - Update dependencies
+    </blockquote>
+  </>
+)
+
+// Create summary text
+const summary = Text.tgx(
+  <DeploySummary
+    service="billing-api"
+    version="2.14.0"
+    env="production"
+    author="Alice"
+    url="https://deploy.example.com/runs/4821"
+  />
+)
+
+// Publish a new post
+const publish = Send.message(Content.text(summary)).pipe(
+  Send.to(Dialog.channel(3011378744)),
+)
+```
+
+<details>
+<summary>How it works?</summary>
+
+JSX is just syntactic sugar transformed by the compiler.
+Result of transformation depends on the JSX runtime.
+`effect-tg` relies on JSX runtime from [`@grom.js/tgx`](https://github.com/grom-dev/tgx), which transforms JSX elements to `TgxElement` instances.
+When `Send.sendMessage` encounters an instance of `Text.Tgx`, it converts inner `TgxElement`s to the parameters for a `send*` method.
+
+</details>
+
+To enable JSX support:
+
+1. Install `@grom.js/tgx` package:
+
+   ```sh
+   npm install @grom.js/tgx
+   ```
+
+2. Update your `tsconfig.json`:
+
+   ```json
+   {
+     "compilerOptions": {
+       "jsx": "react-jsx",
+       "jsxImportSource": "@grom.js/tgx"
+     }
+   }
+   ```

package/dist/BotApiError.js

@@ -54,7 +54,7 @@ export const fromResponse = (response) => {
     if (response.error_code === 400 && response.parameters?.migrate_to_chat_id != null) {
         return new GroupUpgraded({
             response,
-            supergroup: Dialog.supergroup(Option.getOrThrow(Dialog.decodePeerId('supergroup', response.parameters.migrate_to_chat_id))),
+            supergroup: Dialog.supergroup(Option.getOrThrow(Dialog.decodePeerId('channel', response.parameters.migrate_to_chat_id))),
         });
     }
     if (response.error_code >= 500) {

package/dist/BotApiError.js.map

@@ -1 +1 @@
-{"version":3,"file":"BotApiError.js","sourceRoot":"","sources":["../src/BotApiError.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BotApiError.js","sourceRoot":"","sources":["../src/BotApiError.ts"],"names":[],"mappings":"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"}

package/dist/Dialog.d.ts

@@ -26,7 +26,7 @@ export declare class ChannelDm extends ChannelDm_base<{
     topicId: number;
 }> {
 }
-export type Peer = User | Group | Supergroup | Channel;
+export type Peer = User | Group | Channel | Supergroup;
 declare const User_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Readonly<A> & {
     readonly _tag: "User";
 };
@@ -44,15 +44,6 @@ export declare class Group extends Group_base<{
 }> {
     dialogId(): DialogId;
 }
-declare const Supergroup_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Readonly<A> & {
-    readonly _tag: "Supergroup";
-};
-export declare class Supergroup extends Supergroup_base<{
-    id: SupergroupId;
-}> {
-    dialogId(): DialogId;
-    topic(topicId: number): ForumTopic;
-}
 declare const Channel_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Readonly<A> & {
     readonly _tag: "Channel";
 };
@@ -62,6 +53,15 @@ export declare class Channel extends Channel_base<{
     dialogId(): DialogId;
     directMessages(topicId: number): ChannelDm;
 }
+declare const Supergroup_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Readonly<A> & {
+    readonly _tag: "Supergroup";
+};
+export declare class Supergroup extends Supergroup_base<{
+    id: SupergroupId;
+}> {
+    dialogId(): DialogId;
+    topic(topicId: number): ForumTopic;
+}
 /**
  * Dialog ID is a single integer encoding peer type and its ID.
  *
@@ -73,16 +73,17 @@ export type UserId = number & Brand.Brand<'@grom.js/effect-tg/UserId'>;
 export declare const UserId: Brand.Brand.Constructor<UserId>;
 export type GroupId = number & Brand.Brand<'@grom.js/effect-tg/GroupId'>;
 export declare const GroupId: Brand.Brand.Constructor<GroupId>;
-export type SupergroupId = number & Brand.Brand<'@grom.js/effect-tg/SupergroupId'>;
-export declare const SupergroupId: Brand.Brand.Constructor<SupergroupId>;
-/**
- * @alias SupergroupId
- */
-export type ChannelId = SupergroupId;
 /**
- * @alias SupergroupId
+ * ID for channels (including supergroups).
+ *
+ * @see {@link https://core.telegram.org/api/bots/ids Telegram API • Bot API dialog IDs}
  */
-export declare const ChannelId: Brand.Brand.Constructor<SupergroupId>;
+export type ChannelId = number & Brand.Brand<'@grom.js/effect-tg/ChannelId'>;
+export declare const ChannelId: Brand.Brand.Constructor<ChannelId>;
+/** @alias ChannelId */
+export type SupergroupId = ChannelId;
+/** @alias ChannelId */
+export declare const SupergroupId: Brand.Brand.Constructor<ChannelId>;
 export declare const decodeDialogId: (dialogId: number) => Option.Option<{
     peer: 'user';
     id: UserId;
@@ -90,8 +91,8 @@ export declare const decodeDialogId: (dialogId: number) => Option.Option<{
     peer: 'group';
     id: GroupId;
 } | {
-    peer: 'supergroup';
-    id: SupergroupId;
+    peer: 'channel';
+    id: ChannelId;
 } | {
     peer: 'monoforum';
     id: number;
@@ -102,15 +103,15 @@ export declare const decodeDialogId: (dialogId: number) => Option.Option<{
 export declare const decodePeerId: {
     (peer: 'user', dialogId: number): Option.Option<UserId>;
     (peer: 'group', dialogId: number): Option.Option<GroupId>;
-    (peer: 'supergroup', dialogId: number): Option.Option<SupergroupId>;
+    (peer: 'channel', dialogId: number): Option.Option<ChannelId>;
     (peer: 'monoforum', dialogId: number): Option.Option<number>;
     (peer: 'secret-chat', dialogId: number): Option.Option<number>;
 };
-export declare const encodePeerId: (peer: 'user' | 'group' | 'supergroup' | 'monoforum' | 'secret-chat', id: number) => Option.Option<DialogId>;
+export declare const encodePeerId: (peer: 'user' | 'group' | 'channel' | 'monoforum' | 'secret-chat', id: number) => Option.Option<DialogId>;
 export declare const user: (id: number) => User;
 export declare const group: (id: number) => Group;
-export declare const supergroup: (id: number) => Supergroup;
 export declare const channel: (id: number) => Channel;
+export declare const supergroup: (id: number) => Supergroup;
 export declare const ofMessage: (message: BotApi.Types.Message) => Dialog;
 export {};
 //# sourceMappingURL=Dialog.d.ts.map

package/dist/Dialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../src/Dialog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../src/Dialog.ts"],"names":[],"mappings":"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"}

package/dist/Dialog.js

@@ -21,30 +21,28 @@ export class Group extends Data.TaggedClass('Group') {
         return Option.getOrThrow(internal.encodePeerId('group', this.id));
     }
 }
-export class Supergroup extends Data.TaggedClass('Supergroup') {
+export class Channel extends Data.TaggedClass('Channel') {
     dialogId() {
-        return Option.getOrThrow(internal.encodePeerId('supergroup', this.id));
+        return Option.getOrThrow(internal.encodePeerId('channel', this.id));
     }
-    topic(topicId) {
-        return new ForumTopic({ supergroup: this, topicId });
+    directMessages(topicId) {
+        return new ChannelDm({ channel: this, topicId });
     }
 }
-export class Channel extends Data.TaggedClass('Channel') {
+export class Supergroup extends Data.TaggedClass('Supergroup') {
     dialogId() {
-        return Option.getOrThrow(internal.encodePeerId('supergroup', this.id));
+        return Option.getOrThrow(internal.encodePeerId('channel', this.id));
     }
-    directMessages(topicId) {
-        return new ChannelDm({ channel: this, topicId });
+    topic(topicId) {
+        return new ForumTopic({ supergroup: this, topicId });
     }
 }
 export const DialogId = Brand.refined(n => Option.isSome(internal.decodeDialogId(n)), n => Brand.error(`Invalid dialog ID: ${n}`));
 export const UserId = Brand.refined(n => Option.isSome(internal.encodePeerId('user', n)), n => Brand.error(`Invalid user ID: ${n}`));
 export const GroupId = Brand.refined(n => Option.isSome(internal.encodePeerId('group', n)), n => Brand.error(`Invalid group ID: ${n}`));
-export const SupergroupId = Brand.refined(n => Option.isSome(internal.encodePeerId('supergroup', n)), n => Brand.error(`Invalid supergroup or channel ID: ${n}`));
-/**
- * @alias SupergroupId
- */
-export const ChannelId = SupergroupId;
+export const ChannelId = Brand.refined(n => Option.isSome(internal.encodePeerId('channel', n)), n => Brand.error(`Invalid channel or supergroup ID: ${n}`));
+/** @alias ChannelId */
+export const SupergroupId = ChannelId;
 // =============================================================================
 // Dialog ID <-> Peer ID
 // =============================================================================
@@ -60,11 +58,11 @@ export const user = (id) => {
 export const group = (id) => {
     return new Group({ id: GroupId(id) });
 };
-export const supergroup = (id) => {
-    return new Supergroup({ id: SupergroupId(id) });
-};
 export const channel = (id) => {
-    return new Channel({ id: SupergroupId(id) });
+    return new Channel({ id: ChannelId(id) });
+};
+export const supergroup = (id) => {
+    return new Supergroup({ id: ChannelId(id) });
 };
 export const ofMessage = internal.ofMessage;
 //# sourceMappingURL=Dialog.js.map