@grom.js/effect-tg 0.13.0 → 0.14.0

package/src/BotApiError.ts

@@ -1,7 +1,7 @@
 import type * as HttpBody from '@effect/platform/HttpBody'
 import type * as HttpClientError from '@effect/platform/HttpClientError'
 import type * as BotApiTransport from './BotApiTransport.ts'
-import * as Data from 'effect/Data'
+import { TypeIdError } from '@effect/platform/Error'
 import * as Duration from 'effect/Duration'
 import * as Match from 'effect/Match'
 import * as Option from 'effect/Option'
@@ -9,7 +9,7 @@ import * as Predicate from 'effect/Predicate'
 import * as Dialog from './Dialog.ts'
 import * as internal from './internal/botApiError.ts'
 
-export const TypeId = '@grom.js/effect-tg/BotApiError'
+export const TypeId: unique symbol = Symbol.for('@grom.js/effect-tg/BotApiError')
 
 export type TypeId = typeof TypeId
 
@@ -25,14 +25,12 @@ export type BotApiError =
 /**
  * Error caused by the transport when accessing Bot API.
  */
-export class TransportError extends Data.TaggedError('TransportError')<{
-  cause:
+export class TransportError extends TypeIdError(TypeId, 'TransportError')<{
+  readonly cause:
     | HttpClientError.HttpClientError
     | HttpBody.HttpBodyError
 }> {
-  readonly [TypeId]: TypeId = TypeId
-
-  override get message() {
+  override get message(): string {
     return Match.value(this.cause).pipe(
       Match.tagsExhaustive({
         RequestError: e => e.message,
@@ -48,43 +46,39 @@ export class TransportError extends Data.TaggedError('TransportError')<{
   }
 }
 
-export class MethodFailed extends Data.TaggedError('MethodFailed')<{
-  response: FailureResponse
-  possibleReason: MethodFailureReason
+export class MethodFailed extends TypeIdError(TypeId, 'MethodFailed')<{
+  readonly response: FailureResponse
+  readonly possibleReason: MethodFailureReason
 }> {
-  readonly [TypeId]: TypeId = TypeId
-
   override get message() {
     return `(${this.response.error_code}) ${this.response.description}`
   }
 }
 
-export class GroupUpgraded extends Data.TaggedError('GroupUpgraded')<{
-  response: FailureResponse
-  supergroup: Dialog.Supergroup
+export class GroupUpgraded extends TypeIdError(TypeId, 'GroupUpgraded')<{
+  readonly response: FailureResponse
+  readonly supergroup: Dialog.Supergroup
 }> {
-  readonly [TypeId]: TypeId = TypeId
-
   override get message() {
     return `Group has been upgraded to a supergroup with ID ${this.supergroup.id}.`
   }
 }
 
-export class RateLimited extends Data.TaggedError('RateLimited')<{
-  response: FailureResponse
-  retryAfter: Duration.Duration
+export class RateLimited extends TypeIdError(TypeId, 'RateLimited')<{
+  readonly response: FailureResponse
+  readonly retryAfter: Duration.Duration
 }> {
-  readonly [TypeId]: TypeId = TypeId
-
   override get message() {
     return `Flood limit exceeded. Should wait for ${Duration.format(this.retryAfter)} before retrying.`
   }
 }
 
-export class InternalServerError extends Data.TaggedError('InternalServerError')<{
-  response: FailureResponse
+export class InternalServerError extends TypeIdError(TypeId, 'InternalServerError')<{
+  readonly response: FailureResponse
 }> {
-  readonly [TypeId]: TypeId = TypeId
+  override get message() {
+    return `Internal error (${this.response.error_code}): ${this.response.description}`
+  }
 }
 
 export const fromResponse = (response: FailureResponse): BotApiError => {

package/src/BotApiTransport.ts

@@ -7,18 +7,15 @@ import * as Layer from 'effect/Layer'
 import * as BotApiUrl from './BotApiUrl.ts'
 import * as internal from './internal/botApiTransport.ts'
 
-export class BotApiTransport extends Context.Tag('@grom.js/effect-tg/BotApiTransport')<
-  BotApiTransport,
-  Service
->() {}
-
-export interface Service {
-  sendRequest: (
+export interface BotApiTransport {
+  readonly sendRequest: (
     method: string,
     params: unknown,
   ) => Effect.Effect<BotApiResponse, BotApiError.TransportError>
 }
 
+export const BotApiTransport: Context.Tag<BotApiTransport, BotApiTransport> = Context.GenericTag<BotApiTransport>('@grom.js/effect-tg/BotApiTransport')
+
 /**
  * @see https://core.telegram.org/bots/api#making-requests
  */
@@ -36,8 +33,8 @@ export type BotApiResponse =
 
 export const make: (options: {
   httpClient: HttpClient.HttpClient
-  botApiUrl: BotApiUrl.Service
-}) => Service = internal.make
+  botApiUrl: BotApiUrl.BotApiUrl
+}) => BotApiTransport = internal.make
 
 export const layer: Layer.Layer<
   BotApiTransport,

package/src/BotApiUrl.ts

@@ -1,23 +1,20 @@
 import * as Context from 'effect/Context'
 
-export class BotApiUrl extends Context.Tag('@grom.js/effect-tg/BotApiUrl')<
-  BotApiUrl,
-  Service
->() {}
-
-export interface Service {
-  toMethod: (method: string) => URL
-  toFile: (filePath: string) => URL
+export interface BotApiUrl {
+  readonly toMethod: (method: string) => URL
+  readonly toFile: (filePath: string) => URL
 }
 
-export const makeProd = (token: string): Service => (
+export const BotApiUrl: Context.Tag<BotApiUrl, BotApiUrl> = Context.GenericTag<BotApiUrl>('@grom.js/effect-tg/BotApiUrl')
+
+export const makeProd = (token: string): BotApiUrl => (
   {
     toMethod: (method: string) => new URL(`https://api.telegram.org/bot${token}/${method}`),
     toFile: (filePath: string) => new URL(`https://api.telegram.org/file/bot${token}/${filePath}`),
   }
 )
 
-export const makeTest = (token: string): Service => (
+export const makeTest = (token: string): BotApiUrl => (
   {
     toMethod: (method: string) => new URL(`https://api.telegram.org/bot${token}/test/${method}`),
     // TODO: make sure this works in test environment

package/src/Content.ts

@@ -2,7 +2,6 @@ import type * as Duration from 'effect/Duration'
 import type * as File from './File.ts'
 import type * as LinkPreview from './LinkPreview.ts'
 import type * as Text_ from './Text.ts'
-import * as Data from 'effect/Data'
 import * as Option from 'effect/Option'
 
 /**
@@ -28,184 +27,171 @@ export type Content =
   | Sticker
 
 /**
- * Content of a text message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_text.html TDLib • td_api.inputMessageText}
  * @see {@link https://core.telegram.org/bots/api#sendmessage Bot API • sendMessage}
  */
-export class Text extends Data.TaggedClass('Text')<{
-  text: Text_.Text
-  linkPreview: Option.Option<LinkPreview.LinkPreview>
-}> {}
+export interface Text {
+  readonly _tag: 'Text'
+  readonly text: Text_.Text
+  readonly linkPreview: Option.Option<LinkPreview.LinkPreview>
+}
 
 /**
- * Content of a photo message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_photo.html TDLib • td_api.inputMessagePhoto}
  * @see {@link https://core.telegram.org/bots/api#sendphoto Bot API • sendPhoto}
  */
-export class Photo extends Data.TaggedClass('Photo')<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  layout: 'caption-above' | 'caption-below'
-  spoiler: boolean
-}> {}
+export interface Photo {
+  readonly _tag: 'Photo'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly layout: 'caption-above' | 'caption-below'
+  readonly spoiler: boolean
+}
 
 /**
- * Content of an audio message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_audio.html TDLib • td_api.inputMessageAudio}
  * @see {@link https://core.telegram.org/bots/api#sendaudio Bot API • sendAudio}
  */
-export class Audio extends Data.TaggedClass('Audio')<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  duration: Option.Option<Duration.Duration>
-  performer: Option.Option<string>
-  title: Option.Option<string>
-  thumbnail: Option.Option<File.InputFile>
-}> {}
+export interface Audio {
+  readonly _tag: 'Audio'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly duration: Option.Option<Duration.Duration>
+  readonly performer: Option.Option<string>
+  readonly title: Option.Option<string>
+  readonly thumbnail: Option.Option<File.InputFile>
+}
 
 /**
- * Content of a document message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_document.html TDLib • td_api.inputMessageDocument}
  * @see {@link https://core.telegram.org/bots/api#senddocument Bot API • sendDocument}
  */
-export class Document extends Data.TaggedClass('Document')<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  thumbnail: Option.Option<File.InputFile>
-  contentTypeDetection: boolean
-}> {}
+export interface Document {
+  readonly _tag: 'Document'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly thumbnail: Option.Option<File.InputFile>
+  readonly contentTypeDetection: boolean
+}
 
 /**
- * Content of a video message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_video.html TDLib • td_api.inputMessageVideo}
  * @see {@link https://core.telegram.org/bots/api#sendvideo Bot API • sendVideo}
  */
-export class Video extends Data.TaggedClass('Video')<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  layout: 'caption-above' | 'caption-below'
-  spoiler: boolean
-  duration: Option.Option<Duration.Duration>
-  width: Option.Option<number>
-  height: Option.Option<number>
-  thumbnail: Option.Option<File.InputFile>
-  cover: Option.Option<File.FileId | File.External | File.InputFile>
-  startAt: Option.Option<Duration.Duration>
-  supportsStreaming: boolean
-}> {}
+export interface Video {
+  readonly _tag: 'Video'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly layout: 'caption-above' | 'caption-below'
+  readonly spoiler: boolean
+  readonly duration: Option.Option<Duration.Duration>
+  readonly width: Option.Option<number>
+  readonly height: Option.Option<number>
+  readonly thumbnail: Option.Option<File.InputFile>
+  readonly cover: Option.Option<File.FileId | File.External | File.InputFile>
+  readonly startAt: Option.Option<Duration.Duration>
+  readonly supportsStreaming: boolean
+}
 
 /**
- * Content of an animation message (GIF or video without sound).
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_animation.html TDLib • td_api.inputMessageAnimation}
  * @see {@link https://core.telegram.org/bots/api#sendanimation Bot API • sendAnimation}
  */
-export class Animation extends Data.TaggedClass('Animation')<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  layout: 'caption-above' | 'caption-below'
-  spoiler: boolean
-  duration: Option.Option<Duration.Duration>
-  width: Option.Option<number>
-  height: Option.Option<number>
-  thumbnail: Option.Option<File.InputFile>
-}> {}
+export interface Animation {
+  readonly _tag: 'Animation'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly layout: 'caption-above' | 'caption-below'
+  readonly spoiler: boolean
+  readonly duration: Option.Option<Duration.Duration>
+  readonly width: Option.Option<number>
+  readonly height: Option.Option<number>
+  readonly thumbnail: Option.Option<File.InputFile>
+}
 
 /**
- * Content of a voice note message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_voice_note.html TDLib • td_api.inputMessageVoiceNote}
  * @see {@link https://core.telegram.org/bots/api#sendvoice Bot API • sendVoice}
  */
-export class Voice extends Data.TaggedClass('Voice')<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  duration: Option.Option<Duration.Duration>
-}> {}
+export interface Voice {
+  readonly _tag: 'Voice'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly duration: Option.Option<Duration.Duration>
+}
 
 /**
- * Content of a video note message (round video).
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_video_note.html TDLib • td_api.inputMessageVideoNote}
  * @see {@link https://core.telegram.org/bots/api#sendvideonote Bot API • sendVideoNote}
  */
-export class VideoNote extends Data.TaggedClass('VideoNote')<{
-  file: File.FileId | File.InputFile
-  duration: Option.Option<Duration.Duration>
-  diameter: Option.Option<number>
-  thumbnail: Option.Option<File.InputFile>
-}> {}
+export interface VideoNote {
+  readonly _tag: 'VideoNote'
+  readonly file: File.FileId | File.InputFile
+  readonly duration: Option.Option<Duration.Duration>
+  readonly diameter: Option.Option<number>
+  readonly thumbnail: Option.Option<File.InputFile>
+}
 
 /**
- * Content of a location message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_location.html TDLib • td_api.inputMessageLocation}
  * @see {@link https://core.telegram.org/bots/api#sendlocation Bot API • sendLocation}
  */
-export class Location extends Data.TaggedClass('Location')<{
-  latitude: number
-  longitude: number
-  uncertaintyRadius: Option.Option<number>
-  livePeriod: Option.Option<Duration.Duration>
-  heading: Option.Option<number>
-  proximityAlertRadius: Option.Option<number>
-}> {}
+export interface Location {
+  readonly _tag: 'Location'
+  readonly latitude: number
+  readonly longitude: number
+  readonly uncertaintyRadius: Option.Option<number>
+  readonly livePeriod: Option.Option<Duration.Duration>
+  readonly heading: Option.Option<number>
+  readonly proximityAlertRadius: Option.Option<number>
+}
 
 /**
- * Content of a venue message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_venue.html TDLib • td_api.inputMessageVenue}
  * @see {@link https://core.telegram.org/bots/api#sendvenue Bot API • sendVenue}
  */
-export class Venue extends Data.TaggedClass('Venue')<{
-  latitude: number
-  longitude: number
-  title: string
-  address: string
-  foursquareId: Option.Option<string>
-  foursquareType: Option.Option<string>
-  googlePlaceId: Option.Option<string>
-  googlePlaceType: Option.Option<string>
-}> {}
+export interface Venue {
+  readonly _tag: 'Venue'
+  readonly latitude: number
+  readonly longitude: number
+  readonly title: string
+  readonly address: string
+  readonly foursquareId: Option.Option<string>
+  readonly foursquareType: Option.Option<string>
+  readonly googlePlaceId: Option.Option<string>
+  readonly googlePlaceType: Option.Option<string>
+}
 
 /**
- * Content of a contact message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_contact.html TDLib • td_api.inputMessageContact}
  * @see {@link https://core.telegram.org/bots/api#sendcontact Bot API • sendContact}
  */
-export class Contact extends Data.TaggedClass('Contact')<{
-  phoneNumber: string
-  firstName: string
-  lastName: Option.Option<string>
-  vcard: Option.Option<string>
-}> {}
+export interface Contact {
+  readonly _tag: 'Contact'
+  readonly phoneNumber: string
+  readonly firstName: string
+  readonly lastName: Option.Option<string>
+  readonly vcard: Option.Option<string>
+}
 
 /**
- * Content of a dice message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_dice.html TDLib • td_api.inputMessageDice}
  * @see {@link https://core.telegram.org/bots/api#senddice Bot API • sendDice}
  */
-export class Dice extends Data.TaggedClass('Dice')<{
-  emoji: '🎲' | '🎯' | '🏀' | '⚽' | '🎳' | '🎰'
-}> {}
+export interface Dice {
+  readonly _tag: 'Dice'
+  readonly emoji: '🎲' | '🎯' | '🏀' | '⚽' | '🎳' | '🎰'
+}
 
 /**
- * Content of a sticker message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_sticker.html TDLib • td_api.inputMessageSticker}
  * @see {@link https://core.telegram.org/bots/api#sendsticker Bot API • sendSticker}
  */
-export class Sticker extends Data.TaggedClass('Sticker')<{
-  file: File.FileId | File.External | File.InputFile
-  emoji: Option.Option<string>
-}> {}
+export interface Sticker {
+  readonly _tag: 'Sticker'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly emoji: Option.Option<string>
+}
 
 // ——— Constructors ——————————————————————————————————————————————————————————
 
@@ -214,7 +200,8 @@ export const text = (
   options?: {
     linkPreview?: LinkPreview.LinkPreview
   },
-) => new Text({
+): Text => ({
+  _tag: 'Text',
   text,
   linkPreview: Option.fromNullable(options?.linkPreview),
 })
@@ -226,7 +213,8 @@ export const photo = (
     layout?: 'caption-above' | 'caption-below'
     spoiler?: boolean
   },
-): Photo => new Photo({
+): Photo => ({
+  _tag: 'Photo',
   file,
   caption: Option.fromNullable(options.caption),
   layout: options.layout ?? 'caption-below',
@@ -242,7 +230,8 @@ export const audio = (
     title?: string
     thumbnail?: File.InputFile
   },
-): Audio => new Audio({
+): Audio => ({
+  _tag: 'Audio',
   file,
   caption: Option.fromNullable(options.caption),
   duration: Option.fromNullable(options.duration),
@@ -258,7 +247,8 @@ export const document = (
     thumbnail?: File.InputFile
     contentTypeDetection?: boolean
   },
-): Document => new Document({
+): Document => ({
+  _tag: 'Document',
   file,
   caption: Option.fromNullable(options.caption),
   thumbnail: Option.fromNullable(options.thumbnail),
@@ -279,7 +269,8 @@ export const video = (
     startAt?: Duration.Duration
     supportsStreaming?: boolean
   },
-): Video => new Video({
+): Video => ({
+  _tag: 'Video',
   file,
   caption: Option.fromNullable(options.caption),
   layout: options.layout ?? 'caption-below',
@@ -304,7 +295,8 @@ export const animation = (
     height?: number
     thumbnail?: File.InputFile
   },
-): Animation => new Animation({
+): Animation => ({
+  _tag: 'Animation',
   file,
   caption: Option.fromNullable(options.caption),
   layout: options.layout ?? 'caption-below',
@@ -321,7 +313,8 @@ export const voice = (
     caption?: Text_.Text
     duration?: Duration.Duration
   },
-): Voice => new Voice({
+): Voice => ({
+  _tag: 'Voice',
   file,
   caption: Option.fromNullable(options.caption),
   duration: Option.fromNullable(options.duration),
@@ -334,7 +327,8 @@ export const videoNote = (
     diameter?: number
     thumbnail?: File.InputFile
   },
-): VideoNote => new VideoNote({
+): VideoNote => ({
+  _tag: 'VideoNote',
   file,
   duration: Option.fromNullable(options.duration),
   diameter: Option.fromNullable(options.diameter),
@@ -345,7 +339,8 @@ export const location = (options: {
   latitude: number
   longitude: number
   uncertaintyRadius?: number
-}): Location => new Location({
+}): Location => ({
+  _tag: 'Location',
   latitude: options.latitude,
   longitude: options.longitude,
   uncertaintyRadius: Option.fromNullable(options.uncertaintyRadius),
@@ -361,7 +356,8 @@ export const liveLocation = (options: {
   livePeriod: Duration.Duration
   heading?: number
   proximityAlertRadius?: number
-}): Location => new Location({
+}): Location => ({
+  _tag: 'Location',
   latitude: options.latitude,
   longitude: options.longitude,
   uncertaintyRadius: Option.fromNullable(options.uncertaintyRadius),
@@ -379,7 +375,8 @@ export const venue = (options: {
   foursquareType?: string
   googlePlaceId?: string
   googlePlaceType?: string
-}): Venue => new Venue({
+}): Venue => ({
+  _tag: 'Venue',
   latitude: options.latitude,
   longitude: options.longitude,
   title: options.title,
@@ -395,16 +392,17 @@ export const contact = (options: {
   firstName: string
   lastName?: string
   vcard?: string
-}): Contact => new Contact({
+}): Contact => ({
+  _tag: 'Contact',
   phoneNumber: options.phoneNumber,
   firstName: options.firstName,
   lastName: Option.fromNullable(options.lastName),
   vcard: Option.fromNullable(options.vcard),
 })
 
-export const dice = (emoji: Dice['emoji']): Dice => new Dice({ emoji })
+export const dice = (emoji: Dice['emoji']): Dice => ({ _tag: 'Dice', emoji })
 
 export const sticker = (
   file: File.FileId | File.External | File.InputFile,
   emoji?: string,
-): Sticker => new Sticker({ file, emoji: Option.fromNullable(emoji) })
+): Sticker => ({ _tag: 'Sticker', file, emoji: Option.fromNullable(emoji) })