@@ -362,20 +362,20 @@ describe('Sort by tags', () => {
362
362
} ) ;
363
363
364
364
it ( 'should parse a valid line with default tag number' , ( ) => {
365
- const sorter = tagsField . parseSortLine ( 'sort by tag' ) ;
365
+ const sorter = tagsField . createSorterFromLine ( 'sort by tag' ) ;
366
366
expect ( sorter ?. property ) . toEqual ( 'tag' ) ;
367
367
expect ( sorter ?. comparator ( tag_a , tag_b ) ) . toBeLessThan ( 0 ) ;
368
368
expectTaskComparesBefore ( sorter ! , tag_a , tag_b ) ;
369
369
} ) ;
370
370
371
371
it ( 'should parse a valid line with a non-default tag number' , ( ) => {
372
- const sorter = tagsField . parseSortLine ( 'sort by tag 2' ) ;
372
+ const sorter = tagsField . createSorterFromLine ( 'sort by tag 2' ) ;
373
373
expect ( sorter ?. property ) . toEqual ( 'tag' ) ;
374
374
expectTaskComparesBefore ( sorter ! , tags_a_b , tags_a_c ) ;
375
375
} ) ;
376
376
377
377
it ( 'should parse a valid line with reverse and a non-default tag number' , ( ) => {
378
- const sorter = tagsField . parseSortLine ( 'sort by tag reverse 2' ) ;
378
+ const sorter = tagsField . createSorterFromLine ( 'sort by tag reverse 2' ) ;
379
379
expect ( sorter ?. property ) . toEqual ( 'tag' ) ;
380
380
expectTaskComparesAfter ( sorter ! , tags_a_b , tags_a_c ) ;
381
381
} ) ;
@@ -417,7 +417,10 @@ describe('Sort by tags', () => {
417
417
418
418
// Act / Assert
419
419
expect (
420
- Sort . by ( [ new TagsField ( ) . parseSortLine ( 'sort by tag 1' ) ! ] , [ t1 , t3 , t5 , t7 , t6 , t4 , t2 , t8 , t9 , t10 ] ) ,
420
+ Sort . by (
421
+ [ new TagsField ( ) . createSorterFromLine ( 'sort by tag 1' ) ! ] ,
422
+ [ t1 , t3 , t5 , t7 , t6 , t4 , t2 , t8 , t9 , t10 ] ,
423
+ ) ,
421
424
) . toEqual ( expectedOrder ) ;
422
425
} ) ;
423
426
@@ -438,7 +441,7 @@ describe('Sort by tags', () => {
438
441
// Act / Assert
439
442
expect (
440
443
Sort . by (
441
- [ new TagsField ( ) . parseSortLine ( 'sort by tag reverse 1' ) ! ] ,
444
+ [ new TagsField ( ) . createSorterFromLine ( 'sort by tag reverse 1' ) ! ] ,
442
445
[ t1 , t3 , t5 , t7 , t6 , t4 , t2 , t8 , t9 , t10 ] ,
443
446
) ,
444
447
) . toEqual ( expectedOrder ) ;
@@ -451,7 +454,9 @@ describe('Sort by tags', () => {
451
454
const t4 = fromLine ( { line : '- [ ] a #iii #ddd' } ) ;
452
455
const t5 = fromLine ( { line : '- [ ] a #hhh #eee' } ) ;
453
456
const expectedOrder = [ t1 , t2 , t3 , t4 , t5 ] ;
454
- expect ( Sort . by ( [ new TagsField ( ) . parseSortLine ( 'sort by tag 2' ) ! ] , [ t4 , t3 , t2 , t1 , t5 ] ) ) . toEqual ( expectedOrder ) ;
457
+ expect ( Sort . by ( [ new TagsField ( ) . createSorterFromLine ( 'sort by tag 2' ) ! ] , [ t4 , t3 , t2 , t1 , t5 ] ) ) . toEqual (
458
+ expectedOrder ,
459
+ ) ;
455
460
} ) ;
456
461
457
462
it ( 'should sort correctly reversed by second tag with no global filter' , ( ) => {
@@ -461,7 +466,7 @@ describe('Sort by tags', () => {
461
466
const t4 = fromLine ( { line : '- [ ] a #iii #ddd' } ) ;
462
467
const t5 = fromLine ( { line : '- [ ] a #hhh #eee' } ) ;
463
468
const expectedOrder = [ t5 , t4 , t3 , t2 , t1 ] ;
464
- expect ( Sort . by ( [ new TagsField ( ) . parseSortLine ( 'sort by tag reverse 2' ) ! ] , [ t4 , t3 , t2 , t1 , t5 ] ) ) . toEqual (
469
+ expect ( Sort . by ( [ new TagsField ( ) . createSorterFromLine ( 'sort by tag reverse 2' ) ! ] , [ t4 , t3 , t2 , t1 , t5 ] ) ) . toEqual (
465
470
expectedOrder ,
466
471
) ;
467
472
} ) ;
@@ -489,7 +494,7 @@ describe('Sort by tags', () => {
489
494
// Act
490
495
expect (
491
496
Sort . by (
492
- [ new TagsField ( ) . parseSortLine ( 'sort by tag 1' ) ! ] ,
497
+ [ new TagsField ( ) . createSorterFromLine ( 'sort by tag 1' ) ! ] ,
493
498
[ t1 , t12 , t3 , t13 , t5 , t7 , t6 , t4 , t2 , t8 , t9 , t10 , t11 ] ,
494
499
) ,
495
500
) . toEqual ( expectedOrder ) ;
@@ -521,7 +526,7 @@ describe('Sort by tags', () => {
521
526
// Act
522
527
expect (
523
528
Sort . by (
524
- [ new TagsField ( ) . parseSortLine ( 'sort by tag reverse 1' ) ! ] ,
529
+ [ new TagsField ( ) . createSorterFromLine ( 'sort by tag reverse 1' ) ! ] ,
525
530
[ t1 , t12 , t3 , t13 , t5 , t7 , t6 , t4 , t2 , t8 , t9 , t10 , t11 ] ,
526
531
) ,
527
532
) . toEqual ( expectedOrder ) ;
@@ -545,7 +550,10 @@ describe('Sort by tags', () => {
545
550
const expectedOrder = [ t1 , t2 , t3 , t4 , t5 , t6 , t7 , t8 ] ;
546
551
547
552
// Act
548
- const result = Sort . by ( [ new TagsField ( ) . parseSortLine ( 'sort by tag 2' ) ! ] , [ t4 , t7 , t5 , t2 , t3 , t1 , t8 , t6 ] ) ;
553
+ const result = Sort . by (
554
+ [ new TagsField ( ) . createSorterFromLine ( 'sort by tag 2' ) ! ] ,
555
+ [ t4 , t7 , t5 , t2 , t3 , t1 , t8 , t6 ] ,
556
+ ) ;
549
557
550
558
// Assert
551
559
expect ( result ) . toEqual ( expectedOrder ) ;
@@ -570,7 +578,7 @@ describe('Sort by tags', () => {
570
578
571
579
// Act
572
580
const result = Sort . by (
573
- [ new TagsField ( ) . parseSortLine ( 'sort by tag reverse 2' ) ! ] ,
581
+ [ new TagsField ( ) . createSorterFromLine ( 'sort by tag reverse 2' ) ! ] ,
574
582
[ t4 , t7 , t5 , t2 , t3 , t1 , t8 , t6 ] ,
575
583
) ;
576
584
@@ -608,8 +616,8 @@ describe('Sort by tags', () => {
608
616
expect (
609
617
Sort . by (
610
618
[
611
- new TagsField ( ) . parseSortLine ( 'sort by tag 2' ) ! , // tag 2 - ascending
612
- new TagsField ( ) . parseSortLine ( 'sort by tag 1' ) ! , // tag 1 - ascending
619
+ new TagsField ( ) . createSorterFromLine ( 'sort by tag 2' ) ! , // tag 2 - ascending
620
+ new TagsField ( ) . createSorterFromLine ( 'sort by tag 1' ) ! , // tag 1 - ascending
613
621
new DescriptionField ( ) . createNormalSorter ( ) , // then description - ascending
614
622
] ,
615
623
input ,
0 commit comments