Skip to content

Commit 0860159

Browse files
Carl-FosterCarl-Foster
authored
fix: ensure workspace links query parents correctly (#6829)
1 parent 7c459d2 commit 0860159

File tree

2 files changed

+56
-14
lines changed

2 files changed

+56
-14
lines changed

‎workspaces/arborist/lib/query-selector-all.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,11 @@ const depTypes = {
695695
// the compare nodes array
696696
const hasParent = (node, compareNodes) => {
697697
// All it takes is one so we loop and return on the first hit
698-
for (const compareNode of compareNodes) {
698+
for (let compareNode of compareNodes) {
699+
if (compareNode.isLink) {
700+
compareNode = compareNode.target
701+
}
702+
699703
// follows logical parent for link anscestors
700704
if (node.isTop && (node.resolveParent === compareNode)) {
701705
return true

‎workspaces/arborist/test/query-selector-all.js‎

Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ t.test('query-selector-all', async t => {
2828
│ └── [email protected] (production dep of b, deduped)
2929
├─┬ [email protected] (production dep of query-selector-all-tests)
3030
│ └── [email protected] (production dep of bar)
31+
|-┬ [email protected] -> ./c (workspace)
32+
│ └── [email protected] (production dep of c, deduped)
3133
├─┬ [email protected] (dev dep of query-selector-all-tests)
3234
│ ├─┬ [email protected] (production dep of foo, deduped)
3335
│ │ └── [email protected] (overridden peer dep of bar)
@@ -65,6 +67,9 @@ t.test('query-selector-all', async t => {
6567
'1.0.0': undefined,
6668
'1.0.1': yesterday,
6769
},
70+
c: {
71+
'1.0.0': today,
72+
},
6873
'dash-separated-pkg': {
6974
'1.0.0': dayBeforeYesterday,
7075
'2.0.0': yesterday,
@@ -173,6 +178,7 @@ t.test('query-selector-all', async t => {
173178
},
174179
}),
175180
},
181+
c: t.fixture('symlink', '../c'),
176182
foo: {
177183
node_modules: {
178184
bar: {
@@ -275,10 +281,19 @@ t.test('query-selector-all', async t => {
275281
bar: '^2.0.0',
276282
},
277283
}) },
284+
c: {
285+
'package.json': JSON.stringify({
286+
name: 'c',
287+
version: '1.0.0',
288+
dependencies: {
289+
b: '^1.0.0',
290+
},
291+
}),
292+
},
278293
'package.json': JSON.stringify({
279294
name: 'query-selector-all-tests',
280295
version: '1.0.0',
281-
workspaces: ['a', 'b'],
296+
workspaces: ['a', 'b', 'c'],
282297
dependencies: {
283298
a: '^1.0.0',
284299
abbrev: '^1.1.1',
@@ -387,6 +402,7 @@ t.test('query-selector-all', async t => {
387402
'[email protected]',
388403
'[email protected]',
389404
'[email protected]',
405+
'[email protected]',
390406
'@npmcli/[email protected]',
391407
'[email protected]',
392408
'[email protected]',
@@ -404,6 +420,7 @@ t.test('query-selector-all', async t => {
404420
['* > *', [
405421
'[email protected]',
406422
'[email protected]',
423+
'[email protected]',
407424
'[email protected]',
408425
'[email protected]',
409426
'[email protected]',
@@ -425,18 +442,19 @@ t.test('query-selector-all', async t => {
425442
[':root > *', [
426443
'[email protected]',
427444
'[email protected]',
445+
'[email protected]',
428446
'[email protected]',
429447
'[email protected]',
430448
'[email protected]',
431449
'ipsum@npm:[email protected]',
432450
'[email protected]',
433451
'[email protected]',
434452
]],
435-
[':root > .workspace', ['[email protected]', '[email protected]']],
436-
[':root > *.workspace', ['[email protected]', '[email protected]']],
453+
[':root > .workspace', ['[email protected]', '[email protected]', '[email protected]']],
454+
[':root > *.workspace', ['[email protected]', '[email protected]', '[email protected]']],
437455
[':root > .workspace[name=a]', ['[email protected]']],
438456
[':root > [name=bar]', ['[email protected]']],
439-
[':root > .workspace[version=1.0.0]', ['[email protected]', '[email protected]']],
457+
[':root > .workspace[version=1.0.0]', ['[email protected]', '[email protected]', '[email protected]']],
440458
[':root > .workspace[name=a][version=1.0.0]', ['[email protected]']],
441459
[':root > :root', []],
442460
['* > :root', []],
@@ -452,6 +470,7 @@ t.test('query-selector-all', async t => {
452470
'[email protected]',
453471
'[email protected]',
454472
'[email protected]',
473+
'[email protected]',
455474
'[email protected]',
456475
'[email protected]',
457476
'[email protected]',
@@ -461,12 +480,12 @@ t.test('query-selector-all', async t => {
461480
'[email protected]',
462481
'[email protected]',
463482
'[email protected]',
483+
'[email protected]',
464484
'[email protected]',
465485
]],
466486
[':extraneous', ['@npmcli/[email protected]']],
467487
[':invalid', ['[email protected]']],
468-
[':link', ['[email protected]', '[email protected]']],
469-
[':link', ['[email protected]', '[email protected]']],
488+
[':link', ['[email protected]', '[email protected]', '[email protected]']],
470489
[':deduped', [
471490
'[email protected]',
472491
'[email protected]',
@@ -481,6 +500,7 @@ t.test('query-selector-all', async t => {
481500
'[email protected]',
482501
'[email protected]',
483502
'[email protected]',
503+
'[email protected]',
484504
'@npmcli/[email protected]',
485505
'[email protected]',
486506
'[email protected]',
@@ -494,34 +514,36 @@ t.test('query-selector-all', async t => {
494514
'[email protected]',
495515
'[email protected]',
496516
]],
497-
[':root > .workspace:not(#b)', ['[email protected]']],
498-
[':root > .workspace > *:not(#bar)', ['[email protected]', '[email protected]']],
517+
[':root > .workspace:not(#b)', ['[email protected]', '[email protected]']],
518+
[':root > .workspace > *:not(#bar)', ['[email protected]', '[email protected]', '[email protected]']],
499519
['.bundled ~ :not(.workspace)', [
500520
'[email protected]',
501521
'[email protected]',
502522
'ipsum@npm:[email protected]',
503523
'[email protected]',
504524
'[email protected]',
505525
]],
506-
['*:root > *:empty:not(*[name^=a], #b)', ['[email protected]']],
526+
['*:root > *:empty:not(*[name^=a], #b, #c)', ['[email protected]']],
507527
[':not(:not(:link))', [
508528
'[email protected]',
509529
'[email protected]',
530+
'[email protected]',
510531
]],
511532

512533
// has pseudo
513534
[':root > *:has(* > #bar:semver(1.4.0))', ['[email protected]']],
514535
['*:has(* > #bar:semver(1.4.0))', ['[email protected]']],
515536
['*:has(> #bar:semver(1.4.0))', ['[email protected]']],
516537
['.workspace:has(> * > #lorem)', ['[email protected]']],
517-
['.workspace:has(* #lorem, ~ #b)', ['[email protected]', '[email protected]']],
538+
['.workspace:has(* #lorem, ~ #b)', ['[email protected]', '[email protected]', '[email protected]']],
518539

519540
// is pseudo
520541
[':is(#a, #b) > *', ['[email protected]', '[email protected]', '[email protected]']],
521542
// TODO: ipsum is not empty but its child is missing so it doesn't return a
522543
// result here
523544
[':root > *:is(.prod:not(:empty), .dev > [name=bar]) > *', [
524545
'[email protected]',
546+
'[email protected]',
525547
'[email protected]',
526548
'[email protected]',
527549
'[email protected]',
@@ -538,6 +560,7 @@ t.test('query-selector-all', async t => {
538560
'[email protected]',
539561
'[email protected]',
540562
'[email protected]',
563+
'[email protected]',
541564
'@npmcli/[email protected]',
542565
'[email protected]',
543566
'[email protected]',
@@ -557,6 +580,7 @@ t.test('query-selector-all', async t => {
557580
[':type(range)', [
558581
'[email protected]',
559582
'[email protected]',
583+
'[email protected]',
560584
'[email protected]',
561585
'[email protected]',
562586
'[email protected]',
@@ -584,11 +608,12 @@ t.test('query-selector-all', async t => {
584608
[':path(./node_modules/bar)', ['[email protected]']],
585609
[':path(node_modules/foo/node_modules/bar)', ['[email protected]']],
586610
[':path(**/bar)', ['[email protected]', '[email protected]']],
587-
[':path(*)', ['[email protected]', '[email protected]']],
611+
[':path(*)', ['[email protected]', '[email protected]', '[email protected]']],
588612
[':path()', [
589613
'[email protected]',
590614
'[email protected]',
591615
'[email protected]',
616+
'[email protected]',
592617
'@npmcli/[email protected]',
593618
'[email protected]',
594619
'[email protected]',
@@ -609,6 +634,7 @@ t.test('query-selector-all', async t => {
609634
'[email protected]',
610635
'[email protected]',
611636
'[email protected]',
637+
'[email protected]',
612638
'@npmcli/[email protected]',
613639
'[email protected]',
614640
'[email protected]',
@@ -627,6 +653,7 @@ t.test('query-selector-all', async t => {
627653
'[email protected]',
628654
'[email protected]',
629655
'[email protected]',
656+
'[email protected]',
630657
'[email protected]',
631658
'[email protected]',
632659
'[email protected]',
@@ -690,6 +717,7 @@ t.test('query-selector-all', async t => {
690717
'[email protected]',
691718
'[email protected]',
692719
'[email protected]',
720+
'[email protected]',
693721
'[email protected]',
694722
'[email protected]',
695723
'ipsum@npm:[email protected]',
@@ -702,6 +730,7 @@ t.test('query-selector-all', async t => {
702730
'[email protected]',
703731
'[email protected]',
704732
'[email protected]',
733+
'[email protected]',
705734
'[email protected]',
706735
'[email protected]',
707736
'[email protected]',
@@ -720,6 +749,7 @@ t.test('query-selector-all', async t => {
720749
'[email protected]',
721750
'[email protected]',
722751
'[email protected]',
752+
'[email protected]',
723753
'[email protected]',
724754
'[email protected]',
725755
'ipsum@npm:[email protected]',
@@ -731,6 +761,7 @@ t.test('query-selector-all', async t => {
731761
'[email protected]',
732762
'[email protected]',
733763
'[email protected]',
764+
'[email protected]',
734765
'[email protected]',
735766
'[email protected]',
736767
'ipsum@npm:[email protected]',
@@ -832,6 +863,7 @@ t.test('query-selector-all', async t => {
832863
'[email protected]',
833864
'[email protected]',
834865
'[email protected]',
866+
'[email protected]',
835867
'@npmcli/[email protected]',
836868
'[email protected]',
837869
'[email protected]',
@@ -882,15 +914,18 @@ t.test('query-selector-all', async t => {
882914
'[email protected]',
883915
'[email protected]',
884916
'[email protected]',
917+
'[email protected]',
885918
'[email protected]',
886919
'[email protected]',
887920
'[email protected]',
888921
'ipsum@npm:[email protected]',
889922
'[email protected]',
890923
'[email protected]',
891924
]],
892-
['.workspace', ['[email protected]', '[email protected]']],
893-
['.workspace > *', ['[email protected]', '[email protected]', '[email protected]']],
925+
['.workspace', ['[email protected]', '[email protected]', '[email protected]']],
926+
['.workspace > *', ['[email protected]', '[email protected]', '[email protected]', '[email protected]']],
927+
['.workspace .workspace', ['[email protected]', '[email protected]']],
928+
['.workspace .workspace .workspace', ['[email protected]']],
894929
['.workspace ~ *', [
895930
'[email protected]',
896931
'[email protected]',
@@ -911,9 +946,11 @@ t.test('query-selector-all', async t => {
911946
'[email protected]',
912947
]],
913948
['.dev *', [
949+
'[email protected]',
914950
'[email protected]',
915951
'[email protected]',
916952
'[email protected]',
953+
'[email protected]',
917954
'[email protected]',
918955
'[email protected]',
919956
]],
@@ -923,6 +960,7 @@ t.test('query-selector-all', async t => {
923960
['.bundled ~ *', [
924961
'[email protected]',
925962
'[email protected]',
963+
'[email protected]',
926964
'[email protected]',
927965
'[email protected]',
928966
'ipsum@npm:[email protected]',

0 commit comments

Comments
 (0)