refactor: remove extended collection (#6246)

Co-authored-by: iCrawl <buechler.noel@outlook.com>

package-lock.json

@@ -9,7 +9,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@discordjs/builders": "^0.2.0",
-        "@discordjs/collection": "^0.2.0",
+        "@discordjs/collection": "^0.2.1",
         "@discordjs/form-data": "^3.0.1",
         "@sapphire/async-queue": "^1.1.4",
         "@types/ws": "^7.4.5",
@@ -1008,9 +1008,9 @@
       "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     },
     "node_modules/@discordjs/collection": {
-      "version": "0.2.0",
+      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.1.tgz",
-      "integrity": "sha512-ZSiyfQsQmJq5EDgTocUg6n7IOft64MH/53RC8q3+Z5Ltipgc6eH1lLyDMJz2fcY/xq5zrILd9LyqFgEdragDNA==",
+      "integrity": "sha512-vhxqzzM8gkomw0TYRF3tgx7SwElzUlXT/Aa41O7mOcyN6wIJfj5JmDWaO5XGKsGSsNx7F3i5oIlrucCCWV1Nog==",
       "engines": {
         "node": ">=14.0.0"
       }
@@ -12234,9 +12234,9 @@
       }
     },
     "@discordjs/collection": {
-      "version": "0.2.0",
+      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.1.tgz",
-      "integrity": "sha512-ZSiyfQsQmJq5EDgTocUg6n7IOft64MH/53RC8q3+Z5Ltipgc6eH1lLyDMJz2fcY/xq5zrILd9LyqFgEdragDNA=="
+      "integrity": "sha512-vhxqzzM8gkomw0TYRF3tgx7SwElzUlXT/Aa41O7mOcyN6wIJfj5JmDWaO5XGKsGSsNx7F3i5oIlrucCCWV1Nog=="
     },
     "@discordjs/docgen": {
       "version": "0.10.0",

package.json

@@ -46,7 +46,7 @@
   "homepage": "https://github.com/discordjs/discord.js#readme",
   "dependencies": {
     "@discordjs/builders": "^0.2.0",
-    "@discordjs/collection": "^0.2.0",
+    "@discordjs/collection": "^0.2.1",
     "@discordjs/form-data": "^3.0.1",
     "@sapphire/async-queue": "^1.1.4",
     "@types/ws": "^7.4.5",

src/client/Client.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const BaseClient = require('./BaseClient');
 const ActionsManager = require('./actions/ActionsManager');
 const ClientVoiceManager = require('./voice/ClientVoiceManager');
@@ -19,7 +20,6 @@ const StickerPack = require('../structures/StickerPack');
 const VoiceRegion = require('../structures/VoiceRegion');
 const Webhook = require('../structures/Webhook');
 const Widget = require('../structures/Widget');
-const Collection = require('../util/Collection');
 const { Events, InviteScopes, Status } = require('../util/Constants');
 const DataResolver = require('../util/DataResolver');
 const Intents = require('../util/Intents');

src/client/actions/MessageDeleteBulk.js

@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Action = require('./Action');
-const Collection = require('../../util/Collection');
 const { Events } = require('../../util/Constants');
 
 class MessageDeleteBulkAction extends Action {

src/client/actions/ThreadListSync.js

@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Action = require('./Action');
-const Collection = require('../../util/Collection');
 const { Events } = require('../../util/Constants');
 
 class ThreadListSyncAction extends Action {

src/client/websocket/WebSocketManager.js

@@ -1,10 +1,10 @@
 'use strict';
 
 const EventEmitter = require('events');
+const { Collection } = require('@discordjs/collection');
 const WebSocketShard = require('./WebSocketShard');
 const PacketHandlers = require('./handlers');
 const { Error } = require('../../errors');
-const Collection = require('../../util/Collection');
 const { Events, ShardEvents, Status, WSCodes, WSEvents } = require('../../util/Constants');
 const Util = require('../../util/Util');
 

src/client/websocket/handlers/GUILD_MEMBERS_CHUNK.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Collection = require('../../../util/Collection');
+const { Collection } = require('@discordjs/collection');
 const { Events } = require('../../../util/Constants');
 
 module.exports = (client, { d: data }) => {

src/index.js

@@ -14,7 +14,7 @@ module.exports = {
   ApplicationFlags: require('./util/ApplicationFlags'),
   BaseManager: require('./managers/BaseManager'),
   BitField: require('./util/BitField'),
-  Collection: require('./util/Collection'),
+  Collection: require('@discordjs/collection').Collection,
   Constants: require('./util/Constants'),
   DataResolver: require('./util/DataResolver'),
   DiscordAPIError: require('./rest/DiscordAPIError'),

src/managers/ApplicationCommandManager.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const ApplicationCommandPermissionsManager = require('./ApplicationCommandPermissionsManager');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const ApplicationCommand = require('../structures/ApplicationCommand');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for application commands and stores their cache.

src/managers/ApplicationCommandPermissionsManager.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const BaseManager = require('./BaseManager');
 const { Error, TypeError } = require('../errors');
-const Collection = require('../util/Collection');
 const { ApplicationCommandPermissionTypes, APIErrors } = require('../util/Constants');
 
 /**

src/managers/GuildBanManager.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError, Error } = require('../errors');
 const GuildBan = require('../structures/GuildBan');
 const GuildMember = require('../structures/GuildMember');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for GuildBans and stores their cache.

src/managers/GuildChannelManager.js

@@ -1,11 +1,11 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Error } = require('../errors');
 const GuildChannel = require('../structures/GuildChannel');
 const PermissionOverwrites = require('../structures/PermissionOverwrites');
 const ThreadChannel = require('../structures/ThreadChannel');
-const Collection = require('../util/Collection');
 const { ChannelTypes, ThreadChannelTypes } = require('../util/Constants');
 
 /**

src/managers/GuildEmojiManager.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const BaseGuildEmojiManager = require('./BaseGuildEmojiManager');
 const { TypeError } = require('../errors');
-const Collection = require('../util/Collection');
 const DataResolver = require('../util/DataResolver');
 
 /**

src/managers/GuildEmojiRoleManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const DataManager = require('./DataManager');
 const { TypeError } = require('../errors');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for roles belonging to emojis and stores their cache.

src/managers/GuildInviteManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Error } = require('../errors');
 const Invite = require('../structures/Invite');
-const Collection = require('../util/Collection');
 const DataResolver = require('../util/DataResolver');
 
 /**

src/managers/GuildManager.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const Guild = require('../structures/Guild');
 const GuildChannel = require('../structures/GuildChannel');
@@ -8,7 +9,6 @@ const GuildMember = require('../structures/GuildMember');
 const Invite = require('../structures/Invite');
 const OAuth2Guild = require('../structures/OAuth2Guild');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 const {
   ChannelTypes,
   Events,

src/managers/GuildMemberManager.js

@@ -1,11 +1,11 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Error, TypeError, RangeError } = require('../errors');
 const BaseGuildVoiceChannel = require('../structures/BaseGuildVoiceChannel');
 const GuildMember = require('../structures/GuildMember');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 const { Events, Opcodes } = require('../util/Constants');
 const SnowflakeUtil = require('../util/SnowflakeUtil');
 

src/managers/GuildMemberRoleManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const DataManager = require('./DataManager');
 const { TypeError } = require('../errors');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for roles of a GuildMember and stores their cache.

src/managers/GuildStickerManager.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const MessagePayload = require('../structures/MessagePayload');
 const Sticker = require('../structures/Sticker');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for Guild Stickers and stores their cache.

src/managers/MessageManager.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const Message = require('../structures/Message');
 const MessagePayload = require('../structures/MessagePayload');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for Messages and holds their cache.

src/managers/PermissionOverwriteManager.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const PermissionOverwrites = require('../structures/PermissionOverwrites');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 const { OverwriteTypes } = require('../util/Constants');
 
 /**

src/managers/ReactionUserManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Error } = require('../errors');
 const User = require('../structures/User');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for users who reacted to a reaction and stores their cache.

src/managers/RoleManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 const Permissions = require('../util/Permissions');
 const { resolveColor, setPosition } = require('../util/Util');
 

src/managers/ThreadManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const ThreadChannel = require('../structures/ThreadChannel');
-const Collection = require('../util/Collection');
 const { ChannelTypes } = require('../util/Constants');
 
 /**

src/managers/ThreadMemberManager.js

@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const ThreadMember = require('../structures/ThreadMember');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for GuildMembers and stores their cache.

src/rest/RESTManager.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const APIRequest = require('./APIRequest');
 const routeBuilder = require('./APIRouter');
 const RequestHandler = require('./RequestHandler');
 const { Error } = require('../errors');
-const Collection = require('../util/Collection');
 const { Endpoints } = require('../util/Constants');
 
 class RESTManager {

src/sharding/ShardingManager.js

@@ -3,9 +3,9 @@
 const EventEmitter = require('events');
 const fs = require('fs');
 const path = require('path');
+const { Collection } = require('@discordjs/collection');
 const Shard = require('./Shard');
 const { Error, TypeError, RangeError } = require('../errors');
-const Collection = require('../util/Collection');
 const Util = require('../util/Util');
 
 /**

src/structures/BaseGuildVoiceChannel.js

@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const GuildChannel = require('./GuildChannel');
-const Collection = require('../util/Collection');
 const Permissions = require('../util/Permissions');
 
 /**

src/structures/Guild.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const AnonymousGuild = require('./AnonymousGuild');
 const GuildAuditLogs = require('./GuildAuditLogs');
 const GuildPreview = require('./GuildPreview');
@@ -19,7 +20,6 @@ const PresenceManager = require('../managers/PresenceManager');
 const RoleManager = require('../managers/RoleManager');
 const StageInstanceManager = require('../managers/StageInstanceManager');
 const VoiceStateManager = require('../managers/VoiceStateManager');
-const Collection = require('../util/Collection');
 const {
   ChannelTypes,
   DefaultMessageNotificationLevels,

src/structures/GuildAuditLogs.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Integration = require('./Integration');
 const StageInstance = require('./StageInstance');
 const Sticker = require('./Sticker');
 const Webhook = require('./Webhook');
-const Collection = require('../util/Collection');
 const { OverwriteTypes, PartialTypes } = require('../util/Constants');
 const Permissions = require('../util/Permissions');
 const SnowflakeUtil = require('../util/SnowflakeUtil');

src/structures/GuildChannel.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Channel = require('./Channel');
 const PermissionOverwrites = require('./PermissionOverwrites');
 const { Error } = require('../errors');
 const PermissionOverwriteManager = require('../managers/PermissionOverwriteManager');
-const Collection = require('../util/Collection');
 const { ChannelTypes, VoiceBasedChannelTypes } = require('../util/Constants');
 const Permissions = require('../util/Permissions');
 const Util = require('../util/Util');

src/structures/GuildPreview.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Base = require('./Base');
 const GuildPreviewEmoji = require('./GuildPreviewEmoji');
-const Collection = require('../util/Collection');
 const SnowflakeUtil = require('../util/SnowflakeUtil');
 
 /**

src/structures/InteractionCollector.js

@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Collector = require('./interfaces/Collector');
-const Collection = require('../util/Collection');
 const { Events } = require('../util/Constants');
 const { InteractionTypes, MessageComponentTypes } = require('../util/Constants');
 

src/structures/InviteStageInstance.js

@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Base = require('./Base');
-const Collection = require('../util/Collection');
 
 /**
  * Represents the data about a public {@link StageInstance} in an {@link Invite}.

src/structures/Message.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Base = require('./Base');
 const BaseMessageComponent = require('./BaseMessageComponent');
 const ClientApplication = require('./ClientApplication');
@@ -12,7 +13,6 @@ const ReactionCollector = require('./ReactionCollector');
 const Sticker = require('./Sticker');
 const { Error } = require('../errors');
 const ReactionManager = require('../managers/ReactionManager');
-const Collection = require('../util/Collection');
 const { InteractionTypes, MessageTypes, SystemMessageTypes } = require('../util/Constants');
 const MessageFlags = require('../util/MessageFlags');
 const Permissions = require('../util/Permissions');

src/structures/MessageMentions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Collection = require('../util/Collection');
+const { Collection } = require('@discordjs/collection');
 const { ChannelTypes } = require('../util/Constants');
 const Util = require('../util/Util');
 

src/structures/ReactionCollector.js

@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Collector = require('./interfaces/Collector');
-const Collection = require('../util/Collection');
 const { Events } = require('../util/Constants');
 
 /**

src/structures/StickerPack.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Base = require('./Base');
 const Sticker = require('./Sticker');
-const Collection = require('../util/Collection');
 const SnowflakeUtil = require('../util/SnowflakeUtil');
 
 /**

src/structures/Team.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Base = require('./Base');
 const TeamMember = require('./TeamMember');
-const Collection = require('../util/Collection');
 const SnowflakeUtil = require('../util/SnowflakeUtil');
 
 /**

src/structures/TextChannel.js

@@ -1,11 +1,11 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const GuildChannel = require('./GuildChannel');
 const Webhook = require('./Webhook');
 const TextBasedChannel = require('./interfaces/TextBasedChannel');
 const MessageManager = require('../managers/MessageManager');
 const ThreadManager = require('../managers/ThreadManager');
-const Collection = require('../util/Collection');
 const DataResolver = require('../util/DataResolver');
 
 /**

src/structures/WelcomeScreen.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Base = require('./Base');
 const WelcomeChannel = require('./WelcomeChannel');
-const Collection = require('../util/Collection');
 
 /**
  * Represents a welcome screen.

src/structures/Widget.js

@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Base = require('./Base');
 const WidgetMember = require('./WidgetMember');
-const Collection = require('../util/Collection');
 
 /**
  * Represents a Widget.

src/structures/interfaces/Collector.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const EventEmitter = require('events');
+const { Collection } = require('@discordjs/collection');
 const { TypeError } = require('../../errors');
-const Collection = require('../../util/Collection');
 const Util = require('../../util/Util');
 
 /**

src/structures/interfaces/TextBasedChannel.js

@@ -4,7 +4,7 @@
 const MessageCollector = require('../MessageCollector');
 const MessagePayload = require('../MessagePayload');
 const SnowflakeUtil = require('../../util/SnowflakeUtil');
-const Collection = require('../../util/Collection');
+const { Collection } = require('@discordjs/collection');
 const { InteractionTypes } = require('../../util/Constants');
 const { TypeError, Error } = require('../../errors');
 const InteractionCollector = require('../InteractionCollector');

src/util/Collection.js

@@ -1,17 +0,0 @@
-'use strict';
-
-const { Collection: BaseCollection } = require('@discordjs/collection');
-const Util = require('./Util');
-
-class Collection extends BaseCollection {
-  toJSON() {
-    return this.map(e => (typeof e?.toJSON === 'function' ? e.toJSON() : Util.flatten(e)));
-  }
-}
-
-module.exports = Collection;
-
-/**
- * @external Collection
- * @see {@link https://discord.js.org/#/docs/collection/master/class/Collection}
- */

src/util/LimitedCollection.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Collection = require('./Collection.js');
+const { Collection } = require('@discordjs/collection');
 
 /**
  * A Collection which holds a max amount of entries. The first key is deleted if the Collection has

src/util/Options.js

@@ -173,7 +173,7 @@ class Options extends null {
    * });
    */
   static cacheWithLimits(settings = {}) {
-    const Collection = require('./Collection');
+    const { Collection } = require('@discordjs/collection');
     const LimitedCollection = require('./LimitedCollection');
     const SweptCollection = require('./SweptCollection');
 
@@ -197,7 +197,7 @@ class Options extends null {
    * @returns {CacheFactory}
    */
   static cacheEverything() {
-    const Collection = require('./Collection');
+    const { Collection } = require('@discordjs/collection');
     return () => new Collection();
   }
 }

src/util/SweptCollection.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Collection = require('./Collection.js');
+const { Collection } = require('@discordjs/collection');
 const { _cleanupSymbol } = require('./Constants.js');
 const { TypeError } = require('../errors/DJSError.js');
 

typings/index.d.ts

@@ -13,7 +13,7 @@ import {
   TimestampStylesString,
   underscore,
 } from '@discordjs/builders';
-import BaseCollection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 import { ChildProcess } from 'child_process';
 import {
   APIActionRowComponent,
@@ -368,9 +368,7 @@ export class ClientVoiceManager {
   public adapters: Map<Snowflake, InternalDiscordGatewayAdapterLibraryMethods>;
 }
 
-export class Collection<K, V> extends BaseCollection<K, V> {
+export { Collection } from '@discordjs/collection';
-  public toJSON(): unknown;
-}
 
 export abstract class Collector<K, V, F extends unknown[] = []> extends EventEmitter {
   public constructor(client: Client, options?: CollectorOptions<[V, ...F]>);