Simplify CLI

.eslintrc

@@ -8,7 +8,6 @@
       "files": "*.ts",
       "extends": ["plugin:prettier/recommended"],
       "rules": {
-        "sort-imports": ["error", { "ignoreCase": true }],
         "@typescript-eslint/ban-ts-comment": "warn",
         "@typescript-eslint/explicit-function-return-type": "off",
         "@typescript-eslint/no-explicit-any": "warn",

package.json

@@ -40,11 +40,11 @@
     "future.*"
   ],
   "bin": {
-    "telegraf": "bin/telegraf.mjs"
+    "telegraf": "lib/cli.mjs"
   },
   "scripts": {
     "prepare": "npm run --silent build",
-    "build": "tsc && tsc -p bin/tsconfig.json",
+    "build": "tsc",
     "build:docs": "typedoc src/index.ts",
     "pretest": "npm run build",
     "test": "ava test/*",
@@ -61,9 +61,7 @@
   "dependencies": {
     "abort-controller": "^3.0.0",
     "debug": "^4.3.3",
-    "es-main": "^1.2.0",
-    "minimist": "^1.2.6",
-    "module-alias": "^2.2.2",
+    "mri": "^1.2.0",
     "node-fetch": "^2.6.7",
     "p-timeout": "^4.1.0",
     "safe-compare": "^1.1.4",
@@ -72,8 +70,6 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/minimist": "^1.2.2",
-    "@types/module-alias": "^2.0.1",
     "@types/node": "^17.0.14",
     "@types/node-fetch": "^2.5.12",
     "@types/safe-compare": "^1.1.0",
@@ -87,7 +83,6 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-standard": "^5.0.0",
     "prettier": "^2.5.1",
     "typedoc": "^0.23.10",
     "typescript": "^4.7.4"

bin/telegraf.mts → src/cli.mts

@@ -1,20 +1,12 @@
 #!/usr/bin/env node
 
 import debug from 'debug'
+import parse from 'mri'
 import path from 'path'
-import parse from 'minimist'
-import { addAlias } from 'module-alias'
 
-// @ts-expect-error Telegraf doesn't build JS and d.ts in the same place, that needs to be fixed
-import { Telegraf as _Telegraf } from '../lib/index.js'
-import type { Telegraf as Tf, Context, Middleware } from '../typings/index.js'
 import type { RequestListener } from 'http'
 import type { TlsOptions } from 'tls'
-
-import esMain from 'es-main'
-
-// hack to type Telegraf correctly
-const Telegraf: typeof Tf = _Telegraf
+import { Telegraf, type Context, type Middleware } from './index.js'
 
 const log = debug('telegraf:cli')
 
@@ -121,6 +113,7 @@ export async function main(argv: string[], env: Env = {}) {
         path.resolve(process.cwd(), 'package.json')
       )) as { main?: string }
       file = packageJson.main || 'index.js'
+      // eslint-disable-next-line no-empty
     } catch (err) {}
   }
 
@@ -149,13 +142,12 @@ export async function main(argv: string[], env: Env = {}) {
   try {
     if (args.logs) debug.enable('telegraf:*')
 
-    addAlias('telegraf', path.join(import.meta.url, '../'))
     const mod: Mod = await import(file)
     const botHandler = mod.botHandler || mod.default
     const httpHandler = mod.httpHandler
     const tlsOptions = mod.tlsOptions
 
-    const config: Tf.LaunchOptions = {}
+    const config: Telegraf.LaunchOptions = {}
     if (domain) {
       config.webhook = {
         domain,
@@ -182,6 +174,4 @@ export async function main(argv: string[], env: Env = {}) {
   return 0
 }
 
-// run main if called from command line and not imported from another file
-if (esMain(import.meta))
-  process.exitCode = await main(process.argv, process.env as Env)
+process.exitCode = await main(process.argv, process.env as Env)

tsconfig.json

@@ -1,9 +1,10 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "Node16",
     "declaration": true,
     "declarationMap": true,
     "declarationDir": "typings/",
+    "esModuleInterop": true,
     "outDir": "lib/",
     "rootDir": "src/",
     "target": "ES2019",
@@ -24,5 +25,5 @@
     "out": "docs/build/",
     "readme": "README.md"
   },
-  "include": ["src/**/*.ts"]
+  "include": ["src/"]
 }