@effect-ak/tg-bot-client 1.2.0 → 1.3.1

package/dist/index.cjs

@@ -24,9 +24,7 @@ __export(index_exports, {
   TG_BOT_API_URL: () => TG_BOT_API_URL,
   TgBotClientError: () => TgBotClientError,
   executeTgBotMethod: () => executeTgBotMethod,
-  getBaseUrl: () => getBaseUrl,
   getFile: () => getFile,
-  getFileBytes: () => getFileBytes,
   isFileContent: () => isFileContent,
   isMessageEffect: () => isMessageEffect,
   isTgBotApiResponse: () => isTgBotApiResponse,
@@ -52,28 +50,6 @@ var TgBotClientError = class extends Error {
 var isFileContent = (input) => typeof input == "object" && input != null && "file_content" in input && input.file_content instanceof Uint8Array && "file_name" in input && typeof input.file_name == "string";
 var isTgBotApiResponse = (input) => typeof input == "object" && input != null && "ok" in input && typeof input.ok == "boolean";
 
-// src/const.ts
-var TG_BOT_API_URL = "https://api.telegram.org";
-var MESSAGE_EFFECTS = {
-  "\u{1F525}": "5104841245755180586",
-  "\u{1F44D}": "5107584321108051014",
-  "\u{1F44E}": "5104858069142078462",
-  "\u2764\uFE0F": "5159385139981059251",
-  "\u{1F389}": "5046509860389126442",
-  "\u{1F4A9}": "5046589136895476101"
-};
-var messageEffectIdCodes = Object.keys(
-  MESSAGE_EFFECTS
-);
-var isMessageEffect = (input) => {
-  return typeof input === "string" && input in MESSAGE_EFFECTS;
-};
-
-// src/config.ts
-var getBaseUrl = (config) => {
-  return config?.baseUrl ?? TG_BOT_API_URL;
-};
-
 // src/utils.ts
 var snakeToCamel = (str) => {
   return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
@@ -82,12 +58,10 @@ var snakeToCamel = (str) => {
 // src/execute.ts
 async function executeTgBotMethod(params) {
   const { config, method, input } = params;
-  const baseUrl = getBaseUrl(config);
-  const botToken = config.botToken;
   let httpResponse;
   try {
     httpResponse = await fetch(
-      `${baseUrl}/bot${botToken}/${snakeToCamel(method)}`,
+      `${config.base_url}/bot${config.bot_token}/${snakeToCamel(method)}`,
       {
         body: makePayload(input) ?? null,
         method: "POST"
@@ -140,8 +114,8 @@ var makePayload = (body) => {
 };
 
 // src/client-file.ts
-var getFileBytes = async (fileId, context) => {
-  const { config, execute } = context;
+var getFile = async (params) => {
+  const { fileId, config, execute } = params;
   const response = await execute("get_file", { file_id: fileId });
   const file_path = response.file_path;
   if (!file_path || file_path.length === 0) {
@@ -153,9 +127,7 @@ var getFileBytes = async (fileId, context) => {
     });
   }
   const file_name = file_path.replaceAll("/", "-");
-  const baseUrl = getBaseUrl(config);
-  const botToken = config.botToken;
-  const url = `${baseUrl}/file/bot${botToken}/${file_path}`;
+  const url = `${config.base_url}/file/bot${config.bot_token}/${file_path}`;
   let content;
   try {
     content = await fetch(url).then((_) => _.arrayBuffer());
@@ -165,29 +137,49 @@ var getFileBytes = async (fileId, context) => {
     });
   }
   const base64String = () => Buffer.from(content).toString("base64");
+  const file = () => new File([content], file_name, {
+    ...params.type ? { type: params.type } : {}
+  });
   return {
     content,
     file_name,
-    base64String
+    base64String,
+    file
   };
 };
-var getFile = async (input, context) => {
-  const { content, file_name } = await getFileBytes(input.fileId, context);
-  return new File([content], file_name, {
-    ...input.type ? { type: input.type } : {}
-  });
+
+// src/const.ts
+var TG_BOT_API_URL = "https://api.telegram.org";
+var MESSAGE_EFFECTS = {
+  "\u{1F525}": "5104841245755180586",
+  "\u{1F44D}": "5107584321108051014",
+  "\u{1F44E}": "5104858069142078462",
+  "\u2764\uFE0F": "5159385139981059251",
+  "\u{1F389}": "5046509860389126442",
+  "\u{1F4A9}": "5046589136895476101"
+};
+var messageEffectIdCodes = Object.keys(
+  MESSAGE_EFFECTS
+);
+var isMessageEffect = (input) => {
+  return typeof input === "string" && input in MESSAGE_EFFECTS;
 };
 
 // src/client.ts
 function makeTgBotClient(config) {
   const tgConfig = {
-    botToken: config.bot_token,
-    ...config.base_url ? { baseUrl: config.base_url } : {}
+    bot_token: config.bot_token,
+    base_url: config.base_url ?? TG_BOT_API_URL
   };
-  const execute = (method, input) => executeTgBotMethod({ config: tgConfig, method, input });
+  const execute = (method, input) => executeTgBotMethod({
+    config: tgConfig,
+    method,
+    input
+  });
   return {
+    config: tgConfig,
     execute,
-    getFile: (input) => getFile(input, { config: tgConfig, execute })
+    getFile: (input) => getFile({ ...input, config: tgConfig, execute })
   };
 }
 // Annotate the CommonJS export names for ESM import in node:
@@ -196,9 +188,7 @@ function makeTgBotClient(config) {
   TG_BOT_API_URL,
   TgBotClientError,
   executeTgBotMethod,
-  getBaseUrl,
   getFile,
-  getFileBytes,
   isFileContent,
   isMessageEffect,
   isTgBotApiResponse,

package/dist/index.d.cts

@@ -1,43 +1,42 @@
 import { Api } from '@effect-ak/tg-bot-api';
 
-interface TgBotConfig {
-    botToken: string;
-    baseUrl?: string;
+interface TgFile {
+    readonly content: ArrayBuffer;
+    readonly file_name: string;
+    readonly base64String: () => string;
+    readonly file: () => File;
 }
-declare const getBaseUrl: (config?: Pick<TgBotConfig, "baseUrl">) => string;
-
-declare function executeTgBotMethod<M extends keyof Api>(params: {
-    config: TgBotConfig;
-    method: M;
-    input: Parameters<Api[M]>[0];
-}): Promise<ReturnType<Api[M]>>;
-declare const makePayload: (body: object) => FormData | undefined;
-
-interface GetFile {
+declare const getFile: (params: {
     fileId: string;
+    config: {
+        bot_token: string;
+        base_url: string;
+    };
     type?: string;
-}
-interface FileBytes {
-    content: ArrayBuffer;
-    file_name: string;
-    base64String: () => string;
-}
-interface FileContext {
-    config: TgBotConfig;
-    execute: <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Promise<ReturnType<Api[M]>>;
-}
-declare const getFileBytes: (fileId: string, context: FileContext) => Promise<FileBytes>;
-declare const getFile: (input: GetFile, context: FileContext) => Promise<File>;
+    execute: ExecuteMethod;
+}) => Promise<TgFile>;
 
 interface TgBotClient {
-    readonly execute: <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Promise<ReturnType<Api[M]>>;
-    readonly getFile: (input: GetFile) => Promise<File>;
+    readonly config: Required<TgClientConfig>;
+    readonly execute: ExecuteMethod;
+    readonly getFile: (input: {
+        fileId: string;
+        type?: string;
+    }) => Promise<TgFile>;
 }
-interface MakeTgClient {
+interface TgClientConfig {
     bot_token: string;
     base_url?: string;
 }
-declare function makeTgBotClient(config: MakeTgClient): TgBotClient;
+declare function makeTgBotClient(config: TgClientConfig): TgBotClient;
+
+type ExecuteMethod = <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Promise<ReturnType<Api[M]>>;
+declare function executeTgBotMethod<M extends keyof Api>(params: {
+    config: Required<TgClientConfig>;
+    method: M;
+    input: Parameters<Api[M]>[0];
+}): Promise<ReturnType<Api[M]>>;
+declare const makePayload: (body: object) => FormData | undefined;
 
 type ErrorReason = {
     _tag: "NotOkResponse";
@@ -95,4 +94,4 @@ declare const isMessageEffect: (input: unknown) => input is MessageEffect;
 
 declare const snakeToCamel: (str: string) => string;
 
-export { type FileBytes, type FileContent, type GetFile, MESSAGE_EFFECTS, type MakeTgClient, type MessageEffect, TG_BOT_API_URL, type TgBotApiResponseSchema, type TgBotClient, TgBotClientError, type TgBotConfig, executeTgBotMethod, getBaseUrl, getFile, getFileBytes, isFileContent, isMessageEffect, isTgBotApiResponse, makePayload, makeTgBotClient, messageEffectIdCodes, snakeToCamel };
+export { type ExecuteMethod, type FileContent, MESSAGE_EFFECTS, type MessageEffect, TG_BOT_API_URL, type TgBotApiResponseSchema, type TgBotClient, TgBotClientError, type TgClientConfig, type TgFile, executeTgBotMethod, getFile, isFileContent, isMessageEffect, isTgBotApiResponse, makePayload, makeTgBotClient, messageEffectIdCodes, snakeToCamel };

package/dist/index.d.ts

@@ -1,43 +1,42 @@
 import { Api } from '@effect-ak/tg-bot-api';
 
-interface TgBotConfig {
-    botToken: string;
-    baseUrl?: string;
+interface TgFile {
+    readonly content: ArrayBuffer;
+    readonly file_name: string;
+    readonly base64String: () => string;
+    readonly file: () => File;
 }
-declare const getBaseUrl: (config?: Pick<TgBotConfig, "baseUrl">) => string;
-
-declare function executeTgBotMethod<M extends keyof Api>(params: {
-    config: TgBotConfig;
-    method: M;
-    input: Parameters<Api[M]>[0];
-}): Promise<ReturnType<Api[M]>>;
-declare const makePayload: (body: object) => FormData | undefined;
-
-interface GetFile {
+declare const getFile: (params: {
     fileId: string;
+    config: {
+        bot_token: string;
+        base_url: string;
+    };
     type?: string;
-}
-interface FileBytes {
-    content: ArrayBuffer;
-    file_name: string;
-    base64String: () => string;
-}
-interface FileContext {
-    config: TgBotConfig;
-    execute: <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Promise<ReturnType<Api[M]>>;
-}
-declare const getFileBytes: (fileId: string, context: FileContext) => Promise<FileBytes>;
-declare const getFile: (input: GetFile, context: FileContext) => Promise<File>;
+    execute: ExecuteMethod;
+}) => Promise<TgFile>;
 
 interface TgBotClient {
-    readonly execute: <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Promise<ReturnType<Api[M]>>;
-    readonly getFile: (input: GetFile) => Promise<File>;
+    readonly config: Required<TgClientConfig>;
+    readonly execute: ExecuteMethod;
+    readonly getFile: (input: {
+        fileId: string;
+        type?: string;
+    }) => Promise<TgFile>;
 }
-interface MakeTgClient {
+interface TgClientConfig {
     bot_token: string;
     base_url?: string;
 }
-declare function makeTgBotClient(config: MakeTgClient): TgBotClient;
+declare function makeTgBotClient(config: TgClientConfig): TgBotClient;
+
+type ExecuteMethod = <M extends keyof Api>(method: M, input: Parameters<Api[M]>[0]) => Promise<ReturnType<Api[M]>>;
+declare function executeTgBotMethod<M extends keyof Api>(params: {
+    config: Required<TgClientConfig>;
+    method: M;
+    input: Parameters<Api[M]>[0];
+}): Promise<ReturnType<Api[M]>>;
+declare const makePayload: (body: object) => FormData | undefined;
 
 type ErrorReason = {
     _tag: "NotOkResponse";
@@ -95,4 +94,4 @@ declare const isMessageEffect: (input: unknown) => input is MessageEffect;
 
 declare const snakeToCamel: (str: string) => string;
 
-export { type FileBytes, type FileContent, type GetFile, MESSAGE_EFFECTS, type MakeTgClient, type MessageEffect, TG_BOT_API_URL, type TgBotApiResponseSchema, type TgBotClient, TgBotClientError, type TgBotConfig, executeTgBotMethod, getBaseUrl, getFile, getFileBytes, isFileContent, isMessageEffect, isTgBotApiResponse, makePayload, makeTgBotClient, messageEffectIdCodes, snakeToCamel };
+export { type ExecuteMethod, type FileContent, MESSAGE_EFFECTS, type MessageEffect, TG_BOT_API_URL, type TgBotApiResponseSchema, type TgBotClient, TgBotClientError, type TgClientConfig, type TgFile, executeTgBotMethod, getFile, isFileContent, isMessageEffect, isTgBotApiResponse, makePayload, makeTgBotClient, messageEffectIdCodes, snakeToCamel };

package/dist/index.js

@@ -13,28 +13,6 @@ var TgBotClientError = class extends Error {
 var isFileContent = (input) => typeof input == "object" && input != null && "file_content" in input && input.file_content instanceof Uint8Array && "file_name" in input && typeof input.file_name == "string";
 var isTgBotApiResponse = (input) => typeof input == "object" && input != null && "ok" in input && typeof input.ok == "boolean";
 
-// src/const.ts
-var TG_BOT_API_URL = "https://api.telegram.org";
-var MESSAGE_EFFECTS = {
-  "\u{1F525}": "5104841245755180586",
-  "\u{1F44D}": "5107584321108051014",
-  "\u{1F44E}": "5104858069142078462",
-  "\u2764\uFE0F": "5159385139981059251",
-  "\u{1F389}": "5046509860389126442",
-  "\u{1F4A9}": "5046589136895476101"
-};
-var messageEffectIdCodes = Object.keys(
-  MESSAGE_EFFECTS
-);
-var isMessageEffect = (input) => {
-  return typeof input === "string" && input in MESSAGE_EFFECTS;
-};
-
-// src/config.ts
-var getBaseUrl = (config) => {
-  return config?.baseUrl ?? TG_BOT_API_URL;
-};
-
 // src/utils.ts
 var snakeToCamel = (str) => {
   return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
@@ -43,12 +21,10 @@ var snakeToCamel = (str) => {
 // src/execute.ts
 async function executeTgBotMethod(params) {
   const { config, method, input } = params;
-  const baseUrl = getBaseUrl(config);
-  const botToken = config.botToken;
   let httpResponse;
   try {
     httpResponse = await fetch(
-      `${baseUrl}/bot${botToken}/${snakeToCamel(method)}`,
+      `${config.base_url}/bot${config.bot_token}/${snakeToCamel(method)}`,
       {
         body: makePayload(input) ?? null,
         method: "POST"
@@ -101,8 +77,8 @@ var makePayload = (body) => {
 };
 
 // src/client-file.ts
-var getFileBytes = async (fileId, context) => {
-  const { config, execute } = context;
+var getFile = async (params) => {
+  const { fileId, config, execute } = params;
   const response = await execute("get_file", { file_id: fileId });
   const file_path = response.file_path;
   if (!file_path || file_path.length === 0) {
@@ -114,9 +90,7 @@ var getFileBytes = async (fileId, context) => {
     });
   }
   const file_name = file_path.replaceAll("/", "-");
-  const baseUrl = getBaseUrl(config);
-  const botToken = config.botToken;
-  const url = `${baseUrl}/file/bot${botToken}/${file_path}`;
+  const url = `${config.base_url}/file/bot${config.bot_token}/${file_path}`;
   let content;
   try {
     content = await fetch(url).then((_) => _.arrayBuffer());
@@ -126,29 +100,49 @@ var getFileBytes = async (fileId, context) => {
     });
   }
   const base64String = () => Buffer.from(content).toString("base64");
+  const file = () => new File([content], file_name, {
+    ...params.type ? { type: params.type } : {}
+  });
   return {
     content,
     file_name,
-    base64String
+    base64String,
+    file
   };
 };
-var getFile = async (input, context) => {
-  const { content, file_name } = await getFileBytes(input.fileId, context);
-  return new File([content], file_name, {
-    ...input.type ? { type: input.type } : {}
-  });
+
+// src/const.ts
+var TG_BOT_API_URL = "https://api.telegram.org";
+var MESSAGE_EFFECTS = {
+  "\u{1F525}": "5104841245755180586",
+  "\u{1F44D}": "5107584321108051014",
+  "\u{1F44E}": "5104858069142078462",
+  "\u2764\uFE0F": "5159385139981059251",
+  "\u{1F389}": "5046509860389126442",
+  "\u{1F4A9}": "5046589136895476101"
+};
+var messageEffectIdCodes = Object.keys(
+  MESSAGE_EFFECTS
+);
+var isMessageEffect = (input) => {
+  return typeof input === "string" && input in MESSAGE_EFFECTS;
 };
 
 // src/client.ts
 function makeTgBotClient(config) {
   const tgConfig = {
-    botToken: config.bot_token,
-    ...config.base_url ? { baseUrl: config.base_url } : {}
+    bot_token: config.bot_token,
+    base_url: config.base_url ?? TG_BOT_API_URL
   };
-  const execute = (method, input) => executeTgBotMethod({ config: tgConfig, method, input });
+  const execute = (method, input) => executeTgBotMethod({
+    config: tgConfig,
+    method,
+    input
+  });
   return {
+    config: tgConfig,
     execute,
-    getFile: (input) => getFile(input, { config: tgConfig, execute })
+    getFile: (input) => getFile({ ...input, config: tgConfig, execute })
   };
 }
 export {
@@ -156,9 +150,7 @@ export {
   TG_BOT_API_URL,
   TgBotClientError,
   executeTgBotMethod,
-  getBaseUrl,
   getFile,
-  getFileBytes,
   isFileContent,
   isMessageEffect,
   isTgBotApiResponse,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@effect-ak/tg-bot-client",
   "type": "module",
   "description": "Type-safe HTTP client for Telegram Bot API",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "license": "MIT",
   "author": {
     "name": "Aleksandr Kondaurov",
@@ -30,9 +30,10 @@
     }
   },
   "dependencies": {
-    "@effect-ak/tg-bot-api": "0.9.2"
+    "@effect-ak/tg-bot-api": "^1.0.0"
   },
   "scripts": {
-    "build": "tsup"
+    "build": "tsup",
+    "typecheck": "tsc"
   }
 }

package/src/client-file.ts

@@ -1,32 +1,23 @@
-import type { Api } from "@effect-ak/tg-bot-api"
 import { TgBotClientError } from "./errors"
-import type { TgBotConfig } from "./config"
-import { getBaseUrl } from "./config"
+import type { ExecuteMethod } from "./execute"
 
-export interface GetFile {
-  fileId: string
-  type?: string
-}
-
-export interface FileBytes {
-  content: ArrayBuffer
-  file_name: string
-  base64String: () => string
-}
-
-interface FileContext {
-  config: TgBotConfig
-  execute: <M extends keyof Api>(
-    method: M,
-    input: Parameters<Api[M]>[0]
-  ) => Promise<ReturnType<Api[M]>>
+export interface TgFile {
+  readonly content: ArrayBuffer
+  readonly file_name: string
+  readonly base64String: () => string
+  readonly file: () => File
 }
 
-export const getFileBytes = async (
-  fileId: string,
-  context: FileContext
-): Promise<FileBytes> => {
-  const { config, execute } = context
+export const getFile = async (params: {
+  fileId: string
+  config: {
+    bot_token: string
+    base_url: string
+  }
+  type?: string
+  execute: ExecuteMethod
+}): Promise<TgFile> => {
+  const { fileId, config, execute } = params
   const response = await execute("get_file", { file_id: fileId })
   const file_path = response.file_path
 
@@ -40,9 +31,7 @@ export const getFileBytes = async (
   }
 
   const file_name = file_path.replaceAll("/", "-")
-  const baseUrl = getBaseUrl(config)
-  const botToken = config.botToken
-  const url = `${baseUrl}/file/bot${botToken}/${file_path}`
+  const url = `${config.base_url}/file/bot${config.bot_token}/${file_path}`
 
   let content: ArrayBuffer
   try {
@@ -54,20 +43,15 @@ export const getFileBytes = async (
   }
 
   const base64String = () => Buffer.from(content).toString("base64")
+  const file = () =>
+    new File([content], file_name, {
+      ...(params.type ? { type: params.type } : {})
+    })
 
   return {
     content,
     file_name,
-    base64String
+    base64String,
+    file
   }
 }
-
-export const getFile = async (
-  input: GetFile,
-  context: FileContext
-): Promise<File> => {
-  const { content, file_name } = await getFileBytes(input.fileId, context)
-  return new File([content], file_name, {
-    ...(input.type ? { type: input.type } : {})
-  })
-}

package/src/client.ts

@@ -1,34 +1,35 @@
 import type { Api } from "@effect-ak/tg-bot-api"
-import { executeTgBotMethod } from "./execute"
-import type { TgBotConfig } from "./config"
-import { getFile as getFileImpl, type GetFile } from "./client-file"
+import { executeTgBotMethod, type ExecuteMethod } from "./execute"
+import { getFile as getFileImpl, type TgFile } from "./client-file"
+import { TG_BOT_API_URL } from "./const"
 
 export interface TgBotClient {
-  readonly execute: <M extends keyof Api>(
-    method: M,
-    input: Parameters<Api[M]>[0]
-  ) => Promise<ReturnType<Api[M]>>
-  readonly getFile: (input: GetFile) => Promise<File>
+  readonly config: Required<TgClientConfig>
+  readonly execute: ExecuteMethod
+  readonly getFile: (input: { fileId: string; type?: string }) => Promise<TgFile>
 }
 
-export interface MakeTgClient {
+export interface TgClientConfig {
   bot_token: string
   base_url?: string
 }
 
-export function makeTgBotClient(config: MakeTgClient): TgBotClient {
-  const tgConfig: TgBotConfig = {
-    botToken: config.bot_token,
-    ...(config.base_url ? { baseUrl: config.base_url } : {})
+export function makeTgBotClient(config: TgClientConfig): TgBotClient {
+  const tgConfig = {
+    bot_token: config.bot_token,
+    base_url: config.base_url ?? TG_BOT_API_URL
   }
 
   const execute = <M extends keyof Api>(
     method: M,
     input: Parameters<Api[M]>[0]
-  ) => executeTgBotMethod({ config: tgConfig, method, input })
+  ) => executeTgBotMethod({
+    config: tgConfig, method, input
+  })
 
   return {
+    config: tgConfig,
     execute,
-    getFile: (input: GetFile) => getFileImpl(input, { config: tgConfig, execute })
+    getFile: (input) => getFileImpl({ ...input, config: tgConfig, execute })
   }
 }

package/src/execute.ts

@@ -2,23 +2,27 @@ import type { Api } from "@effect-ak/tg-bot-api"
 
 import { TgBotClientError } from "./errors"
 import { isFileContent, isTgBotApiResponse } from "./guards"
-import type { TgBotConfig } from "./config"
-import { getBaseUrl } from "./config"
 import { snakeToCamel } from "./utils"
+import type { TgClientConfig } from "./client"
 
-export async function executeTgBotMethod<M extends keyof Api>(params: {
-  config: TgBotConfig
-  method: M
+export type ExecuteMethod = <M extends keyof Api>(
+  method: M,
   input: Parameters<Api[M]>[0]
-}): Promise<ReturnType<Api[M]>> {
+) => Promise<ReturnType<Api[M]>>
+
+export async function executeTgBotMethod<M extends keyof Api>(
+  params: {
+    config: Required<TgClientConfig>
+    method: M
+    input: Parameters<Api[M]>[0]
+  }
+): Promise<ReturnType<Api[M]>> {
   const { config, method, input } = params
-  const baseUrl = getBaseUrl(config)
-  const botToken = config.botToken
 
   let httpResponse: Response
   try {
     httpResponse = await fetch(
-      `${baseUrl}/bot${botToken}/${snakeToCamel(method)}`,
+      `${config.base_url}/bot${config.bot_token}/${snakeToCamel(method)}`,
       {
         body: makePayload(input) ?? null,
         method: "POST"

package/src/index.ts

@@ -1,7 +1,6 @@
 export * from "./execute"
 export * from "./client-file"
 export * from "./client"
-export * from "./config"
 export * from "./errors"
 export * from "./guards"
 export * from "./const"

package/test/execute.test.ts

@@ -1,32 +1,27 @@
-import { describe, expect, assert, vi } from "vitest"
+import { describe, expect, vi } from "vitest"
 
 import { fixture } from "./fixture"
-import { MESSAGE_EFFECTS } from "../src/const"
-import { Micro } from "effect"
-import { executeTgBotMethod } from "../src/execute"
+import { MESSAGE_EFFECTS } from "~/const"
+import { executeTgBotMethod } from "~/execute"
 
 const fetchSpy = vi.spyOn(global, "fetch")
 
 describe("telegram bot client, execute method", () => {
-  fixture("send dice", async ({ chat_id, context }) => {
+  fixture("send dice", async ({ chat_id, client }) => {
     // skip();
 
-    const response = await executeTgBotMethod("send_dice", {
+    const response = await client.execute("send_dice", {
       chat_id,
       emoji: "🎲",
       message_effect_id: MESSAGE_EFFECTS["🔥"]
-    }).pipe(Micro.provideContext(context), Micro.runPromiseExit)
-
-    assert(response._tag == "Success")
+    })
 
     const url = fetchSpy.mock.calls[0][0] as string
     const lastPath = url.split("/").pop()
 
     expect(lastPath).toEqual("sendDice")
 
-    assert(response != null)
-
-    expect(response.value.chat.id).toBeDefined()
+    expect(response.chat.id).toBeDefined()
   })
 
   fixture("send message", async ({ chat_id, client, skip }) => {

package/test/fixture.ts

@@ -1,18 +1,16 @@
 import { test } from "vitest"
-import { Context } from "effect"
 
-import { makeTgBotClient, TgBotClient } from "../src/client"
-import { TgBotApiToken } from "../src/config"
+import { makeTgBotClient, TgBotClient, TgClientConfig } from "~/client"
 
 interface Fixture {
   readonly token: string
   readonly client: TgBotClient
   readonly chat_id: string
-  readonly context: Context.Context<TgBotApiToken>
+  readonly config: Required<TgClientConfig>
 }
 
 export const fixture = test.extend<Fixture>({
-  token: async (_, use) => {
+  token: async ({}, use) => {
     const token = process.env["bot_token"]
     if (!token) throw Error("bot_token not defined in config.json")
     use(token)
@@ -24,12 +22,12 @@ export const fixture = test.extend<Fixture>({
     })
     use(client)
   },
-  chat_id: async (_, use) => {
+  chat_id: async ({}, use) => {
     const chatId = process.env["chat_id"]
     if (!chatId) throw Error("chat_id not defined in config.json")
     use(chatId)
   },
-  context: async ({ token }, use) => {
-    use(Context.make(TgBotApiToken, token))
+  config: async ({ client }, use) => {
+    use(client.config)
   }
 })

package/vitest.config.ts

@@ -0,0 +1,11 @@
+import { defineConfig } from 'vitest/config'
+import tsconfigPaths from "vite-tsconfig-paths"
+
+export default defineConfig({
+  plugins: [
+    tsconfigPaths()
+  ],
+  test: {
+    testTimeout: 30000
+  },
+})

package/src/config.ts

@@ -1,10 +0,0 @@
-import { TG_BOT_API_URL } from "./const"
-
-export interface TgBotConfig {
-  botToken: string
-  baseUrl?: string
-}
-
-export const getBaseUrl = (config?: Pick<TgBotConfig, "baseUrl">): string => {
-  return config?.baseUrl ?? TG_BOT_API_URL
-}