xernerx 4.17.5 → 4.17.7

package/dist/build/XernerxContextCommand.d.ts

@@ -78,5 +78,5 @@ export default class XernerxContextCommand {
 	 * @param interaction - Interaction event emitted on command
 	 * @param args - The arguments parsed with the command, if any
 	 */
-	exec(interaction: XernerxUserContextInteraction | XernerxMessageContextInteraction, args: ContextCommandArguments<'user' | 'message'>): Promise<any>;
+	exec<T = void>(interaction: XernerxUserContextInteraction | XernerxMessageContextInteraction, args: ContextCommandArguments<'user' | 'message'>): Promise<void | any | T>;
 }

package/dist/build/XernerxEvent.d.ts

@@ -17,5 +17,5 @@ export default class XernerxEvent<Event extends keyof XernerxClientEvents> {
 	readonly filepath: string;
 	readonly client: XernerxClientType;
 	constructor(id: string, options: XernerxEventOptions);
-	run(...args: XernerxClientEvents[Event]): Promise<Awaitable<any>>;
+	run<T = void>(...args: XernerxClientEvents[Event]): Promise<Awaitable<void | any | T>>;
 }

package/dist/build/XernerxMessageCommand.d.ts

@@ -74,11 +74,11 @@ export default class XernerxMessageCommand {
 	 * @param message - The message event emitted on this command
 	 * @param options - The args and flags parsed on this command
 	 */
-	conditions(message: XernerxMessage, { args, flags }: MessageCommandArguments): Promise<any>;
+	conditions<T = void>(message: XernerxMessage, { args, flags }: MessageCommandArguments): Promise<void | any | T>;
 	/**
 	 * @description Runs the execution rule
 	 * @param message - The message event emitted on this command
 	 * @param options - The args and flags parsed on this command
 	 */
-	exec(message: XernerxMessage, { args, flags }: MessageCommandArguments): Promise<any>;
+	exec<T = void>(message: XernerxMessage, { args, flags }: MessageCommandArguments): Promise<void | any | T>;
 }

package/dist/build/XernerxSlashCommand.d.ts

@@ -1,5 +1,5 @@
 /** @format */
-import Discord from 'discord.js';
+import Discord, { AutocompleteFocusedOption, AutocompleteInteraction } from 'discord.js';
 import { XernerxClientType, XernerxMessageContextInteraction, XernerxSlashInteraction, XernerxUserContextInteraction } from '../types/extenders.js';
 import { SlashCommandArguments, SlashCommandOptions } from '../types/interfaces.js';
 import { XernerxInteraction } from '../types/types.js';
@@ -79,13 +79,13 @@ export default class XernerxSlashCommand {
 	 * @param focused - The command option that is in focus
 	 * @param options - The full list of options on the command
 	 */
-	autocomplete<T>(interaction: XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, focused: T, options: T[]): Promise<void | any | T>;
+	autocomplete<T = void>(interaction: AutocompleteInteraction, focused: AutocompleteFocusedOption, options: any[]): Promise<void | any | T>;
 	/**
 	 * @description Checks for conditions before running the command
 	 * @param interaction - The interaction event emitted on this command
 	 * @param options - The args, group and subcommand parsed on this command
 	 */
-	conditions<T>(
+	conditions<T = void>(
 		interaction: XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>,
 		{ args, subcommand, group }: SlashCommandArguments
 	): Promise<void | any | T>;
@@ -94,7 +94,7 @@ export default class XernerxSlashCommand {
 	 * @param interaction - The interaction event emitted on this command
 	 * @param options - The args, group and subcommand parsed on this command
 	 */
-	exec<T>(
+	exec<T = void>(
 		interaction: XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>,
 		{ args, subcommand, group }: SlashCommandArguments
 	): Promise<void | any | T>;

package/dist/client/XernerxClient.d.ts

@@ -6,12 +6,17 @@ import ClientUtil from '../utils/ClientUtil.js';
 import XernerxInhibitor from '../build/XernerxInhibitor.js';
 import XernerxEvent from '../build/XernerxEvent.js';
 import Cooldowns from '../models/Cooldowns.js';
-export default class XernerxClient<T = unknown> extends Client {
+export default class XernerxClient<
+	T extends object = {
+		[index: string | number]: any;
+	},
+> extends Client {
 	readonly settings: {
 		ownerId: (string | string[]) & (string | string[] | undefined);
 		local: string;
 		ceaseless: boolean;
 		global?: boolean | undefined;
+		debug?: boolean | undefined;
 		permissions?:
 			| {
 					user: string[] | null;
@@ -61,5 +66,5 @@ export default class XernerxClient<T = unknown> extends Client {
 	readonly dbl: any;
 	readonly [index: string]: unknown;
 	constructor(discordOptions: ClientOptions, xernerxOptions: XernerxOptions, config?: T);
-	connect(token: string): Promise<string>;
+	connect(token: string): Promise<string | void>;
 }

package/dist/client/XernerxClient.js

@@ -1,6 +1,7 @@
 /** @format */
 import { Client, Collection } from 'discord.js';
 import { z } from 'zod';
+import * as clack from '@clack/prompts';
 import CommandHandler from '../handlers/CommandHandler.js';
 import EventHandler from '../handlers/EventHandler.js';
 import InhibitorHandler from '../handlers/InhibitorHandler.js';
@@ -13,10 +14,12 @@ import Cooldowns from '../models/Cooldowns.js';
 export default class XernerxClient extends Client {
 	constructor(discordOptions, xernerxOptions, config) {
 		super(discordOptions);
+		clack.intro('Xernerx');
 		this.settings = z
 			.object({
 				local: z.string(),
 				global: z.boolean().default(false).optional(),
+				debug: z.boolean().default(false).optional(),
 				ownerId: z.string().or(z.array(z.string())).default([]),
 				ceaseless: z.boolean().default(false),
 				permissions: z
@@ -89,9 +92,15 @@ export default class XernerxClient extends Client {
 		};
 	}
 	async connect(token) {
-		const login = this.login(token); // TODO add thing to catch and have better error message
+		if (this.settings.debug) new XernerxLog(this).debug(`Connecting to discord using token ${token}...`);
+		const login = await this.login(token).catch(() => {
+			new XernerxLog(this).error('An invalid token was provided. Please make sure to provide a valid Discord bot token.');
+		});
+		if (this.settings.debug) new XernerxLog(this).debug(`Connected to discord using token ${token}`);
 		deploy(this);
 		new XernerxLog(this).ready();
+		const spinner = clack.spinner();
+		spinner.start();
 		return login;
 	}
 }

package/dist/handlers/Handler.d.ts

@@ -6,7 +6,10 @@ import XernerxContextCommand from '../build/XernerxContextCommand.js';
 import { filetype } from '../types/types.js';
 import { XernerxClientEvents, XernerxEvent, XernerxInhibitor } from '../main.js';
 export default class Handler {
-	readonly client: XernerxClient<unknown>;
+	readonly client: XernerxClient<{
+		[index: string]: any;
+		[index: number]: any;
+	}>;
 	readonly files: Array<MessageCommandBuilder | XernerxSlashCommand | XernerxContextCommand>;
 	constructor(client: XernerxClient);
 	readdir(dir: string, type: string): Promise<string[]>;

package/dist/handlers/Handler.js

@@ -14,16 +14,13 @@ export default class Handler {
 		try {
 			return fs.readdirSync(path.resolve(dir)).filter((file) => file.endsWith('.js'));
 		} catch (error) {
-			// const spinner = clack.spinner();
-			// spinner.start();
 			new XernerxLog(this.client).error(`Cannot load ${type.toLowerCase()}, there is no such directory ${Style.log(dir, { color: Style.BackgroundColor.Grey })}.`);
-			// spinner.stop();
-			// console.log(c);
 		}
 		return [];
 	}
 	async load(filepath, type) {
 		const file = await load(this.client, filepath, type);
+		if (this.client.settings.debug) new XernerxLog(this.client).debug(`Loaded ${Style.log(type, { color: Style.TextColor.Blue })} ${Style.log(file.name, { color: Style.TextColor.Yellow })}`);
 		this.files.push(file);
 		return file;
 	}
@@ -36,10 +33,13 @@ export default class Handler {
 		if (file.filetype === 'Inhibitor') return;
 		if (file.filetype === 'Event' && file.emitter) {
 			if (file.emitter === 'client') {
+				if (this.client.settings.debug) new XernerxLog(this.client).debug(`Listening to client event ${Style.log(file.name, { color: Style.TextColor.Yellow })}`);
 				this.client[file.once ? 'once' : 'on'](file.name, (...args) => file.run(...args));
 			} else if (file.emitter === 'process') {
+				if (this.client.settings.debug) new XernerxLog(this.client).debug(`Listening to process event ${Style.log(file.name, { color: Style.TextColor.Yellow })}`);
 				process[file.once ? 'once' : 'on'](file.name, (...args) => file.run(...args));
 			} else if (file.emitter === 'rest') {
+				if (this.client.settings.debug) new XernerxLog(this.client).debug(`Listening to rest event ${Style.log(file.name, { color: Style.TextColor.Yellow })}`);
 				this.client.rest[file.once ? 'once' : 'on'](file.name, (...args) => file.run(...args));
 			} else {
 				// @ts-expect-error

package/dist/tools/XernerxLog.d.ts

@@ -17,6 +17,7 @@ export default class XernerxLog {
 	constructor(client: XernerxClient | XernerxClientType | true);
 	info(message: string, force?: boolean): void | null;
 	warn(message: string): void | null;
+	debug(message: string): void;
 	update(version: string, url: string): Promise<void>;
 	error(message: string, error?: XernerxError | unknown): void | null;
 	ready(): void;
@@ -26,4 +27,5 @@ export default class XernerxLog {
 	private purple;
 	private red;
 	private green;
+	private turquoise;
 }

package/dist/tools/XernerxLog.js

@@ -43,7 +43,15 @@ export default class XernerxLog {
 		});
 		this.base = (type, message) =>
 			`${
-				type == 'info' ? `✔️  | ${this.purple('Xernerx')}` : type == `error` ? `❗ | ${this.red('Xernerx')}` : type == `update` ? `⬆️  | ${this.blue('Xernerx')}` : `⚠️  | ${this.yellow('Xernerx')}`
+				type == 'info'
+					? `✔️  | ${this.purple('Xernerx')}`
+					: type == `error`
+					? `❗ | ${this.red('Xernerx')}`
+					: type == `update`
+					? `⬆️  | ${this.blue('Xernerx')}`
+					: type == `debug`
+					? `🐛 | ${this.turquoise('Xernerx')}`
+					: `⚠️  | ${this.yellow('Xernerx')}`
 			} | ${this.format
 				?.map((c) => (typeof format[c] == 'function' ? format[c]() : format[c]) || null)
 				.filter((x) => x)
@@ -55,6 +63,9 @@ export default class XernerxLog {
 	warn(message) {
 		return this.warnLog ? console.warn(this.base('warn', message)) : null;
 	}
+	debug(message) {
+		return console.debug(this.base('debug', message));
+	}
 	async update(version, url) {
 		try {
 			const pkg = await fetch(url)
@@ -131,4 +142,7 @@ export default class XernerxLog {
 	green(string) {
 		return Style.log(String(string), { color: Style.TextColor.Green });
 	}
+	turquoise(string) {
+		return Style.log(String(string), { color: Style.TextColor.Turquoise });
+	}
 }

package/dist/types/interfaces.d.ts

@@ -13,6 +13,7 @@ import { XernerxClientEvents, XernerxMessage, XernerxUser } from './extenders.js
 export interface XernerxOptions {
 	local: string;
 	global?: boolean;
+	debug?: boolean;
 	ownerId?: string | Array<string>;
 	ceaseless?: boolean;
 	permissions?: {
@@ -29,14 +30,16 @@ export interface XernerxOptions {
 		channels?: Array<string>;
 		guilds?: Array<string>;
 	};
-	log?: {
-		ready?: boolean;
-		info?: boolean;
-		warn?: boolean;
-		error?: boolean;
-		table?: Array<'name' | 'aliases' | 'description' | 'filetype' | 'category'>;
-		format?: Array<'name' | 'node' | 'xernerx' | 'discordjs' | 'platform' | 'time' | 'date' | 'ram' | 'version' | 'author' | 'shard' | 'index'>;
-	};
+	log?:
+		| {
+				ready?: boolean;
+				info?: boolean;
+				warn?: boolean;
+				error?: boolean;
+				table?: Array<'name' | 'aliases' | 'description' | 'filetype' | 'category'>;
+				format?: Array<'name' | 'node' | 'xernerx' | 'discordjs' | 'platform' | 'time' | 'date' | 'ram' | 'version' | 'author' | 'shard' | 'index'>;
+		  }
+		| boolean;
 	cooldown?: {
 		command?: number;
 		cache?: number;

package/dist/utils/Util.d.ts

@@ -2,7 +2,10 @@
 import XernerxClient from '../client/XernerxClient.js';
 import XernerxText from '../tools/XernerxText.js';
 export default class Util {
-	readonly client: XernerxClient<unknown>;
+	readonly client: XernerxClient<{
+		[index: string]: any;
+		[index: number]: any;
+	}>;
 	readonly text: XernerxText;
 	constructor(client: XernerxClient);
 	delay(time: number): Promise<unknown>;

package/dist/validators/commandValidation.js

@@ -122,7 +122,7 @@ export default async function commandValidation(event, command) {
 		);
 	if (userPermissions.length) {
 		const missing = [];
-		userPermissions.map((permission) => (event.guild?.members.me?.permissionsIn(event.channel?.id).has(Style.pascalCase(permission, true)) ? null : missing.push(permission)));
+		userPermissions.map((permission) => ((event.member?.permissions).toArray().includes(Style.pascalCase(permission, true)) ? null : missing.push(permission)));
 		if (missing.length)
 			return await emit(
 				event,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xernerx",
-	"version": "4.17.5",
+	"version": "4.17.7",
 	"description": "A bot framework for discord.js.",
 	"main": "dist/main.js",
 	"type": "module",
@@ -21,6 +21,7 @@
 		"node": ">=16.11.0"
 	},
 	"scripts": {
+		"cover": "jest",
 		"start": "npm i && npm fund && npm audit fix --force && npm link && tsc -w",
 		"commit": "npm run write && git add . && node ./.github/scripts/message.js",
 		"tag": "node ./.github/scripts/tag.js",
@@ -50,7 +51,9 @@
 		"zod": "^3.22.4"
 	},
 	"devDependencies": {
+		"jest": "^29.7.0",
 		"prettier": "3.0.0",
+		"ts-node": "^10.9.2",
 		"typescript": "^5.5.2"
 	}
 }