Skip to content
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

fix(arborist): safeguard against null node.target in flag calculation #7579

Merged
merged 7 commits into from
Jul 1, 2024
Merged

fix(arborist): safeguard against null node.target in flag calculation #7579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f7abda
fix node.target when it is null
AmirSa12 Jun 1, 2024
73d1bad
remove all the unrelated style changes caused by auto formatting
AmirSa12 Jun 1, 2024
03d13b0
add tests
AmirSa12 Jun 2, 2024
de861de
failing test
AmirSa12 Jun 4, 2024
866a83e
success test
AmirSa12 Jun 4, 2024
a128db4
fix getChildren
AmirSa12 Jun 4, 2024
4b31759
lint
AmirSa12 Jun 5, 2024
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
15 changes: 11 additions & 4 deletions workspaces/arborist/lib/calc-dep-flags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ const calcDepFlagsStep = (node) => {

// for links, map their hierarchy appropriately
if (node.isLink) {
// node.target can be null, we check to ensure it's not null before proceeding
if (node.target == null) {
return node
}
node.target.dev = node.dev
node.target.optional = node.optional
node.target.devOptional = node.devOptional
Expand Down Expand Up @@ -97,15 +101,18 @@ const unsetFlag = (node, flag) => {
tree: node,
visit: node => {
node.extraneous = node[flag] = false
if (node.isLink) {
if (node.isLink && node.target) {
node.target.extraneous = node.target[flag] = false
}
},
getChildren: node => {
const children = []
for (const edge of node.target.edgesOut.values()) {
if (edge.to && edge.to[flag] &&
(flag !== 'peer' && edge.type === 'peer' || edge.type === 'prod')
const targetNode = node.isLink && node.target ? node.target : node
for (const edge of targetNode.edgesOut.values()) {
if (
edge.to &&
edge.to[flag] &&
((flag !== 'peer' && edge.type === 'peer') || edge.type === 'prod')
) {
children.push(edge.to)
}
Expand Down
13 changes: 13 additions & 0 deletions workspaces/arborist/test/calc-dep-flags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,3 +264,16 @@ t.test('set parents to not extraneous when visiting', t => {
t.equal(bazLink.devOptional, false, 'bazlink not devOptional')
t.end()
})

t.test('check null target in link', async t => {
const root = new Link({
path: '/some/path',
realpath: '/some/path',
pkg: {
dependencies: { foo: '' },
},
})
t.doesNotThrow(() => calcDepFlags(root))
t.doesNotThrow(() => calcDepFlags(root, false))
t.end()
})
Loading