jest-doctor 2.0.7 → 2.0.9

package/dist/createEnvMixin.js

@@ -43,10 +43,6 @@ const createEnvMixin = (Environment) => {
         testPath;
         aggregatedReport;
         tearDownError;
-        promiseToAsyncId = new Map();
-        asyncRoot = 0;
-        asyncIdToParentId = new Map();
-        asyncIdToPromise = new Map();
         asyncStorage = new node_async_hooks_1.AsyncLocalStorage();
         testTimeout;
         constructor(config, context) {
@@ -103,11 +99,16 @@ const createEnvMixin = (Environment) => {
         async handleEvent(event, state) {
             const circusEvent = event;
             const circusState = state;
-            if (circusEvent.name === 'test_fn_start') {
+            if (circusEvent.name === 'test_start') {
                 if (this.options.timerIsolation === 'afterEach') {
                     this.currentAfterEachCount = (0, getAllAfterEach_1.default)(circusEvent.test.parent);
                 }
             }
+            else if (circusEvent.name === 'test_fn_start') {
+                if (this.options.timerIsolation === 'beforeEach') {
+                    this.currentAfterEachCount = (0, getAllAfterEach_1.default)(circusEvent.test.parent);
+                }
+            }
             else if (circusEvent.name === 'teardown') {
                 // the detector needs to be disabled here to avoid the teardown promise polluting the report
                 this.asyncHookDetector?.();

package/dist/patch/domListeners.js

@@ -22,6 +22,9 @@ const patchDOMListeners = (that, listenerOptions) => {
                         recordCapture === capture);
                 });
                 if (index !== -1) {
+                    if (options && options.signal) {
+                        options.signal.removeEventListener('abort', leak.domListeners[index].abort);
+                    }
                     leak.domListeners.splice(index, 1);
                 }
             }
@@ -31,20 +34,29 @@ const patchDOMListeners = (that, listenerOptions) => {
             if (leak) {
                 const stack = (0, getStack_1.default)(window.addEventListener);
                 if (!(0, isIgnored_1.default)(stack, listenerOptions.ignoreStack)) {
+                    const abort = () => {
+                        removeEventLeak(event, listener, options);
+                    };
                     leak.domListeners.push({
                         event: event,
                         listener,
                         stack,
                         options,
+                        abort,
                     });
+                    if (typeof options === 'object') {
+                        if (options.signal) {
+                            options.signal.addEventListener('abort', abort);
+                        }
+                        if (options.once) {
+                            return originalWindowAddEventListener(event, function (...args) {
+                                removeEventLeak(event, listener, options);
+                                listener.call(this, ...args);
+                            }, options);
+                        }
+                    }
                 }
             }
-            if (typeof options === 'object' && options.once) {
-                return originalWindowAddEventListener(event, function (...args) {
-                    removeEventLeak(event, listener, options);
-                    listener.call(this, ...args);
-                }, options);
-            }
             return originalWindowAddEventListener(event, listener, options);
         };
         const originalWindowRemoveEventListner = window.removeEventListener.bind(window);

package/dist/patch/timers.js

@@ -23,7 +23,7 @@ const patchTimers = (that) => {
                     callback();
                 });
                 leakRecord?.timers.set(timerId, {
-                    type: 'setImmediate',
+                    type: 'immediate',
                     stack,
                     isAllowed,
                 });

package/dist/types.d.ts

@@ -37,6 +37,7 @@ interface DOMListenerRecord {
         capture?: boolean;
     } | false | undefined;
     stack: string;
+    abort: () => void;
 }
 export interface LeakRecord {
     promises: Map<Promise<unknown>, PromiseRecord>;
@@ -47,7 +48,7 @@ export interface LeakRecord {
     fakeTimers: Map<number | NodeJS.Timeout | NodeJS.Immediate, TimerRecord>;
     domListeners: DOMListenerRecord[];
 }
-export type TimerIsolation = 'afterEach' | 'immediate';
+export type TimerIsolation = 'afterEach' | 'immediate' | 'beforeEach';
 export type ThrowOrWarn = 'throw' | 'warn';
 export type IsIgnored = Array<string | RegExp>;
 type RawIgnore = string | RegExp | Array<string | RegExp>;
@@ -129,7 +130,6 @@ export interface JestDoctorEnvironment extends JestEnvironment {
     currentAfterEachCount: number;
     options: NormalizedOptions;
     aggregatedReport: AggregatedReport;
-    asyncRoot: number;
     asyncStorage: AsyncLocalStorage<string>;
     testTimeout: number;
 }

package/dist/utils/analyzeCallback.js

@@ -22,28 +22,25 @@ const analyzeCallback = async (that, callback, testContext, timeout, isHook, tra
     const leakRecord = (0, initLeakRecord_1.default)(that, testName);
     let isRejected = false;
     let timerId;
-    return that.asyncStorage.run('ignored', () => {
-        return new Promise((resolve, reject) => {
-            timerId = setTimeout(() => {
-                isRejected = true;
-                reject(getTimeoutError(timeout, isHook, trace));
-            }, timeout);
-            void Promise.resolve(that.asyncStorage.run(testName, () => callback.call(testContext)))
-                .then((returnValue) => {
-                if (!isRejected) {
-                    (0, reportLeaks_1.default)(that, leakRecord);
-                    resolve(returnValue);
-                }
-            }, (reason) => {
-                isRejected = true;
-                reject(reason);
-            })
-                .catch(reject);
-        }).finally(() => {
-            clearTimeout(timerId);
-            that.asyncRoot = 0;
-            (0, cleanupAfterTest_1.default)(that, leakRecord, testName, isRejected);
-        });
+    return new Promise((resolve, reject) => {
+        timerId = setTimeout(() => {
+            isRejected = true;
+            reject(getTimeoutError(timeout, isHook, trace));
+        }, timeout);
+        void Promise.resolve(that.asyncStorage.run(testName, () => callback.call(testContext)))
+            .then((returnValue) => {
+            if (!isRejected) {
+                (0, reportLeaks_1.default)(that, leakRecord);
+                resolve(returnValue);
+            }
+        }, (reason) => {
+            isRejected = true;
+            reject(reason);
+        })
+            .catch(reject);
+    }).finally(() => {
+        clearTimeout(timerId);
+        (0, cleanupAfterTest_1.default)(that, leakRecord, testName, isRejected);
     });
 };
 exports.default = analyzeCallback;

package/dist/utils/cleanupAfterTest.js

@@ -15,9 +15,12 @@ const cleanupAfterTest = (that, leakRecord, testName, ignoreAfterEach = false) =
                 if (record.type === 'timeout') {
                     that.original.timer.clearTimeout(timerId);
                 }
-                else {
+                else if (record.type === 'interval') {
                     that.original.timer.clearInterval(timerId);
                 }
+                else {
+                    that.original.timer.clearImmediate(timerId);
+                }
             }
         }
         that.leakRecords.delete(testName);

package/dist/utils/normalizeOptions.js

@@ -105,7 +105,9 @@ const schema = zod
         .default(DEFAULTS.report),
     verbose: zod.boolean().default(false),
     delayThreshold: zod.int().gte(0).default(0),
-    timerIsolation: zod.enum(['afterEach', 'immediate']).default('afterEach'),
+    timerIsolation: zod
+        .enum(['afterEach', 'immediate', 'beforeEach'])
+        .default('afterEach'),
     clearTimers: zod.boolean().default(true),
 })
     .default(DEFAULTS);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-doctor",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "Custom Jest environment that detects async leaks between tests, enforces test isolation, and prevents flaky failures in CI.",
   "license": "MIT",
   "author": "Stephan Dum",
@@ -49,12 +49,12 @@
     "@testing-library/react": "^16.3.2",
     "@types/cross-spawn": "^6.0.6",
     "@types/jest": "^30.0.0",
-    "@types/node": "^25.2.3",
+    "@types/node": "^25.3.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "c8": "^10.1.3",
     "cross-spawn": "^7.0.6",
-    "eslint": "^9.39.2",
+    "eslint": "^10.0.0",
     "jest": "30.2.0",
     "jest-environment-jsdom": "^30.2.0",
     "jest-environment-node": "^30.2.0",