@kyvrixon/utils 1.4.2 → 1.4.4

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@kyvrixon/utils",
 	"main": "./src/index.ts",
-	"version": "1.4.2",
+	"version": "1.4.4",
 	"type": "module",
 	"private": false,
 	"license": "MIT",
@@ -21,13 +21,15 @@
 	},
 	"types": "./src/index.ts",
 	"devDependencies": {
-		"@biomejs/biome": "2.4.10",
-		"@types/bun": "1.3.11",
-		"typescript": "6.0.2"
+		"@biomejs/biome": "^2.4.10",
+		"@types/bun": "^1.3.11",
+		"typescript": "^6.0.2"
 	},
 	"dependencies": {
-		"chalk": "5.6.2",
-		"discord.js": "14.26.2"
+		"chalk": "^5.6.2"
+	},
+	"peerDependencies": {
+		"discord.js": "^14.26.2"
 	},
 	"exports": {
 		".": {

package/src/lib/discord-utils/Command.ts

@@ -7,6 +7,11 @@ import type {
 	SlashCommandSubcommandsOnlyBuilder,
 } from "discord.js";
 
+export type CommandData =
+	| SlashCommandBuilder
+	| SlashCommandOptionsOnlyBuilder
+	| SlashCommandSubcommandsOnlyBuilder;
+
 export interface DiscordCommandMetadata extends Record<string, unknown> {}
 
 /**
@@ -21,11 +26,8 @@ export interface DiscordCommandMetadata extends Record<string, unknown> {}
  *     }
  * }
  */
-export class DiscordCommand<C extends Client> {
-	public readonly data:
-		| SlashCommandBuilder
-		| SlashCommandOptionsOnlyBuilder
-		| SlashCommandSubcommandsOnlyBuilder;
+export class DiscordCommand<C extends Client = Client> {
+	public readonly data: CommandData;
 	public readonly execute: (
 		client: C,
 		interaction: ChatInputCommandInteraction,
@@ -37,10 +39,16 @@ export class DiscordCommand<C extends Client> {
 	public metadata: DiscordCommandMetadata;
 
 	constructor(ops: {
-		data: DiscordCommand<C>["data"];
-		metadata: DiscordCommand<C>["metadata"];
-		execute: DiscordCommand<C>["execute"];
-		autocomplete?: DiscordCommand<C>["autocomplete"];
+		data: CommandData;
+		metadata: DiscordCommandMetadata;
+		execute: (
+			client: C,
+			interaction: ChatInputCommandInteraction,
+		) => Promise<void>;
+		autocomplete?: (
+			client: C,
+			interaction: AutocompleteInteraction,
+		) => Promise<void>;
 	}) {
 		this.data = ops.data;
 		this.metadata = ops.metadata;

package/src/lib/discord-utils/Event.ts

@@ -1,5 +1,5 @@
 /** biome-ignore-all lint/suspicious/noExplicitAny: Its fine */
-import type {Client, ClientEvents, RestEvents} from "discord.js";
+import type { Client, ClientEvents, RestEvents } from "discord.js";
 
 /**
  * Augment this interface via module declaration to register custom event types.
@@ -11,50 +11,49 @@ import type {Client, ClientEvents, RestEvents} from "discord.js";
  * }
  */
 // biome-ignore lint/suspicious/noEmptyInterface: It's fine
-export interface DiscordEventCustomType {
-}
+export interface DiscordEventCustomType {}
 
 /** Maps an event type discriminant to its corresponding event map. */
 export type EventMap<T extends "client" | "rest" | "custom"> =
-    T extends "client"
-        ? ClientEvents
-        : T extends "rest"
-            ? RestEvents
-            : keyof DiscordEventCustomType extends never
-                ? { "sooo.. there's no custom events..": [] }
-                : DiscordEventCustomType;
+	T extends "client"
+		? ClientEvents
+		: T extends "rest"
+			? RestEvents
+			: keyof DiscordEventCustomType extends never
+				? { "sooo.. there's no custom events..": [] }
+				: DiscordEventCustomType;
 
 /** Resolves the argument tuple for a given event type + key pair. */
 export type EventArgs<
-    T extends "client" | "rest" | "custom",
-    K extends keyof EventMap<T>,
+	T extends "client" | "rest" | "custom",
+	K extends keyof EventMap<T>,
 > = Extract<EventMap<T>[K], any[]>;
 
 /**
  * Wraps a discord.js event handler. Supports `"client"`, `"rest"`, and `"custom"` event types.
  */
 export class DiscordEvent<
-    C extends Client,
-    T extends "client" | "rest" | "custom",
-    K extends keyof EventMap<T> = keyof EventMap<T>,
+	T extends "client" | "rest" | "custom",
+	K extends keyof EventMap<T> = keyof EventMap<T>,
+	C extends Client = Client,
 > {
-    public readonly type: T;
-    public readonly name: K;
-    public readonly once: boolean;
-    public readonly method: (
-        client: C,
-        ...args: EventArgs<T, K>
-    ) => void | Promise<void>;
+	public readonly type: T;
+	public readonly name: K;
+	public readonly once: boolean;
+	public readonly method: (
+		client: C,
+		...args: EventArgs<T, K>
+	) => void | Promise<void>;
 
-    constructor(opts: {
-        type: T;
-        name: K;
-        once: boolean;
-        method: (client: C, ...args: EventArgs<T, K>) => void | Promise<void>;
-    }) {
-        this.type = opts.type;
-        this.name = opts.name;
-        this.once = opts.once;
-        this.method = opts.method;
-    }
+	constructor(opts: {
+		type: T;
+		name: K;
+		once: boolean;
+		method: (client: C, ...args: EventArgs<T, K>) => void | Promise<void>;
+	}) {
+		this.type = opts.type;
+		this.name = opts.name;
+		this.once = opts.once;
+		this.method = opts.method;
+	}
 }