@teambit/merge-lanes 1.0.240 → 1.0.241

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 (10) hide show
  1. package/artifacts/__bit_junit.xml +4 -2
  2. package/artifacts/schema.json +557 -376
  3. package/dist/merge-lane.spec.d.ts +1 -0
  4. package/dist/merge-lane.spec.js +111 -0
  5. package/dist/merge-lane.spec.js.map +1 -0
  6. package/dist/merge-lanes.main.runtime.d.ts +12 -5
  7. package/dist/merge-lanes.main.runtime.js +53 -70
  8. package/dist/merge-lanes.main.runtime.js.map +1 -1
  9. package/package.json +18 -13
  10. /package/dist/{preview-1713277147086.js → preview-1713323989441.js} +0 -0
package/artifacts/schema.json CHANGED
@@ -17,7 +17,7 @@
17
17
  "__schema": "ClassSchema",
18
18
  "location": {
19
19
  "filePath": "merge-lanes.main.runtime.ts",
20
- "line": 70,
20
+ "line": 73,
21
21
  "character": 1
22
22
  },
23
23
  "signature": "class MergeLanesMain",
@@ -27,7 +27,7 @@
27
27
  "__schema": "ConstructorSchema",
28
28
  "location": {
29
29
  "filePath": "merge-lanes.main.runtime.ts",
30
- "line": 71,
30
+ "line": 74,
31
31
  "character": 3
32
32
  },
33
33
  "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -37,7 +37,7 @@
37
37
  "__schema": "ParameterSchema",
38
38
  "location": {
39
39
  "filePath": "merge-lanes.main.runtime.ts",
40
- "line": 72,
40
+ "line": 75,
41
41
  "character": 5
42
42
  },
43
43
  "name": "workspace",
@@ -45,7 +45,7 @@
45
45
  "__schema": "TypeUnionSchema",
46
46
  "location": {
47
47
  "filePath": "merge-lanes.main.runtime.ts",
48
- "line": 72,
48
+ "line": 75,
49
49
  "character": 24
50
50
  },
51
51
  "types": [
@@ -53,7 +53,7 @@
53
53
  "__schema": "TypeRefSchema",
54
54
  "location": {
55
55
  "filePath": "merge-lanes.main.runtime.ts",
56
- "line": 72,
56
+ "line": 75,
57
57
  "character": 24
58
58
  },
59
59
  "name": "Workspace",
@@ -66,7 +66,7 @@
66
66
  "__schema": "KeywordTypeSchema",
67
67
  "location": {
68
68
  "filePath": "merge-lanes.main.runtime.ts",
69
- "line": 72,
69
+ "line": 75,
70
70
  "character": 36
71
71
  },
72
72
  "name": "undefined"
@@ -80,7 +80,7 @@
80
80
  "__schema": "ParameterSchema",
81
81
  "location": {
82
82
  "filePath": "merge-lanes.main.runtime.ts",
83
- "line": 73,
83
+ "line": 76,
84
84
  "character": 5
85
85
  },
86
86
  "name": "merging",
@@ -88,7 +88,7 @@
88
88
  "__schema": "TypeRefSchema",
89
89
  "location": {
90
90
  "filePath": "merge-lanes.main.runtime.ts",
91
- "line": 73,
91
+ "line": 76,
92
92
  "character": 22
93
93
  },
94
94
  "name": "MergingMain",
@@ -104,7 +104,7 @@
104
104
  "__schema": "ParameterSchema",
105
105
  "location": {
106
106
  "filePath": "merge-lanes.main.runtime.ts",
107
- "line": 74,
107
+ "line": 77,
108
108
  "character": 5
109
109
  },
110
110
  "name": "lanes",
@@ -112,7 +112,7 @@
112
112
  "__schema": "TypeRefSchema",
113
113
  "location": {
114
114
  "filePath": "merge-lanes.main.runtime.ts",
115
- "line": 74,
115
+ "line": 77,
116
116
  "character": 20
117
117
  },
118
118
  "name": "LanesMain",
@@ -128,7 +128,7 @@
128
128
  "__schema": "ParameterSchema",
129
129
  "location": {
130
130
  "filePath": "merge-lanes.main.runtime.ts",
131
- "line": 75,
131
+ "line": 78,
132
132
  "character": 5
133
133
  },
134
134
  "name": "logger",
@@ -136,7 +136,7 @@
136
136
  "__schema": "TypeRefSchema",
137
137
  "location": {
138
138
  "filePath": "merge-lanes.main.runtime.ts",
139
- "line": 75,
139
+ "line": 78,
140
140
  "character": 22
141
141
  },
142
142
  "name": "Logger",
@@ -152,7 +152,7 @@
152
152
  "__schema": "ParameterSchema",
153
153
  "location": {
154
154
  "filePath": "merge-lanes.main.runtime.ts",
155
- "line": 76,
155
+ "line": 79,
156
156
  "character": 5
157
157
  },
158
158
  "name": "remove",
@@ -160,7 +160,7 @@
160
160
  "__schema": "TypeRefSchema",
161
161
  "location": {
162
162
  "filePath": "merge-lanes.main.runtime.ts",
163
- "line": 76,
163
+ "line": 79,
164
164
  "character": 21
165
165
  },
166
166
  "name": "RemoveMain",
@@ -176,7 +176,7 @@
176
176
  "__schema": "ParameterSchema",
177
177
  "location": {
178
178
  "filePath": "merge-lanes.main.runtime.ts",
179
- "line": 77,
179
+ "line": 80,
180
180
  "character": 5
181
181
  },
182
182
  "name": "scope",
@@ -184,7 +184,7 @@
184
184
  "__schema": "TypeRefSchema",
185
185
  "location": {
186
186
  "filePath": "merge-lanes.main.runtime.ts",
187
- "line": 77,
187
+ "line": 80,
188
188
  "character": 20
189
189
  },
190
190
  "name": "ScopeMain",
@@ -200,7 +200,7 @@
200
200
  "__schema": "ParameterSchema",
201
201
  "location": {
202
202
  "filePath": "merge-lanes.main.runtime.ts",
203
- "line": 78,
203
+ "line": 81,
204
204
  "character": 5
205
205
  },
206
206
  "name": "exporter",
@@ -208,7 +208,7 @@
208
208
  "__schema": "TypeRefSchema",
209
209
  "location": {
210
210
  "filePath": "merge-lanes.main.runtime.ts",
211
- "line": 78,
211
+ "line": 81,
212
212
  "character": 23
213
213
  },
214
214
  "name": "ExportMain",
@@ -224,7 +224,7 @@
224
224
  "__schema": "ParameterSchema",
225
225
  "location": {
226
226
  "filePath": "merge-lanes.main.runtime.ts",
227
- "line": 79,
227
+ "line": 82,
228
228
  "character": 5
229
229
  },
230
230
  "name": "importer",
@@ -232,7 +232,7 @@
232
232
  "__schema": "TypeRefSchema",
233
233
  "location": {
234
234
  "filePath": "merge-lanes.main.runtime.ts",
235
- "line": 79,
235
+ "line": 82,
236
236
  "character": 23
237
237
  },
238
238
  "name": "ImporterMain",
@@ -248,7 +248,7 @@
248
248
  "__schema": "ParameterSchema",
249
249
  "location": {
250
250
  "filePath": "merge-lanes.main.runtime.ts",
251
- "line": 80,
251
+ "line": 83,
252
252
  "character": 5
253
253
  },
254
254
  "name": "checkout",
@@ -256,7 +256,7 @@
256
256
  "__schema": "TypeRefSchema",
257
257
  "location": {
258
258
  "filePath": "merge-lanes.main.runtime.ts",
259
- "line": 80,
259
+ "line": 83,
260
260
  "character": 23
261
261
  },
262
262
  "name": "CheckoutMain",
@@ -273,7 +273,7 @@
273
273
  "__schema": "ThisTypeSchema",
274
274
  "location": {
275
275
  "filePath": "merge-lanes.main.runtime.ts",
276
- "line": 70,
276
+ "line": 73,
277
277
  "character": 1
278
278
  },
279
279
  "name": "MergeLanesMain"
@@ -284,17 +284,17 @@
284
284
  "__schema": "FunctionLikeSchema",
285
285
  "location": {
286
286
  "filePath": "merge-lanes.main.runtime.ts",
287
- "line": 83,
287
+ "line": 86,
288
288
  "character": 3
289
289
  },
290
- "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
290
+ "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
291
291
  "name": "mergeLaneByCLI",
292
292
  "params": [
293
293
  {
294
294
  "__schema": "ParameterSchema",
295
295
  "location": {
296
296
  "filePath": "merge-lanes.main.runtime.ts",
297
- "line": 83,
297
+ "line": 86,
298
298
  "character": 24
299
299
  },
300
300
  "name": "laneName",
@@ -302,7 +302,7 @@
302
302
  "__schema": "KeywordTypeSchema",
303
303
  "location": {
304
304
  "filePath": "merge-lanes.main.runtime.ts",
305
- "line": 83,
305
+ "line": 86,
306
306
  "character": 34
307
307
  },
308
308
  "name": "string"
@@ -314,7 +314,7 @@
314
314
  "__schema": "ParameterSchema",
315
315
  "location": {
316
316
  "filePath": "merge-lanes.main.runtime.ts",
317
- "line": 83,
317
+ "line": 86,
318
318
  "character": 42
319
319
  },
320
320
  "name": "options",
@@ -322,7 +322,7 @@
322
322
  "__schema": "TypeRefSchema",
323
323
  "location": {
324
324
  "filePath": "merge-lanes.main.runtime.ts",
325
- "line": 83,
325
+ "line": 86,
326
326
  "character": 51
327
327
  },
328
328
  "name": "MergeLaneOptions",
@@ -336,10 +336,10 @@
336
336
  "__schema": "InferenceTypeSchema",
337
337
  "location": {
338
338
  "filePath": "merge-lanes.main.runtime.ts",
339
- "line": 83,
339
+ "line": 86,
340
340
  "character": 3
341
341
  },
342
- "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>"
342
+ "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
343
343
  },
344
344
  "modifiers": [
345
345
  "async"
@@ -349,17 +349,17 @@
349
349
  "__schema": "FunctionLikeSchema",
350
350
  "location": {
351
351
  "filePath": "merge-lanes.main.runtime.ts",
352
- "line": 93,
352
+ "line": 96,
353
353
  "character": 3
354
354
  },
355
- "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
355
+ "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
356
356
  "name": "mergeLane",
357
357
  "params": [
358
358
  {
359
359
  "__schema": "ParameterSchema",
360
360
  "location": {
361
361
  "filePath": "merge-lanes.main.runtime.ts",
362
- "line": 94,
362
+ "line": 97,
363
363
  "character": 5
364
364
  },
365
365
  "name": "otherLaneId",
@@ -367,7 +367,7 @@
367
367
  "__schema": "TypeRefSchema",
368
368
  "location": {
369
369
  "filePath": "merge-lanes.main.runtime.ts",
370
- "line": 94,
370
+ "line": 97,
371
371
  "character": 18
372
372
  },
373
373
  "name": "LaneId",
@@ -384,7 +384,7 @@
384
384
  "__schema": "ParameterSchema",
385
385
  "location": {
386
386
  "filePath": "merge-lanes.main.runtime.ts",
387
- "line": 95,
387
+ "line": 98,
388
388
  "character": 5
389
389
  },
390
390
  "name": "currentLaneId",
@@ -392,7 +392,7 @@
392
392
  "__schema": "TypeRefSchema",
393
393
  "location": {
394
394
  "filePath": "merge-lanes.main.runtime.ts",
395
- "line": 95,
395
+ "line": 98,
396
396
  "character": 20
397
397
  },
398
398
  "name": "LaneId",
@@ -409,7 +409,7 @@
409
409
  "__schema": "ParameterSchema",
410
410
  "location": {
411
411
  "filePath": "merge-lanes.main.runtime.ts",
412
- "line": 96,
412
+ "line": 99,
413
413
  "character": 5
414
414
  },
415
415
  "name": "options",
@@ -417,7 +417,7 @@
417
417
  "__schema": "TypeRefSchema",
418
418
  "location": {
419
419
  "filePath": "merge-lanes.main.runtime.ts",
420
- "line": 96,
420
+ "line": 99,
421
421
  "character": 14
422
422
  },
423
423
  "name": "MergeLaneOptions",
@@ -431,7 +431,7 @@
431
431
  "__schema": "TypeRefSchema",
432
432
  "location": {
433
433
  "filePath": "merge-lanes.main.runtime.ts",
434
- "line": 97,
434
+ "line": 100,
435
435
  "character": 6
436
436
  },
437
437
  "name": "Promise",
@@ -440,7 +440,7 @@
440
440
  "__schema": "TypeLiteralSchema",
441
441
  "location": {
442
442
  "filePath": "merge-lanes.main.runtime.ts",
443
- "line": 97,
443
+ "line": 100,
444
444
  "character": 14
445
445
  },
446
446
  "members": [
@@ -448,8 +448,8 @@
448
448
  "__schema": "VariableLikeSchema",
449
449
  "location": {
450
450
  "filePath": "merge-lanes.main.runtime.ts",
451
- "line": 97,
452
- "character": 16
451
+ "line": 101,
452
+ "character": 5
453
453
  },
454
454
  "signature": "(property) mergeResults: ApplyVersionResults",
455
455
  "name": "mergeResults",
@@ -457,8 +457,8 @@
457
457
  "__schema": "TypeRefSchema",
458
458
  "location": {
459
459
  "filePath": "merge-lanes.main.runtime.ts",
460
- "line": 97,
461
- "character": 16
460
+ "line": 101,
461
+ "character": 5
462
462
  },
463
463
  "name": "ApplyVersionResults",
464
464
  "componentId": {
@@ -472,8 +472,8 @@
472
472
  "__schema": "VariableLikeSchema",
473
473
  "location": {
474
474
  "filePath": "merge-lanes.main.runtime.ts",
475
- "line": 97,
476
- "character": 51
475
+ "line": 102,
476
+ "character": 5
477
477
  },
478
478
  "signature": "(property) deleteResults: any",
479
479
  "name": "deleteResults",
@@ -481,8 +481,8 @@
481
481
  "__schema": "KeywordTypeSchema",
482
482
  "location": {
483
483
  "filePath": "merge-lanes.main.runtime.ts",
484
- "line": 97,
485
- "character": 66
484
+ "line": 102,
485
+ "character": 20
486
486
  },
487
487
  "name": "any"
488
488
  },
@@ -492,8 +492,8 @@
492
492
  "__schema": "VariableLikeSchema",
493
493
  "location": {
494
494
  "filePath": "merge-lanes.main.runtime.ts",
495
- "line": 97,
496
- "character": 71
495
+ "line": 103,
496
+ "character": 5
497
497
  },
498
498
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
499
499
  "name": "configMergeResults",
@@ -501,15 +501,15 @@
501
501
  "__schema": "TypeArraySchema",
502
502
  "location": {
503
503
  "filePath": "merge-lanes.main.runtime.ts",
504
- "line": 97,
505
- "character": 91
504
+ "line": 103,
505
+ "character": 25
506
506
  },
507
507
  "type": {
508
508
  "__schema": "TypeRefSchema",
509
509
  "location": {
510
510
  "filePath": "merge-lanes.main.runtime.ts",
511
- "line": 97,
512
- "character": 91
511
+ "line": 103,
512
+ "character": 25
513
513
  },
514
514
  "name": "ConfigMergeResult",
515
515
  "componentId": {
@@ -519,6 +519,68 @@
519
519
  }
520
520
  },
521
521
  "isOptional": false
522
+ },
523
+ {
524
+ "__schema": "VariableLikeSchema",
525
+ "location": {
526
+ "filePath": "merge-lanes.main.runtime.ts",
527
+ "line": 104,
528
+ "character": 5
529
+ },
530
+ "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
531
+ "name": "mergedSuccessfullyIds",
532
+ "type": {
533
+ "__schema": "TypeArraySchema",
534
+ "location": {
535
+ "filePath": "merge-lanes.main.runtime.ts",
536
+ "line": 104,
537
+ "character": 28
538
+ },
539
+ "type": {
540
+ "__schema": "TypeRefSchema",
541
+ "location": {
542
+ "filePath": "merge-lanes.main.runtime.ts",
543
+ "line": 104,
544
+ "character": 28
545
+ },
546
+ "name": "ComponentID",
547
+ "componentId": {
548
+ "scope": "teambit.component",
549
+ "name": "component-id",
550
+ "version": "1.2.0"
551
+ }
552
+ }
553
+ },
554
+ "isOptional": false
555
+ },
556
+ {
557
+ "__schema": "VariableLikeSchema",
558
+ "location": {
559
+ "filePath": "merge-lanes.main.runtime.ts",
560
+ "line": 105,
561
+ "character": 5
562
+ },
563
+ "signature": "(property) conflicts: ConflictPerId[]",
564
+ "name": "conflicts",
565
+ "type": {
566
+ "__schema": "TypeArraySchema",
567
+ "location": {
568
+ "filePath": "merge-lanes.main.runtime.ts",
569
+ "line": 105,
570
+ "character": 16
571
+ },
572
+ "type": {
573
+ "__schema": "TypeRefSchema",
574
+ "location": {
575
+ "filePath": "merge-lanes.main.runtime.ts",
576
+ "line": 105,
577
+ "character": 16
578
+ },
579
+ "name": "ConflictPerId",
580
+ "internalFilePath": "merge-lanes.main.runtime.ts"
581
+ }
582
+ },
583
+ "isOptional": false
522
584
  }
523
585
  ]
524
586
  }
@@ -532,7 +594,7 @@
532
594
  "__schema": "FunctionLikeSchema",
533
595
  "location": {
534
596
  "filePath": "merge-lanes.main.runtime.ts",
535
- "line": 281,
597
+ "line": 318,
536
598
  "character": 3
537
599
  },
538
600
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -542,7 +604,7 @@
542
604
  "__schema": "ParameterSchema",
543
605
  "location": {
544
606
  "filePath": "merge-lanes.main.runtime.ts",
545
- "line": 281,
607
+ "line": 318,
546
608
  "character": 24
547
609
  },
548
610
  "name": "checkoutProps",
@@ -550,7 +612,7 @@
550
612
  "__schema": "TypeRefSchema",
551
613
  "location": {
552
614
  "filePath": "merge-lanes.main.runtime.ts",
553
- "line": 281,
615
+ "line": 318,
554
616
  "character": 39
555
617
  },
556
618
  "name": "CheckoutProps",
@@ -566,7 +628,7 @@
566
628
  "__schema": "ParameterSchema",
567
629
  "location": {
568
630
  "filePath": "merge-lanes.main.runtime.ts",
569
- "line": 281,
631
+ "line": 318,
570
632
  "character": 54
571
633
  },
572
634
  "name": "mergeAbortOpts",
@@ -574,7 +636,7 @@
574
636
  "__schema": "TypeRefSchema",
575
637
  "location": {
576
638
  "filePath": "merge-lanes.main.runtime.ts",
577
- "line": 281,
639
+ "line": 318,
578
640
  "character": 70
579
641
  },
580
642
  "name": "MergeAbortOpts",
@@ -588,7 +650,7 @@
588
650
  "__schema": "InferenceTypeSchema",
589
651
  "location": {
590
652
  "filePath": "merge-lanes.main.runtime.ts",
591
- "line": 281,
653
+ "line": 318,
592
654
  "character": 3
593
655
  },
594
656
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -601,7 +663,7 @@
601
663
  "__schema": "FunctionLikeSchema",
602
664
  "location": {
603
665
  "filePath": "merge-lanes.main.runtime.ts",
604
- "line": 337,
666
+ "line": 374,
605
667
  "character": 3
606
668
  },
607
669
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -611,7 +673,7 @@
611
673
  "__schema": "ParameterSchema",
612
674
  "location": {
613
675
  "filePath": "merge-lanes.main.runtime.ts",
614
- "line": 338,
676
+ "line": 375,
615
677
  "character": 5
616
678
  },
617
679
  "name": "fromLane",
@@ -619,7 +681,7 @@
619
681
  "__schema": "KeywordTypeSchema",
620
682
  "location": {
621
683
  "filePath": "merge-lanes.main.runtime.ts",
622
- "line": 338,
684
+ "line": 375,
623
685
  "character": 15
624
686
  },
625
687
  "name": "string"
@@ -631,7 +693,7 @@
631
693
  "__schema": "ParameterSchema",
632
694
  "location": {
633
695
  "filePath": "merge-lanes.main.runtime.ts",
634
- "line": 339,
696
+ "line": 376,
635
697
  "character": 5
636
698
  },
637
699
  "name": "toLane",
@@ -639,7 +701,7 @@
639
701
  "__schema": "KeywordTypeSchema",
640
702
  "location": {
641
703
  "filePath": "merge-lanes.main.runtime.ts",
642
- "line": 339,
704
+ "line": 376,
643
705
  "character": 13
644
706
  },
645
707
  "name": "string"
@@ -651,7 +713,7 @@
651
713
  "__schema": "ParameterSchema",
652
714
  "location": {
653
715
  "filePath": "merge-lanes.main.runtime.ts",
654
- "line": 340,
716
+ "line": 377,
655
717
  "character": 5
656
718
  },
657
719
  "name": "options",
@@ -659,7 +721,7 @@
659
721
  "__schema": "TypeIntersectionSchema",
660
722
  "location": {
661
723
  "filePath": "merge-lanes.main.runtime.ts",
662
- "line": 340,
724
+ "line": 377,
663
725
  "character": 14
664
726
  },
665
727
  "types": [
@@ -667,7 +729,7 @@
667
729
  "__schema": "TypeRefSchema",
668
730
  "location": {
669
731
  "filePath": "merge-lanes.main.runtime.ts",
670
- "line": 340,
732
+ "line": 377,
671
733
  "character": 14
672
734
  },
673
735
  "name": "Partial",
@@ -676,7 +738,7 @@
676
738
  "__schema": "TypeRefSchema",
677
739
  "location": {
678
740
  "filePath": "merge-lanes.main.runtime.ts",
679
- "line": 340,
741
+ "line": 377,
680
742
  "character": 22
681
743
  },
682
744
  "name": "MergeLaneOptions",
@@ -688,7 +750,7 @@
688
750
  "__schema": "TypeLiteralSchema",
689
751
  "location": {
690
752
  "filePath": "merge-lanes.main.runtime.ts",
691
- "line": 340,
753
+ "line": 377,
692
754
  "character": 42
693
755
  },
694
756
  "members": [
@@ -696,7 +758,7 @@
696
758
  "__schema": "VariableLikeSchema",
697
759
  "location": {
698
760
  "filePath": "merge-lanes.main.runtime.ts",
699
- "line": 340,
761
+ "line": 377,
700
762
  "character": 44
701
763
  },
702
764
  "signature": "(property) push?: boolean | undefined",
@@ -705,7 +767,7 @@
705
767
  "__schema": "KeywordTypeSchema",
706
768
  "location": {
707
769
  "filePath": "merge-lanes.main.runtime.ts",
708
- "line": 340,
770
+ "line": 377,
709
771
  "character": 51
710
772
  },
711
773
  "name": "boolean"
@@ -716,7 +778,7 @@
716
778
  "__schema": "VariableLikeSchema",
717
779
  "location": {
718
780
  "filePath": "merge-lanes.main.runtime.ts",
719
- "line": 340,
781
+ "line": 377,
720
782
  "character": 60
721
783
  },
722
784
  "signature": "(property) reMerge?: boolean | undefined",
@@ -725,7 +787,7 @@
725
787
  "__schema": "KeywordTypeSchema",
726
788
  "location": {
727
789
  "filePath": "merge-lanes.main.runtime.ts",
728
- "line": 340,
790
+ "line": 377,
729
791
  "character": 70
730
792
  },
731
793
  "name": "boolean"
@@ -744,7 +806,7 @@
744
806
  "__schema": "TypeRefSchema",
745
807
  "location": {
746
808
  "filePath": "merge-lanes.main.runtime.ts",
747
- "line": 341,
809
+ "line": 378,
748
810
  "character": 6
749
811
  },
750
812
  "name": "Promise",
@@ -753,7 +815,7 @@
753
815
  "__schema": "TypeRefSchema",
754
816
  "location": {
755
817
  "filePath": "merge-lanes.main.runtime.ts",
756
- "line": 341,
818
+ "line": 378,
757
819
  "character": 14
758
820
  },
759
821
  "name": "MergeFromScopeResult",
@@ -769,7 +831,7 @@
769
831
  "__schema": "VariableLikeSchema",
770
832
  "location": {
771
833
  "filePath": "merge-lanes.main.runtime.ts",
772
- "line": 482,
834
+ "line": 472,
773
835
  "character": 3
774
836
  },
775
837
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -778,7 +840,7 @@
778
840
  "__schema": "InferenceTypeSchema",
779
841
  "location": {
780
842
  "filePath": "merge-lanes.main.runtime.ts",
781
- "line": 482,
843
+ "line": 472,
782
844
  "character": 3
783
845
  },
784
846
  "type": "never[]"
@@ -790,7 +852,7 @@
790
852
  "__schema": "VariableLikeSchema",
791
853
  "location": {
792
854
  "filePath": "merge-lanes.main.runtime.ts",
793
- "line": 483,
855
+ "line": 473,
794
856
  "character": 3
795
857
  },
796
858
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -799,7 +861,7 @@
799
861
  "__schema": "InferenceTypeSchema",
800
862
  "location": {
801
863
  "filePath": "merge-lanes.main.runtime.ts",
802
- "line": 483,
864
+ "line": 473,
803
865
  "character": 3
804
866
  },
805
867
  "type": "Aspect[]"
@@ -811,7 +873,7 @@
811
873
  "__schema": "VariableLikeSchema",
812
874
  "location": {
813
875
  "filePath": "merge-lanes.main.runtime.ts",
814
- "line": 496,
876
+ "line": 486,
815
877
  "character": 3
816
878
  },
817
879
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -820,7 +882,7 @@
820
882
  "__schema": "InferenceTypeSchema",
821
883
  "location": {
822
884
  "filePath": "merge-lanes.main.runtime.ts",
823
- "line": 496,
885
+ "line": 486,
824
886
  "character": 3
825
887
  },
826
888
  "type": "RuntimeDefinition"
@@ -832,7 +894,7 @@
832
894
  "__schema": "FunctionLikeSchema",
833
895
  "location": {
834
896
  "filePath": "merge-lanes.main.runtime.ts",
835
- "line": 498,
897
+ "line": 488,
836
898
  "character": 3
837
899
  },
838
900
  "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 +904,7 @@
842
904
  "__schema": "ParameterSchema",
843
905
  "location": {
844
906
  "filePath": "merge-lanes.main.runtime.ts",
845
- "line": 498,
907
+ "line": 488,
846
908
  "character": 25
847
909
  },
848
910
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -850,7 +912,7 @@
850
912
  "__schema": "TupleTypeSchema",
851
913
  "location": {
852
914
  "filePath": "merge-lanes.main.runtime.ts",
853
- "line": 510,
915
+ "line": 500,
854
916
  "character": 6
855
917
  },
856
918
  "elements": [
@@ -858,7 +920,7 @@
858
920
  "__schema": "TypeRefSchema",
859
921
  "location": {
860
922
  "filePath": "merge-lanes.main.runtime.ts",
861
- "line": 511,
923
+ "line": 501,
862
924
  "character": 5
863
925
  },
864
926
  "name": "LanesMain",
@@ -871,7 +933,7 @@
871
933
  "__schema": "TypeRefSchema",
872
934
  "location": {
873
935
  "filePath": "merge-lanes.main.runtime.ts",
874
- "line": 512,
936
+ "line": 502,
875
937
  "character": 5
876
938
  },
877
939
  "name": "CLIMain",
@@ -884,7 +946,7 @@
884
946
  "__schema": "TypeRefSchema",
885
947
  "location": {
886
948
  "filePath": "merge-lanes.main.runtime.ts",
887
- "line": 513,
949
+ "line": 503,
888
950
  "character": 5
889
951
  },
890
952
  "name": "Workspace",
@@ -897,7 +959,7 @@
897
959
  "__schema": "TypeRefSchema",
898
960
  "location": {
899
961
  "filePath": "merge-lanes.main.runtime.ts",
900
- "line": 514,
962
+ "line": 504,
901
963
  "character": 5
902
964
  },
903
965
  "name": "MergingMain",
@@ -910,7 +972,7 @@
910
972
  "__schema": "TypeRefSchema",
911
973
  "location": {
912
974
  "filePath": "merge-lanes.main.runtime.ts",
913
- "line": 515,
975
+ "line": 505,
914
976
  "character": 5
915
977
  },
916
978
  "name": "LoggerMain",
@@ -923,7 +985,7 @@
923
985
  "__schema": "TypeRefSchema",
924
986
  "location": {
925
987
  "filePath": "merge-lanes.main.runtime.ts",
926
- "line": 516,
988
+ "line": 506,
927
989
  "character": 5
928
990
  },
929
991
  "name": "RemoveMain",
@@ -936,7 +998,7 @@
936
998
  "__schema": "TypeRefSchema",
937
999
  "location": {
938
1000
  "filePath": "merge-lanes.main.runtime.ts",
939
- "line": 517,
1001
+ "line": 507,
940
1002
  "character": 5
941
1003
  },
942
1004
  "name": "ScopeMain",
@@ -949,7 +1011,7 @@
949
1011
  "__schema": "TypeRefSchema",
950
1012
  "location": {
951
1013
  "filePath": "merge-lanes.main.runtime.ts",
952
- "line": 518,
1014
+ "line": 508,
953
1015
  "character": 5
954
1016
  },
955
1017
  "name": "ExportMain",
@@ -962,7 +1024,7 @@
962
1024
  "__schema": "TypeRefSchema",
963
1025
  "location": {
964
1026
  "filePath": "merge-lanes.main.runtime.ts",
965
- "line": 519,
1027
+ "line": 509,
966
1028
  "character": 5
967
1029
  },
968
1030
  "name": "ImporterMain",
@@ -975,7 +1037,7 @@
975
1037
  "__schema": "TypeRefSchema",
976
1038
  "location": {
977
1039
  "filePath": "merge-lanes.main.runtime.ts",
978
- "line": 520,
1040
+ "line": 510,
979
1041
  "character": 5
980
1042
  },
981
1043
  "name": "CheckoutMain",
@@ -988,7 +1050,7 @@
988
1050
  "__schema": "TypeRefSchema",
989
1051
  "location": {
990
1052
  "filePath": "merge-lanes.main.runtime.ts",
991
- "line": 521,
1053
+ "line": 511,
992
1054
  "character": 5
993
1055
  },
994
1056
  "name": "GlobalConfigMain",
@@ -1007,7 +1069,7 @@
1007
1069
  "__schema": "InferenceTypeSchema",
1008
1070
  "location": {
1009
1071
  "filePath": "merge-lanes.main.runtime.ts",
1010
- "line": 498,
1072
+ "line": 488,
1011
1073
  "character": 3
1012
1074
  },
1013
1075
  "type": "Promise<MergeLanesMain>"
@@ -1076,7 +1138,7 @@
1076
1138
  "line": 39,
1077
1139
  "character": 1
1078
1140
  },
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 ... 8 more ...;\n shouldIncludeUpdateDependents?: boolean | undefined;\n}",
1141
+ "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 ... 10 more ...;\n fetchCurrent?: boolean | undefined;\n}",
1080
1142
  "name": "MergeLaneOptions",
1081
1143
  "type": {
1082
1144
  "__schema": "TypeLiteralSchema",
@@ -1467,6 +1529,46 @@
1467
1529
  "name": "boolean"
1468
1530
  },
1469
1531
  "isOptional": true
1532
+ },
1533
+ {
1534
+ "__schema": "VariableLikeSchema",
1535
+ "location": {
1536
+ "filePath": "merge-lanes.main.runtime.ts",
1537
+ "line": 59,
1538
+ "character": 3
1539
+ },
1540
+ "signature": "(property) throwIfNotUpToDate?: boolean | undefined",
1541
+ "name": "throwIfNotUpToDate",
1542
+ "type": {
1543
+ "__schema": "KeywordTypeSchema",
1544
+ "location": {
1545
+ "filePath": "merge-lanes.main.runtime.ts",
1546
+ "line": 59,
1547
+ "character": 24
1548
+ },
1549
+ "name": "boolean"
1550
+ },
1551
+ "isOptional": true
1552
+ },
1553
+ {
1554
+ "__schema": "VariableLikeSchema",
1555
+ "location": {
1556
+ "filePath": "merge-lanes.main.runtime.ts",
1557
+ "line": 60,
1558
+ "character": 3
1559
+ },
1560
+ "signature": "(property) fetchCurrent?: boolean | undefined",
1561
+ "name": "fetchCurrent",
1562
+ "type": {
1563
+ "__schema": "KeywordTypeSchema",
1564
+ "location": {
1565
+ "filePath": "merge-lanes.main.runtime.ts",
1566
+ "line": 60,
1567
+ "character": 18
1568
+ },
1569
+ "name": "boolean"
1570
+ },
1571
+ "isOptional": true
1470
1572
  }
1471
1573
  ]
1472
1574
  }
@@ -1475,16 +1577,109 @@
1475
1577
  "__schema": "TypeSchema",
1476
1578
  "location": {
1477
1579
  "filePath": "merge-lanes.main.runtime.ts",
1478
- "line": 60,
1580
+ "line": 62,
1479
1581
  "character": 1
1480
1582
  },
1481
- "signature": "type MergeFromScopeResult = {\n mergedNow: ComponentID[];\n exportedIds: ComponentID[];\n unmerged: {\n id: ComponentID;\n reason: string;\n }[];\n conflicts?: {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n }[] | undefined;\n snappedIds?: ComponentID[] | undefined;\n mergedPreviously: ComponentID[];\n mergeSnapError?: Error | undefined;\n}",
1583
+ "signature": "type ConflictPerId = {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n}",
1584
+ "name": "ConflictPerId",
1585
+ "type": {
1586
+ "__schema": "TypeLiteralSchema",
1587
+ "location": {
1588
+ "filePath": "merge-lanes.main.runtime.ts",
1589
+ "line": 62,
1590
+ "character": 29
1591
+ },
1592
+ "members": [
1593
+ {
1594
+ "__schema": "VariableLikeSchema",
1595
+ "location": {
1596
+ "filePath": "merge-lanes.main.runtime.ts",
1597
+ "line": 62,
1598
+ "character": 31
1599
+ },
1600
+ "signature": "(property) id: ComponentID",
1601
+ "name": "id",
1602
+ "type": {
1603
+ "__schema": "TypeRefSchema",
1604
+ "location": {
1605
+ "filePath": "merge-lanes.main.runtime.ts",
1606
+ "line": 62,
1607
+ "character": 31
1608
+ },
1609
+ "name": "ComponentID",
1610
+ "componentId": {
1611
+ "scope": "teambit.component",
1612
+ "name": "component-id",
1613
+ "version": "1.2.0"
1614
+ }
1615
+ },
1616
+ "isOptional": false
1617
+ },
1618
+ {
1619
+ "__schema": "VariableLikeSchema",
1620
+ "location": {
1621
+ "filePath": "merge-lanes.main.runtime.ts",
1622
+ "line": 62,
1623
+ "character": 48
1624
+ },
1625
+ "signature": "(property) files: string[]",
1626
+ "name": "files",
1627
+ "type": {
1628
+ "__schema": "TypeArraySchema",
1629
+ "location": {
1630
+ "filePath": "merge-lanes.main.runtime.ts",
1631
+ "line": 62,
1632
+ "character": 55
1633
+ },
1634
+ "type": {
1635
+ "__schema": "KeywordTypeSchema",
1636
+ "location": {
1637
+ "filePath": "merge-lanes.main.runtime.ts",
1638
+ "line": 62,
1639
+ "character": 55
1640
+ },
1641
+ "name": "string"
1642
+ }
1643
+ },
1644
+ "isOptional": false
1645
+ },
1646
+ {
1647
+ "__schema": "VariableLikeSchema",
1648
+ "location": {
1649
+ "filePath": "merge-lanes.main.runtime.ts",
1650
+ "line": 62,
1651
+ "character": 65
1652
+ },
1653
+ "signature": "(property) config?: boolean | undefined",
1654
+ "name": "config",
1655
+ "type": {
1656
+ "__schema": "KeywordTypeSchema",
1657
+ "location": {
1658
+ "filePath": "merge-lanes.main.runtime.ts",
1659
+ "line": 62,
1660
+ "character": 74
1661
+ },
1662
+ "name": "boolean"
1663
+ },
1664
+ "isOptional": true
1665
+ }
1666
+ ]
1667
+ }
1668
+ },
1669
+ {
1670
+ "__schema": "TypeSchema",
1671
+ "location": {
1672
+ "filePath": "merge-lanes.main.runtime.ts",
1673
+ "line": 63,
1674
+ "character": 1
1675
+ },
1676
+ "signature": "type MergeFromScopeResult = {\n mergedNow: ComponentID[];\n exportedIds: ComponentID[];\n unmerged: {\n id: ComponentID;\n reason: string;\n }[];\n conflicts?: ConflictPerId[] | undefined;\n snappedIds?: ComponentID[] | undefined;\n mergedPreviously: ComponentID[];\n mergeSnapError?: Error | undefined;\n}",
1482
1677
  "name": "MergeFromScopeResult",
1483
1678
  "type": {
1484
1679
  "__schema": "TypeLiteralSchema",
1485
1680
  "location": {
1486
1681
  "filePath": "merge-lanes.main.runtime.ts",
1487
- "line": 60,
1682
+ "line": 63,
1488
1683
  "character": 36
1489
1684
  },
1490
1685
  "members": [
@@ -1492,7 +1687,7 @@
1492
1687
  "__schema": "VariableLikeSchema",
1493
1688
  "location": {
1494
1689
  "filePath": "merge-lanes.main.runtime.ts",
1495
- "line": 61,
1690
+ "line": 64,
1496
1691
  "character": 3
1497
1692
  },
1498
1693
  "signature": "(property) mergedNow: ComponentID[]",
@@ -1501,14 +1696,14 @@
1501
1696
  "__schema": "TypeArraySchema",
1502
1697
  "location": {
1503
1698
  "filePath": "merge-lanes.main.runtime.ts",
1504
- "line": 61,
1699
+ "line": 64,
1505
1700
  "character": 14
1506
1701
  },
1507
1702
  "type": {
1508
1703
  "__schema": "TypeRefSchema",
1509
1704
  "location": {
1510
1705
  "filePath": "merge-lanes.main.runtime.ts",
1511
- "line": 61,
1706
+ "line": 64,
1512
1707
  "character": 14
1513
1708
  },
1514
1709
  "name": "ComponentID",
@@ -1525,7 +1720,7 @@
1525
1720
  "__schema": "VariableLikeSchema",
1526
1721
  "location": {
1527
1722
  "filePath": "merge-lanes.main.runtime.ts",
1528
- "line": 62,
1723
+ "line": 65,
1529
1724
  "character": 3
1530
1725
  },
1531
1726
  "signature": "(property) exportedIds: ComponentID[]",
@@ -1534,14 +1729,14 @@
1534
1729
  "__schema": "TypeArraySchema",
1535
1730
  "location": {
1536
1731
  "filePath": "merge-lanes.main.runtime.ts",
1537
- "line": 62,
1732
+ "line": 65,
1538
1733
  "character": 16
1539
1734
  },
1540
1735
  "type": {
1541
1736
  "__schema": "TypeRefSchema",
1542
1737
  "location": {
1543
1738
  "filePath": "merge-lanes.main.runtime.ts",
1544
- "line": 62,
1739
+ "line": 65,
1545
1740
  "character": 16
1546
1741
  },
1547
1742
  "name": "ComponentID",
@@ -1558,7 +1753,7 @@
1558
1753
  "__schema": "VariableLikeSchema",
1559
1754
  "location": {
1560
1755
  "filePath": "merge-lanes.main.runtime.ts",
1561
- "line": 63,
1756
+ "line": 66,
1562
1757
  "character": 3
1563
1758
  },
1564
1759
  "signature": "(property) unmerged: {\n id: ComponentID;\n reason: string;\n}[]",
@@ -1567,14 +1762,14 @@
1567
1762
  "__schema": "TypeArraySchema",
1568
1763
  "location": {
1569
1764
  "filePath": "merge-lanes.main.runtime.ts",
1570
- "line": 63,
1765
+ "line": 66,
1571
1766
  "character": 13
1572
1767
  },
1573
1768
  "type": {
1574
1769
  "__schema": "TypeLiteralSchema",
1575
1770
  "location": {
1576
1771
  "filePath": "merge-lanes.main.runtime.ts",
1577
- "line": 63,
1772
+ "line": 66,
1578
1773
  "character": 13
1579
1774
  },
1580
1775
  "members": [
@@ -1582,7 +1777,7 @@
1582
1777
  "__schema": "VariableLikeSchema",
1583
1778
  "location": {
1584
1779
  "filePath": "merge-lanes.main.runtime.ts",
1585
- "line": 63,
1780
+ "line": 66,
1586
1781
  "character": 15
1587
1782
  },
1588
1783
  "signature": "(property) id: ComponentID",
@@ -1591,7 +1786,7 @@
1591
1786
  "__schema": "TypeRefSchema",
1592
1787
  "location": {
1593
1788
  "filePath": "merge-lanes.main.runtime.ts",
1594
- "line": 63,
1789
+ "line": 66,
1595
1790
  "character": 15
1596
1791
  },
1597
1792
  "name": "ComponentID",
@@ -1607,7 +1802,7 @@
1607
1802
  "__schema": "VariableLikeSchema",
1608
1803
  "location": {
1609
1804
  "filePath": "merge-lanes.main.runtime.ts",
1610
- "line": 63,
1805
+ "line": 66,
1611
1806
  "character": 32
1612
1807
  },
1613
1808
  "signature": "(property) reason: string",
@@ -1616,7 +1811,7 @@
1616
1811
  "__schema": "KeywordTypeSchema",
1617
1812
  "location": {
1618
1813
  "filePath": "merge-lanes.main.runtime.ts",
1619
- "line": 63,
1814
+ "line": 66,
1620
1815
  "character": 40
1621
1816
  },
1622
1817
  "name": "string"
@@ -1632,104 +1827,28 @@
1632
1827
  "__schema": "VariableLikeSchema",
1633
1828
  "location": {
1634
1829
  "filePath": "merge-lanes.main.runtime.ts",
1635
- "line": 64,
1830
+ "line": 67,
1636
1831
  "character": 3
1637
1832
  },
1638
- "signature": "(property) conflicts?: {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n}[] | undefined",
1833
+ "signature": "(property) conflicts?: ConflictPerId[] | undefined",
1639
1834
  "name": "conflicts",
1640
1835
  "type": {
1641
- "__schema": "TypeRefSchema",
1836
+ "__schema": "TypeArraySchema",
1642
1837
  "location": {
1643
1838
  "filePath": "merge-lanes.main.runtime.ts",
1644
- "line": 64,
1839
+ "line": 67,
1645
1840
  "character": 15
1646
1841
  },
1647
- "name": "Array",
1648
- "typeArgs": [
1649
- {
1650
- "__schema": "TypeLiteralSchema",
1651
- "location": {
1652
- "filePath": "merge-lanes.main.runtime.ts",
1653
- "line": 64,
1654
- "character": 21
1655
- },
1656
- "members": [
1657
- {
1658
- "__schema": "VariableLikeSchema",
1659
- "location": {
1660
- "filePath": "merge-lanes.main.runtime.ts",
1661
- "line": 64,
1662
- "character": 23
1663
- },
1664
- "signature": "(property) id: ComponentID",
1665
- "name": "id",
1666
- "type": {
1667
- "__schema": "TypeRefSchema",
1668
- "location": {
1669
- "filePath": "merge-lanes.main.runtime.ts",
1670
- "line": 64,
1671
- "character": 23
1672
- },
1673
- "name": "ComponentID",
1674
- "componentId": {
1675
- "scope": "teambit.component",
1676
- "name": "component-id",
1677
- "version": "1.2.0"
1678
- }
1679
- },
1680
- "isOptional": false
1681
- },
1682
- {
1683
- "__schema": "VariableLikeSchema",
1684
- "location": {
1685
- "filePath": "merge-lanes.main.runtime.ts",
1686
- "line": 64,
1687
- "character": 40
1688
- },
1689
- "signature": "(property) files: string[]",
1690
- "name": "files",
1691
- "type": {
1692
- "__schema": "TypeArraySchema",
1693
- "location": {
1694
- "filePath": "merge-lanes.main.runtime.ts",
1695
- "line": 64,
1696
- "character": 47
1697
- },
1698
- "type": {
1699
- "__schema": "KeywordTypeSchema",
1700
- "location": {
1701
- "filePath": "merge-lanes.main.runtime.ts",
1702
- "line": 64,
1703
- "character": 47
1704
- },
1705
- "name": "string"
1706
- }
1707
- },
1708
- "isOptional": false
1709
- },
1710
- {
1711
- "__schema": "VariableLikeSchema",
1712
- "location": {
1713
- "filePath": "merge-lanes.main.runtime.ts",
1714
- "line": 64,
1715
- "character": 57
1716
- },
1717
- "signature": "(property) config?: boolean | undefined",
1718
- "name": "config",
1719
- "type": {
1720
- "__schema": "KeywordTypeSchema",
1721
- "location": {
1722
- "filePath": "merge-lanes.main.runtime.ts",
1723
- "line": 64,
1724
- "character": 66
1725
- },
1726
- "name": "boolean"
1727
- },
1728
- "isOptional": true
1729
- }
1730
- ]
1731
- }
1732
- ]
1842
+ "type": {
1843
+ "__schema": "TypeRefSchema",
1844
+ "location": {
1845
+ "filePath": "merge-lanes.main.runtime.ts",
1846
+ "line": 67,
1847
+ "character": 15
1848
+ },
1849
+ "name": "ConflictPerId",
1850
+ "internalFilePath": "merge-lanes.main.runtime.ts"
1851
+ }
1733
1852
  },
1734
1853
  "isOptional": true
1735
1854
  },
@@ -1737,7 +1856,7 @@
1737
1856
  "__schema": "VariableLikeSchema",
1738
1857
  "location": {
1739
1858
  "filePath": "merge-lanes.main.runtime.ts",
1740
- "line": 65,
1859
+ "line": 68,
1741
1860
  "character": 3
1742
1861
  },
1743
1862
  "signature": "(property) snappedIds?: ComponentID[] | undefined",
@@ -1746,14 +1865,14 @@
1746
1865
  "__schema": "TypeArraySchema",
1747
1866
  "location": {
1748
1867
  "filePath": "merge-lanes.main.runtime.ts",
1749
- "line": 65,
1868
+ "line": 68,
1750
1869
  "character": 16
1751
1870
  },
1752
1871
  "type": {
1753
1872
  "__schema": "TypeRefSchema",
1754
1873
  "location": {
1755
1874
  "filePath": "merge-lanes.main.runtime.ts",
1756
- "line": 65,
1875
+ "line": 68,
1757
1876
  "character": 16
1758
1877
  },
1759
1878
  "name": "ComponentID",
@@ -1770,7 +1889,7 @@
1770
1889
  "__schema": "VariableLikeSchema",
1771
1890
  "location": {
1772
1891
  "filePath": "merge-lanes.main.runtime.ts",
1773
- "line": 66,
1892
+ "line": 69,
1774
1893
  "character": 3
1775
1894
  },
1776
1895
  "signature": "(property) mergedPreviously: ComponentID[]",
@@ -1779,14 +1898,14 @@
1779
1898
  "__schema": "TypeArraySchema",
1780
1899
  "location": {
1781
1900
  "filePath": "merge-lanes.main.runtime.ts",
1782
- "line": 66,
1901
+ "line": 69,
1783
1902
  "character": 21
1784
1903
  },
1785
1904
  "type": {
1786
1905
  "__schema": "TypeRefSchema",
1787
1906
  "location": {
1788
1907
  "filePath": "merge-lanes.main.runtime.ts",
1789
- "line": 66,
1908
+ "line": 69,
1790
1909
  "character": 21
1791
1910
  },
1792
1911
  "name": "ComponentID",
@@ -1803,7 +1922,7 @@
1803
1922
  "__schema": "VariableLikeSchema",
1804
1923
  "location": {
1805
1924
  "filePath": "merge-lanes.main.runtime.ts",
1806
- "line": 67,
1925
+ "line": 70,
1807
1926
  "character": 3
1808
1927
  },
1809
1928
  "signature": "(property) mergeSnapError?: Error | undefined",
@@ -1812,7 +1931,7 @@
1812
1931
  "__schema": "TypeRefSchema",
1813
1932
  "location": {
1814
1933
  "filePath": "merge-lanes.main.runtime.ts",
1815
- "line": 67,
1934
+ "line": 70,
1816
1935
  "character": 20
1817
1936
  },
1818
1937
  "name": "Error"
@@ -1826,7 +1945,7 @@
1826
1945
  "__schema": "ClassSchema",
1827
1946
  "location": {
1828
1947
  "filePath": "merge-lanes.main.runtime.ts",
1829
- "line": 70,
1948
+ "line": 73,
1830
1949
  "character": 1
1831
1950
  },
1832
1951
  "signature": "class MergeLanesMain",
@@ -1836,7 +1955,7 @@
1836
1955
  "__schema": "ConstructorSchema",
1837
1956
  "location": {
1838
1957
  "filePath": "merge-lanes.main.runtime.ts",
1839
- "line": 71,
1958
+ "line": 74,
1840
1959
  "character": 3
1841
1960
  },
1842
1961
  "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -1846,7 +1965,7 @@
1846
1965
  "__schema": "ParameterSchema",
1847
1966
  "location": {
1848
1967
  "filePath": "merge-lanes.main.runtime.ts",
1849
- "line": 72,
1968
+ "line": 75,
1850
1969
  "character": 5
1851
1970
  },
1852
1971
  "name": "workspace",
@@ -1854,7 +1973,7 @@
1854
1973
  "__schema": "TypeUnionSchema",
1855
1974
  "location": {
1856
1975
  "filePath": "merge-lanes.main.runtime.ts",
1857
- "line": 72,
1976
+ "line": 75,
1858
1977
  "character": 24
1859
1978
  },
1860
1979
  "types": [
@@ -1862,7 +1981,7 @@
1862
1981
  "__schema": "TypeRefSchema",
1863
1982
  "location": {
1864
1983
  "filePath": "merge-lanes.main.runtime.ts",
1865
- "line": 72,
1984
+ "line": 75,
1866
1985
  "character": 24
1867
1986
  },
1868
1987
  "name": "Workspace",
@@ -1875,7 +1994,7 @@
1875
1994
  "__schema": "KeywordTypeSchema",
1876
1995
  "location": {
1877
1996
  "filePath": "merge-lanes.main.runtime.ts",
1878
- "line": 72,
1997
+ "line": 75,
1879
1998
  "character": 36
1880
1999
  },
1881
2000
  "name": "undefined"
@@ -1889,7 +2008,7 @@
1889
2008
  "__schema": "ParameterSchema",
1890
2009
  "location": {
1891
2010
  "filePath": "merge-lanes.main.runtime.ts",
1892
- "line": 73,
2011
+ "line": 76,
1893
2012
  "character": 5
1894
2013
  },
1895
2014
  "name": "merging",
@@ -1897,7 +2016,7 @@
1897
2016
  "__schema": "TypeRefSchema",
1898
2017
  "location": {
1899
2018
  "filePath": "merge-lanes.main.runtime.ts",
1900
- "line": 73,
2019
+ "line": 76,
1901
2020
  "character": 22
1902
2021
  },
1903
2022
  "name": "MergingMain",
@@ -1913,7 +2032,7 @@
1913
2032
  "__schema": "ParameterSchema",
1914
2033
  "location": {
1915
2034
  "filePath": "merge-lanes.main.runtime.ts",
1916
- "line": 74,
2035
+ "line": 77,
1917
2036
  "character": 5
1918
2037
  },
1919
2038
  "name": "lanes",
@@ -1921,7 +2040,7 @@
1921
2040
  "__schema": "TypeRefSchema",
1922
2041
  "location": {
1923
2042
  "filePath": "merge-lanes.main.runtime.ts",
1924
- "line": 74,
2043
+ "line": 77,
1925
2044
  "character": 20
1926
2045
  },
1927
2046
  "name": "LanesMain",
@@ -1937,7 +2056,7 @@
1937
2056
  "__schema": "ParameterSchema",
1938
2057
  "location": {
1939
2058
  "filePath": "merge-lanes.main.runtime.ts",
1940
- "line": 75,
2059
+ "line": 78,
1941
2060
  "character": 5
1942
2061
  },
1943
2062
  "name": "logger",
@@ -1945,7 +2064,7 @@
1945
2064
  "__schema": "TypeRefSchema",
1946
2065
  "location": {
1947
2066
  "filePath": "merge-lanes.main.runtime.ts",
1948
- "line": 75,
2067
+ "line": 78,
1949
2068
  "character": 22
1950
2069
  },
1951
2070
  "name": "Logger",
@@ -1961,7 +2080,7 @@
1961
2080
  "__schema": "ParameterSchema",
1962
2081
  "location": {
1963
2082
  "filePath": "merge-lanes.main.runtime.ts",
1964
- "line": 76,
2083
+ "line": 79,
1965
2084
  "character": 5
1966
2085
  },
1967
2086
  "name": "remove",
@@ -1969,7 +2088,7 @@
1969
2088
  "__schema": "TypeRefSchema",
1970
2089
  "location": {
1971
2090
  "filePath": "merge-lanes.main.runtime.ts",
1972
- "line": 76,
2091
+ "line": 79,
1973
2092
  "character": 21
1974
2093
  },
1975
2094
  "name": "RemoveMain",
@@ -1985,7 +2104,7 @@
1985
2104
  "__schema": "ParameterSchema",
1986
2105
  "location": {
1987
2106
  "filePath": "merge-lanes.main.runtime.ts",
1988
- "line": 77,
2107
+ "line": 80,
1989
2108
  "character": 5
1990
2109
  },
1991
2110
  "name": "scope",
@@ -1993,7 +2112,7 @@
1993
2112
  "__schema": "TypeRefSchema",
1994
2113
  "location": {
1995
2114
  "filePath": "merge-lanes.main.runtime.ts",
1996
- "line": 77,
2115
+ "line": 80,
1997
2116
  "character": 20
1998
2117
  },
1999
2118
  "name": "ScopeMain",
@@ -2009,7 +2128,7 @@
2009
2128
  "__schema": "ParameterSchema",
2010
2129
  "location": {
2011
2130
  "filePath": "merge-lanes.main.runtime.ts",
2012
- "line": 78,
2131
+ "line": 81,
2013
2132
  "character": 5
2014
2133
  },
2015
2134
  "name": "exporter",
@@ -2017,7 +2136,7 @@
2017
2136
  "__schema": "TypeRefSchema",
2018
2137
  "location": {
2019
2138
  "filePath": "merge-lanes.main.runtime.ts",
2020
- "line": 78,
2139
+ "line": 81,
2021
2140
  "character": 23
2022
2141
  },
2023
2142
  "name": "ExportMain",
@@ -2033,7 +2152,7 @@
2033
2152
  "__schema": "ParameterSchema",
2034
2153
  "location": {
2035
2154
  "filePath": "merge-lanes.main.runtime.ts",
2036
- "line": 79,
2155
+ "line": 82,
2037
2156
  "character": 5
2038
2157
  },
2039
2158
  "name": "importer",
@@ -2041,7 +2160,7 @@
2041
2160
  "__schema": "TypeRefSchema",
2042
2161
  "location": {
2043
2162
  "filePath": "merge-lanes.main.runtime.ts",
2044
- "line": 79,
2163
+ "line": 82,
2045
2164
  "character": 23
2046
2165
  },
2047
2166
  "name": "ImporterMain",
@@ -2057,7 +2176,7 @@
2057
2176
  "__schema": "ParameterSchema",
2058
2177
  "location": {
2059
2178
  "filePath": "merge-lanes.main.runtime.ts",
2060
- "line": 80,
2179
+ "line": 83,
2061
2180
  "character": 5
2062
2181
  },
2063
2182
  "name": "checkout",
@@ -2065,7 +2184,7 @@
2065
2184
  "__schema": "TypeRefSchema",
2066
2185
  "location": {
2067
2186
  "filePath": "merge-lanes.main.runtime.ts",
2068
- "line": 80,
2187
+ "line": 83,
2069
2188
  "character": 23
2070
2189
  },
2071
2190
  "name": "CheckoutMain",
@@ -2082,7 +2201,7 @@
2082
2201
  "__schema": "ThisTypeSchema",
2083
2202
  "location": {
2084
2203
  "filePath": "merge-lanes.main.runtime.ts",
2085
- "line": 70,
2204
+ "line": 73,
2086
2205
  "character": 1
2087
2206
  },
2088
2207
  "name": "MergeLanesMain"
@@ -2093,17 +2212,17 @@
2093
2212
  "__schema": "FunctionLikeSchema",
2094
2213
  "location": {
2095
2214
  "filePath": "merge-lanes.main.runtime.ts",
2096
- "line": 83,
2215
+ "line": 86,
2097
2216
  "character": 3
2098
2217
  },
2099
- "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
2218
+ "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
2100
2219
  "name": "mergeLaneByCLI",
2101
2220
  "params": [
2102
2221
  {
2103
2222
  "__schema": "ParameterSchema",
2104
2223
  "location": {
2105
2224
  "filePath": "merge-lanes.main.runtime.ts",
2106
- "line": 83,
2225
+ "line": 86,
2107
2226
  "character": 24
2108
2227
  },
2109
2228
  "name": "laneName",
@@ -2111,7 +2230,7 @@
2111
2230
  "__schema": "KeywordTypeSchema",
2112
2231
  "location": {
2113
2232
  "filePath": "merge-lanes.main.runtime.ts",
2114
- "line": 83,
2233
+ "line": 86,
2115
2234
  "character": 34
2116
2235
  },
2117
2236
  "name": "string"
@@ -2123,7 +2242,7 @@
2123
2242
  "__schema": "ParameterSchema",
2124
2243
  "location": {
2125
2244
  "filePath": "merge-lanes.main.runtime.ts",
2126
- "line": 83,
2245
+ "line": 86,
2127
2246
  "character": 42
2128
2247
  },
2129
2248
  "name": "options",
@@ -2131,7 +2250,7 @@
2131
2250
  "__schema": "TypeRefSchema",
2132
2251
  "location": {
2133
2252
  "filePath": "merge-lanes.main.runtime.ts",
2134
- "line": 83,
2253
+ "line": 86,
2135
2254
  "character": 51
2136
2255
  },
2137
2256
  "name": "MergeLaneOptions",
@@ -2145,10 +2264,10 @@
2145
2264
  "__schema": "InferenceTypeSchema",
2146
2265
  "location": {
2147
2266
  "filePath": "merge-lanes.main.runtime.ts",
2148
- "line": 83,
2267
+ "line": 86,
2149
2268
  "character": 3
2150
2269
  },
2151
- "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>"
2270
+ "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
2152
2271
  },
2153
2272
  "modifiers": [
2154
2273
  "async"
@@ -2158,17 +2277,17 @@
2158
2277
  "__schema": "FunctionLikeSchema",
2159
2278
  "location": {
2160
2279
  "filePath": "merge-lanes.main.runtime.ts",
2161
- "line": 93,
2280
+ "line": 96,
2162
2281
  "character": 3
2163
2282
  },
2164
- "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
2283
+ "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
2165
2284
  "name": "mergeLane",
2166
2285
  "params": [
2167
2286
  {
2168
2287
  "__schema": "ParameterSchema",
2169
2288
  "location": {
2170
2289
  "filePath": "merge-lanes.main.runtime.ts",
2171
- "line": 94,
2290
+ "line": 97,
2172
2291
  "character": 5
2173
2292
  },
2174
2293
  "name": "otherLaneId",
@@ -2176,7 +2295,7 @@
2176
2295
  "__schema": "TypeRefSchema",
2177
2296
  "location": {
2178
2297
  "filePath": "merge-lanes.main.runtime.ts",
2179
- "line": 94,
2298
+ "line": 97,
2180
2299
  "character": 18
2181
2300
  },
2182
2301
  "name": "LaneId",
@@ -2193,7 +2312,7 @@
2193
2312
  "__schema": "ParameterSchema",
2194
2313
  "location": {
2195
2314
  "filePath": "merge-lanes.main.runtime.ts",
2196
- "line": 95,
2315
+ "line": 98,
2197
2316
  "character": 5
2198
2317
  },
2199
2318
  "name": "currentLaneId",
@@ -2201,7 +2320,7 @@
2201
2320
  "__schema": "TypeRefSchema",
2202
2321
  "location": {
2203
2322
  "filePath": "merge-lanes.main.runtime.ts",
2204
- "line": 95,
2323
+ "line": 98,
2205
2324
  "character": 20
2206
2325
  },
2207
2326
  "name": "LaneId",
@@ -2218,7 +2337,7 @@
2218
2337
  "__schema": "ParameterSchema",
2219
2338
  "location": {
2220
2339
  "filePath": "merge-lanes.main.runtime.ts",
2221
- "line": 96,
2340
+ "line": 99,
2222
2341
  "character": 5
2223
2342
  },
2224
2343
  "name": "options",
@@ -2226,7 +2345,7 @@
2226
2345
  "__schema": "TypeRefSchema",
2227
2346
  "location": {
2228
2347
  "filePath": "merge-lanes.main.runtime.ts",
2229
- "line": 96,
2348
+ "line": 99,
2230
2349
  "character": 14
2231
2350
  },
2232
2351
  "name": "MergeLaneOptions",
@@ -2240,7 +2359,7 @@
2240
2359
  "__schema": "TypeRefSchema",
2241
2360
  "location": {
2242
2361
  "filePath": "merge-lanes.main.runtime.ts",
2243
- "line": 97,
2362
+ "line": 100,
2244
2363
  "character": 6
2245
2364
  },
2246
2365
  "name": "Promise",
@@ -2249,7 +2368,7 @@
2249
2368
  "__schema": "TypeLiteralSchema",
2250
2369
  "location": {
2251
2370
  "filePath": "merge-lanes.main.runtime.ts",
2252
- "line": 97,
2371
+ "line": 100,
2253
2372
  "character": 14
2254
2373
  },
2255
2374
  "members": [
@@ -2257,8 +2376,8 @@
2257
2376
  "__schema": "VariableLikeSchema",
2258
2377
  "location": {
2259
2378
  "filePath": "merge-lanes.main.runtime.ts",
2260
- "line": 97,
2261
- "character": 16
2379
+ "line": 101,
2380
+ "character": 5
2262
2381
  },
2263
2382
  "signature": "(property) mergeResults: ApplyVersionResults",
2264
2383
  "name": "mergeResults",
@@ -2266,8 +2385,8 @@
2266
2385
  "__schema": "TypeRefSchema",
2267
2386
  "location": {
2268
2387
  "filePath": "merge-lanes.main.runtime.ts",
2269
- "line": 97,
2270
- "character": 16
2388
+ "line": 101,
2389
+ "character": 5
2271
2390
  },
2272
2391
  "name": "ApplyVersionResults",
2273
2392
  "componentId": {
@@ -2281,8 +2400,8 @@
2281
2400
  "__schema": "VariableLikeSchema",
2282
2401
  "location": {
2283
2402
  "filePath": "merge-lanes.main.runtime.ts",
2284
- "line": 97,
2285
- "character": 51
2403
+ "line": 102,
2404
+ "character": 5
2286
2405
  },
2287
2406
  "signature": "(property) deleteResults: any",
2288
2407
  "name": "deleteResults",
@@ -2290,8 +2409,8 @@
2290
2409
  "__schema": "KeywordTypeSchema",
2291
2410
  "location": {
2292
2411
  "filePath": "merge-lanes.main.runtime.ts",
2293
- "line": 97,
2294
- "character": 66
2412
+ "line": 102,
2413
+ "character": 20
2295
2414
  },
2296
2415
  "name": "any"
2297
2416
  },
@@ -2301,8 +2420,8 @@
2301
2420
  "__schema": "VariableLikeSchema",
2302
2421
  "location": {
2303
2422
  "filePath": "merge-lanes.main.runtime.ts",
2304
- "line": 97,
2305
- "character": 71
2423
+ "line": 103,
2424
+ "character": 5
2306
2425
  },
2307
2426
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
2308
2427
  "name": "configMergeResults",
@@ -2310,15 +2429,15 @@
2310
2429
  "__schema": "TypeArraySchema",
2311
2430
  "location": {
2312
2431
  "filePath": "merge-lanes.main.runtime.ts",
2313
- "line": 97,
2314
- "character": 91
2432
+ "line": 103,
2433
+ "character": 25
2315
2434
  },
2316
2435
  "type": {
2317
2436
  "__schema": "TypeRefSchema",
2318
2437
  "location": {
2319
2438
  "filePath": "merge-lanes.main.runtime.ts",
2320
- "line": 97,
2321
- "character": 91
2439
+ "line": 103,
2440
+ "character": 25
2322
2441
  },
2323
2442
  "name": "ConfigMergeResult",
2324
2443
  "componentId": {
@@ -2328,6 +2447,68 @@
2328
2447
  }
2329
2448
  },
2330
2449
  "isOptional": false
2450
+ },
2451
+ {
2452
+ "__schema": "VariableLikeSchema",
2453
+ "location": {
2454
+ "filePath": "merge-lanes.main.runtime.ts",
2455
+ "line": 104,
2456
+ "character": 5
2457
+ },
2458
+ "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
2459
+ "name": "mergedSuccessfullyIds",
2460
+ "type": {
2461
+ "__schema": "TypeArraySchema",
2462
+ "location": {
2463
+ "filePath": "merge-lanes.main.runtime.ts",
2464
+ "line": 104,
2465
+ "character": 28
2466
+ },
2467
+ "type": {
2468
+ "__schema": "TypeRefSchema",
2469
+ "location": {
2470
+ "filePath": "merge-lanes.main.runtime.ts",
2471
+ "line": 104,
2472
+ "character": 28
2473
+ },
2474
+ "name": "ComponentID",
2475
+ "componentId": {
2476
+ "scope": "teambit.component",
2477
+ "name": "component-id",
2478
+ "version": "1.2.0"
2479
+ }
2480
+ }
2481
+ },
2482
+ "isOptional": false
2483
+ },
2484
+ {
2485
+ "__schema": "VariableLikeSchema",
2486
+ "location": {
2487
+ "filePath": "merge-lanes.main.runtime.ts",
2488
+ "line": 105,
2489
+ "character": 5
2490
+ },
2491
+ "signature": "(property) conflicts: ConflictPerId[]",
2492
+ "name": "conflicts",
2493
+ "type": {
2494
+ "__schema": "TypeArraySchema",
2495
+ "location": {
2496
+ "filePath": "merge-lanes.main.runtime.ts",
2497
+ "line": 105,
2498
+ "character": 16
2499
+ },
2500
+ "type": {
2501
+ "__schema": "TypeRefSchema",
2502
+ "location": {
2503
+ "filePath": "merge-lanes.main.runtime.ts",
2504
+ "line": 105,
2505
+ "character": 16
2506
+ },
2507
+ "name": "ConflictPerId",
2508
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2509
+ }
2510
+ },
2511
+ "isOptional": false
2331
2512
  }
2332
2513
  ]
2333
2514
  }
@@ -2341,7 +2522,7 @@
2341
2522
  "__schema": "FunctionLikeSchema",
2342
2523
  "location": {
2343
2524
  "filePath": "merge-lanes.main.runtime.ts",
2344
- "line": 281,
2525
+ "line": 318,
2345
2526
  "character": 3
2346
2527
  },
2347
2528
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -2351,7 +2532,7 @@
2351
2532
  "__schema": "ParameterSchema",
2352
2533
  "location": {
2353
2534
  "filePath": "merge-lanes.main.runtime.ts",
2354
- "line": 281,
2535
+ "line": 318,
2355
2536
  "character": 24
2356
2537
  },
2357
2538
  "name": "checkoutProps",
@@ -2359,7 +2540,7 @@
2359
2540
  "__schema": "TypeRefSchema",
2360
2541
  "location": {
2361
2542
  "filePath": "merge-lanes.main.runtime.ts",
2362
- "line": 281,
2543
+ "line": 318,
2363
2544
  "character": 39
2364
2545
  },
2365
2546
  "name": "CheckoutProps",
@@ -2375,7 +2556,7 @@
2375
2556
  "__schema": "ParameterSchema",
2376
2557
  "location": {
2377
2558
  "filePath": "merge-lanes.main.runtime.ts",
2378
- "line": 281,
2559
+ "line": 318,
2379
2560
  "character": 54
2380
2561
  },
2381
2562
  "name": "mergeAbortOpts",
@@ -2383,7 +2564,7 @@
2383
2564
  "__schema": "TypeRefSchema",
2384
2565
  "location": {
2385
2566
  "filePath": "merge-lanes.main.runtime.ts",
2386
- "line": 281,
2567
+ "line": 318,
2387
2568
  "character": 70
2388
2569
  },
2389
2570
  "name": "MergeAbortOpts",
@@ -2397,7 +2578,7 @@
2397
2578
  "__schema": "InferenceTypeSchema",
2398
2579
  "location": {
2399
2580
  "filePath": "merge-lanes.main.runtime.ts",
2400
- "line": 281,
2581
+ "line": 318,
2401
2582
  "character": 3
2402
2583
  },
2403
2584
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -2410,7 +2591,7 @@
2410
2591
  "__schema": "FunctionLikeSchema",
2411
2592
  "location": {
2412
2593
  "filePath": "merge-lanes.main.runtime.ts",
2413
- "line": 337,
2594
+ "line": 374,
2414
2595
  "character": 3
2415
2596
  },
2416
2597
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -2420,7 +2601,7 @@
2420
2601
  "__schema": "ParameterSchema",
2421
2602
  "location": {
2422
2603
  "filePath": "merge-lanes.main.runtime.ts",
2423
- "line": 338,
2604
+ "line": 375,
2424
2605
  "character": 5
2425
2606
  },
2426
2607
  "name": "fromLane",
@@ -2428,7 +2609,7 @@
2428
2609
  "__schema": "KeywordTypeSchema",
2429
2610
  "location": {
2430
2611
  "filePath": "merge-lanes.main.runtime.ts",
2431
- "line": 338,
2612
+ "line": 375,
2432
2613
  "character": 15
2433
2614
  },
2434
2615
  "name": "string"
@@ -2440,7 +2621,7 @@
2440
2621
  "__schema": "ParameterSchema",
2441
2622
  "location": {
2442
2623
  "filePath": "merge-lanes.main.runtime.ts",
2443
- "line": 339,
2624
+ "line": 376,
2444
2625
  "character": 5
2445
2626
  },
2446
2627
  "name": "toLane",
@@ -2448,7 +2629,7 @@
2448
2629
  "__schema": "KeywordTypeSchema",
2449
2630
  "location": {
2450
2631
  "filePath": "merge-lanes.main.runtime.ts",
2451
- "line": 339,
2632
+ "line": 376,
2452
2633
  "character": 13
2453
2634
  },
2454
2635
  "name": "string"
@@ -2460,7 +2641,7 @@
2460
2641
  "__schema": "ParameterSchema",
2461
2642
  "location": {
2462
2643
  "filePath": "merge-lanes.main.runtime.ts",
2463
- "line": 340,
2644
+ "line": 377,
2464
2645
  "character": 5
2465
2646
  },
2466
2647
  "name": "options",
@@ -2468,7 +2649,7 @@
2468
2649
  "__schema": "TypeIntersectionSchema",
2469
2650
  "location": {
2470
2651
  "filePath": "merge-lanes.main.runtime.ts",
2471
- "line": 340,
2652
+ "line": 377,
2472
2653
  "character": 14
2473
2654
  },
2474
2655
  "types": [
@@ -2476,7 +2657,7 @@
2476
2657
  "__schema": "TypeRefSchema",
2477
2658
  "location": {
2478
2659
  "filePath": "merge-lanes.main.runtime.ts",
2479
- "line": 340,
2660
+ "line": 377,
2480
2661
  "character": 14
2481
2662
  },
2482
2663
  "name": "Partial",
@@ -2485,7 +2666,7 @@
2485
2666
  "__schema": "TypeRefSchema",
2486
2667
  "location": {
2487
2668
  "filePath": "merge-lanes.main.runtime.ts",
2488
- "line": 340,
2669
+ "line": 377,
2489
2670
  "character": 22
2490
2671
  },
2491
2672
  "name": "MergeLaneOptions",
@@ -2497,7 +2678,7 @@
2497
2678
  "__schema": "TypeLiteralSchema",
2498
2679
  "location": {
2499
2680
  "filePath": "merge-lanes.main.runtime.ts",
2500
- "line": 340,
2681
+ "line": 377,
2501
2682
  "character": 42
2502
2683
  },
2503
2684
  "members": [
@@ -2505,7 +2686,7 @@
2505
2686
  "__schema": "VariableLikeSchema",
2506
2687
  "location": {
2507
2688
  "filePath": "merge-lanes.main.runtime.ts",
2508
- "line": 340,
2689
+ "line": 377,
2509
2690
  "character": 44
2510
2691
  },
2511
2692
  "signature": "(property) push?: boolean | undefined",
@@ -2514,7 +2695,7 @@
2514
2695
  "__schema": "KeywordTypeSchema",
2515
2696
  "location": {
2516
2697
  "filePath": "merge-lanes.main.runtime.ts",
2517
- "line": 340,
2698
+ "line": 377,
2518
2699
  "character": 51
2519
2700
  },
2520
2701
  "name": "boolean"
@@ -2525,7 +2706,7 @@
2525
2706
  "__schema": "VariableLikeSchema",
2526
2707
  "location": {
2527
2708
  "filePath": "merge-lanes.main.runtime.ts",
2528
- "line": 340,
2709
+ "line": 377,
2529
2710
  "character": 60
2530
2711
  },
2531
2712
  "signature": "(property) reMerge?: boolean | undefined",
@@ -2534,7 +2715,7 @@
2534
2715
  "__schema": "KeywordTypeSchema",
2535
2716
  "location": {
2536
2717
  "filePath": "merge-lanes.main.runtime.ts",
2537
- "line": 340,
2718
+ "line": 377,
2538
2719
  "character": 70
2539
2720
  },
2540
2721
  "name": "boolean"
@@ -2553,7 +2734,7 @@
2553
2734
  "__schema": "TypeRefSchema",
2554
2735
  "location": {
2555
2736
  "filePath": "merge-lanes.main.runtime.ts",
2556
- "line": 341,
2737
+ "line": 378,
2557
2738
  "character": 6
2558
2739
  },
2559
2740
  "name": "Promise",
@@ -2562,7 +2743,7 @@
2562
2743
  "__schema": "TypeRefSchema",
2563
2744
  "location": {
2564
2745
  "filePath": "merge-lanes.main.runtime.ts",
2565
- "line": 341,
2746
+ "line": 378,
2566
2747
  "character": 14
2567
2748
  },
2568
2749
  "name": "MergeFromScopeResult",
@@ -2578,7 +2759,7 @@
2578
2759
  "__schema": "VariableLikeSchema",
2579
2760
  "location": {
2580
2761
  "filePath": "merge-lanes.main.runtime.ts",
2581
- "line": 482,
2762
+ "line": 472,
2582
2763
  "character": 3
2583
2764
  },
2584
2765
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2587,7 +2768,7 @@
2587
2768
  "__schema": "InferenceTypeSchema",
2588
2769
  "location": {
2589
2770
  "filePath": "merge-lanes.main.runtime.ts",
2590
- "line": 482,
2771
+ "line": 472,
2591
2772
  "character": 3
2592
2773
  },
2593
2774
  "type": "never[]"
@@ -2599,7 +2780,7 @@
2599
2780
  "__schema": "VariableLikeSchema",
2600
2781
  "location": {
2601
2782
  "filePath": "merge-lanes.main.runtime.ts",
2602
- "line": 483,
2783
+ "line": 473,
2603
2784
  "character": 3
2604
2785
  },
2605
2786
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2608,7 +2789,7 @@
2608
2789
  "__schema": "InferenceTypeSchema",
2609
2790
  "location": {
2610
2791
  "filePath": "merge-lanes.main.runtime.ts",
2611
- "line": 483,
2792
+ "line": 473,
2612
2793
  "character": 3
2613
2794
  },
2614
2795
  "type": "Aspect[]"
@@ -2620,7 +2801,7 @@
2620
2801
  "__schema": "VariableLikeSchema",
2621
2802
  "location": {
2622
2803
  "filePath": "merge-lanes.main.runtime.ts",
2623
- "line": 496,
2804
+ "line": 486,
2624
2805
  "character": 3
2625
2806
  },
2626
2807
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2629,7 +2810,7 @@
2629
2810
  "__schema": "InferenceTypeSchema",
2630
2811
  "location": {
2631
2812
  "filePath": "merge-lanes.main.runtime.ts",
2632
- "line": 496,
2813
+ "line": 486,
2633
2814
  "character": 3
2634
2815
  },
2635
2816
  "type": "RuntimeDefinition"
@@ -2641,7 +2822,7 @@
2641
2822
  "__schema": "FunctionLikeSchema",
2642
2823
  "location": {
2643
2824
  "filePath": "merge-lanes.main.runtime.ts",
2644
- "line": 498,
2825
+ "line": 488,
2645
2826
  "character": 3
2646
2827
  },
2647
2828
  "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>",
@@ -2651,7 +2832,7 @@
2651
2832
  "__schema": "ParameterSchema",
2652
2833
  "location": {
2653
2834
  "filePath": "merge-lanes.main.runtime.ts",
2654
- "line": 498,
2835
+ "line": 488,
2655
2836
  "character": 25
2656
2837
  },
2657
2838
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2659,7 +2840,7 @@
2659
2840
  "__schema": "TupleTypeSchema",
2660
2841
  "location": {
2661
2842
  "filePath": "merge-lanes.main.runtime.ts",
2662
- "line": 510,
2843
+ "line": 500,
2663
2844
  "character": 6
2664
2845
  },
2665
2846
  "elements": [
@@ -2667,7 +2848,7 @@
2667
2848
  "__schema": "TypeRefSchema",
2668
2849
  "location": {
2669
2850
  "filePath": "merge-lanes.main.runtime.ts",
2670
- "line": 511,
2851
+ "line": 501,
2671
2852
  "character": 5
2672
2853
  },
2673
2854
  "name": "LanesMain",
@@ -2680,7 +2861,7 @@
2680
2861
  "__schema": "TypeRefSchema",
2681
2862
  "location": {
2682
2863
  "filePath": "merge-lanes.main.runtime.ts",
2683
- "line": 512,
2864
+ "line": 502,
2684
2865
  "character": 5
2685
2866
  },
2686
2867
  "name": "CLIMain",
@@ -2693,7 +2874,7 @@
2693
2874
  "__schema": "TypeRefSchema",
2694
2875
  "location": {
2695
2876
  "filePath": "merge-lanes.main.runtime.ts",
2696
- "line": 513,
2877
+ "line": 503,
2697
2878
  "character": 5
2698
2879
  },
2699
2880
  "name": "Workspace",
@@ -2706,7 +2887,7 @@
2706
2887
  "__schema": "TypeRefSchema",
2707
2888
  "location": {
2708
2889
  "filePath": "merge-lanes.main.runtime.ts",
2709
- "line": 514,
2890
+ "line": 504,
2710
2891
  "character": 5
2711
2892
  },
2712
2893
  "name": "MergingMain",
@@ -2719,7 +2900,7 @@
2719
2900
  "__schema": "TypeRefSchema",
2720
2901
  "location": {
2721
2902
  "filePath": "merge-lanes.main.runtime.ts",
2722
- "line": 515,
2903
+ "line": 505,
2723
2904
  "character": 5
2724
2905
  },
2725
2906
  "name": "LoggerMain",
@@ -2732,7 +2913,7 @@
2732
2913
  "__schema": "TypeRefSchema",
2733
2914
  "location": {
2734
2915
  "filePath": "merge-lanes.main.runtime.ts",
2735
- "line": 516,
2916
+ "line": 506,
2736
2917
  "character": 5
2737
2918
  },
2738
2919
  "name": "RemoveMain",
@@ -2745,7 +2926,7 @@
2745
2926
  "__schema": "TypeRefSchema",
2746
2927
  "location": {
2747
2928
  "filePath": "merge-lanes.main.runtime.ts",
2748
- "line": 517,
2929
+ "line": 507,
2749
2930
  "character": 5
2750
2931
  },
2751
2932
  "name": "ScopeMain",
@@ -2758,7 +2939,7 @@
2758
2939
  "__schema": "TypeRefSchema",
2759
2940
  "location": {
2760
2941
  "filePath": "merge-lanes.main.runtime.ts",
2761
- "line": 518,
2942
+ "line": 508,
2762
2943
  "character": 5
2763
2944
  },
2764
2945
  "name": "ExportMain",
@@ -2771,7 +2952,7 @@
2771
2952
  "__schema": "TypeRefSchema",
2772
2953
  "location": {
2773
2954
  "filePath": "merge-lanes.main.runtime.ts",
2774
- "line": 519,
2955
+ "line": 509,
2775
2956
  "character": 5
2776
2957
  },
2777
2958
  "name": "ImporterMain",
@@ -2784,7 +2965,7 @@
2784
2965
  "__schema": "TypeRefSchema",
2785
2966
  "location": {
2786
2967
  "filePath": "merge-lanes.main.runtime.ts",
2787
- "line": 520,
2968
+ "line": 510,
2788
2969
  "character": 5
2789
2970
  },
2790
2971
  "name": "CheckoutMain",
@@ -2797,7 +2978,7 @@
2797
2978
  "__schema": "TypeRefSchema",
2798
2979
  "location": {
2799
2980
  "filePath": "merge-lanes.main.runtime.ts",
2800
- "line": 521,
2981
+ "line": 511,
2801
2982
  "character": 5
2802
2983
  },
2803
2984
  "name": "GlobalConfigMain",
@@ -2816,7 +2997,7 @@
2816
2997
  "__schema": "InferenceTypeSchema",
2817
2998
  "location": {
2818
2999
  "filePath": "merge-lanes.main.runtime.ts",
2819
- "line": 498,
3000
+ "line": 488,
2820
3001
  "character": 3
2821
3002
  },
2822
3003
  "type": "Promise<MergeLanesMain>"
@@ -2834,7 +3015,7 @@
2834
3015
  "__schema": "UnImplementedSchema",
2835
3016
  "location": {
2836
3017
  "filePath": "merge-lanes.main.runtime.ts",
2837
- "line": 793,
3018
+ "line": 782,
2838
3019
  "character": 16
2839
3020
  },
2840
3021
  "name": "MergeLanesMain",
@@ -2846,7 +3027,7 @@
2846
3027
  "__schema": "FunctionLikeSchema",
2847
3028
  "location": {
2848
3029
  "filePath": "merge-lanes.main.runtime.ts",
2849
- "line": 543,
3030
+ "line": 533,
2850
3031
  "character": 1
2851
3032
  },
2852
3033
  "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -2856,7 +3037,7 @@
2856
3037
  "__schema": "ParameterSchema",
2857
3038
  "location": {
2858
3039
  "filePath": "merge-lanes.main.runtime.ts",
2859
- "line": 544,
3040
+ "line": 534,
2860
3041
  "character": 3
2861
3042
  },
2862
3043
  "name": "allComponentsStatus",
@@ -2864,14 +3045,14 @@
2864
3045
  "__schema": "TypeArraySchema",
2865
3046
  "location": {
2866
3047
  "filePath": "merge-lanes.main.runtime.ts",
2867
- "line": 544,
3048
+ "line": 534,
2868
3049
  "character": 24
2869
3050
  },
2870
3051
  "type": {
2871
3052
  "__schema": "TypeRefSchema",
2872
3053
  "location": {
2873
3054
  "filePath": "merge-lanes.main.runtime.ts",
2874
- "line": 544,
3055
+ "line": 534,
2875
3056
  "character": 24
2876
3057
  },
2877
3058
  "name": "ComponentMergeStatus",
@@ -2888,7 +3069,7 @@
2888
3069
  "__schema": "ParameterSchema",
2889
3070
  "location": {
2890
3071
  "filePath": "merge-lanes.main.runtime.ts",
2891
- "line": 545,
3072
+ "line": 535,
2892
3073
  "character": 3
2893
3074
  },
2894
3075
  "name": "compIdsToKeep",
@@ -2896,14 +3077,14 @@
2896
3077
  "__schema": "TypeArraySchema",
2897
3078
  "location": {
2898
3079
  "filePath": "merge-lanes.main.runtime.ts",
2899
- "line": 545,
3080
+ "line": 535,
2900
3081
  "character": 18
2901
3082
  },
2902
3083
  "type": {
2903
3084
  "__schema": "TypeRefSchema",
2904
3085
  "location": {
2905
3086
  "filePath": "merge-lanes.main.runtime.ts",
2906
- "line": 545,
3087
+ "line": 535,
2907
3088
  "character": 18
2908
3089
  },
2909
3090
  "name": "ComponentID",
@@ -2921,7 +3102,7 @@
2921
3102
  "__schema": "ParameterSchema",
2922
3103
  "location": {
2923
3104
  "filePath": "merge-lanes.main.runtime.ts",
2924
- "line": 546,
3105
+ "line": 536,
2925
3106
  "character": 3
2926
3107
  },
2927
3108
  "name": "allBitIds",
@@ -2929,14 +3110,14 @@
2929
3110
  "__schema": "TypeArraySchema",
2930
3111
  "location": {
2931
3112
  "filePath": "merge-lanes.main.runtime.ts",
2932
- "line": 546,
3113
+ "line": 536,
2933
3114
  "character": 14
2934
3115
  },
2935
3116
  "type": {
2936
3117
  "__schema": "TypeRefSchema",
2937
3118
  "location": {
2938
3119
  "filePath": "merge-lanes.main.runtime.ts",
2939
- "line": 546,
3120
+ "line": 536,
2940
3121
  "character": 14
2941
3122
  },
2942
3123
  "name": "ComponentID",
@@ -2954,7 +3135,7 @@
2954
3135
  "__schema": "ParameterSchema",
2955
3136
  "location": {
2956
3137
  "filePath": "merge-lanes.main.runtime.ts",
2957
- "line": 547,
3138
+ "line": 537,
2958
3139
  "character": 3
2959
3140
  },
2960
3141
  "name": "legacyScope",
@@ -2962,7 +3143,7 @@
2962
3143
  "__schema": "TypeRefSchema",
2963
3144
  "location": {
2964
3145
  "filePath": "merge-lanes.main.runtime.ts",
2965
- "line": 547,
3146
+ "line": 537,
2966
3147
  "character": 16
2967
3148
  },
2968
3149
  "name": "LegacyScope"
@@ -2974,7 +3155,7 @@
2974
3155
  "__schema": "ParameterSchema",
2975
3156
  "location": {
2976
3157
  "filePath": "merge-lanes.main.runtime.ts",
2977
- "line": 548,
3158
+ "line": 538,
2978
3159
  "character": 3
2979
3160
  },
2980
3161
  "name": "includeDeps",
@@ -2982,7 +3163,7 @@
2982
3163
  "__schema": "InferenceTypeSchema",
2983
3164
  "location": {
2984
3165
  "filePath": "merge-lanes.main.runtime.ts",
2985
- "line": 548,
3166
+ "line": 538,
2986
3167
  "character": 3
2987
3168
  },
2988
3169
  "type": "boolean"
@@ -2995,7 +3176,7 @@
2995
3176
  "__schema": "ParameterSchema",
2996
3177
  "location": {
2997
3178
  "filePath": "merge-lanes.main.runtime.ts",
2998
- "line": 549,
3179
+ "line": 539,
2999
3180
  "character": 3
3000
3181
  },
3001
3182
  "name": "otherLane",
@@ -3003,7 +3184,7 @@
3003
3184
  "__schema": "TypeRefSchema",
3004
3185
  "location": {
3005
3186
  "filePath": "merge-lanes.main.runtime.ts",
3006
- "line": 549,
3187
+ "line": 539,
3007
3188
  "character": 15
3008
3189
  },
3009
3190
  "name": "Lane",
@@ -3016,7 +3197,7 @@
3016
3197
  "__schema": "ParameterSchema",
3017
3198
  "location": {
3018
3199
  "filePath": "merge-lanes.main.runtime.ts",
3019
- "line": 550,
3200
+ "line": 540,
3020
3201
  "character": 3
3021
3202
  },
3022
3203
  "name": "shouldSquash",
@@ -3024,7 +3205,7 @@
3024
3205
  "__schema": "KeywordTypeSchema",
3025
3206
  "location": {
3026
3207
  "filePath": "merge-lanes.main.runtime.ts",
3027
- "line": 550,
3208
+ "line": 540,
3028
3209
  "character": 18
3029
3210
  },
3030
3211
  "name": "boolean"
@@ -3037,7 +3218,7 @@
3037
3218
  "__schema": "TypeRefSchema",
3038
3219
  "location": {
3039
3220
  "filePath": "merge-lanes.main.runtime.ts",
3040
- "line": 551,
3221
+ "line": 541,
3041
3222
  "character": 4
3042
3223
  },
3043
3224
  "name": "Promise",
@@ -3046,14 +3227,14 @@
3046
3227
  "__schema": "TypeArraySchema",
3047
3228
  "location": {
3048
3229
  "filePath": "merge-lanes.main.runtime.ts",
3049
- "line": 551,
3230
+ "line": 541,
3050
3231
  "character": 12
3051
3232
  },
3052
3233
  "type": {
3053
3234
  "__schema": "TypeRefSchema",
3054
3235
  "location": {
3055
3236
  "filePath": "merge-lanes.main.runtime.ts",
3056
- "line": 551,
3237
+ "line": 541,
3057
3238
  "character": 12
3058
3239
  },
3059
3240
  "name": "ComponentMergeStatus",
@@ -3073,7 +3254,7 @@
3073
3254
  "__schema": "FunctionLikeSchema",
3074
3255
  "location": {
3075
3256
  "filePath": "merge-lanes.main.runtime.ts",
3076
- "line": 660,
3257
+ "line": 650,
3077
3258
  "character": 1
3078
3259
  },
3079
3260
  "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
@@ -3083,7 +3264,7 @@
3083
3264
  "__schema": "ParameterSchema",
3084
3265
  "location": {
3085
3266
  "filePath": "merge-lanes.main.runtime.ts",
3086
- "line": 660,
3267
+ "line": 650,
3087
3268
  "character": 32
3088
3269
  },
3089
3270
  "name": "otherLaneId",
@@ -3091,7 +3272,7 @@
3091
3272
  "__schema": "TypeRefSchema",
3092
3273
  "location": {
3093
3274
  "filePath": "merge-lanes.main.runtime.ts",
3094
- "line": 660,
3275
+ "line": 650,
3095
3276
  "character": 45
3096
3277
  },
3097
3278
  "name": "LaneId",
@@ -3109,7 +3290,7 @@
3109
3290
  "__schema": "InferenceTypeSchema",
3110
3291
  "location": {
3111
3292
  "filePath": "merge-lanes.main.runtime.ts",
3112
- "line": 660,
3293
+ "line": 650,
3113
3294
  "character": 1
3114
3295
  },
3115
3296
  "type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
@@ -3122,32 +3303,32 @@
3122
3303
  "__schema": "FunctionLikeSchema",
3123
3304
  "location": {
3124
3305
  "filePath": "merge-lanes.main.runtime.ts",
3125
- "line": 669,
3306
+ "line": 659,
3126
3307
  "character": 1
3127
3308
  },
3128
- "signature": "function squashSnaps(allComponentsStatus: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
3309
+ "signature": "function squashSnaps(succeededComponents: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
3129
3310
  "name": "squashSnaps",
3130
3311
  "params": [
3131
3312
  {
3132
3313
  "__schema": "ParameterSchema",
3133
3314
  "location": {
3134
3315
  "filePath": "merge-lanes.main.runtime.ts",
3135
- "line": 670,
3316
+ "line": 660,
3136
3317
  "character": 3
3137
3318
  },
3138
- "name": "allComponentsStatus",
3319
+ "name": "succeededComponents",
3139
3320
  "type": {
3140
3321
  "__schema": "TypeArraySchema",
3141
3322
  "location": {
3142
3323
  "filePath": "merge-lanes.main.runtime.ts",
3143
- "line": 670,
3324
+ "line": 660,
3144
3325
  "character": 24
3145
3326
  },
3146
3327
  "type": {
3147
3328
  "__schema": "TypeRefSchema",
3148
3329
  "location": {
3149
3330
  "filePath": "merge-lanes.main.runtime.ts",
3150
- "line": 670,
3331
+ "line": 660,
3151
3332
  "character": 24
3152
3333
  },
3153
3334
  "name": "ComponentMergeStatus",
@@ -3164,7 +3345,7 @@
3164
3345
  "__schema": "ParameterSchema",
3165
3346
  "location": {
3166
3347
  "filePath": "merge-lanes.main.runtime.ts",
3167
- "line": 671,
3348
+ "line": 661,
3168
3349
  "character": 3
3169
3350
  },
3170
3351
  "name": "currentLaneId",
@@ -3172,7 +3353,7 @@
3172
3353
  "__schema": "TypeRefSchema",
3173
3354
  "location": {
3174
3355
  "filePath": "merge-lanes.main.runtime.ts",
3175
- "line": 671,
3356
+ "line": 661,
3176
3357
  "character": 18
3177
3358
  },
3178
3359
  "name": "LaneId",
@@ -3189,7 +3370,7 @@
3189
3370
  "__schema": "ParameterSchema",
3190
3371
  "location": {
3191
3372
  "filePath": "merge-lanes.main.runtime.ts",
3192
- "line": 672,
3373
+ "line": 662,
3193
3374
  "character": 3
3194
3375
  },
3195
3376
  "name": "otherLaneId",
@@ -3197,7 +3378,7 @@
3197
3378
  "__schema": "TypeRefSchema",
3198
3379
  "location": {
3199
3380
  "filePath": "merge-lanes.main.runtime.ts",
3200
- "line": 672,
3381
+ "line": 662,
3201
3382
  "character": 16
3202
3383
  },
3203
3384
  "name": "LaneId",
@@ -3214,7 +3395,7 @@
3214
3395
  "__schema": "ParameterSchema",
3215
3396
  "location": {
3216
3397
  "filePath": "merge-lanes.main.runtime.ts",
3217
- "line": 673,
3398
+ "line": 663,
3218
3399
  "character": 3
3219
3400
  },
3220
3401
  "name": "scope",
@@ -3222,7 +3403,7 @@
3222
3403
  "__schema": "TypeRefSchema",
3223
3404
  "location": {
3224
3405
  "filePath": "merge-lanes.main.runtime.ts",
3225
- "line": 673,
3406
+ "line": 663,
3226
3407
  "character": 10
3227
3408
  },
3228
3409
  "name": "LegacyScope"
@@ -3234,7 +3415,7 @@
3234
3415
  "__schema": "ParameterSchema",
3235
3416
  "location": {
3236
3417
  "filePath": "merge-lanes.main.runtime.ts",
3237
- "line": 674,
3418
+ "line": 664,
3238
3419
  "character": 3
3239
3420
  },
3240
3421
  "name": "messageTitle",
@@ -3242,7 +3423,7 @@
3242
3423
  "__schema": "KeywordTypeSchema",
3243
3424
  "location": {
3244
3425
  "filePath": "merge-lanes.main.runtime.ts",
3245
- "line": 674,
3426
+ "line": 664,
3246
3427
  "character": 18
3247
3428
  },
3248
3429
  "name": "string"
@@ -3255,7 +3436,7 @@
3255
3436
  "__schema": "InferenceTypeSchema",
3256
3437
  "location": {
3257
3438
  "filePath": "merge-lanes.main.runtime.ts",
3258
- "line": 669,
3439
+ "line": 659,
3259
3440
  "character": 1
3260
3441
  },
3261
3442
  "type": "Promise<void>"
@@ -3268,14 +3449,14 @@
3268
3449
  "__schema": "FunctionLikeSchema",
3269
3450
  "location": {
3270
3451
  "filePath": "merge-lanes.main.runtime.ts",
3271
- "line": 709,
3452
+ "line": 698,
3272
3453
  "character": 1
3273
3454
  },
3274
3455
  "doc": {
3275
3456
  "__schema": "DocSchema",
3276
3457
  "location": {
3277
3458
  "filePath": "merge-lanes.main.runtime.ts",
3278
- "line": 706,
3459
+ "line": 695,
3279
3460
  "character": 1
3280
3461
  },
3281
3462
  "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -3288,7 +3469,7 @@
3288
3469
  "__schema": "ParameterSchema",
3289
3470
  "location": {
3290
3471
  "filePath": "merge-lanes.main.runtime.ts",
3291
- "line": 710,
3472
+ "line": 699,
3292
3473
  "character": 3
3293
3474
  },
3294
3475
  "name": "currentLaneName",
@@ -3296,7 +3477,7 @@
3296
3477
  "__schema": "KeywordTypeSchema",
3297
3478
  "location": {
3298
3479
  "filePath": "merge-lanes.main.runtime.ts",
3299
- "line": 710,
3480
+ "line": 699,
3300
3481
  "character": 20
3301
3482
  },
3302
3483
  "name": "string"
@@ -3308,7 +3489,7 @@
3308
3489
  "__schema": "ParameterSchema",
3309
3490
  "location": {
3310
3491
  "filePath": "merge-lanes.main.runtime.ts",
3311
- "line": 711,
3492
+ "line": 700,
3312
3493
  "character": 3
3313
3494
  },
3314
3495
  "name": "otherLaneId",
@@ -3316,7 +3497,7 @@
3316
3497
  "__schema": "TypeRefSchema",
3317
3498
  "location": {
3318
3499
  "filePath": "merge-lanes.main.runtime.ts",
3319
- "line": 711,
3500
+ "line": 700,
3320
3501
  "character": 16
3321
3502
  },
3322
3503
  "name": "LaneId",
@@ -3333,7 +3514,7 @@
3333
3514
  "__schema": "ParameterSchema",
3334
3515
  "location": {
3335
3516
  "filePath": "merge-lanes.main.runtime.ts",
3336
- "line": 712,
3517
+ "line": 701,
3337
3518
  "character": 3
3338
3519
  },
3339
3520
  "name": "id",
@@ -3341,7 +3522,7 @@
3341
3522
  "__schema": "TypeRefSchema",
3342
3523
  "location": {
3343
3524
  "filePath": "merge-lanes.main.runtime.ts",
3344
- "line": 712,
3525
+ "line": 701,
3345
3526
  "character": 7
3346
3527
  },
3347
3528
  "name": "ComponentID",
@@ -3358,7 +3539,7 @@
3358
3539
  "__schema": "ParameterSchema",
3359
3540
  "location": {
3360
3541
  "filePath": "merge-lanes.main.runtime.ts",
3361
- "line": 713,
3542
+ "line": 702,
3362
3543
  "character": 3
3363
3544
  },
3364
3545
  "name": "divergeData",
@@ -3366,7 +3547,7 @@
3366
3547
  "__schema": "TypeRefSchema",
3367
3548
  "location": {
3368
3549
  "filePath": "merge-lanes.main.runtime.ts",
3369
- "line": 713,
3550
+ "line": 702,
3370
3551
  "character": 16
3371
3552
  },
3372
3553
  "name": "SnapsDistance",
@@ -3379,7 +3560,7 @@
3379
3560
  "__schema": "ParameterSchema",
3380
3561
  "location": {
3381
3562
  "filePath": "merge-lanes.main.runtime.ts",
3382
- "line": 714,
3563
+ "line": 703,
3383
3564
  "character": 3
3384
3565
  },
3385
3566
  "name": "log",
@@ -3387,7 +3568,7 @@
3387
3568
  "__schema": "TypeRefSchema",
3388
3569
  "location": {
3389
3570
  "filePath": "merge-lanes.main.runtime.ts",
3390
- "line": 714,
3571
+ "line": 703,
3391
3572
  "character": 8
3392
3573
  },
3393
3574
  "name": "Log",
@@ -3400,7 +3581,7 @@
3400
3581
  "__schema": "ParameterSchema",
3401
3582
  "location": {
3402
3583
  "filePath": "merge-lanes.main.runtime.ts",
3403
- "line": 715,
3584
+ "line": 704,
3404
3585
  "character": 3
3405
3586
  },
3406
3587
  "name": "scope",
@@ -3408,7 +3589,7 @@
3408
3589
  "__schema": "TypeRefSchema",
3409
3590
  "location": {
3410
3591
  "filePath": "merge-lanes.main.runtime.ts",
3411
- "line": 715,
3592
+ "line": 704,
3412
3593
  "character": 10
3413
3594
  },
3414
3595
  "name": "LegacyScope"
@@ -3420,7 +3601,7 @@
3420
3601
  "__schema": "ParameterSchema",
3421
3602
  "location": {
3422
3603
  "filePath": "merge-lanes.main.runtime.ts",
3423
- "line": 716,
3604
+ "line": 705,
3424
3605
  "character": 3
3425
3606
  },
3426
3607
  "name": "componentFromModel",
@@ -3428,7 +3609,7 @@
3428
3609
  "__schema": "TypeRefSchema",
3429
3610
  "location": {
3430
3611
  "filePath": "merge-lanes.main.runtime.ts",
3431
- "line": 716,
3612
+ "line": 705,
3432
3613
  "character": 24
3433
3614
  },
3434
3615
  "name": "Version",
@@ -3441,7 +3622,7 @@
3441
3622
  "__schema": "ParameterSchema",
3442
3623
  "location": {
3443
3624
  "filePath": "merge-lanes.main.runtime.ts",
3444
- "line": 717,
3625
+ "line": 706,
3445
3626
  "character": 3
3446
3627
  },
3447
3628
  "name": "messageTitle",
@@ -3449,7 +3630,7 @@
3449
3630
  "__schema": "KeywordTypeSchema",
3450
3631
  "location": {
3451
3632
  "filePath": "merge-lanes.main.runtime.ts",
3452
- "line": 717,
3633
+ "line": 706,
3453
3634
  "character": 18
3454
3635
  },
3455
3636
  "name": "string"
@@ -3462,7 +3643,7 @@
3462
3643
  "__schema": "TypeRefSchema",
3463
3644
  "location": {
3464
3645
  "filePath": "merge-lanes.main.runtime.ts",
3465
- "line": 718,
3646
+ "line": 707,
3466
3647
  "character": 4
3467
3648
  },
3468
3649
  "name": "Promise",
@@ -3471,7 +3652,7 @@
3471
3652
  "__schema": "TypeUnionSchema",
3472
3653
  "location": {
3473
3654
  "filePath": "merge-lanes.main.runtime.ts",
3474
- "line": 718,
3655
+ "line": 707,
3475
3656
  "character": 12
3476
3657
  },
3477
3658
  "types": [
@@ -3479,7 +3660,7 @@
3479
3660
  "__schema": "TypeRefSchema",
3480
3661
  "location": {
3481
3662
  "filePath": "merge-lanes.main.runtime.ts",
3482
- "line": 718,
3663
+ "line": 707,
3483
3664
  "character": 12
3484
3665
  },
3485
3666
  "name": "Version",
@@ -3489,7 +3670,7 @@
3489
3670
  "__schema": "KeywordTypeSchema",
3490
3671
  "location": {
3491
3672
  "filePath": "merge-lanes.main.runtime.ts",
3492
- "line": 718,
3673
+ "line": 707,
3493
3674
  "character": 22
3494
3675
  },
3495
3676
  "name": "undefined"
@@ -3506,7 +3687,7 @@
3506
3687
  "__schema": "UnImplementedSchema",
3507
3688
  "location": {
3508
3689
  "filePath": "merge-lanes.main.runtime.ts",
3509
- "line": 791,
3690
+ "line": 780,
3510
3691
  "character": 1
3511
3692
  },
3512
3693
  "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -3555,7 +3736,7 @@
3555
3736
  "componentId": {
3556
3737
  "scope": "teambit.lanes",
3557
3738
  "name": "merge-lanes",
3558
- "version": "1.0.240"
3739
+ "version": "1.0.241"
3559
3740
  },
3560
3741
  "taggedModuleExports": []
3561
3742
  }