patch(vest): Add SuiteWalker

packages/vest/src/core/VestBus/VestBus.ts

@@ -1,3 +1,4 @@
+import { SuiteWalker } from 'SuiteWalker';
 import { CB, ValueOf } from 'vest-utils';
 import { Bus, RuntimeEvents, TIsolate } from 'vestjs-runtime';
 
@@ -29,11 +30,6 @@ export function useInitVestBus() {
     const { fieldName } = VestTest.getData(testObject);
 
     useRunFieldCallbacks(fieldName);
-
-    if (!TestWalker.hasRemainingTests()) {
-      // When no more tests are running, emit the done event
-      VestBus.emit(Events.ALL_RUNNING_TESTS_FINISHED);
-    }
   });
 
   on(Events.TEST_RUN_STARTED, () => {
@@ -54,6 +50,11 @@ export function useInitVestBus() {
     }
 
     CommonStateMachine.setDone(isolate);
+
+    if (!SuiteWalker.hasPending()) {
+      // When no more tests are running, emit the done event
+      VestBus.emit(Events.ALL_RUNNING_TESTS_FINISHED);
+    }
   });
 
   on(Events.DONE_TEST_OMISSION_PASS, () => {

packages/vest/src/core/isolate/IsolateTest/TestWalker.ts

@@ -16,22 +16,6 @@ export class TestWalker {
     return !Walker.has(root, VestTest.is);
   }
 
-  static someIncompleteTests(
-    predicate: (test: TIsolateTest) => boolean,
-    root: MaybeRoot = TestWalker.defaultRoot()
-  ): boolean {
-    if (!root) return false;
-    return Walker.some(
-      root,
-      isolate => {
-        VestTest.isX(isolate);
-
-        return VestTest.isPending(isolate) && predicate(isolate);
-      },
-      VestTest.is
-    );
-  }
-
   static someTests(
     predicate: (test: TIsolateTest) => boolean,
     root: MaybeRoot = TestWalker.defaultRoot()
@@ -78,15 +62,6 @@ export class TestWalker {
     );
   }
 
-  static hasRemainingTests(fieldName?: TFieldName): boolean {
-    return TestWalker.someIncompleteTests(testObject => {
-      if (fieldName) {
-        return matchingFieldName(VestTest.getData(testObject), fieldName);
-      }
-      return true;
-    });
-  }
-
   static pluckTests(
     predicate: (test: TIsolateTest) => boolean,
     root: MaybeRoot = TestWalker.defaultRoot()

packages/vest/src/core/isolate/IsolateTest/__tests__/hasRemainingTests.test.ts

@@ -1,9 +1,9 @@
 import wait from 'wait';
 
-import { TestWalker } from 'TestWalker';
+import { SuiteWalker } from 'SuiteWalker';
 import * as vest from 'vest';
 
-describe('TestWalker.hasRemainingTests', () => {
+describe('SuiteWalker.hasRemainingTests', () => {
   let hasRemaining: boolean | null = null;
   let count = 0;
 
@@ -15,7 +15,7 @@ describe('TestWalker.hasRemainingTests', () => {
     describe('When no remaining tests', () => {
       it('should return false', () => {
         vest.create(() => {
-          hasRemaining = TestWalker.hasRemainingTests();
+          hasRemaining = SuiteWalker.hasRemainingTests();
         })();
         expect(hasRemaining).toBe(false);
       });
@@ -27,7 +27,7 @@ describe('TestWalker.hasRemainingTests', () => {
           vest.test('f1', async () => {
             await wait(100);
           });
-          hasRemaining = TestWalker.hasRemainingTests();
+          hasRemaining = SuiteWalker.hasRemainingTests();
         })();
 
         expect(hasRemaining).toBe(true);
@@ -40,7 +40,7 @@ describe('TestWalker.hasRemainingTests', () => {
             await wait(100);
           });
           count++;
-          hasRemaining = TestWalker.hasRemainingTests();
+          hasRemaining = SuiteWalker.hasRemainingTests();
         });
         suite();
         suite();
@@ -58,7 +58,7 @@ describe('TestWalker.hasRemainingTests', () => {
             await wait(100);
           });
           count++;
-          hasRemaining = TestWalker.hasRemainingTests();
+          hasRemaining = SuiteWalker.hasRemainingTests();
         });
 
         suite();
@@ -73,7 +73,7 @@ describe('TestWalker.hasRemainingTests', () => {
     describe('When no remaining tests', () => {
       it('Should return false', () => {
         vest.create(() => {
-          hasRemaining = TestWalker.hasRemainingTests('f1');
+          hasRemaining = SuiteWalker.hasRemainingTests('f1');
         })();
         expect(hasRemaining).toBe(false);
       });
@@ -85,7 +85,7 @@ describe('TestWalker.hasRemainingTests', () => {
           vest.test('f1', async () => {
             await wait(100);
           });
-          hasRemaining = TestWalker.hasRemainingTests('f1');
+          hasRemaining = SuiteWalker.hasRemainingTests('f1');
         })();
         expect(hasRemaining).toBe(true);
       });
@@ -97,7 +97,7 @@ describe('TestWalker.hasRemainingTests', () => {
             await wait(100);
           });
           count++;
-          hasRemaining = TestWalker.hasRemainingTests('f1');
+          hasRemaining = SuiteWalker.hasRemainingTests('f1');
         });
         suite();
         suite();
@@ -116,8 +116,8 @@ describe('TestWalker.hasRemainingTests', () => {
           });
           count++;
           hasRemaining =
-            TestWalker.hasRemainingTests('f1') &&
-            TestWalker.hasRemainingTests('f2');
+            SuiteWalker.hasRemainingTests('f1') &&
+            SuiteWalker.hasRemainingTests('f2');
         });
 
         suite();

packages/vest/src/core/test/helpers/matchingFieldName.ts

@@ -16,3 +16,13 @@ export default function matchingFieldName(
 ): boolean {
   return !!(fieldName && WithFieldName.fieldName === fieldName);
 }
+
+export function matchesOrHasNoFieldName(
+  WithFieldName: WithFieldName<TFieldName>,
+  fieldName?: Maybe<TFieldName>
+): boolean {
+  if (fieldName) {
+    return matchingFieldName(WithFieldName, fieldName);
+  }
+  return true;
+}

packages/vest/src/suite/SuiteWalker.ts

@@ -0,0 +1,35 @@
+import { Predicates, type Predicate } from 'vest-utils';
+import { TIsolate, VestRuntime, Walker } from 'vestjs-runtime';
+
+import { CommonStates } from 'CommonStateMachine';
+import { TIsolateTest } from 'IsolateTest';
+import { TFieldName } from 'SuiteResultTypes';
+import { VestTest } from 'VestTest';
+import { matchesOrHasNoFieldName } from 'matchingFieldName';
+
+export class SuiteWalker {
+  static defaultRoot = VestRuntime.useAvailableRoot;
+
+  static hasPending(predicate?: Predicate): boolean {
+    const root = SuiteWalker.defaultRoot();
+
+    if (!root) {
+      return false;
+    }
+
+    return Walker.some(root, (isolate: TIsolate) => {
+      return (
+        (isolate.status === CommonStates.PENDING && predicate?.(isolate)) ??
+        true
+      );
+    });
+  }
+
+  static hasRemainingTests(fieldName?: TFieldName): boolean {
+    return SuiteWalker.hasPending(
+      Predicates.all(VestTest.is, (testObject: TIsolateTest) => {
+        return matchesOrHasNoFieldName(VestTest.getData(testObject), fieldName);
+      })
+    );
+  }
+}

packages/vest/src/suite/runCallbacks.ts

@@ -2,7 +2,7 @@ import { isArray, callEach } from 'vest-utils';
 
 import { useDoneCallbacks, useFieldCallbacks } from 'Runtime';
 import { TFieldName } from 'SuiteResultTypes';
-import { TestWalker } from 'TestWalker';
+import { SuiteWalker } from 'SuiteWalker';
 
 /**
  * Runs done callback per field when async tests are finished running.
@@ -12,7 +12,7 @@ export function useRunFieldCallbacks(fieldName?: TFieldName): void {
 
   if (
     fieldName &&
-    !TestWalker.hasRemainingTests(fieldName) &&
+    !SuiteWalker.hasRemainingTests(fieldName) &&
     isArray(fieldCallbacks[fieldName])
   ) {
     callEach(fieldCallbacks[fieldName]);

packages/vest/src/suiteResult/selectors/shouldAddValidProperty.ts

@@ -1,4 +1,6 @@
+import { SuiteWalker } from 'SuiteWalker';
 import { useIsOptionalFieldApplied } from 'optional';
+import { Predicates } from 'vest-utils';
 import { VestRuntime } from 'vestjs-runtime';
 
 import { SuiteOptionalFields, TIsolateSuite } from 'IsolateSuite';
@@ -62,30 +64,31 @@ export function useShouldAddValidPropertyInGroup(
 
 // Does the given field have any pending tests that are not optional?
 function useHasNonOptionalIncomplete(fieldName?: TFieldName) {
-  return TestWalker.someIncompleteTests(testObject => {
-    if (nonMatchingFieldName(VestTest.getData(testObject), fieldName)) {
-      return false;
-    }
-    return !useIsOptionalFieldApplied(fieldName);
-  });
+  return SuiteWalker.hasPending(
+    Predicates.all(
+      VestTest.is,
+      (testObject: TIsolateTest) =>
+        !nonMatchingFieldName(VestTest.getData(testObject), fieldName),
+      () => !useIsOptionalFieldApplied(fieldName)
+    )
+  );
 }
 
 // Do the given group/field have any pending tests that are not optional?
 function useHasNonOptionalIncompleteByGroup(
   groupName: TGroupName,
   fieldName: TFieldName
 ): boolean {
-  return TestWalker.someIncompleteTests(testObject => {
-    if (nonMatchingGroupName(testObject, groupName)) {
-      return false;
-    }
-
-    if (nonMatchingFieldName(VestTest.getData(testObject), fieldName)) {
-      return false;
-    }
-
-    return !useIsOptionalFieldApplied(fieldName);
-  });
+  return SuiteWalker.hasPending(
+    Predicates.all(
+      VestTest.is,
+      (testObject: TIsolateTest) =>
+        !nonMatchingGroupName(testObject, groupName),
+      (testObject: TIsolateTest) =>
+        !nonMatchingFieldName(VestTest.getData(testObject), fieldName),
+      () => !useIsOptionalFieldApplied(fieldName)
+    )
+  );
 }
 
 // Did all of the tests for the provided field run/omit?

packages/vest/src/suiteResult/suiteRunResult.ts

@@ -1,3 +1,4 @@
+import { SuiteWalker } from 'SuiteWalker';
 import { assign } from 'vest-utils';
 import { VestRuntime } from 'vestjs-runtime';
 
@@ -7,7 +8,6 @@ import {
   TFieldName,
   TGroupName,
 } from 'SuiteResultTypes';
-import { TestWalker } from 'TestWalker';
 import { useDeferDoneCallback } from 'deferDoneCallback';
 import { shouldSkipDoneRegistration } from 'shouldSkipDoneRegistration';
 import { useCreateSuiteResult } from 'suiteResult';
@@ -43,7 +43,7 @@ function done<F extends TFieldName, G extends TGroupName>(
     return output;
   }
   const useDoneCallback = () => callback(useCreateSuiteResult());
-  if (!TestWalker.hasRemainingTests(fieldName)) {
+  if (!SuiteWalker.hasRemainingTests(fieldName)) {
     useDoneCallback();
     return output;
   }