hookified 2.0.0 → 2.1.0

package/dist/node/index.cjs

@@ -28,13 +28,13 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/eventified.ts
+var ERROR_EVENT = "error";
 var Eventified = class {
   _eventListeners;
   _maxListeners;
   _eventLogger;
   _throwOnEmitError = false;
   _throwOnEmptyListeners = true;
-  _errorEvent = "error";
   constructor(options) {
     this._eventListeners = /* @__PURE__ */ new Map();
     this._maxListeners = 0;
@@ -109,10 +109,17 @@ var Eventified = class {
    */
   listenerCount(eventName) {
     if (eventName === void 0) {
-      return this.getAllListeners().length;
+      let count = 0;
+      for (const entry2 of this._eventListeners.values()) {
+        count += typeof entry2 === "function" ? 1 : entry2.length;
+      }
+      return count;
+    }
+    const entry = this._eventListeners.get(eventName);
+    if (entry === void 0) {
+      return 0;
     }
-    const listeners = this._eventListeners.get(eventName);
-    return listeners ? listeners.length : 0;
+    return typeof entry === "function" ? 1 : entry.length;
   }
   /**
    * Gets an array of event names
@@ -130,7 +137,11 @@ var Eventified = class {
     if (event === void 0) {
       return this.getAllListeners();
     }
-    return this._eventListeners.get(event) ?? [];
+    const entry = this._eventListeners.get(event);
+    if (entry === void 0) {
+      return [];
+    }
+    return typeof entry === "function" ? [entry] : entry;
   }
   /**
    * Prepends a listener to the beginning of the listeners array for the specified event
@@ -139,9 +150,14 @@ var Eventified = class {
    * @returns {IEventEmitter} returns the instance of the class for chaining
    */
   prependListener(eventName, listener) {
-    const listeners = this._eventListeners.get(eventName) ?? [];
-    listeners.unshift(listener);
-    this._eventListeners.set(eventName, listeners);
+    const existing = this._eventListeners.get(eventName);
+    if (existing === void 0) {
+      this._eventListeners.set(eventName, listener);
+    } else if (typeof existing === "function") {
+      this._eventListeners.set(eventName, [listener, existing]);
+    } else {
+      existing.unshift(listener);
+    }
     return this;
   }
   /**
@@ -182,17 +198,26 @@ var Eventified = class {
    * @returns {IEventEmitter} returns the instance of the class for chaining
    */
   on(event, listener) {
-    if (!this._eventListeners.has(event)) {
-      this._eventListeners.set(event, []);
-    }
-    const listeners = this._eventListeners.get(event);
-    if (listeners) {
-      if (this._maxListeners > 0 && listeners.length >= this._maxListeners) {
+    const existing = this._eventListeners.get(event);
+    if (existing === void 0) {
+      this._eventListeners.set(event, listener);
+      return this;
+    }
+    if (typeof existing === "function") {
+      const arr = [existing, listener];
+      this._eventListeners.set(event, arr);
+      if (this._maxListeners > 0 && arr.length > this._maxListeners) {
+        console.warn(
+          `MaxListenersExceededWarning: Possible event memory leak detected. ${arr.length} ${event} listeners added. Use setMaxListeners() to increase limit.`
+        );
+      }
+    } else {
+      existing.push(listener);
+      if (this._maxListeners > 0 && existing.length > this._maxListeners) {
         console.warn(
-          `MaxListenersExceededWarning: Possible event memory leak detected. ${listeners.length + 1} ${event} listeners added. Use setMaxListeners() to increase limit.`
+          `MaxListenersExceededWarning: Possible event memory leak detected. ${existing.length} ${event} listeners added. Use setMaxListeners() to increase limit.`
         );
       }
-      listeners.push(listener);
     }
     return this;
   }
@@ -213,13 +238,25 @@ var Eventified = class {
    * @returns {IEventEmitter} returns the instance of the class for chaining
    */
   off(event, listener) {
-    const listeners = this._eventListeners.get(event) ?? [];
-    const index = listeners.indexOf(listener);
-    if (index !== -1) {
-      listeners.splice(index, 1);
+    const entry = this._eventListeners.get(event);
+    if (entry === void 0) {
+      return this;
     }
-    if (listeners.length === 0) {
-      this._eventListeners.delete(event);
+    if (typeof entry === "function") {
+      if (entry === listener) {
+        this._eventListeners.delete(event);
+      }
+      return this;
+    }
+    const index = entry.indexOf(listener);
+    if (index !== -1) {
+      if (entry.length === 2) {
+        this._eventListeners.set(event, entry[1 - index]);
+      } else if (entry.length === 1) {
+        this._eventListeners.delete(event);
+      } else {
+        entry.splice(index, 1);
+      }
     }
     return this;
   }
@@ -231,22 +268,38 @@ var Eventified = class {
    */
   emit(event, ...arguments_) {
     let result = false;
-    const listeners = this._eventListeners.get(event);
-    if (listeners && listeners.length > 0) {
-      for (const listener of listeners) {
-        listener(...arguments_);
-        result = true;
+    const entry = this._eventListeners.get(event);
+    const argumentLength = arguments_.length;
+    if (entry !== void 0) {
+      if (typeof entry === "function") {
+        if (argumentLength === 1) {
+          entry(arguments_[0]);
+        } else if (argumentLength === 2) {
+          entry(arguments_[0], arguments_[1]);
+        } else {
+          entry(...arguments_);
+        }
+      } else {
+        const snapshot = [...entry];
+        for (let i = 0; i < snapshot.length; i++) {
+          if (argumentLength === 1) {
+            snapshot[i](arguments_[0]);
+          } else if (argumentLength === 2) {
+            snapshot[i](arguments_[0], arguments_[1]);
+          } else {
+            snapshot[i](...arguments_);
+          }
+        }
       }
+      result = true;
     }
-    this.sendToEventLogger(event, arguments_);
-    if (event === this._errorEvent) {
+    if (this._eventLogger) {
+      this.sendToEventLogger(event, arguments_);
+    }
+    if (event === ERROR_EVENT && !result) {
       const error = arguments_[0] instanceof Error ? arguments_[0] : new Error(`${arguments_[0]}`);
-      if (this._throwOnEmitError && !result) {
+      if (this._throwOnEmitError || this._throwOnEmptyListeners) {
         throw error;
-      } else {
-        if (this.listeners(this._errorEvent).length === 0 && this._throwOnEmptyListeners === true) {
-          throw error;
-        }
       }
     }
     return result;
@@ -257,7 +310,11 @@ var Eventified = class {
    * @returns {EventListener[]} An array of listeners
    */
   listeners(event) {
-    return this._eventListeners.get(event) ?? [];
+    const entry = this._eventListeners.get(event);
+    if (entry === void 0) {
+      return [];
+    }
+    return typeof entry === "function" ? [entry] : entry;
   }
   /**
    * Removes all listeners for a specific event. If no event is provided, it removes all listeners
@@ -285,9 +342,15 @@ var Eventified = class {
    * @returns {EventListener[]} An array of listeners
    */
   getAllListeners() {
-    let result = [];
-    for (const listeners of this._eventListeners.values()) {
-      result = [...result, ...listeners];
+    const result = [];
+    for (const entry of this._eventListeners.values()) {
+      if (typeof entry === "function") {
+        result.push(entry);
+      } else {
+        for (let i = 0; i < entry.length; i++) {
+          result.push(entry[i]);
+        }
+      }
     }
     return result;
   }
@@ -517,15 +580,21 @@ var Hookified = class extends Eventified {
   set useHookClone(value) {
     this._useHookClone = value;
   }
-  /**
-   * Adds a handler function for a specific event.
-   * If you prefer the legacy `(event, handler)` signature, use {@link addHook} instead.
-   * To register multiple hooks at once, use {@link onHooks}.
-   * @param {IHook} hook - the hook containing event name and handler
-   * @param {OnHookOptions} [options] - optional per-call options (e.g., useHookClone override, position)
-   * @returns {IHook | undefined} the stored hook, or undefined if blocked by deprecation
-   */
-  onHook(hook, options) {
+  onHook(hookOrEvent, optionsOrHandler) {
+    let hook;
+    let options;
+    if (typeof hookOrEvent === "string") {
+      if (typeof optionsOrHandler !== "function") {
+        throw new TypeError(
+          "When calling onHook(event, handler), the second argument must be a function"
+        );
+      }
+      hook = { event: hookOrEvent, handler: optionsOrHandler };
+      options = void 0;
+    } else {
+      hook = hookOrEvent;
+      options = optionsOrHandler;
+    }
     this.validateHookName(hook.event);
     if (!this.checkDeprecatedHook(hook.event)) {
       return void 0;
@@ -846,4 +915,6 @@ var Hookified = class extends Eventified {
   Hookified,
   WaterfallHook
 });
+/* v8 ignore start -- @preserve: single-element arrays are stored as functions */
+/* v8 ignore next 3 -- @preserve: guarded by caller */
 /* v8 ignore next -- @preserve */

package/dist/node/index.d.cts

@@ -274,7 +274,6 @@ declare class Eventified implements IEventEmitter {
     private _eventLogger?;
     private _throwOnEmitError;
     private _throwOnEmptyListeners;
-    private _errorEvent;
     constructor(options?: EventEmitterOptions);
     /**
      * Gets the event logger
@@ -532,13 +531,16 @@ declare class Hookified extends Eventified {
     set useHookClone(value: boolean);
     /**
      * Adds a handler function for a specific event.
-     * If you prefer the legacy `(event, handler)` signature, use {@link addHook} instead.
+     * Supports both object and legacy signatures:
+     *   onHook({ event, handler }, options?)
+     *   onHook(event, handler)
      * To register multiple hooks at once, use {@link onHooks}.
-     * @param {IHook} hook - the hook containing event name and handler
-     * @param {OnHookOptions} [options] - optional per-call options (e.g., useHookClone override, position)
+     * @param {IHook | string} hookOrEvent - the hook object or event name
+     * @param {OnHookOptions | HookFn} [optionsOrHandler] - options (when using object form) or handler function (when using string form)
      * @returns {IHook | undefined} the stored hook, or undefined if blocked by deprecation
      */
     onHook(hook: IHook, options?: OnHookOptions): IHook | undefined;
+    onHook(event: string, handler: HookFn): IHook | undefined;
     /**
      * Alias for onHook. This is provided for compatibility with other libraries that use the `addHook` method.
      * @param {string} event - the event name

package/dist/node/index.d.ts

@@ -274,7 +274,6 @@ declare class Eventified implements IEventEmitter {
     private _eventLogger?;
     private _throwOnEmitError;
     private _throwOnEmptyListeners;
-    private _errorEvent;
     constructor(options?: EventEmitterOptions);
     /**
      * Gets the event logger
@@ -532,13 +531,16 @@ declare class Hookified extends Eventified {
     set useHookClone(value: boolean);
     /**
      * Adds a handler function for a specific event.
-     * If you prefer the legacy `(event, handler)` signature, use {@link addHook} instead.
+     * Supports both object and legacy signatures:
+     *   onHook({ event, handler }, options?)
+     *   onHook(event, handler)
      * To register multiple hooks at once, use {@link onHooks}.
-     * @param {IHook} hook - the hook containing event name and handler
-     * @param {OnHookOptions} [options] - optional per-call options (e.g., useHookClone override, position)
+     * @param {IHook | string} hookOrEvent - the hook object or event name
+     * @param {OnHookOptions | HookFn} [optionsOrHandler] - options (when using object form) or handler function (when using string form)
      * @returns {IHook | undefined} the stored hook, or undefined if blocked by deprecation
      */
     onHook(hook: IHook, options?: OnHookOptions): IHook | undefined;
+    onHook(event: string, handler: HookFn): IHook | undefined;
     /**
      * Alias for onHook. This is provided for compatibility with other libraries that use the `addHook` method.
      * @param {string} event - the event name

package/dist/node/index.js

@@ -1,11 +1,11 @@
 // src/eventified.ts
+var ERROR_EVENT = "error";
 var Eventified = class {
   _eventListeners;
   _maxListeners;
   _eventLogger;
   _throwOnEmitError = false;
   _throwOnEmptyListeners = true;
-  _errorEvent = "error";
   constructor(options) {
     this._eventListeners = /* @__PURE__ */ new Map();
     this._maxListeners = 0;
@@ -80,10 +80,17 @@ var Eventified = class {
    */
   listenerCount(eventName) {
     if (eventName === void 0) {
-      return this.getAllListeners().length;
+      let count = 0;
+      for (const entry2 of this._eventListeners.values()) {
+        count += typeof entry2 === "function" ? 1 : entry2.length;
+      }
+      return count;
+    }
+    const entry = this._eventListeners.get(eventName);
+    if (entry === void 0) {
+      return 0;
     }
-    const listeners = this._eventListeners.get(eventName);
-    return listeners ? listeners.length : 0;
+    return typeof entry === "function" ? 1 : entry.length;
   }
   /**
    * Gets an array of event names
@@ -101,7 +108,11 @@ var Eventified = class {
     if (event === void 0) {
       return this.getAllListeners();
     }
-    return this._eventListeners.get(event) ?? [];
+    const entry = this._eventListeners.get(event);
+    if (entry === void 0) {
+      return [];
+    }
+    return typeof entry === "function" ? [entry] : entry;
   }
   /**
    * Prepends a listener to the beginning of the listeners array for the specified event
@@ -110,9 +121,14 @@ var Eventified = class {
    * @returns {IEventEmitter} returns the instance of the class for chaining
    */
   prependListener(eventName, listener) {
-    const listeners = this._eventListeners.get(eventName) ?? [];
-    listeners.unshift(listener);
-    this._eventListeners.set(eventName, listeners);
+    const existing = this._eventListeners.get(eventName);
+    if (existing === void 0) {
+      this._eventListeners.set(eventName, listener);
+    } else if (typeof existing === "function") {
+      this._eventListeners.set(eventName, [listener, existing]);
+    } else {
+      existing.unshift(listener);
+    }
     return this;
   }
   /**
@@ -153,17 +169,26 @@ var Eventified = class {
    * @returns {IEventEmitter} returns the instance of the class for chaining
    */
   on(event, listener) {
-    if (!this._eventListeners.has(event)) {
-      this._eventListeners.set(event, []);
-    }
-    const listeners = this._eventListeners.get(event);
-    if (listeners) {
-      if (this._maxListeners > 0 && listeners.length >= this._maxListeners) {
+    const existing = this._eventListeners.get(event);
+    if (existing === void 0) {
+      this._eventListeners.set(event, listener);
+      return this;
+    }
+    if (typeof existing === "function") {
+      const arr = [existing, listener];
+      this._eventListeners.set(event, arr);
+      if (this._maxListeners > 0 && arr.length > this._maxListeners) {
+        console.warn(
+          `MaxListenersExceededWarning: Possible event memory leak detected. ${arr.length} ${event} listeners added. Use setMaxListeners() to increase limit.`
+        );
+      }
+    } else {
+      existing.push(listener);
+      if (this._maxListeners > 0 && existing.length > this._maxListeners) {
         console.warn(
-          `MaxListenersExceededWarning: Possible event memory leak detected. ${listeners.length + 1} ${event} listeners added. Use setMaxListeners() to increase limit.`
+          `MaxListenersExceededWarning: Possible event memory leak detected. ${existing.length} ${event} listeners added. Use setMaxListeners() to increase limit.`
         );
       }
-      listeners.push(listener);
     }
     return this;
   }
@@ -184,13 +209,25 @@ var Eventified = class {
    * @returns {IEventEmitter} returns the instance of the class for chaining
    */
   off(event, listener) {
-    const listeners = this._eventListeners.get(event) ?? [];
-    const index = listeners.indexOf(listener);
-    if (index !== -1) {
-      listeners.splice(index, 1);
+    const entry = this._eventListeners.get(event);
+    if (entry === void 0) {
+      return this;
     }
-    if (listeners.length === 0) {
-      this._eventListeners.delete(event);
+    if (typeof entry === "function") {
+      if (entry === listener) {
+        this._eventListeners.delete(event);
+      }
+      return this;
+    }
+    const index = entry.indexOf(listener);
+    if (index !== -1) {
+      if (entry.length === 2) {
+        this._eventListeners.set(event, entry[1 - index]);
+      } else if (entry.length === 1) {
+        this._eventListeners.delete(event);
+      } else {
+        entry.splice(index, 1);
+      }
     }
     return this;
   }
@@ -202,22 +239,38 @@ var Eventified = class {
    */
   emit(event, ...arguments_) {
     let result = false;
-    const listeners = this._eventListeners.get(event);
-    if (listeners && listeners.length > 0) {
-      for (const listener of listeners) {
-        listener(...arguments_);
-        result = true;
+    const entry = this._eventListeners.get(event);
+    const argumentLength = arguments_.length;
+    if (entry !== void 0) {
+      if (typeof entry === "function") {
+        if (argumentLength === 1) {
+          entry(arguments_[0]);
+        } else if (argumentLength === 2) {
+          entry(arguments_[0], arguments_[1]);
+        } else {
+          entry(...arguments_);
+        }
+      } else {
+        const snapshot = [...entry];
+        for (let i = 0; i < snapshot.length; i++) {
+          if (argumentLength === 1) {
+            snapshot[i](arguments_[0]);
+          } else if (argumentLength === 2) {
+            snapshot[i](arguments_[0], arguments_[1]);
+          } else {
+            snapshot[i](...arguments_);
+          }
+        }
       }
+      result = true;
     }
-    this.sendToEventLogger(event, arguments_);
-    if (event === this._errorEvent) {
+    if (this._eventLogger) {
+      this.sendToEventLogger(event, arguments_);
+    }
+    if (event === ERROR_EVENT && !result) {
       const error = arguments_[0] instanceof Error ? arguments_[0] : new Error(`${arguments_[0]}`);
-      if (this._throwOnEmitError && !result) {
+      if (this._throwOnEmitError || this._throwOnEmptyListeners) {
         throw error;
-      } else {
-        if (this.listeners(this._errorEvent).length === 0 && this._throwOnEmptyListeners === true) {
-          throw error;
-        }
       }
     }
     return result;
@@ -228,7 +281,11 @@ var Eventified = class {
    * @returns {EventListener[]} An array of listeners
    */
   listeners(event) {
-    return this._eventListeners.get(event) ?? [];
+    const entry = this._eventListeners.get(event);
+    if (entry === void 0) {
+      return [];
+    }
+    return typeof entry === "function" ? [entry] : entry;
   }
   /**
    * Removes all listeners for a specific event. If no event is provided, it removes all listeners
@@ -256,9 +313,15 @@ var Eventified = class {
    * @returns {EventListener[]} An array of listeners
    */
   getAllListeners() {
-    let result = [];
-    for (const listeners of this._eventListeners.values()) {
-      result = [...result, ...listeners];
+    const result = [];
+    for (const entry of this._eventListeners.values()) {
+      if (typeof entry === "function") {
+        result.push(entry);
+      } else {
+        for (let i = 0; i < entry.length; i++) {
+          result.push(entry[i]);
+        }
+      }
     }
     return result;
   }
@@ -488,15 +551,21 @@ var Hookified = class extends Eventified {
   set useHookClone(value) {
     this._useHookClone = value;
   }
-  /**
-   * Adds a handler function for a specific event.
-   * If you prefer the legacy `(event, handler)` signature, use {@link addHook} instead.
-   * To register multiple hooks at once, use {@link onHooks}.
-   * @param {IHook} hook - the hook containing event name and handler
-   * @param {OnHookOptions} [options] - optional per-call options (e.g., useHookClone override, position)
-   * @returns {IHook | undefined} the stored hook, or undefined if blocked by deprecation
-   */
-  onHook(hook, options) {
+  onHook(hookOrEvent, optionsOrHandler) {
+    let hook;
+    let options;
+    if (typeof hookOrEvent === "string") {
+      if (typeof optionsOrHandler !== "function") {
+        throw new TypeError(
+          "When calling onHook(event, handler), the second argument must be a function"
+        );
+      }
+      hook = { event: hookOrEvent, handler: optionsOrHandler };
+      options = void 0;
+    } else {
+      hook = hookOrEvent;
+      options = optionsOrHandler;
+    }
     this.validateHookName(hook.event);
     if (!this.checkDeprecatedHook(hook.event)) {
       return void 0;
@@ -816,4 +885,6 @@ export {
   Hookified,
   WaterfallHook
 };
+/* v8 ignore start -- @preserve: single-element arrays are stored as functions */
+/* v8 ignore next 3 -- @preserve: guarded by caller */
 /* v8 ignore next -- @preserve */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hookified",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Event Emitting and Middleware Hooks",
   "type": "module",
   "main": "./dist/node/index.js",