Merge pull request #255 from Telegram-Mini-Apps/bugfix/tests

Get rid of barrel files

.changeset/thin-wolves-sneeze.md

@@ -0,0 +1,5 @@
+---
+"@tma.js/sdk": patch
+---
+
+Get rid of barrel files

packages/sdk/src/bridge/env/hasExternalNotify.ts

@@ -1,4 +1,4 @@
-import { isRecord } from '../../misc/index.js';
+import { isRecord } from '../../misc/isRecord.js';
 
 type WithExternalNotify<T> = T & {
   external: {

packages/sdk/src/bridge/env/hasWebviewProxy.ts

@@ -1,4 +1,4 @@
-import { isRecord } from '../../misc/index.js';
+import { isRecord } from '../../misc/isRecord.js';
 
 type WithWebviewProxy<T> = T & {
   TelegramWebviewProxy: {

packages/sdk/src/bridge/errors/MethodUnsupportedError.ts

@@ -1,5 +1,5 @@
-import type { Version } from '../../version/index.js';
-import type { MiniAppsMethodName } from '../methods/index.js';
+import type { Version } from '../../version/types.js';
+import type { MiniAppsMethodName } from '../methods/methods.js';
 
 /**
  * Error thrown in case, unsupported method was called.

packages/sdk/src/bridge/errors/ParameterUnsupportedError.ts

@@ -1,5 +1,5 @@
-import type { Version } from '../../version/index.js';
-import type { MiniAppsMethodName } from '../methods/index.js';
+import type { Version } from '../../version/types.js';
+import type { MiniAppsMethodName } from '../methods/methods.js';
 
 /**
  * Error thrown in case, unsupported parameter was used.

packages/sdk/src/bridge/events/createEmitter.ts

@@ -1,19 +1,17 @@
 import type { MiniAppsEventEmitter, MiniAppsEventName } from './events.js';
 import { onTelegramEvent } from './onTelegramEvent.js';
-import {
-  clipboardTextReceived,
-  customMethodInvoked,
-  invoiceClosed,
-  phoneRequested,
-  popupClosed,
-  qrTextReceived,
-  themeChanged,
-  viewportChanged,
-  writeAccessRequested,
-} from './parsers/index.js';
-import { EventEmitter } from '../../event-emitter/index.js';
+import { clipboardTextReceived } from './parsers/clipboardTextReceived.js';
+import { customMethodInvoked } from './parsers/customMethodInvoked.js';
+import { invoiceClosed } from './parsers/invoiceClosed.js';
+import { phoneRequested } from './parsers/phoneRequested.js';
+import { popupClosed } from './parsers/popupClosed.js';
+import { qrTextReceived } from './parsers/qrTextReceived.js';
+import { themeChanged } from './parsers/theme-changed.js';
+import { viewportChanged } from './parsers/viewportChanged.js';
+import { writeAccessRequested } from './parsers/writeAccessRequested.js';
+import { EventEmitter } from '../../event-emitter/EventEmitter.js';
 import { logger } from '../../globals.js';
-import { string } from '../../parsing/index.js';
+import { string } from '../../parsing/parsers/string.js';
 
 /**
  * Returns event emitter which could be safely used, to process events from

packages/sdk/src/bridge/events/events.ts

@@ -1,21 +1,16 @@
-import type {
-  ClipboardTextReceivedPayload,
-  CustomMethodInvokedPayload,
-  InvoiceClosedPayload,
-  PhoneRequestedPayload,
-  PopupClosedPayload,
-  QrTextReceivedPayload,
-  ThemeChangedPayload,
-  ViewportChangedPayload,
-  WriteAccessRequestedPayload,
-} from './parsers/index.js';
-import type {
-  AnySubscribeListener,
-  EventEmitter,
-  EventListener,
-  EventParams,
-} from '../../event-emitter/index.js';
-import type { IsNever, Not } from '../../types/index.js';
+import type { ClipboardTextReceivedPayload } from './parsers/clipboardTextReceived.js';
+import type { CustomMethodInvokedPayload } from './parsers/customMethodInvoked.js';
+import type { InvoiceClosedPayload } from './parsers/invoiceClosed.js';
+import type { PhoneRequestedPayload } from './parsers/phoneRequested.js';
+import type { PopupClosedPayload } from './parsers/popupClosed.js';
+import type { QrTextReceivedPayload } from './parsers/qrTextReceived.js';
+import type { ThemeChangedPayload } from './parsers/theme-changed.js';
+import type { ViewportChangedPayload } from './parsers/viewportChanged.js';
+import type { WriteAccessRequestedPayload } from './parsers/writeAccessRequested.js';
+import type { EventEmitter } from '../../event-emitter/EventEmitter.js';
+import type { AnySubscribeListener, EventListener, EventParams } from '../../event-emitter/types.js';
+import type { Not } from '../../types/logical.js';
+import type { IsNever } from '../../types/utils.js';
 
 /**
  * Map where key is known event name, and value is its listener.

packages/sdk/src/bridge/events/onTelegramEvent.ts

@@ -1,4 +1,4 @@
-import { parseMessage } from '../../bridge/parseMessage.js';
+import { parseMessage } from '../parseMessage.js';
 
 /**
  * Emits event sent from Telegram native application like it was sent in

packages/sdk/src/bridge/events/parsers/clipboardTextReceived.ts

@@ -1,5 +1,6 @@
-import { json, string } from '../../../parsing/index.js';
-import type { RequestId } from '../../../types/index.js';
+import { json } from '../../../parsing/parsers/json.js';
+import { string } from '../../../parsing/parsers/string.js';
+import type { RequestId } from '../../../types/request-id.js';
 
 export interface ClipboardTextReceivedPayload {
   /**

packages/sdk/src/bridge/events/parsers/customMethodInvoked.ts

@@ -1,5 +1,6 @@
-import { json, string } from '../../../parsing/index.js';
-import type { RequestId } from '../../../types/index.js';
+import { json } from '../../../parsing/parsers/json.js';
+import { string } from '../../../parsing/parsers/string.js';
+import type { RequestId } from '../../../types/request-id.js';
 
 export interface CustomMethodInvokedPayload<R = unknown> {
   /**

packages/sdk/src/bridge/events/parsers/invoiceClosed.ts

@@ -1,4 +1,5 @@
-import { json, string } from '../../../parsing/index.js';
+import { json } from '../../../parsing/parsers/json.js';
+import { string } from '../../../parsing/parsers/string.js';
 
 export type InvoiceStatus =
   | 'paid'

packages/sdk/src/bridge/events/parsers/phoneRequested.ts

@@ -1,4 +1,5 @@
-import { json, string } from '../../../parsing/index.js';
+import { json } from '../../../parsing/parsers/json.js';
+import { string } from '../../../parsing/parsers/string.js';
 
 export type PhoneRequestedStatus = 'sent' | 'cancelled' | string;
 

packages/sdk/src/bridge/events/parsers/popupClosed.ts

@@ -1,4 +1,5 @@
-import { json, string } from '../../../parsing/index.js';
+import { json } from '../../../parsing/parsers/json.js';
+import { string } from '../../../parsing/parsers/string.js';
 
 export interface PopupClosedPayload {
   /**

packages/sdk/src/bridge/events/parsers/qrTextReceived.ts

@@ -1,4 +1,5 @@
-import { json, string } from '../../../parsing/index.js';
+import { json } from '../../../parsing/parsers/json.js';
+import { string } from '../../../parsing/parsers/string.js';
 
 export interface QrTextReceivedPayload {
   /**

packages/sdk/src/bridge/events/parsers/theme-changed.ts

@@ -1,5 +1,7 @@
-import type { RGB } from '../../../colors/index.js';
-import { json, rgb, toRecord } from '../../../parsing/index.js';
+import type { RGB } from '../../../colors/types.js';
+import { json } from '../../../parsing/parsers/json.js';
+import { rgb } from '../../../parsing/parsers/rgb.js';
+import { toRecord } from '../../../parsing/toRecord.js';
 
 export interface ThemeChangedPayload {
   /**

packages/sdk/src/bridge/events/parsers/viewportChanged.ts

@@ -1,4 +1,6 @@
-import { boolean, json, number } from '../../../parsing/index.js';
+import { boolean } from '../../../parsing/parsers/boolean.js';
+import { json } from '../../../parsing/parsers/json.js';
+import { number } from '../../../parsing/parsers/number.js';
 
 export interface ViewportChangedPayload {
   /**

packages/sdk/src/bridge/events/parsers/writeAccessRequested.ts

@@ -1,4 +1,5 @@
-import { json, string } from '../../../parsing/index.js';
+import { json } from '../../../parsing/parsers/json.js';
+import { string } from '../../../parsing/parsers/string.js';
 
 export type WriteAccessRequestedStatus = 'allowed' | string;
 

packages/sdk/src/bridge/events/singletonEmitter.ts

@@ -1,5 +1,5 @@
-import { createEmitter } from '../../bridge/events/createEmitter.js';
-import type { MiniAppsEventEmitter } from '../../bridge/index.js';
+import { createEmitter } from './createEmitter.js';
+import type { MiniAppsEventEmitter } from './events.js';
 
 const CACHED_EMITTER = 'telegram-mini-apps-cached-emitter';
 

packages/sdk/src/bridge/invokeCustomMethod.ts

@@ -1,6 +1,6 @@
-import type { CustomMethodName, CustomMethodParams } from './methods/index.js';
+import type { CustomMethodName, CustomMethodParams } from './methods/custom-methods.js';
 import { request } from './request.js';
-import type { ExecuteWithOptions } from '../types/index.js';
+import type { ExecuteWithOptions } from '../types/methods.js';
 
 /**
  * Invokes known custom method. Returns method execution result.

packages/sdk/src/bridge/methods/__tests__/createPostEvent.ts

@@ -1,9 +1,9 @@
 import { expect, it, vi } from 'vitest';
 
-import { createPostEvent } from '../../index';
+import { createPostEvent } from '../createPostEvent';
 import * as postEventModule from '../postEvent';
 
-vi.mock('../../bridge/methods/postEvent.js', () => ({
+vi.mock('../postEvent', () => ({
   postEvent: vi.fn(),
 }));
 

packages/sdk/src/bridge/methods/__tests__/postEvent.ts

@@ -8,7 +8,7 @@ import {
 } from 'vitest';
 
 import { setTargetOrigin } from '../../../globals';
-import { postEvent } from '../../index';
+import { postEvent } from '../postEvent';
 
 let windowSpy: SpyInstance<[], Window & typeof globalThis>;
 

packages/sdk/src/bridge/methods/createPostEvent.ts

@@ -1,8 +1,9 @@
 import { type PostEvent, postEvent } from './postEvent.js';
-import { isRecord } from '../../misc/index.js';
-import { supports } from '../../supports/index.js';
-import type { Version } from '../../version/index.js';
-import { MethodUnsupportedError, ParameterUnsupportedError } from '../errors/index.js';
+import { isRecord } from '../../misc/isRecord.js';
+import { supports } from '../../supports/supports.js';
+import type { Version } from '../../version/types.js';
+import { MethodUnsupportedError } from '../errors/MethodUnsupportedError.js';
+import { ParameterUnsupportedError } from '../errors/ParameterUnsupportedError.js';
 
 /**
  * Creates function which checks if specified method and parameters are supported. In case,

packages/sdk/src/bridge/methods/custom-methods.ts

@@ -1,4 +1,4 @@
-import type { RequestId } from '../../types/index.js';
+import type { RequestId } from '../../types/request-id.js';
 
 interface CreateInvokeCustomMethodParams<M extends string, Params extends object> {
   /**

packages/sdk/src/bridge/methods/methods.ts

@@ -1,8 +1,11 @@
 import type { AnyInvokeCustomMethodParams } from './custom-methods.js';
 import type { AnyHapticFeedbackParams } from './haptic.js';
 import type { PopupParams } from './popup.js';
-import type { RGB } from '../../colors/index.js';
-import type { IsNever, Not, RequestId, UnionKeys } from '../../types/index.js';
+import type { RGB } from '../../colors/types.js';
+import type { Not } from '../../types/logical.js';
+import type { RequestId } from '../../types/request-id.js';
+import type { UnionKeys } from '../../types/unions.js';
+import type { IsNever } from '../../types/utils.js';
 
 /**
  * Color key which could be used to update header color.

packages/sdk/src/bridge/methods/postEvent.ts

@@ -6,10 +6,8 @@ import type {
 } from './methods.js';
 import { logger, targetOrigin as globalTargetOrigin } from '../../globals.js';
 import { isIframe } from '../../misc/isIframe.js';
-import {
-  hasExternalNotify,
-  hasWebviewProxy,
-} from '../env/index.js';
+import { hasExternalNotify } from '../env/hasExternalNotify.js';
+import { hasWebviewProxy } from '../env/hasWebviewProxy.js';
 
 interface PostEventOptions {
   /**

packages/sdk/src/bridge/parseMessage.ts

@@ -1,4 +1,5 @@
-import { json, string } from '../parsing/index.js';
+import { json } from '../parsing/parsers/json.js';
+import { string } from '../parsing/parsers/string.js';
 
 /**
  * Message format used in communication between client and Telegram applications.

packages/sdk/src/bridge/request.ts

@@ -1,20 +1,21 @@
-import {
-  type MiniAppsEventHasParams,
-  type MiniAppsEventName,
-  type MiniAppsEventParams,
-  on,
-} from './events/index.js';
-import {
-  type MiniAppsEmptyMethodName,
-  type MiniAppsMethodAcceptParams,
-  type MiniAppsMethodName,
-  type MiniAppsMethodParams,
-  type MiniAppsNonEmptyMethodName,
-  postEvent as defaultPostEvent,
-} from './methods/index.js';
-import { isRecord } from '../misc/index.js';
-import { withTimeout } from '../timeout/index.js';
-import type { And, ExecuteWithOptions, If, IsNever } from '../types/index.js';
+import type {
+  MiniAppsEventHasParams,
+  MiniAppsEventName,
+  MiniAppsEventParams,
+} from './events/events.js';
+import { on } from './events/on.js';
+import type {
+  MiniAppsEmptyMethodName,
+  MiniAppsMethodAcceptParams,
+  MiniAppsMethodName,
+  MiniAppsMethodParams, MiniAppsNonEmptyMethodName,
+} from './methods/methods.js';
+import { postEvent as defaultPostEvent } from './methods/postEvent.js';
+import { isRecord } from '../misc/isRecord.js';
+import { withTimeout } from '../timeout/withTimeout.js';
+import type { And, If } from '../types/logical.js';
+import type { ExecuteWithOptions } from '../types/methods.js';
+import type { IsNever } from '../types/utils.js';
 
 /**
  * Names of methods, which require passing "req_id" parameter.

packages/sdk/src/classnames/mergeClassNames.ts

@@ -1,8 +1,8 @@
 import { classNames } from './classNames.js';
-import { isRecord } from '../misc/index.js';
-import type { UnionOptionalKeys, UnionRequiredKeys } from '../types/index.js';
+import { isRecord } from '../misc/isRecord.js';
+import type { UnionOptionalKeys, UnionRequiredKeys } from '../types/unions.js';
 
-type MergeClassNames<Tuple extends any[]> =
+export type MergeClassNames<Tuple extends any[]> =
   // Removes all types from union which will be ignored by the mergeClassNames function.
   Exclude<Tuple[number], number | string | null | undefined | any[] | boolean> extends infer Union
     ? {