GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — fix(ui): simplify explorer filtering + fix nested tests when search m… · vitest-dev/vitest@a627be4

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • packages/ui/client/composables/explorer
    • collapse.ts
    • collector.ts
    • expand.ts
    • filter.ts
    • types.ts
    • utils.ts
  • test/ui/test
    • ui.spec.ts
Expand file treeCollapse file tree
Open diff view settings
Collapse file

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

Copy file name to clipboardExpand all lines: packages/ui/client/composables/explorer/collapse.ts
+3-38Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { UITaskTreeNode } from '~/composables/explorer/types'
22
import { explorerTree } from '~/composables/explorer/index'
33
import { openedTreeItems, treeFilter, uiEntries } from '~/composables/explorer/state'
4-
import { isFileNode, isParentNode } from '~/composables/explorer/utils'
4+
import { isFileNode, isParentNode, replaceSubtreeEntries } from '~/composables/explorer/utils'
55

66
/**
77
* Collapse all nodes: all children collapsed.
@@ -24,9 +24,10 @@ export function runCollapseNode(id: string) {
2424
return
2525
}
2626

27+
node.expanded = false
2728
const treeItems = new Set(openedTreeItems.value)
2829
treeItems.delete(node.id)
29-
const entries = [...collectCollapseNode(node)]
30+
const entries = replaceSubtreeEntries(uiEntries.value, node, [node])
3031
openedTreeItems.value = Array.from(treeItems)
3132
// Keep expandAll state as it is: collapsing individual shouldn't prevent collapsing all the nodes ("collapse all" button)
3233
// 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[]) {
6869
}
6970
}
7071
}
71-
72-
function* collectChildNodes(node: UITaskTreeNode, itself: boolean): Generator<string> {
73-
if (itself) {
74-
yield node.id
75-
}
76-
77-
if (isParentNode(node)) {
78-
for (let i = 0; i < node.tasks.length; i++) {
79-
yield* collectChildNodes(node.tasks[i], true)
80-
}
81-
}
82-
}
83-
84-
function* collectCollapseNode(node: UITaskTreeNode) {
85-
const id = node.id
86-
// collect children to remove from the list
87-
const childNodes = new Set<string>(collectChildNodes(node, false))
88-
for (let i = 0; i < uiEntries.value.length; i++) {
89-
const child = uiEntries.value[i]
90-
// collapse current node and return it
91-
if (child.id === id) {
92-
child.expanded = false
93-
yield child
94-
continue
95-
}
96-
97-
// remove children from the list
98-
if (childNodes.has(child.id)) {
99-
childNodes.delete(child.id)
100-
continue
101-
}
102-
103-
// return the node
104-
yield child
105-
}
106-
}
Collapse file

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

Copy file name to clipboardExpand all lines: packages/ui/client/composables/explorer/collector.ts
+8-10Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import type {
1414
SearchMatcher,
1515
} from '~/composables/explorer/types'
1616
import { toArray } from '@vitest/utils/helpers'
17-
import { client, findById } from '~/composables/client'
17+
import { client, config, findById } from '~/composables/client'
1818
import { testRunState } from '~/composables/client/state'
1919
import { expandNodesOnEndRun } from '~/composables/explorer/expand'
2020
import { runFilter, testMatcher } from '~/composables/explorer/filter'
@@ -128,14 +128,10 @@ export function runCollect(
128128
doRunFilter(search, filter, end)
129129
}
130130

131-
function* collectRunningTodoTests() {
132-
yield* uiEntries.value.filter(isRunningTestNode)
133-
}
134-
135131
function updateRunningTodoTests() {
136132
const idMap = client.state.idMap
137133
let task: Task | undefined
138-
for (const test of collectRunningTodoTests()) {
134+
for (const test of uiEntries.value.filter(isRunningTestNode)) {
139135
// lookup the parent
140136
task = idMap.get(test.parentId)
141137
if (task && isSuite(task) && task.mode === 'todo') {
@@ -372,7 +368,7 @@ function collectTests(file: File, search: SearchMatcher = () => true, filter?: F
372368
} satisfies CollectFilteredTests
373369

374370
for (const t of testsCollector(file)) {
375-
if (!filter || testMatcher(t, search, filter)) {
371+
if (!filter || testMatcher(t, search, filter, config.value.slowTestThreshold)) {
376372
data.total++
377373
if (isSlowTestTask(t)) {
378374
data.slow++
@@ -448,15 +444,17 @@ export function collectTestsTotalData(
448444
return filesSummary
449445
}
450446

451-
function* testsCollector(suite: Arrayable<Task>): Generator<Test> {
447+
function testsCollector(suite: Arrayable<Task>, collectedTests: Test[] = []) {
452448
const arraySuites = toArray(suite)
453449
let s: Task
454450
for (let i = 0; i < arraySuites.length; i++) {
455451
s = arraySuites[i]
456452
if (s.type === 'test') {
457-
yield s
453+
collectedTests.push(s)
458454
} else {
459-
yield* testsCollector(s.tasks)
455+
testsCollector(s.tasks, collectedTests)
460456
}
461457
}
458+
459+
return collectedTests
462460
}
Collapse file

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

Copy file name to clipboardExpand all lines: packages/ui/client/composables/explorer/expand.ts
+13-39Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import type { Filter, SearchMatcher, UITaskTreeNode } from '~/composables/explorer/types'
2-
import { findById } from '~/composables/client'
3-
import { filterAll, filterNode } from '~/composables/explorer/filter'
2+
import { client, config } from '~/composables/client'
3+
import { filterNode, runFilter } from '~/composables/explorer/filter'
44
import { explorerTree } from '~/composables/explorer/index'
5-
import { filteredFiles, openedTreeItems, treeFilter, uiEntries } from '~/composables/explorer/state'
5+
import { openedTreeItems, treeFilter, uiEntries } from '~/composables/explorer/state'
66
import {
77
createOrUpdateNode,
88
createOrUpdateSuiteTask,
99
isFileNode,
1010
isParentNode,
11+
replaceSubtreeEntries,
1112
} from '~/composables/explorer/utils'
1213

1314
/**
@@ -46,11 +47,15 @@ export function runExpandNode(id: string, search: SearchMatcher, filter: Filter)
4647

4748
const treeItems = new Set(openedTreeItems.value)
4849
treeItems.add(node.id)
49-
// collect children
50-
// the first node is itself only when it is a file
51-
const children = new Set(filterNode(node, search, filter))
50+
const subtree = filterNode(node, {
51+
nodes: explorerTree.nodes,
52+
taskIdMap: client.state.idMap,
53+
search,
54+
filter,
55+
slowTestThreshold: config.value.slowTestThreshold,
56+
})
5257

53-
const entries = [...collectExpandedNode(node, children)]
58+
const entries = replaceSubtreeEntries(uiEntries.value, node, subtree)
5459
openedTreeItems.value = Array.from(treeItems)
5560
// Keep expandAll state as it is: expanding individual shouldn't prevent expanding all the nodes ("expand all" button)
5661
// 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)
8186
*/
8287
export function runExpandAll(search: SearchMatcher, filter: Filter) {
8388
expandAllNodes(explorerTree.root.tasks, false)
84-
const entries = [...filterAll(search, filter)]
8589
treeFilter.value.expandAll = false
8690
openedTreeItems.value = []
87-
uiEntries.value = entries
88-
filteredFiles.value = entries.filter(isFileNode).map((f) => findById(f.id)!)
91+
runFilter(search, filter)
8992
}
9093

9194
export function expandNodesOnEndRun(ids: Set<string>, end: boolean) {
@@ -113,32 +116,3 @@ function expandAllNodes(nodes: UITaskTreeNode[], updateState: boolean) {
113116
openedTreeItems.value = []
114117
}
115118
}
116-
117-
/**
118-
* Build the complete next explorer entry list by emitting an expanded node and its filtered
119-
* subtree at the node's current position.
120-
*
121-
* `children` contains only entries produced by filtering the expanded subtree. This function
122-
* walks the complete current `uiEntries`. When it reaches `node`, it emits the node unless
123-
* `children` already contains it, followed by the children. Unrelated entries are copied
124-
* unchanged, while existing entries with the same IDs are skipped to avoid duplicates.
125-
*
126-
* TODO: Make this a pure splice over explicit entries and keep expansion state changes in
127-
* `runExpandNode`.
128-
*/
129-
function* collectExpandedNode(node: UITaskTreeNode, children: Set<UITaskTreeNode>) {
130-
const id = node.id
131-
const ids = new Set(Array.from(children).map((n) => n.id))
132-
133-
for (const child of uiEntries.value) {
134-
if (child.id === id) {
135-
child.expanded = true
136-
if (!ids.has(child.id)) {
137-
yield node
138-
}
139-
yield* children
140-
} else if (!ids.has(child.id)) {
141-
yield child
142-
}
143-
}
144-
}

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.