@kyvrixon/utils 1.0.10 → 1.0.11

package/README.md

@@ -4,6 +4,4 @@ General utility files I use for alot of projects! Designed for use with the [bun
 
 ```bash
 bun install @kyvrixon/utils
-# or
-bun install github:kyvrixon/utils#1.0.10
-```
+```

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@kyvrixon/utils",
 	"main": "./src/index.ts",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"type": "module",
 	"private": false,
 	"license": "MIT",
@@ -9,20 +9,20 @@
 		"src"
 	],
 	"engines": {
-		"bun": "1.3.10"
+		"bun": "1.3.11"
 	},
 	"repository": {
 		"url": "https://github.com/kyvrixon/utils"
 	},
 	"scripts": {
-		"pub": "bun prebuild.ts && bun publish --access public",
+		"pub": "bun publish --access public",
 		"pretty": "bun biome format --write ."
 	},
 	"packageManager": "bun@1.3.10",
 	"types": "./src/index.ts",
 	"devDependencies": {
 		"@biomejs/biome": "2.4.6",
-		"@types/bun": "1.3.10",
+		"@types/bun": "1.3.11",
 		"typescript": "5.9.3"
 	},
 	"dependencies": {

package/src/index.ts

@@ -3,4 +3,4 @@ export * from "./lib/toOrdinal";
 export * from "./lib/discord-utils/Command";
 export * from "./lib/discord-utils/createPagination";
 export * from "./lib/discord-utils/Event";
-export * from "./lib/modules/LoggerModule";
+export * from "./lib/modules/LoggerModule";

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

@@ -3,59 +3,53 @@ import type { Client, ClientEvents, RestEvents } from "discord.js";
 
 // biome-ignore lint/suspicious/noEmptyInterface: Its fine
 export interface DiscordEventCustomType {}
+
+/** Maps an event type discriminant to its corresponding event map. */
+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;
+
+/** Resolves the argument tuple for a given event type + key pair. */
+type EventArgs<
+	T extends "client" | "rest" | "custom",
+	K extends keyof EventMap<T>,
+> = Extract<EventMap<T>[K], any[]>;
+
 /**
  * To define custom types:
  * @example
  * declare module "@kyvrixon/utils" {
- * 	interface DiscordEventCustomType {
- *			myEventName: [data: string];
- *		}
- * }
- * // You can also add these to `ClientEvents` if you wish for better typing like so:
- * declare module "discord.js" {
- * 	interface ClientEvents extends DiscordEventCustomType {}
+ *   interface DiscordEventCustomType {
+ *     myEventName: [data: string];
+ *   }
  * }
  */
 export class DiscordEvent<
 	V extends Client,
-	T extends "client" | "custom" | "rest" = "client",
-	K extends T extends "custom"
-		? keyof DiscordEventCustomType
-		: T extends "client"
-			? keyof ClientEvents
-			: keyof RestEvents = T extends "custom"
-		? keyof DiscordEventCustomType
-		: T extends "client"
-			? keyof ClientEvents
-			: keyof RestEvents,
+	T extends "client" | "rest" | "custom",
+	K extends keyof EventMap<T> = keyof EventMap<T>,
 > {
 	public readonly type: T;
 	public readonly name: K;
 	public readonly once: boolean;
 	public readonly method: (
 		client: V,
-		...args: T extends "client"
-			? K extends keyof ClientEvents
-				? ClientEvents[K]
-				: any[]
-			: T extends "rest"
-				? K extends keyof RestEvents
-					? RestEvents[K]
-					: any[]
-				: K extends keyof DiscordEventCustomType
-					? DiscordEventCustomType[K]
-					: any[]
-	) => Promise<void>;
+		...args: EventArgs<T, K>
+	) => void | Promise<void>;
 
 	constructor(opts: {
 		type: T;
 		name: K;
-		once?: boolean;
+		once: boolean;
 		method: DiscordEvent<V, T, K>["method"];
 	}) {
 		this.type = opts.type;
 		this.name = opts.name;
-		this.once = opts.once ?? false;
+		this.once = opts.once;
 		this.method = opts.method;
 	}
 }

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

@@ -324,4 +324,4 @@ export async function createPagination(
 		ended = true;
 		await render();
 	});
-}
+}