fix(ui): simplify explorer filtering + fix nested tests when search matches a suite

packages/ui/client/composables/explorer/collapse.ts

@@ -1,7 +1,7 @@
 import type { UITaskTreeNode } from '~/composables/explorer/types'
 import { explorerTree } from '~/composables/explorer/index'
 import { openedTreeItems, treeFilter, uiEntries } from '~/composables/explorer/state'
-import { isFileNode, isParentNode } from '~/composables/explorer/utils'
+import { isFileNode, isParentNode, replaceSubtreeEntries } from '~/composables/explorer/utils'
 
 /**
  * Collapse all nodes: all children collapsed.
@@ -24,9 +24,10 @@ export function runCollapseNode(id: string) {
     return
   }
 
+  node.expanded = false
   const treeItems = new Set(openedTreeItems.value)
   treeItems.delete(node.id)
-  const entries = [...collectCollapseNode(node)]
+  const entries = replaceSubtreeEntries(uiEntries.value, node, [node])
   openedTreeItems.value = Array.from(treeItems)
   // Keep expandAll state as it is: collapsing individual shouldn't prevent collapsing all the nodes ("collapse all" button)
   // There is a watcher on composable search.ts to reset to undefined expandAll if there are no opened items
@@ -68,39 +69,3 @@ function collapseAllNodes(nodes: UITaskTreeNode[]) {
     }
   }
 }
-
-function* collectChildNodes(node: UITaskTreeNode, itself: boolean): Generator<string> {
-  if (itself) {
-    yield node.id
-  }
-
-  if (isParentNode(node)) {
-    for (let i = 0; i < node.tasks.length; i++) {
-      yield* collectChildNodes(node.tasks[i], true)
-    }
-  }
-}
-
-function* collectCollapseNode(node: UITaskTreeNode) {
-  const id = node.id
-  // collect children to remove from the list
-  const childNodes = new Set<string>(collectChildNodes(node, false))
-  for (let i = 0; i < uiEntries.value.length; i++) {
-    const child = uiEntries.value[i]
-    // collapse current node and return it
-    if (child.id === id) {
-      child.expanded = false
-      yield child
-      continue
-    }
-
-    // remove children from the list
-    if (childNodes.has(child.id)) {
-      childNodes.delete(child.id)
-      continue
-    }
-
-    // return the node
-    yield child
-  }
-}

packages/ui/client/composables/explorer/collector.ts

@@ -14,7 +14,7 @@ import type {
   SearchMatcher,
 } from '~/composables/explorer/types'
 import { toArray } from '@vitest/utils/helpers'
-import { client, findById } from '~/composables/client'
+import { client, config, findById } from '~/composables/client'
 import { testRunState } from '~/composables/client/state'
 import { expandNodesOnEndRun } from '~/composables/explorer/expand'
 import { runFilter, testMatcher } from '~/composables/explorer/filter'
@@ -128,14 +128,10 @@ export function runCollect(
   doRunFilter(search, filter, end)
 }
 
-function* collectRunningTodoTests() {
-  yield* uiEntries.value.filter(isRunningTestNode)
-}
-
 function updateRunningTodoTests() {
   const idMap = client.state.idMap
   let task: Task | undefined
-  for (const test of collectRunningTodoTests()) {
+  for (const test of uiEntries.value.filter(isRunningTestNode)) {
     // lookup the parent
     task = idMap.get(test.parentId)
     if (task && isSuite(task) && task.mode === 'todo') {
@@ -372,7 +368,7 @@ function collectTests(file: File, search: SearchMatcher = () => true, filter?: F
   } satisfies CollectFilteredTests
 
   for (const t of testsCollector(file)) {
-    if (!filter || testMatcher(t, search, filter)) {
+    if (!filter || testMatcher(t, search, filter, config.value.slowTestThreshold)) {
       data.total++
       if (isSlowTestTask(t)) {
         data.slow++
@@ -448,15 +444,17 @@ export function collectTestsTotalData(
   return filesSummary
 }
 
-function* testsCollector(suite: Arrayable<Task>): Generator<Test> {
+function testsCollector(suite: Arrayable<Task>, collectedTests: Test[] = []) {
   const arraySuites = toArray(suite)
   let s: Task
   for (let i = 0; i < arraySuites.length; i++) {
     s = arraySuites[i]
     if (s.type === 'test') {
-      yield s
+      collectedTests.push(s)
     } else {
-      yield* testsCollector(s.tasks)
+      testsCollector(s.tasks, collectedTests)
     }
   }
+
+  return collectedTests
 }

packages/ui/client/composables/explorer/expand.ts

@@ -1,13 +1,14 @@
 import type { Filter, SearchMatcher, UITaskTreeNode } from '~/composables/explorer/types'
-import { findById } from '~/composables/client'
-import { filterAll, filterNode } from '~/composables/explorer/filter'
+import { client, config } from '~/composables/client'
+import { filterNode, runFilter } from '~/composables/explorer/filter'
 import { explorerTree } from '~/composables/explorer/index'
-import { filteredFiles, openedTreeItems, treeFilter, uiEntries } from '~/composables/explorer/state'
+import { openedTreeItems, treeFilter, uiEntries } from '~/composables/explorer/state'
 import {
   createOrUpdateNode,
   createOrUpdateSuiteTask,
   isFileNode,
   isParentNode,
+  replaceSubtreeEntries,
 } from '~/composables/explorer/utils'
 
 /**
@@ -46,11 +47,15 @@ export function runExpandNode(id: string, search: SearchMatcher, filter: Filter)
 
   const treeItems = new Set(openedTreeItems.value)
   treeItems.add(node.id)
-  // collect children
-  // the first node is itself only when it is a file
-  const children = new Set(filterNode(node, search, filter))
+  const subtree = filterNode(node, {
+    nodes: explorerTree.nodes,
+    taskIdMap: client.state.idMap,
+    search,
+    filter,
+    slowTestThreshold: config.value.slowTestThreshold,
+  })
 
-  const entries = [...collectExpandedNode(node, children)]
+  const entries = replaceSubtreeEntries(uiEntries.value, node, subtree)
   openedTreeItems.value = Array.from(treeItems)
   // Keep expandAll state as it is: expanding individual shouldn't prevent expanding all the nodes ("expand all" button)
   // There is a watcher on composable search.ts to reset to undefined expandAll if there are no opened items
@@ -81,11 +86,9 @@ export function runExpandNode(id: string, search: SearchMatcher, filter: Filter)
  */
 export function runExpandAll(search: SearchMatcher, filter: Filter) {
   expandAllNodes(explorerTree.root.tasks, false)
-  const entries = [...filterAll(search, filter)]
   treeFilter.value.expandAll = false
   openedTreeItems.value = []
-  uiEntries.value = entries
-  filteredFiles.value = entries.filter(isFileNode).map((f) => findById(f.id)!)
+  runFilter(search, filter)
 }
 
 export function expandNodesOnEndRun(ids: Set<string>, end: boolean) {
@@ -113,32 +116,3 @@ function expandAllNodes(nodes: UITaskTreeNode[], updateState: boolean) {
     openedTreeItems.value = []
   }
 }
-
-/**
- * Build the complete next explorer entry list by emitting an expanded node and its filtered
- * subtree at the node's current position.
- *
- * `children` contains only entries produced by filtering the expanded subtree. This function
- * walks the complete current `uiEntries`. When it reaches `node`, it emits the node unless
- * `children` already contains it, followed by the children. Unrelated entries are copied
- * unchanged, while existing entries with the same IDs are skipped to avoid duplicates.
- *
- * TODO: Make this a pure splice over explicit entries and keep expansion state changes in
- * `runExpandNode`.
- */
-function* collectExpandedNode(node: UITaskTreeNode, children: Set<UITaskTreeNode>) {
-  const id = node.id
-  const ids = new Set(Array.from(children).map((n) => n.id))
-
-  for (const child of uiEntries.value) {
-    if (child.id === id) {
-      child.expanded = true
-      if (!ids.has(child.id)) {
-        yield node
-      }
-      yield* children
-    } else if (!ids.has(child.id)) {
-      yield child
-    }
-  }
-}