@teambit/merge-lanes 1.0.173 → 1.0.174

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 +1 -1
  2. package/artifacts/schema.json +258 -238
  3. package/dist/merge-lane-from-scope.cmd.d.ts +4 -0
  4. package/dist/merge-lane-from-scope.cmd.js +21 -7
  5. package/dist/merge-lane-from-scope.cmd.js.map +1 -1
  6. package/dist/merge-lanes.main.runtime.d.ts +1 -0
  7. package/dist/merge-lanes.main.runtime.js +9 -6
  8. package/dist/merge-lanes.main.runtime.js.map +1 -1
  9. package/package.json +11 -11
  10. /package/dist/{preview-1708466611462.js → preview-1708958940676.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": 69,
20
+ "line": 70,
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": 70,
30
+ "line": 71,
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": 71,
40
+ "line": 72,
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": 71,
48
+ "line": 72,
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": 71,
56
+ "line": 72,
57
57
  "character": 24
58
58
  },
59
59
  "name": "Workspace"
@@ -62,7 +62,7 @@
62
62
  "__schema": "KeywordTypeSchema",
63
63
  "location": {
64
64
  "filePath": "merge-lanes.main.runtime.ts",
65
- "line": 71,
65
+ "line": 72,
66
66
  "character": 36
67
67
  },
68
68
  "name": "undefined"
@@ -76,7 +76,7 @@
76
76
  "__schema": "ParameterSchema",
77
77
  "location": {
78
78
  "filePath": "merge-lanes.main.runtime.ts",
79
- "line": 72,
79
+ "line": 73,
80
80
  "character": 5
81
81
  },
82
82
  "name": "merging",
@@ -84,7 +84,7 @@
84
84
  "__schema": "TypeRefSchema",
85
85
  "location": {
86
86
  "filePath": "merge-lanes.main.runtime.ts",
87
- "line": 72,
87
+ "line": 73,
88
88
  "character": 22
89
89
  },
90
90
  "name": "MergingMain"
@@ -96,7 +96,7 @@
96
96
  "__schema": "ParameterSchema",
97
97
  "location": {
98
98
  "filePath": "merge-lanes.main.runtime.ts",
99
- "line": 73,
99
+ "line": 74,
100
100
  "character": 5
101
101
  },
102
102
  "name": "lanes",
@@ -104,7 +104,7 @@
104
104
  "__schema": "TypeRefSchema",
105
105
  "location": {
106
106
  "filePath": "merge-lanes.main.runtime.ts",
107
- "line": 73,
107
+ "line": 74,
108
108
  "character": 20
109
109
  },
110
110
  "name": "LanesMain"
@@ -116,7 +116,7 @@
116
116
  "__schema": "ParameterSchema",
117
117
  "location": {
118
118
  "filePath": "merge-lanes.main.runtime.ts",
119
- "line": 74,
119
+ "line": 75,
120
120
  "character": 5
121
121
  },
122
122
  "name": "logger",
@@ -124,7 +124,7 @@
124
124
  "__schema": "TypeRefSchema",
125
125
  "location": {
126
126
  "filePath": "merge-lanes.main.runtime.ts",
127
- "line": 74,
127
+ "line": 75,
128
128
  "character": 22
129
129
  },
130
130
  "name": "Logger"
@@ -136,7 +136,7 @@
136
136
  "__schema": "ParameterSchema",
137
137
  "location": {
138
138
  "filePath": "merge-lanes.main.runtime.ts",
139
- "line": 75,
139
+ "line": 76,
140
140
  "character": 5
141
141
  },
142
142
  "name": "remove",
@@ -144,7 +144,7 @@
144
144
  "__schema": "TypeRefSchema",
145
145
  "location": {
146
146
  "filePath": "merge-lanes.main.runtime.ts",
147
- "line": 75,
147
+ "line": 76,
148
148
  "character": 21
149
149
  },
150
150
  "name": "RemoveMain"
@@ -156,7 +156,7 @@
156
156
  "__schema": "ParameterSchema",
157
157
  "location": {
158
158
  "filePath": "merge-lanes.main.runtime.ts",
159
- "line": 76,
159
+ "line": 77,
160
160
  "character": 5
161
161
  },
162
162
  "name": "scope",
@@ -164,7 +164,7 @@
164
164
  "__schema": "TypeRefSchema",
165
165
  "location": {
166
166
  "filePath": "merge-lanes.main.runtime.ts",
167
- "line": 76,
167
+ "line": 77,
168
168
  "character": 20
169
169
  },
170
170
  "name": "ScopeMain"
@@ -176,7 +176,7 @@
176
176
  "__schema": "ParameterSchema",
177
177
  "location": {
178
178
  "filePath": "merge-lanes.main.runtime.ts",
179
- "line": 77,
179
+ "line": 78,
180
180
  "character": 5
181
181
  },
182
182
  "name": "exporter",
@@ -184,7 +184,7 @@
184
184
  "__schema": "TypeRefSchema",
185
185
  "location": {
186
186
  "filePath": "merge-lanes.main.runtime.ts",
187
- "line": 77,
187
+ "line": 78,
188
188
  "character": 23
189
189
  },
190
190
  "name": "ExportMain"
@@ -196,7 +196,7 @@
196
196
  "__schema": "ParameterSchema",
197
197
  "location": {
198
198
  "filePath": "merge-lanes.main.runtime.ts",
199
- "line": 78,
199
+ "line": 79,
200
200
  "character": 5
201
201
  },
202
202
  "name": "importer",
@@ -204,7 +204,7 @@
204
204
  "__schema": "TypeRefSchema",
205
205
  "location": {
206
206
  "filePath": "merge-lanes.main.runtime.ts",
207
- "line": 78,
207
+ "line": 79,
208
208
  "character": 23
209
209
  },
210
210
  "name": "ImporterMain"
@@ -216,7 +216,7 @@
216
216
  "__schema": "ParameterSchema",
217
217
  "location": {
218
218
  "filePath": "merge-lanes.main.runtime.ts",
219
- "line": 79,
219
+ "line": 80,
220
220
  "character": 5
221
221
  },
222
222
  "name": "checkout",
@@ -224,7 +224,7 @@
224
224
  "__schema": "TypeRefSchema",
225
225
  "location": {
226
226
  "filePath": "merge-lanes.main.runtime.ts",
227
- "line": 79,
227
+ "line": 80,
228
228
  "character": 23
229
229
  },
230
230
  "name": "CheckoutMain"
@@ -237,7 +237,7 @@
237
237
  "__schema": "ThisTypeSchema",
238
238
  "location": {
239
239
  "filePath": "merge-lanes.main.runtime.ts",
240
- "line": 69,
240
+ "line": 70,
241
241
  "character": 1
242
242
  },
243
243
  "name": "MergeLanesMain"
@@ -248,7 +248,7 @@
248
248
  "__schema": "FunctionLikeSchema",
249
249
  "location": {
250
250
  "filePath": "merge-lanes.main.runtime.ts",
251
- "line": 82,
251
+ "line": 83,
252
252
  "character": 3
253
253
  },
254
254
  "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
@@ -258,7 +258,7 @@
258
258
  "__schema": "ParameterSchema",
259
259
  "location": {
260
260
  "filePath": "merge-lanes.main.runtime.ts",
261
- "line": 82,
261
+ "line": 83,
262
262
  "character": 24
263
263
  },
264
264
  "name": "laneName",
@@ -266,7 +266,7 @@
266
266
  "__schema": "KeywordTypeSchema",
267
267
  "location": {
268
268
  "filePath": "merge-lanes.main.runtime.ts",
269
- "line": 82,
269
+ "line": 83,
270
270
  "character": 34
271
271
  },
272
272
  "name": "string"
@@ -278,7 +278,7 @@
278
278
  "__schema": "ParameterSchema",
279
279
  "location": {
280
280
  "filePath": "merge-lanes.main.runtime.ts",
281
- "line": 82,
281
+ "line": 83,
282
282
  "character": 42
283
283
  },
284
284
  "name": "options",
@@ -286,7 +286,7 @@
286
286
  "__schema": "TypeRefSchema",
287
287
  "location": {
288
288
  "filePath": "merge-lanes.main.runtime.ts",
289
- "line": 82,
289
+ "line": 83,
290
290
  "character": 51
291
291
  },
292
292
  "name": "MergeLaneOptions"
@@ -299,7 +299,7 @@
299
299
  "__schema": "InferenceTypeSchema",
300
300
  "location": {
301
301
  "filePath": "merge-lanes.main.runtime.ts",
302
- "line": 82,
302
+ "line": 83,
303
303
  "character": 3
304
304
  },
305
305
  "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>"
@@ -312,7 +312,7 @@
312
312
  "__schema": "FunctionLikeSchema",
313
313
  "location": {
314
314
  "filePath": "merge-lanes.main.runtime.ts",
315
- "line": 92,
315
+ "line": 93,
316
316
  "character": 3
317
317
  },
318
318
  "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
@@ -322,7 +322,7 @@
322
322
  "__schema": "ParameterSchema",
323
323
  "location": {
324
324
  "filePath": "merge-lanes.main.runtime.ts",
325
- "line": 93,
325
+ "line": 94,
326
326
  "character": 5
327
327
  },
328
328
  "name": "otherLaneId",
@@ -330,7 +330,7 @@
330
330
  "__schema": "TypeRefSchema",
331
331
  "location": {
332
332
  "filePath": "merge-lanes.main.runtime.ts",
333
- "line": 93,
333
+ "line": 94,
334
334
  "character": 18
335
335
  },
336
336
  "name": "LaneId"
@@ -342,7 +342,7 @@
342
342
  "__schema": "ParameterSchema",
343
343
  "location": {
344
344
  "filePath": "merge-lanes.main.runtime.ts",
345
- "line": 94,
345
+ "line": 95,
346
346
  "character": 5
347
347
  },
348
348
  "name": "currentLaneId",
@@ -350,7 +350,7 @@
350
350
  "__schema": "TypeRefSchema",
351
351
  "location": {
352
352
  "filePath": "merge-lanes.main.runtime.ts",
353
- "line": 94,
353
+ "line": 95,
354
354
  "character": 20
355
355
  },
356
356
  "name": "LaneId"
@@ -362,7 +362,7 @@
362
362
  "__schema": "ParameterSchema",
363
363
  "location": {
364
364
  "filePath": "merge-lanes.main.runtime.ts",
365
- "line": 95,
365
+ "line": 96,
366
366
  "character": 5
367
367
  },
368
368
  "name": "options",
@@ -370,7 +370,7 @@
370
370
  "__schema": "TypeRefSchema",
371
371
  "location": {
372
372
  "filePath": "merge-lanes.main.runtime.ts",
373
- "line": 95,
373
+ "line": 96,
374
374
  "character": 14
375
375
  },
376
376
  "name": "MergeLaneOptions"
@@ -383,7 +383,7 @@
383
383
  "__schema": "TypeRefSchema",
384
384
  "location": {
385
385
  "filePath": "merge-lanes.main.runtime.ts",
386
- "line": 96,
386
+ "line": 97,
387
387
  "character": 6
388
388
  },
389
389
  "name": "Promise",
@@ -392,7 +392,7 @@
392
392
  "__schema": "TypeLiteralSchema",
393
393
  "location": {
394
394
  "filePath": "merge-lanes.main.runtime.ts",
395
- "line": 96,
395
+ "line": 97,
396
396
  "character": 14
397
397
  },
398
398
  "members": [
@@ -400,7 +400,7 @@
400
400
  "__schema": "VariableLikeSchema",
401
401
  "location": {
402
402
  "filePath": "merge-lanes.main.runtime.ts",
403
- "line": 96,
403
+ "line": 97,
404
404
  "character": 16
405
405
  },
406
406
  "signature": "(property) mergeResults: ApplyVersionResults",
@@ -409,7 +409,7 @@
409
409
  "__schema": "TypeRefSchema",
410
410
  "location": {
411
411
  "filePath": "merge-lanes.main.runtime.ts",
412
- "line": 96,
412
+ "line": 97,
413
413
  "character": 16
414
414
  },
415
415
  "name": "ApplyVersionResults",
@@ -424,7 +424,7 @@
424
424
  "__schema": "VariableLikeSchema",
425
425
  "location": {
426
426
  "filePath": "merge-lanes.main.runtime.ts",
427
- "line": 96,
427
+ "line": 97,
428
428
  "character": 51
429
429
  },
430
430
  "signature": "(property) deleteResults: any",
@@ -433,7 +433,7 @@
433
433
  "__schema": "KeywordTypeSchema",
434
434
  "location": {
435
435
  "filePath": "merge-lanes.main.runtime.ts",
436
- "line": 96,
436
+ "line": 97,
437
437
  "character": 66
438
438
  },
439
439
  "name": "any"
@@ -444,7 +444,7 @@
444
444
  "__schema": "VariableLikeSchema",
445
445
  "location": {
446
446
  "filePath": "merge-lanes.main.runtime.ts",
447
- "line": 96,
447
+ "line": 97,
448
448
  "character": 71
449
449
  },
450
450
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -453,14 +453,14 @@
453
453
  "__schema": "TypeArraySchema",
454
454
  "location": {
455
455
  "filePath": "merge-lanes.main.runtime.ts",
456
- "line": 96,
456
+ "line": 97,
457
457
  "character": 91
458
458
  },
459
459
  "type": {
460
460
  "__schema": "TypeRefSchema",
461
461
  "location": {
462
462
  "filePath": "merge-lanes.main.runtime.ts",
463
- "line": 96,
463
+ "line": 97,
464
464
  "character": 91
465
465
  },
466
466
  "name": "ConfigMergeResult"
@@ -480,7 +480,7 @@
480
480
  "__schema": "FunctionLikeSchema",
481
481
  "location": {
482
482
  "filePath": "merge-lanes.main.runtime.ts",
483
- "line": 277,
483
+ "line": 278,
484
484
  "character": 3
485
485
  },
486
486
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -490,7 +490,7 @@
490
490
  "__schema": "ParameterSchema",
491
491
  "location": {
492
492
  "filePath": "merge-lanes.main.runtime.ts",
493
- "line": 277,
493
+ "line": 278,
494
494
  "character": 24
495
495
  },
496
496
  "name": "checkoutProps",
@@ -498,7 +498,7 @@
498
498
  "__schema": "TypeRefSchema",
499
499
  "location": {
500
500
  "filePath": "merge-lanes.main.runtime.ts",
501
- "line": 277,
501
+ "line": 278,
502
502
  "character": 39
503
503
  },
504
504
  "name": "CheckoutProps"
@@ -510,7 +510,7 @@
510
510
  "__schema": "ParameterSchema",
511
511
  "location": {
512
512
  "filePath": "merge-lanes.main.runtime.ts",
513
- "line": 277,
513
+ "line": 278,
514
514
  "character": 54
515
515
  },
516
516
  "name": "mergeAbortOpts",
@@ -518,7 +518,7 @@
518
518
  "__schema": "TypeRefSchema",
519
519
  "location": {
520
520
  "filePath": "merge-lanes.main.runtime.ts",
521
- "line": 277,
521
+ "line": 278,
522
522
  "character": 70
523
523
  },
524
524
  "name": "MergeAbortOpts"
@@ -531,7 +531,7 @@
531
531
  "__schema": "InferenceTypeSchema",
532
532
  "location": {
533
533
  "filePath": "merge-lanes.main.runtime.ts",
534
- "line": 277,
534
+ "line": 278,
535
535
  "character": 3
536
536
  },
537
537
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -544,7 +544,7 @@
544
544
  "__schema": "FunctionLikeSchema",
545
545
  "location": {
546
546
  "filePath": "merge-lanes.main.runtime.ts",
547
- "line": 333,
547
+ "line": 334,
548
548
  "character": 3
549
549
  },
550
550
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -554,7 +554,7 @@
554
554
  "__schema": "ParameterSchema",
555
555
  "location": {
556
556
  "filePath": "merge-lanes.main.runtime.ts",
557
- "line": 334,
557
+ "line": 335,
558
558
  "character": 5
559
559
  },
560
560
  "name": "fromLane",
@@ -562,7 +562,7 @@
562
562
  "__schema": "KeywordTypeSchema",
563
563
  "location": {
564
564
  "filePath": "merge-lanes.main.runtime.ts",
565
- "line": 334,
565
+ "line": 335,
566
566
  "character": 15
567
567
  },
568
568
  "name": "string"
@@ -574,7 +574,7 @@
574
574
  "__schema": "ParameterSchema",
575
575
  "location": {
576
576
  "filePath": "merge-lanes.main.runtime.ts",
577
- "line": 335,
577
+ "line": 336,
578
578
  "character": 5
579
579
  },
580
580
  "name": "toLane",
@@ -582,7 +582,7 @@
582
582
  "__schema": "KeywordTypeSchema",
583
583
  "location": {
584
584
  "filePath": "merge-lanes.main.runtime.ts",
585
- "line": 335,
585
+ "line": 336,
586
586
  "character": 13
587
587
  },
588
588
  "name": "string"
@@ -594,7 +594,7 @@
594
594
  "__schema": "ParameterSchema",
595
595
  "location": {
596
596
  "filePath": "merge-lanes.main.runtime.ts",
597
- "line": 336,
597
+ "line": 337,
598
598
  "character": 5
599
599
  },
600
600
  "name": "options",
@@ -602,7 +602,7 @@
602
602
  "__schema": "TypeIntersectionSchema",
603
603
  "location": {
604
604
  "filePath": "merge-lanes.main.runtime.ts",
605
- "line": 336,
605
+ "line": 337,
606
606
  "character": 14
607
607
  },
608
608
  "types": [
@@ -610,7 +610,7 @@
610
610
  "__schema": "TypeRefSchema",
611
611
  "location": {
612
612
  "filePath": "merge-lanes.main.runtime.ts",
613
- "line": 336,
613
+ "line": 337,
614
614
  "character": 14
615
615
  },
616
616
  "name": "Partial",
@@ -619,7 +619,7 @@
619
619
  "__schema": "TypeRefSchema",
620
620
  "location": {
621
621
  "filePath": "merge-lanes.main.runtime.ts",
622
- "line": 336,
622
+ "line": 337,
623
623
  "character": 22
624
624
  },
625
625
  "name": "MergeLaneOptions"
@@ -630,7 +630,7 @@
630
630
  "__schema": "TypeLiteralSchema",
631
631
  "location": {
632
632
  "filePath": "merge-lanes.main.runtime.ts",
633
- "line": 336,
633
+ "line": 337,
634
634
  "character": 42
635
635
  },
636
636
  "members": [
@@ -638,7 +638,7 @@
638
638
  "__schema": "VariableLikeSchema",
639
639
  "location": {
640
640
  "filePath": "merge-lanes.main.runtime.ts",
641
- "line": 336,
641
+ "line": 337,
642
642
  "character": 44
643
643
  },
644
644
  "signature": "(property) push?: boolean | undefined",
@@ -647,7 +647,7 @@
647
647
  "__schema": "KeywordTypeSchema",
648
648
  "location": {
649
649
  "filePath": "merge-lanes.main.runtime.ts",
650
- "line": 336,
650
+ "line": 337,
651
651
  "character": 51
652
652
  },
653
653
  "name": "boolean"
@@ -658,7 +658,7 @@
658
658
  "__schema": "VariableLikeSchema",
659
659
  "location": {
660
660
  "filePath": "merge-lanes.main.runtime.ts",
661
- "line": 336,
661
+ "line": 337,
662
662
  "character": 60
663
663
  },
664
664
  "signature": "(property) reMerge?: boolean | undefined",
@@ -667,7 +667,7 @@
667
667
  "__schema": "KeywordTypeSchema",
668
668
  "location": {
669
669
  "filePath": "merge-lanes.main.runtime.ts",
670
- "line": 336,
670
+ "line": 337,
671
671
  "character": 70
672
672
  },
673
673
  "name": "boolean"
@@ -686,7 +686,7 @@
686
686
  "__schema": "TypeRefSchema",
687
687
  "location": {
688
688
  "filePath": "merge-lanes.main.runtime.ts",
689
- "line": 337,
689
+ "line": 338,
690
690
  "character": 6
691
691
  },
692
692
  "name": "Promise",
@@ -695,7 +695,7 @@
695
695
  "__schema": "TypeRefSchema",
696
696
  "location": {
697
697
  "filePath": "merge-lanes.main.runtime.ts",
698
- "line": 337,
698
+ "line": 338,
699
699
  "character": 14
700
700
  },
701
701
  "name": "MergeFromScopeResult"
@@ -710,7 +710,7 @@
710
710
  "__schema": "VariableLikeSchema",
711
711
  "location": {
712
712
  "filePath": "merge-lanes.main.runtime.ts",
713
- "line": 530,
713
+ "line": 535,
714
714
  "character": 3
715
715
  },
716
716
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -719,7 +719,7 @@
719
719
  "__schema": "InferenceTypeSchema",
720
720
  "location": {
721
721
  "filePath": "merge-lanes.main.runtime.ts",
722
- "line": 530,
722
+ "line": 535,
723
723
  "character": 3
724
724
  },
725
725
  "type": "never[]"
@@ -731,7 +731,7 @@
731
731
  "__schema": "VariableLikeSchema",
732
732
  "location": {
733
733
  "filePath": "merge-lanes.main.runtime.ts",
734
- "line": 531,
734
+ "line": 536,
735
735
  "character": 3
736
736
  },
737
737
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -740,7 +740,7 @@
740
740
  "__schema": "InferenceTypeSchema",
741
741
  "location": {
742
742
  "filePath": "merge-lanes.main.runtime.ts",
743
- "line": 531,
743
+ "line": 536,
744
744
  "character": 3
745
745
  },
746
746
  "type": "Aspect[]"
@@ -752,7 +752,7 @@
752
752
  "__schema": "VariableLikeSchema",
753
753
  "location": {
754
754
  "filePath": "merge-lanes.main.runtime.ts",
755
- "line": 544,
755
+ "line": 549,
756
756
  "character": 3
757
757
  },
758
758
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -761,7 +761,7 @@
761
761
  "__schema": "InferenceTypeSchema",
762
762
  "location": {
763
763
  "filePath": "merge-lanes.main.runtime.ts",
764
- "line": 544,
764
+ "line": 549,
765
765
  "character": 3
766
766
  },
767
767
  "type": "RuntimeDefinition"
@@ -773,7 +773,7 @@
773
773
  "__schema": "FunctionLikeSchema",
774
774
  "location": {
775
775
  "filePath": "merge-lanes.main.runtime.ts",
776
- "line": 546,
776
+ "line": 551,
777
777
  "character": 3
778
778
  },
779
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>",
@@ -783,7 +783,7 @@
783
783
  "__schema": "ParameterSchema",
784
784
  "location": {
785
785
  "filePath": "merge-lanes.main.runtime.ts",
786
- "line": 546,
786
+ "line": 551,
787
787
  "character": 25
788
788
  },
789
789
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -791,7 +791,7 @@
791
791
  "__schema": "TupleTypeSchema",
792
792
  "location": {
793
793
  "filePath": "merge-lanes.main.runtime.ts",
794
- "line": 558,
794
+ "line": 563,
795
795
  "character": 6
796
796
  },
797
797
  "elements": [
@@ -799,7 +799,7 @@
799
799
  "__schema": "TypeRefSchema",
800
800
  "location": {
801
801
  "filePath": "merge-lanes.main.runtime.ts",
802
- "line": 559,
802
+ "line": 564,
803
803
  "character": 5
804
804
  },
805
805
  "name": "LanesMain"
@@ -808,7 +808,7 @@
808
808
  "__schema": "TypeRefSchema",
809
809
  "location": {
810
810
  "filePath": "merge-lanes.main.runtime.ts",
811
- "line": 560,
811
+ "line": 565,
812
812
  "character": 5
813
813
  },
814
814
  "name": "CLIMain"
@@ -817,7 +817,7 @@
817
817
  "__schema": "TypeRefSchema",
818
818
  "location": {
819
819
  "filePath": "merge-lanes.main.runtime.ts",
820
- "line": 561,
820
+ "line": 566,
821
821
  "character": 5
822
822
  },
823
823
  "name": "Workspace"
@@ -826,7 +826,7 @@
826
826
  "__schema": "TypeRefSchema",
827
827
  "location": {
828
828
  "filePath": "merge-lanes.main.runtime.ts",
829
- "line": 562,
829
+ "line": 567,
830
830
  "character": 5
831
831
  },
832
832
  "name": "MergingMain"
@@ -835,7 +835,7 @@
835
835
  "__schema": "TypeRefSchema",
836
836
  "location": {
837
837
  "filePath": "merge-lanes.main.runtime.ts",
838
- "line": 563,
838
+ "line": 568,
839
839
  "character": 5
840
840
  },
841
841
  "name": "LoggerMain"
@@ -844,7 +844,7 @@
844
844
  "__schema": "TypeRefSchema",
845
845
  "location": {
846
846
  "filePath": "merge-lanes.main.runtime.ts",
847
- "line": 564,
847
+ "line": 569,
848
848
  "character": 5
849
849
  },
850
850
  "name": "RemoveMain"
@@ -853,7 +853,7 @@
853
853
  "__schema": "TypeRefSchema",
854
854
  "location": {
855
855
  "filePath": "merge-lanes.main.runtime.ts",
856
- "line": 565,
856
+ "line": 570,
857
857
  "character": 5
858
858
  },
859
859
  "name": "ScopeMain"
@@ -862,7 +862,7 @@
862
862
  "__schema": "TypeRefSchema",
863
863
  "location": {
864
864
  "filePath": "merge-lanes.main.runtime.ts",
865
- "line": 566,
865
+ "line": 571,
866
866
  "character": 5
867
867
  },
868
868
  "name": "ExportMain"
@@ -871,7 +871,7 @@
871
871
  "__schema": "TypeRefSchema",
872
872
  "location": {
873
873
  "filePath": "merge-lanes.main.runtime.ts",
874
- "line": 567,
874
+ "line": 572,
875
875
  "character": 5
876
876
  },
877
877
  "name": "ImporterMain"
@@ -880,7 +880,7 @@
880
880
  "__schema": "TypeRefSchema",
881
881
  "location": {
882
882
  "filePath": "merge-lanes.main.runtime.ts",
883
- "line": 568,
883
+ "line": 573,
884
884
  "character": 5
885
885
  },
886
886
  "name": "CheckoutMain"
@@ -889,7 +889,7 @@
889
889
  "__schema": "TypeRefSchema",
890
890
  "location": {
891
891
  "filePath": "merge-lanes.main.runtime.ts",
892
- "line": 569,
892
+ "line": 574,
893
893
  "character": 5
894
894
  },
895
895
  "name": "GlobalConfigMain"
@@ -904,7 +904,7 @@
904
904
  "__schema": "InferenceTypeSchema",
905
905
  "location": {
906
906
  "filePath": "merge-lanes.main.runtime.ts",
907
- "line": 546,
907
+ "line": 551,
908
908
  "character": 3
909
909
  },
910
910
  "type": "Promise<MergeLanesMain>"
@@ -1353,7 +1353,7 @@
1353
1353
  "line": 60,
1354
1354
  "character": 1
1355
1355
  },
1356
- "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}",
1356
+ "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}",
1357
1357
  "name": "MergeFromScopeResult",
1358
1358
  "type": {
1359
1359
  "__schema": "TypeLiteralSchema",
@@ -1653,6 +1653,26 @@
1653
1653
  }
1654
1654
  },
1655
1655
  "isOptional": false
1656
+ },
1657
+ {
1658
+ "__schema": "VariableLikeSchema",
1659
+ "location": {
1660
+ "filePath": "merge-lanes.main.runtime.ts",
1661
+ "line": 67,
1662
+ "character": 3
1663
+ },
1664
+ "signature": "(property) mergeSnapError?: Error | undefined",
1665
+ "name": "mergeSnapError",
1666
+ "type": {
1667
+ "__schema": "TypeRefSchema",
1668
+ "location": {
1669
+ "filePath": "merge-lanes.main.runtime.ts",
1670
+ "line": 67,
1671
+ "character": 20
1672
+ },
1673
+ "name": "Error"
1674
+ },
1675
+ "isOptional": true
1656
1676
  }
1657
1677
  ]
1658
1678
  }
@@ -1661,7 +1681,7 @@
1661
1681
  "__schema": "ClassSchema",
1662
1682
  "location": {
1663
1683
  "filePath": "merge-lanes.main.runtime.ts",
1664
- "line": 69,
1684
+ "line": 70,
1665
1685
  "character": 1
1666
1686
  },
1667
1687
  "signature": "class MergeLanesMain",
@@ -1671,7 +1691,7 @@
1671
1691
  "__schema": "ConstructorSchema",
1672
1692
  "location": {
1673
1693
  "filePath": "merge-lanes.main.runtime.ts",
1674
- "line": 70,
1694
+ "line": 71,
1675
1695
  "character": 3
1676
1696
  },
1677
1697
  "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -1681,7 +1701,7 @@
1681
1701
  "__schema": "ParameterSchema",
1682
1702
  "location": {
1683
1703
  "filePath": "merge-lanes.main.runtime.ts",
1684
- "line": 71,
1704
+ "line": 72,
1685
1705
  "character": 5
1686
1706
  },
1687
1707
  "name": "workspace",
@@ -1689,7 +1709,7 @@
1689
1709
  "__schema": "TypeUnionSchema",
1690
1710
  "location": {
1691
1711
  "filePath": "merge-lanes.main.runtime.ts",
1692
- "line": 71,
1712
+ "line": 72,
1693
1713
  "character": 24
1694
1714
  },
1695
1715
  "types": [
@@ -1697,7 +1717,7 @@
1697
1717
  "__schema": "TypeRefSchema",
1698
1718
  "location": {
1699
1719
  "filePath": "merge-lanes.main.runtime.ts",
1700
- "line": 71,
1720
+ "line": 72,
1701
1721
  "character": 24
1702
1722
  },
1703
1723
  "name": "Workspace"
@@ -1706,7 +1726,7 @@
1706
1726
  "__schema": "KeywordTypeSchema",
1707
1727
  "location": {
1708
1728
  "filePath": "merge-lanes.main.runtime.ts",
1709
- "line": 71,
1729
+ "line": 72,
1710
1730
  "character": 36
1711
1731
  },
1712
1732
  "name": "undefined"
@@ -1720,7 +1740,7 @@
1720
1740
  "__schema": "ParameterSchema",
1721
1741
  "location": {
1722
1742
  "filePath": "merge-lanes.main.runtime.ts",
1723
- "line": 72,
1743
+ "line": 73,
1724
1744
  "character": 5
1725
1745
  },
1726
1746
  "name": "merging",
@@ -1728,7 +1748,7 @@
1728
1748
  "__schema": "TypeRefSchema",
1729
1749
  "location": {
1730
1750
  "filePath": "merge-lanes.main.runtime.ts",
1731
- "line": 72,
1751
+ "line": 73,
1732
1752
  "character": 22
1733
1753
  },
1734
1754
  "name": "MergingMain"
@@ -1740,7 +1760,7 @@
1740
1760
  "__schema": "ParameterSchema",
1741
1761
  "location": {
1742
1762
  "filePath": "merge-lanes.main.runtime.ts",
1743
- "line": 73,
1763
+ "line": 74,
1744
1764
  "character": 5
1745
1765
  },
1746
1766
  "name": "lanes",
@@ -1748,7 +1768,7 @@
1748
1768
  "__schema": "TypeRefSchema",
1749
1769
  "location": {
1750
1770
  "filePath": "merge-lanes.main.runtime.ts",
1751
- "line": 73,
1771
+ "line": 74,
1752
1772
  "character": 20
1753
1773
  },
1754
1774
  "name": "LanesMain"
@@ -1760,7 +1780,7 @@
1760
1780
  "__schema": "ParameterSchema",
1761
1781
  "location": {
1762
1782
  "filePath": "merge-lanes.main.runtime.ts",
1763
- "line": 74,
1783
+ "line": 75,
1764
1784
  "character": 5
1765
1785
  },
1766
1786
  "name": "logger",
@@ -1768,7 +1788,7 @@
1768
1788
  "__schema": "TypeRefSchema",
1769
1789
  "location": {
1770
1790
  "filePath": "merge-lanes.main.runtime.ts",
1771
- "line": 74,
1791
+ "line": 75,
1772
1792
  "character": 22
1773
1793
  },
1774
1794
  "name": "Logger"
@@ -1780,7 +1800,7 @@
1780
1800
  "__schema": "ParameterSchema",
1781
1801
  "location": {
1782
1802
  "filePath": "merge-lanes.main.runtime.ts",
1783
- "line": 75,
1803
+ "line": 76,
1784
1804
  "character": 5
1785
1805
  },
1786
1806
  "name": "remove",
@@ -1788,7 +1808,7 @@
1788
1808
  "__schema": "TypeRefSchema",
1789
1809
  "location": {
1790
1810
  "filePath": "merge-lanes.main.runtime.ts",
1791
- "line": 75,
1811
+ "line": 76,
1792
1812
  "character": 21
1793
1813
  },
1794
1814
  "name": "RemoveMain"
@@ -1800,7 +1820,7 @@
1800
1820
  "__schema": "ParameterSchema",
1801
1821
  "location": {
1802
1822
  "filePath": "merge-lanes.main.runtime.ts",
1803
- "line": 76,
1823
+ "line": 77,
1804
1824
  "character": 5
1805
1825
  },
1806
1826
  "name": "scope",
@@ -1808,7 +1828,7 @@
1808
1828
  "__schema": "TypeRefSchema",
1809
1829
  "location": {
1810
1830
  "filePath": "merge-lanes.main.runtime.ts",
1811
- "line": 76,
1831
+ "line": 77,
1812
1832
  "character": 20
1813
1833
  },
1814
1834
  "name": "ScopeMain"
@@ -1820,7 +1840,7 @@
1820
1840
  "__schema": "ParameterSchema",
1821
1841
  "location": {
1822
1842
  "filePath": "merge-lanes.main.runtime.ts",
1823
- "line": 77,
1843
+ "line": 78,
1824
1844
  "character": 5
1825
1845
  },
1826
1846
  "name": "exporter",
@@ -1828,7 +1848,7 @@
1828
1848
  "__schema": "TypeRefSchema",
1829
1849
  "location": {
1830
1850
  "filePath": "merge-lanes.main.runtime.ts",
1831
- "line": 77,
1851
+ "line": 78,
1832
1852
  "character": 23
1833
1853
  },
1834
1854
  "name": "ExportMain"
@@ -1840,7 +1860,7 @@
1840
1860
  "__schema": "ParameterSchema",
1841
1861
  "location": {
1842
1862
  "filePath": "merge-lanes.main.runtime.ts",
1843
- "line": 78,
1863
+ "line": 79,
1844
1864
  "character": 5
1845
1865
  },
1846
1866
  "name": "importer",
@@ -1848,7 +1868,7 @@
1848
1868
  "__schema": "TypeRefSchema",
1849
1869
  "location": {
1850
1870
  "filePath": "merge-lanes.main.runtime.ts",
1851
- "line": 78,
1871
+ "line": 79,
1852
1872
  "character": 23
1853
1873
  },
1854
1874
  "name": "ImporterMain"
@@ -1860,7 +1880,7 @@
1860
1880
  "__schema": "ParameterSchema",
1861
1881
  "location": {
1862
1882
  "filePath": "merge-lanes.main.runtime.ts",
1863
- "line": 79,
1883
+ "line": 80,
1864
1884
  "character": 5
1865
1885
  },
1866
1886
  "name": "checkout",
@@ -1868,7 +1888,7 @@
1868
1888
  "__schema": "TypeRefSchema",
1869
1889
  "location": {
1870
1890
  "filePath": "merge-lanes.main.runtime.ts",
1871
- "line": 79,
1891
+ "line": 80,
1872
1892
  "character": 23
1873
1893
  },
1874
1894
  "name": "CheckoutMain"
@@ -1881,7 +1901,7 @@
1881
1901
  "__schema": "ThisTypeSchema",
1882
1902
  "location": {
1883
1903
  "filePath": "merge-lanes.main.runtime.ts",
1884
- "line": 69,
1904
+ "line": 70,
1885
1905
  "character": 1
1886
1906
  },
1887
1907
  "name": "MergeLanesMain"
@@ -1892,7 +1912,7 @@
1892
1912
  "__schema": "FunctionLikeSchema",
1893
1913
  "location": {
1894
1914
  "filePath": "merge-lanes.main.runtime.ts",
1895
- "line": 82,
1915
+ "line": 83,
1896
1916
  "character": 3
1897
1917
  },
1898
1918
  "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
@@ -1902,7 +1922,7 @@
1902
1922
  "__schema": "ParameterSchema",
1903
1923
  "location": {
1904
1924
  "filePath": "merge-lanes.main.runtime.ts",
1905
- "line": 82,
1925
+ "line": 83,
1906
1926
  "character": 24
1907
1927
  },
1908
1928
  "name": "laneName",
@@ -1910,7 +1930,7 @@
1910
1930
  "__schema": "KeywordTypeSchema",
1911
1931
  "location": {
1912
1932
  "filePath": "merge-lanes.main.runtime.ts",
1913
- "line": 82,
1933
+ "line": 83,
1914
1934
  "character": 34
1915
1935
  },
1916
1936
  "name": "string"
@@ -1922,7 +1942,7 @@
1922
1942
  "__schema": "ParameterSchema",
1923
1943
  "location": {
1924
1944
  "filePath": "merge-lanes.main.runtime.ts",
1925
- "line": 82,
1945
+ "line": 83,
1926
1946
  "character": 42
1927
1947
  },
1928
1948
  "name": "options",
@@ -1930,7 +1950,7 @@
1930
1950
  "__schema": "TypeRefSchema",
1931
1951
  "location": {
1932
1952
  "filePath": "merge-lanes.main.runtime.ts",
1933
- "line": 82,
1953
+ "line": 83,
1934
1954
  "character": 51
1935
1955
  },
1936
1956
  "name": "MergeLaneOptions"
@@ -1943,7 +1963,7 @@
1943
1963
  "__schema": "InferenceTypeSchema",
1944
1964
  "location": {
1945
1965
  "filePath": "merge-lanes.main.runtime.ts",
1946
- "line": 82,
1966
+ "line": 83,
1947
1967
  "character": 3
1948
1968
  },
1949
1969
  "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>"
@@ -1956,7 +1976,7 @@
1956
1976
  "__schema": "FunctionLikeSchema",
1957
1977
  "location": {
1958
1978
  "filePath": "merge-lanes.main.runtime.ts",
1959
- "line": 92,
1979
+ "line": 93,
1960
1980
  "character": 3
1961
1981
  },
1962
1982
  "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
@@ -1966,7 +1986,7 @@
1966
1986
  "__schema": "ParameterSchema",
1967
1987
  "location": {
1968
1988
  "filePath": "merge-lanes.main.runtime.ts",
1969
- "line": 93,
1989
+ "line": 94,
1970
1990
  "character": 5
1971
1991
  },
1972
1992
  "name": "otherLaneId",
@@ -1974,7 +1994,7 @@
1974
1994
  "__schema": "TypeRefSchema",
1975
1995
  "location": {
1976
1996
  "filePath": "merge-lanes.main.runtime.ts",
1977
- "line": 93,
1997
+ "line": 94,
1978
1998
  "character": 18
1979
1999
  },
1980
2000
  "name": "LaneId"
@@ -1986,7 +2006,7 @@
1986
2006
  "__schema": "ParameterSchema",
1987
2007
  "location": {
1988
2008
  "filePath": "merge-lanes.main.runtime.ts",
1989
- "line": 94,
2009
+ "line": 95,
1990
2010
  "character": 5
1991
2011
  },
1992
2012
  "name": "currentLaneId",
@@ -1994,7 +2014,7 @@
1994
2014
  "__schema": "TypeRefSchema",
1995
2015
  "location": {
1996
2016
  "filePath": "merge-lanes.main.runtime.ts",
1997
- "line": 94,
2017
+ "line": 95,
1998
2018
  "character": 20
1999
2019
  },
2000
2020
  "name": "LaneId"
@@ -2006,7 +2026,7 @@
2006
2026
  "__schema": "ParameterSchema",
2007
2027
  "location": {
2008
2028
  "filePath": "merge-lanes.main.runtime.ts",
2009
- "line": 95,
2029
+ "line": 96,
2010
2030
  "character": 5
2011
2031
  },
2012
2032
  "name": "options",
@@ -2014,7 +2034,7 @@
2014
2034
  "__schema": "TypeRefSchema",
2015
2035
  "location": {
2016
2036
  "filePath": "merge-lanes.main.runtime.ts",
2017
- "line": 95,
2037
+ "line": 96,
2018
2038
  "character": 14
2019
2039
  },
2020
2040
  "name": "MergeLaneOptions"
@@ -2027,7 +2047,7 @@
2027
2047
  "__schema": "TypeRefSchema",
2028
2048
  "location": {
2029
2049
  "filePath": "merge-lanes.main.runtime.ts",
2030
- "line": 96,
2050
+ "line": 97,
2031
2051
  "character": 6
2032
2052
  },
2033
2053
  "name": "Promise",
@@ -2036,7 +2056,7 @@
2036
2056
  "__schema": "TypeLiteralSchema",
2037
2057
  "location": {
2038
2058
  "filePath": "merge-lanes.main.runtime.ts",
2039
- "line": 96,
2059
+ "line": 97,
2040
2060
  "character": 14
2041
2061
  },
2042
2062
  "members": [
@@ -2044,7 +2064,7 @@
2044
2064
  "__schema": "VariableLikeSchema",
2045
2065
  "location": {
2046
2066
  "filePath": "merge-lanes.main.runtime.ts",
2047
- "line": 96,
2067
+ "line": 97,
2048
2068
  "character": 16
2049
2069
  },
2050
2070
  "signature": "(property) mergeResults: ApplyVersionResults",
@@ -2053,7 +2073,7 @@
2053
2073
  "__schema": "TypeRefSchema",
2054
2074
  "location": {
2055
2075
  "filePath": "merge-lanes.main.runtime.ts",
2056
- "line": 96,
2076
+ "line": 97,
2057
2077
  "character": 16
2058
2078
  },
2059
2079
  "name": "ApplyVersionResults",
@@ -2068,7 +2088,7 @@
2068
2088
  "__schema": "VariableLikeSchema",
2069
2089
  "location": {
2070
2090
  "filePath": "merge-lanes.main.runtime.ts",
2071
- "line": 96,
2091
+ "line": 97,
2072
2092
  "character": 51
2073
2093
  },
2074
2094
  "signature": "(property) deleteResults: any",
@@ -2077,7 +2097,7 @@
2077
2097
  "__schema": "KeywordTypeSchema",
2078
2098
  "location": {
2079
2099
  "filePath": "merge-lanes.main.runtime.ts",
2080
- "line": 96,
2100
+ "line": 97,
2081
2101
  "character": 66
2082
2102
  },
2083
2103
  "name": "any"
@@ -2088,7 +2108,7 @@
2088
2108
  "__schema": "VariableLikeSchema",
2089
2109
  "location": {
2090
2110
  "filePath": "merge-lanes.main.runtime.ts",
2091
- "line": 96,
2111
+ "line": 97,
2092
2112
  "character": 71
2093
2113
  },
2094
2114
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -2097,14 +2117,14 @@
2097
2117
  "__schema": "TypeArraySchema",
2098
2118
  "location": {
2099
2119
  "filePath": "merge-lanes.main.runtime.ts",
2100
- "line": 96,
2120
+ "line": 97,
2101
2121
  "character": 91
2102
2122
  },
2103
2123
  "type": {
2104
2124
  "__schema": "TypeRefSchema",
2105
2125
  "location": {
2106
2126
  "filePath": "merge-lanes.main.runtime.ts",
2107
- "line": 96,
2127
+ "line": 97,
2108
2128
  "character": 91
2109
2129
  },
2110
2130
  "name": "ConfigMergeResult"
@@ -2124,7 +2144,7 @@
2124
2144
  "__schema": "FunctionLikeSchema",
2125
2145
  "location": {
2126
2146
  "filePath": "merge-lanes.main.runtime.ts",
2127
- "line": 277,
2147
+ "line": 278,
2128
2148
  "character": 3
2129
2149
  },
2130
2150
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -2134,7 +2154,7 @@
2134
2154
  "__schema": "ParameterSchema",
2135
2155
  "location": {
2136
2156
  "filePath": "merge-lanes.main.runtime.ts",
2137
- "line": 277,
2157
+ "line": 278,
2138
2158
  "character": 24
2139
2159
  },
2140
2160
  "name": "checkoutProps",
@@ -2142,7 +2162,7 @@
2142
2162
  "__schema": "TypeRefSchema",
2143
2163
  "location": {
2144
2164
  "filePath": "merge-lanes.main.runtime.ts",
2145
- "line": 277,
2165
+ "line": 278,
2146
2166
  "character": 39
2147
2167
  },
2148
2168
  "name": "CheckoutProps"
@@ -2154,7 +2174,7 @@
2154
2174
  "__schema": "ParameterSchema",
2155
2175
  "location": {
2156
2176
  "filePath": "merge-lanes.main.runtime.ts",
2157
- "line": 277,
2177
+ "line": 278,
2158
2178
  "character": 54
2159
2179
  },
2160
2180
  "name": "mergeAbortOpts",
@@ -2162,7 +2182,7 @@
2162
2182
  "__schema": "TypeRefSchema",
2163
2183
  "location": {
2164
2184
  "filePath": "merge-lanes.main.runtime.ts",
2165
- "line": 277,
2185
+ "line": 278,
2166
2186
  "character": 70
2167
2187
  },
2168
2188
  "name": "MergeAbortOpts"
@@ -2175,7 +2195,7 @@
2175
2195
  "__schema": "InferenceTypeSchema",
2176
2196
  "location": {
2177
2197
  "filePath": "merge-lanes.main.runtime.ts",
2178
- "line": 277,
2198
+ "line": 278,
2179
2199
  "character": 3
2180
2200
  },
2181
2201
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -2188,7 +2208,7 @@
2188
2208
  "__schema": "FunctionLikeSchema",
2189
2209
  "location": {
2190
2210
  "filePath": "merge-lanes.main.runtime.ts",
2191
- "line": 333,
2211
+ "line": 334,
2192
2212
  "character": 3
2193
2213
  },
2194
2214
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -2198,7 +2218,7 @@
2198
2218
  "__schema": "ParameterSchema",
2199
2219
  "location": {
2200
2220
  "filePath": "merge-lanes.main.runtime.ts",
2201
- "line": 334,
2221
+ "line": 335,
2202
2222
  "character": 5
2203
2223
  },
2204
2224
  "name": "fromLane",
@@ -2206,7 +2226,7 @@
2206
2226
  "__schema": "KeywordTypeSchema",
2207
2227
  "location": {
2208
2228
  "filePath": "merge-lanes.main.runtime.ts",
2209
- "line": 334,
2229
+ "line": 335,
2210
2230
  "character": 15
2211
2231
  },
2212
2232
  "name": "string"
@@ -2218,7 +2238,7 @@
2218
2238
  "__schema": "ParameterSchema",
2219
2239
  "location": {
2220
2240
  "filePath": "merge-lanes.main.runtime.ts",
2221
- "line": 335,
2241
+ "line": 336,
2222
2242
  "character": 5
2223
2243
  },
2224
2244
  "name": "toLane",
@@ -2226,7 +2246,7 @@
2226
2246
  "__schema": "KeywordTypeSchema",
2227
2247
  "location": {
2228
2248
  "filePath": "merge-lanes.main.runtime.ts",
2229
- "line": 335,
2249
+ "line": 336,
2230
2250
  "character": 13
2231
2251
  },
2232
2252
  "name": "string"
@@ -2238,7 +2258,7 @@
2238
2258
  "__schema": "ParameterSchema",
2239
2259
  "location": {
2240
2260
  "filePath": "merge-lanes.main.runtime.ts",
2241
- "line": 336,
2261
+ "line": 337,
2242
2262
  "character": 5
2243
2263
  },
2244
2264
  "name": "options",
@@ -2246,7 +2266,7 @@
2246
2266
  "__schema": "TypeIntersectionSchema",
2247
2267
  "location": {
2248
2268
  "filePath": "merge-lanes.main.runtime.ts",
2249
- "line": 336,
2269
+ "line": 337,
2250
2270
  "character": 14
2251
2271
  },
2252
2272
  "types": [
@@ -2254,7 +2274,7 @@
2254
2274
  "__schema": "TypeRefSchema",
2255
2275
  "location": {
2256
2276
  "filePath": "merge-lanes.main.runtime.ts",
2257
- "line": 336,
2277
+ "line": 337,
2258
2278
  "character": 14
2259
2279
  },
2260
2280
  "name": "Partial",
@@ -2263,7 +2283,7 @@
2263
2283
  "__schema": "TypeRefSchema",
2264
2284
  "location": {
2265
2285
  "filePath": "merge-lanes.main.runtime.ts",
2266
- "line": 336,
2286
+ "line": 337,
2267
2287
  "character": 22
2268
2288
  },
2269
2289
  "name": "MergeLaneOptions"
@@ -2274,7 +2294,7 @@
2274
2294
  "__schema": "TypeLiteralSchema",
2275
2295
  "location": {
2276
2296
  "filePath": "merge-lanes.main.runtime.ts",
2277
- "line": 336,
2297
+ "line": 337,
2278
2298
  "character": 42
2279
2299
  },
2280
2300
  "members": [
@@ -2282,7 +2302,7 @@
2282
2302
  "__schema": "VariableLikeSchema",
2283
2303
  "location": {
2284
2304
  "filePath": "merge-lanes.main.runtime.ts",
2285
- "line": 336,
2305
+ "line": 337,
2286
2306
  "character": 44
2287
2307
  },
2288
2308
  "signature": "(property) push?: boolean | undefined",
@@ -2291,7 +2311,7 @@
2291
2311
  "__schema": "KeywordTypeSchema",
2292
2312
  "location": {
2293
2313
  "filePath": "merge-lanes.main.runtime.ts",
2294
- "line": 336,
2314
+ "line": 337,
2295
2315
  "character": 51
2296
2316
  },
2297
2317
  "name": "boolean"
@@ -2302,7 +2322,7 @@
2302
2322
  "__schema": "VariableLikeSchema",
2303
2323
  "location": {
2304
2324
  "filePath": "merge-lanes.main.runtime.ts",
2305
- "line": 336,
2325
+ "line": 337,
2306
2326
  "character": 60
2307
2327
  },
2308
2328
  "signature": "(property) reMerge?: boolean | undefined",
@@ -2311,7 +2331,7 @@
2311
2331
  "__schema": "KeywordTypeSchema",
2312
2332
  "location": {
2313
2333
  "filePath": "merge-lanes.main.runtime.ts",
2314
- "line": 336,
2334
+ "line": 337,
2315
2335
  "character": 70
2316
2336
  },
2317
2337
  "name": "boolean"
@@ -2330,7 +2350,7 @@
2330
2350
  "__schema": "TypeRefSchema",
2331
2351
  "location": {
2332
2352
  "filePath": "merge-lanes.main.runtime.ts",
2333
- "line": 337,
2353
+ "line": 338,
2334
2354
  "character": 6
2335
2355
  },
2336
2356
  "name": "Promise",
@@ -2339,7 +2359,7 @@
2339
2359
  "__schema": "TypeRefSchema",
2340
2360
  "location": {
2341
2361
  "filePath": "merge-lanes.main.runtime.ts",
2342
- "line": 337,
2362
+ "line": 338,
2343
2363
  "character": 14
2344
2364
  },
2345
2365
  "name": "MergeFromScopeResult"
@@ -2354,7 +2374,7 @@
2354
2374
  "__schema": "VariableLikeSchema",
2355
2375
  "location": {
2356
2376
  "filePath": "merge-lanes.main.runtime.ts",
2357
- "line": 530,
2377
+ "line": 535,
2358
2378
  "character": 3
2359
2379
  },
2360
2380
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2363,7 +2383,7 @@
2363
2383
  "__schema": "InferenceTypeSchema",
2364
2384
  "location": {
2365
2385
  "filePath": "merge-lanes.main.runtime.ts",
2366
- "line": 530,
2386
+ "line": 535,
2367
2387
  "character": 3
2368
2388
  },
2369
2389
  "type": "never[]"
@@ -2375,7 +2395,7 @@
2375
2395
  "__schema": "VariableLikeSchema",
2376
2396
  "location": {
2377
2397
  "filePath": "merge-lanes.main.runtime.ts",
2378
- "line": 531,
2398
+ "line": 536,
2379
2399
  "character": 3
2380
2400
  },
2381
2401
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2384,7 +2404,7 @@
2384
2404
  "__schema": "InferenceTypeSchema",
2385
2405
  "location": {
2386
2406
  "filePath": "merge-lanes.main.runtime.ts",
2387
- "line": 531,
2407
+ "line": 536,
2388
2408
  "character": 3
2389
2409
  },
2390
2410
  "type": "Aspect[]"
@@ -2396,7 +2416,7 @@
2396
2416
  "__schema": "VariableLikeSchema",
2397
2417
  "location": {
2398
2418
  "filePath": "merge-lanes.main.runtime.ts",
2399
- "line": 544,
2419
+ "line": 549,
2400
2420
  "character": 3
2401
2421
  },
2402
2422
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2405,7 +2425,7 @@
2405
2425
  "__schema": "InferenceTypeSchema",
2406
2426
  "location": {
2407
2427
  "filePath": "merge-lanes.main.runtime.ts",
2408
- "line": 544,
2428
+ "line": 549,
2409
2429
  "character": 3
2410
2430
  },
2411
2431
  "type": "RuntimeDefinition"
@@ -2417,7 +2437,7 @@
2417
2437
  "__schema": "FunctionLikeSchema",
2418
2438
  "location": {
2419
2439
  "filePath": "merge-lanes.main.runtime.ts",
2420
- "line": 546,
2440
+ "line": 551,
2421
2441
  "character": 3
2422
2442
  },
2423
2443
  "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>",
@@ -2427,7 +2447,7 @@
2427
2447
  "__schema": "ParameterSchema",
2428
2448
  "location": {
2429
2449
  "filePath": "merge-lanes.main.runtime.ts",
2430
- "line": 546,
2450
+ "line": 551,
2431
2451
  "character": 25
2432
2452
  },
2433
2453
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2435,7 +2455,7 @@
2435
2455
  "__schema": "TupleTypeSchema",
2436
2456
  "location": {
2437
2457
  "filePath": "merge-lanes.main.runtime.ts",
2438
- "line": 558,
2458
+ "line": 563,
2439
2459
  "character": 6
2440
2460
  },
2441
2461
  "elements": [
@@ -2443,7 +2463,7 @@
2443
2463
  "__schema": "TypeRefSchema",
2444
2464
  "location": {
2445
2465
  "filePath": "merge-lanes.main.runtime.ts",
2446
- "line": 559,
2466
+ "line": 564,
2447
2467
  "character": 5
2448
2468
  },
2449
2469
  "name": "LanesMain"
@@ -2452,7 +2472,7 @@
2452
2472
  "__schema": "TypeRefSchema",
2453
2473
  "location": {
2454
2474
  "filePath": "merge-lanes.main.runtime.ts",
2455
- "line": 560,
2475
+ "line": 565,
2456
2476
  "character": 5
2457
2477
  },
2458
2478
  "name": "CLIMain"
@@ -2461,7 +2481,7 @@
2461
2481
  "__schema": "TypeRefSchema",
2462
2482
  "location": {
2463
2483
  "filePath": "merge-lanes.main.runtime.ts",
2464
- "line": 561,
2484
+ "line": 566,
2465
2485
  "character": 5
2466
2486
  },
2467
2487
  "name": "Workspace"
@@ -2470,7 +2490,7 @@
2470
2490
  "__schema": "TypeRefSchema",
2471
2491
  "location": {
2472
2492
  "filePath": "merge-lanes.main.runtime.ts",
2473
- "line": 562,
2493
+ "line": 567,
2474
2494
  "character": 5
2475
2495
  },
2476
2496
  "name": "MergingMain"
@@ -2479,7 +2499,7 @@
2479
2499
  "__schema": "TypeRefSchema",
2480
2500
  "location": {
2481
2501
  "filePath": "merge-lanes.main.runtime.ts",
2482
- "line": 563,
2502
+ "line": 568,
2483
2503
  "character": 5
2484
2504
  },
2485
2505
  "name": "LoggerMain"
@@ -2488,7 +2508,7 @@
2488
2508
  "__schema": "TypeRefSchema",
2489
2509
  "location": {
2490
2510
  "filePath": "merge-lanes.main.runtime.ts",
2491
- "line": 564,
2511
+ "line": 569,
2492
2512
  "character": 5
2493
2513
  },
2494
2514
  "name": "RemoveMain"
@@ -2497,7 +2517,7 @@
2497
2517
  "__schema": "TypeRefSchema",
2498
2518
  "location": {
2499
2519
  "filePath": "merge-lanes.main.runtime.ts",
2500
- "line": 565,
2520
+ "line": 570,
2501
2521
  "character": 5
2502
2522
  },
2503
2523
  "name": "ScopeMain"
@@ -2506,7 +2526,7 @@
2506
2526
  "__schema": "TypeRefSchema",
2507
2527
  "location": {
2508
2528
  "filePath": "merge-lanes.main.runtime.ts",
2509
- "line": 566,
2529
+ "line": 571,
2510
2530
  "character": 5
2511
2531
  },
2512
2532
  "name": "ExportMain"
@@ -2515,7 +2535,7 @@
2515
2535
  "__schema": "TypeRefSchema",
2516
2536
  "location": {
2517
2537
  "filePath": "merge-lanes.main.runtime.ts",
2518
- "line": 567,
2538
+ "line": 572,
2519
2539
  "character": 5
2520
2540
  },
2521
2541
  "name": "ImporterMain"
@@ -2524,7 +2544,7 @@
2524
2544
  "__schema": "TypeRefSchema",
2525
2545
  "location": {
2526
2546
  "filePath": "merge-lanes.main.runtime.ts",
2527
- "line": 568,
2547
+ "line": 573,
2528
2548
  "character": 5
2529
2549
  },
2530
2550
  "name": "CheckoutMain"
@@ -2533,7 +2553,7 @@
2533
2553
  "__schema": "TypeRefSchema",
2534
2554
  "location": {
2535
2555
  "filePath": "merge-lanes.main.runtime.ts",
2536
- "line": 569,
2556
+ "line": 574,
2537
2557
  "character": 5
2538
2558
  },
2539
2559
  "name": "GlobalConfigMain"
@@ -2548,7 +2568,7 @@
2548
2568
  "__schema": "InferenceTypeSchema",
2549
2569
  "location": {
2550
2570
  "filePath": "merge-lanes.main.runtime.ts",
2551
- "line": 546,
2571
+ "line": 551,
2552
2572
  "character": 3
2553
2573
  },
2554
2574
  "type": "Promise<MergeLanesMain>"
@@ -2566,7 +2586,7 @@
2566
2586
  "__schema": "UnImplementedSchema",
2567
2587
  "location": {
2568
2588
  "filePath": "merge-lanes.main.runtime.ts",
2569
- "line": 839,
2589
+ "line": 844,
2570
2590
  "character": 16
2571
2591
  },
2572
2592
  "name": "MergeLanesMain",
@@ -2578,7 +2598,7 @@
2578
2598
  "__schema": "FunctionLikeSchema",
2579
2599
  "location": {
2580
2600
  "filePath": "merge-lanes.main.runtime.ts",
2581
- "line": 591,
2601
+ "line": 596,
2582
2602
  "character": 1
2583
2603
  },
2584
2604
  "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -2588,7 +2608,7 @@
2588
2608
  "__schema": "ParameterSchema",
2589
2609
  "location": {
2590
2610
  "filePath": "merge-lanes.main.runtime.ts",
2591
- "line": 592,
2611
+ "line": 597,
2592
2612
  "character": 3
2593
2613
  },
2594
2614
  "name": "allComponentsStatus",
@@ -2596,14 +2616,14 @@
2596
2616
  "__schema": "TypeArraySchema",
2597
2617
  "location": {
2598
2618
  "filePath": "merge-lanes.main.runtime.ts",
2599
- "line": 592,
2619
+ "line": 597,
2600
2620
  "character": 24
2601
2621
  },
2602
2622
  "type": {
2603
2623
  "__schema": "TypeRefSchema",
2604
2624
  "location": {
2605
2625
  "filePath": "merge-lanes.main.runtime.ts",
2606
- "line": 592,
2626
+ "line": 597,
2607
2627
  "character": 24
2608
2628
  },
2609
2629
  "name": "ComponentMergeStatus"
@@ -2616,7 +2636,7 @@
2616
2636
  "__schema": "ParameterSchema",
2617
2637
  "location": {
2618
2638
  "filePath": "merge-lanes.main.runtime.ts",
2619
- "line": 593,
2639
+ "line": 598,
2620
2640
  "character": 3
2621
2641
  },
2622
2642
  "name": "compIdsToKeep",
@@ -2624,14 +2644,14 @@
2624
2644
  "__schema": "TypeArraySchema",
2625
2645
  "location": {
2626
2646
  "filePath": "merge-lanes.main.runtime.ts",
2627
- "line": 593,
2647
+ "line": 598,
2628
2648
  "character": 18
2629
2649
  },
2630
2650
  "type": {
2631
2651
  "__schema": "TypeRefSchema",
2632
2652
  "location": {
2633
2653
  "filePath": "merge-lanes.main.runtime.ts",
2634
- "line": 593,
2654
+ "line": 598,
2635
2655
  "character": 18
2636
2656
  },
2637
2657
  "name": "ComponentID"
@@ -2644,7 +2664,7 @@
2644
2664
  "__schema": "ParameterSchema",
2645
2665
  "location": {
2646
2666
  "filePath": "merge-lanes.main.runtime.ts",
2647
- "line": 594,
2667
+ "line": 599,
2648
2668
  "character": 3
2649
2669
  },
2650
2670
  "name": "allBitIds",
@@ -2652,14 +2672,14 @@
2652
2672
  "__schema": "TypeArraySchema",
2653
2673
  "location": {
2654
2674
  "filePath": "merge-lanes.main.runtime.ts",
2655
- "line": 594,
2675
+ "line": 599,
2656
2676
  "character": 14
2657
2677
  },
2658
2678
  "type": {
2659
2679
  "__schema": "TypeRefSchema",
2660
2680
  "location": {
2661
2681
  "filePath": "merge-lanes.main.runtime.ts",
2662
- "line": 594,
2682
+ "line": 599,
2663
2683
  "character": 14
2664
2684
  },
2665
2685
  "name": "ComponentID"
@@ -2672,7 +2692,7 @@
2672
2692
  "__schema": "ParameterSchema",
2673
2693
  "location": {
2674
2694
  "filePath": "merge-lanes.main.runtime.ts",
2675
- "line": 595,
2695
+ "line": 600,
2676
2696
  "character": 3
2677
2697
  },
2678
2698
  "name": "legacyScope",
@@ -2680,7 +2700,7 @@
2680
2700
  "__schema": "TypeRefSchema",
2681
2701
  "location": {
2682
2702
  "filePath": "merge-lanes.main.runtime.ts",
2683
- "line": 595,
2703
+ "line": 600,
2684
2704
  "character": 16
2685
2705
  },
2686
2706
  "name": "LegacyScope"
@@ -2692,7 +2712,7 @@
2692
2712
  "__schema": "ParameterSchema",
2693
2713
  "location": {
2694
2714
  "filePath": "merge-lanes.main.runtime.ts",
2695
- "line": 596,
2715
+ "line": 601,
2696
2716
  "character": 3
2697
2717
  },
2698
2718
  "name": "includeDeps",
@@ -2700,7 +2720,7 @@
2700
2720
  "__schema": "InferenceTypeSchema",
2701
2721
  "location": {
2702
2722
  "filePath": "merge-lanes.main.runtime.ts",
2703
- "line": 596,
2723
+ "line": 601,
2704
2724
  "character": 3
2705
2725
  },
2706
2726
  "type": "boolean"
@@ -2713,7 +2733,7 @@
2713
2733
  "__schema": "ParameterSchema",
2714
2734
  "location": {
2715
2735
  "filePath": "merge-lanes.main.runtime.ts",
2716
- "line": 597,
2736
+ "line": 602,
2717
2737
  "character": 3
2718
2738
  },
2719
2739
  "name": "otherLane",
@@ -2721,7 +2741,7 @@
2721
2741
  "__schema": "TypeRefSchema",
2722
2742
  "location": {
2723
2743
  "filePath": "merge-lanes.main.runtime.ts",
2724
- "line": 597,
2744
+ "line": 602,
2725
2745
  "character": 15
2726
2746
  },
2727
2747
  "name": "Lane"
@@ -2733,7 +2753,7 @@
2733
2753
  "__schema": "ParameterSchema",
2734
2754
  "location": {
2735
2755
  "filePath": "merge-lanes.main.runtime.ts",
2736
- "line": 598,
2756
+ "line": 603,
2737
2757
  "character": 3
2738
2758
  },
2739
2759
  "name": "shouldSquash",
@@ -2741,7 +2761,7 @@
2741
2761
  "__schema": "KeywordTypeSchema",
2742
2762
  "location": {
2743
2763
  "filePath": "merge-lanes.main.runtime.ts",
2744
- "line": 598,
2764
+ "line": 603,
2745
2765
  "character": 18
2746
2766
  },
2747
2767
  "name": "boolean"
@@ -2754,7 +2774,7 @@
2754
2774
  "__schema": "TypeRefSchema",
2755
2775
  "location": {
2756
2776
  "filePath": "merge-lanes.main.runtime.ts",
2757
- "line": 599,
2777
+ "line": 604,
2758
2778
  "character": 4
2759
2779
  },
2760
2780
  "name": "Promise",
@@ -2763,14 +2783,14 @@
2763
2783
  "__schema": "TypeArraySchema",
2764
2784
  "location": {
2765
2785
  "filePath": "merge-lanes.main.runtime.ts",
2766
- "line": 599,
2786
+ "line": 604,
2767
2787
  "character": 12
2768
2788
  },
2769
2789
  "type": {
2770
2790
  "__schema": "TypeRefSchema",
2771
2791
  "location": {
2772
2792
  "filePath": "merge-lanes.main.runtime.ts",
2773
- "line": 599,
2793
+ "line": 604,
2774
2794
  "character": 12
2775
2795
  },
2776
2796
  "name": "ComponentMergeStatus"
@@ -2786,7 +2806,7 @@
2786
2806
  "__schema": "FunctionLikeSchema",
2787
2807
  "location": {
2788
2808
  "filePath": "merge-lanes.main.runtime.ts",
2789
- "line": 708,
2809
+ "line": 713,
2790
2810
  "character": 1
2791
2811
  },
2792
2812
  "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
@@ -2796,7 +2816,7 @@
2796
2816
  "__schema": "ParameterSchema",
2797
2817
  "location": {
2798
2818
  "filePath": "merge-lanes.main.runtime.ts",
2799
- "line": 708,
2819
+ "line": 713,
2800
2820
  "character": 32
2801
2821
  },
2802
2822
  "name": "otherLaneId",
@@ -2804,7 +2824,7 @@
2804
2824
  "__schema": "TypeRefSchema",
2805
2825
  "location": {
2806
2826
  "filePath": "merge-lanes.main.runtime.ts",
2807
- "line": 708,
2827
+ "line": 713,
2808
2828
  "character": 45
2809
2829
  },
2810
2830
  "name": "LaneId"
@@ -2817,7 +2837,7 @@
2817
2837
  "__schema": "InferenceTypeSchema",
2818
2838
  "location": {
2819
2839
  "filePath": "merge-lanes.main.runtime.ts",
2820
- "line": 708,
2840
+ "line": 713,
2821
2841
  "character": 1
2822
2842
  },
2823
2843
  "type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
@@ -2830,7 +2850,7 @@
2830
2850
  "__schema": "FunctionLikeSchema",
2831
2851
  "location": {
2832
2852
  "filePath": "merge-lanes.main.runtime.ts",
2833
- "line": 717,
2853
+ "line": 722,
2834
2854
  "character": 1
2835
2855
  },
2836
2856
  "signature": "function squashSnaps(allComponentsStatus: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope): Promise<void>",
@@ -2840,7 +2860,7 @@
2840
2860
  "__schema": "ParameterSchema",
2841
2861
  "location": {
2842
2862
  "filePath": "merge-lanes.main.runtime.ts",
2843
- "line": 718,
2863
+ "line": 723,
2844
2864
  "character": 3
2845
2865
  },
2846
2866
  "name": "allComponentsStatus",
@@ -2848,14 +2868,14 @@
2848
2868
  "__schema": "TypeArraySchema",
2849
2869
  "location": {
2850
2870
  "filePath": "merge-lanes.main.runtime.ts",
2851
- "line": 718,
2871
+ "line": 723,
2852
2872
  "character": 24
2853
2873
  },
2854
2874
  "type": {
2855
2875
  "__schema": "TypeRefSchema",
2856
2876
  "location": {
2857
2877
  "filePath": "merge-lanes.main.runtime.ts",
2858
- "line": 718,
2878
+ "line": 723,
2859
2879
  "character": 24
2860
2880
  },
2861
2881
  "name": "ComponentMergeStatus"
@@ -2868,7 +2888,7 @@
2868
2888
  "__schema": "ParameterSchema",
2869
2889
  "location": {
2870
2890
  "filePath": "merge-lanes.main.runtime.ts",
2871
- "line": 719,
2891
+ "line": 724,
2872
2892
  "character": 3
2873
2893
  },
2874
2894
  "name": "currentLaneId",
@@ -2876,7 +2896,7 @@
2876
2896
  "__schema": "TypeRefSchema",
2877
2897
  "location": {
2878
2898
  "filePath": "merge-lanes.main.runtime.ts",
2879
- "line": 719,
2899
+ "line": 724,
2880
2900
  "character": 18
2881
2901
  },
2882
2902
  "name": "LaneId"
@@ -2888,7 +2908,7 @@
2888
2908
  "__schema": "ParameterSchema",
2889
2909
  "location": {
2890
2910
  "filePath": "merge-lanes.main.runtime.ts",
2891
- "line": 720,
2911
+ "line": 725,
2892
2912
  "character": 3
2893
2913
  },
2894
2914
  "name": "otherLaneId",
@@ -2896,7 +2916,7 @@
2896
2916
  "__schema": "TypeRefSchema",
2897
2917
  "location": {
2898
2918
  "filePath": "merge-lanes.main.runtime.ts",
2899
- "line": 720,
2919
+ "line": 725,
2900
2920
  "character": 16
2901
2921
  },
2902
2922
  "name": "LaneId"
@@ -2908,7 +2928,7 @@
2908
2928
  "__schema": "ParameterSchema",
2909
2929
  "location": {
2910
2930
  "filePath": "merge-lanes.main.runtime.ts",
2911
- "line": 721,
2931
+ "line": 726,
2912
2932
  "character": 3
2913
2933
  },
2914
2934
  "name": "scope",
@@ -2916,7 +2936,7 @@
2916
2936
  "__schema": "TypeRefSchema",
2917
2937
  "location": {
2918
2938
  "filePath": "merge-lanes.main.runtime.ts",
2919
- "line": 721,
2939
+ "line": 726,
2920
2940
  "character": 10
2921
2941
  },
2922
2942
  "name": "LegacyScope"
@@ -2929,7 +2949,7 @@
2929
2949
  "__schema": "InferenceTypeSchema",
2930
2950
  "location": {
2931
2951
  "filePath": "merge-lanes.main.runtime.ts",
2932
- "line": 717,
2952
+ "line": 722,
2933
2953
  "character": 1
2934
2954
  },
2935
2955
  "type": "Promise<void>"
@@ -2942,14 +2962,14 @@
2942
2962
  "__schema": "FunctionLikeSchema",
2943
2963
  "location": {
2944
2964
  "filePath": "merge-lanes.main.runtime.ts",
2945
- "line": 755,
2965
+ "line": 760,
2946
2966
  "character": 1
2947
2967
  },
2948
2968
  "doc": {
2949
2969
  "__schema": "DocSchema",
2950
2970
  "location": {
2951
2971
  "filePath": "merge-lanes.main.runtime.ts",
2952
- "line": 752,
2972
+ "line": 757,
2953
2973
  "character": 1
2954
2974
  },
2955
2975
  "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -2962,7 +2982,7 @@
2962
2982
  "__schema": "ParameterSchema",
2963
2983
  "location": {
2964
2984
  "filePath": "merge-lanes.main.runtime.ts",
2965
- "line": 756,
2985
+ "line": 761,
2966
2986
  "character": 3
2967
2987
  },
2968
2988
  "name": "currentLaneName",
@@ -2970,7 +2990,7 @@
2970
2990
  "__schema": "KeywordTypeSchema",
2971
2991
  "location": {
2972
2992
  "filePath": "merge-lanes.main.runtime.ts",
2973
- "line": 756,
2993
+ "line": 761,
2974
2994
  "character": 20
2975
2995
  },
2976
2996
  "name": "string"
@@ -2982,7 +3002,7 @@
2982
3002
  "__schema": "ParameterSchema",
2983
3003
  "location": {
2984
3004
  "filePath": "merge-lanes.main.runtime.ts",
2985
- "line": 757,
3005
+ "line": 762,
2986
3006
  "character": 3
2987
3007
  },
2988
3008
  "name": "otherLaneId",
@@ -2990,7 +3010,7 @@
2990
3010
  "__schema": "TypeRefSchema",
2991
3011
  "location": {
2992
3012
  "filePath": "merge-lanes.main.runtime.ts",
2993
- "line": 757,
3013
+ "line": 762,
2994
3014
  "character": 16
2995
3015
  },
2996
3016
  "name": "LaneId"
@@ -3002,7 +3022,7 @@
3002
3022
  "__schema": "ParameterSchema",
3003
3023
  "location": {
3004
3024
  "filePath": "merge-lanes.main.runtime.ts",
3005
- "line": 758,
3025
+ "line": 763,
3006
3026
  "character": 3
3007
3027
  },
3008
3028
  "name": "id",
@@ -3010,7 +3030,7 @@
3010
3030
  "__schema": "TypeRefSchema",
3011
3031
  "location": {
3012
3032
  "filePath": "merge-lanes.main.runtime.ts",
3013
- "line": 758,
3033
+ "line": 763,
3014
3034
  "character": 7
3015
3035
  },
3016
3036
  "name": "ComponentID"
@@ -3022,7 +3042,7 @@
3022
3042
  "__schema": "ParameterSchema",
3023
3043
  "location": {
3024
3044
  "filePath": "merge-lanes.main.runtime.ts",
3025
- "line": 759,
3045
+ "line": 764,
3026
3046
  "character": 3
3027
3047
  },
3028
3048
  "name": "divergeData",
@@ -3030,7 +3050,7 @@
3030
3050
  "__schema": "TypeRefSchema",
3031
3051
  "location": {
3032
3052
  "filePath": "merge-lanes.main.runtime.ts",
3033
- "line": 759,
3053
+ "line": 764,
3034
3054
  "character": 16
3035
3055
  },
3036
3056
  "name": "SnapsDistance"
@@ -3042,7 +3062,7 @@
3042
3062
  "__schema": "ParameterSchema",
3043
3063
  "location": {
3044
3064
  "filePath": "merge-lanes.main.runtime.ts",
3045
- "line": 760,
3065
+ "line": 765,
3046
3066
  "character": 3
3047
3067
  },
3048
3068
  "name": "log",
@@ -3050,7 +3070,7 @@
3050
3070
  "__schema": "TypeRefSchema",
3051
3071
  "location": {
3052
3072
  "filePath": "merge-lanes.main.runtime.ts",
3053
- "line": 760,
3073
+ "line": 765,
3054
3074
  "character": 8
3055
3075
  },
3056
3076
  "name": "Log"
@@ -3062,7 +3082,7 @@
3062
3082
  "__schema": "ParameterSchema",
3063
3083
  "location": {
3064
3084
  "filePath": "merge-lanes.main.runtime.ts",
3065
- "line": 761,
3085
+ "line": 766,
3066
3086
  "character": 3
3067
3087
  },
3068
3088
  "name": "scope",
@@ -3070,7 +3090,7 @@
3070
3090
  "__schema": "TypeRefSchema",
3071
3091
  "location": {
3072
3092
  "filePath": "merge-lanes.main.runtime.ts",
3073
- "line": 761,
3093
+ "line": 766,
3074
3094
  "character": 10
3075
3095
  },
3076
3096
  "name": "LegacyScope"
@@ -3082,7 +3102,7 @@
3082
3102
  "__schema": "ParameterSchema",
3083
3103
  "location": {
3084
3104
  "filePath": "merge-lanes.main.runtime.ts",
3085
- "line": 762,
3105
+ "line": 767,
3086
3106
  "character": 3
3087
3107
  },
3088
3108
  "name": "componentFromModel",
@@ -3090,7 +3110,7 @@
3090
3110
  "__schema": "TypeRefSchema",
3091
3111
  "location": {
3092
3112
  "filePath": "merge-lanes.main.runtime.ts",
3093
- "line": 762,
3113
+ "line": 767,
3094
3114
  "character": 24
3095
3115
  },
3096
3116
  "name": "Version"
@@ -3102,7 +3122,7 @@
3102
3122
  "__schema": "ParameterSchema",
3103
3123
  "location": {
3104
3124
  "filePath": "merge-lanes.main.runtime.ts",
3105
- "line": 763,
3125
+ "line": 768,
3106
3126
  "character": 3
3107
3127
  },
3108
3128
  "name": "messageTitle",
@@ -3110,7 +3130,7 @@
3110
3130
  "__schema": "KeywordTypeSchema",
3111
3131
  "location": {
3112
3132
  "filePath": "merge-lanes.main.runtime.ts",
3113
- "line": 763,
3133
+ "line": 768,
3114
3134
  "character": 18
3115
3135
  },
3116
3136
  "name": "string"
@@ -3123,7 +3143,7 @@
3123
3143
  "__schema": "TypeRefSchema",
3124
3144
  "location": {
3125
3145
  "filePath": "merge-lanes.main.runtime.ts",
3126
- "line": 764,
3146
+ "line": 769,
3127
3147
  "character": 4
3128
3148
  },
3129
3149
  "name": "Promise",
@@ -3132,7 +3152,7 @@
3132
3152
  "__schema": "TypeUnionSchema",
3133
3153
  "location": {
3134
3154
  "filePath": "merge-lanes.main.runtime.ts",
3135
- "line": 764,
3155
+ "line": 769,
3136
3156
  "character": 12
3137
3157
  },
3138
3158
  "types": [
@@ -3140,7 +3160,7 @@
3140
3160
  "__schema": "TypeRefSchema",
3141
3161
  "location": {
3142
3162
  "filePath": "merge-lanes.main.runtime.ts",
3143
- "line": 764,
3163
+ "line": 769,
3144
3164
  "character": 12
3145
3165
  },
3146
3166
  "name": "Version"
@@ -3149,7 +3169,7 @@
3149
3169
  "__schema": "KeywordTypeSchema",
3150
3170
  "location": {
3151
3171
  "filePath": "merge-lanes.main.runtime.ts",
3152
- "line": 764,
3172
+ "line": 769,
3153
3173
  "character": 22
3154
3174
  },
3155
3175
  "name": "undefined"
@@ -3166,7 +3186,7 @@
3166
3186
  "__schema": "UnImplementedSchema",
3167
3187
  "location": {
3168
3188
  "filePath": "merge-lanes.main.runtime.ts",
3169
- "line": 837,
3189
+ "line": 842,
3170
3190
  "character": 1
3171
3191
  },
3172
3192
  "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -3215,7 +3235,7 @@
3215
3235
  "componentId": {
3216
3236
  "scope": "teambit.lanes",
3217
3237
  "name": "merge-lanes",
3218
- "version": "1.0.173"
3238
+ "version": "1.0.174"
3219
3239
  },
3220
3240
  "taggedModuleExports": []
3221
3241
  }