@svgrid/grid 2.6.20 → 2.6.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +62 -0
- package/README.md +22 -0
- package/dist/GridMenus.svelte +17 -12
- package/dist/SvGrid.controller.svelte.d.ts +14 -8
- package/dist/SvGrid.controller.svelte.js +214 -74
- package/dist/SvGrid.css +1 -1
- package/dist/SvGrid.svelte +112 -57
- package/dist/SvGrid.types.d.ts +191 -1
- package/dist/ai.d.ts +28 -0
- package/dist/ai.js +6 -0
- package/dist/cdn/{GridMenus-B0F9iBrG.js → GridMenus-BuoBPqxx.js} +137 -132
- package/dist/cdn/GridMenus-n4llxoOI.js +494 -0
- package/dist/cdn/column-resize-DsfNXMom.js +102 -0
- package/dist/cdn/row-resize-BRcimkUT.js +95 -0
- package/dist/cdn/{src-Cd0tearp.js → src-C9Hihx1W.js} +3497 -3487
- package/dist/cdn/{src-B1TdiyS8.js → src-D1lXwq1l.js} +8258 -8248
- package/dist/cdn/svgrid.js +10 -8
- package/dist/cdn/svgrid.svelte-external.js +10 -8
- package/dist/cdn/validate-_CDJzgIo.js +75 -0
- package/dist/cell-formatting.d.ts +2 -0
- package/dist/cell-formatting.js +2 -0
- package/dist/chart-export.d.ts +1 -0
- package/dist/chart.d.ts +31 -5
- package/dist/chart.js +9 -3
- package/dist/column-groups.js +1 -1
- package/dist/column-resize.d.ts +46 -0
- package/dist/column-resize.js +205 -0
- package/dist/columns.d.ts +0 -3
- package/dist/columns.js +0 -57
- package/dist/core.d.ts +216 -4
- package/dist/core.js +532 -119
- package/dist/createTree.svelte.d.ts +3 -0
- package/dist/createTree.svelte.js +1 -0
- package/dist/datetime/date-core.d.ts +2 -0
- package/dist/datetime/date-restrict.d.ts +1 -0
- package/dist/datetime/timezone.d.ts +1 -0
- package/dist/dock-manager-model.d.ts +3 -0
- package/dist/dock-manager-model.js +1 -0
- package/dist/dock-model.d.ts +6 -0
- package/dist/dock-model.js +3 -0
- package/dist/editor-contract.d.ts +1 -0
- package/dist/filtering/excel-filters.js +28 -0
- package/dist/group-display.d.ts +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +6 -0
- package/dist/list-option.d.ts +1 -0
- package/dist/menus.js +1 -1
- package/dist/positioning.d.ts +2 -0
- package/dist/row-resize.d.ts +11 -0
- package/dist/row-resize.js +7 -1
- package/dist/scheduler-ical.d.ts +1 -0
- package/dist/scheduler-model.d.ts +1 -0
- package/dist/selection.js +9 -0
- package/dist/spreadsheet.d.ts +1 -1
- package/dist/spreadsheet.js +1 -1
- package/dist/summaries.js +22 -0
- package/dist/svgrid-wrapper.types.d.ts +5 -0
- package/dist/toast-store.svelte.d.ts +4 -0
- package/dist/validate.d.ts +50 -0
- package/dist/validate.js +187 -0
- package/package.json +4 -1
- package/src/GridMenus.svelte +17 -12
- package/src/SvGrid.controller.svelte.ts +223 -76
- package/src/SvGrid.css +1 -1
- package/src/SvGrid.svelte +112 -57
- package/src/SvGrid.types.ts +191 -1
- package/src/ai.ts +28 -0
- package/src/cell-formatting.ts +2 -0
- package/src/chart-export.ts +1 -0
- package/src/chart.ts +31 -5
- package/src/column-groups.ts +1 -1
- package/src/column-resize.test.ts +381 -0
- package/src/column-resize.ts +227 -0
- package/src/columns.test.ts +0 -103
- package/src/columns.ts +0 -58
- package/src/core.aggregate.test.ts +134 -0
- package/src/core.filter.test.ts +156 -0
- package/src/core.grouping.test.ts +146 -0
- package/src/core.row-shape.test.ts +119 -0
- package/src/core.rowmodel-cache.test.ts +121 -0
- package/src/core.sort.test.ts +293 -0
- package/src/core.ts +723 -119
- package/src/createTree.svelte.ts +3 -0
- package/src/datetime/date-core.ts +2 -0
- package/src/datetime/date-restrict.ts +1 -0
- package/src/datetime/timezone.ts +1 -0
- package/src/dock-manager-model.ts +3 -0
- package/src/dock-model.ts +6 -0
- package/src/editor-contract.ts +1 -0
- package/src/filtering/excel-filters.ts +30 -0
- package/src/filtering/normalize-fast-path.test.ts +104 -0
- package/src/group-display.ts +1 -1
- package/src/index.ts +12 -1
- package/src/list-option.ts +1 -0
- package/src/menus.ts +1 -1
- package/src/positioning.ts +2 -0
- package/src/resize-props.test.ts +361 -0
- package/src/row-resize.test.ts +31 -0
- package/src/row-resize.ts +21 -3
- package/src/scheduler-ical.ts +1 -0
- package/src/scheduler-model.ts +1 -0
- package/src/selection.ts +9 -0
- package/src/spreadsheet.ts +1 -1
- package/src/summaries.ts +21 -0
- package/src/svgrid-wrapper.types.ts +5 -0
- package/src/svgrid.summaries.test.ts +217 -0
- package/src/toast-store.svelte.ts +4 -0
- package/src/validate.test.ts +207 -0
- package/src/validate.ts +269 -0
- package/dist/cdn/GridMenus-IHK_l7m6.js +0 -489
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The public shape of a `Row`.
|
|
3
|
+
*
|
|
4
|
+
* Rows were rewritten from object literals with per-row closures to objects
|
|
5
|
+
* carrying shared `this`-based methods, which cut mount allocation from 56.5 MB
|
|
6
|
+
* to 14.5 MB. Those shared methods need a pointer back to the table, and the
|
|
7
|
+
* first version stored it as a plain `_ctx` property - which made every row
|
|
8
|
+
* serialise the whole grid, because `options.data` is reachable through it.
|
|
9
|
+
* `JSON.stringify(oneRow)` grew with the dataset: 981 characters at 3 rows,
|
|
10
|
+
* 67,719 at 3,000. Stringifying a row model was quadratic.
|
|
11
|
+
*
|
|
12
|
+
* The fix is to key the internals with symbols: invisible to `JSON.stringify`,
|
|
13
|
+
* `Object.keys` and `for...in`, but still copied by object spread, which
|
|
14
|
+
* several row models rely on when they do `{ ...row, depth }`.
|
|
15
|
+
*
|
|
16
|
+
* These tests pin all four of those properties. `Row` is public API and its
|
|
17
|
+
* observable shape is part of the contract.
|
|
18
|
+
*/
|
|
19
|
+
import { describe, expect, it } from 'vitest'
|
|
20
|
+
import {
|
|
21
|
+
createCoreRowModel,
|
|
22
|
+
createGroupedRowModel,
|
|
23
|
+
createSvGridCore,
|
|
24
|
+
columnGroupingFeature,
|
|
25
|
+
tableFeatures,
|
|
26
|
+
type ColumnDef,
|
|
27
|
+
} from './core'
|
|
28
|
+
|
|
29
|
+
type Data = Record<string, unknown>
|
|
30
|
+
|
|
31
|
+
function makeGrid(count: number, grouping: string[] = []) {
|
|
32
|
+
const data: Data[] = Array.from({ length: count }, (_, i) => ({
|
|
33
|
+
name: `row-${i}`,
|
|
34
|
+
score: i,
|
|
35
|
+
bucket: i % 2 === 0 ? 'even' : 'odd',
|
|
36
|
+
}))
|
|
37
|
+
return createSvGridCore({
|
|
38
|
+
_features: tableFeatures({ columnGroupingFeature }),
|
|
39
|
+
_rowModels: grouping.length
|
|
40
|
+
? { coreRowModel: createCoreRowModel(), groupedRowModel: createGroupedRowModel() }
|
|
41
|
+
: { coreRowModel: createCoreRowModel() },
|
|
42
|
+
columns: [{ field: 'name' }, { field: 'score' }, { field: 'bucket' }] as unknown as Array<
|
|
43
|
+
ColumnDef<ReturnType<typeof tableFeatures>, Data>
|
|
44
|
+
>,
|
|
45
|
+
data,
|
|
46
|
+
state: { grouping },
|
|
47
|
+
onGroupingChange: () => {},
|
|
48
|
+
})
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
const PUBLIC_KEYS = [
|
|
52
|
+
'id',
|
|
53
|
+
'index',
|
|
54
|
+
'original',
|
|
55
|
+
'depth',
|
|
56
|
+
'getCanExpand',
|
|
57
|
+
'getIsExpanded',
|
|
58
|
+
'toggleExpanded',
|
|
59
|
+
'getIsSelected',
|
|
60
|
+
'toggleSelected',
|
|
61
|
+
'getAllCells',
|
|
62
|
+
'getCellValueByColumnId',
|
|
63
|
+
]
|
|
64
|
+
|
|
65
|
+
describe('Row public shape', () => {
|
|
66
|
+
it('exposes exactly the documented keys, with no internals', () => {
|
|
67
|
+
const row = makeGrid(10).getRowModel().rows[0]!
|
|
68
|
+
expect(Object.keys(row).sort()).toEqual([...PUBLIC_KEYS].sort())
|
|
69
|
+
})
|
|
70
|
+
|
|
71
|
+
it('does not leak internals through for...in', () => {
|
|
72
|
+
const row = makeGrid(10).getRowModel().rows[0]!
|
|
73
|
+
const seen: string[] = []
|
|
74
|
+
for (const k in row) seen.push(k)
|
|
75
|
+
expect(seen.sort()).toEqual([...PUBLIC_KEYS].sort())
|
|
76
|
+
})
|
|
77
|
+
|
|
78
|
+
it('serialises to a constant size regardless of dataset size', () => {
|
|
79
|
+
// The regression this guards: `_ctx` reached `options.data`, so a single
|
|
80
|
+
// row carried the entire grid into JSON. Sizes must not grow with count.
|
|
81
|
+
const sizes = [10, 100, 1000].map(
|
|
82
|
+
(n) => JSON.stringify(makeGrid(n).getRowModel().rows[0]).length,
|
|
83
|
+
)
|
|
84
|
+
expect(new Set(sizes).size).toBe(1)
|
|
85
|
+
// And it must stay small - this is 4 scalar fields, not a grid.
|
|
86
|
+
expect(sizes[0]!).toBeLessThan(200)
|
|
87
|
+
})
|
|
88
|
+
|
|
89
|
+
it('serialises a whole row model linearly, not quadratically', () => {
|
|
90
|
+
const small = JSON.stringify(makeGrid(50).getRowModel().rows).length
|
|
91
|
+
const large = JSON.stringify(makeGrid(500).getRowModel().rows).length
|
|
92
|
+
// Ten times the rows should cost about ten times the characters. Quadratic
|
|
93
|
+
// growth would put this well past 20x.
|
|
94
|
+
expect(large).toBeLessThan(small * 20)
|
|
95
|
+
})
|
|
96
|
+
|
|
97
|
+
it('survives an object spread with its methods intact', () => {
|
|
98
|
+
// `createGroupedRowModel` does `{ ...row, depth }` for leaf rows; the clone
|
|
99
|
+
// has to keep working, which is why the internals are symbol-keyed rather
|
|
100
|
+
// than non-enumerable.
|
|
101
|
+
const row = makeGrid(10).getRowModel().rows[0]!
|
|
102
|
+
const clone = { ...row, depth: 3 }
|
|
103
|
+
expect(clone.depth).toBe(3)
|
|
104
|
+
expect(typeof clone.getCellValueByColumnId).toBe('function')
|
|
105
|
+
expect(clone.getCellValueByColumnId('name')).toBe(row.getCellValueByColumnId('name'))
|
|
106
|
+
expect(clone.getIsSelected()).toBe(false)
|
|
107
|
+
// The clone must not have grown a public surface either.
|
|
108
|
+
expect(Object.keys(clone).sort()).toEqual([...PUBLIC_KEYS].sort())
|
|
109
|
+
})
|
|
110
|
+
|
|
111
|
+
it('keeps grouped leaf rows working after the model clones them', () => {
|
|
112
|
+
const rows = makeGrid(10, ['bucket']).getRowModel().rows
|
|
113
|
+
const group = rows[0]!
|
|
114
|
+
expect(group.subRows?.length).toBeGreaterThan(0)
|
|
115
|
+
const leaf = group.subRows![0]!
|
|
116
|
+
expect(leaf.getCellValueByColumnId('name')).toMatch(/^row-\d+$/)
|
|
117
|
+
expect(leaf.depth).toBe(1)
|
|
118
|
+
})
|
|
119
|
+
})
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Row-model memo invalidation.
|
|
3
|
+
*
|
|
4
|
+
* `getRowModel()` caches on the identity of the data, the columns, and a set of
|
|
5
|
+
* state slices. `rowSelection` was one of those slices, so ticking a single
|
|
6
|
+
* checkbox on a 100k-row grid re-ran the whole pipeline - re-filtering and
|
|
7
|
+
* re-sorting the entire dataset - to produce a row array that was, by
|
|
8
|
+
* construction, identical. Measured at 5 full re-runs for 5 toggles
|
|
9
|
+
* (`pnpm bench --case=selection-toggle`).
|
|
10
|
+
*
|
|
11
|
+
* Nothing in the pipeline reads selection. The two consumers, `getIsSelected`
|
|
12
|
+
* on data rows (core.ts) and on group rows, are closures that read
|
|
13
|
+
* `store.state` when called, so they see a selection change without the model
|
|
14
|
+
* being rebuilt. That is what the last test here pins: dropping the slice must
|
|
15
|
+
* not make a selected row report the wrong thing.
|
|
16
|
+
*/
|
|
17
|
+
import { describe, expect, it } from 'vitest'
|
|
18
|
+
import {
|
|
19
|
+
createCoreRowModel,
|
|
20
|
+
createFilteredRowModel,
|
|
21
|
+
createSortedRowModel,
|
|
22
|
+
createSvGridCore,
|
|
23
|
+
rowSelectionFeature,
|
|
24
|
+
tableFeatures,
|
|
25
|
+
type ColumnDef,
|
|
26
|
+
type RowModelFactory,
|
|
27
|
+
} from './core'
|
|
28
|
+
|
|
29
|
+
type Row = { id: number; name: string; score: number }
|
|
30
|
+
|
|
31
|
+
const COLUMNS = [
|
|
32
|
+
{ field: 'id', editorType: 'number' },
|
|
33
|
+
{ field: 'name' },
|
|
34
|
+
{ field: 'score', editorType: 'number' },
|
|
35
|
+
]
|
|
36
|
+
|
|
37
|
+
function makeRows(n: number): Row[] {
|
|
38
|
+
return Array.from({ length: n }, (_, i) => ({
|
|
39
|
+
id: i,
|
|
40
|
+
name: `name-${(i * 7919) % n}`,
|
|
41
|
+
score: (i * 31) % 1000,
|
|
42
|
+
}))
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** Wrap a stage so we can count how many times the pipeline actually ran it. */
|
|
46
|
+
function counted<T extends Row>(factory: RowModelFactory<T>, tally: { n: number }): RowModelFactory<T> {
|
|
47
|
+
return (args) => {
|
|
48
|
+
tally.n++
|
|
49
|
+
return factory(args)
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
function makeGrid(rows: Row[], tallies: { filter: { n: number }; sort: { n: number } }) {
|
|
54
|
+
return createSvGridCore({
|
|
55
|
+
_features: tableFeatures({ rowSelectionFeature }),
|
|
56
|
+
_rowModels: {
|
|
57
|
+
coreRowModel: createCoreRowModel(),
|
|
58
|
+
filteredRowModel: counted(createFilteredRowModel<Row>(), tallies.filter),
|
|
59
|
+
sortedRowModel: counted(createSortedRowModel<Row>(), tallies.sort),
|
|
60
|
+
},
|
|
61
|
+
columns: COLUMNS as unknown as Array<ColumnDef<ReturnType<typeof tableFeatures>, Row>>,
|
|
62
|
+
data: rows,
|
|
63
|
+
state: {
|
|
64
|
+
columnFilters: [{ id: 'name', value: 'name-' }],
|
|
65
|
+
sorting: [{ id: 'score', desc: false }],
|
|
66
|
+
rowSelection: {},
|
|
67
|
+
},
|
|
68
|
+
})
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
describe('row-model cache: selection', () => {
|
|
72
|
+
it('does not re-run the pipeline when only the selection changes', () => {
|
|
73
|
+
const tallies = { filter: { n: 0 }, sort: { n: 0 } }
|
|
74
|
+
const grid = makeGrid(makeRows(500), tallies)
|
|
75
|
+
|
|
76
|
+
grid.getRowModel() // first build - expected to run
|
|
77
|
+
const after = { filter: tallies.filter.n, sort: tallies.sort.n }
|
|
78
|
+
expect(after.filter).toBe(1)
|
|
79
|
+
expect(after.sort).toBe(1)
|
|
80
|
+
|
|
81
|
+
for (let i = 0; i < 5; i++) {
|
|
82
|
+
grid.setRowSelection((prev) => ({ ...prev, [String(i)]: true }))
|
|
83
|
+
grid.getRowModel()
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
expect(tallies.filter.n - after.filter).toBe(0)
|
|
87
|
+
expect(tallies.sort.n - after.sort).toBe(0)
|
|
88
|
+
})
|
|
89
|
+
|
|
90
|
+
it('still re-runs when a slice the pipeline DOES read changes', () => {
|
|
91
|
+
const tallies = { filter: { n: 0 }, sort: { n: 0 } }
|
|
92
|
+
const grid = makeGrid(makeRows(200), tallies)
|
|
93
|
+
grid.getRowModel()
|
|
94
|
+
const before = tallies.sort.n
|
|
95
|
+
|
|
96
|
+
// No `setSorting` on the core - sorting is driven through the store (or a
|
|
97
|
+
// column's `toggleSorting`), which is also how <SvGrid> does it.
|
|
98
|
+
grid.store.setState((prev) => ({ ...prev, sorting: [{ id: 'score', desc: true }] }))
|
|
99
|
+
grid.getRowModel()
|
|
100
|
+
|
|
101
|
+
expect(tallies.sort.n).toBeGreaterThan(before)
|
|
102
|
+
})
|
|
103
|
+
|
|
104
|
+
it('reports selection correctly even though the model was not rebuilt', () => {
|
|
105
|
+
const tallies = { filter: { n: 0 }, sort: { n: 0 } }
|
|
106
|
+
const grid = makeGrid(makeRows(50), tallies)
|
|
107
|
+
|
|
108
|
+
const rows = grid.getRowModel().rows
|
|
109
|
+
const target = rows[3]!
|
|
110
|
+
expect(target.getIsSelected()).toBe(false)
|
|
111
|
+
|
|
112
|
+
grid.setRowSelection((prev) => ({ ...prev, [target.id]: true }))
|
|
113
|
+
|
|
114
|
+
// Same row object, no rebuild - the closure must observe the new state.
|
|
115
|
+
expect(grid.getRowModel().rows[3]).toBe(target)
|
|
116
|
+
expect(target.getIsSelected()).toBe(true)
|
|
117
|
+
|
|
118
|
+
grid.setRowSelection(() => ({}))
|
|
119
|
+
expect(target.getIsSelected()).toBe(false)
|
|
120
|
+
})
|
|
121
|
+
})
|
|
@@ -0,0 +1,293 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Equivalence + work-budget tests for `createSortedRowModel`.
|
|
3
|
+
*
|
|
4
|
+
* The sort path was rewritten to stop resolving the clause's column inside the
|
|
5
|
+
* comparator: it used to call `table.getAllColumns().find(...)` once per
|
|
6
|
+
* comparison per clause, which is ~1.5M array scans for a single-clause sort of
|
|
7
|
+
* 100k rows (measured - see `pnpm bench --case=sort-1col`).
|
|
8
|
+
*
|
|
9
|
+
* A faster sort that orders rows differently is a bug, not an optimisation, and
|
|
10
|
+
* ordering has a lot of edges: nulls, undefined, unparseable dates, mixed
|
|
11
|
+
* types, ties that must stay stable, and custom comparators. So rather than
|
|
12
|
+
* snapshot the new output, `referenceSort` below is a literal transcription of
|
|
13
|
+
* the ORIGINAL comparator, and every case asserts the two agree. If the rewrite
|
|
14
|
+
* ever diverges on any input, including the randomised ones, this fails.
|
|
15
|
+
*/
|
|
16
|
+
import { describe, expect, it } from 'vitest'
|
|
17
|
+
// From './core' rather than './index': `createSvGridCore` is the runes-free
|
|
18
|
+
// engine and is not on the main barrel (it ships via the `@svgrid/grid/core`
|
|
19
|
+
// subpath). Driving it directly keeps this test about the row model rather than
|
|
20
|
+
// about Svelte reactivity.
|
|
21
|
+
import {
|
|
22
|
+
createCoreRowModel,
|
|
23
|
+
createSortedRowModel,
|
|
24
|
+
createSvGridCore,
|
|
25
|
+
sortFns,
|
|
26
|
+
tableFeatures,
|
|
27
|
+
type ColumnDef,
|
|
28
|
+
type SortingState,
|
|
29
|
+
} from './core'
|
|
30
|
+
|
|
31
|
+
type Row = Record<string, unknown>
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* The original implementation, verbatim, as the oracle. Deliberately naive:
|
|
35
|
+
* this is the behaviour being preserved, not a second optimisation.
|
|
36
|
+
*/
|
|
37
|
+
function referenceSort(
|
|
38
|
+
rows: Row[],
|
|
39
|
+
columns: Array<{ field: string; editorType?: string }>,
|
|
40
|
+
sorting: SortingState,
|
|
41
|
+
fns: typeof sortFns = sortFns,
|
|
42
|
+
): Row[] {
|
|
43
|
+
return [...rows].sort((a, b) => {
|
|
44
|
+
for (const clause of sorting) {
|
|
45
|
+
const column = columns.find((col) => col.field === clause.id)
|
|
46
|
+
if (!column) continue
|
|
47
|
+
const editorType = column.editorType
|
|
48
|
+
const comparator =
|
|
49
|
+
editorType === 'number'
|
|
50
|
+
? fns.number
|
|
51
|
+
: editorType === 'date' || editorType === 'datetime'
|
|
52
|
+
? fns.date
|
|
53
|
+
: fns.auto
|
|
54
|
+
const result = comparator(a[column.field], b[column.field])
|
|
55
|
+
if (result !== 0) return clause.desc ? -result : result
|
|
56
|
+
}
|
|
57
|
+
return 0
|
|
58
|
+
})
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
function actualSort(
|
|
62
|
+
rows: Row[],
|
|
63
|
+
columns: Array<{ field: string; editorType?: string }>,
|
|
64
|
+
sorting: SortingState,
|
|
65
|
+
fns: typeof sortFns = sortFns,
|
|
66
|
+
): Row[] {
|
|
67
|
+
const grid = createSvGridCore({
|
|
68
|
+
_features: tableFeatures({}),
|
|
69
|
+
_rowModels: {
|
|
70
|
+
coreRowModel: createCoreRowModel(),
|
|
71
|
+
sortedRowModel: createSortedRowModel(fns),
|
|
72
|
+
},
|
|
73
|
+
columns: columns as Array<ColumnDef<ReturnType<typeof tableFeatures>, Row>>,
|
|
74
|
+
data: rows,
|
|
75
|
+
state: { sorting },
|
|
76
|
+
})
|
|
77
|
+
return grid.getRowModel().rows.map((r) => r.original as Row)
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/** Compare by identity, so a stable-sort difference on ties is caught too. */
|
|
81
|
+
function expectSameOrder(a: Row[], b: Row[]) {
|
|
82
|
+
expect(a.length).toBe(b.length)
|
|
83
|
+
for (let i = 0; i < a.length; i++) expect(a[i]).toBe(b[i])
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const COLUMNS = [
|
|
87
|
+
{ field: 'text' },
|
|
88
|
+
{ field: 'num', editorType: 'number' },
|
|
89
|
+
{ field: 'when', editorType: 'date' },
|
|
90
|
+
{ field: 'tie' },
|
|
91
|
+
]
|
|
92
|
+
|
|
93
|
+
describe('createSortedRowModel - equivalence with the original comparator', () => {
|
|
94
|
+
const nasty: Row[] = [
|
|
95
|
+
{ text: 'banana', num: 2, when: '2021-03-04', tie: 'x' },
|
|
96
|
+
{ text: 'Apple', num: 10, when: '2020-01-01', tie: 'x' },
|
|
97
|
+
{ text: 'apple', num: -3, when: '1999-12-31', tie: 'x' },
|
|
98
|
+
{ text: null, num: null, when: null, tie: 'x' },
|
|
99
|
+
{ text: undefined, num: undefined, when: undefined, tie: 'x' },
|
|
100
|
+
{ text: '', num: 0, when: '', tie: 'x' },
|
|
101
|
+
{ text: 'zebra', num: NaN, when: 'not a date', tie: 'x' },
|
|
102
|
+
{ text: '10', num: '10', when: '2020-01-01T05:00:00Z', tie: 'x' },
|
|
103
|
+
{ text: '9', num: '9', when: 1600000000000, tie: 'x' },
|
|
104
|
+
{ text: 'é', num: 1e21, when: new Date('2022-06-01'), tie: 'x' },
|
|
105
|
+
{ text: 'e', num: -0, when: '2022-06-01', tie: 'x' },
|
|
106
|
+
{ text: true, num: true, when: true, tie: 'x' },
|
|
107
|
+
]
|
|
108
|
+
|
|
109
|
+
for (const field of ['text', 'num', 'when', 'tie']) {
|
|
110
|
+
for (const desc of [false, true]) {
|
|
111
|
+
it(`matches on ${field}, desc=${desc}`, () => {
|
|
112
|
+
const sorting: SortingState = [{ id: field, desc }]
|
|
113
|
+
expectSameOrder(actualSort(nasty, COLUMNS, sorting), referenceSort(nasty, COLUMNS, sorting))
|
|
114
|
+
})
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
it('matches on a multi-clause sort where the first clause ties everywhere', () => {
|
|
119
|
+
// `tie` is identical on every row, so ordering is decided entirely by the
|
|
120
|
+
// later clauses - which is where an unstable rewrite would show up.
|
|
121
|
+
const sorting: SortingState = [
|
|
122
|
+
{ id: 'tie', desc: false },
|
|
123
|
+
{ id: 'num', desc: true },
|
|
124
|
+
{ id: 'text', desc: false },
|
|
125
|
+
]
|
|
126
|
+
expectSameOrder(actualSort(nasty, COLUMNS, sorting), referenceSort(nasty, COLUMNS, sorting))
|
|
127
|
+
})
|
|
128
|
+
|
|
129
|
+
it('preserves input order when every clause ties (stability)', () => {
|
|
130
|
+
const rows: Row[] = Array.from({ length: 50 }, (_, i) => ({ text: 'same', num: 1, when: null, tie: i }))
|
|
131
|
+
const sorted = actualSort(rows, COLUMNS, [{ id: 'text', desc: false }])
|
|
132
|
+
expect(sorted.map((r) => r.tie)).toEqual(rows.map((r) => r.tie))
|
|
133
|
+
})
|
|
134
|
+
|
|
135
|
+
it('ignores a clause naming a column that does not exist', () => {
|
|
136
|
+
const sorting: SortingState = [{ id: 'nope', desc: false }, { id: 'num', desc: false }]
|
|
137
|
+
expectSameOrder(actualSort(nasty, COLUMNS, sorting), referenceSort(nasty, COLUMNS, sorting))
|
|
138
|
+
})
|
|
139
|
+
|
|
140
|
+
it('returns rows untouched when there is no sorting', () => {
|
|
141
|
+
expect(actualSort(nasty, COLUMNS, [])).toEqual(nasty)
|
|
142
|
+
})
|
|
143
|
+
|
|
144
|
+
it('honours custom comparators passed in place of the built-ins', () => {
|
|
145
|
+
// Reverse-length ordering: nothing like the built-ins, so this only passes
|
|
146
|
+
// if the rewrite actually calls the supplied function.
|
|
147
|
+
const custom = {
|
|
148
|
+
...sortFns,
|
|
149
|
+
auto: (a: unknown, b: unknown) => String(b).length - String(a).length,
|
|
150
|
+
}
|
|
151
|
+
const sorting: SortingState = [{ id: 'text', desc: false }]
|
|
152
|
+
expectSameOrder(
|
|
153
|
+
actualSort(nasty, COLUMNS, sorting, custom),
|
|
154
|
+
referenceSort(nasty, COLUMNS, sorting, custom),
|
|
155
|
+
)
|
|
156
|
+
})
|
|
157
|
+
|
|
158
|
+
// The text comparator has two paths. When a column's distinct values are few
|
|
159
|
+
// relative to its rows, the distinct values are collated once and rows are
|
|
160
|
+
// sorted by rank; otherwise rows are collated directly. Both must produce the
|
|
161
|
+
// same order, and the small `nasty` fixture above only ever exercises the
|
|
162
|
+
// second, so these force the first.
|
|
163
|
+
describe('low-cardinality text (the rank path)', () => {
|
|
164
|
+
const words = ['banana', 'Apple', 'apple', 'zebra', 'é', 'e', '', '10', '9', 'Ä', 'a']
|
|
165
|
+
|
|
166
|
+
function repeated(rowCount: number): Row[] {
|
|
167
|
+
return Array.from({ length: rowCount }, (_, i) => ({
|
|
168
|
+
text: words[i % words.length],
|
|
169
|
+
num: i,
|
|
170
|
+
when: null,
|
|
171
|
+
tie: 'x',
|
|
172
|
+
}))
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
for (const desc of [false, true]) {
|
|
176
|
+
it(`matches the direct comparator, desc=${desc}`, () => {
|
|
177
|
+
// 220 rows over 11 distinct values: comfortably past the ratio guard.
|
|
178
|
+
const rows = repeated(220)
|
|
179
|
+
const sorting: SortingState = [{ id: 'text', desc }]
|
|
180
|
+
expectSameOrder(actualSort(rows, COLUMNS, sorting), referenceSort(rows, COLUMNS, sorting))
|
|
181
|
+
})
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
it('keeps equal values in input order (rank ties are still stable)', () => {
|
|
185
|
+
const rows = repeated(220)
|
|
186
|
+
const sorted = actualSort(rows, COLUMNS, [{ id: 'text', desc: false }])
|
|
187
|
+
// Within one text value, `num` must still ascend - proof the shared rank
|
|
188
|
+
// did not disturb relative order.
|
|
189
|
+
const byText = new Map<unknown, number[]>()
|
|
190
|
+
for (const r of sorted) {
|
|
191
|
+
const list = byText.get(r.text) ?? []
|
|
192
|
+
list.push(r.num as number)
|
|
193
|
+
byText.set(r.text, list)
|
|
194
|
+
}
|
|
195
|
+
for (const [, nums] of byText) {
|
|
196
|
+
expect(nums).toEqual([...nums].sort((a, b) => a - b))
|
|
197
|
+
}
|
|
198
|
+
})
|
|
199
|
+
|
|
200
|
+
it('agrees with the direct path on the same data at both cardinalities', () => {
|
|
201
|
+
// 22 rows over 11 values takes the rank path (11 * 2 <= 22); 20 rows over
|
|
202
|
+
// the same 11 values does not (11 * 2 > 20). Same inputs, same order.
|
|
203
|
+
const sorting: SortingState = [{ id: 'text', desc: false }]
|
|
204
|
+
for (const count of [20, 22, 100, 121]) {
|
|
205
|
+
const rows = repeated(count)
|
|
206
|
+
expectSameOrder(actualSort(rows, COLUMNS, sorting), referenceSort(rows, COLUMNS, sorting))
|
|
207
|
+
}
|
|
208
|
+
})
|
|
209
|
+
})
|
|
210
|
+
|
|
211
|
+
it('matches across randomised datasets', () => {
|
|
212
|
+
// Seeded so a failure is reproducible from the message alone.
|
|
213
|
+
let seed = 42
|
|
214
|
+
const rand = () => {
|
|
215
|
+
seed = (seed * 1103515245 + 12345) & 0x7fffffff
|
|
216
|
+
return seed / 0x7fffffff
|
|
217
|
+
}
|
|
218
|
+
const pick = <T,>(xs: T[]) => xs[Math.floor(rand() * xs.length)]!
|
|
219
|
+
const texts = ['a', 'B', 'c', '', null, undefined, 'ä', '10', '9']
|
|
220
|
+
const nums = [0, -1, 5, null, undefined, NaN, '3', 1e9]
|
|
221
|
+
const dates = ['2020-01-01', '2021-05-05', null, undefined, 'junk', 1600000000000]
|
|
222
|
+
|
|
223
|
+
for (let trial = 0; trial < 25; trial++) {
|
|
224
|
+
const rows: Row[] = Array.from({ length: 60 }, () => ({
|
|
225
|
+
text: pick(texts), num: pick(nums), when: pick(dates), tie: pick(['p', 'q']),
|
|
226
|
+
}))
|
|
227
|
+
const sorting: SortingState = [
|
|
228
|
+
{ id: pick(['text', 'num', 'when', 'tie']), desc: rand() > 0.5 },
|
|
229
|
+
{ id: pick(['text', 'num', 'when']), desc: rand() > 0.5 },
|
|
230
|
+
]
|
|
231
|
+
expectSameOrder(actualSort(rows, COLUMNS, sorting), referenceSort(rows, COLUMNS, sorting))
|
|
232
|
+
}
|
|
233
|
+
})
|
|
234
|
+
})
|
|
235
|
+
|
|
236
|
+
describe('createSortedRowModel - work budget', () => {
|
|
237
|
+
/** Count `getAllColumns` calls the way tools/bench does, but in-process. */
|
|
238
|
+
function countColumnLookups(rowCount: number, sorting: SortingState): number {
|
|
239
|
+
const rows: Row[] = Array.from({ length: rowCount }, (_, i) => ({
|
|
240
|
+
text: `t${(i * 7919) % rowCount}`,
|
|
241
|
+
num: (i * 31) % rowCount,
|
|
242
|
+
when: null,
|
|
243
|
+
tie: 'x',
|
|
244
|
+
}))
|
|
245
|
+
let calls = 0
|
|
246
|
+
const grid = createSvGridCore({
|
|
247
|
+
_features: tableFeatures({}),
|
|
248
|
+
_rowModels: {
|
|
249
|
+
coreRowModel: createCoreRowModel(),
|
|
250
|
+
sortedRowModel: (args) => {
|
|
251
|
+
const table = new Proxy(args.table, {
|
|
252
|
+
get(obj, prop, recv) {
|
|
253
|
+
const v = Reflect.get(obj, prop, recv)
|
|
254
|
+
if (prop === 'getAllColumns' && typeof v === 'function') {
|
|
255
|
+
return (...a: unknown[]) => {
|
|
256
|
+
calls++
|
|
257
|
+
return (v as (...x: unknown[]) => unknown).apply(obj, a)
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
return v
|
|
261
|
+
},
|
|
262
|
+
})
|
|
263
|
+
return createSortedRowModel()({ ...args, table })
|
|
264
|
+
},
|
|
265
|
+
},
|
|
266
|
+
columns: COLUMNS as Array<ColumnDef<ReturnType<typeof tableFeatures>, Row>>,
|
|
267
|
+
data: rows,
|
|
268
|
+
state: { sorting },
|
|
269
|
+
})
|
|
270
|
+
grid.getRowModel()
|
|
271
|
+
return calls
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
it('resolves each clause once instead of once per comparison', () => {
|
|
275
|
+
// The original made this proportional to n log n: 2,000 rows produced tens
|
|
276
|
+
// of thousands of lookups. A handful is the whole point of the rewrite, and
|
|
277
|
+
// the budget is what stops it regressing.
|
|
278
|
+
expect(countColumnLookups(2_000, [{ id: 'num', desc: false }])).toBeLessThanOrEqual(4)
|
|
279
|
+
expect(
|
|
280
|
+
countColumnLookups(2_000, [
|
|
281
|
+
{ id: 'text', desc: false },
|
|
282
|
+
{ id: 'num', desc: true },
|
|
283
|
+
{ id: 'tie', desc: false },
|
|
284
|
+
]),
|
|
285
|
+
).toBeLessThanOrEqual(12)
|
|
286
|
+
})
|
|
287
|
+
|
|
288
|
+
it('does not grow with row count', () => {
|
|
289
|
+
const small = countColumnLookups(500, [{ id: 'num', desc: false }])
|
|
290
|
+
const large = countColumnLookups(20_000, [{ id: 'num', desc: false }])
|
|
291
|
+
expect(large).toBe(small)
|
|
292
|
+
})
|
|
293
|
+
})
|