chore: improve linting (#7244)

packages/builders/.eslintrc.json

@@ -8,9 +8,5 @@
 	"ignorePatterns": ["**/dist/*"],
 	"env": {
 		"jest": true
-	},
-	"rules": {
-		"no-redeclare": 0,
-		"@typescript-eslint/naming-convention": 0
 	}
 }

packages/builders/.prettierignore

@@ -1,2 +1,8 @@
 # Autogenerated
 CHANGELOG.md
+.turbo
+dist/
+docs/**/*
+!docs/index.yml
+!docs/README.md
+coverage/

packages/builders/__tests__/interactions/SlashCommands/SlashCommands.test.ts

@@ -178,14 +178,14 @@ describe('Slash Commands', () => {
 				expect(() =>
 					getBuilder().addStringOption(
 						// @ts-expect-error Checking if check works JS-side too
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call
 						getStringOption().setAutocomplete(true).addChoice('Fancy Pants', 'fp_1'),
 					),
 				).toThrowError();
 
 				expect(() =>
 					getBuilder().addStringOption(
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call
 						getStringOption()
 							.setAutocomplete(true)
 							// @ts-expect-error Checking if check works JS-side too
@@ -200,7 +200,7 @@ describe('Slash Commands', () => {
 				expect(() =>
 					getBuilder().addStringOption(
 						// @ts-expect-error Checking if check works JS-side too
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call
 						getStringOption().addChoice('Fancy Pants', 'fp_1').setAutocomplete(true),
 					),
 				).toThrowError();
@@ -384,6 +384,7 @@ describe('Slash Commands', () => {
 			test('GIVEN builder with a subcommand that tries to add an invalid result THEN throw error', () => {
 				expect(() =>
 					// @ts-expect-error Checking if check works JS-side too
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
 					getNamedBuilder().addSubcommand(getSubcommand()).addInteger(getInteger()),
 				).toThrowError();
 			});

packages/builders/package.json

@@ -5,9 +5,8 @@
 	"scripts": {
 		"build": "tsup",
 		"test": "jest --pass-with-no-tests",
-		"lint": "eslint src --ext mjs,js,ts",
-		"lint:fix": "eslint src --ext mjs,js,ts --fix",
-		"format": "prettier --write .",
+		"lint": "prettier --check . && eslint src __tests__ --ext mjs,js,ts",
+		"format": "prettier --write . && eslint src __tests__ --ext mjs,js,ts --fix",
 		"docs": "typedoc --json docs/typedoc-out.json src/index.ts && node scripts/docs.mjs",
 		"prepublishOnly": "yarn build && yarn lint && yarn test",
 		"changelog": "git cliff --prepend ./CHANGELOG.md -l -c ../../cliff.toml -r ../../ --include-path './*'"
@@ -61,16 +60,16 @@
 	"devDependencies": {
 		"@babel/core": "^7.16.5",
 		"@babel/plugin-proposal-decorators": "^7.16.5",
-		"@babel/preset-env": "^7.16.5",
+		"@babel/preset-env": "^7.16.8",
 		"@babel/preset-typescript": "^7.16.5",
 		"@discordjs/ts-docgen": "^0.3.4",
 		"@types/jest": "^27.0.3",
 		"@types/node": "^16.11.6",
-		"@typescript-eslint/eslint-plugin": "^5.9.0",
-		"@typescript-eslint/parser": "^5.9.0",
+		"@typescript-eslint/eslint-plugin": "^5.9.1",
+		"@typescript-eslint/parser": "^5.9.1",
 		"babel-plugin-transform-typescript-metadata": "^0.3.2",
 		"eslint": "^8.5.0",
-		"eslint-config-marine": "^9.1.0",
+		"eslint-config-marine": "^9.3.2",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-prettier": "^4.0.0",
 		"jest": "^27.4.7",

packages/builders/src/interactions/contextMenuCommands/Assertions.ts

@@ -2,6 +2,28 @@ import { z } from 'zod';
 import { ApplicationCommandType } from 'discord-api-types/v9';
 import type { ContextMenuCommandType } from './ContextMenuCommandBuilder';
 
+const namePredicate = z
+	.string()
+	.min(1)
+	.max(32)
+	.regex(/^( *[\p{L}\p{N}_-]+ *)+$/u);
+
+const typePredicate = z.union([z.literal(ApplicationCommandType.User), z.literal(ApplicationCommandType.Message)]);
+
+const booleanPredicate = z.boolean();
+
+export function validateDefaultPermission(value: unknown): asserts value is boolean {
+	booleanPredicate.parse(value);
+}
+
+export function validateName(name: unknown): asserts name is string {
+	namePredicate.parse(name);
+}
+
+export function validateType(type: unknown): asserts type is ContextMenuCommandType {
+	typePredicate.parse(type);
+}
+
 export function validateRequiredParameters(name: string, type: number) {
 	// Assert name matches all conditions
 	validateName(name);
@@ -9,25 +31,3 @@ export function validateRequiredParameters(name: string, type: number) {
 	// Assert type is valid
 	validateType(type);
 }
-
-const namePredicate = z
-	.string()
-	.min(1)
-	.max(32)
-	.regex(/^( *[\p{L}\p{N}_-]+ *)+$/u);
-
-export function validateName(name: unknown): asserts name is string {
-	namePredicate.parse(name);
-}
-
-const typePredicate = z.union([z.literal(ApplicationCommandType.User), z.literal(ApplicationCommandType.Message)]);
-
-export function validateType(type: unknown): asserts type is ContextMenuCommandType {
-	typePredicate.parse(type);
-}
-
-const booleanPredicate = z.boolean();
-
-export function validateDefaultPermission(value: unknown): asserts value is boolean {
-	booleanPredicate.parse(value);
-}

packages/builders/src/interactions/slashCommands/Assertions.ts

@@ -5,21 +5,6 @@ import type { ApplicationCommandOptionBase } from './mixins/ApplicationCommandOp
 import type { ToAPIApplicationCommandOptions } from './SlashCommandBuilder';
 import type { SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder } from './SlashCommandSubcommands';
 
-export function validateRequiredParameters(
-	name: string,
-	description: string,
-	options: ToAPIApplicationCommandOptions[],
-) {
-	// Assert name matches all conditions
-	validateName(name);
-
-	// Assert description conditions
-	validateDescription(description);
-
-	// Assert options conditions
-	validateMaxOptionsLength(options);
-}
-
 const namePredicate = z
 	.string()
 	.min(1)
@@ -36,6 +21,27 @@ export function validateDescription(description: unknown): asserts description i
 	descriptionPredicate.parse(description);
 }
 
+const maxArrayLengthPredicate = z.unknown().array().max(25);
+
+export function validateMaxOptionsLength(options: unknown): asserts options is ToAPIApplicationCommandOptions[] {
+	maxArrayLengthPredicate.parse(options);
+}
+
+export function validateRequiredParameters(
+	name: string,
+	description: string,
+	options: ToAPIApplicationCommandOptions[],
+) {
+	// Assert name matches all conditions
+	validateName(name);
+
+	// Assert description conditions
+	validateDescription(description);
+
+	// Assert options conditions
+	validateMaxOptionsLength(options);
+}
+
 const booleanPredicate = z.boolean();
 
 export function validateDefaultPermission(value: unknown): asserts value is boolean {
@@ -46,12 +52,6 @@ export function validateRequired(required: unknown): asserts required is boolean
 	booleanPredicate.parse(required);
 }
 
-const maxArrayLengthPredicate = z.unknown().array().max(25);
-
-export function validateMaxOptionsLength(options: unknown): asserts options is ToAPIApplicationCommandOptions[] {
-	maxArrayLengthPredicate.parse(options);
-}
-
 export function validateMaxChoicesLength(choices: APIApplicationCommandOptionChoice[]) {
 	maxArrayLengthPredicate.parse(choices);
 }

packages/builders/src/interactions/slashCommands/SlashCommandBuilder.ts

@@ -133,5 +133,5 @@ export interface SlashCommandOptionsOnlyBuilder
 		Pick<SlashCommandBuilder, 'toJSON'> {}
 
 export interface ToAPIApplicationCommandOptions {
-	toJSON(): APIApplicationCommandOption;
+	toJSON: () => APIApplicationCommandOption;
 }

packages/builders/src/interactions/slashCommands/SlashCommandSubcommands.ts

@@ -48,8 +48,10 @@ export class SlashCommandSubcommandGroupBuilder implements ToAPIApplicationComma
 		validateMaxOptionsLength(options);
 
 		// Get the final result
+		// eslint-disable-next-line @typescript-eslint/no-use-before-define
 		const result = typeof input === 'function' ? input(new SlashCommandSubcommandBuilder()) : input;
 
+		// eslint-disable-next-line @typescript-eslint/no-use-before-define
 		assertReturnOfBuilder(result, SlashCommandSubcommandBuilder);
 
 		// Push it