@grom.js/effect-tg 0.12.0 → 0.14.0

package/src/File.ts

@@ -7,20 +7,51 @@ import type * as BotApi from './BotApi.ts'
 import type * as BotApiError from './BotApiError.ts'
 import type * as BotApiUrl from './BotApiUrl.ts'
 import * as Brand from 'effect/Brand'
-import * as Data from 'effect/Data'
+import * as Predicate from 'effect/Predicate'
 import * as internal from './internal/file.ts'
 
 export type FileId = string & Brand.Brand<'FileId'>
-export const FileId = Brand.nominal<FileId>()
+export const FileId: Brand.Brand.Constructor<FileId> = Brand.nominal<FileId>()
 
 export type External = URL & Brand.Brand<'External'>
-export const External = Brand.nominal<External>()
+export const External: Brand.Brand.Constructor<External> = Brand.nominal<External>()
 
-export class InputFile extends Data.TaggedClass('InputFile')<{
+// =============================================================================
+// InputFile
+// =============================================================================
+
+const InputFileTypeId: unique symbol = Symbol.for('effect-tg/InputFile')
+
+export type InputFileTypeId = typeof InputFileTypeId
+
+export interface InputFile {
+  readonly [InputFileTypeId]: InputFileTypeId
+  readonly stream: Stream.Stream<Uint8Array>
+  readonly filename: string
+  readonly mimeType?: string
+}
+
+const InputFileProto = {
+  [InputFileTypeId]: InputFileTypeId,
+}
+
+export const make: (args: {
   stream: Stream.Stream<Uint8Array>
   filename: string
   mimeType?: string
-}> {}
+}) => InputFile = ({ stream, filename, mimeType }) => {
+  const file = Object.create(InputFileProto)
+  file.stream = stream
+  file.filename = filename
+  file.mimeType = mimeType
+  return file
+}
+
+export const isInputFile = (u: unknown): u is InputFile => Predicate.hasProperty(u, InputFileTypeId)
+
+// =============================================================================
+// Utilities
+// =============================================================================
 
 /**
  * Downloads a file from the Bot API server.

package/src/Markup.ts

@@ -1,4 +1,3 @@
-import * as Data from 'effect/Data'
 import * as Option from 'effect/Option'
 
 // =============================================================================
@@ -14,27 +13,31 @@ export type Markup =
   | ReplyKeyboardRemove
   | ForceReply
 
-export class InlineKeyboard extends Data.TaggedClass('InlineKeyboard')<{
+export interface InlineKeyboard {
+  readonly _tag: 'InlineKeyboard'
   readonly rows: ReadonlyArray<ReadonlyArray<InlineButton>>
-}> {}
+}
 
-export class ReplyKeyboard extends Data.TaggedClass('ReplyKeyboard')<{
+export interface ReplyKeyboard {
+  readonly _tag: 'ReplyKeyboard'
   readonly rows: ReadonlyArray<ReadonlyArray<ReplyButton>>
   readonly persistent: boolean
   readonly resizable: boolean
   readonly oneTime: boolean
   readonly selective: boolean
   readonly inputPlaceholder: Option.Option<string>
-}> {}
+}
 
-export class ReplyKeyboardRemove extends Data.TaggedClass('ReplyKeyboardRemove')<{
+export interface ReplyKeyboardRemove {
+  readonly _tag: 'ReplyKeyboardRemove'
   readonly selective: boolean
-}> {}
+}
 
-export class ForceReply extends Data.TaggedClass('ForceReply')<{
+export interface ForceReply {
+  readonly _tag: 'ForceReply'
   readonly selective: boolean
   readonly inputPlaceholder: Option.Option<string>
-}> {}
+}
 
 // =============================================================================
 // Constructors
@@ -42,7 +45,10 @@ export class ForceReply extends Data.TaggedClass('ForceReply')<{
 
 export const inlineKeyboard = (
   rows: ReadonlyArray<ReadonlyArray<InlineButton>>,
-): InlineKeyboard => new InlineKeyboard({ rows })
+): InlineKeyboard => ({
+  _tag: 'InlineKeyboard',
+  rows,
+})
 
 export const replyKeyboard = (
   rows: ReadonlyArray<ReadonlyArray<ReplyButton>>,
@@ -53,27 +59,31 @@ export const replyKeyboard = (
     readonly selective?: boolean
     readonly inputPlaceholder?: string
   },
-): ReplyKeyboard =>
-  new ReplyKeyboard({
-    rows,
-    persistent: options?.persistent ?? false,
-    resizable: options?.resizable ?? false,
-    oneTime: options?.oneTime ?? false,
-    selective: options?.selective ?? false,
-    inputPlaceholder: Option.fromNullable(options?.inputPlaceholder),
-  })
-
-export const replyKeyboardRemove = (options?: { readonly selective?: boolean }): ReplyKeyboardRemove =>
-  new ReplyKeyboardRemove({ selective: options?.selective ?? false })
+): ReplyKeyboard => ({
+  _tag: 'ReplyKeyboard',
+  rows,
+  persistent: options?.persistent ?? false,
+  resizable: options?.resizable ?? false,
+  oneTime: options?.oneTime ?? false,
+  selective: options?.selective ?? false,
+  inputPlaceholder: Option.fromNullable(options?.inputPlaceholder),
+})
+
+export const replyKeyboardRemove = (options?: {
+  readonly selective?: boolean
+}): ReplyKeyboardRemove => ({
+  _tag: 'ReplyKeyboardRemove',
+  selective: options?.selective ?? false,
+})
 
 export const forceReply = (options?: {
   readonly selective?: boolean
   readonly inputPlaceholder?: string
-}): ForceReply =>
-  new ForceReply({
-    selective: options?.selective ?? false,
-    inputPlaceholder: Option.fromNullable(options?.inputPlaceholder),
-  })
+}): ForceReply => ({
+  _tag: 'ForceReply',
+  selective: options?.selective ?? false,
+  inputPlaceholder: Option.fromNullable(options?.inputPlaceholder),
+})
 
 // =============================================================================
 // Inline button

package/src/Runner.ts

@@ -1,5 +1,7 @@
 import type * as Effect from 'effect/Effect'
 import type * as Bot from './Bot.ts'
+import type * as BotApi from './BotApi.ts'
+import type * as BotApiError from './BotApiError.ts'
 import * as internal from './internal/runner.ts'
 
 /**
@@ -19,4 +21,6 @@ export interface Runner<E = never, R = never> {
  * Creates a simple runner that fetches updates by calling `BotApi.getUpdates`
  * method and handles them one by one.
  */
-export const makeSimple = internal.makeSimple
+export const makeSimple: (options?: {
+  allowedUpdates?: string[]
+}) => Runner<BotApiError.BotApiError, BotApi.BotApi> = internal.makeSimple

package/src/Send.ts

@@ -36,6 +36,32 @@ export const sendMessage: (params: {
   BotApi.BotApi
 > = internal.sendMessage
 
+// =============================================================================
+// TargetDialog
+// =============================================================================
+
+/**
+ * Target dialog for sending messages.
+ */
+export interface TargetDialog {
+  readonly dialog: Dialog.Dialog | Dialog.DialogId
+}
+
+export const TargetDialog: Context.Tag<TargetDialog, TargetDialog> = Context.GenericTag<TargetDialog>('@grom.js/effect-tg/Send/TargetDialog')
+
+/**
+ * Provides the target dialog for sending messages.
+ */
+export const to: {
+  (dialog: Dialog.Dialog | Dialog.DialogId): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, TargetDialog>>
+  <A, E, R>(effect: Effect.Effect<A, E, R>, dialog: Dialog.Dialog | Dialog.DialogId): Effect.Effect<A, E, Exclude<R, TargetDialog>>
+} = Function.dual(2, <A, E, R>(
+  effect: Effect.Effect<A, E, R>,
+  dialog: Dialog.Dialog | Dialog.DialogId,
+): Effect.Effect<A, E, Exclude<R, TargetDialog>> => (
+  Effect.provideService(effect, TargetDialog, { dialog })
+))
+
 // =============================================================================
 // MessageToSend
 // =============================================================================
@@ -71,7 +97,7 @@ const MessageToSendProto = {
   commit(this: MessageToSend) {
     return Effect.flatMap(
       TargetDialog,
-      dialog => sendMessage({
+      ({ dialog }) => sendMessage({
         dialog,
         content: this.content,
         markup: this.markup,
@@ -109,31 +135,6 @@ export const message = (content: Content.Content, params?: {
   return self
 }
 
-// =============================================================================
-// TargetDialog
-// =============================================================================
-
-/**
- * Target dialog for sending messages.
- */
-export class TargetDialog extends Context.Tag('@grom.js/effect-tg/Send/TargetDialog')<
-  TargetDialog,
-  Dialog.Dialog | Dialog.DialogId
->() {}
-
-/**
- * Provides the target dialog for sending messages.
- */
-export const to: {
-  (dialog: Dialog.Dialog): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, TargetDialog>>
-  <A, E, R>(effect: Effect.Effect<A, E, R>, dialog: Dialog.Dialog): Effect.Effect<A, E, Exclude<R, TargetDialog>>
-} = Function.dual(2, <A, E, R>(
-  effect: Effect.Effect<A, E, R>,
-  dialog: Dialog.Dialog,
-): Effect.Effect<A, E, Exclude<R, TargetDialog>> => (
-  Effect.provideService(effect, TargetDialog, dialog)
-))
-
 // =============================================================================
 // Reply Markup
 // =============================================================================

package/src/Text.ts

@@ -1,6 +1,5 @@
 import type { TgxElement } from '@grom.js/tgx'
 import type { Types } from './BotApi.ts'
-import * as Data from 'effect/Data'
 
 /**
  * Formatted text.
@@ -11,32 +10,36 @@ export type Text =
   | Markdown
   | Tgx
 
-export class Plain extends Data.TaggedClass('Plain')<{
-  text: string
-  entities?: Array<Types.MessageEntity>
-}> {}
+export interface Plain {
+  readonly _tag: 'Plain'
+  readonly text: string
+  readonly entities?: Array<Types.MessageEntity>
+}
 
-export class Html extends Data.TaggedClass('Html')<{
-  html: string
-}> {}
+export interface Html {
+  readonly _tag: 'Html'
+  readonly html: string
+}
 
-export class Markdown extends Data.TaggedClass('Markdown')<{
-  markdown: string
-}> {}
+export interface Markdown {
+  readonly _tag: 'Markdown'
+  readonly markdown: string
+}
 
-export class Tgx extends Data.TaggedClass('Tgx')<{
-  tgx: TgxElement
-}> {}
+export interface Tgx {
+  readonly _tag: 'Tgx'
+  readonly tgx: TgxElement
+}
 
 // ———— Constructors ———————————————————————————————————————————————————————————
 
 export const plain = (
   text: string,
   entities?: Array<Types.MessageEntity>,
-): Plain => new Plain({ text, entities })
+): Plain => ({ _tag: 'Plain', text, entities })
 
-export const html = (html: string): Html => new Html({ html })
+export const html = (html: string): Html => ({ _tag: 'Html', html })
 
-export const markdown = (markdown: string): Markdown => new Markdown({ markdown })
+export const markdown = (markdown: string): Markdown => ({ _tag: 'Markdown', markdown })
 
-export const tgx = (tgx: TgxElement): Tgx => new Tgx({ tgx })
+export const tgx = (tgx: TgxElement): Tgx => ({ _tag: 'Tgx', tgx })

package/src/internal/botApi.gen.ts

@@ -82,7 +82,7 @@ export interface BotApi {
   sendChecklist: BotApiMethod<'sendChecklist'>
   /** Use this method to send an animated emoji that will display a random value. On success, the sent [Message](https://core.telegram.org/bots/api#message) is returned. */
   sendDice: BotApiMethod<'sendDice'>
-  /** Use this method to stream a partial message to a user while the message is being generated; supported only for bots with forum topic mode enabled. Returns _True_ on success. */
+  /** Use this method to stream a partial message to a user while the message is being generated. Returns _True_ on success. */
   sendMessageDraft: BotApiMethod<'sendMessageDraft'>
   /**
    * Use this method when you need to tell the user that something is happening on the bot's side. The status is set for 5 seconds or less (when a message arrives from your bot, Telegram clients clear its typing status). Returns _True_ on success.
@@ -116,6 +116,8 @@ export interface BotApi {
   promoteChatMember: BotApiMethod<'promoteChatMember'>
   /** Use this method to set a custom title for an administrator in a supergroup promoted by the bot. Returns _True_ on success. */
   setChatAdministratorCustomTitle: BotApiMethod<'setChatAdministratorCustomTitle'>
+  /** Use this method to set a tag for a regular member in a group or a supergroup. The bot must be an administrator in the chat for this to work and must have the _can\_manage\_tags_ administrator right. Returns _True_ on success. */
+  setChatMemberTag: BotApiMethod<'setChatMemberTag'>
   /** Use this method to ban a channel chat in a supergroup or a channel. Until the chat is [unbanned](https://core.telegram.org/bots/api#unbanchatsenderchat), the owner of the banned chat won't be able to send messages on behalf of **any of their channels**. The bot must be an administrator in the supergroup or channel for this to work and must have the appropriate administrator rights. Returns _True_ on success. */
   banChatSenderChat: BotApiMethod<'banChatSenderChat'>
   /** Use this method to unban a previously banned channel chat in a supergroup or channel. The bot must be an administrator for this to work and must have the appropriate administrator rights. Returns _True_ on success. */
@@ -667,6 +669,8 @@ export declare namespace Types {
     sender_boost_count?: number
     /** The bot that actually sent the message on behalf of the business account. Available only for outgoing messages sent on behalf of the connected business account. */
     sender_business_bot?: Types.User
+    /** Tag or custom title of the sender of the message; for supergroups only */
+    sender_tag?: string
     /** Date the message was sent in Unix time. It is always a positive number, representing a valid date. */
     date: number
     /** Unique identifier of the business connection from which the message was received. If non-empty, the message belongs to a chat of the corresponding business account that is independent from any potential bot chat which might share the same identifier. */
@@ -699,7 +703,7 @@ export declare namespace Types {
     is_from_offline?: true
     /** _True_, if the message is a paid post. Note that such posts must not be deleted for 24 hours to receive the payment and can't be edited. */
     is_paid_post?: true
-    /** The unique identifier of a media message group this message belongs to */
+    /** The unique identifier inside this chat of a media message group this message belongs to */
     media_group_id?: string
     /** Signature of the post author for messages in channels, or the custom title of an anonymous group administrator */
     author_signature?: string
@@ -861,7 +865,7 @@ export declare namespace Types {
     video_chat_participants_invited?: Types.VideoChatParticipantsInvited
     /** Service message: data sent by a Web App */
     web_app_data?: Types.WebAppData
-    /** Inline keyboard attached to the message. `login_url` buttons are represented as ordinary `url` buttons. */
+    /** [Inline keyboard](https://core.telegram.org/bots/features#inline-keyboards) attached to the message. `login_url` buttons are represented as ordinary `url` buttons. */
     reply_markup?: Types.InlineKeyboardMarkup
   }
 
@@ -891,8 +895,8 @@ export declare namespace Types {
 
   /** This object represents one special entity in a text message. For example, hashtags, usernames, URLs, etc. */
   export interface MessageEntity {
-    /** Type of the entity. Currently, can be “mention” (`@username`), “hashtag” (`#hashtag` or `#hashtag@chatusername`), “cashtag” (`$USD` or `$USD@chatusername`), “bot\_command” (`/start@jobs_bot`), “url” (`https://telegram.org`), “email” (`do-not-reply@telegram.org`), “phone\_number” (`+1-212-555-0123`), “bold” (**bold text**), “italic” (_italic text_), “underline” (underlined text), “strikethrough” (strikethrough text), “spoiler” (spoiler message), “blockquote” (block quotation), “expandable\_blockquote” (collapsed-by-default block quotation), “code” (monowidth string), “pre” (monowidth block), “text\_link” (for clickable text URLs), “text\_mention” (for users [without usernames](https://telegram.org/blog/edit#new-mentions)), “custom\_emoji” (for inline custom emoji stickers) */
-    type: 'mention' | 'hashtag' | 'cashtag' | 'bot_command' | 'url' | 'email' | 'phone_number' | 'bold' | 'italic' | 'underline' | 'strikethrough' | 'spoiler' | 'blockquote' | 'expandable_blockquote' | 'code' | 'pre' | 'text_link' | 'text_mention' | 'custom_emoji'
+    /** Type of the entity. Currently, can be “mention” (`@username`), “hashtag” (`#hashtag` or `#hashtag@chatusername`), “cashtag” (`$USD` or `$USD@chatusername`), “bot\_command” (`/start@jobs_bot`), “url” (`https://telegram.org`), “email” (`do-not-reply@telegram.org`), “phone\_number” (`+1-212-555-0123`), “bold” (**bold text**), “italic” (_italic text_), “underline” (underlined text), “strikethrough” (strikethrough text), “spoiler” (spoiler message), “blockquote” (block quotation), “expandable\_blockquote” (collapsed-by-default block quotation), “code” (monowidth string), “pre” (monowidth block), “text\_link” (for clickable text URLs), “text\_mention” (for users [without usernames](https://telegram.org/blog/edit#new-mentions)), “custom\_emoji” (for inline custom emoji stickers), or “date\_time” (for formatted date and time) */
+    type: 'mention' | 'hashtag' | 'cashtag' | 'bot_command' | 'url' | 'email' | 'phone_number' | 'bold' | 'italic' | 'underline' | 'strikethrough' | 'spoiler' | 'blockquote' | 'expandable_blockquote' | 'code' | 'pre' | 'text_link' | 'text_mention' | 'custom_emoji' | 'date_time'
     /** Offset in [UTF-16 code units](https://core.telegram.org/api/entities#entity-length) to the start of the entity */
     offset: number
     /** Length of the entity in [UTF-16 code units](https://core.telegram.org/api/entities#entity-length) */
@@ -905,6 +909,10 @@ export declare namespace Types {
     language?: string
     /** For “custom\_emoji” only, unique identifier of the custom emoji. Use [getCustomEmojiStickers](https://core.telegram.org/bots/api#getcustomemojistickers) to get full information about the sticker */
     custom_emoji_id?: string
+    /** For “date\_time” only, the Unix time associated with the entity */
+    unix_time?: number
+    /** For “date\_time” only, the string that defines the formatting of the date and time. See [date-time entity formatting](https://core.telegram.org/bots/api#date-time-entity-formatting) for more details. */
+    date_time_format?: string
   }
 
   /** This object contains information about the quoted part of a message that is replied to by the given message. */
@@ -2204,6 +2212,8 @@ export declare namespace Types {
     can_manage_topics?: boolean
     /** _True_, if the administrator can manage direct messages of the channel and decline suggested posts; for channels only */
     can_manage_direct_messages?: boolean
+    /** _True_, if the administrator can edit the tags of regular members; for groups and supergroups only. If omitted defaults to the value of can\_pin\_messages. */
+    can_manage_tags?: boolean
   }
 
   /** This object represents changes in the status of a chat member. */
@@ -2290,6 +2300,8 @@ export declare namespace Types {
     can_manage_topics?: boolean
     /** _True_, if the administrator can manage direct messages of the channel and decline suggested posts; for channels only */
     can_manage_direct_messages?: boolean
+    /** _True_, if the administrator can edit the tags of regular members; for groups and supergroups only. If omitted defaults to the value of can\_pin\_messages. */
+    can_manage_tags?: boolean
     /** Custom title for this user */
     custom_title?: string
   }
@@ -2298,6 +2310,8 @@ export declare namespace Types {
   export interface ChatMemberMember {
     /** The member's status in the chat, always “member” */
     status: 'member'
+    /** Tag of the member */
+    tag?: string
     /** Information about the user */
     user: Types.User
     /** Date when the user's subscription will expire; Unix time */
@@ -2308,6 +2322,8 @@ export declare namespace Types {
   export interface ChatMemberRestricted {
     /** The member's status in the chat, always “restricted” */
     status: 'restricted'
+    /** Tag of the member */
+    tag?: string
     /** Information about the user */
     user: Types.User
     /** _True_, if the user is a member of the chat at the moment of the request */
@@ -2332,6 +2348,8 @@ export declare namespace Types {
     can_send_other_messages: boolean
     /** _True_, if the user is allowed to add web page previews to their messages */
     can_add_web_page_previews: boolean
+    /** _True_, if the user is allowed to edit their own tag */
+    can_edit_tag: boolean
     /** _True_, if the user is allowed to change the chat title, photo and other settings */
     can_change_info: boolean
     /** _True_, if the user is allowed to invite new users to the chat */
@@ -2400,6 +2418,8 @@ export declare namespace Types {
     can_send_other_messages?: boolean
     /** _True_, if the user is allowed to add web page previews to their messages */
     can_add_web_page_previews?: boolean
+    /** _True_, if the user is allowed to edit their own tag */
+    can_edit_tag?: boolean
     /** _True_, if the user is allowed to change the chat title, photo and other settings. Ignored in public supergroups */
     can_change_info?: boolean
     /** _True_, if the user is allowed to invite new users to the chat */
@@ -3792,7 +3812,7 @@ export declare namespace Types {
     mime_type: 'application/pdf' | 'application/zip'
     /** Short description of the result */
     description?: string
-    /** Inline keyboard attached to the message */
+    /** [Inline keyboard](https://core.telegram.org/bots/features#inline-keyboards) attached to the message */
     reply_markup?: Types.InlineKeyboardMarkup
     /** Content of the message to be sent instead of the file */
     input_message_content?: Types.InputMessageContent
@@ -5401,7 +5421,7 @@ export interface MethodParams {
     message_effect_id?: string
     /** An object for description of the message to reply to */
     reply_parameters?: Types.ReplyParameters
-    /** An object for an inline keyboard */
+    /** An object for an [inline keyboard](https://core.telegram.org/bots/features#inline-keyboards) */
     reply_markup?: Types.InlineKeyboardMarkup
   }
   sendDice: {
@@ -5559,6 +5579,8 @@ export interface MethodParams {
     can_manage_topics?: boolean
     /** Pass _True_ if the administrator can manage direct messages within the channel and decline suggested posts; for channels only */
     can_manage_direct_messages?: boolean
+    /** Pass _True_ if the administrator can edit the tags of regular members; for groups and supergroups only */
+    can_manage_tags?: boolean
   }
   setChatAdministratorCustomTitle: {
     /** Unique identifier for the target chat or username of the target supergroup (in the format `@supergroupusername`) */
@@ -5568,6 +5590,14 @@ export interface MethodParams {
     /** New custom title for the administrator; 0-16 characters, emoji are not allowed */
     custom_title: string
   }
+  setChatMemberTag: {
+    /** Unique identifier for the target chat or username of the target supergroup (in the format `@supergroupusername`) */
+    chat_id: number | string
+    /** Unique identifier of the target user */
+    user_id: number
+    /** New tag for the member; 0-16 characters, emoji are not allowed */
+    tag?: string
+  }
   banChatSenderChat: {
     /** Unique identifier for the target chat or username of the target channel (in the format `@channelusername`) */
     chat_id: number | string
@@ -6268,7 +6298,7 @@ export interface MethodParams {
     message_id: number
     /** An object for the new checklist */
     checklist: Types.InputChecklist
-    /** An object for the new inline keyboard for the message */
+    /** An object for the new [inline keyboard](https://core.telegram.org/bots/features#inline-keyboards) for the message */
     reply_markup?: Types.InlineKeyboardMarkup
   }
   editMessageReplyMarkup: void | {
@@ -6730,6 +6760,7 @@ export interface MethodResults {
   restrictChatMember: true
   promoteChatMember: true
   setChatAdministratorCustomTitle: true
+  setChatMemberTag: true
   banChatSenderChat: true
   unbanChatSenderChat: true
   setChatPermissions: true

package/src/internal/botApi.ts

@@ -3,17 +3,16 @@ import type * as BotApiTransport from '../BotApiTransport.ts'
 import * as Effect from 'effect/Effect'
 import * as BotApiError from '../BotApiError.ts'
 
-export const make = ({
-  transport,
-}: {
-  transport: BotApiTransport.Service
-}): BotApi.Service => (
+export const make = ({ transport }: {
+  transport: BotApiTransport.BotApiTransport
+}): BotApi.BotApi => (
   new Proxy({}, {
     get: (_target, prop) => {
       if (typeof prop !== 'string') {
         return
       }
       const method = prop
+      // TODO: Shouldn't we cache effects not to create them on each call?
       return Effect.fnUntraced(
         function* (params: void | Record<string, unknown> = {}) {
           const response = yield* transport.sendRequest(method, params)
@@ -24,5 +23,5 @@ export const make = ({
         },
       )
     },
-  }) as BotApi.Service
+  }) as BotApi.BotApi
 )

package/src/internal/botApiTransport.ts

@@ -18,7 +18,7 @@ interface ExtractedFile {
  * {@linkcode File.InputFile InputFile} instances.
  */
 const hasInputFile = (value: unknown): boolean => {
-  if (value instanceof File.InputFile) {
+  if (File.isInputFile(value)) {
     return true
   }
   if (Array.isArray(value)) {
@@ -34,7 +34,7 @@ const cloneAndExtract = (
   value: unknown,
   files: ExtractedFile[],
 ): unknown => {
-  if (value instanceof File.InputFile) {
+  if (File.isInputFile(value)) {
     const attachId = String(files.length + 1)
     files.push({ attachId, file: value })
     return `attach://${attachId}`
@@ -108,15 +108,14 @@ export const make = ({
   botApiUrl,
 }: {
   httpClient: HttpClient.HttpClient
-  botApiUrl: BotApiUrl.Service
-}): BotApiTransport.Service => ({
+  botApiUrl: BotApiUrl.BotApiUrl
+}): BotApiTransport.BotApiTransport => ({
   sendRequest: (method, params) => (
     Effect.gen(function* () {
       const body = yield* makeHttpBody(params)
       const response = yield* httpClient.post(botApiUrl.toMethod(method), { body })
-      const responseJson = yield* response.json
       // We trust Bot API and don't want to introduce overhead with validation.
-      return responseJson as BotApiTransport.BotApiResponse
+      return (yield* response.json) as BotApiTransport.BotApiResponse
     }).pipe(
       Effect.catchAll(cause => (
         Effect.fail(new BotApiError.TransportError({ cause }))

package/src/internal/dialog.ts

@@ -15,7 +15,7 @@ export const decodeDialogId = (dialogId: number): Option.Option<
 > => {
   if (Number.isSafeInteger(dialogId)) {
     if (1 <= dialogId && dialogId <= 0xFFFFFFFFFF) {
-      return Option.some({ peer: 'user', id: +dialogId as Dialog.UserId })
+      return Option.some({ peer: 'user', id: dialogId as Dialog.UserId })
     }
     if (-999999999999 <= dialogId && dialogId <= -1) {
       return Option.some({ peer: 'group', id: -dialogId as Dialog.GroupId })
@@ -80,34 +80,26 @@ export const ofMessage: (
 ) => Dialog.Dialog = (m) => {
   switch (m.chat.type) {
     case 'private': {
-      const user = new Dialog.User({
-        id: Option.getOrThrow(decodePeerId('user', m.chat.id)),
-      })
+      const user = Dialog.user(Option.getOrThrow(decodePeerId('user', m.chat.id)))
       if (m.message_thread_id != null) {
-        return user.topic(m.message_thread_id)
+        return Dialog.privateTopic(user, m.message_thread_id)
       }
       return user
     }
     case 'group': {
-      return new Dialog.Group({
-        id: Option.getOrThrow(decodePeerId('group', m.chat.id)),
-      })
+      return Dialog.group(Option.getOrThrow(decodePeerId('group', m.chat.id)))
     }
     case 'channel': {
-      const channel = new Dialog.Channel({
-        id: Option.getOrThrow(decodePeerId('channel', m.chat.id)),
-      })
+      const channel = Dialog.channel(Option.getOrThrow(decodePeerId('channel', m.chat.id)))
       if (m.direct_messages_topic != null) {
-        return channel.directMessages(m.direct_messages_topic.topic_id)
+        return Dialog.channelDm(channel, m.direct_messages_topic.topic_id)
       }
       return channel
     }
     case 'supergroup': {
-      const supergroup = new Dialog.Supergroup({
-        id: Option.getOrThrow(decodePeerId('channel', m.chat.id)),
-      })
+      const supergroup = Dialog.supergroup(Option.getOrThrow(decodePeerId('channel', m.chat.id)))
       if (m.message_thread_id != null) {
-        return supergroup.topic(m.message_thread_id)
+        return Dialog.forumTopic(supergroup, m.message_thread_id)
       }
       return supergroup
     }

package/src/internal/file.ts

@@ -1,11 +1,14 @@
-import type { FileId } from '../File.ts'
+import type * as File from '../File.ts'
 import * as HttpClient from '@effect/platform/HttpClient'
 import * as Effect from 'effect/Effect'
 import * as BotApi from '../BotApi.ts'
 import * as BotApiUrl from '../BotApiUrl.ts'
 
+/**
+ * @internal
+ */
 export const download = Effect.fnUntraced(
-  function* (fileId: FileId) {
+  function* (fileId: File.FileId) {
     const file = yield* BotApi.callMethod('getFile', { file_id: fileId })
     if (file.file_path == null) {
       return yield* Effect.die(new Error(`Bot API returned no file path for file "${fileId}".`))