Skip to content

Enable ts-strict for treeUtil.ts #1238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huchenlei merged 1 commit into from
Oct 12, 2024
Merged

Enable ts-strict for treeUtil.ts #1238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/utils/treeUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// @ts-strict-ignore
import type { TreeNode } from 'primevue/treenode'

export function buildTree<T>(
items: T[],
key: string | ((item: T) => string[])
): TreeNode {
export function buildTree<T>(items: T[], key: (item: T) => string[]): TreeNode {
const root: TreeNode = {
key: 'root',
label: 'root',
Expand All @@ -16,7 +12,7 @@ export function buildTree<T>(
}

for (const item of items) {
const keys = typeof key === 'string' ? item[key] : key(item)
Copy link
Contributor Author

@huchenlei huchenlei Oct 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The item attr key is unused. Removing the support for it.

const keys = key(item)
let parent = root
for (let i = 0; i < keys.length; i++) {
const k = keys[i]
Expand All @@ -33,7 +29,7 @@ export function buildTree<T>(
children: []
}
map[id] = node
parent.children.push(node)
parent.children?.push(node)
}
parent = map[id]
}
Expand Down Expand Up @@ -63,7 +59,7 @@ export function sortedTree(node: TreeNode): TreeNode {
if (node.children) {
// Sort the children of the current node
const sortedChildren = [...node.children].sort((a, b) =>
a.label.localeCompare(b.label)
(a.label ?? '').localeCompare(b.label ?? '')
)
// Recursively sort the children and add them to the new node
newNode.children = []
Expand Down