From 97be09d65f913ec703c370de4e4585d3276945d5 Mon Sep 17 00:00:00 2001 From: Jonathan Ho Date: Wed, 6 Dec 2023 18:29:16 -0800 Subject: [PATCH] Revert "Fix the TS error in transformers benchmark (#3261)" (#3268) This reverts commit 721b8a82f6186e3a9bdb2b42c53e8ae4694b41a1. --- packages/benchmark/package.json | 2 +- .../benchmark/src/benchmarks/transformers.ts | 13 ++- packages/types/src/discord.ts | 6 +- yarn.lock | 88 ++++++++++++++++++- 4 files changed, 96 insertions(+), 13 deletions(-) diff --git a/packages/benchmark/package.json b/packages/benchmark/package.json index dca49789e..01e3e861c 100644 --- a/packages/benchmark/package.json +++ b/packages/benchmark/package.json @@ -24,7 +24,7 @@ "bench": "node dist/index.js" }, "dependencies": { - "@discordeno/bot": "19.0.0-alpha.1", + "@discordeno/bot": "latest", "@discordeno/gateway": "19.0.0-alpha.1", "@discordeno/rest": "19.0.0-alpha.1", "@discordeno/types": "19.0.0-alpha.1", diff --git a/packages/benchmark/src/benchmarks/transformers.ts b/packages/benchmark/src/benchmarks/transformers.ts index 26a83c966..0f757ebf2 100644 --- a/packages/benchmark/src/benchmarks/transformers.ts +++ b/packages/benchmark/src/benchmarks/transformers.ts @@ -2,7 +2,6 @@ import { ApplicationFlags, ButtonStyles, InteractionTypes, - MemberToggles, MessageActivityTypes, MessageComponentTypes, MessageTypes, @@ -14,10 +13,9 @@ import { createBot, iconHashToBigInt, type Bot, - type DiscordMember, type DiscordMessage, - type DiscordUser, } from '@discordeno/bot' +import { MemberToggles } from '@discordeno/bot/dist/transformers/index.js' import { memoryBenchmark } from '../utils/memoryBenchmark.js' export const CHANNEL_MENTION_REGEX = /<#[0-9]+>/g @@ -79,9 +77,8 @@ const USER = { public_flags: UserFlags.BotHttpInteractions, system: true, username: 'skillz', - global_name: 'skillz', verified: true, -} as DiscordUser +} const MEMBER = { nick: 'John', roles: ['111111111111111111', '222222222222222222', '333333333333333333'], @@ -91,7 +88,7 @@ const MEMBER = { mute: true, pending: false, permissions: '2147483647', -} as DiscordMember +} console.log('before the bench') await memoryBenchmark( @@ -379,7 +376,7 @@ await memoryBenchmark( tts: true, type: MessageTypes.Default, webhook_id: GUILD_ID, - }) as DiscordMessage, + }) as unknown as DiscordMessage, ), // array of event to test with { times: 1, log: false, table: false }, ) @@ -763,7 +760,7 @@ await memoryBenchmark( tts: true, type: MessageTypes.Default, webhook_id: GUILD_ID, - }) as DiscordMessage, + }) as unknown as DiscordMessage, ), // array of event to test with { times: 1, log: false, table: false }, ) diff --git a/packages/types/src/discord.ts b/packages/types/src/discord.ts index dca5ca6a4..186229bd8 100644 --- a/packages/types/src/discord.ts +++ b/packages/types/src/discord.ts @@ -1348,11 +1348,11 @@ export interface DiscordChannelMention { export interface DiscordReaction { /** Total number of times this emoji has been used to react (including super reacts) */ count: number - /** Reaction count details object */ + /** Reaction count details object */ count_details: DiscordReactionCountDetails /** Whether the current user reacted using this emoji */ me: boolean - /** Whether the current user super-reacted using this emoji */ + /** Whether the current user super-reacted using this emoji */ me_burst: boolean /** Emoji information */ emoji: Partial @@ -1364,7 +1364,7 @@ export interface DiscordReaction { export interface DiscordReactionCountDetails { /** Count of super reactions */ burst: number - /** Count of normal reactions */ + /** Count of normal reactions */ normal: number } diff --git a/yarn.lock b/yarn.lock index 1fe01a260..2c6dcb00f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -54,6 +54,18 @@ __metadata: languageName: unknown linkType: soft +"@discordeno/bot@npm:latest": + version: 19.0.0-next.4384457 + resolution: "@discordeno/bot@npm:19.0.0-next.4384457" + dependencies: + "@discordeno/gateway": "npm:19.0.0-next.4384457" + "@discordeno/rest": "npm:19.0.0-next.4384457" + "@discordeno/types": "npm:19.0.0-next.4384457" + "@discordeno/utils": "npm:19.0.0-next.4384457" + checksum: 32860748710a721eaada18a7b15b63915b7f559de0029bc36fca9fc1fd8fe74ea3cb4f85fb1dbcd6c7dba17206cdba916022c713012cb9380c3cd552124de877 + languageName: node + linkType: hard + "@discordeno/gateway@npm:19.0.0-alpha.1, @discordeno/gateway@workspace:packages/gateway": version: 0.0.0-use.local resolution: "@discordeno/gateway@workspace:packages/gateway" @@ -81,6 +93,17 @@ __metadata: languageName: unknown linkType: soft +"@discordeno/gateway@npm:19.0.0-next.4384457": + version: 19.0.0-next.4384457 + resolution: "@discordeno/gateway@npm:19.0.0-next.4384457" + dependencies: + "@discordeno/types": "npm:19.0.0-next.4384457" + "@discordeno/utils": "npm:19.0.0-next.4384457" + ws: "npm:^8.13.0" + checksum: 4ef5d78a219cf85cdfce7b5014395fc6271050b5b88b952dfd43d63c9e43b52f9f1f5b03d96476064fa1afa78aa2ed8a4d13d32162c90cf0c754ad7974bda259 + languageName: node + linkType: hard + "@discordeno/rest@npm:19.0.0-alpha.1, @discordeno/rest@workspace:packages/rest": version: 0.0.0-use.local resolution: "@discordeno/rest@workspace:packages/rest" @@ -109,6 +132,18 @@ __metadata: languageName: unknown linkType: soft +"@discordeno/rest@npm:19.0.0-next.4384457": + version: 19.0.0-next.4384457 + resolution: "@discordeno/rest@npm:19.0.0-next.4384457" + dependencies: + "@discordeno/types": "npm:19.0.0-next.4384457" + "@discordeno/utils": "npm:19.0.0-next.4384457" + dotenv: "npm:^16.0.3" + node-fetch: "npm:^3.3.1" + checksum: 1e21cd35b4cff1b6695e0daa309aab5d109f30bc669eefe76bd9f9a1024b131a3bbb82f829cb391a109251b55201abcb4a1615a073295ee065b42cfbfdf7e140 + languageName: node + linkType: hard + "@discordeno/types@npm:19.0.0-alpha.1, @discordeno/types@workspace:packages/types": version: 0.0.0-use.local resolution: "@discordeno/types@workspace:packages/types" @@ -130,6 +165,13 @@ __metadata: languageName: unknown linkType: soft +"@discordeno/types@npm:19.0.0-next.4384457": + version: 19.0.0-next.4384457 + resolution: "@discordeno/types@npm:19.0.0-next.4384457" + checksum: d7491e4377f709d834d9214c5b471e922acf34c43653bb58262f53ee68c5a0b37fce961695854e6143bfad3ff8c9d6f78b332ddda8377179a13b73678aa76e90 + languageName: node + linkType: hard + "@discordeno/utils@npm:19.0.0-alpha.1, @discordeno/utils@workspace:packages/utils": version: 0.0.0-use.local resolution: "@discordeno/utils@workspace:packages/utils" @@ -154,6 +196,17 @@ __metadata: languageName: unknown linkType: soft +"@discordeno/utils@npm:19.0.0-next.4384457": + version: 19.0.0-next.4384457 + resolution: "@discordeno/utils@npm:19.0.0-next.4384457" + dependencies: + "@discordeno/types": "npm:19.0.0-next.4384457" + node-fetch: "npm:^3.3.1" + tweetnacl: "npm:^1.0.3" + checksum: 261db3111966d4ce97e44c38a9fa28c4cbbef41de0951a31534e51c5df3a1532056dfa6b5be0107e56753f86240600d40e2142cc1699d3ce7c597ada93e107ab + languageName: node + linkType: hard + "@eslint-community/eslint-utils@npm:^4.1.2, @eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" @@ -1191,7 +1244,7 @@ __metadata: version: 0.0.0-use.local resolution: "benchmark@workspace:packages/benchmark" dependencies: - "@discordeno/bot": "npm:19.0.0-alpha.1" + "@discordeno/bot": "npm:latest" "@discordeno/gateway": "npm:19.0.0-alpha.1" "@discordeno/rest": "npm:19.0.0-alpha.1" "@discordeno/types": "npm:19.0.0-alpha.1" @@ -1970,6 +2023,13 @@ __metadata: languageName: node linkType: hard +"dotenv@npm:^16.0.3": + version: 16.0.3 + resolution: "dotenv@npm:16.0.3" + checksum: d6788c8e40b35ad9a9ca29249dccf37fa6b3ad26700fcbc87f2f41101bf914f5193a04e36a3d23de70b1dcb8e5d5a3b21e151debace2c4cd08d868be500a1b29 + languageName: node + linkType: hard + "dotenv@npm:^16.3.1": version: 16.3.1 resolution: "dotenv@npm:16.3.1" @@ -4283,6 +4343,17 @@ __metadata: languageName: node linkType: hard +"node-fetch@npm:^3.3.1": + version: 3.3.1 + resolution: "node-fetch@npm:3.3.1" + dependencies: + data-uri-to-buffer: "npm:^4.0.0" + fetch-blob: "npm:^3.1.4" + formdata-polyfill: "npm:^4.0.10" + checksum: 9fed9ed9ab83f719ffbe51b5029f32ee9820a725afc57a3e6a7e5742a05dd38b22d005f2d03d70e8e0924b497e513b08992843bb1bc7f0a15b72ad071d8c1271 + languageName: node + linkType: hard + "node-fetch@npm:^3.3.2": version: 3.3.2 resolution: "node-fetch@npm:3.3.2" @@ -6065,6 +6136,21 @@ __metadata: languageName: node linkType: hard +"ws@npm:^8.13.0": + version: 8.13.0 + resolution: "ws@npm:8.13.0" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ">=5.0.2" + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: 1769532b6fdab9ff659f0b17810e7501831d34ecca23fd179ee64091dd93a51f42c59f6c7bb4c7a384b6c229aca8076fb312aa35626257c18081511ef62a161d + languageName: node + linkType: hard + "ws@npm:^8.14.2": version: 8.14.2 resolution: "ws@npm:8.14.2"