From 0b2ae3aac618ec340f1a5ac8ca2d51b055328240 Mon Sep 17 00:00:00 2001
From: Alina Sireneva <alina@tei.su>
Date: Sat, 2 Dec 2023 04:10:31 +0300
Subject: [PATCH] fix: import compatibility with ts-node/esm

see https://github.com/TypeStrong/ts-node/issues/1934
---
 e2e/cjs/utils.js             |  2 ++
 e2e/esm/utils.js             |  2 ++
 e2e/ts/run-esm.cjs           |  1 -
 e2e/ts/utils.ts              |  2 ++
 packages/client/package.json |  6 +++---
 packages/core/package.json   | 18 +++++++++---------
 packages/i18n/package.json   |  6 +++---
 7 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/e2e/cjs/utils.js b/e2e/cjs/utils.js
index ac6e547b8..1307ce20a 100644
--- a/e2e/cjs/utils.js
+++ b/e2e/cjs/utils.js
@@ -1,4 +1,5 @@
 const { MemoryStorage } = require('@mtcute/core/storage/memory.js')
+const { LogManager } = require('@mtcute/core/utils.js')
 
 exports.getApiParams = () => {
     if (!process.env.API_ID || !process.env.API_HASH) {
@@ -10,5 +11,6 @@ exports.getApiParams = () => {
         apiHash: process.env.API_HASH,
         testMode: true,
         storage: new MemoryStorage(),
+        logLevel: LogManager.DEBUG,
     }
 }
diff --git a/e2e/esm/utils.js b/e2e/esm/utils.js
index 8bbb6b6d9..aa4c14d2b 100644
--- a/e2e/esm/utils.js
+++ b/e2e/esm/utils.js
@@ -1,4 +1,5 @@
 import { MemoryStorage } from '@mtcute/core/storage/memory.js'
+import { LogManager } from '@mtcute/core/utils.js'
 
 export const getApiParams = () => {
     if (!process.env.API_ID || !process.env.API_HASH) {
@@ -10,5 +11,6 @@ export const getApiParams = () => {
         apiHash: process.env.API_HASH,
         testMode: true,
         storage: new MemoryStorage(),
+        logLevel: LogManager.DEBUG,
     }
 }
diff --git a/e2e/ts/run-esm.cjs b/e2e/ts/run-esm.cjs
index bfa24fec9..c00361e16 100644
--- a/e2e/ts/run-esm.cjs
+++ b/e2e/ts/run-esm.cjs
@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-globals */
 const cp = require('child_process')
 
 const { fixForEsm } = require('./build-esm.cjs')
diff --git a/e2e/ts/utils.ts b/e2e/ts/utils.ts
index 32fe9e555..a456568ac 100644
--- a/e2e/ts/utils.ts
+++ b/e2e/ts/utils.ts
@@ -1,5 +1,6 @@
 import { BaseTelegramClientOptions } from '@mtcute/core'
 import { MemoryStorage } from '@mtcute/core/storage/memory.js'
+import { LogManager } from '@mtcute/core/utils.js'
 
 export const getApiParams = (): BaseTelegramClientOptions => {
     if (!process.env.API_ID || !process.env.API_HASH) {
@@ -11,5 +12,6 @@ export const getApiParams = (): BaseTelegramClientOptions => {
         apiHash: process.env.API_HASH,
         testMode: true,
         storage: new MemoryStorage(),
+        logLevel: LogManager.DEBUG,
     }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 79a0b71dc..0a865c501 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -18,9 +18,9 @@
                 "import": "./esm/index.js",
                 "require": "./cjs/index.js"
             },
-            "./methods/*.js": {
-                "import": "./esm/methods/*.js",
-                "require": "./cjs/methods/*.js"
+            "./methods/*": {
+                "import": "./esm/methods/*",
+                "require": "./cjs/methods/*"
             },
             "./utils.js": {
                 "import": "./esm/utils/index.js",
diff --git a/packages/core/package.json b/packages/core/package.json
index 0cf806616..1506b70b3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -27,17 +27,17 @@
                 "import": "./esm/utils/index.js",
                 "require": "./cjs/utils/index.js"
             },
-            "./utils/crypto/*.js": {
-                "import": "./esm/utils/crypto/*.js",
-                "require": "./cjs/utils/crypto/*.js"
+            "./utils/crypto/*": {
+                "import": "./esm/utils/crypto/*",
+                "require": "./cjs/utils/crypto/*"
             },
-            "./network/transports/*.js": {
-                "import": "./esm/network/transports/*.js",
-                "require": "./cjs/network/transports/*.js"
+            "./network/transports/*": {
+                "import": "./esm/network/transports/*",
+                "require": "./cjs/network/transports/*"
             },
-            "./storage/*.js": {
-                "import": "./esm/storage/*.js",
-                "require": "./cjs/storage/*.js"
+            "./storage/*": {
+                "import": "./esm/storage/*",
+                "require": "./cjs/storage/*"
             }
         }
     },
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 56d696970..dd6eb82a3 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -16,9 +16,9 @@
                 "import": "./esm/index.js",
                 "require": "./cjs/index.js"
             },
-            "./plurals/*.js": {
-                "import": "./esm/plurals/*.js",
-                "require": "./cjs/plurals/*.js"
+            "./plurals/*": {
+                "import": "./esm/plurals/*",
+                "require": "./cjs/plurals/*"
             }
         }
     },