@ovencord/util 1.1.4 → 1.1.6

package/package.json

@@ -1,12 +1,14 @@
 {
 	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@ovencord/util",
-	"version": "1.1.4",
+	"version": "1.1.6",
 	"description": "Utilities shared across Discord.js packages",
 	"scripts": {
 		"test": "bun test",
 		"typecheck": "tsc --noEmit",
-		"lint": "eslint src"
+		"lint": "biome check .",
+		"format": "biome format --write .",
+		"check": "biome check --write ."
 	},
 	"type": "module",
 	"exports": "./src/index.ts",
@@ -34,16 +36,11 @@
 	"homepage": "https://ovencord.dev",
 	"funding": "https://github.com/ovencord/ovencord?sponsor",
 	"dependencies": {
-		"discord-api-types": "^0.38.36"
-	},
-	"devDependencies": {
-		"@types/bun": "^1.3.8",
-		"eslint": "^9.39.2",
-		"typescript": "^5.9.3",
-		"typescript-eslint": "^8.54.0"
+		"discord-api-types": "^0.38.40"
 	},
+	"devDependencies": {},
 	"engines": {
-		"bun": ">=1.0.0"
+		"bun": ">=1.3.0"
 	},
 	"publishConfig": {
 		"access": "public"

package/src/AsyncEventEmitter.ts

@@ -1,6 +1,8 @@
+import { AsyncQueue } from './AsyncQueue.js';
+
 export type EventMap = Record<string | symbol, any[]>;
 
-export class AsyncEventEmitter<Events extends EventMap = EventMap> {
+export class AsyncEventEmitter<Events extends Record<keyof Events, any[]> = any> {
   private _listeners = new Map<keyof Events | string | symbol, Set<Function>>();
   private _maxListeners = 10;
 
@@ -139,7 +141,6 @@ export class AsyncEventEmitter<Events extends EventMap = EventMap> {
   }
 
   public waitFor<K extends keyof Events>(event: K, timeout?: number): Promise<Events[K]>;
-  public waitFor<K extends string | symbol>(event: K, timeout?: number): Promise<any[]>;
   public waitFor(event: string | symbol, timeout?: number): Promise<any[]> {
     return new Promise((resolve, reject) => {
       let timeoutId: Timer | undefined;
@@ -159,4 +160,44 @@ export class AsyncEventEmitter<Events extends EventMap = EventMap> {
       }
     });
   }
+
+  public static async *on<T extends AsyncEventEmitter<any>, K extends keyof (T extends AsyncEventEmitter<infer U> ? U : never)>(
+    emitter: T,
+    eventName: K,
+    options?: { signal?: AbortSignal }
+  ): AsyncIterableIterator<(T extends AsyncEventEmitter<infer U> ? U : never)[K]> {
+    const signal = options?.signal;
+    if (signal?.aborted) throw new Error('AbortError');
+
+    const queue = new AsyncQueue();
+    const items: any[][] = [];
+
+    const listener = (...args: any[]) => {
+      items.push(args);
+      queue.shift();
+    };
+
+    const abortHandler = () => {
+      emitter.off(eventName as any, listener);
+      queue.shift();
+    };
+
+    emitter.on(eventName as any, listener);
+    signal?.addEventListener('abort', abortHandler, { once: true });
+
+    try {
+      while (true) {
+        if (signal?.aborted && items.length === 0) break;
+        if (items.length === 0) {
+          await queue.wait(options);
+        }
+        if (signal?.aborted && items.length === 0) break;
+
+        yield items.shift()! as any;
+      }
+    } finally {
+      emitter.off(eventName as any, listener);
+      signal?.removeEventListener('abort', abortHandler);
+    }
+  }
 }

package/src/functions/lazy.ts

@@ -10,9 +10,7 @@
  * const value = lazy(() => computeExpensiveValue());
  * ```
  */
-// eslint-disable-next-line
 export function lazy<Value>(cb: () => Value): () => Value {
 	let defaultValue: Value;
-	// eslint-disable-next-line
 	return () => (defaultValue ??= cb());
 }