oceanic.js 0.0.11-dev.ac167cd → 0.0.11-dev.c858dfa

package/dist/lib/util/InteractionOptionsWrapper.d.ts

@@ -11,146 +11,125 @@ export default class InteractionOptionsWrapper {
     resolved: ApplicationCommandInteractionResolvedData | null;
     constructor(data: Array<InteractionOptions>, resolved: ApplicationCommandInteractionResolvedData | null);
     private _getOption;
-    /**
-     * Get an attachment option.
-     * @param name The name of the option.
-     * @param required If true, an error will be thrown if the option is not present.
-     */
-    getAttachment(name: string, required?: false): InteractionOptionsAttachment | undefined;
-    getAttachment(name: string, required: true): InteractionOptionsAttachment;
     /**
      * Get an attachment option value.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present or the attachment cannot be found.
      */
-    getAttachmentValue(name: string, required?: false): Attachment | undefined;
-    getAttachmentValue(name: string, required: true): Attachment;
+    getAttachment(name: string, required?: false): Attachment | undefined;
+    getAttachment(name: string, required: true): Attachment;
     /**
-     * Get a boolean option.
+     * Get an attachment option.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getBoolean(name: string, required?: false): InteractionOptionsBoolean | undefined;
-    getBoolean(name: string, required: true): InteractionOptionsBoolean;
+    getAttachmentOption(name: string, required?: false): InteractionOptionsAttachment | undefined;
+    getAttachmentOption(name: string, required: true): InteractionOptionsAttachment;
     /**
      * Get a boolean option value.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getBooleanValue(name: string, required?: false): boolean | undefined;
-    getBooleanValue(name: string, required: true): boolean;
+    getBoolean(name: string, required?: false): boolean | undefined;
+    getBoolean(name: string, required: true): boolean;
     /**
-     * Get a channel option.
-     * @param name The name of the option.
-     * @param required If true, an error will be thrown if the option is not present.
-     */
-    getChannel(name: string, required?: false): InteractionOptionsChannel | undefined;
-    getChannel(name: string, required: true): InteractionOptionsChannel;
-    /**
-     * Get a channel option value (id).
+     * Get a boolean option.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getChannelID(name: string, required?: false): string | undefined;
-    getChannelID(name: string, required: true): string;
+    getBooleanOption(name: string, required?: false): InteractionOptionsBoolean | undefined;
+    getBooleanOption(name: string, required: true): InteractionOptionsBoolean;
     /**
-     * Get a channel option value (channel).
+     * Get a channel option value.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present or the channel cannot be found.
      */
-    getChannelValue<T extends AnyChannel = AnyChannel>(name: string, required?: false): T | undefined;
-    getChannelValue<T extends AnyChannel = AnyChannel>(name: string, required: true): T;
+    getChannel<T extends AnyChannel = AnyChannel>(name: string, required?: false): T | undefined;
+    getChannel<T extends AnyChannel = AnyChannel>(name: string, required: true): T;
     /**
-     * Get an integer option.
+     * Get a channel option.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getInteger(name: string, required?: false): InteractionOptionsInteger | undefined;
-    getInteger(name: string, required: true): InteractionOptionsInteger;
+    getChannelOption(name: string, required?: false): InteractionOptionsChannel | undefined;
+    getChannelOption(name: string, required: true): InteractionOptionsChannel;
     /**
-     * Get an integer option.
+     * Get an integer option value.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getIntegerValue(name: string, required?: false): number | undefined;
-    getIntegerValue(name: string, required: true): number;
+    getInteger(name: string, required?: false): number | undefined;
+    getInteger(name: string, required: true): number;
     /**
-     * Get a user option value (member).
-     * @param name The name of the option.
-     * @param required If true, an error will be thrown if the option is not present, or if the member cannot be found.
-     */
-    getMemberValue(name: string, required?: false): Member | undefined;
-    getMemberValue(name: string, required: true): Member;
-    /**
-     * Get a mentionable option.
+     * Get an integer option.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getMentionable(name: string, required?: false): InteractionOptionsMentionable | undefined;
-    getMentionable(name: string, required: true): InteractionOptionsMentionable;
+    getIntegerOption(name: string, required?: false): InteractionOptionsInteger | undefined;
+    getIntegerOption(name: string, required: true): InteractionOptionsInteger;
     /**
-     * Get a mentionable option (id).
+     * Get a user option value (as a member).
      * @param name The name of the option.
-     * @param required If true, an error will be thrown if the option is not present.
+     * @param required If true, an error will be thrown if the option is not present, or if the member cannot be found.
      */
-    getMentionableID(name: string, required?: false): string | undefined;
-    getMentionableID(name: string, required: true): string;
+    getMember(name: string, required?: false): Member | undefined;
+    getMember(name: string, required: true): Member;
     /**
-     * Get a mentionable option (channel, user, role).
+     * Get a mentionable option value (channel, user, role).
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present, or if the value cannot be found.
      */
-    getMentionableValue<T extends AnyChannel | User | Role = AnyChannel | User | Role>(name: string, required?: false): T | undefined;
-    getMentionableValue<T extends AnyChannel | User | Role = AnyChannel | User | Role>(name: string, required: true): T;
+    getMentionable<T extends AnyChannel | User | Role = AnyChannel | User | Role>(name: string, required?: false): T | undefined;
+    getMentionable<T extends AnyChannel | User | Role = AnyChannel | User | Role>(name: string, required: true): T;
     /**
-     * Get a number option.
+     * Get a mentionable option.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getNumber(name: string, required?: false): InteractionOptionsNumber | undefined;
-    getNumber(name: string, required: true): InteractionOptionsNumber;
+    getMentionableOption(name: string, required?: false): InteractionOptionsMentionable | undefined;
+    getMentionableOption(name: string, required: true): InteractionOptionsMentionable;
     /**
      * Get a number option value.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getNumberValue(name: string, required?: false): number | undefined;
-    getNumberValue(name: string, required: true): number;
+    getNumber(name: string, required?: false): number | undefined;
+    getNumber(name: string, required: true): number;
     /**
-     * Get a role option.
+     * Get a number option.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getRole(name: string, required?: false): InteractionOptionsRole | undefined;
-    getRole(name: string, required: true): InteractionOptionsRole;
+    getNumberOption(name: string, required?: false): InteractionOptionsNumber | undefined;
+    getNumberOption(name: string, required: true): InteractionOptionsNumber;
     /**
-     * Get a role option value (id).
+     * Get a role option value.
      * @param name The name of the option.
-     * @param required If true, an error will be thrown if the option is not present.
+     * @param required If true, an error will be thrown if the option is not present, or if the role cannot be found.
      */
-    getRoleID(name: string, required?: false): string | undefined;
-    getRoleID(name: string, required: true): string;
+    getRole(name: string, required?: false): Role | undefined;
+    getRole(name: string, required: true): Role;
     /**
-     * Get a role option value (role).
+     * Get a role option.
      * @param name The name of the option.
-     * @param required If true, an error will be thrown if the option is not present, or if the role cannot be found.
+     * @param required If true, an error will be thrown if the option is not present.
      */
-    getRoleValue(name: string, required?: false): Role | undefined;
-    getRoleValue(name: string, required: true): Role;
+    getRoleOption(name: string, required?: false): InteractionOptionsRole | undefined;
+    getRoleOption(name: string, required: true): InteractionOptionsRole;
     /**
-     * Get a string option.
+     * Get a string option value.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getString(name: string, required?: false): InteractionOptionsString | undefined;
-    getString(name: string, required: true): InteractionOptionsString;
+    getString<T extends string = string>(name: string, required?: false): T | undefined;
+    getString<T extends string = string>(name: string, required: true): T;
     /**
      * Get a string option.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getStringValue<T extends string = string>(name: string, required?: false): T | undefined;
-    getStringValue<T extends string = string>(name: string, required: true): T;
+    getStringOption(name: string, required?: false): InteractionOptionsString | undefined;
+    getStringOption(name: string, required: true): InteractionOptionsString;
     /**
      * If present, returns the top level subcommand. This only goes one level deep, to get the subcommand of a subcommandgroup, you must call this twice in a ro.
      * @param name The name of the option.
@@ -159,24 +138,17 @@ export default class InteractionOptionsWrapper {
     getSubCommand(required?: false): [subcommand: string] | [subcommandGroup: string, subcommand: string] | undefined;
     getSubCommand(required: true): [subcommand: string] | [subcommandGroup: string, subcommand: string];
     /**
-     * Get a user option.
+     * Get a user option value.
      * @param name The name of the option.
-     * @param required If true, an error will be thrown if the option is not present.
+     * @param required If true, an error will be thrown if the option is not present, or if the user cannot be found.
      */
-    getUser(name: string, required?: false): InteractionOptionsUser | undefined;
-    getUser(name: string, required: true): InteractionOptionsUser;
+    getUser(name: string, required?: false): User | undefined;
+    getUser(name: string, required: true): User;
     /**
-     * Get a user option value (id).
+     * Get a user option.
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present.
      */
-    getUserID(name: string, required?: false): string | undefined;
-    getUserID(name: string, required: true): string;
-    /**
-     * Get a user option value (user).
-     * @param name The name of the option.
-     * @param required If true, an error will be thrown if the option is not present, or if the user cannot be found.
-     */
-    getUserValue(name: string, required?: false): User | undefined;
-    getUserValue(name: string, required: true): User;
+    getUserOption(name: string, required?: false): InteractionOptionsUser | undefined;
+    getUserOption(name: string, required: true): InteractionOptionsUser;
 }

package/dist/lib/util/InteractionOptionsWrapper.js

@@ -25,53 +25,50 @@ class InteractionOptionsWrapper {
             return opt;
     }
     getAttachment(name, required) {
-        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.ATTACHMENT);
-    }
-    getAttachmentValue(name, required) {
         if (this.resolved === null)
             throw new Error("attempt to use getAttachmentValue with null resolved");
         let val;
-        if (!(val = this.getAttachment(name, required)?.value))
+        if (!(val = this.getAttachmentOption(name, required)?.value))
             return undefined;
         const a = this.resolved.attachments.get(val);
         if (!a && required)
             throw new Error(`attachment not present for required option: ${name}`);
         return a;
     }
+    getAttachmentOption(name, required) {
+        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.ATTACHMENT);
+    }
     getBoolean(name, required) {
-        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.BOOLEAN);
+        return this.getBooleanOption(name, required)?.value;
     }
-    getBooleanValue(name, required) {
-        return this.getBoolean(name, required)?.value;
+    getBooleanOption(name, required) {
+        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.BOOLEAN);
     }
     getChannel(name, required) {
-        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.CHANNEL);
-    }
-    getChannelID(name, required) {
-        return this.getChannel(name, required)?.value;
-    }
-    getChannelValue(name, required) {
         if (this.resolved === null)
             throw new Error("attempt to use getChannelValue with null resolved");
         let val;
-        if (!(val = this.getChannel(name, required)?.value))
+        if (!(val = this.getChannelOption(name, required)?.value))
             return undefined;
         const ch = this.resolved.channels.get(val);
         if (!ch && required)
             throw new Error(`channel not present for required option: ${name}`);
         return ch;
     }
+    getChannelOption(name, required) {
+        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.CHANNEL);
+    }
     getInteger(name, required) {
-        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.INTEGER);
+        return this.getIntegerOption(name, required)?.value;
     }
-    getIntegerValue(name, required) {
-        return this.getInteger(name, required)?.value;
+    getIntegerOption(name, required) {
+        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.INTEGER);
     }
-    getMemberValue(name, required) {
+    getMember(name, required) {
         if (this.resolved === null)
             throw new Error("attempt to use getMemberValue with null resolved");
         let val;
-        if (!(val = this.getUser(name, required)?.value))
+        if (!(val = this.getUserOption(name, required)?.value))
             return undefined;
         const ch = this.resolved.members.get(val);
         if (!ch && required)
@@ -79,50 +76,46 @@ class InteractionOptionsWrapper {
         return ch;
     }
     getMentionable(name, required) {
-        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.MENTIONABLE);
-    }
-    getMentionableID(name, required) {
-        return this.getMentionable(name, required)?.value;
-    }
-    getMentionableValue(name, required) {
         if (this.resolved === null)
             throw new Error("attempt to use getMentionableValue with null resolved");
         let val;
-        if (!(val = this.getChannel(name, required)?.value))
+        if (!(val = this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.MENTIONABLE)?.value))
             return undefined;
         const ch = this.resolved.channels.get(val);
-        if (!ch && required)
-            throw new Error(`channel not present for required option: ${name}`);
+        const role = this.resolved.roles.get(val);
+        const user = this.resolved.users.get(val);
+        if ((!ch && !role && !user) && required)
+            throw new Error(`value not present for required option: ${name}`);
         return ch;
     }
+    getMentionableOption(name, required) {
+        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.MENTIONABLE);
+    }
     getNumber(name, required) {
-        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.NUMBER);
+        return this.getNumberOption(name, required)?.value;
     }
-    getNumberValue(name, required) {
-        return this.getNumber(name, required)?.value;
+    getNumberOption(name, required) {
+        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.NUMBER);
     }
     getRole(name, required) {
-        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.ROLE);
-    }
-    getRoleID(name, required) {
-        return this.getRole(name, required)?.value;
-    }
-    getRoleValue(name, required) {
         if (this.resolved === null)
             throw new Error("attempt to use getRoleValue with null resolved");
         let val;
-        if (!(val = this.getRole(name, required)?.value))
+        if (!(val = this.getRoleOption(name, required)?.value))
             return undefined;
         const ch = this.resolved.roles.get(val);
         if (!ch && required)
             throw new Error(`role not present for required option: ${name}`);
         return ch;
     }
+    getRoleOption(name, required) {
+        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.ROLE);
+    }
     getString(name, required) {
-        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.STRING);
+        return this.getStringOption(name, required)?.value;
     }
-    getStringValue(name, required) {
-        return this.getString(name, required)?.value;
+    getStringOption(name, required) {
+        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.STRING);
     }
     getSubCommand(required) {
         const opt = this.raw.find(o => o.type === Constants_1.ApplicationCommandOptionTypes.SUB_COMMAND || o.type === Constants_1.ApplicationCommandOptionTypes.SUB_COMMAND_GROUP);
@@ -146,22 +139,19 @@ class InteractionOptionsWrapper {
         }
     }
     getUser(name, required) {
-        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.USER);
-    }
-    getUserID(name, required) {
-        return this.getUser(name, required)?.value;
-    }
-    getUserValue(name, required) {
         if (this.resolved === null)
             throw new Error("attempt to use getUserValue with null resolved");
         let val;
-        if (!(val = this.getUser(name, required)?.value))
+        if (!(val = this.getUserOption(name, required)?.value))
             return undefined;
         const ch = this.resolved.users.get(val);
         if (!ch && required)
             throw new Error(`user not present for required option: ${name}`);
         return ch;
     }
+    getUserOption(name, required) {
+        return this._getOption(name, required, Constants_1.ApplicationCommandOptionTypes.USER);
+    }
 }
 exports.default = InteractionOptionsWrapper;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"InteractionOptionsWrapper.js","sourceRoot":"","sources":["../../../lib/util/InteractionOptionsWrapper.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"InteractionOptionsWrapper.js","sourceRoot":"","sources":["../../../lib/util/InteractionOptionsWrapper.ts"],"names":[],"mappings":"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"}

package/dist/lib/util/TypedCollection.d.ts

@@ -0,0 +1,16 @@
+import Collection from "./Collection";
+import type Client from "../Client";
+import Base from "../structures/Base";
+export declare type AnyClass<T, I, E extends Array<unknown>> = new (data: T, client: Client, ...extra: E) => I;
+/** This is an internal class, you should not use it in your projects. */
+export default class TypedCollection<K extends string | number, M extends Record<string, any>, C extends Base, E extends Array<unknown> = []> extends Collection<K, C> {
+    #private;
+    limit: number;
+    constructor(baseObject: AnyClass<M, C, E>, client: Client, limit?: number);
+    /** @hidden */
+    add<T extends C>(value: T): T;
+    /** @hidden */
+    update(value: C | Partial<M> & {
+        id?: K;
+    }, ...extra: E): C;
+}

package/dist/lib/util/TypedCollection.js

@@ -0,0 +1,59 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Collection_1 = __importDefault(require("./Collection"));
+const Base_1 = __importDefault(require("../structures/Base"));
+/** This is an internal class, you should not use it in your projects. */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+class TypedCollection extends Collection_1.default {
+    #baseObject;
+    #client;
+    limit;
+    constructor(baseObject, client, limit = Infinity) {
+        super();
+        if (!(baseObject.prototype instanceof Base_1.default))
+            throw new Error("baseObject must be a class that extends Base");
+        this.#baseObject = baseObject;
+        this.#client = client;
+        this.limit = limit;
+    }
+    /** @hidden */
+    add(value) {
+        if ("id" in value) {
+            if (this.limit === 0)
+                return value;
+            this.set(value.id, value);
+            if (this.limit && this.size > this.limit) {
+                const iter = this.keys();
+                while (this.size > this.limit) {
+                    this.delete(iter.next().value.id);
+                }
+            }
+            return value;
+        }
+        else {
+            const err = new Error("Collection.add: value must have an id property");
+            Object.defineProperty(err, "_object", { value });
+            throw err;
+        }
+    }
+    /** @hidden */
+    update(value, ...extra) {
+        if (value instanceof this.#baseObject) {
+            if ("update" in value)
+                value["update"].call(value, value);
+            return value;
+        }
+        // if the object does not have a direct id, we're forced to construct a whole new object
+        let item = "id" in value && value.id ? this.get(value.id) : undefined;
+        if (!item)
+            item = this.add(new this.#baseObject(value, this.#client, ...extra));
+        else if ("update" in item)
+            item["update"].call(item, value);
+        return item;
+    }
+}
+exports.default = TypedCollection;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVHlwZWRDb2xsZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWwvVHlwZWRDb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsOERBQXNDO0FBRXRDLDhEQUFzQztBQUl0Qyx5RUFBeUU7QUFDekUsOERBQThEO0FBQzlELE1BQXFCLGVBQXlILFNBQVEsb0JBQWdCO0lBQ2xLLFdBQVcsQ0FBb0I7SUFDL0IsT0FBTyxDQUFTO0lBQ2hCLEtBQUssQ0FBUztJQUNkLFlBQVksVUFBNkIsRUFBRSxNQUFjLEVBQUUsS0FBSyxHQUFHLFFBQVE7UUFDdkUsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsQ0FBQyxVQUFVLENBQUMsU0FBUyxZQUFZLGNBQUksQ0FBQztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsOENBQThDLENBQUMsQ0FBQztRQUM3RyxJQUFJLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQztRQUM5QixJQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQztRQUN0QixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztJQUN2QixDQUFDO0lBRUQsY0FBYztJQUNkLEdBQUcsQ0FBYyxLQUFRO1FBQ3JCLElBQUksSUFBSSxJQUFJLEtBQUssRUFBRTtZQUNmLElBQUksSUFBSSxDQUFDLEtBQUssS0FBSyxDQUFDO2dCQUFFLE9BQU8sS0FBSyxDQUFDO1lBQ25DLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztZQUUvQixJQUFJLElBQUksQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsS0FBSyxFQUFFO2dCQUN0QyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ3pCLE9BQU8sSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsS0FBSyxFQUFFO29CQUMzQixJQUFJLENBQUMsTUFBTSxDQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxLQUFXLENBQUMsRUFBTyxDQUFDLENBQUM7aUJBQ2pEO2FBQ0o7WUFFRCxPQUFPLEtBQUssQ0FBQztTQUNoQjthQUFNO1lBQ0gsTUFBTSxHQUFHLEdBQUcsSUFBSSxLQUFLLENBQUMsZ0RBQWdELENBQUMsQ0FBQztZQUN4RSxNQUFNLENBQUMsY0FBYyxDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO1lBQ2pELE1BQU0sR0FBRyxDQUFDO1NBQ2I7SUFDTCxDQUFDO0lBRUQsY0FBYztJQUNkLE1BQU0sQ0FBQyxLQUFtQyxFQUFFLEdBQUcsS0FBUTtRQUNuRCxJQUFJLEtBQUssWUFBWSxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQ25DLElBQUksUUFBUSxJQUFJLEtBQUs7Z0JBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDMUQsT0FBTyxLQUFLLENBQUM7U0FDaEI7UUFDRCx3RkFBd0Y7UUFDeEYsSUFBSSxJQUFJLEdBQUcsSUFBSSxJQUFJLEtBQUssSUFBSSxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1FBQzNFLElBQUksQ0FBQyxJQUFJO1lBQUUsSUFBSSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQVUsRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQzthQUNoRixJQUFJLFFBQVEsSUFBSSxJQUFJO1lBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDNUQsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztDQUNKO0FBN0NELGtDQTZDQyJ9

package/dist/lib/voice/VoiceConnectionManager.d.ts

@@ -1,6 +1,6 @@
 import type VoiceConnection from "./VoiceConnection";
 import type Client from "../Client";
-import { Collection } from "@augu/collections";
+import Collection from "../util/Collection";
 export default class VoiceConnectionManager extends Collection<string, VoiceConnection> {
     #private;
     constructor(client: Client);

package/dist/lib/voice/VoiceConnectionManager.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const collections_1 = require("@augu/collections");
-class VoiceConnectionManager extends collections_1.Collection {
+const Collection_1 = __importDefault(require("../util/Collection"));
+class VoiceConnectionManager extends Collection_1.default {
     #client;
     constructor(client) {
         super();
@@ -9,4 +12,4 @@ class VoiceConnectionManager extends collections_1.Collection {
     }
 }
 exports.default = VoiceConnectionManager;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm9pY2VDb25uZWN0aW9uTWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi92b2ljZS9Wb2ljZUNvbm5lY3Rpb25NYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsbURBQStDO0FBRS9DLE1BQXFCLHNCQUF1QixTQUFRLHdCQUFtQztJQUNuRixPQUFPLENBQVM7SUFDaEIsWUFBWSxNQUFjO1FBQ3RCLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUM7SUFDMUIsQ0FBQztDQUNKO0FBTkQseUNBTUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm9pY2VDb25uZWN0aW9uTWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2xpYi92b2ljZS9Wb2ljZUNvbm5lY3Rpb25NYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBRUEsb0VBQTRDO0FBRTVDLE1BQXFCLHNCQUF1QixTQUFRLG9CQUFtQztJQUNuRixPQUFPLENBQVM7SUFDaEIsWUFBWSxNQUFjO1FBQ3RCLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUM7SUFDMUIsQ0FBQztDQUNKO0FBTkQseUNBTUMifQ==

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oceanic.js",
-    "version": "0.0.11-dev.ac167cd",
+    "version": "0.0.11-dev.c858dfa",
     "description": "A nodejs library for interfacing with Discord.",
     "main": "dist/lib/index.js",
     "types": "dist/lib/index.d.ts",
@@ -50,7 +50,6 @@
         "typescript": "^4.8.2"
     },
     "dependencies": {
-        "@augu/collections": "^1.1.0",
         "undici": "^5.10.0",
         "ws": "^8.8.1"
     },

package/esm.mjs

@@ -16,7 +16,7 @@ const Client = (await import("./dist/lib/Client.js")).default.default;
 const ClientApplication = (await import("./dist/lib/structures/ClientApplication.js")).default.default;
 const Constants = (await import("./dist/lib/Constants.js")).default;
 const CommandInteraction = (await import("./dist/lib/structures/CommandInteraction.js")).default.default;
-const TypedCollection = (await import("./dist/lib/util/Collection.js")).default.default;
+const Collection = (await import("./dist/lib/util/Collection.js")).default.default;
 const ComponentInteraction = (await import("./dist/lib/structures/ComponentInteraction.js")).default.default;
 const DiscordHTTPError = (await import("./dist/lib/rest/DiscordHTTPError.js")).default.default;
 const DiscordRESTError = (await import("./dist/lib/rest/DiscordRESTError.js")).default.default;
@@ -54,6 +54,7 @@ const Team = (await import("./dist/lib/structures/Team.js")).default.default;
 const TextableChannel = (await import("./dist/lib/structures/TextableChannel.js")).default.default;
 const TextChannel = (await import("./dist/lib/structures/TextChannel.js")).default.default;
 const ThreadChannel = (await import("./dist/lib/structures/ThreadChannel.js")).default.default;
+const TypedCollection = (await import("./dist/lib/util/TypedCollection.js")).default.default;
 const TypedEmitter = (await import("./dist/lib/util/TypedEmitter.js")).default.default;
 const UnavailableGuild = (await import("./dist/lib/structures/UnavailableGuild.js")).default.default;
 const User = (await import("./dist/lib/structures/User.js")).default.default;
@@ -63,7 +64,6 @@ const VoiceState = (await import("./dist/lib/structures/VoiceState.js")).default
 const Webhook = (await import("./dist/lib/structures/Webhook.js")).default.default;
 
 export * from "./dist/lib/Constants.js";
-export { Collection } from "@augu/collections";
 
 export {
     Channel,
@@ -83,7 +83,7 @@ export {
     ClientApplication,
     Constants,
     CommandInteraction,
-    TypedCollection,
+    Collection as TypedCollection,
     ComponentInteraction,
     DiscordHTTPError,
     DiscordRESTError,
@@ -121,6 +121,7 @@ export {
     TextableChannel,
     TextChannel,
     ThreadChannel,
+    TypedCollection,
     TypedEmitter,
     UnavailableGuild,
     User,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oceanic.js",
-  "version": "0.0.11-dev.ac167cd",
+  "version": "0.0.11-dev.c858dfa",
   "description": "A nodejs library for interfacing with Discord.",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",
@@ -50,7 +50,6 @@
     "typescript": "^4.8.2"
   },
   "dependencies": {
-    "@augu/collections": "^1.1.0",
     "undici": "^5.10.0",
     "ws": "^8.8.1"
   },