@medievalrain/emitter 0.4.0 → 0.7.0

package/dist/index.d.ts

@@ -4,17 +4,18 @@ type CallbackOptions = {
   once?: boolean;
   signal?: AbortSignal;
 };
-type Callback<E extends EventMap, K$1 extends keyof E> = (...args: [E[K$1]] extends [void] ? [] : [E[K$1]]) => void;
 type OnAnyCallback<Events extends EventMap> = (data: Events[keyof Events]) => void;
+type Callback<Events extends EventMap, K extends keyof Events> = undefined extends Events[K] ? () => void : (data: Events[K]) => void;
+type Emit<Events extends EventMap> = <K extends keyof Events>(...args: undefined extends Events[K] ? [eventName: K] : [eventName: K, data: Events[K]]) => void;
 type Emitter<Events extends EventMap> = {
-  emit: <EM extends keyof Events>(eventName: EM, ...args: Parameters<Callback<Events, EM>>) => void;
-  on: <EM extends keyof Events>(eventName: EM, callback: Callback<Events, EM>, options?: CallbackOptions) => void;
+  emit: Emit<Events>;
+  on: <K extends keyof Events>(eventName: K, callback: Callback<Events, K>, options?: CallbackOptions) => void;
+  off: <K extends keyof Events>(eventName: K, callback: Callback<Events, K>) => void;
   onAny: (callback: OnAnyCallback<Events>, options?: CallbackOptions) => void;
   offAny: (callback: OnAnyCallback<Events>) => void;
-  off: <EM extends keyof Events>(eventName: EM, callback: Callback<Events, EM>) => void;
 };
 //#endregion
 //#region src/emitter.d.ts
 declare const createEmitter: <Events extends EventMap>() => Emitter<Events>;
 //#endregion
-export { type CallbackOptions, type EventMap, createEmitter };
+export { type CallbackOptions, type Emitter, type EventMap, createEmitter };

package/dist/index.js

@@ -9,13 +9,13 @@ const createEmitter = () => {
 		callbacks.delete(callback);
 		if (!callbacks.size) delete callbackMap[eventName];
 	};
-	const emit = (eventName, ...args) => {
+	const emit = (...[eventName, callbackArgs]) => {
 		const callbacks = callbackMap[eventName];
 		if (!callbacks?.size) return;
 		Array.from(callbacks.entries()).forEach(([callback, { once }]) => {
 			if (!callbacks.has(callback)) return;
 			try {
-				callback(...args);
+				callback(callbackArgs);
 			} finally {
 				if (once) off(eventName, callback);
 			}
@@ -23,7 +23,7 @@ const createEmitter = () => {
 		Array.from(onAnyCallbacks.entries()).forEach(([callback, options]) => {
 			if (!onAnyCallbacks.has(callback)) return;
 			try {
-				callback(args);
+				callback(callbackArgs);
 			} finally {
 				if (options?.once) offAny(callback);
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@medievalrain/emitter",
-	"version": "0.4.0",
+	"version": "0.7.0",
 	"description": "A typesafe event emitter",
 	"type": "module",
 	"repository": {