hookable 5.4.0 → 5.4.1

package/dist/index.cjs

@@ -50,46 +50,6 @@ function callEachWith(callbacks, arg0) {
     cb(arg0);
   }
 }
-const isBrowser = typeof window !== "undefined";
-function createDebugger(hooks, _options = {}) {
-  const options = {
-    inspect: isBrowser,
-    group: isBrowser,
-    filter: () => true,
-    ..._options
-  };
-  const _filter = options.filter;
-  const filter = typeof _filter === "string" ? (name) => name.startsWith(_filter) : _filter;
-  const logPrefix = options.tag ? `[${options.tag}] ` : "";
-  const unsubscribeBefore = hooks.beforeEach(({ name }) => {
-    if (!filter(name)) {
-      return;
-    }
-    console.time(logPrefix + name);
-  });
-  const unsubscribeAfter = hooks.afterEach(({ name, args }) => {
-    if (!filter(name)) {
-      return;
-    }
-    if (options.group) {
-      console.groupCollapsed(name);
-    }
-    if (options.inspect) {
-      console.timeLog(logPrefix + name, args);
-    } else {
-      console.timeEnd(logPrefix + name);
-    }
-    if (options.group) {
-      console.groupEnd();
-    }
-  });
-  return {
-    close: () => {
-      unsubscribeBefore();
-      unsubscribeAfter();
-    }
-  };
-}
 
 class Hookable {
   constructor() {
@@ -198,12 +158,12 @@ class Hookable {
     const result = caller(this._hooks[name] || [], args);
     if (result instanceof Promise) {
       return result.finally(() => {
-        if (this._after) {
+        if (this._after && event) {
           callEachWith(this._after, event);
         }
       });
     }
-    if (this._after) {
+    if (this._after && event) {
       callEachWith(this._after, event);
     }
     return result;
@@ -233,6 +193,52 @@ function createHooks() {
   return new Hookable();
 }
 
+const isBrowser = typeof window !== "undefined";
+function createDebugger(hooks, _options = {}) {
+  const options = {
+    inspect: isBrowser,
+    group: isBrowser,
+    filter: () => true,
+    ..._options
+  };
+  const _filter = options.filter;
+  const filter = typeof _filter === "string" ? (name) => name.startsWith(_filter) : _filter;
+  const _tag = options.tag ? `[${options.tag}] ` : "";
+  const logPrefix = (event) => _tag + event.name + "".padEnd(event._id, "\0");
+  const _idCtr = {};
+  const unsubscribeBefore = hooks.beforeEach((event) => {
+    if (!filter(event.name)) {
+      return;
+    }
+    _idCtr[event.name] = _idCtr[event.name] || 0;
+    event._id = _idCtr[event.name]++;
+    console.time(logPrefix(event));
+  });
+  const unsubscribeAfter = hooks.afterEach((event) => {
+    if (!filter(event.name)) {
+      return;
+    }
+    if (options.group) {
+      console.groupCollapsed(event.name);
+    }
+    if (options.inspect) {
+      console.timeLog(logPrefix(event), event.args);
+    } else {
+      console.timeEnd(logPrefix(event));
+    }
+    if (options.group) {
+      console.groupEnd();
+    }
+    _idCtr[event.name]--;
+  });
+  return {
+    close: () => {
+      unsubscribeBefore();
+      unsubscribeAfter();
+    }
+  };
+}
+
 exports.Hookable = Hookable;
 exports.createDebugger = createDebugger;
 exports.createHooks = createHooks;

package/dist/index.d.ts

@@ -34,24 +34,6 @@ declare type NestedHooks<T> = (Partial<StripGeneric<T>> | Partial<OnlyGeneric<T>
 }> & Partial<{
     [key in BareHooks<StripGeneric<T>>]: T[key];
 }>;
-interface CreateDebuggerOptions {
-    /** An optional tag to prefix console logs with */
-    tag?: string;
-    /**
-     * Show hook params to the console output
-     *
-     * Enabled for browsers by default
-     */
-    inspect?: boolean;
-    /**
-     * Use group/groupEnd wrapper around logs happening during a specific hook
-     *
-     * Enabled for browsers by default
-     */
-    group?: boolean;
-    /** Filter which hooks to enable debugger for. Can be a string prefix or fn. */
-    filter?: string | ((event: string) => boolean);
-}
 
 declare type InferCallback<HT, HN extends keyof HT> = HT[HN] extends HookCallback ? HT[HN] : never;
 declare type InferSpyEvent<HT extends Record<string, any>> = {
@@ -90,8 +72,27 @@ declare function mergeHooks<T>(...hooks: NestedHooks<T>[]): T;
 declare function serial<T>(tasks: T[], fn: (task: T) => Promise<any> | any): Promise<any>;
 declare function serialCaller(hooks: HookCallback[], args?: any[]): Promise<any>;
 declare function parallelCaller(hooks: HookCallback[], args?: any[]): Promise<any[]>;
+
+interface CreateDebuggerOptions {
+    /** An optional tag to prefix console logs with */
+    tag?: string;
+    /**
+     * Show hook params to the console output
+     *
+     * Enabled for browsers by default
+     */
+    inspect?: boolean;
+    /**
+     * Use group/groupEnd wrapper around logs happening during a specific hook
+     *
+     * Enabled for browsers by default
+     */
+    group?: boolean;
+    /** Filter which hooks to enable debugger for. Can be a string prefix or fn. */
+    filter?: string | ((event: string) => boolean);
+}
 /** Start debugging hook names and timing in console */
-declare function createDebugger(hooks: Hookable, _options?: CreateDebuggerOptions): {
+declare function createDebugger(hooks: Hookable<any>, _options?: CreateDebuggerOptions): {
     /** Stop debugging and remove listeners */
     close: () => void;
 };

package/dist/index.mjs

@@ -46,46 +46,6 @@ function callEachWith(callbacks, arg0) {
     cb(arg0);
   }
 }
-const isBrowser = typeof window !== "undefined";
-function createDebugger(hooks, _options = {}) {
-  const options = {
-    inspect: isBrowser,
-    group: isBrowser,
-    filter: () => true,
-    ..._options
-  };
-  const _filter = options.filter;
-  const filter = typeof _filter === "string" ? (name) => name.startsWith(_filter) : _filter;
-  const logPrefix = options.tag ? `[${options.tag}] ` : "";
-  const unsubscribeBefore = hooks.beforeEach(({ name }) => {
-    if (!filter(name)) {
-      return;
-    }
-    console.time(logPrefix + name);
-  });
-  const unsubscribeAfter = hooks.afterEach(({ name, args }) => {
-    if (!filter(name)) {
-      return;
-    }
-    if (options.group) {
-      console.groupCollapsed(name);
-    }
-    if (options.inspect) {
-      console.timeLog(logPrefix + name, args);
-    } else {
-      console.timeEnd(logPrefix + name);
-    }
-    if (options.group) {
-      console.groupEnd();
-    }
-  });
-  return {
-    close: () => {
-      unsubscribeBefore();
-      unsubscribeAfter();
-    }
-  };
-}
 
 class Hookable {
   constructor() {
@@ -194,12 +154,12 @@ class Hookable {
     const result = caller(this._hooks[name] || [], args);
     if (result instanceof Promise) {
       return result.finally(() => {
-        if (this._after) {
+        if (this._after && event) {
           callEachWith(this._after, event);
         }
       });
     }
-    if (this._after) {
+    if (this._after && event) {
       callEachWith(this._after, event);
     }
     return result;
@@ -229,4 +189,50 @@ function createHooks() {
   return new Hookable();
 }
 
+const isBrowser = typeof window !== "undefined";
+function createDebugger(hooks, _options = {}) {
+  const options = {
+    inspect: isBrowser,
+    group: isBrowser,
+    filter: () => true,
+    ..._options
+  };
+  const _filter = options.filter;
+  const filter = typeof _filter === "string" ? (name) => name.startsWith(_filter) : _filter;
+  const _tag = options.tag ? `[${options.tag}] ` : "";
+  const logPrefix = (event) => _tag + event.name + "".padEnd(event._id, "\0");
+  const _idCtr = {};
+  const unsubscribeBefore = hooks.beforeEach((event) => {
+    if (!filter(event.name)) {
+      return;
+    }
+    _idCtr[event.name] = _idCtr[event.name] || 0;
+    event._id = _idCtr[event.name]++;
+    console.time(logPrefix(event));
+  });
+  const unsubscribeAfter = hooks.afterEach((event) => {
+    if (!filter(event.name)) {
+      return;
+    }
+    if (options.group) {
+      console.groupCollapsed(event.name);
+    }
+    if (options.inspect) {
+      console.timeLog(logPrefix(event), event.args);
+    } else {
+      console.timeEnd(logPrefix(event));
+    }
+    if (options.group) {
+      console.groupEnd();
+    }
+    _idCtr[event.name]--;
+  });
+  return {
+    close: () => {
+      unsubscribeBefore();
+      unsubscribeAfter();
+    }
+  };
+}
+
 export { Hookable, createDebugger, createHooks, flatHooks, mergeHooks, parallelCaller, serial, serialCaller };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hookable",
-  "version": "5.4.0",
+  "version": "5.4.1",
   "description": "Awaitable hook system",
   "keywords": [
     "hook",
@@ -22,14 +22,14 @@
     "dist"
   ],
   "devDependencies": {
-    "@nuxtjs/eslint-config-typescript": "latest",
-    "@vitest/coverage-c8": "^0.24.1",
-    "eslint": "latest",
+    "@nuxtjs/eslint-config-typescript": "^11.0.0",
+    "@vitest/coverage-c8": "^0.24.3",
+    "eslint": "^8.25.0",
     "expect-type": "^0.14.2",
-    "standard-version": "latest",
+    "standard-version": "^9.5.0",
     "typescript": "latest",
-    "unbuild": "latest",
-    "vitest": "latest"
+    "unbuild": "^0.8.2",
+    "vitest": "^0.24.3"
   },
   "packageManager": "pnpm@7.13.4",
   "scripts": {