From 2db96e09257b8aacbdf50a0aa7ae1c56916cb57b Mon Sep 17 00:00:00 2001 From: Vladislav Khr Date: Tue, 27 Feb 2024 22:59:00 +0300 Subject: [PATCH] update telegraf dev version to 4.16 (#1173) * docs: update deprecated `hookPath` to `path` * chore(deps): update `telegraf` to `4.16` * chore(utils): check `descriptor` is undefined --- docs/getting-updates.md | 2 +- lib/utils/create-listener-decorator.util.ts | 20 ++++--- package-lock.json | 63 ++++++++++----------- package.json | 2 +- 4 files changed, 46 insertions(+), 41 deletions(-) diff --git a/docs/getting-updates.md b/docs/getting-updates.md index 6781a963..2f5dee52 100644 --- a/docs/getting-updates.md +++ b/docs/getting-updates.md @@ -29,7 +29,7 @@ TelegrafModule.forRootAsync({ launchOptions: { webhook: { domain: 'domain.tld', - hookPath: '/secret-path', + path: '/secret-path', } } }), diff --git a/lib/utils/create-listener-decorator.util.ts b/lib/utils/create-listener-decorator.util.ts index e42d7c62..e95b264c 100644 --- a/lib/utils/create-listener-decorator.util.ts +++ b/lib/utils/create-listener-decorator.util.ts @@ -5,11 +5,12 @@ import { ListenerMetadata } from '../interfaces'; export function createListenerDecorator< TComposer extends Composer, - TMethod extends OnlyFunctionPropertyNames = OnlyFunctionPropertyNames, + TMethod extends + OnlyFunctionPropertyNames = OnlyFunctionPropertyNames, >(method: TMethod) { return (...args: ComposerMethodArgs): MethodDecorator => { return ( - _target: any, + target: object, _key?: string | symbol, descriptor?: TypedPropertyDescriptor, ) => { @@ -20,11 +21,16 @@ export function createListenerDecorator< } as ListenerMetadata, ]; - const previousValue = - Reflect.getMetadata(LISTENERS_METADATA, descriptor.value) || []; - const value = [...previousValue, ...metadata]; - Reflect.defineMetadata(LISTENERS_METADATA, value, descriptor.value); - return descriptor; + if (descriptor) { + const previousValue = + Reflect.getMetadata(LISTENERS_METADATA, descriptor.value) || []; + const value = [...previousValue, ...metadata]; + Reflect.defineMetadata(LISTENERS_METADATA, value, descriptor.value); + return descriptor; + } + + Reflect.defineMetadata(LISTENERS_METADATA, metadata, target); + return target; }; }; } diff --git a/package-lock.json b/package-lock.json index e6daad80..b0278037 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "nestjs-telegraf", "version": "2.7.0", "license": "MIT", "dependencies": { @@ -26,7 +25,7 @@ "lint-staged": "13.2.3", "prettier": "3.0.0", "reflect-metadata": "0.1.13", - "telegraf": "4.12.2", + "telegraf": "^4.16.0", "typedoc": "0.24.8", "typescript": "4.8.2", "vitepress": "^1.0.0-beta.6" @@ -1331,6 +1330,12 @@ "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==", "dev": true }, + "node_modules/@telegraf/types": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@telegraf/types/-/types-7.1.0.tgz", + "integrity": "sha512-kGevOIbpMcIlCDeorKGpwZmdH7kHbqlk/Yj6dEpJMKEQw5lk0KVQY0OLXaCswy8GqlIVLd5625OB+rAntP9xVw==", + "dev": true + }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -4636,9 +4641,9 @@ "dev": true }, "node_modules/node-fetch": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz", - "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, "dependencies": { "whatwg-url": "^5.0.0" @@ -5700,19 +5705,19 @@ "dev": true }, "node_modules/telegraf": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.12.2.tgz", - "integrity": "sha512-PgwqI4wD86cMqVfFtEM9JkGGnMHgvgLJbReZMmwW4z35QeOi4DvbdItONld4bPnYn3A1jcO0SRKs0BXmR+x+Ew==", + "version": "4.16.2", + "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.16.2.tgz", + "integrity": "sha512-d+/XMTBMW8DfQFhYkpyU2f58HMIPygkzClEE03c0LPoEKPGlY9da+9pOVSO7jq9Ar8RRT4OrfwW38sgF/o/x0w==", "dev": true, "dependencies": { + "@telegraf/types": "^7.1.0", "abort-controller": "^3.0.0", "debug": "^4.3.4", "mri": "^1.2.0", - "node-fetch": "^2.6.8", + "node-fetch": "^2.7.0", "p-timeout": "^4.1.0", "safe-compare": "^1.1.4", - "sandwich-stream": "^2.0.2", - "typegram": "^4.3.0" + "sandwich-stream": "^2.0.2" }, "bin": { "telegraf": "lib/cli.mjs" @@ -5923,12 +5928,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/typegram": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/typegram/-/typegram-4.3.0.tgz", - "integrity": "sha512-pS4STyOZoJ++Mwa9GPMTNjOwEzMkxFfFt1By6IbMOJfheP0utMP/H1ga6J9R4DTjAYBr0UDn4eQg++LpWBvcAg==", - "dev": true - }, "node_modules/typescript": { "version": "4.8.2", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz", @@ -7111,6 +7110,12 @@ } } }, + "@telegraf/types": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@telegraf/types/-/types-7.1.0.tgz", + "integrity": "sha512-kGevOIbpMcIlCDeorKGpwZmdH7kHbqlk/Yj6dEpJMKEQw5lk0KVQY0OLXaCswy8GqlIVLd5625OB+rAntP9xVw==", + "dev": true + }, "@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -9419,9 +9424,9 @@ "dev": true }, "node-fetch": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz", - "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, "requires": { "whatwg-url": "^5.0.0" @@ -10156,19 +10161,19 @@ "dev": true }, "telegraf": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.12.2.tgz", - "integrity": "sha512-PgwqI4wD86cMqVfFtEM9JkGGnMHgvgLJbReZMmwW4z35QeOi4DvbdItONld4bPnYn3A1jcO0SRKs0BXmR+x+Ew==", + "version": "4.16.2", + "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.16.2.tgz", + "integrity": "sha512-d+/XMTBMW8DfQFhYkpyU2f58HMIPygkzClEE03c0LPoEKPGlY9da+9pOVSO7jq9Ar8RRT4OrfwW38sgF/o/x0w==", "dev": true, "requires": { + "@telegraf/types": "^7.1.0", "abort-controller": "^3.0.0", "debug": "^4.3.4", "mri": "^1.2.0", - "node-fetch": "^2.6.8", + "node-fetch": "^2.7.0", "p-timeout": "^4.1.0", "safe-compare": "^1.1.4", - "sandwich-stream": "^2.0.2", - "typegram": "^4.3.0" + "sandwich-stream": "^2.0.2" } }, "text-extensions": { @@ -10308,12 +10313,6 @@ } } }, - "typegram": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/typegram/-/typegram-4.3.0.tgz", - "integrity": "sha512-pS4STyOZoJ++Mwa9GPMTNjOwEzMkxFfFt1By6IbMOJfheP0utMP/H1ga6J9R4DTjAYBr0UDn4eQg++LpWBvcAg==", - "dev": true - }, "typescript": { "version": "4.8.2", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz", diff --git a/package.json b/package.json index c6676d6e..4b8a1608 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "lint-staged": "13.2.3", "prettier": "3.0.0", "reflect-metadata": "0.1.13", - "telegraf": "4.12.2", + "telegraf": "^4.16.0", "typedoc": "0.24.8", "typescript": "4.8.2", "vitepress": "^1.0.0-beta.6"