refactor: Don't return builders from API data (#7584)

* refactor: don't return builders from API data * Update packages/discord.js/src/structures/ActionRow.js Co-authored-by: Antonio Román <kyradiscord@gmail.com> * fix: circular dependency * fix: circular dependency pt.2 * chore: make requested changes * chore: bump dapi-types * chore: convert text input * chore: convert text input * feat: handle cases of unknown component types better * refactor: refactor modal to builder * feat: add #from for easy builder conversions * refactor: make requested changes * chore: make requested changes * style: fix linting error Co-authored-by: Antonio Román <kyradiscord@gmail.com> Co-authored-by: almeidx <almeidx@pm.me>
2026-03-19 04:53:30 +01:00 · 2022-03-12 13:39:23 -05:00
parent 230c0c4cb1
commit 549716e4fc
44 changed files with 974 additions and 705 deletions
--- a/packages/builders/tests/components/actionRow.test.ts
+++ b/packages/builders/tests/components/actionRow.test.ts
@@ -1,13 +1,13 @@
+import { APIActionRowComponent, APIMessageActionRowComponent, ButtonStyle, ComponentType } from 'discord-api-types/v9';
 import {
-	APIActionRowComponent,
-	APIActionRowComponentTypes,
-	APIMessageActionRowComponent,
-	ButtonStyle,
-	ComponentType,
-} from 'discord-api-types/v9';
-import { ActionRow, ButtonComponent, createComponent, SelectMenuComponent, SelectMenuOption } from '../../src';
+	ActionRowBuilder,
+	ButtonBuilder,
+	createComponentBuilder,
+	SelectMenuBuilder,
+	SelectMenuOptionBuilder,
+} from '../../src';

-const rowWithButtonData: APIActionRowComponent<APIMessageComponent> = {
+const rowWithButtonData: APIActionRowComponent<APIMessageActionRowComponent> = {
 	type: ComponentType.ActionRow,
 	components: [
 		{
@@ -19,7 +19,7 @@ const rowWithButtonData: APIActionRowComponent<APIMessageComponent> = {
 	],
 };

-const rowWithSelectMenuData: APIActionRowComponent<APIMessageComponent> = {
+const rowWithSelectMenuData: APIActionRowComponent<APIMessageActionRowComponent> = {
 	type: ComponentType.ActionRow,
 	components: [
 		{
@@ -44,8 +44,8 @@ const rowWithSelectMenuData: APIActionRowComponent<APIMessageComponent> = {
 describe('Action Row Components', () => {
 	describe('Assertion Tests', () => {
 		test('GIVEN valid components THEN do not throw', () => {
-			expect(() => new ActionRow().addComponents(new ButtonComponent())).not.toThrowError();
-			expect(() => new ActionRow().setComponents(new ButtonComponent())).not.toThrowError();
+			expect(() => new ActionRowBuilder().addComponents(new ButtonBuilder())).not.toThrowError();
+			expect(() => new ActionRowBuilder().setComponents(new ButtonBuilder())).not.toThrowError();
 		});

 		test('GIVEN valid JSON input THEN valid JSON output is given', () => {
@@ -78,13 +78,12 @@ describe('Action Row Components', () => {
 				],
 			};

-			expect(new ActionRow(actionRowData).toJSON()).toEqual(actionRowData);
-			expect(new ActionRow().toJSON()).toEqual({ type: ComponentType.ActionRow, components: [] });
-			expect(() => createComponent({ type: ComponentType.ActionRow, components: [] })).not.toThrowError();
-			expect(() => createComponent({ type: 42, components: [] })).toThrowError();
+			expect(new ActionRowBuilder(actionRowData).toJSON()).toEqual(actionRowData);
+			expect(new ActionRowBuilder().toJSON()).toEqual({ type: ComponentType.ActionRow, components: [] });
+			expect(() => createComponentBuilder({ type: ComponentType.ActionRow, components: [] })).not.toThrowError();
 		});
 		test('GIVEN valid builder options THEN valid JSON output is given', () => {
-			const rowWithButtonData: APIActionRowComponent<APIActionRowComponentTypes> = {
+			const rowWithButtonData: APIActionRowComponent<APIMessageActionRowComponent> = {
 				type: ComponentType.ActionRow,
 				components: [
 					{
@@ -96,7 +95,7 @@ describe('Action Row Components', () => {
 				],
 			};

-			const rowWithSelectMenuData: APIActionRowComponent<APIActionRowComponentTypes> = {
+			const rowWithSelectMenuData: APIActionRowComponent<APIMessageActionRowComponent> = {
 				type: ComponentType.ActionRow,
 				components: [
 					{
@@ -118,22 +117,24 @@ describe('Action Row Components', () => {
 				],
 			};

-			const button = new ButtonComponent().setLabel('test').setStyle(ButtonStyle.Primary).setCustomId('123');
-			const selectMenu = new SelectMenuComponent()
+			expect(new ActionRowBuilder(rowWithButtonData).toJSON()).toEqual(rowWithButtonData);
+			expect(new ActionRowBuilder(rowWithSelectMenuData).toJSON()).toEqual(rowWithSelectMenuData);
+			expect(new ActionRowBuilder().toJSON()).toEqual({ type: ComponentType.ActionRow, components: [] });
+			expect(() => createComponentBuilder({ type: ComponentType.ActionRow, components: [] })).not.toThrowError();
+		});
+		test('GIVEN valid builder options THEN valid JSON output is given', () => {
+			const button = new ButtonBuilder().setLabel('test').setStyle(ButtonStyle.Primary).setCustomId('123');
+			const selectMenu = new SelectMenuBuilder()
 				.setCustomId('1234')
 				.setMaxValues(10)
 				.setMinValues(12)
 				.setOptions(
-					new SelectMenuOption().setLabel('one').setValue('one'),
-					new SelectMenuOption().setLabel('two').setValue('two'),
+					new SelectMenuOptionBuilder().setLabel('one').setValue('one'),
+					new SelectMenuOptionBuilder().setLabel('two').setValue('two'),
 				);

-			expect(new ActionRow().addComponents(button).toJSON()).toEqual(rowWithButtonData);
-			expect(new ActionRow().addComponents(selectMenu).toJSON()).toEqual(rowWithSelectMenuData);
-		});
-		test('Given JSON data THEN builder is equal to it and itself', () => {
-			expect(new ActionRow(rowWithSelectMenuData).equals(rowWithSelectMenuData)).toBeTruthy();
-			expect(new ActionRow(rowWithButtonData).equals(new ActionRow(rowWithButtonData))).toBeTruthy();
+			expect(new ActionRowBuilder().addComponents(button).toJSON()).toEqual(rowWithButtonData);
+			expect(new ActionRowBuilder().addComponents(selectMenu).toJSON()).toEqual(rowWithSelectMenuData);
 		});
 	});
 });
--- a/packages/builders/tests/components/button.test.ts
+++ b/packages/builders/tests/components/button.test.ts
@@ -5,9 +5,9 @@ import {
 	ComponentType,
 } from 'discord-api-types/v9';
 import { buttonLabelValidator, buttonStyleValidator } from '../../src/components/Assertions';
-import { ButtonComponent } from '../../src/components/button/Button';
+import { ButtonBuilder } from '../../src/components/button/Button';

-const buttonComponent = () => new ButtonComponent();
+const buttonComponent = () => new ButtonBuilder();

 const longStr =
 	'looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong';
@@ -119,7 +119,7 @@ describe('Button Components', () => {
 				disabled: true,
 			};

-			expect(new ButtonComponent(interactionData).toJSON()).toEqual(interactionData);
+			expect(new ButtonBuilder(interactionData).toJSON()).toEqual(interactionData);

 			expect(
 				buttonComponent()
@@ -138,21 +138,9 @@ describe('Button Components', () => {
 				url: 'https://google.com',
 			};

-			expect(new ButtonComponent(linkData).toJSON()).toEqual(linkData);
+			expect(new ButtonBuilder(linkData).toJSON()).toEqual(linkData);

 			expect(buttonComponent().setLabel(linkData.label).setDisabled(true).setURL(linkData.url));
 		});
-		test('Given JSON data THEN builder is equal to it and itself', () => {
-			const buttonData: APIButtonComponentWithCustomId = {
-				type: ComponentType.Button,
-				custom_id: 'test',
-				label: 'test',
-				style: ButtonStyle.Primary,
-				disabled: true,
-			};
-
-			expect(new ButtonComponent(buttonData).equals(buttonData)).toBeTruthy();
-			expect(new ButtonComponent(buttonData).equals(new ButtonComponent(buttonData))).toBeTruthy();
-		});
 	});
 });
--- a/packages/builders/tests/components/selectMenu.test.ts
+++ b/packages/builders/tests/components/selectMenu.test.ts
@@ -1,8 +1,8 @@
 import { APISelectMenuComponent, APISelectMenuOption, ComponentType } from 'discord-api-types/v9';
-import { SelectMenuComponent, SelectMenuOption } from '../../src/index';
+import { SelectMenuBuilder, SelectMenuOptionBuilder } from '../../src/index';

-const selectMenu = () => new SelectMenuComponent();
-const selectMenuOption = () => new SelectMenuOption();
+const selectMenu = () => new SelectMenuBuilder();
+const selectMenuOption = () => new SelectMenuOptionBuilder();

 const longStr = 'a'.repeat(256);

@@ -44,8 +44,8 @@ describe('Select Menu Components', () => {
 				.setEmoji({ name: 'test' })
 				.setDescription('description');
 			expect(() => selectMenu().addOptions(option)).not.toThrowError();
-			expect(() => selectMenu().setOptions([option])).not.toThrowError();
-			expect(() => selectMenu().setOptions([{ label: 'test', value: 'test' }])).not.toThrowError();
+			expect(() => selectMenu().setOptions(option)).not.toThrowError();
+			expect(() => selectMenu().setOptions({ label: 'test', value: 'test' })).not.toThrowError();
 		});

 		test('GIVEN invalid inputs THEN Select Menu does throw', () => {
@@ -70,16 +70,11 @@ describe('Select Menu Components', () => {

 		test('GIVEN valid JSON input THEN valid JSON history is correct', () => {
 			expect(
-				new SelectMenuComponent(selectMenuDataWithoutOptions)
-					.addOptions(new SelectMenuOption(selectMenuOptionData))
+				new SelectMenuBuilder(selectMenuDataWithoutOptions)
+					.addOptions(new SelectMenuOptionBuilder(selectMenuOptionData))
 					.toJSON(),
 			).toEqual(selectMenuData);
-			expect(new SelectMenuOption(selectMenuOptionData).toJSON()).toEqual(selectMenuOptionData);
-		});
-
-		test('Given JSON data THEN builder is equal to it and itself', () => {
-			expect(new SelectMenuComponent(selectMenuData).equals(selectMenuData)).toBeTruthy();
-			expect(new SelectMenuComponent(selectMenuData).equals(new SelectMenuComponent(selectMenuData))).toBeTruthy();
+			expect(new SelectMenuOptionBuilder(selectMenuOptionData).toJSON()).toEqual(selectMenuOptionData);
 		});
 	});
 });
--- a/packages/builders/tests/components/textInput.test.ts
+++ b/packages/builders/tests/components/textInput.test.ts
@@ -7,11 +7,11 @@ import {
 	valueValidator,
 	textInputStyleValidator,
 } from '../../src/components/textInput/Assertions';
-import { TextInputComponent } from '../../src/components/textInput/TextInput';
+import { TextInputBuilder } from '../../src/components/textInput/TextInput';

 const superLongStr = 'a'.repeat(5000);

-const textInputComponent = () => new TextInputComponent();
+const textInputComponent = () => new TextInputBuilder();

 describe('Text Input Components', () => {
 	describe('Assertion Tests', () => {
@@ -109,7 +109,7 @@ describe('Text Input Components', () => {
 			style: TextInputStyle.Paragraph,
 		};

-		expect(new TextInputComponent(textInputData).toJSON()).toEqual(textInputData);
+		expect(new TextInputBuilder(textInputData).toJSON()).toEqual(textInputData);
 		expect(
 			textInputComponent()
 				.setCustomId(textInputData.custom_id)
--- a/packages/builders/tests/interactions/modal.test.ts
+++ b/packages/builders/tests/interactions/modal.test.ts
@@ -1,12 +1,18 @@
 import { APIModalInteractionResponseCallbackData, ComponentType, TextInputStyle } from 'discord-api-types/v9';
-import { ActionRow, ButtonComponent, Modal, ModalActionRowComponent, TextInputComponent } from '../../src';
+import {
+	ActionRowBuilder,
+	ButtonBuilder,
+	ModalBuilder,
+	ModalActionRowComponentBuilder,
+	TextInputBuilder,
+} from '../../src';
 import {
 	componentsValidator,
 	titleValidator,
 	validateRequiredParameters,
 } from '../../src/interactions/modals/Assertions';

-const modal = () => new Modal();
+const modal = () => new ModalBuilder();

 describe('Modals', () => {
 	describe('Assertion Tests', () => {
@@ -19,33 +25,37 @@ describe('Modals', () => {
 		});

 		test('GIVEN valid components THEN validator does not throw', () => {
-			expect(() => componentsValidator.parse([new ActionRow(), new ActionRow()])).not.toThrowError();
+			expect(() => componentsValidator.parse([new ActionRowBuilder(), new ActionRowBuilder()])).not.toThrowError();
 		});

 		test('GIVEN invalid components THEN validator does throw', () => {
-			expect(() => componentsValidator.parse([new ButtonComponent(), new TextInputComponent()])).toThrowError();
+			expect(() => componentsValidator.parse([new ButtonBuilder(), new TextInputBuilder()])).toThrowError();
 		});

 		test('GIVEN valid required parameters THEN validator does not throw', () => {
-			expect(() => validateRequiredParameters('123', 'title', [new ActionRow(), new ActionRow()])).not.toThrowError();
+			expect(() =>
+				validateRequiredParameters('123', 'title', [new ActionRowBuilder(), new ActionRowBuilder()]),
+			).not.toThrowError();
 		});

 		test('GIVEN invalid required parameters THEN validator does throw', () => {
 			expect(() =>
 				// @ts-expect-error
-				validateRequiredParameters('123', undefined, [new ActionRow(), new ButtonComponent()]),
+				validateRequiredParameters('123', undefined, [new ActionRowBuilder(), new ButtonBuilder()]),
 			).toThrowError();
 		});
 	});

 	test('GIVEN valid fields THEN builder does not throw', () => {
-		expect(() => modal().setTitle('test').setCustomId('foobar').setComponents(new ActionRow())).not.toThrowError();
+		expect(() =>
+			modal().setTitle('test').setCustomId('foobar').setComponents(new ActionRowBuilder()),
+		).not.toThrowError();
 	});

 	test('GIVEN invalid fields THEN builder does throw', () => {
 		expect(() =>
 			// @ts-expect-error
-			modal().setTitle('test').setCustomId('foobar').setComponents([new ActionRow()]).toJSON(),
+			modal().setTitle('test').setCustomId('foobar').setComponents([new ActionRowBuilder()]).toJSON(),
 		).toThrowError();
 		expect(() => modal().setTitle('test').setCustomId('foobar').toJSON()).toThrowError();
 		// @ts-expect-error
@@ -71,15 +81,15 @@ describe('Modals', () => {
 			],
 		};

-		expect(new Modal(modalData).toJSON()).toEqual(modalData);
+		expect(new ModalBuilder(modalData).toJSON()).toEqual(modalData);

 		expect(
 			modal()
 				.setTitle(modalData.title)
 				.setCustomId('custom id')
 				.setComponents(
-					new ActionRow<ModalActionRowComponent>().addComponents(
-						new TextInputComponent().setCustomId('custom id').setLabel('label').setStyle(TextInputStyle.Paragraph),
+					new ActionRowBuilder<ModalActionRowComponentBuilder>().addComponents(
+						new TextInputBuilder().setCustomId('custom id').setLabel('label').setStyle(TextInputStyle.Paragraph),
 					),
 				)
 				.toJSON(),
--- a/packages/builders/tests/messages/embed.test.ts
+++ b/packages/builders/tests/messages/embed.test.ts
@@ -1,11 +1,11 @@
-import { Embed } from '../../src';
+import { EmbedBuilder, embedLength } from '../../src';

 const alpha = 'abcdefghijklmnopqrstuvwxyz';

 describe('Embed', () => {
 	describe('Embed getters', () => {
 		test('GIVEN an embed with specific amount of characters THEN returns amount of characters', () => {
-			const embed = new Embed({
+			const embed = new EmbedBuilder({
 				title: alpha,
 				description: alpha,
 				fields: [{ name: alpha, value: alpha }],
@@ -13,38 +13,38 @@ describe('Embed', () => {
 				footer: { text: alpha },
 			});

-			expect(embed.length).toBe(alpha.length * 6);
+			expect(embedLength(embed.data)).toBe(alpha.length * 6);
 		});

 		test('GIVEN an embed with zero characters THEN returns amount of characters', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

-			expect(embed.length).toBe(0);
+			expect(embedLength(embed.data)).toBe(0);
 		});
 	});

 	describe('Embed title', () => {
 		test('GIVEN an embed with a pre-defined title THEN return valid toJSON data', () => {
-			const embed = new Embed({ title: 'foo' });
+			const embed = new EmbedBuilder({ title: 'foo' });
 			expect(embed.toJSON()).toStrictEqual({ title: 'foo' });
 		});

 		test('GIVEN an embed using Embed#setTitle THEN return valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setTitle('foo');

 			expect(embed.toJSON()).toStrictEqual({ title: 'foo' });
 		});

 		test('GIVEN an embed with a pre-defined title THEN unset title THEN return valid toJSON data', () => {
-			const embed = new Embed({ title: 'foo' });
+			const embed = new EmbedBuilder({ title: 'foo' });
 			embed.setTitle(null);

 			expect(embed.toJSON()).toStrictEqual({ title: undefined });
 		});

 		test('GIVEN an embed with an invalid title THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			expect(() => embed.setTitle('a'.repeat(257))).toThrowError();
 		});
@@ -52,26 +52,26 @@ describe('Embed', () => {

 	describe('Embed description', () => {
 		test('GIVEN an embed with a pre-defined description THEN return valid toJSON data', () => {
-			const embed = new Embed({ description: 'foo' });
+			const embed = new EmbedBuilder({ description: 'foo' });
 			expect(embed.toJSON()).toStrictEqual({ description: 'foo' });
 		});

 		test('GIVEN an embed using Embed#setDescription THEN return valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setDescription('foo');

 			expect(embed.toJSON()).toStrictEqual({ description: 'foo' });
 		});

 		test('GIVEN an embed with a pre-defined description THEN unset description THEN return valid toJSON data', () => {
-			const embed = new Embed({ description: 'foo' });
+			const embed = new EmbedBuilder({ description: 'foo' });
 			embed.setDescription(null);

 			expect(embed.toJSON()).toStrictEqual({ description: undefined });
 		});

 		test('GIVEN an embed with an invalid description THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			expect(() => embed.setDescription('a'.repeat(4097))).toThrowError();
 		});
@@ -79,14 +79,14 @@ describe('Embed', () => {

 	describe('Embed URL', () => {
 		test('GIVEN an embed with a pre-defined url THEN returns valid toJSON data', () => {
-			const embed = new Embed({ url: 'https://discord.js.org/' });
+			const embed = new EmbedBuilder({ url: 'https://discord.js.org/' });
 			expect(embed.toJSON()).toStrictEqual({
 				url: 'https://discord.js.org/',
 			});
 		});

 		test('GIVEN an embed using Embed#setURL THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setURL('https://discord.js.org/');

 			expect(embed.toJSON()).toStrictEqual({
@@ -95,14 +95,14 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed with a pre-defined title THEN unset title THEN return valid toJSON data', () => {
-			const embed = new Embed({ url: 'https://discord.js.org' });
+			const embed = new EmbedBuilder({ url: 'https://discord.js.org' });
 			embed.setURL(null);

 			expect(embed.toJSON()).toStrictEqual({ url: undefined });
 		});

 		test('GIVEN an embed with an invalid URL THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			expect(() => embed.setURL('owo')).toThrowError();
 		});
@@ -110,24 +110,24 @@ describe('Embed', () => {

 	describe('Embed Color', () => {
 		test('GIVEN an embed with a pre-defined color THEN returns valid toJSON data', () => {
-			const embed = new Embed({ color: 0xff0000 });
+			const embed = new EmbedBuilder({ color: 0xff0000 });
 			expect(embed.toJSON()).toStrictEqual({ color: 0xff0000 });
 		});

 		test('GIVEN an embed using Embed#setColor THEN returns valid toJSON data', () => {
-			expect(new Embed().setColor(0xff0000).toJSON()).toStrictEqual({ color: 0xff0000 });
-			expect(new Embed().setColor([242, 66, 245]).toJSON()).toStrictEqual({ color: 0xf242f5 });
+			expect(new EmbedBuilder().setColor(0xff0000).toJSON()).toStrictEqual({ color: 0xff0000 });
+			expect(new EmbedBuilder().setColor([242, 66, 245]).toJSON()).toStrictEqual({ color: 0xf242f5 });
 		});

 		test('GIVEN an embed with a pre-defined color THEN unset color THEN return valid toJSON data', () => {
-			const embed = new Embed({ color: 0xff0000 });
+			const embed = new EmbedBuilder({ color: 0xff0000 });
 			embed.setColor(null);

 			expect(embed.toJSON()).toStrictEqual({ color: undefined });
 		});

 		test('GIVEN an embed with an invalid color THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			// @ts-expect-error
 			expect(() => embed.setColor('RED')).toThrowError();
@@ -141,33 +141,33 @@ describe('Embed', () => {
 		const now = new Date();

 		test('GIVEN an embed with a pre-defined timestamp THEN returns valid toJSON data', () => {
-			const embed = new Embed({ timestamp: now.toISOString() });
+			const embed = new EmbedBuilder({ timestamp: now.toISOString() });
 			expect(embed.toJSON()).toStrictEqual({ timestamp: now.toISOString() });
 		});

 		test('given an embed using Embed#setTimestamp (with Date) THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setTimestamp(now);

 			expect(embed.toJSON()).toStrictEqual({ timestamp: now.toISOString() });
 		});

 		test('GIVEN an embed using Embed#setTimestamp (with int) THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setTimestamp(now.getTime());

 			expect(embed.toJSON()).toStrictEqual({ timestamp: now.toISOString() });
 		});

 		test('GIVEN an embed using Embed#setTimestamp (default) THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setTimestamp();

-			expect(embed.toJSON()).toStrictEqual({ timestamp: embed.timestamp });
+			expect(embed.toJSON()).toStrictEqual({ timestamp: embed.data.timestamp });
 		});

 		test('GIVEN an embed with a pre-defined timestamp THEN unset timestamp THEN return valid toJSON data', () => {
-			const embed = new Embed({ timestamp: now.toISOString() });
+			const embed = new EmbedBuilder({ timestamp: now.toISOString() });
 			embed.setTimestamp(null);

 			expect(embed.toJSON()).toStrictEqual({ timestamp: undefined });
@@ -176,14 +176,14 @@ describe('Embed', () => {

 	describe('Embed Thumbnail', () => {
 		test('GIVEN an embed with a pre-defined thumbnail THEN returns valid toJSON data', () => {
-			const embed = new Embed({ thumbnail: { url: 'https://discord.js.org/static/logo.svg' } });
+			const embed = new EmbedBuilder({ thumbnail: { url: 'https://discord.js.org/static/logo.svg' } });
 			expect(embed.toJSON()).toStrictEqual({
 				thumbnail: { url: 'https://discord.js.org/static/logo.svg' },
 			});
 		});

 		test('GIVEN an embed using Embed#setThumbnail THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setThumbnail('https://discord.js.org/static/logo.svg');

 			expect(embed.toJSON()).toStrictEqual({
@@ -192,14 +192,14 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed with a pre-defined thumbnail THEN unset thumbnail THEN return valid toJSON data', () => {
-			const embed = new Embed({ thumbnail: { url: 'https://discord.js.org/static/logo.svg' } });
+			const embed = new EmbedBuilder({ thumbnail: { url: 'https://discord.js.org/static/logo.svg' } });
 			embed.setThumbnail(null);

 			expect(embed.toJSON()).toStrictEqual({ thumbnail: undefined });
 		});

 		test('GIVEN an embed with an invalid thumbnail THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			expect(() => embed.setThumbnail('owo')).toThrowError();
 		});
@@ -207,14 +207,14 @@ describe('Embed', () => {

 	describe('Embed Image', () => {
 		test('GIVEN an embed with a pre-defined image THEN returns valid toJSON data', () => {
-			const embed = new Embed({ image: { url: 'https://discord.js.org/static/logo.svg' } });
+			const embed = new EmbedBuilder({ image: { url: 'https://discord.js.org/static/logo.svg' } });
 			expect(embed.toJSON()).toStrictEqual({
 				image: { url: 'https://discord.js.org/static/logo.svg' },
 			});
 		});

 		test('GIVEN an embed using Embed#setImage THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setImage('https://discord.js.org/static/logo.svg');

 			expect(embed.toJSON()).toStrictEqual({
@@ -223,14 +223,14 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed with a pre-defined image THEN unset image THEN return valid toJSON data', () => {
-			const embed = new Embed({ image: { url: 'https://discord.js/org/static/logo.svg' } });
+			const embed = new EmbedBuilder({ image: { url: 'https://discord.js/org/static/logo.svg' } });
 			embed.setImage(null);

 			expect(embed.toJSON()).toStrictEqual({ image: undefined });
 		});

 		test('GIVEN an embed with an invalid image THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			expect(() => embed.setImage('owo')).toThrowError();
 		});
@@ -238,7 +238,7 @@ describe('Embed', () => {

 	describe('Embed Author', () => {
 		test('GIVEN an embed with a pre-defined author THEN returns valid toJSON data', () => {
-			const embed = new Embed({
+			const embed = new EmbedBuilder({
 				author: { name: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg', url: 'https://discord.js.org' },
 			});
 			expect(embed.toJSON()).toStrictEqual({
@@ -247,7 +247,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed using Embed#setAuthor THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setAuthor({
 				name: 'Wumpus',
 				iconURL: 'https://discord.js.org/static/logo.svg',
@@ -260,7 +260,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed with a pre-defined author THEN unset author THEN return valid toJSON data', () => {
-			const embed = new Embed({
+			const embed = new EmbedBuilder({
 				author: { name: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg', url: 'https://discord.js.org' },
 			});
 			embed.setAuthor(null);
@@ -269,7 +269,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed with an invalid author name THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			expect(() => embed.setAuthor({ name: 'a'.repeat(257) })).toThrowError();
 		});
@@ -277,7 +277,7 @@ describe('Embed', () => {

 	describe('Embed Footer', () => {
 		test('GIVEN an embed with a pre-defined footer THEN returns valid toJSON data', () => {
-			const embed = new Embed({
+			const embed = new EmbedBuilder({
 				footer: { text: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg' },
 			});
 			expect(embed.toJSON()).toStrictEqual({
@@ -286,7 +286,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed using Embed#setAuthor THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.setFooter({ text: 'Wumpus', iconURL: 'https://discord.js.org/static/logo.svg' });

 			expect(embed.toJSON()).toStrictEqual({
@@ -295,14 +295,16 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed with a pre-defined footer THEN unset footer THEN return valid toJSON data', () => {
-			const embed = new Embed({ footer: { text: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg' } });
+			const embed = new EmbedBuilder({
+				footer: { text: 'Wumpus', icon_url: 'https://discord.js.org/static/logo.svg' },
+			});
 			embed.setFooter(null);

 			expect(embed.toJSON()).toStrictEqual({ footer: undefined });
 		});

 		test('GIVEN an embed with invalid footer text THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			expect(() => embed.setFooter({ text: 'a'.repeat(2049) })).toThrowError();
 		});
@@ -310,7 +312,7 @@ describe('Embed', () => {

 	describe('Embed Fields', () => {
 		test('GIVEN an embed with a pre-defined field THEN returns valid toJSON data', () => {
-			const embed = new Embed({
+			const embed = new EmbedBuilder({
 				fields: [{ name: 'foo', value: 'bar' }],
 			});
 			expect(embed.toJSON()).toStrictEqual({
@@ -319,7 +321,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed using Embed#addFields THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.addFields({ name: 'foo', value: 'bar' });

 			expect(embed.toJSON()).toStrictEqual({
@@ -328,7 +330,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed using Embed#spliceFields THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.addFields({ name: 'foo', value: 'bar' }, { name: 'foo', value: 'baz' });

 			expect(embed.spliceFields(0, 1).toJSON()).toStrictEqual({
@@ -337,7 +339,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed using Embed#spliceFields THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.addFields(...Array.from({ length: 23 }, () => ({ name: 'foo', value: 'bar' })));

 			expect(() =>
@@ -346,7 +348,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed using Embed#spliceFields that adds additional fields resulting in fields > 25 THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();
 			embed.addFields(...Array.from({ length: 23 }, () => ({ name: 'foo', value: 'bar' })));

 			expect(() =>
@@ -355,7 +357,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed using Embed#setFields THEN returns valid toJSON data', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			expect(() =>
 				embed.setFields(...Array.from({ length: 25 }, () => ({ name: 'foo', value: 'bar' }))),
@@ -363,7 +365,7 @@ describe('Embed', () => {
 		});

 		test('GIVEN an embed using Embed#setFields that sets more than 25 fields THEN throws error', () => {
-			const embed = new Embed();
+			const embed = new EmbedBuilder();

 			expect(() =>
 				embed.setFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' }))),
@@ -372,7 +374,7 @@ describe('Embed', () => {

 		describe('GIVEN invalid field amount THEN throws error', () => {
 			test('', () => {
-				const embed = new Embed();
+				const embed = new EmbedBuilder();

 				expect(() =>
 					embed.addFields(...Array.from({ length: 26 }, () => ({ name: 'foo', value: 'bar' }))),
@@ -382,7 +384,7 @@ describe('Embed', () => {

 		describe('GIVEN invalid field name THEN throws error', () => {
 			test('', () => {
-				const embed = new Embed();
+				const embed = new EmbedBuilder();

 				expect(() => embed.addFields({ name: '', value: 'bar' })).toThrowError();
 			});
@@ -390,7 +392,7 @@ describe('Embed', () => {

 		describe('GIVEN invalid field name length THEN throws error', () => {
 			test('', () => {
-				const embed = new Embed();
+				const embed = new EmbedBuilder();

 				expect(() => embed.addFields({ name: 'a'.repeat(257), value: 'bar' })).toThrowError();
 			});
@@ -398,7 +400,7 @@ describe('Embed', () => {

 		describe('GIVEN invalid field value length THEN throws error', () => {
 			test('', () => {
-				const embed = new Embed();
+				const embed = new EmbedBuilder();

 				expect(() => embed.addFields({ name: '', value: 'a'.repeat(1025) })).toThrowError();
 			});