@grom.js/effect-tg 0.13.0 → 0.14.0

package/src/Dialog.ts

@@ -1,6 +1,6 @@
 import type * as BotApi from './BotApi.ts'
 import * as Brand from 'effect/Brand'
-import * as Data from 'effect/Data'
+import * as Match from 'effect/Match'
 import * as Option from 'effect/Option'
 import * as internal from './internal/dialog.ts'
 
@@ -14,20 +14,23 @@ export type Dialog =
   | ForumTopic
   | ChannelDm
 
-export class PrivateTopic extends Data.TaggedClass('PrivateTopic')<{
-  user: User
-  topicId: number
-}> {}
+export interface PrivateTopic {
+  readonly _tag: 'PrivateTopic'
+  readonly user: User
+  readonly topicId: number
+}
 
-export class ForumTopic extends Data.TaggedClass('ForumTopic')<{
-  supergroup: Supergroup
-  topicId: number
-}> {}
+export interface ForumTopic {
+  readonly _tag: 'ForumTopic'
+  readonly supergroup: Supergroup
+  readonly topicId: number
+}
 
-export class ChannelDm extends Data.TaggedClass('ChannelDm')<{
-  channel: Channel
-  topicId: number
-}> {}
+export interface ChannelDm {
+  readonly _tag: 'ChannelDm'
+  readonly channel: Channel
+  readonly topicId: number
+}
 
 // =============================================================================
 // Peer
@@ -39,49 +42,38 @@ export type Peer =
   | Channel
   | Supergroup
 
-export class User extends Data.TaggedClass('User')<{
-  id: UserId
-}> {
-  public dialogId(): DialogId {
-    return Option.getOrThrow(internal.encodePeerId('user', this.id))
-  }
-
-  public topic(topicId: number): PrivateTopic {
-    return new PrivateTopic({ user: this, topicId })
-  }
+export interface User {
+  readonly _tag: 'User'
+  readonly id: UserId
 }
 
-export class Group extends Data.TaggedClass('Group')<{
-  id: GroupId
-}> {
-  public dialogId(): DialogId {
-    return Option.getOrThrow(internal.encodePeerId('group', this.id))
-  }
+export interface Group {
+  readonly _tag: 'Group'
+  readonly id: GroupId
 }
 
-export class Channel extends Data.TaggedClass('Channel')<{
-  id: ChannelId
-}> {
-  public dialogId(): DialogId {
-    return Option.getOrThrow(internal.encodePeerId('channel', this.id))
-  }
+export interface Channel {
+  readonly _tag: 'Channel'
+  readonly id: ChannelId
+}
 
-  public directMessages(topicId: number): ChannelDm {
-    return new ChannelDm({ channel: this, topicId })
-  }
+export interface Supergroup {
+  readonly _tag: 'Supergroup'
+  readonly id: SupergroupId
 }
 
-export class Supergroup extends Data.TaggedClass('Supergroup')<{
-  id: SupergroupId
-}> {
-  public dialogId(): DialogId {
-    return Option.getOrThrow(internal.encodePeerId('channel', this.id))
-  }
+// =============================================================================
+// Peer Functions
+// =============================================================================
 
-  public topic(topicId: number): ForumTopic {
-    return new ForumTopic({ supergroup: this, topicId })
-  }
-}
+export const dialogId: (peer: Peer) => DialogId = Match.type<Peer>().pipe(
+  Match.tagsExhaustive({
+    User: u => Option.getOrThrow(internal.encodePeerId('user', u.id)),
+    Group: g => Option.getOrThrow(internal.encodePeerId('group', g.id)),
+    Channel: c => Option.getOrThrow(internal.encodePeerId('channel', c.id)),
+    Supergroup: s => Option.getOrThrow(internal.encodePeerId('channel', s.id)),
+  }),
+)
 
 // =============================================================================
 // Brands
@@ -93,30 +85,25 @@ export class Supergroup extends Data.TaggedClass('Supergroup')<{
  * @see {@link https://core.telegram.org/api/bots/ids Telegram API • Bot API dialog IDs}
  */
 export type DialogId = number & Brand.Brand<'@grom.js/effect-tg/DialogId'>
-export const DialogId = Brand.refined<DialogId>(
+export const DialogId: Brand.Brand.Constructor<DialogId> = Brand.refined<DialogId>(
   n => Option.isSome(internal.decodeDialogId(n)),
   n => Brand.error(`Invalid dialog ID: ${n}`),
 )
 
 export type UserId = number & Brand.Brand<'@grom.js/effect-tg/UserId'>
-export const UserId = Brand.refined<UserId>(
+export const UserId: Brand.Brand.Constructor<UserId> = Brand.refined<UserId>(
   n => Option.isSome(internal.encodePeerId('user', n)),
   n => Brand.error(`Invalid user ID: ${n}`),
 )
 
 export type GroupId = number & Brand.Brand<'@grom.js/effect-tg/GroupId'>
-export const GroupId = Brand.refined<GroupId>(
+export const GroupId: Brand.Brand.Constructor<GroupId> = Brand.refined<GroupId>(
   n => Option.isSome(internal.encodePeerId('group', n)),
   n => Brand.error(`Invalid group ID: ${n}`),
 )
 
-/**
- * ID for channels (including supergroups).
- *
- * @see {@link https://core.telegram.org/api/bots/ids Telegram API • Bot API dialog IDs}
- */
 export type ChannelId = number & Brand.Brand<'@grom.js/effect-tg/ChannelId'>
-export const ChannelId = Brand.refined<ChannelId>(
+export const ChannelId: Brand.Brand.Constructor<ChannelId> = Brand.refined<ChannelId>(
   n => Option.isSome(internal.encodePeerId('channel', n)),
   n => Brand.error(`Invalid channel or supergroup ID: ${n}`),
 )
@@ -125,7 +112,7 @@ export const ChannelId = Brand.refined<ChannelId>(
 export type SupergroupId = ChannelId
 
 /** @alias ChannelId */
-export const SupergroupId = ChannelId
+export const SupergroupId: Brand.Brand.Constructor<ChannelId> = ChannelId
 
 // =============================================================================
 // Dialog ID <-> Peer ID
@@ -156,21 +143,40 @@ export const encodePeerId: (
 // Constructors
 // =============================================================================
 
-export const user: (id: number) => User = (id) => {
-  return new User({ id: UserId(id) })
-}
-
-export const group: (id: number) => Group = (id) => {
-  return new Group({ id: GroupId(id) })
-}
-
-export const channel: (id: number) => Channel = (id) => {
-  return new Channel({ id: ChannelId(id) })
-}
-
-export const supergroup: (id: number) => Supergroup = (id) => {
-  return new Supergroup({ id: ChannelId(id) })
-}
+export const user: (id: number) => User = id => ({ _tag: 'User', id: UserId(id) })
+
+export const group: (id: number) => Group = id => ({ _tag: 'Group', id: GroupId(id) })
+
+export const channel: (id: number) => Channel = id => ({ _tag: 'Channel', id: ChannelId(id) })
+
+export const supergroup: (id: number) => Supergroup = id => ({ _tag: 'Supergroup', id: ChannelId(id) })
+
+export const privateTopic: (
+  user: User,
+  topicId: number,
+) => PrivateTopic = (user, topicId) => ({
+  _tag: 'PrivateTopic',
+  user,
+  topicId,
+})
+
+export const forumTopic: (
+  supergroup: Supergroup,
+  topicId: number,
+) => ForumTopic = (supergroup, topicId) => ({
+  _tag: 'ForumTopic',
+  supergroup,
+  topicId,
+})
+
+export const channelDm: (
+  channel: Channel,
+  topicId: number,
+) => ChannelDm = (channel, topicId) => ({
+  _tag: 'ChannelDm',
+  channel,
+  topicId,
+})
 
 export const ofMessage: (
   message: BotApi.Types.Message,

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.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}".`))