@teambit/merge-lanes 1.0.225 → 1.0.227

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.
Files changed (17) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +306 -546
  3. package/dist/merge-lane-from-scope.cmd.js +1 -0
  4. package/dist/merge-lane-from-scope.cmd.js.map +1 -1
  5. package/dist/merge-lanes.main.runtime.js +55 -117
  6. package/dist/merge-lanes.main.runtime.js.map +1 -1
  7. package/package.json +15 -15
  8. package/tsconfig.json +40 -1
  9. package/dist/exceptions/missing-comps-to-merge.d.ts +0 -6
  10. package/dist/index.d.ts +0 -4
  11. package/dist/last-merged.d.ts +0 -33
  12. package/dist/merge-abort.cmd.d.ts +0 -22
  13. package/dist/merge-lane-from-scope.cmd.d.ts +0 -60
  14. package/dist/merge-lane.cmd.d.ts +0 -41
  15. package/dist/merge-lanes.aspect.d.ts +0 -2
  16. package/dist/merge-lanes.main.runtime.d.ts +0 -102
  17. /package/dist/{preview-1712546198033.js → preview-1712719054377.js} +0 -0
package/artifacts/schema.json CHANGED
@@ -56,11 +56,7 @@
56
56
  "line": 72,
57
57
  "character": 24
58
58
  },
59
- "name": "Workspace",
60
- "componentId": {
61
- "scope": "teambit.workspace",
62
- "name": "workspace"
63
- }
59
+ "name": "Workspace"
64
60
  },
65
61
  {
66
62
  "__schema": "KeywordTypeSchema",
@@ -91,11 +87,7 @@
91
87
  "line": 73,
92
88
  "character": 22
93
89
  },
94
- "name": "MergingMain",
95
- "componentId": {
96
- "scope": "teambit.component",
97
- "name": "merging"
98
- }
90
+ "name": "MergingMain"
99
91
  },
100
92
  "isOptional": false,
101
93
  "isSpread": false
@@ -115,11 +107,7 @@
115
107
  "line": 74,
116
108
  "character": 20
117
109
  },
118
- "name": "LanesMain",
119
- "componentId": {
120
- "scope": "teambit.lanes",
121
- "name": "lanes"
122
- }
110
+ "name": "LanesMain"
123
111
  },
124
112
  "isOptional": false,
125
113
  "isSpread": false
@@ -139,11 +127,7 @@
139
127
  "line": 75,
140
128
  "character": 22
141
129
  },
142
- "name": "Logger",
143
- "componentId": {
144
- "scope": "teambit.harmony",
145
- "name": "logger"
146
- }
130
+ "name": "Logger"
147
131
  },
148
132
  "isOptional": false,
149
133
  "isSpread": false
@@ -163,11 +147,7 @@
163
147
  "line": 76,
164
148
  "character": 21
165
149
  },
166
- "name": "RemoveMain",
167
- "componentId": {
168
- "scope": "teambit.component",
169
- "name": "remove"
170
- }
150
+ "name": "RemoveMain"
171
151
  },
172
152
  "isOptional": false,
173
153
  "isSpread": false
@@ -187,11 +167,7 @@
187
167
  "line": 77,
188
168
  "character": 20
189
169
  },
190
- "name": "ScopeMain",
191
- "componentId": {
192
- "scope": "teambit.scope",
193
- "name": "scope"
194
- }
170
+ "name": "ScopeMain"
195
171
  },
196
172
  "isOptional": false,
197
173
  "isSpread": false
@@ -211,11 +187,7 @@
211
187
  "line": 78,
212
188
  "character": 23
213
189
  },
214
- "name": "ExportMain",
215
- "componentId": {
216
- "scope": "teambit.scope",
217
- "name": "export"
218
- }
190
+ "name": "ExportMain"
219
191
  },
220
192
  "isOptional": false,
221
193
  "isSpread": false
@@ -235,11 +207,7 @@
235
207
  "line": 79,
236
208
  "character": 23
237
209
  },
238
- "name": "ImporterMain",
239
- "componentId": {
240
- "scope": "teambit.scope",
241
- "name": "importer"
242
- }
210
+ "name": "ImporterMain"
243
211
  },
244
212
  "isOptional": false,
245
213
  "isSpread": false
@@ -259,11 +227,7 @@
259
227
  "line": 80,
260
228
  "character": 23
261
229
  },
262
- "name": "CheckoutMain",
263
- "componentId": {
264
- "scope": "teambit.component",
265
- "name": "checkout"
266
- }
230
+ "name": "CheckoutMain"
267
231
  },
268
232
  "isOptional": false,
269
233
  "isSpread": false
@@ -325,8 +289,7 @@
325
289
  "line": 83,
326
290
  "character": 51
327
291
  },
328
- "name": "MergeLaneOptions",
329
- "internalFilePath": "merge-lanes.main.runtime.ts"
292
+ "name": "MergeLaneOptions"
330
293
  },
331
294
  "isOptional": false,
332
295
  "isSpread": false
@@ -370,12 +333,7 @@
370
333
  "line": 94,
371
334
  "character": 18
372
335
  },
373
- "name": "LaneId",
374
- "componentId": {
375
- "scope": "teambit.lanes",
376
- "name": "lane-id",
377
- "version": "0.0.311"
378
- }
336
+ "name": "LaneId"
379
337
  },
380
338
  "isOptional": false,
381
339
  "isSpread": false
@@ -395,12 +353,7 @@
395
353
  "line": 95,
396
354
  "character": 20
397
355
  },
398
- "name": "LaneId",
399
- "componentId": {
400
- "scope": "teambit.lanes",
401
- "name": "lane-id",
402
- "version": "0.0.311"
403
- }
356
+ "name": "LaneId"
404
357
  },
405
358
  "isOptional": false,
406
359
  "isSpread": false
@@ -420,8 +373,7 @@
420
373
  "line": 96,
421
374
  "character": 14
422
375
  },
423
- "name": "MergeLaneOptions",
424
- "internalFilePath": "merge-lanes.main.runtime.ts"
376
+ "name": "MergeLaneOptions"
425
377
  },
426
378
  "isOptional": false,
427
379
  "isSpread": false
@@ -511,11 +463,7 @@
511
463
  "line": 97,
512
464
  "character": 91
513
465
  },
514
- "name": "ConfigMergeResult",
515
- "componentId": {
516
- "scope": "teambit.workspace",
517
- "name": "config-merger"
518
- }
466
+ "name": "ConfigMergeResult"
519
467
  }
520
468
  },
521
469
  "isOptional": false
@@ -532,7 +480,7 @@
532
480
  "__schema": "FunctionLikeSchema",
533
481
  "location": {
534
482
  "filePath": "merge-lanes.main.runtime.ts",
535
- "line": 278,
483
+ "line": 281,
536
484
  "character": 3
537
485
  },
538
486
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -542,7 +490,7 @@
542
490
  "__schema": "ParameterSchema",
543
491
  "location": {
544
492
  "filePath": "merge-lanes.main.runtime.ts",
545
- "line": 278,
493
+ "line": 281,
546
494
  "character": 24
547
495
  },
548
496
  "name": "checkoutProps",
@@ -550,14 +498,10 @@
550
498
  "__schema": "TypeRefSchema",
551
499
  "location": {
552
500
  "filePath": "merge-lanes.main.runtime.ts",
553
- "line": 278,
501
+ "line": 281,
554
502
  "character": 39
555
503
  },
556
- "name": "CheckoutProps",
557
- "componentId": {
558
- "scope": "teambit.component",
559
- "name": "checkout"
560
- }
504
+ "name": "CheckoutProps"
561
505
  },
562
506
  "isOptional": false,
563
507
  "isSpread": false
@@ -566,7 +510,7 @@
566
510
  "__schema": "ParameterSchema",
567
511
  "location": {
568
512
  "filePath": "merge-lanes.main.runtime.ts",
569
- "line": 278,
513
+ "line": 281,
570
514
  "character": 54
571
515
  },
572
516
  "name": "mergeAbortOpts",
@@ -574,11 +518,10 @@
574
518
  "__schema": "TypeRefSchema",
575
519
  "location": {
576
520
  "filePath": "merge-lanes.main.runtime.ts",
577
- "line": 278,
521
+ "line": 281,
578
522
  "character": 70
579
523
  },
580
- "name": "MergeAbortOpts",
581
- "internalFilePath": "merge-abort.cmd.ts"
524
+ "name": "MergeAbortOpts"
582
525
  },
583
526
  "isOptional": false,
584
527
  "isSpread": false
@@ -588,7 +531,7 @@
588
531
  "__schema": "InferenceTypeSchema",
589
532
  "location": {
590
533
  "filePath": "merge-lanes.main.runtime.ts",
591
- "line": 278,
534
+ "line": 281,
592
535
  "character": 3
593
536
  },
594
537
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -601,7 +544,7 @@
601
544
  "__schema": "FunctionLikeSchema",
602
545
  "location": {
603
546
  "filePath": "merge-lanes.main.runtime.ts",
604
- "line": 334,
547
+ "line": 337,
605
548
  "character": 3
606
549
  },
607
550
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -611,7 +554,7 @@
611
554
  "__schema": "ParameterSchema",
612
555
  "location": {
613
556
  "filePath": "merge-lanes.main.runtime.ts",
614
- "line": 335,
557
+ "line": 338,
615
558
  "character": 5
616
559
  },
617
560
  "name": "fromLane",
@@ -619,7 +562,7 @@
619
562
  "__schema": "KeywordTypeSchema",
620
563
  "location": {
621
564
  "filePath": "merge-lanes.main.runtime.ts",
622
- "line": 335,
565
+ "line": 338,
623
566
  "character": 15
624
567
  },
625
568
  "name": "string"
@@ -631,7 +574,7 @@
631
574
  "__schema": "ParameterSchema",
632
575
  "location": {
633
576
  "filePath": "merge-lanes.main.runtime.ts",
634
- "line": 336,
577
+ "line": 339,
635
578
  "character": 5
636
579
  },
637
580
  "name": "toLane",
@@ -639,7 +582,7 @@
639
582
  "__schema": "KeywordTypeSchema",
640
583
  "location": {
641
584
  "filePath": "merge-lanes.main.runtime.ts",
642
- "line": 336,
585
+ "line": 339,
643
586
  "character": 13
644
587
  },
645
588
  "name": "string"
@@ -651,7 +594,7 @@
651
594
  "__schema": "ParameterSchema",
652
595
  "location": {
653
596
  "filePath": "merge-lanes.main.runtime.ts",
654
- "line": 337,
597
+ "line": 340,
655
598
  "character": 5
656
599
  },
657
600
  "name": "options",
@@ -659,7 +602,7 @@
659
602
  "__schema": "TypeIntersectionSchema",
660
603
  "location": {
661
604
  "filePath": "merge-lanes.main.runtime.ts",
662
- "line": 337,
605
+ "line": 340,
663
606
  "character": 14
664
607
  },
665
608
  "types": [
@@ -667,7 +610,7 @@
667
610
  "__schema": "TypeRefSchema",
668
611
  "location": {
669
612
  "filePath": "merge-lanes.main.runtime.ts",
670
- "line": 337,
613
+ "line": 340,
671
614
  "character": 14
672
615
  },
673
616
  "name": "Partial",
@@ -676,11 +619,10 @@
676
619
  "__schema": "TypeRefSchema",
677
620
  "location": {
678
621
  "filePath": "merge-lanes.main.runtime.ts",
679
- "line": 337,
622
+ "line": 340,
680
623
  "character": 22
681
624
  },
682
- "name": "MergeLaneOptions",
683
- "internalFilePath": "merge-lanes.main.runtime.ts"
625
+ "name": "MergeLaneOptions"
684
626
  }
685
627
  ]
686
628
  },
@@ -688,7 +630,7 @@
688
630
  "__schema": "TypeLiteralSchema",
689
631
  "location": {
690
632
  "filePath": "merge-lanes.main.runtime.ts",
691
- "line": 337,
633
+ "line": 340,
692
634
  "character": 42
693
635
  },
694
636
  "members": [
@@ -696,7 +638,7 @@
696
638
  "__schema": "VariableLikeSchema",
697
639
  "location": {
698
640
  "filePath": "merge-lanes.main.runtime.ts",
699
- "line": 337,
641
+ "line": 340,
700
642
  "character": 44
701
643
  },
702
644
  "signature": "(property) push?: boolean | undefined",
@@ -705,7 +647,7 @@
705
647
  "__schema": "KeywordTypeSchema",
706
648
  "location": {
707
649
  "filePath": "merge-lanes.main.runtime.ts",
708
- "line": 337,
650
+ "line": 340,
709
651
  "character": 51
710
652
  },
711
653
  "name": "boolean"
@@ -716,7 +658,7 @@
716
658
  "__schema": "VariableLikeSchema",
717
659
  "location": {
718
660
  "filePath": "merge-lanes.main.runtime.ts",
719
- "line": 337,
661
+ "line": 340,
720
662
  "character": 60
721
663
  },
722
664
  "signature": "(property) reMerge?: boolean | undefined",
@@ -725,7 +667,7 @@
725
667
  "__schema": "KeywordTypeSchema",
726
668
  "location": {
727
669
  "filePath": "merge-lanes.main.runtime.ts",
728
- "line": 337,
670
+ "line": 340,
729
671
  "character": 70
730
672
  },
731
673
  "name": "boolean"
@@ -744,7 +686,7 @@
744
686
  "__schema": "TypeRefSchema",
745
687
  "location": {
746
688
  "filePath": "merge-lanes.main.runtime.ts",
747
- "line": 338,
689
+ "line": 341,
748
690
  "character": 6
749
691
  },
750
692
  "name": "Promise",
@@ -753,11 +695,10 @@
753
695
  "__schema": "TypeRefSchema",
754
696
  "location": {
755
697
  "filePath": "merge-lanes.main.runtime.ts",
756
- "line": 338,
698
+ "line": 341,
757
699
  "character": 14
758
700
  },
759
- "name": "MergeFromScopeResult",
760
- "internalFilePath": "merge-lanes.main.runtime.ts"
701
+ "name": "MergeFromScopeResult"
761
702
  }
762
703
  ]
763
704
  },
@@ -769,7 +710,7 @@
769
710
  "__schema": "VariableLikeSchema",
770
711
  "location": {
771
712
  "filePath": "merge-lanes.main.runtime.ts",
772
- "line": 540,
713
+ "line": 482,
773
714
  "character": 3
774
715
  },
775
716
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -778,7 +719,7 @@
778
719
  "__schema": "InferenceTypeSchema",
779
720
  "location": {
780
721
  "filePath": "merge-lanes.main.runtime.ts",
781
- "line": 540,
722
+ "line": 482,
782
723
  "character": 3
783
724
  },
784
725
  "type": "never[]"
@@ -790,7 +731,7 @@
790
731
  "__schema": "VariableLikeSchema",
791
732
  "location": {
792
733
  "filePath": "merge-lanes.main.runtime.ts",
793
- "line": 541,
734
+ "line": 483,
794
735
  "character": 3
795
736
  },
796
737
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -799,7 +740,7 @@
799
740
  "__schema": "InferenceTypeSchema",
800
741
  "location": {
801
742
  "filePath": "merge-lanes.main.runtime.ts",
802
- "line": 541,
743
+ "line": 483,
803
744
  "character": 3
804
745
  },
805
746
  "type": "Aspect[]"
@@ -811,7 +752,7 @@
811
752
  "__schema": "VariableLikeSchema",
812
753
  "location": {
813
754
  "filePath": "merge-lanes.main.runtime.ts",
814
- "line": 554,
755
+ "line": 496,
815
756
  "character": 3
816
757
  },
817
758
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -820,7 +761,7 @@
820
761
  "__schema": "InferenceTypeSchema",
821
762
  "location": {
822
763
  "filePath": "merge-lanes.main.runtime.ts",
823
- "line": 554,
764
+ "line": 496,
824
765
  "character": 3
825
766
  },
826
767
  "type": "RuntimeDefinition"
@@ -832,7 +773,7 @@
832
773
  "__schema": "FunctionLikeSchema",
833
774
  "location": {
834
775
  "filePath": "merge-lanes.main.runtime.ts",
835
- "line": 556,
776
+ "line": 498,
836
777
  "character": 3
837
778
  },
838
779
  "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -842,7 +783,7 @@
842
783
  "__schema": "ParameterSchema",
843
784
  "location": {
844
785
  "filePath": "merge-lanes.main.runtime.ts",
845
- "line": 556,
786
+ "line": 498,
846
787
  "character": 25
847
788
  },
848
789
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -850,7 +791,7 @@
850
791
  "__schema": "TupleTypeSchema",
851
792
  "location": {
852
793
  "filePath": "merge-lanes.main.runtime.ts",
853
- "line": 568,
794
+ "line": 510,
854
795
  "character": 6
855
796
  },
856
797
  "elements": [
@@ -858,144 +799,100 @@
858
799
  "__schema": "TypeRefSchema",
859
800
  "location": {
860
801
  "filePath": "merge-lanes.main.runtime.ts",
861
- "line": 569,
802
+ "line": 511,
862
803
  "character": 5
863
804
  },
864
- "name": "LanesMain",
865
- "componentId": {
866
- "scope": "teambit.lanes",
867
- "name": "lanes"
868
- }
805
+ "name": "LanesMain"
869
806
  },
870
807
  {
871
808
  "__schema": "TypeRefSchema",
872
809
  "location": {
873
810
  "filePath": "merge-lanes.main.runtime.ts",
874
- "line": 570,
811
+ "line": 512,
875
812
  "character": 5
876
813
  },
877
- "name": "CLIMain",
878
- "componentId": {
879
- "scope": "teambit.harmony",
880
- "name": "cli"
881
- }
814
+ "name": "CLIMain"
882
815
  },
883
816
  {
884
817
  "__schema": "TypeRefSchema",
885
818
  "location": {
886
819
  "filePath": "merge-lanes.main.runtime.ts",
887
- "line": 571,
820
+ "line": 513,
888
821
  "character": 5
889
822
  },
890
- "name": "Workspace",
891
- "componentId": {
892
- "scope": "teambit.workspace",
893
- "name": "workspace"
894
- }
823
+ "name": "Workspace"
895
824
  },
896
825
  {
897
826
  "__schema": "TypeRefSchema",
898
827
  "location": {
899
828
  "filePath": "merge-lanes.main.runtime.ts",
900
- "line": 572,
829
+ "line": 514,
901
830
  "character": 5
902
831
  },
903
- "name": "MergingMain",
904
- "componentId": {
905
- "scope": "teambit.component",
906
- "name": "merging"
907
- }
832
+ "name": "MergingMain"
908
833
  },
909
834
  {
910
835
  "__schema": "TypeRefSchema",
911
836
  "location": {
912
837
  "filePath": "merge-lanes.main.runtime.ts",
913
- "line": 573,
838
+ "line": 515,
914
839
  "character": 5
915
840
  },
916
- "name": "LoggerMain",
917
- "componentId": {
918
- "scope": "teambit.harmony",
919
- "name": "logger"
920
- }
841
+ "name": "LoggerMain"
921
842
  },
922
843
  {
923
844
  "__schema": "TypeRefSchema",
924
845
  "location": {
925
846
  "filePath": "merge-lanes.main.runtime.ts",
926
- "line": 574,
847
+ "line": 516,
927
848
  "character": 5
928
849
  },
929
- "name": "RemoveMain",
930
- "componentId": {
931
- "scope": "teambit.component",
932
- "name": "remove"
933
- }
850
+ "name": "RemoveMain"
934
851
  },
935
852
  {
936
853
  "__schema": "TypeRefSchema",
937
854
  "location": {
938
855
  "filePath": "merge-lanes.main.runtime.ts",
939
- "line": 575,
856
+ "line": 517,
940
857
  "character": 5
941
858
  },
942
- "name": "ScopeMain",
943
- "componentId": {
944
- "scope": "teambit.scope",
945
- "name": "scope"
946
- }
859
+ "name": "ScopeMain"
947
860
  },
948
861
  {
949
862
  "__schema": "TypeRefSchema",
950
863
  "location": {
951
864
  "filePath": "merge-lanes.main.runtime.ts",
952
- "line": 576,
865
+ "line": 518,
953
866
  "character": 5
954
867
  },
955
- "name": "ExportMain",
956
- "componentId": {
957
- "scope": "teambit.scope",
958
- "name": "export"
959
- }
868
+ "name": "ExportMain"
960
869
  },
961
870
  {
962
871
  "__schema": "TypeRefSchema",
963
872
  "location": {
964
873
  "filePath": "merge-lanes.main.runtime.ts",
965
- "line": 577,
874
+ "line": 519,
966
875
  "character": 5
967
876
  },
968
- "name": "ImporterMain",
969
- "componentId": {
970
- "scope": "teambit.scope",
971
- "name": "importer"
972
- }
877
+ "name": "ImporterMain"
973
878
  },
974
879
  {
975
880
  "__schema": "TypeRefSchema",
976
881
  "location": {
977
882
  "filePath": "merge-lanes.main.runtime.ts",
978
- "line": 578,
883
+ "line": 520,
979
884
  "character": 5
980
885
  },
981
- "name": "CheckoutMain",
982
- "componentId": {
983
- "scope": "teambit.component",
984
- "name": "checkout"
985
- }
886
+ "name": "CheckoutMain"
986
887
  },
987
888
  {
988
889
  "__schema": "TypeRefSchema",
989
890
  "location": {
990
891
  "filePath": "merge-lanes.main.runtime.ts",
991
- "line": 579,
892
+ "line": 521,
992
893
  "character": 5
993
894
  },
994
- "name": "GlobalConfigMain",
995
- "componentId": {
996
- "scope": "teambit.harmony",
997
- "name": "global-config"
998
- }
895
+ "name": "GlobalConfigMain"
999
896
  }
1000
897
  ]
1001
898
  },
@@ -1007,7 +904,7 @@
1007
904
  "__schema": "InferenceTypeSchema",
1008
905
  "location": {
1009
906
  "filePath": "merge-lanes.main.runtime.ts",
1010
- "line": 556,
907
+ "line": 498,
1011
908
  "character": 3
1012
909
  },
1013
910
  "type": "Promise<MergeLanesMain>"
@@ -1073,16 +970,16 @@
1073
970
  "__schema": "TypeSchema",
1074
971
  "location": {
1075
972
  "filePath": "merge-lanes.main.runtime.ts",
1076
- "line": 40,
973
+ "line": 39,
1077
974
  "character": 1
1078
975
  },
1079
- "signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n squash?: boolean | undefined;\n noSquash: boolean;\n ... 7 more ...;\n excludeNonLaneComps?: boolean | undefined;\n}",
976
+ "signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n squash?: boolean | undefined;\n noSquash: boolean;\n ... 8 more ...;\n shouldIncludeUpdateDependents?: boolean | undefined;\n}",
1080
977
  "name": "MergeLaneOptions",
1081
978
  "type": {
1082
979
  "__schema": "TypeLiteralSchema",
1083
980
  "location": {
1084
981
  "filePath": "merge-lanes.main.runtime.ts",
1085
- "line": 40,
982
+ "line": 39,
1086
983
  "character": 32
1087
984
  },
1088
985
  "members": [
@@ -1090,7 +987,7 @@
1090
987
  "__schema": "VariableLikeSchema",
1091
988
  "location": {
1092
989
  "filePath": "merge-lanes.main.runtime.ts",
1093
- "line": 41,
990
+ "line": 40,
1094
991
  "character": 3
1095
992
  },
1096
993
  "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -1099,11 +996,10 @@
1099
996
  "__schema": "TypeRefSchema",
1100
997
  "location": {
1101
998
  "filePath": "merge-lanes.main.runtime.ts",
1102
- "line": 41,
999
+ "line": 40,
1103
1000
  "character": 18
1104
1001
  },
1105
- "name": "MergeStrategy",
1106
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1002
+ "name": "MergeStrategy"
1107
1003
  },
1108
1004
  "isOptional": false
1109
1005
  },
@@ -1111,7 +1007,7 @@
1111
1007
  "__schema": "VariableLikeSchema",
1112
1008
  "location": {
1113
1009
  "filePath": "merge-lanes.main.runtime.ts",
1114
- "line": 42,
1010
+ "line": 41,
1115
1011
  "character": 3
1116
1012
  },
1117
1013
  "signature": "(property) ours?: boolean | undefined",
@@ -1120,7 +1016,7 @@
1120
1016
  "__schema": "KeywordTypeSchema",
1121
1017
  "location": {
1122
1018
  "filePath": "merge-lanes.main.runtime.ts",
1123
- "line": 42,
1019
+ "line": 41,
1124
1020
  "character": 10
1125
1021
  },
1126
1022
  "name": "boolean"
@@ -1131,7 +1027,7 @@
1131
1027
  "__schema": "VariableLikeSchema",
1132
1028
  "location": {
1133
1029
  "filePath": "merge-lanes.main.runtime.ts",
1134
- "line": 43,
1030
+ "line": 42,
1135
1031
  "character": 3
1136
1032
  },
1137
1033
  "signature": "(property) theirs?: boolean | undefined",
@@ -1140,7 +1036,7 @@
1140
1036
  "__schema": "KeywordTypeSchema",
1141
1037
  "location": {
1142
1038
  "filePath": "merge-lanes.main.runtime.ts",
1143
- "line": 43,
1039
+ "line": 42,
1144
1040
  "character": 12
1145
1041
  },
1146
1042
  "name": "boolean"
@@ -1151,7 +1047,7 @@
1151
1047
  "__schema": "VariableLikeSchema",
1152
1048
  "location": {
1153
1049
  "filePath": "merge-lanes.main.runtime.ts",
1154
- "line": 44,
1050
+ "line": 43,
1155
1051
  "character": 3
1156
1052
  },
1157
1053
  "signature": "(property) noSnap: boolean",
@@ -1160,7 +1056,7 @@
1160
1056
  "__schema": "KeywordTypeSchema",
1161
1057
  "location": {
1162
1058
  "filePath": "merge-lanes.main.runtime.ts",
1163
- "line": 44,
1059
+ "line": 43,
1164
1060
  "character": 11
1165
1061
  },
1166
1062
  "name": "boolean"
@@ -1171,7 +1067,7 @@
1171
1067
  "__schema": "VariableLikeSchema",
1172
1068
  "location": {
1173
1069
  "filePath": "merge-lanes.main.runtime.ts",
1174
- "line": 45,
1070
+ "line": 44,
1175
1071
  "character": 3
1176
1072
  },
1177
1073
  "signature": "(property) snapMessage: string",
@@ -1180,7 +1076,7 @@
1180
1076
  "__schema": "KeywordTypeSchema",
1181
1077
  "location": {
1182
1078
  "filePath": "merge-lanes.main.runtime.ts",
1183
- "line": 45,
1079
+ "line": 44,
1184
1080
  "character": 16
1185
1081
  },
1186
1082
  "name": "string"
@@ -1191,7 +1087,7 @@
1191
1087
  "__schema": "VariableLikeSchema",
1192
1088
  "location": {
1193
1089
  "filePath": "merge-lanes.main.runtime.ts",
1194
- "line": 46,
1090
+ "line": 45,
1195
1091
  "character": 3
1196
1092
  },
1197
1093
  "signature": "(property) existingOnWorkspaceOnly: boolean",
@@ -1200,7 +1096,7 @@
1200
1096
  "__schema": "KeywordTypeSchema",
1201
1097
  "location": {
1202
1098
  "filePath": "merge-lanes.main.runtime.ts",
1203
- "line": 46,
1099
+ "line": 45,
1204
1100
  "character": 28
1205
1101
  },
1206
1102
  "name": "boolean"
@@ -1211,7 +1107,7 @@
1211
1107
  "__schema": "VariableLikeSchema",
1212
1108
  "location": {
1213
1109
  "filePath": "merge-lanes.main.runtime.ts",
1214
- "line": 47,
1110
+ "line": 46,
1215
1111
  "character": 3
1216
1112
  },
1217
1113
  "signature": "(property) build: boolean",
@@ -1220,7 +1116,7 @@
1220
1116
  "__schema": "KeywordTypeSchema",
1221
1117
  "location": {
1222
1118
  "filePath": "merge-lanes.main.runtime.ts",
1223
- "line": 47,
1119
+ "line": 46,
1224
1120
  "character": 10
1225
1121
  },
1226
1122
  "name": "boolean"
@@ -1231,7 +1127,7 @@
1231
1127
  "__schema": "VariableLikeSchema",
1232
1128
  "location": {
1233
1129
  "filePath": "merge-lanes.main.runtime.ts",
1234
- "line": 48,
1130
+ "line": 47,
1235
1131
  "character": 3
1236
1132
  },
1237
1133
  "signature": "(property) keepReadme: boolean",
@@ -1240,7 +1136,7 @@
1240
1136
  "__schema": "KeywordTypeSchema",
1241
1137
  "location": {
1242
1138
  "filePath": "merge-lanes.main.runtime.ts",
1243
- "line": 48,
1139
+ "line": 47,
1244
1140
  "character": 15
1245
1141
  },
1246
1142
  "name": "boolean"
@@ -1251,7 +1147,7 @@
1251
1147
  "__schema": "VariableLikeSchema",
1252
1148
  "location": {
1253
1149
  "filePath": "merge-lanes.main.runtime.ts",
1254
- "line": 49,
1150
+ "line": 48,
1255
1151
  "character": 3
1256
1152
  },
1257
1153
  "signature": "(property) squash?: boolean | undefined",
@@ -1260,7 +1156,7 @@
1260
1156
  "__schema": "KeywordTypeSchema",
1261
1157
  "location": {
1262
1158
  "filePath": "merge-lanes.main.runtime.ts",
1263
- "line": 49,
1159
+ "line": 48,
1264
1160
  "character": 12
1265
1161
  },
1266
1162
  "name": "boolean"
@@ -1271,7 +1167,7 @@
1271
1167
  "__schema": "VariableLikeSchema",
1272
1168
  "location": {
1273
1169
  "filePath": "merge-lanes.main.runtime.ts",
1274
- "line": 50,
1170
+ "line": 49,
1275
1171
  "character": 3
1276
1172
  },
1277
1173
  "signature": "(property) noSquash: boolean",
@@ -1280,7 +1176,7 @@
1280
1176
  "__schema": "KeywordTypeSchema",
1281
1177
  "location": {
1282
1178
  "filePath": "merge-lanes.main.runtime.ts",
1283
- "line": 50,
1179
+ "line": 49,
1284
1180
  "character": 13
1285
1181
  },
1286
1182
  "name": "boolean"
@@ -1291,7 +1187,7 @@
1291
1187
  "__schema": "VariableLikeSchema",
1292
1188
  "location": {
1293
1189
  "filePath": "merge-lanes.main.runtime.ts",
1294
- "line": 51,
1190
+ "line": 50,
1295
1191
  "character": 3
1296
1192
  },
1297
1193
  "signature": "(property) tag?: boolean | undefined",
@@ -1300,7 +1196,7 @@
1300
1196
  "__schema": "KeywordTypeSchema",
1301
1197
  "location": {
1302
1198
  "filePath": "merge-lanes.main.runtime.ts",
1303
- "line": 51,
1199
+ "line": 50,
1304
1200
  "character": 9
1305
1201
  },
1306
1202
  "name": "boolean"
@@ -1311,7 +1207,7 @@
1311
1207
  "__schema": "VariableLikeSchema",
1312
1208
  "location": {
1313
1209
  "filePath": "merge-lanes.main.runtime.ts",
1314
- "line": 52,
1210
+ "line": 51,
1315
1211
  "character": 3
1316
1212
  },
1317
1213
  "signature": "(property) pattern?: string | undefined",
@@ -1320,7 +1216,7 @@
1320
1216
  "__schema": "KeywordTypeSchema",
1321
1217
  "location": {
1322
1218
  "filePath": "merge-lanes.main.runtime.ts",
1323
- "line": 52,
1219
+ "line": 51,
1324
1220
  "character": 13
1325
1221
  },
1326
1222
  "name": "string"
@@ -1331,7 +1227,7 @@
1331
1227
  "__schema": "VariableLikeSchema",
1332
1228
  "location": {
1333
1229
  "filePath": "merge-lanes.main.runtime.ts",
1334
- "line": 53,
1230
+ "line": 52,
1335
1231
  "character": 3
1336
1232
  },
1337
1233
  "signature": "(property) includeDeps?: boolean | undefined",
@@ -1340,7 +1236,7 @@
1340
1236
  "__schema": "KeywordTypeSchema",
1341
1237
  "location": {
1342
1238
  "filePath": "merge-lanes.main.runtime.ts",
1343
- "line": 53,
1239
+ "line": 52,
1344
1240
  "character": 17
1345
1241
  },
1346
1242
  "name": "boolean"
@@ -1351,7 +1247,7 @@
1351
1247
  "__schema": "VariableLikeSchema",
1352
1248
  "location": {
1353
1249
  "filePath": "merge-lanes.main.runtime.ts",
1354
- "line": 54,
1250
+ "line": 53,
1355
1251
  "character": 3
1356
1252
  },
1357
1253
  "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -1360,7 +1256,7 @@
1360
1256
  "__schema": "KeywordTypeSchema",
1361
1257
  "location": {
1362
1258
  "filePath": "merge-lanes.main.runtime.ts",
1363
- "line": 54,
1259
+ "line": 53,
1364
1260
  "character": 32
1365
1261
  },
1366
1262
  "name": "boolean"
@@ -1371,7 +1267,7 @@
1371
1267
  "__schema": "VariableLikeSchema",
1372
1268
  "location": {
1373
1269
  "filePath": "merge-lanes.main.runtime.ts",
1374
- "line": 55,
1270
+ "line": 54,
1375
1271
  "character": 3
1376
1272
  },
1377
1273
  "signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
@@ -1380,11 +1276,10 @@
1380
1276
  "__schema": "TypeRefSchema",
1381
1277
  "location": {
1382
1278
  "filePath": "merge-lanes.main.runtime.ts",
1383
- "line": 55,
1279
+ "line": 54,
1384
1280
  "character": 22
1385
1281
  },
1386
- "name": "MergeStrategy",
1387
- "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1282
+ "name": "MergeStrategy"
1388
1283
  },
1389
1284
  "isOptional": true
1390
1285
  },
@@ -1392,7 +1287,7 @@
1392
1287
  "__schema": "VariableLikeSchema",
1393
1288
  "location": {
1394
1289
  "filePath": "merge-lanes.main.runtime.ts",
1395
- "line": 56,
1290
+ "line": 55,
1396
1291
  "character": 3
1397
1292
  },
1398
1293
  "signature": "(property) ignoreConfigChanges?: boolean | undefined",
@@ -1401,7 +1296,7 @@
1401
1296
  "__schema": "KeywordTypeSchema",
1402
1297
  "location": {
1403
1298
  "filePath": "merge-lanes.main.runtime.ts",
1404
- "line": 56,
1299
+ "line": 55,
1405
1300
  "character": 25
1406
1301
  },
1407
1302
  "name": "boolean"
@@ -1412,7 +1307,7 @@
1412
1307
  "__schema": "VariableLikeSchema",
1413
1308
  "location": {
1414
1309
  "filePath": "merge-lanes.main.runtime.ts",
1415
- "line": 57,
1310
+ "line": 56,
1416
1311
  "character": 3
1417
1312
  },
1418
1313
  "signature": "(property) skipFetch?: boolean | undefined",
@@ -1421,7 +1316,7 @@
1421
1316
  "__schema": "KeywordTypeSchema",
1422
1317
  "location": {
1423
1318
  "filePath": "merge-lanes.main.runtime.ts",
1424
- "line": 57,
1319
+ "line": 56,
1425
1320
  "character": 15
1426
1321
  },
1427
1322
  "name": "boolean"
@@ -1432,7 +1327,7 @@
1432
1327
  "__schema": "VariableLikeSchema",
1433
1328
  "location": {
1434
1329
  "filePath": "merge-lanes.main.runtime.ts",
1435
- "line": 58,
1330
+ "line": 57,
1436
1331
  "character": 3
1437
1332
  },
1438
1333
  "signature": "(property) excludeNonLaneComps?: boolean | undefined",
@@ -1441,12 +1336,32 @@
1441
1336
  "__schema": "KeywordTypeSchema",
1442
1337
  "location": {
1443
1338
  "filePath": "merge-lanes.main.runtime.ts",
1444
- "line": 58,
1339
+ "line": 57,
1445
1340
  "character": 25
1446
1341
  },
1447
1342
  "name": "boolean"
1448
1343
  },
1449
1344
  "isOptional": true
1345
+ },
1346
+ {
1347
+ "__schema": "VariableLikeSchema",
1348
+ "location": {
1349
+ "filePath": "merge-lanes.main.runtime.ts",
1350
+ "line": 58,
1351
+ "character": 3
1352
+ },
1353
+ "signature": "(property) shouldIncludeUpdateDependents?: boolean | undefined",
1354
+ "name": "shouldIncludeUpdateDependents",
1355
+ "type": {
1356
+ "__schema": "KeywordTypeSchema",
1357
+ "location": {
1358
+ "filePath": "merge-lanes.main.runtime.ts",
1359
+ "line": 58,
1360
+ "character": 35
1361
+ },
1362
+ "name": "boolean"
1363
+ },
1364
+ "isOptional": true
1450
1365
  }
1451
1366
  ]
1452
1367
  }
@@ -1491,12 +1406,7 @@
1491
1406
  "line": 61,
1492
1407
  "character": 14
1493
1408
  },
1494
- "name": "ComponentID",
1495
- "componentId": {
1496
- "scope": "teambit.component",
1497
- "name": "component-id",
1498
- "version": "1.2.0"
1499
- }
1409
+ "name": "ComponentID"
1500
1410
  }
1501
1411
  },
1502
1412
  "isOptional": false
@@ -1524,12 +1434,7 @@
1524
1434
  "line": 62,
1525
1435
  "character": 16
1526
1436
  },
1527
- "name": "ComponentID",
1528
- "componentId": {
1529
- "scope": "teambit.component",
1530
- "name": "component-id",
1531
- "version": "1.2.0"
1532
- }
1437
+ "name": "ComponentID"
1533
1438
  }
1534
1439
  },
1535
1440
  "isOptional": false
@@ -1736,12 +1641,7 @@
1736
1641
  "line": 65,
1737
1642
  "character": 16
1738
1643
  },
1739
- "name": "ComponentID",
1740
- "componentId": {
1741
- "scope": "teambit.component",
1742
- "name": "component-id",
1743
- "version": "1.2.0"
1744
- }
1644
+ "name": "ComponentID"
1745
1645
  }
1746
1646
  },
1747
1647
  "isOptional": true
@@ -1769,12 +1669,7 @@
1769
1669
  "line": 66,
1770
1670
  "character": 21
1771
1671
  },
1772
- "name": "ComponentID",
1773
- "componentId": {
1774
- "scope": "teambit.component",
1775
- "name": "component-id",
1776
- "version": "1.2.0"
1777
- }
1672
+ "name": "ComponentID"
1778
1673
  }
1779
1674
  },
1780
1675
  "isOptional": false
@@ -1845,11 +1740,7 @@
1845
1740
  "line": 72,
1846
1741
  "character": 24
1847
1742
  },
1848
- "name": "Workspace",
1849
- "componentId": {
1850
- "scope": "teambit.workspace",
1851
- "name": "workspace"
1852
- }
1743
+ "name": "Workspace"
1853
1744
  },
1854
1745
  {
1855
1746
  "__schema": "KeywordTypeSchema",
@@ -1880,11 +1771,7 @@
1880
1771
  "line": 73,
1881
1772
  "character": 22
1882
1773
  },
1883
- "name": "MergingMain",
1884
- "componentId": {
1885
- "scope": "teambit.component",
1886
- "name": "merging"
1887
- }
1774
+ "name": "MergingMain"
1888
1775
  },
1889
1776
  "isOptional": false,
1890
1777
  "isSpread": false
@@ -1904,11 +1791,7 @@
1904
1791
  "line": 74,
1905
1792
  "character": 20
1906
1793
  },
1907
- "name": "LanesMain",
1908
- "componentId": {
1909
- "scope": "teambit.lanes",
1910
- "name": "lanes"
1911
- }
1794
+ "name": "LanesMain"
1912
1795
  },
1913
1796
  "isOptional": false,
1914
1797
  "isSpread": false
@@ -1928,11 +1811,7 @@
1928
1811
  "line": 75,
1929
1812
  "character": 22
1930
1813
  },
1931
- "name": "Logger",
1932
- "componentId": {
1933
- "scope": "teambit.harmony",
1934
- "name": "logger"
1935
- }
1814
+ "name": "Logger"
1936
1815
  },
1937
1816
  "isOptional": false,
1938
1817
  "isSpread": false
@@ -1952,11 +1831,7 @@
1952
1831
  "line": 76,
1953
1832
  "character": 21
1954
1833
  },
1955
- "name": "RemoveMain",
1956
- "componentId": {
1957
- "scope": "teambit.component",
1958
- "name": "remove"
1959
- }
1834
+ "name": "RemoveMain"
1960
1835
  },
1961
1836
  "isOptional": false,
1962
1837
  "isSpread": false
@@ -1976,11 +1851,7 @@
1976
1851
  "line": 77,
1977
1852
  "character": 20
1978
1853
  },
1979
- "name": "ScopeMain",
1980
- "componentId": {
1981
- "scope": "teambit.scope",
1982
- "name": "scope"
1983
- }
1854
+ "name": "ScopeMain"
1984
1855
  },
1985
1856
  "isOptional": false,
1986
1857
  "isSpread": false
@@ -2000,11 +1871,7 @@
2000
1871
  "line": 78,
2001
1872
  "character": 23
2002
1873
  },
2003
- "name": "ExportMain",
2004
- "componentId": {
2005
- "scope": "teambit.scope",
2006
- "name": "export"
2007
- }
1874
+ "name": "ExportMain"
2008
1875
  },
2009
1876
  "isOptional": false,
2010
1877
  "isSpread": false
@@ -2024,11 +1891,7 @@
2024
1891
  "line": 79,
2025
1892
  "character": 23
2026
1893
  },
2027
- "name": "ImporterMain",
2028
- "componentId": {
2029
- "scope": "teambit.scope",
2030
- "name": "importer"
2031
- }
1894
+ "name": "ImporterMain"
2032
1895
  },
2033
1896
  "isOptional": false,
2034
1897
  "isSpread": false
@@ -2048,11 +1911,7 @@
2048
1911
  "line": 80,
2049
1912
  "character": 23
2050
1913
  },
2051
- "name": "CheckoutMain",
2052
- "componentId": {
2053
- "scope": "teambit.component",
2054
- "name": "checkout"
2055
- }
1914
+ "name": "CheckoutMain"
2056
1915
  },
2057
1916
  "isOptional": false,
2058
1917
  "isSpread": false
@@ -2114,8 +1973,7 @@
2114
1973
  "line": 83,
2115
1974
  "character": 51
2116
1975
  },
2117
- "name": "MergeLaneOptions",
2118
- "internalFilePath": "merge-lanes.main.runtime.ts"
1976
+ "name": "MergeLaneOptions"
2119
1977
  },
2120
1978
  "isOptional": false,
2121
1979
  "isSpread": false
@@ -2159,12 +2017,7 @@
2159
2017
  "line": 94,
2160
2018
  "character": 18
2161
2019
  },
2162
- "name": "LaneId",
2163
- "componentId": {
2164
- "scope": "teambit.lanes",
2165
- "name": "lane-id",
2166
- "version": "0.0.311"
2167
- }
2020
+ "name": "LaneId"
2168
2021
  },
2169
2022
  "isOptional": false,
2170
2023
  "isSpread": false
@@ -2184,12 +2037,7 @@
2184
2037
  "line": 95,
2185
2038
  "character": 20
2186
2039
  },
2187
- "name": "LaneId",
2188
- "componentId": {
2189
- "scope": "teambit.lanes",
2190
- "name": "lane-id",
2191
- "version": "0.0.311"
2192
- }
2040
+ "name": "LaneId"
2193
2041
  },
2194
2042
  "isOptional": false,
2195
2043
  "isSpread": false
@@ -2209,8 +2057,7 @@
2209
2057
  "line": 96,
2210
2058
  "character": 14
2211
2059
  },
2212
- "name": "MergeLaneOptions",
2213
- "internalFilePath": "merge-lanes.main.runtime.ts"
2060
+ "name": "MergeLaneOptions"
2214
2061
  },
2215
2062
  "isOptional": false,
2216
2063
  "isSpread": false
@@ -2300,11 +2147,7 @@
2300
2147
  "line": 97,
2301
2148
  "character": 91
2302
2149
  },
2303
- "name": "ConfigMergeResult",
2304
- "componentId": {
2305
- "scope": "teambit.workspace",
2306
- "name": "config-merger"
2307
- }
2150
+ "name": "ConfigMergeResult"
2308
2151
  }
2309
2152
  },
2310
2153
  "isOptional": false
@@ -2321,7 +2164,7 @@
2321
2164
  "__schema": "FunctionLikeSchema",
2322
2165
  "location": {
2323
2166
  "filePath": "merge-lanes.main.runtime.ts",
2324
- "line": 278,
2167
+ "line": 281,
2325
2168
  "character": 3
2326
2169
  },
2327
2170
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -2331,7 +2174,7 @@
2331
2174
  "__schema": "ParameterSchema",
2332
2175
  "location": {
2333
2176
  "filePath": "merge-lanes.main.runtime.ts",
2334
- "line": 278,
2177
+ "line": 281,
2335
2178
  "character": 24
2336
2179
  },
2337
2180
  "name": "checkoutProps",
@@ -2339,14 +2182,10 @@
2339
2182
  "__schema": "TypeRefSchema",
2340
2183
  "location": {
2341
2184
  "filePath": "merge-lanes.main.runtime.ts",
2342
- "line": 278,
2185
+ "line": 281,
2343
2186
  "character": 39
2344
2187
  },
2345
- "name": "CheckoutProps",
2346
- "componentId": {
2347
- "scope": "teambit.component",
2348
- "name": "checkout"
2349
- }
2188
+ "name": "CheckoutProps"
2350
2189
  },
2351
2190
  "isOptional": false,
2352
2191
  "isSpread": false
@@ -2355,7 +2194,7 @@
2355
2194
  "__schema": "ParameterSchema",
2356
2195
  "location": {
2357
2196
  "filePath": "merge-lanes.main.runtime.ts",
2358
- "line": 278,
2197
+ "line": 281,
2359
2198
  "character": 54
2360
2199
  },
2361
2200
  "name": "mergeAbortOpts",
@@ -2363,11 +2202,10 @@
2363
2202
  "__schema": "TypeRefSchema",
2364
2203
  "location": {
2365
2204
  "filePath": "merge-lanes.main.runtime.ts",
2366
- "line": 278,
2205
+ "line": 281,
2367
2206
  "character": 70
2368
2207
  },
2369
- "name": "MergeAbortOpts",
2370
- "internalFilePath": "merge-abort.cmd.ts"
2208
+ "name": "MergeAbortOpts"
2371
2209
  },
2372
2210
  "isOptional": false,
2373
2211
  "isSpread": false
@@ -2377,7 +2215,7 @@
2377
2215
  "__schema": "InferenceTypeSchema",
2378
2216
  "location": {
2379
2217
  "filePath": "merge-lanes.main.runtime.ts",
2380
- "line": 278,
2218
+ "line": 281,
2381
2219
  "character": 3
2382
2220
  },
2383
2221
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -2390,7 +2228,7 @@
2390
2228
  "__schema": "FunctionLikeSchema",
2391
2229
  "location": {
2392
2230
  "filePath": "merge-lanes.main.runtime.ts",
2393
- "line": 334,
2231
+ "line": 337,
2394
2232
  "character": 3
2395
2233
  },
2396
2234
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -2400,7 +2238,7 @@
2400
2238
  "__schema": "ParameterSchema",
2401
2239
  "location": {
2402
2240
  "filePath": "merge-lanes.main.runtime.ts",
2403
- "line": 335,
2241
+ "line": 338,
2404
2242
  "character": 5
2405
2243
  },
2406
2244
  "name": "fromLane",
@@ -2408,7 +2246,7 @@
2408
2246
  "__schema": "KeywordTypeSchema",
2409
2247
  "location": {
2410
2248
  "filePath": "merge-lanes.main.runtime.ts",
2411
- "line": 335,
2249
+ "line": 338,
2412
2250
  "character": 15
2413
2251
  },
2414
2252
  "name": "string"
@@ -2420,7 +2258,7 @@
2420
2258
  "__schema": "ParameterSchema",
2421
2259
  "location": {
2422
2260
  "filePath": "merge-lanes.main.runtime.ts",
2423
- "line": 336,
2261
+ "line": 339,
2424
2262
  "character": 5
2425
2263
  },
2426
2264
  "name": "toLane",
@@ -2428,7 +2266,7 @@
2428
2266
  "__schema": "KeywordTypeSchema",
2429
2267
  "location": {
2430
2268
  "filePath": "merge-lanes.main.runtime.ts",
2431
- "line": 336,
2269
+ "line": 339,
2432
2270
  "character": 13
2433
2271
  },
2434
2272
  "name": "string"
@@ -2440,7 +2278,7 @@
2440
2278
  "__schema": "ParameterSchema",
2441
2279
  "location": {
2442
2280
  "filePath": "merge-lanes.main.runtime.ts",
2443
- "line": 337,
2281
+ "line": 340,
2444
2282
  "character": 5
2445
2283
  },
2446
2284
  "name": "options",
@@ -2448,7 +2286,7 @@
2448
2286
  "__schema": "TypeIntersectionSchema",
2449
2287
  "location": {
2450
2288
  "filePath": "merge-lanes.main.runtime.ts",
2451
- "line": 337,
2289
+ "line": 340,
2452
2290
  "character": 14
2453
2291
  },
2454
2292
  "types": [
@@ -2456,7 +2294,7 @@
2456
2294
  "__schema": "TypeRefSchema",
2457
2295
  "location": {
2458
2296
  "filePath": "merge-lanes.main.runtime.ts",
2459
- "line": 337,
2297
+ "line": 340,
2460
2298
  "character": 14
2461
2299
  },
2462
2300
  "name": "Partial",
@@ -2465,11 +2303,10 @@
2465
2303
  "__schema": "TypeRefSchema",
2466
2304
  "location": {
2467
2305
  "filePath": "merge-lanes.main.runtime.ts",
2468
- "line": 337,
2306
+ "line": 340,
2469
2307
  "character": 22
2470
2308
  },
2471
- "name": "MergeLaneOptions",
2472
- "internalFilePath": "merge-lanes.main.runtime.ts"
2309
+ "name": "MergeLaneOptions"
2473
2310
  }
2474
2311
  ]
2475
2312
  },
@@ -2477,7 +2314,7 @@
2477
2314
  "__schema": "TypeLiteralSchema",
2478
2315
  "location": {
2479
2316
  "filePath": "merge-lanes.main.runtime.ts",
2480
- "line": 337,
2317
+ "line": 340,
2481
2318
  "character": 42
2482
2319
  },
2483
2320
  "members": [
@@ -2485,7 +2322,7 @@
2485
2322
  "__schema": "VariableLikeSchema",
2486
2323
  "location": {
2487
2324
  "filePath": "merge-lanes.main.runtime.ts",
2488
- "line": 337,
2325
+ "line": 340,
2489
2326
  "character": 44
2490
2327
  },
2491
2328
  "signature": "(property) push?: boolean | undefined",
@@ -2494,7 +2331,7 @@
2494
2331
  "__schema": "KeywordTypeSchema",
2495
2332
  "location": {
2496
2333
  "filePath": "merge-lanes.main.runtime.ts",
2497
- "line": 337,
2334
+ "line": 340,
2498
2335
  "character": 51
2499
2336
  },
2500
2337
  "name": "boolean"
@@ -2505,7 +2342,7 @@
2505
2342
  "__schema": "VariableLikeSchema",
2506
2343
  "location": {
2507
2344
  "filePath": "merge-lanes.main.runtime.ts",
2508
- "line": 337,
2345
+ "line": 340,
2509
2346
  "character": 60
2510
2347
  },
2511
2348
  "signature": "(property) reMerge?: boolean | undefined",
@@ -2514,7 +2351,7 @@
2514
2351
  "__schema": "KeywordTypeSchema",
2515
2352
  "location": {
2516
2353
  "filePath": "merge-lanes.main.runtime.ts",
2517
- "line": 337,
2354
+ "line": 340,
2518
2355
  "character": 70
2519
2356
  },
2520
2357
  "name": "boolean"
@@ -2533,7 +2370,7 @@
2533
2370
  "__schema": "TypeRefSchema",
2534
2371
  "location": {
2535
2372
  "filePath": "merge-lanes.main.runtime.ts",
2536
- "line": 338,
2373
+ "line": 341,
2537
2374
  "character": 6
2538
2375
  },
2539
2376
  "name": "Promise",
@@ -2542,11 +2379,10 @@
2542
2379
  "__schema": "TypeRefSchema",
2543
2380
  "location": {
2544
2381
  "filePath": "merge-lanes.main.runtime.ts",
2545
- "line": 338,
2382
+ "line": 341,
2546
2383
  "character": 14
2547
2384
  },
2548
- "name": "MergeFromScopeResult",
2549
- "internalFilePath": "merge-lanes.main.runtime.ts"
2385
+ "name": "MergeFromScopeResult"
2550
2386
  }
2551
2387
  ]
2552
2388
  },
@@ -2558,7 +2394,7 @@
2558
2394
  "__schema": "VariableLikeSchema",
2559
2395
  "location": {
2560
2396
  "filePath": "merge-lanes.main.runtime.ts",
2561
- "line": 540,
2397
+ "line": 482,
2562
2398
  "character": 3
2563
2399
  },
2564
2400
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2567,7 +2403,7 @@
2567
2403
  "__schema": "InferenceTypeSchema",
2568
2404
  "location": {
2569
2405
  "filePath": "merge-lanes.main.runtime.ts",
2570
- "line": 540,
2406
+ "line": 482,
2571
2407
  "character": 3
2572
2408
  },
2573
2409
  "type": "never[]"
@@ -2579,7 +2415,7 @@
2579
2415
  "__schema": "VariableLikeSchema",
2580
2416
  "location": {
2581
2417
  "filePath": "merge-lanes.main.runtime.ts",
2582
- "line": 541,
2418
+ "line": 483,
2583
2419
  "character": 3
2584
2420
  },
2585
2421
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2588,7 +2424,7 @@
2588
2424
  "__schema": "InferenceTypeSchema",
2589
2425
  "location": {
2590
2426
  "filePath": "merge-lanes.main.runtime.ts",
2591
- "line": 541,
2427
+ "line": 483,
2592
2428
  "character": 3
2593
2429
  },
2594
2430
  "type": "Aspect[]"
@@ -2600,7 +2436,7 @@
2600
2436
  "__schema": "VariableLikeSchema",
2601
2437
  "location": {
2602
2438
  "filePath": "merge-lanes.main.runtime.ts",
2603
- "line": 554,
2439
+ "line": 496,
2604
2440
  "character": 3
2605
2441
  },
2606
2442
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2609,7 +2445,7 @@
2609
2445
  "__schema": "InferenceTypeSchema",
2610
2446
  "location": {
2611
2447
  "filePath": "merge-lanes.main.runtime.ts",
2612
- "line": 554,
2448
+ "line": 496,
2613
2449
  "character": 3
2614
2450
  },
2615
2451
  "type": "RuntimeDefinition"
@@ -2621,7 +2457,7 @@
2621
2457
  "__schema": "FunctionLikeSchema",
2622
2458
  "location": {
2623
2459
  "filePath": "merge-lanes.main.runtime.ts",
2624
- "line": 556,
2460
+ "line": 498,
2625
2461
  "character": 3
2626
2462
  },
2627
2463
  "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -2631,7 +2467,7 @@
2631
2467
  "__schema": "ParameterSchema",
2632
2468
  "location": {
2633
2469
  "filePath": "merge-lanes.main.runtime.ts",
2634
- "line": 556,
2470
+ "line": 498,
2635
2471
  "character": 25
2636
2472
  },
2637
2473
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2639,7 +2475,7 @@
2639
2475
  "__schema": "TupleTypeSchema",
2640
2476
  "location": {
2641
2477
  "filePath": "merge-lanes.main.runtime.ts",
2642
- "line": 568,
2478
+ "line": 510,
2643
2479
  "character": 6
2644
2480
  },
2645
2481
  "elements": [
@@ -2647,144 +2483,100 @@
2647
2483
  "__schema": "TypeRefSchema",
2648
2484
  "location": {
2649
2485
  "filePath": "merge-lanes.main.runtime.ts",
2650
- "line": 569,
2486
+ "line": 511,
2651
2487
  "character": 5
2652
2488
  },
2653
- "name": "LanesMain",
2654
- "componentId": {
2655
- "scope": "teambit.lanes",
2656
- "name": "lanes"
2657
- }
2489
+ "name": "LanesMain"
2658
2490
  },
2659
2491
  {
2660
2492
  "__schema": "TypeRefSchema",
2661
2493
  "location": {
2662
2494
  "filePath": "merge-lanes.main.runtime.ts",
2663
- "line": 570,
2495
+ "line": 512,
2664
2496
  "character": 5
2665
2497
  },
2666
- "name": "CLIMain",
2667
- "componentId": {
2668
- "scope": "teambit.harmony",
2669
- "name": "cli"
2670
- }
2498
+ "name": "CLIMain"
2671
2499
  },
2672
2500
  {
2673
2501
  "__schema": "TypeRefSchema",
2674
2502
  "location": {
2675
2503
  "filePath": "merge-lanes.main.runtime.ts",
2676
- "line": 571,
2504
+ "line": 513,
2677
2505
  "character": 5
2678
2506
  },
2679
- "name": "Workspace",
2680
- "componentId": {
2681
- "scope": "teambit.workspace",
2682
- "name": "workspace"
2683
- }
2507
+ "name": "Workspace"
2684
2508
  },
2685
2509
  {
2686
2510
  "__schema": "TypeRefSchema",
2687
2511
  "location": {
2688
2512
  "filePath": "merge-lanes.main.runtime.ts",
2689
- "line": 572,
2513
+ "line": 514,
2690
2514
  "character": 5
2691
2515
  },
2692
- "name": "MergingMain",
2693
- "componentId": {
2694
- "scope": "teambit.component",
2695
- "name": "merging"
2696
- }
2516
+ "name": "MergingMain"
2697
2517
  },
2698
2518
  {
2699
2519
  "__schema": "TypeRefSchema",
2700
2520
  "location": {
2701
2521
  "filePath": "merge-lanes.main.runtime.ts",
2702
- "line": 573,
2522
+ "line": 515,
2703
2523
  "character": 5
2704
2524
  },
2705
- "name": "LoggerMain",
2706
- "componentId": {
2707
- "scope": "teambit.harmony",
2708
- "name": "logger"
2709
- }
2525
+ "name": "LoggerMain"
2710
2526
  },
2711
2527
  {
2712
2528
  "__schema": "TypeRefSchema",
2713
2529
  "location": {
2714
2530
  "filePath": "merge-lanes.main.runtime.ts",
2715
- "line": 574,
2531
+ "line": 516,
2716
2532
  "character": 5
2717
2533
  },
2718
- "name": "RemoveMain",
2719
- "componentId": {
2720
- "scope": "teambit.component",
2721
- "name": "remove"
2722
- }
2534
+ "name": "RemoveMain"
2723
2535
  },
2724
2536
  {
2725
2537
  "__schema": "TypeRefSchema",
2726
2538
  "location": {
2727
2539
  "filePath": "merge-lanes.main.runtime.ts",
2728
- "line": 575,
2540
+ "line": 517,
2729
2541
  "character": 5
2730
2542
  },
2731
- "name": "ScopeMain",
2732
- "componentId": {
2733
- "scope": "teambit.scope",
2734
- "name": "scope"
2735
- }
2543
+ "name": "ScopeMain"
2736
2544
  },
2737
2545
  {
2738
2546
  "__schema": "TypeRefSchema",
2739
2547
  "location": {
2740
2548
  "filePath": "merge-lanes.main.runtime.ts",
2741
- "line": 576,
2549
+ "line": 518,
2742
2550
  "character": 5
2743
2551
  },
2744
- "name": "ExportMain",
2745
- "componentId": {
2746
- "scope": "teambit.scope",
2747
- "name": "export"
2748
- }
2552
+ "name": "ExportMain"
2749
2553
  },
2750
2554
  {
2751
2555
  "__schema": "TypeRefSchema",
2752
2556
  "location": {
2753
2557
  "filePath": "merge-lanes.main.runtime.ts",
2754
- "line": 577,
2558
+ "line": 519,
2755
2559
  "character": 5
2756
2560
  },
2757
- "name": "ImporterMain",
2758
- "componentId": {
2759
- "scope": "teambit.scope",
2760
- "name": "importer"
2761
- }
2561
+ "name": "ImporterMain"
2762
2562
  },
2763
2563
  {
2764
2564
  "__schema": "TypeRefSchema",
2765
2565
  "location": {
2766
2566
  "filePath": "merge-lanes.main.runtime.ts",
2767
- "line": 578,
2567
+ "line": 520,
2768
2568
  "character": 5
2769
2569
  },
2770
- "name": "CheckoutMain",
2771
- "componentId": {
2772
- "scope": "teambit.component",
2773
- "name": "checkout"
2774
- }
2570
+ "name": "CheckoutMain"
2775
2571
  },
2776
2572
  {
2777
2573
  "__schema": "TypeRefSchema",
2778
2574
  "location": {
2779
2575
  "filePath": "merge-lanes.main.runtime.ts",
2780
- "line": 579,
2576
+ "line": 521,
2781
2577
  "character": 5
2782
2578
  },
2783
- "name": "GlobalConfigMain",
2784
- "componentId": {
2785
- "scope": "teambit.harmony",
2786
- "name": "global-config"
2787
- }
2579
+ "name": "GlobalConfigMain"
2788
2580
  }
2789
2581
  ]
2790
2582
  },
@@ -2796,7 +2588,7 @@
2796
2588
  "__schema": "InferenceTypeSchema",
2797
2589
  "location": {
2798
2590
  "filePath": "merge-lanes.main.runtime.ts",
2799
- "line": 556,
2591
+ "line": 498,
2800
2592
  "character": 3
2801
2593
  },
2802
2594
  "type": "Promise<MergeLanesMain>"
@@ -2814,7 +2606,7 @@
2814
2606
  "__schema": "UnImplementedSchema",
2815
2607
  "location": {
2816
2608
  "filePath": "merge-lanes.main.runtime.ts",
2817
- "line": 849,
2609
+ "line": 793,
2818
2610
  "character": 16
2819
2611
  },
2820
2612
  "name": "MergeLanesMain",
@@ -2826,7 +2618,7 @@
2826
2618
  "__schema": "FunctionLikeSchema",
2827
2619
  "location": {
2828
2620
  "filePath": "merge-lanes.main.runtime.ts",
2829
- "line": 601,
2621
+ "line": 543,
2830
2622
  "character": 1
2831
2623
  },
2832
2624
  "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -2836,7 +2628,7 @@
2836
2628
  "__schema": "ParameterSchema",
2837
2629
  "location": {
2838
2630
  "filePath": "merge-lanes.main.runtime.ts",
2839
- "line": 602,
2631
+ "line": 544,
2840
2632
  "character": 3
2841
2633
  },
2842
2634
  "name": "allComponentsStatus",
@@ -2844,21 +2636,17 @@
2844
2636
  "__schema": "TypeArraySchema",
2845
2637
  "location": {
2846
2638
  "filePath": "merge-lanes.main.runtime.ts",
2847
- "line": 602,
2639
+ "line": 544,
2848
2640
  "character": 24
2849
2641
  },
2850
2642
  "type": {
2851
2643
  "__schema": "TypeRefSchema",
2852
2644
  "location": {
2853
2645
  "filePath": "merge-lanes.main.runtime.ts",
2854
- "line": 602,
2646
+ "line": 544,
2855
2647
  "character": 24
2856
2648
  },
2857
- "name": "ComponentMergeStatus",
2858
- "componentId": {
2859
- "scope": "teambit.component",
2860
- "name": "merging"
2861
- }
2649
+ "name": "ComponentMergeStatus"
2862
2650
  }
2863
2651
  },
2864
2652
  "isOptional": false,
@@ -2868,7 +2656,7 @@
2868
2656
  "__schema": "ParameterSchema",
2869
2657
  "location": {
2870
2658
  "filePath": "merge-lanes.main.runtime.ts",
2871
- "line": 603,
2659
+ "line": 545,
2872
2660
  "character": 3
2873
2661
  },
2874
2662
  "name": "compIdsToKeep",
@@ -2876,22 +2664,17 @@
2876
2664
  "__schema": "TypeArraySchema",
2877
2665
  "location": {
2878
2666
  "filePath": "merge-lanes.main.runtime.ts",
2879
- "line": 603,
2667
+ "line": 545,
2880
2668
  "character": 18
2881
2669
  },
2882
2670
  "type": {
2883
2671
  "__schema": "TypeRefSchema",
2884
2672
  "location": {
2885
2673
  "filePath": "merge-lanes.main.runtime.ts",
2886
- "line": 603,
2674
+ "line": 545,
2887
2675
  "character": 18
2888
2676
  },
2889
- "name": "ComponentID",
2890
- "componentId": {
2891
- "scope": "teambit.component",
2892
- "name": "component-id",
2893
- "version": "1.2.0"
2894
- }
2677
+ "name": "ComponentID"
2895
2678
  }
2896
2679
  },
2897
2680
  "isOptional": false,
@@ -2901,7 +2684,7 @@
2901
2684
  "__schema": "ParameterSchema",
2902
2685
  "location": {
2903
2686
  "filePath": "merge-lanes.main.runtime.ts",
2904
- "line": 604,
2687
+ "line": 546,
2905
2688
  "character": 3
2906
2689
  },
2907
2690
  "name": "allBitIds",
@@ -2909,22 +2692,17 @@
2909
2692
  "__schema": "TypeArraySchema",
2910
2693
  "location": {
2911
2694
  "filePath": "merge-lanes.main.runtime.ts",
2912
- "line": 604,
2695
+ "line": 546,
2913
2696
  "character": 14
2914
2697
  },
2915
2698
  "type": {
2916
2699
  "__schema": "TypeRefSchema",
2917
2700
  "location": {
2918
2701
  "filePath": "merge-lanes.main.runtime.ts",
2919
- "line": 604,
2702
+ "line": 546,
2920
2703
  "character": 14
2921
2704
  },
2922
- "name": "ComponentID",
2923
- "componentId": {
2924
- "scope": "teambit.component",
2925
- "name": "component-id",
2926
- "version": "1.2.0"
2927
- }
2705
+ "name": "ComponentID"
2928
2706
  }
2929
2707
  },
2930
2708
  "isOptional": false,
@@ -2934,7 +2712,7 @@
2934
2712
  "__schema": "ParameterSchema",
2935
2713
  "location": {
2936
2714
  "filePath": "merge-lanes.main.runtime.ts",
2937
- "line": 605,
2715
+ "line": 547,
2938
2716
  "character": 3
2939
2717
  },
2940
2718
  "name": "legacyScope",
@@ -2942,7 +2720,7 @@
2942
2720
  "__schema": "TypeRefSchema",
2943
2721
  "location": {
2944
2722
  "filePath": "merge-lanes.main.runtime.ts",
2945
- "line": 605,
2723
+ "line": 547,
2946
2724
  "character": 16
2947
2725
  },
2948
2726
  "name": "LegacyScope"
@@ -2954,7 +2732,7 @@
2954
2732
  "__schema": "ParameterSchema",
2955
2733
  "location": {
2956
2734
  "filePath": "merge-lanes.main.runtime.ts",
2957
- "line": 606,
2735
+ "line": 548,
2958
2736
  "character": 3
2959
2737
  },
2960
2738
  "name": "includeDeps",
@@ -2962,7 +2740,7 @@
2962
2740
  "__schema": "InferenceTypeSchema",
2963
2741
  "location": {
2964
2742
  "filePath": "merge-lanes.main.runtime.ts",
2965
- "line": 606,
2743
+ "line": 548,
2966
2744
  "character": 3
2967
2745
  },
2968
2746
  "type": "boolean"
@@ -2975,7 +2753,7 @@
2975
2753
  "__schema": "ParameterSchema",
2976
2754
  "location": {
2977
2755
  "filePath": "merge-lanes.main.runtime.ts",
2978
- "line": 607,
2756
+ "line": 549,
2979
2757
  "character": 3
2980
2758
  },
2981
2759
  "name": "otherLane",
@@ -2983,11 +2761,10 @@
2983
2761
  "__schema": "TypeRefSchema",
2984
2762
  "location": {
2985
2763
  "filePath": "merge-lanes.main.runtime.ts",
2986
- "line": 607,
2764
+ "line": 549,
2987
2765
  "character": 15
2988
2766
  },
2989
- "name": "Lane",
2990
- "packageName": "@teambit/legacy/dist/scope/models"
2767
+ "name": "Lane"
2991
2768
  },
2992
2769
  "isOptional": true,
2993
2770
  "isSpread": false
@@ -2996,7 +2773,7 @@
2996
2773
  "__schema": "ParameterSchema",
2997
2774
  "location": {
2998
2775
  "filePath": "merge-lanes.main.runtime.ts",
2999
- "line": 608,
2776
+ "line": 550,
3000
2777
  "character": 3
3001
2778
  },
3002
2779
  "name": "shouldSquash",
@@ -3004,7 +2781,7 @@
3004
2781
  "__schema": "KeywordTypeSchema",
3005
2782
  "location": {
3006
2783
  "filePath": "merge-lanes.main.runtime.ts",
3007
- "line": 608,
2784
+ "line": 550,
3008
2785
  "character": 18
3009
2786
  },
3010
2787
  "name": "boolean"
@@ -3017,7 +2794,7 @@
3017
2794
  "__schema": "TypeRefSchema",
3018
2795
  "location": {
3019
2796
  "filePath": "merge-lanes.main.runtime.ts",
3020
- "line": 609,
2797
+ "line": 551,
3021
2798
  "character": 4
3022
2799
  },
3023
2800
  "name": "Promise",
@@ -3026,21 +2803,17 @@
3026
2803
  "__schema": "TypeArraySchema",
3027
2804
  "location": {
3028
2805
  "filePath": "merge-lanes.main.runtime.ts",
3029
- "line": 609,
2806
+ "line": 551,
3030
2807
  "character": 12
3031
2808
  },
3032
2809
  "type": {
3033
2810
  "__schema": "TypeRefSchema",
3034
2811
  "location": {
3035
2812
  "filePath": "merge-lanes.main.runtime.ts",
3036
- "line": 609,
2813
+ "line": 551,
3037
2814
  "character": 12
3038
2815
  },
3039
- "name": "ComponentMergeStatus",
3040
- "componentId": {
3041
- "scope": "teambit.component",
3042
- "name": "merging"
3043
- }
2816
+ "name": "ComponentMergeStatus"
3044
2817
  }
3045
2818
  }
3046
2819
  ]
@@ -3053,7 +2826,7 @@
3053
2826
  "__schema": "FunctionLikeSchema",
3054
2827
  "location": {
3055
2828
  "filePath": "merge-lanes.main.runtime.ts",
3056
- "line": 718,
2829
+ "line": 660,
3057
2830
  "character": 1
3058
2831
  },
3059
2832
  "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
@@ -3063,7 +2836,7 @@
3063
2836
  "__schema": "ParameterSchema",
3064
2837
  "location": {
3065
2838
  "filePath": "merge-lanes.main.runtime.ts",
3066
- "line": 718,
2839
+ "line": 660,
3067
2840
  "character": 32
3068
2841
  },
3069
2842
  "name": "otherLaneId",
@@ -3071,15 +2844,10 @@
3071
2844
  "__schema": "TypeRefSchema",
3072
2845
  "location": {
3073
2846
  "filePath": "merge-lanes.main.runtime.ts",
3074
- "line": 718,
2847
+ "line": 660,
3075
2848
  "character": 45
3076
2849
  },
3077
- "name": "LaneId",
3078
- "componentId": {
3079
- "scope": "teambit.lanes",
3080
- "name": "lane-id",
3081
- "version": "0.0.311"
3082
- }
2850
+ "name": "LaneId"
3083
2851
  },
3084
2852
  "isOptional": false,
3085
2853
  "isSpread": false
@@ -3089,7 +2857,7 @@
3089
2857
  "__schema": "InferenceTypeSchema",
3090
2858
  "location": {
3091
2859
  "filePath": "merge-lanes.main.runtime.ts",
3092
- "line": 718,
2860
+ "line": 660,
3093
2861
  "character": 1
3094
2862
  },
3095
2863
  "type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
@@ -3102,17 +2870,17 @@
3102
2870
  "__schema": "FunctionLikeSchema",
3103
2871
  "location": {
3104
2872
  "filePath": "merge-lanes.main.runtime.ts",
3105
- "line": 727,
2873
+ "line": 669,
3106
2874
  "character": 1
3107
2875
  },
3108
- "signature": "function squashSnaps(allComponentsStatus: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope): Promise<void>",
2876
+ "signature": "function squashSnaps(allComponentsStatus: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
3109
2877
  "name": "squashSnaps",
3110
2878
  "params": [
3111
2879
  {
3112
2880
  "__schema": "ParameterSchema",
3113
2881
  "location": {
3114
2882
  "filePath": "merge-lanes.main.runtime.ts",
3115
- "line": 728,
2883
+ "line": 670,
3116
2884
  "character": 3
3117
2885
  },
3118
2886
  "name": "allComponentsStatus",
@@ -3120,21 +2888,17 @@
3120
2888
  "__schema": "TypeArraySchema",
3121
2889
  "location": {
3122
2890
  "filePath": "merge-lanes.main.runtime.ts",
3123
- "line": 728,
2891
+ "line": 670,
3124
2892
  "character": 24
3125
2893
  },
3126
2894
  "type": {
3127
2895
  "__schema": "TypeRefSchema",
3128
2896
  "location": {
3129
2897
  "filePath": "merge-lanes.main.runtime.ts",
3130
- "line": 728,
2898
+ "line": 670,
3131
2899
  "character": 24
3132
2900
  },
3133
- "name": "ComponentMergeStatus",
3134
- "componentId": {
3135
- "scope": "teambit.component",
3136
- "name": "merging"
3137
- }
2901
+ "name": "ComponentMergeStatus"
3138
2902
  }
3139
2903
  },
3140
2904
  "isOptional": false,
@@ -3144,7 +2908,7 @@
3144
2908
  "__schema": "ParameterSchema",
3145
2909
  "location": {
3146
2910
  "filePath": "merge-lanes.main.runtime.ts",
3147
- "line": 729,
2911
+ "line": 671,
3148
2912
  "character": 3
3149
2913
  },
3150
2914
  "name": "currentLaneId",
@@ -3152,15 +2916,10 @@
3152
2916
  "__schema": "TypeRefSchema",
3153
2917
  "location": {
3154
2918
  "filePath": "merge-lanes.main.runtime.ts",
3155
- "line": 729,
2919
+ "line": 671,
3156
2920
  "character": 18
3157
2921
  },
3158
- "name": "LaneId",
3159
- "componentId": {
3160
- "scope": "teambit.lanes",
3161
- "name": "lane-id",
3162
- "version": "0.0.311"
3163
- }
2922
+ "name": "LaneId"
3164
2923
  },
3165
2924
  "isOptional": false,
3166
2925
  "isSpread": false
@@ -3169,7 +2928,7 @@
3169
2928
  "__schema": "ParameterSchema",
3170
2929
  "location": {
3171
2930
  "filePath": "merge-lanes.main.runtime.ts",
3172
- "line": 730,
2931
+ "line": 672,
3173
2932
  "character": 3
3174
2933
  },
3175
2934
  "name": "otherLaneId",
@@ -3177,15 +2936,10 @@
3177
2936
  "__schema": "TypeRefSchema",
3178
2937
  "location": {
3179
2938
  "filePath": "merge-lanes.main.runtime.ts",
3180
- "line": 730,
2939
+ "line": 672,
3181
2940
  "character": 16
3182
2941
  },
3183
- "name": "LaneId",
3184
- "componentId": {
3185
- "scope": "teambit.lanes",
3186
- "name": "lane-id",
3187
- "version": "0.0.311"
3188
- }
2942
+ "name": "LaneId"
3189
2943
  },
3190
2944
  "isOptional": false,
3191
2945
  "isSpread": false
@@ -3194,7 +2948,7 @@
3194
2948
  "__schema": "ParameterSchema",
3195
2949
  "location": {
3196
2950
  "filePath": "merge-lanes.main.runtime.ts",
3197
- "line": 731,
2951
+ "line": 673,
3198
2952
  "character": 3
3199
2953
  },
3200
2954
  "name": "scope",
@@ -3202,20 +2956,40 @@
3202
2956
  "__schema": "TypeRefSchema",
3203
2957
  "location": {
3204
2958
  "filePath": "merge-lanes.main.runtime.ts",
3205
- "line": 731,
2959
+ "line": 673,
3206
2960
  "character": 10
3207
2961
  },
3208
2962
  "name": "LegacyScope"
3209
2963
  },
3210
2964
  "isOptional": false,
3211
2965
  "isSpread": false
2966
+ },
2967
+ {
2968
+ "__schema": "ParameterSchema",
2969
+ "location": {
2970
+ "filePath": "merge-lanes.main.runtime.ts",
2971
+ "line": 674,
2972
+ "character": 3
2973
+ },
2974
+ "name": "messageTitle",
2975
+ "type": {
2976
+ "__schema": "KeywordTypeSchema",
2977
+ "location": {
2978
+ "filePath": "merge-lanes.main.runtime.ts",
2979
+ "line": 674,
2980
+ "character": 18
2981
+ },
2982
+ "name": "string"
2983
+ },
2984
+ "isOptional": true,
2985
+ "isSpread": false
3212
2986
  }
3213
2987
  ],
3214
2988
  "returnType": {
3215
2989
  "__schema": "InferenceTypeSchema",
3216
2990
  "location": {
3217
2991
  "filePath": "merge-lanes.main.runtime.ts",
3218
- "line": 727,
2992
+ "line": 669,
3219
2993
  "character": 1
3220
2994
  },
3221
2995
  "type": "Promise<void>"
@@ -3228,14 +3002,14 @@
3228
3002
  "__schema": "FunctionLikeSchema",
3229
3003
  "location": {
3230
3004
  "filePath": "merge-lanes.main.runtime.ts",
3231
- "line": 765,
3005
+ "line": 709,
3232
3006
  "character": 1
3233
3007
  },
3234
3008
  "doc": {
3235
3009
  "__schema": "DocSchema",
3236
3010
  "location": {
3237
3011
  "filePath": "merge-lanes.main.runtime.ts",
3238
- "line": 762,
3012
+ "line": 706,
3239
3013
  "character": 1
3240
3014
  },
3241
3015
  "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -3248,7 +3022,7 @@
3248
3022
  "__schema": "ParameterSchema",
3249
3023
  "location": {
3250
3024
  "filePath": "merge-lanes.main.runtime.ts",
3251
- "line": 766,
3025
+ "line": 710,
3252
3026
  "character": 3
3253
3027
  },
3254
3028
  "name": "currentLaneName",
@@ -3256,7 +3030,7 @@
3256
3030
  "__schema": "KeywordTypeSchema",
3257
3031
  "location": {
3258
3032
  "filePath": "merge-lanes.main.runtime.ts",
3259
- "line": 766,
3033
+ "line": 710,
3260
3034
  "character": 20
3261
3035
  },
3262
3036
  "name": "string"
@@ -3268,7 +3042,7 @@
3268
3042
  "__schema": "ParameterSchema",
3269
3043
  "location": {
3270
3044
  "filePath": "merge-lanes.main.runtime.ts",
3271
- "line": 767,
3045
+ "line": 711,
3272
3046
  "character": 3
3273
3047
  },
3274
3048
  "name": "otherLaneId",
@@ -3276,15 +3050,10 @@
3276
3050
  "__schema": "TypeRefSchema",
3277
3051
  "location": {
3278
3052
  "filePath": "merge-lanes.main.runtime.ts",
3279
- "line": 767,
3053
+ "line": 711,
3280
3054
  "character": 16
3281
3055
  },
3282
- "name": "LaneId",
3283
- "componentId": {
3284
- "scope": "teambit.lanes",
3285
- "name": "lane-id",
3286
- "version": "0.0.311"
3287
- }
3056
+ "name": "LaneId"
3288
3057
  },
3289
3058
  "isOptional": false,
3290
3059
  "isSpread": false
@@ -3293,7 +3062,7 @@
3293
3062
  "__schema": "ParameterSchema",
3294
3063
  "location": {
3295
3064
  "filePath": "merge-lanes.main.runtime.ts",
3296
- "line": 768,
3065
+ "line": 712,
3297
3066
  "character": 3
3298
3067
  },
3299
3068
  "name": "id",
@@ -3301,15 +3070,10 @@
3301
3070
  "__schema": "TypeRefSchema",
3302
3071
  "location": {
3303
3072
  "filePath": "merge-lanes.main.runtime.ts",
3304
- "line": 768,
3073
+ "line": 712,
3305
3074
  "character": 7
3306
3075
  },
3307
- "name": "ComponentID",
3308
- "componentId": {
3309
- "scope": "teambit.component",
3310
- "name": "component-id",
3311
- "version": "1.2.0"
3312
- }
3076
+ "name": "ComponentID"
3313
3077
  },
3314
3078
  "isOptional": false,
3315
3079
  "isSpread": false
@@ -3318,7 +3082,7 @@
3318
3082
  "__schema": "ParameterSchema",
3319
3083
  "location": {
3320
3084
  "filePath": "merge-lanes.main.runtime.ts",
3321
- "line": 769,
3085
+ "line": 713,
3322
3086
  "character": 3
3323
3087
  },
3324
3088
  "name": "divergeData",
@@ -3326,11 +3090,10 @@
3326
3090
  "__schema": "TypeRefSchema",
3327
3091
  "location": {
3328
3092
  "filePath": "merge-lanes.main.runtime.ts",
3329
- "line": 769,
3093
+ "line": 713,
3330
3094
  "character": 16
3331
3095
  },
3332
- "name": "SnapsDistance",
3333
- "packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
3096
+ "name": "SnapsDistance"
3334
3097
  },
3335
3098
  "isOptional": false,
3336
3099
  "isSpread": false
@@ -3339,7 +3102,7 @@
3339
3102
  "__schema": "ParameterSchema",
3340
3103
  "location": {
3341
3104
  "filePath": "merge-lanes.main.runtime.ts",
3342
- "line": 770,
3105
+ "line": 714,
3343
3106
  "character": 3
3344
3107
  },
3345
3108
  "name": "log",
@@ -3347,11 +3110,10 @@
3347
3110
  "__schema": "TypeRefSchema",
3348
3111
  "location": {
3349
3112
  "filePath": "merge-lanes.main.runtime.ts",
3350
- "line": 770,
3113
+ "line": 714,
3351
3114
  "character": 8
3352
3115
  },
3353
- "name": "Log",
3354
- "packageName": "@teambit/legacy/dist/scope/models/version"
3116
+ "name": "Log"
3355
3117
  },
3356
3118
  "isOptional": false,
3357
3119
  "isSpread": false
@@ -3360,7 +3122,7 @@
3360
3122
  "__schema": "ParameterSchema",
3361
3123
  "location": {
3362
3124
  "filePath": "merge-lanes.main.runtime.ts",
3363
- "line": 771,
3125
+ "line": 715,
3364
3126
  "character": 3
3365
3127
  },
3366
3128
  "name": "scope",
@@ -3368,7 +3130,7 @@
3368
3130
  "__schema": "TypeRefSchema",
3369
3131
  "location": {
3370
3132
  "filePath": "merge-lanes.main.runtime.ts",
3371
- "line": 771,
3133
+ "line": 715,
3372
3134
  "character": 10
3373
3135
  },
3374
3136
  "name": "LegacyScope"
@@ -3380,7 +3142,7 @@
3380
3142
  "__schema": "ParameterSchema",
3381
3143
  "location": {
3382
3144
  "filePath": "merge-lanes.main.runtime.ts",
3383
- "line": 772,
3145
+ "line": 716,
3384
3146
  "character": 3
3385
3147
  },
3386
3148
  "name": "componentFromModel",
@@ -3388,11 +3150,10 @@
3388
3150
  "__schema": "TypeRefSchema",
3389
3151
  "location": {
3390
3152
  "filePath": "merge-lanes.main.runtime.ts",
3391
- "line": 772,
3153
+ "line": 716,
3392
3154
  "character": 24
3393
3155
  },
3394
- "name": "Version",
3395
- "packageName": "@teambit/legacy/dist/scope/models"
3156
+ "name": "Version"
3396
3157
  },
3397
3158
  "isOptional": true,
3398
3159
  "isSpread": false
@@ -3401,7 +3162,7 @@
3401
3162
  "__schema": "ParameterSchema",
3402
3163
  "location": {
3403
3164
  "filePath": "merge-lanes.main.runtime.ts",
3404
- "line": 773,
3165
+ "line": 717,
3405
3166
  "character": 3
3406
3167
  },
3407
3168
  "name": "messageTitle",
@@ -3409,7 +3170,7 @@
3409
3170
  "__schema": "KeywordTypeSchema",
3410
3171
  "location": {
3411
3172
  "filePath": "merge-lanes.main.runtime.ts",
3412
- "line": 773,
3173
+ "line": 717,
3413
3174
  "character": 18
3414
3175
  },
3415
3176
  "name": "string"
@@ -3422,7 +3183,7 @@
3422
3183
  "__schema": "TypeRefSchema",
3423
3184
  "location": {
3424
3185
  "filePath": "merge-lanes.main.runtime.ts",
3425
- "line": 774,
3186
+ "line": 718,
3426
3187
  "character": 4
3427
3188
  },
3428
3189
  "name": "Promise",
@@ -3431,7 +3192,7 @@
3431
3192
  "__schema": "TypeUnionSchema",
3432
3193
  "location": {
3433
3194
  "filePath": "merge-lanes.main.runtime.ts",
3434
- "line": 774,
3195
+ "line": 718,
3435
3196
  "character": 12
3436
3197
  },
3437
3198
  "types": [
@@ -3439,17 +3200,16 @@
3439
3200
  "__schema": "TypeRefSchema",
3440
3201
  "location": {
3441
3202
  "filePath": "merge-lanes.main.runtime.ts",
3442
- "line": 774,
3203
+ "line": 718,
3443
3204
  "character": 12
3444
3205
  },
3445
- "name": "Version",
3446
- "packageName": "@teambit/legacy/dist/scope/models"
3206
+ "name": "Version"
3447
3207
  },
3448
3208
  {
3449
3209
  "__schema": "KeywordTypeSchema",
3450
3210
  "location": {
3451
3211
  "filePath": "merge-lanes.main.runtime.ts",
3452
- "line": 774,
3212
+ "line": 718,
3453
3213
  "character": 22
3454
3214
  },
3455
3215
  "name": "undefined"
@@ -3466,7 +3226,7 @@
3466
3226
  "__schema": "UnImplementedSchema",
3467
3227
  "location": {
3468
3228
  "filePath": "merge-lanes.main.runtime.ts",
3469
- "line": 847,
3229
+ "line": 791,
3470
3230
  "character": 1
3471
3231
  },
3472
3232
  "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -3515,7 +3275,7 @@
3515
3275
  "componentId": {
3516
3276
  "scope": "teambit.lanes",
3517
3277
  "name": "merge-lanes",
3518
- "version": "1.0.225"
3278
+ "version": "1.0.227"
3519
3279
  },
3520
3280
  "taggedModuleExports": []
3521
3281
  }