seyfert 4.4.1 → 5.0.0

package/lib/builders/Attachment.js

@@ -12,7 +12,6 @@ exports.resolveImage = resolveImage;
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
-const utils_1 = require("../api/utils/utils");
 const common_1 = require("../common");
 const Base_1 = require("../structures/extra/Base");
 class Attachment extends Base_1.Base {
@@ -178,6 +177,14 @@ async function resolveAttachmentData(data, type) {
                     },
                 });
             const res = await fetch(data);
+            if (!res.ok) {
+                throw new common_1.SeyfertError('INVALID_ATTACHMENT_TYPE', {
+                    metadata: {
+                        ...(0, common_1.createValidationMetadata)('successful HTTP response', `${res.status} ${res.statusText}`),
+                        detail: `Failed to fetch attachment from URL: ${res.status} ${res.statusText}`,
+                    },
+                });
+            }
             return {
                 data: Buffer.from(await res.arrayBuffer()),
                 contentType: res.headers.get('content-type'),
@@ -196,8 +203,12 @@ async function resolveAttachmentData(data, type) {
             return { data: await node_fs_1.promises.readFile(file) };
         }
         case 'buffer': {
-            if ((0, utils_1.isBufferLike)(data))
+            if (Buffer.isBuffer(data))
                 return { data };
+            if (data instanceof ArrayBuffer)
+                return { data: Buffer.from(data) };
+            if (data instanceof Uint8Array || data instanceof Uint8ClampedArray)
+                return { data: Buffer.from(data) };
             if (typeof data[Symbol.asyncIterator] === 'function') {
                 const buffers = [];
                 for await (const resource of data)
@@ -226,9 +237,9 @@ async function resolveAttachmentData(data, type) {
  * @param data - The base64 data.
  * @returns The resolved data URL.
  */
-function resolveBase64(data) {
+function resolveBase64(data, contentType = 'image/jpeg') {
     if (Buffer.isBuffer(data))
-        return `data:image/jpg;base64,${data.toString('base64')}`;
+        return `data:${contentType};base64,${data.toString('base64')}`;
     return data;
 }
 /**
@@ -239,8 +250,10 @@ function resolveBase64(data) {
 async function resolveImage(image) {
     if (image instanceof AttachmentBuilder) {
         const { data: { type, resolvable }, } = image;
-        if (type && resolvable)
-            return resolveBase64((await resolveAttachmentData(resolvable, type)).data);
+        if (type && resolvable) {
+            const file = await resolveAttachmentData(resolvable, type);
+            return resolveBase64(file.data, file.contentType ?? undefined);
+        }
         throw new common_1.SeyfertError('INVALID_ATTACHMENT_TYPE', {
             metadata: {
                 ...(0, common_1.createValidationMetadata)('AttachmentBuilder with type and resolvable data', {
@@ -253,8 +266,17 @@ async function resolveImage(image) {
     }
     if (image instanceof Attachment) {
         const response = await fetch(image.url);
-        return resolveBase64((await resolveAttachmentData(await response.arrayBuffer(), 'buffer')).data);
+        if (!response.ok) {
+            throw new common_1.SeyfertError('INVALID_ATTACHMENT_TYPE', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('successful HTTP response', `${response.status} ${response.statusText}`),
+                    detail: `Failed to fetch attachment from URL: ${response.status} ${response.statusText}`,
+                },
+            });
+        }
+        const file = await resolveAttachmentData(await response.arrayBuffer(), 'buffer');
+        return resolveBase64(file.data, response.headers.get('content-type') ?? file.contentType ?? undefined);
     }
     const file = await resolveAttachmentData(image.data, image.type);
-    return resolveBase64(file.data);
+    return resolveBase64(file.data, file.contentType ?? undefined);
 }

package/lib/builders/MediaGallery.d.ts

@@ -1,4 +1,4 @@
-import type { RestOrArray } from '../common';
+import { type RestOrArray } from '../common';
 import { type APIMediaGalleryComponent, type APIMediaGalleryItems } from '../types';
 import { BaseComponentBuilder } from './Base';
 /**
@@ -73,7 +73,7 @@ export declare class MediaGalleryItem {
      * @returns The JSON representation of the item data.
      */
     toJSON(): {
-        media?: import("../types").APIUnfurledMediaItem | undefined;
+        media?: import("..").APIUnfurledMediaItem | undefined;
         description?: string | undefined;
         spoiler?: boolean | undefined;
     };

package/lib/builders/MediaGallery.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MediaGalleryItem = exports.MediaGallery = void 0;
+const common_1 = require("../common");
 const types_1 = require("../types");
 const Base_1 = require("./Base");
 /**
@@ -104,6 +105,15 @@ class MediaGalleryItem {
      * @returns The JSON representation of the item data.
      */
     toJSON() {
+        if (!this.data.media)
+            throw new common_1.SeyfertError('MISSING_MEDIA', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('media to be set before calling toJSON()', this.data.media, {
+                        component: 'MediaGalleryItem',
+                    }),
+                    detail: 'Cannot convert to JSON without media.',
+                },
+            });
         return { ...this.data };
     }
 }

package/lib/builders/Modal.d.ts

@@ -1,4 +1,4 @@
-import type { RestOrArray } from '../common';
+import { type RestOrArray } from '../common';
 import { type APIModalInteractionResponseCallbackData, type APITextInputComponent, type TextInputStyle } from '../types';
 import { BaseComponentBuilder, type OptionValuesLength } from './Base';
 import type { ModalBuilderComponents, ModalSubmitCallback } from './types';
@@ -8,10 +8,16 @@ import type { ModalBuilderComponents, ModalSubmitCallback } from './types';
  * @example
  * const modal = new Modal();
  * modal.setTitle("Sample Modal");
+ * modal.setCustomId("sample-modal");
  * modal.addComponents(
- *   new ActionRow<TextInput>()
- *   .addComponents(new TextInput().setLabel("Enter text"))
- * ));
+ *   new Label()
+ *     .setLabel("Enter text")
+ *     .setComponent(
+ *       new TextInput()
+ *         .setCustomId("sample-input")
+ *         .setStyle(TextInputStyle.Paragraph)
+ *     )
+ * );
  * modal.run((interaction) => {
  *   // Handle modal submission
  * });
@@ -64,10 +70,14 @@ export declare class Modal {
 /**
  * Represents a text input component builder.
  * @example
- * const textInput = new TextInput().setLabel("Enter text");
- * textInput.setStyle(TextInputStyle.Paragraph);
- * textInput.setPlaceholder("Type here");
- * const json = textInput.toJSON();
+ * const textInput = new TextInput()
+ *   .setCustomId("feedback")
+ *   .setStyle(TextInputStyle.Paragraph)
+ *   .setPlaceholder("Type here");
+ * const label = new Label()
+ *   .setLabel("Feedback")
+ *   .setComponent(textInput);
+ * const json = label.toJSON();
  */
 export declare class TextInput extends BaseComponentBuilder<APITextInputComponent> {
     /**

package/lib/builders/Modal.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TextInput = exports.Modal = void 0;
+const common_1 = require("../common");
 const types_1 = require("../types");
 const _1 = require(".");
 const Base_1 = require("./Base");
@@ -10,10 +11,16 @@ const Base_1 = require("./Base");
  * @example
  * const modal = new Modal();
  * modal.setTitle("Sample Modal");
+ * modal.setCustomId("sample-modal");
  * modal.addComponents(
- *   new ActionRow<TextInput>()
- *   .addComponents(new TextInput().setLabel("Enter text"))
- * ));
+ *   new Label()
+ *     .setLabel("Enter text")
+ *     .setComponent(
+ *       new TextInput()
+ *         .setCustomId("sample-input")
+ *         .setStyle(TextInputStyle.Paragraph)
+ *     )
+ * );
  * modal.run((interaction) => {
  *   // Handle modal submission
  * });
@@ -82,6 +89,24 @@ class Modal {
      * @returns The modal data in JSON format.
      */
     toJSON() {
+        if (!this.data.custom_id)
+            throw new common_1.SeyfertError('MISSING_MODAL_CUSTOM_ID', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('custom_id to be set before calling toJSON()', this.data.custom_id, {
+                        component: 'Modal',
+                    }),
+                    detail: 'Cannot convert to JSON without a custom_id.',
+                },
+            });
+        if (!this.data.title)
+            throw new common_1.SeyfertError('MISSING_MODAL_TITLE', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('title to be set before calling toJSON()', this.data.title, {
+                        component: 'Modal',
+                    }),
+                    detail: 'Cannot convert to JSON without a title.',
+                },
+            });
         return {
             custom_id: this.data.custom_id,
             title: this.data.title,
@@ -93,10 +118,14 @@ exports.Modal = Modal;
 /**
  * Represents a text input component builder.
  * @example
- * const textInput = new TextInput().setLabel("Enter text");
- * textInput.setStyle(TextInputStyle.Paragraph);
- * textInput.setPlaceholder("Type here");
- * const json = textInput.toJSON();
+ * const textInput = new TextInput()
+ *   .setCustomId("feedback")
+ *   .setStyle(TextInputStyle.Paragraph)
+ *   .setPlaceholder("Type here");
+ * const label = new Label()
+ *   .setLabel("Feedback")
+ *   .setComponent(textInput);
+ * const json = label.toJSON();
  */
 class TextInput extends Base_1.BaseComponentBuilder {
     /**

package/lib/builders/Poll.js

@@ -33,6 +33,24 @@ class PollBuilder {
         return this;
     }
     toJSON() {
+        if (!this.data.question?.text && !this.data.question?.emoji)
+            throw new common_1.SeyfertError('MISSING_POLL_QUESTION', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('question to be set before calling toJSON()', this.data.question, {
+                        component: 'PollBuilder',
+                    }),
+                    detail: 'Cannot convert to JSON without a question.',
+                },
+            });
+        if (!this.data.answers?.length)
+            throw new common_1.SeyfertError('MISSING_POLL_ANSWERS', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('at least one answer to be set before calling toJSON()', this.data.answers, {
+                        component: 'PollBuilder',
+                    }),
+                    detail: 'Cannot convert to JSON without answers.',
+                },
+            });
         return { ...this.data };
     }
     resolvedPollMedia(data) {

package/lib/builders/RadioGroup.d.ts

@@ -16,7 +16,7 @@ export declare class RadioGroup extends BaseComponentBuilder<APIRadioGroupCompon
      * @returns The current RadioGroup instance.
      */
     setCustomId(customId: string): this;
-    setOptions(options: RestOrArray<RadioGroupOption>): this;
+    setOptions(...options: RestOrArray<RadioGroupOption>): this;
     addOptions(...options: RestOrArray<RadioGroupOption>): this;
     /**
      * Sets whether the radio group is required.
@@ -27,8 +27,8 @@ export declare class RadioGroup extends BaseComponentBuilder<APIRadioGroupCompon
     toJSON(): APIRadioGroupComponent;
 }
 export declare class RadioGroupOption {
-    data: Partial<APIRadioGroupOption>;
-    constructor(data?: Partial<APIRadioGroupOption>);
+    data: APIRadioGroupOption;
+    constructor(data: APIRadioGroupOption);
     /**
      * Sets the label for the option.
      *  label - The label for the option.
@@ -53,4 +53,5 @@ export declare class RadioGroupOption {
      * @returns The current RadioGroupOption instance.
      */
     setDefault(value?: boolean): this;
+    toJSON(): APIRadioGroupOption;
 }

package/lib/builders/RadioGroup.js

@@ -27,7 +27,7 @@ class RadioGroup extends Base_1.BaseComponentBuilder {
         this.data.custom_id = customId;
         return this;
     }
-    setOptions(options) {
+    setOptions(...options) {
         this.#options = options.flat();
         return this;
     }
@@ -45,7 +45,7 @@ class RadioGroup extends Base_1.BaseComponentBuilder {
         return this;
     }
     toJSON() {
-        const options = [...this.#options.map(option => option.data), ...(this.data.options ?? [])];
+        const options = [...this.#options.map(option => option.toJSON()), ...(this.data.options ?? [])];
         const optionCount = options.length;
         if (optionCount < 2 || optionCount > 10) {
             throw new common_1.SeyfertError('INVALID_OPTIONS_LENGTH', {
@@ -66,7 +66,7 @@ class RadioGroup extends Base_1.BaseComponentBuilder {
 exports.RadioGroup = RadioGroup;
 class RadioGroupOption {
     data;
-    constructor(data = {}) {
+    constructor(data) {
         this.data = data;
     }
     /**
@@ -105,5 +105,26 @@ class RadioGroupOption {
         this.data.default = value;
         return this;
     }
+    toJSON() {
+        if (!this.data.label)
+            throw new common_1.SeyfertError('MISSING_RADIO_GROUP_OPTION_LABEL', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('label to be set before calling toJSON()', this.data.label, {
+                        component: 'RadioGroupOption',
+                    }),
+                    detail: 'Cannot convert to JSON without a label.',
+                },
+            });
+        if (!this.data.value)
+            throw new common_1.SeyfertError('MISSING_RADIO_GROUP_OPTION_VALUE', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('value to be set before calling toJSON()', this.data.value, {
+                        component: 'RadioGroupOption',
+                    }),
+                    detail: 'Cannot convert to JSON without a value.',
+                },
+            });
+        return { ...this.data };
+    }
 }
 exports.RadioGroupOption = RadioGroupOption;

package/lib/builders/SelectMenu.d.ts

@@ -2,6 +2,7 @@ import { type EmojiResolvable, type RestOrArray } from '../common';
 import { type APIChannelSelectComponent, type APIMentionableSelectComponent, type APIRoleSelectComponent, type APISelectMenuComponent, type APISelectMenuOption, type APIStringSelectComponent, type APIUserSelectComponent, type ChannelType, SelectMenuDefaultValueType } from '../types';
 import { BaseComponentBuilder, type OptionValuesLength } from './Base';
 export type BuilderSelectMenus = RoleSelectMenu | UserSelectMenu | MentionableSelectMenu | ChannelSelectMenu | StringSelectMenu;
+type StringSelectOptionResolvable<Value extends string = string> = StringSelectOption | APISelectMenuOption<Value>;
 /**
  * Represents a base class for building Select Menus.
  * @template Select - The type of APISelectMenuComponent.
@@ -153,30 +154,30 @@ export declare class ChannelSelectMenu extends SelectMenu<APIChannelSelectCompon
  *   { label: "Option 3", value: "option_3" },
  * ]);
  */
-export declare class StringSelectMenu extends SelectMenu {
-    data: Omit<APIStringSelectComponent, 'options'> & {
+export declare class StringSelectMenu<Value extends string = string> extends SelectMenu<APIStringSelectComponent<Value>> {
+    data: Omit<Partial<APIStringSelectComponent<Value>>, 'options'> & {
         options: StringSelectOption[];
     };
-    constructor(data?: Partial<APIStringSelectComponent>);
+    constructor(data?: Partial<APIStringSelectComponent<Value>>);
     /**
      * Adds options to the string select menu.
      * @param options - Options to be added.
      * @returns The current StringSelectMenu instance.
      */
-    addOption(...options: RestOrArray<StringSelectOption>): this;
+    addOption(...options: RestOrArray<StringSelectOptionResolvable<Value>>): this;
     /**
      * Sets the options for the string select menu.
      *  options - Options to be set.
      * @returns The current StringSelectMenu instance.
      */
-    setOptions(options: StringSelectOption[]): this;
+    setOptions(...options: RestOrArray<StringSelectOptionResolvable<Value>>): this;
     /**
      * Sets whether the string select is required to answer in a modal.
      * @param required - Whether the string select is required to answer in a modal.
      * @returns The current StringSelectMenu instance.
      */
     setRequired(required?: boolean): this;
-    toJSON(): APIStringSelectComponent;
+    toJSON(): APIStringSelectComponent<Value>;
 }
 /**
  * Represents an individual option for a string select menu.
@@ -222,3 +223,4 @@ export declare class StringSelectOption {
      */
     toJSON(): APISelectMenuOption;
 }
+export {};

package/lib/builders/SelectMenu.js

@@ -15,6 +15,9 @@ const Base_1 = require("./Base");
 function mappedDefault(ids, type) {
     return ids.flat().map(id => ({ id, type }));
 }
+function resolveStringSelectOption(option) {
+    return option instanceof StringSelectOption ? option : new StringSelectOption(option);
+}
 /**
  * Represents a base class for building Select Menus.
  * @template Select - The type of APISelectMenuComponent.
@@ -235,7 +238,7 @@ class StringSelectMenu extends SelectMenu {
      * @returns The current StringSelectMenu instance.
      */
     addOption(...options) {
-        this.data.options = this.data.options.concat(options.flat());
+        this.data.options = this.data.options.concat(options.flat().map(resolveStringSelectOption));
         return this;
     }
     /**
@@ -243,8 +246,8 @@ class StringSelectMenu extends SelectMenu {
      *  options - Options to be set.
      * @returns The current StringSelectMenu instance.
      */
-    setOptions(options) {
-        this.data.options = options;
+    setOptions(...options) {
+        this.data.options = options.flat().map(resolveStringSelectOption);
         return this;
     }
     /**
@@ -333,6 +336,24 @@ class StringSelectOption {
      * @returns The option data in JSON format.
      */
     toJSON() {
+        if (!this.data.label)
+            throw new common_1.SeyfertError('MISSING_STRING_SELECT_OPTION_LABEL', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('label to be set before calling toJSON()', this.data.label, {
+                        component: 'StringSelectOption',
+                    }),
+                    detail: 'Cannot convert to JSON without a label.',
+                },
+            });
+        if (!this.data.value)
+            throw new common_1.SeyfertError('MISSING_STRING_SELECT_OPTION_VALUE', {
+                metadata: {
+                    ...(0, common_1.createValidationMetadata)('value to be set before calling toJSON()', this.data.value, {
+                        component: 'StringSelectOption',
+                    }),
+                    detail: 'Cannot convert to JSON without a value.',
+                },
+            });
         return { ...this.data };
     }
 }

package/lib/builders/types.d.ts

@@ -18,8 +18,9 @@ import type { Thumbnail } from './Thumbnail';
 export type ComponentCallback<T extends ComponentInteraction | StringSelectMenuInteraction = ComponentInteraction | StringSelectMenuInteraction> = (interaction: T, stop: ComponentStopCallback, refresh: ComponentRefreshCallback) => any;
 export type ComponentOnErrorCallback<T extends ComponentInteraction | StringSelectMenuInteraction = ComponentInteraction | StringSelectMenuInteraction> = (interaction: T, error: unknown, stop: ComponentStopCallback, refresh: ComponentRefreshCallback) => any;
 export type ComponentFilterCallback<T = ComponentInteraction> = (interaction: T) => any;
-export type ComponentOnStopCallback = (reason: 'messageDelete' | 'channelDelete' | 'guildDelete' | 'idle' | 'timeout' | (string & {}) | undefined, refresh: ComponentRefreshCallback) => any;
-export type ComponentStopCallback = (reason: 'messageDelete' | 'channelDelete' | 'guildDelete' | 'idle' | 'timeout' | (string & {}) | undefined) => any;
+export type ComponentCollectorStopReason = 'messageDelete' | 'channelDelete' | 'guildDelete' | 'idle' | 'timeout' | (string & {}) | undefined;
+export type ComponentOnStopCallback = (reason: ComponentCollectorStopReason, refresh: ComponentRefreshCallback) => any;
+export type ComponentStopCallback = (reason: ComponentCollectorStopReason) => any;
 export type ComponentRefreshCallback = () => any;
 export type ModalSubmitCallback<T = ModalSubmitInteraction> = (interaction: T) => any;
 export type ButtonLink = Omit<Button, 'setCustomId'>;

package/lib/cache/adapters/default.d.ts

@@ -7,7 +7,7 @@ export declare class MemoryAdapter<T> implements Adapter {
     options: MemoryAdapterOptions<T>;
     isAsync: boolean;
     readonly storage: Map<string, T>;
-    readonly relationships: Map<string, string[]>;
+    readonly relationships: Map<string, Set<string>>;
     constructor(options?: MemoryAdapterOptions<T>);
     start(): void;
     scan(query: string, keys?: false): any[];

package/lib/cache/adapters/default.js

@@ -23,23 +23,27 @@ class MemoryAdapter {
         const values = [];
         const sq = query.split('.');
         for (const [key, value] of this.storage.entries()) {
-            if (key.split('.').every((value, i) => (sq[i] === '*' ? !!value : sq[i] === value))) {
+            const keySplit = key.split('.');
+            if (keySplit.length === sq.length &&
+                keySplit.every((segment, i) => (sq[i] === '*' ? !!segment : sq[i] === segment))) {
                 values.push(keys ? key : this.options.decode(value));
             }
         }
         return values;
     }
     bulkGet(keys) {
-        return keys
-            .map(x => {
-            const data = this.storage.get(x);
-            return data ? this.options.decode(data) : null;
-        })
-            .filter(x => x);
+        const result = [];
+        for (const key of keys) {
+            const data = this.storage.get(key);
+            if (data !== undefined)
+                result.push(this.options.decode(data));
+        }
+        return result;
     }
     get(keys) {
-        const data = this.storage.get(keys);
-        return data ? this.options.decode(data) : null;
+        if (!this.storage.has(keys))
+            return null;
+        return this.options.decode(this.storage.get(keys));
     }
     bulkSet(keys) {
         for (const [key, value] of keys) {
@@ -63,10 +67,8 @@ class MemoryAdapter {
         const array = [];
         const data = this.keys(to);
         for (const key of data) {
-            const content = this.get(key);
-            if (content) {
-                array.push(content);
-            }
+            if (this.storage.has(key))
+                array.push(this.options.decode(this.storage.get(key)));
         }
         return array;
     }
@@ -74,7 +76,7 @@ class MemoryAdapter {
         return this.getToRelationship(to).map(id => `${to}.${id}`);
     }
     count(to) {
-        return this.getToRelationship(to).length;
+        return this.relationships.get(to)?.size ?? 0;
     }
     bulkRemove(keys) {
         for (const i of keys) {
@@ -89,10 +91,10 @@ class MemoryAdapter {
         this.relationships.clear();
     }
     contains(to, keys) {
-        return this.getToRelationship(to).includes(keys);
+        return this.relationships.get(to)?.has(keys) ?? false;
     }
     getToRelationship(to) {
-        return this.relationships.get(to) || [];
+        return [...(this.relationships.get(to) ?? [])];
     }
     bulkAddToRelationShip(data) {
         for (const i in data) {
@@ -101,23 +103,18 @@ class MemoryAdapter {
     }
     addToRelationship(to, keys) {
         if (!this.relationships.has(to)) {
-            this.relationships.set(to, []);
+            this.relationships.set(to, new Set());
         }
-        const data = this.getToRelationship(to);
+        const data = this.relationships.get(to);
         for (const key of Array.isArray(keys) ? keys : [keys]) {
-            if (!data.includes(key)) {
-                data.push(key);
-            }
+            data.add(key);
         }
     }
     removeToRelationship(to, keys) {
-        const data = this.getToRelationship(to);
+        const data = this.relationships.get(to);
         if (data) {
             for (const key of Array.isArray(keys) ? keys : [keys]) {
-                const idx = data.indexOf(key);
-                if (idx !== -1) {
-                    data.splice(idx, 1);
-                }
+                data.delete(key);
             }
         }
     }

package/lib/cache/adapters/limited.d.ts

@@ -60,6 +60,7 @@ export declare class LimitedMemoryAdapter<T> implements Adapter {
     contains(to: string, keys: string): boolean;
     private _getRelationshipData;
     private _getRelationshipSet;
+    private _ensureRelationshipSet;
     getToRelationship(to: string): string[];
     bulkAddToRelationShip(data: Record<string, string[]>): void;
     addToRelationship(to: string, keys: string | string[]): void;