fix(core): only pass args

Author: pi0

src/hookable.ts

@@ -3,7 +3,7 @@ import {
   parallelTaskCaller,
   serialTaskCaller,
   callEachWith,
-  nextDispatch,
+  callHooks,
 } from "./utils.ts";
 
 import type {
@@ -326,13 +326,6 @@ export class HookableCore<
     if (!hooks || hooks.length === 0) {
       return;
     }
-    return nextDispatch(
-      hooks,
-      (args?.length ? [name, ...args] : [name]) as Parameters<
-        InferCallback<HooksT, NameT>
-      >,
-      { run: (fn) => fn() },
-      0,
-    );
+    return callHooks(hooks, args, 0);
   }
 }

src/utils.ts

@@ -77,18 +77,19 @@ const createTask = /* @__PURE__ */ (() => {
   return () => defaultTask;
 })();
 
-export function nextDispatch(
+export function callHooks(
   hooks: HookCallback[],
   args: any[],
-  task: ReturnType<CreateTask>,
   startIndex: number,
+  task?: ReturnType<CreateTask>,
 ): Promise<any> | void {
   for (let i = startIndex; i < hooks.length; i += 1) {
     try {
-      const result = task.run(() => hooks[i](...args));
-
+      const result = task
+        ? task.run(() => hooks[i](...args))
+        : hooks[i](...args);
       if (result instanceof Promise) {
-        return result.then(() => nextDispatch(hooks, args, task, i + 1));
+        return result.then(() => callHooks(hooks, args, i + 1, task));
       }
     } catch (error) {
       return Promise.reject(error);
@@ -100,25 +101,19 @@ export function serialTaskCaller(
   hooks: HookCallback[],
   args: any[],
 ): Promise<any> | void {
-  if (hooks.length === 0) {
-    return;
+  if (hooks.length > 0) {
+    return callHooks(hooks, args, 0, createTask(args.shift()));
   }
-
-  const task = createTask(args.shift());
-
-  return nextDispatch(hooks, args, task, 0);
 }
 
 export function parallelTaskCaller(
   hooks: HookCallback[],
   args: any[],
 ): Promise<any> | void {
-  if (hooks.length === 0) {
-    return;
+  if (hooks.length > 0) {
+    const task = createTask(args.shift());
+    return Promise.all(hooks.map((hook) => task.run(() => hook(...args))));
   }
-
-  const task = createTask(args.shift());
-  return Promise.all(hooks.map((hook) => task.run(() => hook(...args))));
 }
 
 /** @deprecated */

test/bundle.test.ts

@@ -26,8 +26,8 @@ describe("benchmark", () => {
     if (process.env.DEBUG) {
       console.log("new HookableCore():", { bytes, gzipSize });
     }
-    expect(bytes).toBeLessThan(640);
-    expect(gzipSize).toBeLessThan(380);
+    expect(bytes).toBeLessThan(630);
+    expect(gzipSize).toBeLessThan(370);
   });
 });
 

test/hookable.test.ts

@@ -5,12 +5,12 @@ import { Hookable, HookableCore, flatHooks, mergeHooks } from "../src/index.ts";
 describe("HookableCore", () => {
   test("basic functionality", async () => {
     const hookable = new HookableCore<{ test(): void }>();
-    let called = false;
-    hookable.hook("test", async () => {
-      called = true;
+    hookable.hook("test", async (obj: { called: boolean }) => {
+      obj.called = true;
     });
-    await hookable.callHook("test");
-    expect(called).toBe(true);
+    const obj = { called: false };
+    await hookable.callHook("test", obj);
+    expect(obj.called).toBe(true);
   });
 });