@teambit/merge-lanes 1.0.169 → 1.0.171

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 (6) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +306 -306
  3. package/dist/merge-lanes.main.runtime.js +6 -8
  4. package/dist/merge-lanes.main.runtime.js.map +1 -1
  5. package/package.json +11 -11
  6. /package/dist/{preview-1708312624982.js → preview-1708455795514.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": 68,
20
+ "line": 69,
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": 69,
30
+ "line": 70,
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": 70,
40
+ "line": 71,
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": 70,
48
+ "line": 71,
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": 70,
56
+ "line": 71,
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": 70,
65
+ "line": 71,
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": 71,
79
+ "line": 72,
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": 71,
87
+ "line": 72,
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": 72,
99
+ "line": 73,
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": 72,
107
+ "line": 73,
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": 73,
119
+ "line": 74,
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": 73,
127
+ "line": 74,
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": 74,
139
+ "line": 75,
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": 74,
147
+ "line": 75,
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": 75,
159
+ "line": 76,
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": 75,
167
+ "line": 76,
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": 76,
179
+ "line": 77,
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": 76,
187
+ "line": 77,
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": 77,
199
+ "line": 78,
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": 77,
207
+ "line": 78,
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": 78,
219
+ "line": 79,
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": 78,
227
+ "line": 79,
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": 68,
240
+ "line": 69,
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": 81,
251
+ "line": 82,
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": 81,
261
+ "line": 82,
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": 81,
269
+ "line": 82,
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": 81,
281
+ "line": 82,
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": 81,
289
+ "line": 82,
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": 81,
302
+ "line": 82,
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": 91,
315
+ "line": 92,
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": 92,
325
+ "line": 93,
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": 92,
333
+ "line": 93,
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": 93,
345
+ "line": 94,
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": 93,
353
+ "line": 94,
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": 94,
365
+ "line": 95,
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": 94,
373
+ "line": 95,
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": 95,
386
+ "line": 96,
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": 95,
395
+ "line": 96,
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": 95,
403
+ "line": 96,
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": 95,
412
+ "line": 96,
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": 95,
427
+ "line": 96,
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": 95,
436
+ "line": 96,
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": 95,
447
+ "line": 96,
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": 95,
456
+ "line": 96,
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": 95,
463
+ "line": 96,
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": 276,
483
+ "line": 277,
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": 276,
493
+ "line": 277,
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": 276,
501
+ "line": 277,
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": 276,
513
+ "line": 277,
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": 276,
521
+ "line": 277,
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": 276,
534
+ "line": 277,
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": 332,
547
+ "line": 333,
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": 333,
557
+ "line": 334,
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": 333,
565
+ "line": 334,
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": 334,
577
+ "line": 335,
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": 334,
585
+ "line": 335,
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": 335,
597
+ "line": 336,
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": 335,
605
+ "line": 336,
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": 335,
613
+ "line": 336,
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": 335,
622
+ "line": 336,
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": 335,
633
+ "line": 336,
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": 335,
641
+ "line": 336,
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": 335,
650
+ "line": 336,
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": 335,
661
+ "line": 336,
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": 335,
670
+ "line": 336,
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": 336,
689
+ "line": 337,
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": 336,
698
+ "line": 337,
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": 529,
713
+ "line": 530,
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": 529,
722
+ "line": 530,
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": 530,
734
+ "line": 531,
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": 530,
743
+ "line": 531,
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": 543,
755
+ "line": 544,
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": 543,
764
+ "line": 544,
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": 545,
776
+ "line": 546,
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": 545,
786
+ "line": 546,
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": 557,
794
+ "line": 558,
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": 558,
802
+ "line": 559,
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": 559,
811
+ "line": 560,
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": 560,
820
+ "line": 561,
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": 561,
829
+ "line": 562,
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": 562,
838
+ "line": 563,
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": 563,
847
+ "line": 564,
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": 564,
856
+ "line": 565,
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": 565,
865
+ "line": 566,
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": 566,
874
+ "line": 567,
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": 567,
883
+ "line": 568,
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": 568,
892
+ "line": 569,
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": 545,
907
+ "line": 546,
908
908
  "character": 3
909
909
  },
910
910
  "type": "Promise<MergeLanesMain>"
@@ -970,7 +970,7 @@
970
970
  "__schema": "TypeSchema",
971
971
  "location": {
972
972
  "filePath": "merge-lanes.main.runtime.ts",
973
- "line": 39,
973
+ "line": 40,
974
974
  "character": 1
975
975
  },
976
976
  "signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n squash?: boolean | undefined;\n noSquash: boolean;\n ... 7 more ...;\n excludeNonLaneComps?: boolean | undefined;\n}",
@@ -979,7 +979,7 @@
979
979
  "__schema": "TypeLiteralSchema",
980
980
  "location": {
981
981
  "filePath": "merge-lanes.main.runtime.ts",
982
- "line": 39,
982
+ "line": 40,
983
983
  "character": 32
984
984
  },
985
985
  "members": [
@@ -987,7 +987,7 @@
987
987
  "__schema": "VariableLikeSchema",
988
988
  "location": {
989
989
  "filePath": "merge-lanes.main.runtime.ts",
990
- "line": 40,
990
+ "line": 41,
991
991
  "character": 3
992
992
  },
993
993
  "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
@@ -996,7 +996,7 @@
996
996
  "__schema": "TypeRefSchema",
997
997
  "location": {
998
998
  "filePath": "merge-lanes.main.runtime.ts",
999
- "line": 40,
999
+ "line": 41,
1000
1000
  "character": 18
1001
1001
  },
1002
1002
  "name": "MergeStrategy"
@@ -1007,7 +1007,7 @@
1007
1007
  "__schema": "VariableLikeSchema",
1008
1008
  "location": {
1009
1009
  "filePath": "merge-lanes.main.runtime.ts",
1010
- "line": 41,
1010
+ "line": 42,
1011
1011
  "character": 3
1012
1012
  },
1013
1013
  "signature": "(property) ours?: boolean | undefined",
@@ -1016,7 +1016,7 @@
1016
1016
  "__schema": "KeywordTypeSchema",
1017
1017
  "location": {
1018
1018
  "filePath": "merge-lanes.main.runtime.ts",
1019
- "line": 41,
1019
+ "line": 42,
1020
1020
  "character": 10
1021
1021
  },
1022
1022
  "name": "boolean"
@@ -1027,7 +1027,7 @@
1027
1027
  "__schema": "VariableLikeSchema",
1028
1028
  "location": {
1029
1029
  "filePath": "merge-lanes.main.runtime.ts",
1030
- "line": 42,
1030
+ "line": 43,
1031
1031
  "character": 3
1032
1032
  },
1033
1033
  "signature": "(property) theirs?: boolean | undefined",
@@ -1036,7 +1036,7 @@
1036
1036
  "__schema": "KeywordTypeSchema",
1037
1037
  "location": {
1038
1038
  "filePath": "merge-lanes.main.runtime.ts",
1039
- "line": 42,
1039
+ "line": 43,
1040
1040
  "character": 12
1041
1041
  },
1042
1042
  "name": "boolean"
@@ -1047,7 +1047,7 @@
1047
1047
  "__schema": "VariableLikeSchema",
1048
1048
  "location": {
1049
1049
  "filePath": "merge-lanes.main.runtime.ts",
1050
- "line": 43,
1050
+ "line": 44,
1051
1051
  "character": 3
1052
1052
  },
1053
1053
  "signature": "(property) noSnap: boolean",
@@ -1056,7 +1056,7 @@
1056
1056
  "__schema": "KeywordTypeSchema",
1057
1057
  "location": {
1058
1058
  "filePath": "merge-lanes.main.runtime.ts",
1059
- "line": 43,
1059
+ "line": 44,
1060
1060
  "character": 11
1061
1061
  },
1062
1062
  "name": "boolean"
@@ -1067,7 +1067,7 @@
1067
1067
  "__schema": "VariableLikeSchema",
1068
1068
  "location": {
1069
1069
  "filePath": "merge-lanes.main.runtime.ts",
1070
- "line": 44,
1070
+ "line": 45,
1071
1071
  "character": 3
1072
1072
  },
1073
1073
  "signature": "(property) snapMessage: string",
@@ -1076,7 +1076,7 @@
1076
1076
  "__schema": "KeywordTypeSchema",
1077
1077
  "location": {
1078
1078
  "filePath": "merge-lanes.main.runtime.ts",
1079
- "line": 44,
1079
+ "line": 45,
1080
1080
  "character": 16
1081
1081
  },
1082
1082
  "name": "string"
@@ -1087,7 +1087,7 @@
1087
1087
  "__schema": "VariableLikeSchema",
1088
1088
  "location": {
1089
1089
  "filePath": "merge-lanes.main.runtime.ts",
1090
- "line": 45,
1090
+ "line": 46,
1091
1091
  "character": 3
1092
1092
  },
1093
1093
  "signature": "(property) existingOnWorkspaceOnly: boolean",
@@ -1096,7 +1096,7 @@
1096
1096
  "__schema": "KeywordTypeSchema",
1097
1097
  "location": {
1098
1098
  "filePath": "merge-lanes.main.runtime.ts",
1099
- "line": 45,
1099
+ "line": 46,
1100
1100
  "character": 28
1101
1101
  },
1102
1102
  "name": "boolean"
@@ -1107,7 +1107,7 @@
1107
1107
  "__schema": "VariableLikeSchema",
1108
1108
  "location": {
1109
1109
  "filePath": "merge-lanes.main.runtime.ts",
1110
- "line": 46,
1110
+ "line": 47,
1111
1111
  "character": 3
1112
1112
  },
1113
1113
  "signature": "(property) build: boolean",
@@ -1116,7 +1116,7 @@
1116
1116
  "__schema": "KeywordTypeSchema",
1117
1117
  "location": {
1118
1118
  "filePath": "merge-lanes.main.runtime.ts",
1119
- "line": 46,
1119
+ "line": 47,
1120
1120
  "character": 10
1121
1121
  },
1122
1122
  "name": "boolean"
@@ -1127,7 +1127,7 @@
1127
1127
  "__schema": "VariableLikeSchema",
1128
1128
  "location": {
1129
1129
  "filePath": "merge-lanes.main.runtime.ts",
1130
- "line": 47,
1130
+ "line": 48,
1131
1131
  "character": 3
1132
1132
  },
1133
1133
  "signature": "(property) keepReadme: boolean",
@@ -1136,7 +1136,7 @@
1136
1136
  "__schema": "KeywordTypeSchema",
1137
1137
  "location": {
1138
1138
  "filePath": "merge-lanes.main.runtime.ts",
1139
- "line": 47,
1139
+ "line": 48,
1140
1140
  "character": 15
1141
1141
  },
1142
1142
  "name": "boolean"
@@ -1147,7 +1147,7 @@
1147
1147
  "__schema": "VariableLikeSchema",
1148
1148
  "location": {
1149
1149
  "filePath": "merge-lanes.main.runtime.ts",
1150
- "line": 48,
1150
+ "line": 49,
1151
1151
  "character": 3
1152
1152
  },
1153
1153
  "signature": "(property) squash?: boolean | undefined",
@@ -1156,7 +1156,7 @@
1156
1156
  "__schema": "KeywordTypeSchema",
1157
1157
  "location": {
1158
1158
  "filePath": "merge-lanes.main.runtime.ts",
1159
- "line": 48,
1159
+ "line": 49,
1160
1160
  "character": 12
1161
1161
  },
1162
1162
  "name": "boolean"
@@ -1167,7 +1167,7 @@
1167
1167
  "__schema": "VariableLikeSchema",
1168
1168
  "location": {
1169
1169
  "filePath": "merge-lanes.main.runtime.ts",
1170
- "line": 49,
1170
+ "line": 50,
1171
1171
  "character": 3
1172
1172
  },
1173
1173
  "signature": "(property) noSquash: boolean",
@@ -1176,7 +1176,7 @@
1176
1176
  "__schema": "KeywordTypeSchema",
1177
1177
  "location": {
1178
1178
  "filePath": "merge-lanes.main.runtime.ts",
1179
- "line": 49,
1179
+ "line": 50,
1180
1180
  "character": 13
1181
1181
  },
1182
1182
  "name": "boolean"
@@ -1187,7 +1187,7 @@
1187
1187
  "__schema": "VariableLikeSchema",
1188
1188
  "location": {
1189
1189
  "filePath": "merge-lanes.main.runtime.ts",
1190
- "line": 50,
1190
+ "line": 51,
1191
1191
  "character": 3
1192
1192
  },
1193
1193
  "signature": "(property) tag?: boolean | undefined",
@@ -1196,7 +1196,7 @@
1196
1196
  "__schema": "KeywordTypeSchema",
1197
1197
  "location": {
1198
1198
  "filePath": "merge-lanes.main.runtime.ts",
1199
- "line": 50,
1199
+ "line": 51,
1200
1200
  "character": 9
1201
1201
  },
1202
1202
  "name": "boolean"
@@ -1207,7 +1207,7 @@
1207
1207
  "__schema": "VariableLikeSchema",
1208
1208
  "location": {
1209
1209
  "filePath": "merge-lanes.main.runtime.ts",
1210
- "line": 51,
1210
+ "line": 52,
1211
1211
  "character": 3
1212
1212
  },
1213
1213
  "signature": "(property) pattern?: string | undefined",
@@ -1216,7 +1216,7 @@
1216
1216
  "__schema": "KeywordTypeSchema",
1217
1217
  "location": {
1218
1218
  "filePath": "merge-lanes.main.runtime.ts",
1219
- "line": 51,
1219
+ "line": 52,
1220
1220
  "character": 13
1221
1221
  },
1222
1222
  "name": "string"
@@ -1227,7 +1227,7 @@
1227
1227
  "__schema": "VariableLikeSchema",
1228
1228
  "location": {
1229
1229
  "filePath": "merge-lanes.main.runtime.ts",
1230
- "line": 52,
1230
+ "line": 53,
1231
1231
  "character": 3
1232
1232
  },
1233
1233
  "signature": "(property) includeDeps?: boolean | undefined",
@@ -1236,7 +1236,7 @@
1236
1236
  "__schema": "KeywordTypeSchema",
1237
1237
  "location": {
1238
1238
  "filePath": "merge-lanes.main.runtime.ts",
1239
- "line": 52,
1239
+ "line": 53,
1240
1240
  "character": 17
1241
1241
  },
1242
1242
  "name": "boolean"
@@ -1247,7 +1247,7 @@
1247
1247
  "__schema": "VariableLikeSchema",
1248
1248
  "location": {
1249
1249
  "filePath": "merge-lanes.main.runtime.ts",
1250
- "line": 53,
1250
+ "line": 54,
1251
1251
  "character": 3
1252
1252
  },
1253
1253
  "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -1256,7 +1256,7 @@
1256
1256
  "__schema": "KeywordTypeSchema",
1257
1257
  "location": {
1258
1258
  "filePath": "merge-lanes.main.runtime.ts",
1259
- "line": 53,
1259
+ "line": 54,
1260
1260
  "character": 32
1261
1261
  },
1262
1262
  "name": "boolean"
@@ -1267,7 +1267,7 @@
1267
1267
  "__schema": "VariableLikeSchema",
1268
1268
  "location": {
1269
1269
  "filePath": "merge-lanes.main.runtime.ts",
1270
- "line": 54,
1270
+ "line": 55,
1271
1271
  "character": 3
1272
1272
  },
1273
1273
  "signature": "(property) resolveUnrelated?: \"manual\" | \"theirs\" | \"ours\" | undefined",
@@ -1276,7 +1276,7 @@
1276
1276
  "__schema": "TypeRefSchema",
1277
1277
  "location": {
1278
1278
  "filePath": "merge-lanes.main.runtime.ts",
1279
- "line": 54,
1279
+ "line": 55,
1280
1280
  "character": 22
1281
1281
  },
1282
1282
  "name": "MergeStrategy"
@@ -1287,7 +1287,7 @@
1287
1287
  "__schema": "VariableLikeSchema",
1288
1288
  "location": {
1289
1289
  "filePath": "merge-lanes.main.runtime.ts",
1290
- "line": 55,
1290
+ "line": 56,
1291
1291
  "character": 3
1292
1292
  },
1293
1293
  "signature": "(property) ignoreConfigChanges?: boolean | undefined",
@@ -1296,7 +1296,7 @@
1296
1296
  "__schema": "KeywordTypeSchema",
1297
1297
  "location": {
1298
1298
  "filePath": "merge-lanes.main.runtime.ts",
1299
- "line": 55,
1299
+ "line": 56,
1300
1300
  "character": 25
1301
1301
  },
1302
1302
  "name": "boolean"
@@ -1307,7 +1307,7 @@
1307
1307
  "__schema": "VariableLikeSchema",
1308
1308
  "location": {
1309
1309
  "filePath": "merge-lanes.main.runtime.ts",
1310
- "line": 56,
1310
+ "line": 57,
1311
1311
  "character": 3
1312
1312
  },
1313
1313
  "signature": "(property) skipFetch?: boolean | undefined",
@@ -1316,7 +1316,7 @@
1316
1316
  "__schema": "KeywordTypeSchema",
1317
1317
  "location": {
1318
1318
  "filePath": "merge-lanes.main.runtime.ts",
1319
- "line": 56,
1319
+ "line": 57,
1320
1320
  "character": 15
1321
1321
  },
1322
1322
  "name": "boolean"
@@ -1327,7 +1327,7 @@
1327
1327
  "__schema": "VariableLikeSchema",
1328
1328
  "location": {
1329
1329
  "filePath": "merge-lanes.main.runtime.ts",
1330
- "line": 57,
1330
+ "line": 58,
1331
1331
  "character": 3
1332
1332
  },
1333
1333
  "signature": "(property) excludeNonLaneComps?: boolean | undefined",
@@ -1336,7 +1336,7 @@
1336
1336
  "__schema": "KeywordTypeSchema",
1337
1337
  "location": {
1338
1338
  "filePath": "merge-lanes.main.runtime.ts",
1339
- "line": 57,
1339
+ "line": 58,
1340
1340
  "character": 25
1341
1341
  },
1342
1342
  "name": "boolean"
@@ -1350,7 +1350,7 @@
1350
1350
  "__schema": "TypeSchema",
1351
1351
  "location": {
1352
1352
  "filePath": "merge-lanes.main.runtime.ts",
1353
- "line": 59,
1353
+ "line": 60,
1354
1354
  "character": 1
1355
1355
  },
1356
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}",
@@ -1359,7 +1359,7 @@
1359
1359
  "__schema": "TypeLiteralSchema",
1360
1360
  "location": {
1361
1361
  "filePath": "merge-lanes.main.runtime.ts",
1362
- "line": 59,
1362
+ "line": 60,
1363
1363
  "character": 36
1364
1364
  },
1365
1365
  "members": [
@@ -1367,7 +1367,7 @@
1367
1367
  "__schema": "VariableLikeSchema",
1368
1368
  "location": {
1369
1369
  "filePath": "merge-lanes.main.runtime.ts",
1370
- "line": 60,
1370
+ "line": 61,
1371
1371
  "character": 3
1372
1372
  },
1373
1373
  "signature": "(property) mergedNow: ComponentID[]",
@@ -1376,14 +1376,14 @@
1376
1376
  "__schema": "TypeArraySchema",
1377
1377
  "location": {
1378
1378
  "filePath": "merge-lanes.main.runtime.ts",
1379
- "line": 60,
1379
+ "line": 61,
1380
1380
  "character": 14
1381
1381
  },
1382
1382
  "type": {
1383
1383
  "__schema": "TypeRefSchema",
1384
1384
  "location": {
1385
1385
  "filePath": "merge-lanes.main.runtime.ts",
1386
- "line": 60,
1386
+ "line": 61,
1387
1387
  "character": 14
1388
1388
  },
1389
1389
  "name": "ComponentID"
@@ -1395,7 +1395,7 @@
1395
1395
  "__schema": "VariableLikeSchema",
1396
1396
  "location": {
1397
1397
  "filePath": "merge-lanes.main.runtime.ts",
1398
- "line": 61,
1398
+ "line": 62,
1399
1399
  "character": 3
1400
1400
  },
1401
1401
  "signature": "(property) exportedIds: ComponentID[]",
@@ -1404,14 +1404,14 @@
1404
1404
  "__schema": "TypeArraySchema",
1405
1405
  "location": {
1406
1406
  "filePath": "merge-lanes.main.runtime.ts",
1407
- "line": 61,
1407
+ "line": 62,
1408
1408
  "character": 16
1409
1409
  },
1410
1410
  "type": {
1411
1411
  "__schema": "TypeRefSchema",
1412
1412
  "location": {
1413
1413
  "filePath": "merge-lanes.main.runtime.ts",
1414
- "line": 61,
1414
+ "line": 62,
1415
1415
  "character": 16
1416
1416
  },
1417
1417
  "name": "ComponentID"
@@ -1423,7 +1423,7 @@
1423
1423
  "__schema": "VariableLikeSchema",
1424
1424
  "location": {
1425
1425
  "filePath": "merge-lanes.main.runtime.ts",
1426
- "line": 62,
1426
+ "line": 63,
1427
1427
  "character": 3
1428
1428
  },
1429
1429
  "signature": "(property) unmerged: {\n id: ComponentID;\n reason: string;\n}[]",
@@ -1432,14 +1432,14 @@
1432
1432
  "__schema": "TypeArraySchema",
1433
1433
  "location": {
1434
1434
  "filePath": "merge-lanes.main.runtime.ts",
1435
- "line": 62,
1435
+ "line": 63,
1436
1436
  "character": 13
1437
1437
  },
1438
1438
  "type": {
1439
1439
  "__schema": "TypeLiteralSchema",
1440
1440
  "location": {
1441
1441
  "filePath": "merge-lanes.main.runtime.ts",
1442
- "line": 62,
1442
+ "line": 63,
1443
1443
  "character": 13
1444
1444
  },
1445
1445
  "members": [
@@ -1447,7 +1447,7 @@
1447
1447
  "__schema": "VariableLikeSchema",
1448
1448
  "location": {
1449
1449
  "filePath": "merge-lanes.main.runtime.ts",
1450
- "line": 62,
1450
+ "line": 63,
1451
1451
  "character": 15
1452
1452
  },
1453
1453
  "signature": "(property) id: ComponentID",
@@ -1456,7 +1456,7 @@
1456
1456
  "__schema": "TypeRefSchema",
1457
1457
  "location": {
1458
1458
  "filePath": "merge-lanes.main.runtime.ts",
1459
- "line": 62,
1459
+ "line": 63,
1460
1460
  "character": 15
1461
1461
  },
1462
1462
  "name": "ComponentID",
@@ -1472,7 +1472,7 @@
1472
1472
  "__schema": "VariableLikeSchema",
1473
1473
  "location": {
1474
1474
  "filePath": "merge-lanes.main.runtime.ts",
1475
- "line": 62,
1475
+ "line": 63,
1476
1476
  "character": 32
1477
1477
  },
1478
1478
  "signature": "(property) reason: string",
@@ -1481,7 +1481,7 @@
1481
1481
  "__schema": "KeywordTypeSchema",
1482
1482
  "location": {
1483
1483
  "filePath": "merge-lanes.main.runtime.ts",
1484
- "line": 62,
1484
+ "line": 63,
1485
1485
  "character": 40
1486
1486
  },
1487
1487
  "name": "string"
@@ -1497,7 +1497,7 @@
1497
1497
  "__schema": "VariableLikeSchema",
1498
1498
  "location": {
1499
1499
  "filePath": "merge-lanes.main.runtime.ts",
1500
- "line": 63,
1500
+ "line": 64,
1501
1501
  "character": 3
1502
1502
  },
1503
1503
  "signature": "(property) conflicts?: {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n}[] | undefined",
@@ -1506,7 +1506,7 @@
1506
1506
  "__schema": "TypeRefSchema",
1507
1507
  "location": {
1508
1508
  "filePath": "merge-lanes.main.runtime.ts",
1509
- "line": 63,
1509
+ "line": 64,
1510
1510
  "character": 15
1511
1511
  },
1512
1512
  "name": "Array",
@@ -1515,7 +1515,7 @@
1515
1515
  "__schema": "TypeLiteralSchema",
1516
1516
  "location": {
1517
1517
  "filePath": "merge-lanes.main.runtime.ts",
1518
- "line": 63,
1518
+ "line": 64,
1519
1519
  "character": 21
1520
1520
  },
1521
1521
  "members": [
@@ -1523,7 +1523,7 @@
1523
1523
  "__schema": "VariableLikeSchema",
1524
1524
  "location": {
1525
1525
  "filePath": "merge-lanes.main.runtime.ts",
1526
- "line": 63,
1526
+ "line": 64,
1527
1527
  "character": 23
1528
1528
  },
1529
1529
  "signature": "(property) id: ComponentID",
@@ -1532,7 +1532,7 @@
1532
1532
  "__schema": "TypeRefSchema",
1533
1533
  "location": {
1534
1534
  "filePath": "merge-lanes.main.runtime.ts",
1535
- "line": 63,
1535
+ "line": 64,
1536
1536
  "character": 23
1537
1537
  },
1538
1538
  "name": "ComponentID",
@@ -1548,7 +1548,7 @@
1548
1548
  "__schema": "VariableLikeSchema",
1549
1549
  "location": {
1550
1550
  "filePath": "merge-lanes.main.runtime.ts",
1551
- "line": 63,
1551
+ "line": 64,
1552
1552
  "character": 40
1553
1553
  },
1554
1554
  "signature": "(property) files: string[]",
@@ -1557,14 +1557,14 @@
1557
1557
  "__schema": "TypeArraySchema",
1558
1558
  "location": {
1559
1559
  "filePath": "merge-lanes.main.runtime.ts",
1560
- "line": 63,
1560
+ "line": 64,
1561
1561
  "character": 47
1562
1562
  },
1563
1563
  "type": {
1564
1564
  "__schema": "KeywordTypeSchema",
1565
1565
  "location": {
1566
1566
  "filePath": "merge-lanes.main.runtime.ts",
1567
- "line": 63,
1567
+ "line": 64,
1568
1568
  "character": 47
1569
1569
  },
1570
1570
  "name": "string"
@@ -1576,7 +1576,7 @@
1576
1576
  "__schema": "VariableLikeSchema",
1577
1577
  "location": {
1578
1578
  "filePath": "merge-lanes.main.runtime.ts",
1579
- "line": 63,
1579
+ "line": 64,
1580
1580
  "character": 57
1581
1581
  },
1582
1582
  "signature": "(property) config?: boolean | undefined",
@@ -1585,7 +1585,7 @@
1585
1585
  "__schema": "KeywordTypeSchema",
1586
1586
  "location": {
1587
1587
  "filePath": "merge-lanes.main.runtime.ts",
1588
- "line": 63,
1588
+ "line": 64,
1589
1589
  "character": 66
1590
1590
  },
1591
1591
  "name": "boolean"
@@ -1602,7 +1602,7 @@
1602
1602
  "__schema": "VariableLikeSchema",
1603
1603
  "location": {
1604
1604
  "filePath": "merge-lanes.main.runtime.ts",
1605
- "line": 64,
1605
+ "line": 65,
1606
1606
  "character": 3
1607
1607
  },
1608
1608
  "signature": "(property) snappedIds?: ComponentID[] | undefined",
@@ -1611,14 +1611,14 @@
1611
1611
  "__schema": "TypeArraySchema",
1612
1612
  "location": {
1613
1613
  "filePath": "merge-lanes.main.runtime.ts",
1614
- "line": 64,
1614
+ "line": 65,
1615
1615
  "character": 16
1616
1616
  },
1617
1617
  "type": {
1618
1618
  "__schema": "TypeRefSchema",
1619
1619
  "location": {
1620
1620
  "filePath": "merge-lanes.main.runtime.ts",
1621
- "line": 64,
1621
+ "line": 65,
1622
1622
  "character": 16
1623
1623
  },
1624
1624
  "name": "ComponentID"
@@ -1630,7 +1630,7 @@
1630
1630
  "__schema": "VariableLikeSchema",
1631
1631
  "location": {
1632
1632
  "filePath": "merge-lanes.main.runtime.ts",
1633
- "line": 65,
1633
+ "line": 66,
1634
1634
  "character": 3
1635
1635
  },
1636
1636
  "signature": "(property) mergedPreviously: ComponentID[]",
@@ -1639,14 +1639,14 @@
1639
1639
  "__schema": "TypeArraySchema",
1640
1640
  "location": {
1641
1641
  "filePath": "merge-lanes.main.runtime.ts",
1642
- "line": 65,
1642
+ "line": 66,
1643
1643
  "character": 21
1644
1644
  },
1645
1645
  "type": {
1646
1646
  "__schema": "TypeRefSchema",
1647
1647
  "location": {
1648
1648
  "filePath": "merge-lanes.main.runtime.ts",
1649
- "line": 65,
1649
+ "line": 66,
1650
1650
  "character": 21
1651
1651
  },
1652
1652
  "name": "ComponentID"
@@ -1661,7 +1661,7 @@
1661
1661
  "__schema": "ClassSchema",
1662
1662
  "location": {
1663
1663
  "filePath": "merge-lanes.main.runtime.ts",
1664
- "line": 68,
1664
+ "line": 69,
1665
1665
  "character": 1
1666
1666
  },
1667
1667
  "signature": "class MergeLanesMain",
@@ -1671,7 +1671,7 @@
1671
1671
  "__schema": "ConstructorSchema",
1672
1672
  "location": {
1673
1673
  "filePath": "merge-lanes.main.runtime.ts",
1674
- "line": 69,
1674
+ "line": 70,
1675
1675
  "character": 3
1676
1676
  },
1677
1677
  "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 +1681,7 @@
1681
1681
  "__schema": "ParameterSchema",
1682
1682
  "location": {
1683
1683
  "filePath": "merge-lanes.main.runtime.ts",
1684
- "line": 70,
1684
+ "line": 71,
1685
1685
  "character": 5
1686
1686
  },
1687
1687
  "name": "workspace",
@@ -1689,7 +1689,7 @@
1689
1689
  "__schema": "TypeUnionSchema",
1690
1690
  "location": {
1691
1691
  "filePath": "merge-lanes.main.runtime.ts",
1692
- "line": 70,
1692
+ "line": 71,
1693
1693
  "character": 24
1694
1694
  },
1695
1695
  "types": [
@@ -1697,7 +1697,7 @@
1697
1697
  "__schema": "TypeRefSchema",
1698
1698
  "location": {
1699
1699
  "filePath": "merge-lanes.main.runtime.ts",
1700
- "line": 70,
1700
+ "line": 71,
1701
1701
  "character": 24
1702
1702
  },
1703
1703
  "name": "Workspace"
@@ -1706,7 +1706,7 @@
1706
1706
  "__schema": "KeywordTypeSchema",
1707
1707
  "location": {
1708
1708
  "filePath": "merge-lanes.main.runtime.ts",
1709
- "line": 70,
1709
+ "line": 71,
1710
1710
  "character": 36
1711
1711
  },
1712
1712
  "name": "undefined"
@@ -1720,7 +1720,7 @@
1720
1720
  "__schema": "ParameterSchema",
1721
1721
  "location": {
1722
1722
  "filePath": "merge-lanes.main.runtime.ts",
1723
- "line": 71,
1723
+ "line": 72,
1724
1724
  "character": 5
1725
1725
  },
1726
1726
  "name": "merging",
@@ -1728,7 +1728,7 @@
1728
1728
  "__schema": "TypeRefSchema",
1729
1729
  "location": {
1730
1730
  "filePath": "merge-lanes.main.runtime.ts",
1731
- "line": 71,
1731
+ "line": 72,
1732
1732
  "character": 22
1733
1733
  },
1734
1734
  "name": "MergingMain"
@@ -1740,7 +1740,7 @@
1740
1740
  "__schema": "ParameterSchema",
1741
1741
  "location": {
1742
1742
  "filePath": "merge-lanes.main.runtime.ts",
1743
- "line": 72,
1743
+ "line": 73,
1744
1744
  "character": 5
1745
1745
  },
1746
1746
  "name": "lanes",
@@ -1748,7 +1748,7 @@
1748
1748
  "__schema": "TypeRefSchema",
1749
1749
  "location": {
1750
1750
  "filePath": "merge-lanes.main.runtime.ts",
1751
- "line": 72,
1751
+ "line": 73,
1752
1752
  "character": 20
1753
1753
  },
1754
1754
  "name": "LanesMain"
@@ -1760,7 +1760,7 @@
1760
1760
  "__schema": "ParameterSchema",
1761
1761
  "location": {
1762
1762
  "filePath": "merge-lanes.main.runtime.ts",
1763
- "line": 73,
1763
+ "line": 74,
1764
1764
  "character": 5
1765
1765
  },
1766
1766
  "name": "logger",
@@ -1768,7 +1768,7 @@
1768
1768
  "__schema": "TypeRefSchema",
1769
1769
  "location": {
1770
1770
  "filePath": "merge-lanes.main.runtime.ts",
1771
- "line": 73,
1771
+ "line": 74,
1772
1772
  "character": 22
1773
1773
  },
1774
1774
  "name": "Logger"
@@ -1780,7 +1780,7 @@
1780
1780
  "__schema": "ParameterSchema",
1781
1781
  "location": {
1782
1782
  "filePath": "merge-lanes.main.runtime.ts",
1783
- "line": 74,
1783
+ "line": 75,
1784
1784
  "character": 5
1785
1785
  },
1786
1786
  "name": "remove",
@@ -1788,7 +1788,7 @@
1788
1788
  "__schema": "TypeRefSchema",
1789
1789
  "location": {
1790
1790
  "filePath": "merge-lanes.main.runtime.ts",
1791
- "line": 74,
1791
+ "line": 75,
1792
1792
  "character": 21
1793
1793
  },
1794
1794
  "name": "RemoveMain"
@@ -1800,7 +1800,7 @@
1800
1800
  "__schema": "ParameterSchema",
1801
1801
  "location": {
1802
1802
  "filePath": "merge-lanes.main.runtime.ts",
1803
- "line": 75,
1803
+ "line": 76,
1804
1804
  "character": 5
1805
1805
  },
1806
1806
  "name": "scope",
@@ -1808,7 +1808,7 @@
1808
1808
  "__schema": "TypeRefSchema",
1809
1809
  "location": {
1810
1810
  "filePath": "merge-lanes.main.runtime.ts",
1811
- "line": 75,
1811
+ "line": 76,
1812
1812
  "character": 20
1813
1813
  },
1814
1814
  "name": "ScopeMain"
@@ -1820,7 +1820,7 @@
1820
1820
  "__schema": "ParameterSchema",
1821
1821
  "location": {
1822
1822
  "filePath": "merge-lanes.main.runtime.ts",
1823
- "line": 76,
1823
+ "line": 77,
1824
1824
  "character": 5
1825
1825
  },
1826
1826
  "name": "exporter",
@@ -1828,7 +1828,7 @@
1828
1828
  "__schema": "TypeRefSchema",
1829
1829
  "location": {
1830
1830
  "filePath": "merge-lanes.main.runtime.ts",
1831
- "line": 76,
1831
+ "line": 77,
1832
1832
  "character": 23
1833
1833
  },
1834
1834
  "name": "ExportMain"
@@ -1840,7 +1840,7 @@
1840
1840
  "__schema": "ParameterSchema",
1841
1841
  "location": {
1842
1842
  "filePath": "merge-lanes.main.runtime.ts",
1843
- "line": 77,
1843
+ "line": 78,
1844
1844
  "character": 5
1845
1845
  },
1846
1846
  "name": "importer",
@@ -1848,7 +1848,7 @@
1848
1848
  "__schema": "TypeRefSchema",
1849
1849
  "location": {
1850
1850
  "filePath": "merge-lanes.main.runtime.ts",
1851
- "line": 77,
1851
+ "line": 78,
1852
1852
  "character": 23
1853
1853
  },
1854
1854
  "name": "ImporterMain"
@@ -1860,7 +1860,7 @@
1860
1860
  "__schema": "ParameterSchema",
1861
1861
  "location": {
1862
1862
  "filePath": "merge-lanes.main.runtime.ts",
1863
- "line": 78,
1863
+ "line": 79,
1864
1864
  "character": 5
1865
1865
  },
1866
1866
  "name": "checkout",
@@ -1868,7 +1868,7 @@
1868
1868
  "__schema": "TypeRefSchema",
1869
1869
  "location": {
1870
1870
  "filePath": "merge-lanes.main.runtime.ts",
1871
- "line": 78,
1871
+ "line": 79,
1872
1872
  "character": 23
1873
1873
  },
1874
1874
  "name": "CheckoutMain"
@@ -1881,7 +1881,7 @@
1881
1881
  "__schema": "ThisTypeSchema",
1882
1882
  "location": {
1883
1883
  "filePath": "merge-lanes.main.runtime.ts",
1884
- "line": 68,
1884
+ "line": 69,
1885
1885
  "character": 1
1886
1886
  },
1887
1887
  "name": "MergeLanesMain"
@@ -1892,7 +1892,7 @@
1892
1892
  "__schema": "FunctionLikeSchema",
1893
1893
  "location": {
1894
1894
  "filePath": "merge-lanes.main.runtime.ts",
1895
- "line": 81,
1895
+ "line": 82,
1896
1896
  "character": 3
1897
1897
  },
1898
1898
  "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
@@ -1902,7 +1902,7 @@
1902
1902
  "__schema": "ParameterSchema",
1903
1903
  "location": {
1904
1904
  "filePath": "merge-lanes.main.runtime.ts",
1905
- "line": 81,
1905
+ "line": 82,
1906
1906
  "character": 24
1907
1907
  },
1908
1908
  "name": "laneName",
@@ -1910,7 +1910,7 @@
1910
1910
  "__schema": "KeywordTypeSchema",
1911
1911
  "location": {
1912
1912
  "filePath": "merge-lanes.main.runtime.ts",
1913
- "line": 81,
1913
+ "line": 82,
1914
1914
  "character": 34
1915
1915
  },
1916
1916
  "name": "string"
@@ -1922,7 +1922,7 @@
1922
1922
  "__schema": "ParameterSchema",
1923
1923
  "location": {
1924
1924
  "filePath": "merge-lanes.main.runtime.ts",
1925
- "line": 81,
1925
+ "line": 82,
1926
1926
  "character": 42
1927
1927
  },
1928
1928
  "name": "options",
@@ -1930,7 +1930,7 @@
1930
1930
  "__schema": "TypeRefSchema",
1931
1931
  "location": {
1932
1932
  "filePath": "merge-lanes.main.runtime.ts",
1933
- "line": 81,
1933
+ "line": 82,
1934
1934
  "character": 51
1935
1935
  },
1936
1936
  "name": "MergeLaneOptions"
@@ -1943,7 +1943,7 @@
1943
1943
  "__schema": "InferenceTypeSchema",
1944
1944
  "location": {
1945
1945
  "filePath": "merge-lanes.main.runtime.ts",
1946
- "line": 81,
1946
+ "line": 82,
1947
1947
  "character": 3
1948
1948
  },
1949
1949
  "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>"
@@ -1956,7 +1956,7 @@
1956
1956
  "__schema": "FunctionLikeSchema",
1957
1957
  "location": {
1958
1958
  "filePath": "merge-lanes.main.runtime.ts",
1959
- "line": 91,
1959
+ "line": 92,
1960
1960
  "character": 3
1961
1961
  },
1962
1962
  "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
@@ -1966,7 +1966,7 @@
1966
1966
  "__schema": "ParameterSchema",
1967
1967
  "location": {
1968
1968
  "filePath": "merge-lanes.main.runtime.ts",
1969
- "line": 92,
1969
+ "line": 93,
1970
1970
  "character": 5
1971
1971
  },
1972
1972
  "name": "otherLaneId",
@@ -1974,7 +1974,7 @@
1974
1974
  "__schema": "TypeRefSchema",
1975
1975
  "location": {
1976
1976
  "filePath": "merge-lanes.main.runtime.ts",
1977
- "line": 92,
1977
+ "line": 93,
1978
1978
  "character": 18
1979
1979
  },
1980
1980
  "name": "LaneId"
@@ -1986,7 +1986,7 @@
1986
1986
  "__schema": "ParameterSchema",
1987
1987
  "location": {
1988
1988
  "filePath": "merge-lanes.main.runtime.ts",
1989
- "line": 93,
1989
+ "line": 94,
1990
1990
  "character": 5
1991
1991
  },
1992
1992
  "name": "currentLaneId",
@@ -1994,7 +1994,7 @@
1994
1994
  "__schema": "TypeRefSchema",
1995
1995
  "location": {
1996
1996
  "filePath": "merge-lanes.main.runtime.ts",
1997
- "line": 93,
1997
+ "line": 94,
1998
1998
  "character": 20
1999
1999
  },
2000
2000
  "name": "LaneId"
@@ -2006,7 +2006,7 @@
2006
2006
  "__schema": "ParameterSchema",
2007
2007
  "location": {
2008
2008
  "filePath": "merge-lanes.main.runtime.ts",
2009
- "line": 94,
2009
+ "line": 95,
2010
2010
  "character": 5
2011
2011
  },
2012
2012
  "name": "options",
@@ -2014,7 +2014,7 @@
2014
2014
  "__schema": "TypeRefSchema",
2015
2015
  "location": {
2016
2016
  "filePath": "merge-lanes.main.runtime.ts",
2017
- "line": 94,
2017
+ "line": 95,
2018
2018
  "character": 14
2019
2019
  },
2020
2020
  "name": "MergeLaneOptions"
@@ -2027,7 +2027,7 @@
2027
2027
  "__schema": "TypeRefSchema",
2028
2028
  "location": {
2029
2029
  "filePath": "merge-lanes.main.runtime.ts",
2030
- "line": 95,
2030
+ "line": 96,
2031
2031
  "character": 6
2032
2032
  },
2033
2033
  "name": "Promise",
@@ -2036,7 +2036,7 @@
2036
2036
  "__schema": "TypeLiteralSchema",
2037
2037
  "location": {
2038
2038
  "filePath": "merge-lanes.main.runtime.ts",
2039
- "line": 95,
2039
+ "line": 96,
2040
2040
  "character": 14
2041
2041
  },
2042
2042
  "members": [
@@ -2044,7 +2044,7 @@
2044
2044
  "__schema": "VariableLikeSchema",
2045
2045
  "location": {
2046
2046
  "filePath": "merge-lanes.main.runtime.ts",
2047
- "line": 95,
2047
+ "line": 96,
2048
2048
  "character": 16
2049
2049
  },
2050
2050
  "signature": "(property) mergeResults: ApplyVersionResults",
@@ -2053,7 +2053,7 @@
2053
2053
  "__schema": "TypeRefSchema",
2054
2054
  "location": {
2055
2055
  "filePath": "merge-lanes.main.runtime.ts",
2056
- "line": 95,
2056
+ "line": 96,
2057
2057
  "character": 16
2058
2058
  },
2059
2059
  "name": "ApplyVersionResults",
@@ -2068,7 +2068,7 @@
2068
2068
  "__schema": "VariableLikeSchema",
2069
2069
  "location": {
2070
2070
  "filePath": "merge-lanes.main.runtime.ts",
2071
- "line": 95,
2071
+ "line": 96,
2072
2072
  "character": 51
2073
2073
  },
2074
2074
  "signature": "(property) deleteResults: any",
@@ -2077,7 +2077,7 @@
2077
2077
  "__schema": "KeywordTypeSchema",
2078
2078
  "location": {
2079
2079
  "filePath": "merge-lanes.main.runtime.ts",
2080
- "line": 95,
2080
+ "line": 96,
2081
2081
  "character": 66
2082
2082
  },
2083
2083
  "name": "any"
@@ -2088,7 +2088,7 @@
2088
2088
  "__schema": "VariableLikeSchema",
2089
2089
  "location": {
2090
2090
  "filePath": "merge-lanes.main.runtime.ts",
2091
- "line": 95,
2091
+ "line": 96,
2092
2092
  "character": 71
2093
2093
  },
2094
2094
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -2097,14 +2097,14 @@
2097
2097
  "__schema": "TypeArraySchema",
2098
2098
  "location": {
2099
2099
  "filePath": "merge-lanes.main.runtime.ts",
2100
- "line": 95,
2100
+ "line": 96,
2101
2101
  "character": 91
2102
2102
  },
2103
2103
  "type": {
2104
2104
  "__schema": "TypeRefSchema",
2105
2105
  "location": {
2106
2106
  "filePath": "merge-lanes.main.runtime.ts",
2107
- "line": 95,
2107
+ "line": 96,
2108
2108
  "character": 91
2109
2109
  },
2110
2110
  "name": "ConfigMergeResult"
@@ -2124,7 +2124,7 @@
2124
2124
  "__schema": "FunctionLikeSchema",
2125
2125
  "location": {
2126
2126
  "filePath": "merge-lanes.main.runtime.ts",
2127
- "line": 276,
2127
+ "line": 277,
2128
2128
  "character": 3
2129
2129
  },
2130
2130
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -2134,7 +2134,7 @@
2134
2134
  "__schema": "ParameterSchema",
2135
2135
  "location": {
2136
2136
  "filePath": "merge-lanes.main.runtime.ts",
2137
- "line": 276,
2137
+ "line": 277,
2138
2138
  "character": 24
2139
2139
  },
2140
2140
  "name": "checkoutProps",
@@ -2142,7 +2142,7 @@
2142
2142
  "__schema": "TypeRefSchema",
2143
2143
  "location": {
2144
2144
  "filePath": "merge-lanes.main.runtime.ts",
2145
- "line": 276,
2145
+ "line": 277,
2146
2146
  "character": 39
2147
2147
  },
2148
2148
  "name": "CheckoutProps"
@@ -2154,7 +2154,7 @@
2154
2154
  "__schema": "ParameterSchema",
2155
2155
  "location": {
2156
2156
  "filePath": "merge-lanes.main.runtime.ts",
2157
- "line": 276,
2157
+ "line": 277,
2158
2158
  "character": 54
2159
2159
  },
2160
2160
  "name": "mergeAbortOpts",
@@ -2162,7 +2162,7 @@
2162
2162
  "__schema": "TypeRefSchema",
2163
2163
  "location": {
2164
2164
  "filePath": "merge-lanes.main.runtime.ts",
2165
- "line": 276,
2165
+ "line": 277,
2166
2166
  "character": 70
2167
2167
  },
2168
2168
  "name": "MergeAbortOpts"
@@ -2175,7 +2175,7 @@
2175
2175
  "__schema": "InferenceTypeSchema",
2176
2176
  "location": {
2177
2177
  "filePath": "merge-lanes.main.runtime.ts",
2178
- "line": 276,
2178
+ "line": 277,
2179
2179
  "character": 3
2180
2180
  },
2181
2181
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -2188,7 +2188,7 @@
2188
2188
  "__schema": "FunctionLikeSchema",
2189
2189
  "location": {
2190
2190
  "filePath": "merge-lanes.main.runtime.ts",
2191
- "line": 332,
2191
+ "line": 333,
2192
2192
  "character": 3
2193
2193
  },
2194
2194
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -2198,7 +2198,7 @@
2198
2198
  "__schema": "ParameterSchema",
2199
2199
  "location": {
2200
2200
  "filePath": "merge-lanes.main.runtime.ts",
2201
- "line": 333,
2201
+ "line": 334,
2202
2202
  "character": 5
2203
2203
  },
2204
2204
  "name": "fromLane",
@@ -2206,7 +2206,7 @@
2206
2206
  "__schema": "KeywordTypeSchema",
2207
2207
  "location": {
2208
2208
  "filePath": "merge-lanes.main.runtime.ts",
2209
- "line": 333,
2209
+ "line": 334,
2210
2210
  "character": 15
2211
2211
  },
2212
2212
  "name": "string"
@@ -2218,7 +2218,7 @@
2218
2218
  "__schema": "ParameterSchema",
2219
2219
  "location": {
2220
2220
  "filePath": "merge-lanes.main.runtime.ts",
2221
- "line": 334,
2221
+ "line": 335,
2222
2222
  "character": 5
2223
2223
  },
2224
2224
  "name": "toLane",
@@ -2226,7 +2226,7 @@
2226
2226
  "__schema": "KeywordTypeSchema",
2227
2227
  "location": {
2228
2228
  "filePath": "merge-lanes.main.runtime.ts",
2229
- "line": 334,
2229
+ "line": 335,
2230
2230
  "character": 13
2231
2231
  },
2232
2232
  "name": "string"
@@ -2238,7 +2238,7 @@
2238
2238
  "__schema": "ParameterSchema",
2239
2239
  "location": {
2240
2240
  "filePath": "merge-lanes.main.runtime.ts",
2241
- "line": 335,
2241
+ "line": 336,
2242
2242
  "character": 5
2243
2243
  },
2244
2244
  "name": "options",
@@ -2246,7 +2246,7 @@
2246
2246
  "__schema": "TypeIntersectionSchema",
2247
2247
  "location": {
2248
2248
  "filePath": "merge-lanes.main.runtime.ts",
2249
- "line": 335,
2249
+ "line": 336,
2250
2250
  "character": 14
2251
2251
  },
2252
2252
  "types": [
@@ -2254,7 +2254,7 @@
2254
2254
  "__schema": "TypeRefSchema",
2255
2255
  "location": {
2256
2256
  "filePath": "merge-lanes.main.runtime.ts",
2257
- "line": 335,
2257
+ "line": 336,
2258
2258
  "character": 14
2259
2259
  },
2260
2260
  "name": "Partial",
@@ -2263,7 +2263,7 @@
2263
2263
  "__schema": "TypeRefSchema",
2264
2264
  "location": {
2265
2265
  "filePath": "merge-lanes.main.runtime.ts",
2266
- "line": 335,
2266
+ "line": 336,
2267
2267
  "character": 22
2268
2268
  },
2269
2269
  "name": "MergeLaneOptions"
@@ -2274,7 +2274,7 @@
2274
2274
  "__schema": "TypeLiteralSchema",
2275
2275
  "location": {
2276
2276
  "filePath": "merge-lanes.main.runtime.ts",
2277
- "line": 335,
2277
+ "line": 336,
2278
2278
  "character": 42
2279
2279
  },
2280
2280
  "members": [
@@ -2282,7 +2282,7 @@
2282
2282
  "__schema": "VariableLikeSchema",
2283
2283
  "location": {
2284
2284
  "filePath": "merge-lanes.main.runtime.ts",
2285
- "line": 335,
2285
+ "line": 336,
2286
2286
  "character": 44
2287
2287
  },
2288
2288
  "signature": "(property) push?: boolean | undefined",
@@ -2291,7 +2291,7 @@
2291
2291
  "__schema": "KeywordTypeSchema",
2292
2292
  "location": {
2293
2293
  "filePath": "merge-lanes.main.runtime.ts",
2294
- "line": 335,
2294
+ "line": 336,
2295
2295
  "character": 51
2296
2296
  },
2297
2297
  "name": "boolean"
@@ -2302,7 +2302,7 @@
2302
2302
  "__schema": "VariableLikeSchema",
2303
2303
  "location": {
2304
2304
  "filePath": "merge-lanes.main.runtime.ts",
2305
- "line": 335,
2305
+ "line": 336,
2306
2306
  "character": 60
2307
2307
  },
2308
2308
  "signature": "(property) reMerge?: boolean | undefined",
@@ -2311,7 +2311,7 @@
2311
2311
  "__schema": "KeywordTypeSchema",
2312
2312
  "location": {
2313
2313
  "filePath": "merge-lanes.main.runtime.ts",
2314
- "line": 335,
2314
+ "line": 336,
2315
2315
  "character": 70
2316
2316
  },
2317
2317
  "name": "boolean"
@@ -2330,7 +2330,7 @@
2330
2330
  "__schema": "TypeRefSchema",
2331
2331
  "location": {
2332
2332
  "filePath": "merge-lanes.main.runtime.ts",
2333
- "line": 336,
2333
+ "line": 337,
2334
2334
  "character": 6
2335
2335
  },
2336
2336
  "name": "Promise",
@@ -2339,7 +2339,7 @@
2339
2339
  "__schema": "TypeRefSchema",
2340
2340
  "location": {
2341
2341
  "filePath": "merge-lanes.main.runtime.ts",
2342
- "line": 336,
2342
+ "line": 337,
2343
2343
  "character": 14
2344
2344
  },
2345
2345
  "name": "MergeFromScopeResult"
@@ -2354,7 +2354,7 @@
2354
2354
  "__schema": "VariableLikeSchema",
2355
2355
  "location": {
2356
2356
  "filePath": "merge-lanes.main.runtime.ts",
2357
- "line": 529,
2357
+ "line": 530,
2358
2358
  "character": 3
2359
2359
  },
2360
2360
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2363,7 +2363,7 @@
2363
2363
  "__schema": "InferenceTypeSchema",
2364
2364
  "location": {
2365
2365
  "filePath": "merge-lanes.main.runtime.ts",
2366
- "line": 529,
2366
+ "line": 530,
2367
2367
  "character": 3
2368
2368
  },
2369
2369
  "type": "never[]"
@@ -2375,7 +2375,7 @@
2375
2375
  "__schema": "VariableLikeSchema",
2376
2376
  "location": {
2377
2377
  "filePath": "merge-lanes.main.runtime.ts",
2378
- "line": 530,
2378
+ "line": 531,
2379
2379
  "character": 3
2380
2380
  },
2381
2381
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2384,7 +2384,7 @@
2384
2384
  "__schema": "InferenceTypeSchema",
2385
2385
  "location": {
2386
2386
  "filePath": "merge-lanes.main.runtime.ts",
2387
- "line": 530,
2387
+ "line": 531,
2388
2388
  "character": 3
2389
2389
  },
2390
2390
  "type": "Aspect[]"
@@ -2396,7 +2396,7 @@
2396
2396
  "__schema": "VariableLikeSchema",
2397
2397
  "location": {
2398
2398
  "filePath": "merge-lanes.main.runtime.ts",
2399
- "line": 543,
2399
+ "line": 544,
2400
2400
  "character": 3
2401
2401
  },
2402
2402
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2405,7 +2405,7 @@
2405
2405
  "__schema": "InferenceTypeSchema",
2406
2406
  "location": {
2407
2407
  "filePath": "merge-lanes.main.runtime.ts",
2408
- "line": 543,
2408
+ "line": 544,
2409
2409
  "character": 3
2410
2410
  },
2411
2411
  "type": "RuntimeDefinition"
@@ -2417,7 +2417,7 @@
2417
2417
  "__schema": "FunctionLikeSchema",
2418
2418
  "location": {
2419
2419
  "filePath": "merge-lanes.main.runtime.ts",
2420
- "line": 545,
2420
+ "line": 546,
2421
2421
  "character": 3
2422
2422
  },
2423
2423
  "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 +2427,7 @@
2427
2427
  "__schema": "ParameterSchema",
2428
2428
  "location": {
2429
2429
  "filePath": "merge-lanes.main.runtime.ts",
2430
- "line": 545,
2430
+ "line": 546,
2431
2431
  "character": 25
2432
2432
  },
2433
2433
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2435,7 +2435,7 @@
2435
2435
  "__schema": "TupleTypeSchema",
2436
2436
  "location": {
2437
2437
  "filePath": "merge-lanes.main.runtime.ts",
2438
- "line": 557,
2438
+ "line": 558,
2439
2439
  "character": 6
2440
2440
  },
2441
2441
  "elements": [
@@ -2443,7 +2443,7 @@
2443
2443
  "__schema": "TypeRefSchema",
2444
2444
  "location": {
2445
2445
  "filePath": "merge-lanes.main.runtime.ts",
2446
- "line": 558,
2446
+ "line": 559,
2447
2447
  "character": 5
2448
2448
  },
2449
2449
  "name": "LanesMain"
@@ -2452,7 +2452,7 @@
2452
2452
  "__schema": "TypeRefSchema",
2453
2453
  "location": {
2454
2454
  "filePath": "merge-lanes.main.runtime.ts",
2455
- "line": 559,
2455
+ "line": 560,
2456
2456
  "character": 5
2457
2457
  },
2458
2458
  "name": "CLIMain"
@@ -2461,7 +2461,7 @@
2461
2461
  "__schema": "TypeRefSchema",
2462
2462
  "location": {
2463
2463
  "filePath": "merge-lanes.main.runtime.ts",
2464
- "line": 560,
2464
+ "line": 561,
2465
2465
  "character": 5
2466
2466
  },
2467
2467
  "name": "Workspace"
@@ -2470,7 +2470,7 @@
2470
2470
  "__schema": "TypeRefSchema",
2471
2471
  "location": {
2472
2472
  "filePath": "merge-lanes.main.runtime.ts",
2473
- "line": 561,
2473
+ "line": 562,
2474
2474
  "character": 5
2475
2475
  },
2476
2476
  "name": "MergingMain"
@@ -2479,7 +2479,7 @@
2479
2479
  "__schema": "TypeRefSchema",
2480
2480
  "location": {
2481
2481
  "filePath": "merge-lanes.main.runtime.ts",
2482
- "line": 562,
2482
+ "line": 563,
2483
2483
  "character": 5
2484
2484
  },
2485
2485
  "name": "LoggerMain"
@@ -2488,7 +2488,7 @@
2488
2488
  "__schema": "TypeRefSchema",
2489
2489
  "location": {
2490
2490
  "filePath": "merge-lanes.main.runtime.ts",
2491
- "line": 563,
2491
+ "line": 564,
2492
2492
  "character": 5
2493
2493
  },
2494
2494
  "name": "RemoveMain"
@@ -2497,7 +2497,7 @@
2497
2497
  "__schema": "TypeRefSchema",
2498
2498
  "location": {
2499
2499
  "filePath": "merge-lanes.main.runtime.ts",
2500
- "line": 564,
2500
+ "line": 565,
2501
2501
  "character": 5
2502
2502
  },
2503
2503
  "name": "ScopeMain"
@@ -2506,7 +2506,7 @@
2506
2506
  "__schema": "TypeRefSchema",
2507
2507
  "location": {
2508
2508
  "filePath": "merge-lanes.main.runtime.ts",
2509
- "line": 565,
2509
+ "line": 566,
2510
2510
  "character": 5
2511
2511
  },
2512
2512
  "name": "ExportMain"
@@ -2515,7 +2515,7 @@
2515
2515
  "__schema": "TypeRefSchema",
2516
2516
  "location": {
2517
2517
  "filePath": "merge-lanes.main.runtime.ts",
2518
- "line": 566,
2518
+ "line": 567,
2519
2519
  "character": 5
2520
2520
  },
2521
2521
  "name": "ImporterMain"
@@ -2524,7 +2524,7 @@
2524
2524
  "__schema": "TypeRefSchema",
2525
2525
  "location": {
2526
2526
  "filePath": "merge-lanes.main.runtime.ts",
2527
- "line": 567,
2527
+ "line": 568,
2528
2528
  "character": 5
2529
2529
  },
2530
2530
  "name": "CheckoutMain"
@@ -2533,7 +2533,7 @@
2533
2533
  "__schema": "TypeRefSchema",
2534
2534
  "location": {
2535
2535
  "filePath": "merge-lanes.main.runtime.ts",
2536
- "line": 568,
2536
+ "line": 569,
2537
2537
  "character": 5
2538
2538
  },
2539
2539
  "name": "GlobalConfigMain"
@@ -2548,7 +2548,7 @@
2548
2548
  "__schema": "InferenceTypeSchema",
2549
2549
  "location": {
2550
2550
  "filePath": "merge-lanes.main.runtime.ts",
2551
- "line": 545,
2551
+ "line": 546,
2552
2552
  "character": 3
2553
2553
  },
2554
2554
  "type": "Promise<MergeLanesMain>"
@@ -2566,7 +2566,7 @@
2566
2566
  "__schema": "UnImplementedSchema",
2567
2567
  "location": {
2568
2568
  "filePath": "merge-lanes.main.runtime.ts",
2569
- "line": 838,
2569
+ "line": 839,
2570
2570
  "character": 16
2571
2571
  },
2572
2572
  "name": "MergeLanesMain",
@@ -2578,7 +2578,7 @@
2578
2578
  "__schema": "FunctionLikeSchema",
2579
2579
  "location": {
2580
2580
  "filePath": "merge-lanes.main.runtime.ts",
2581
- "line": 590,
2581
+ "line": 591,
2582
2582
  "character": 1
2583
2583
  },
2584
2584
  "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -2588,7 +2588,7 @@
2588
2588
  "__schema": "ParameterSchema",
2589
2589
  "location": {
2590
2590
  "filePath": "merge-lanes.main.runtime.ts",
2591
- "line": 591,
2591
+ "line": 592,
2592
2592
  "character": 3
2593
2593
  },
2594
2594
  "name": "allComponentsStatus",
@@ -2596,14 +2596,14 @@
2596
2596
  "__schema": "TypeArraySchema",
2597
2597
  "location": {
2598
2598
  "filePath": "merge-lanes.main.runtime.ts",
2599
- "line": 591,
2599
+ "line": 592,
2600
2600
  "character": 24
2601
2601
  },
2602
2602
  "type": {
2603
2603
  "__schema": "TypeRefSchema",
2604
2604
  "location": {
2605
2605
  "filePath": "merge-lanes.main.runtime.ts",
2606
- "line": 591,
2606
+ "line": 592,
2607
2607
  "character": 24
2608
2608
  },
2609
2609
  "name": "ComponentMergeStatus"
@@ -2616,7 +2616,7 @@
2616
2616
  "__schema": "ParameterSchema",
2617
2617
  "location": {
2618
2618
  "filePath": "merge-lanes.main.runtime.ts",
2619
- "line": 592,
2619
+ "line": 593,
2620
2620
  "character": 3
2621
2621
  },
2622
2622
  "name": "compIdsToKeep",
@@ -2624,14 +2624,14 @@
2624
2624
  "__schema": "TypeArraySchema",
2625
2625
  "location": {
2626
2626
  "filePath": "merge-lanes.main.runtime.ts",
2627
- "line": 592,
2627
+ "line": 593,
2628
2628
  "character": 18
2629
2629
  },
2630
2630
  "type": {
2631
2631
  "__schema": "TypeRefSchema",
2632
2632
  "location": {
2633
2633
  "filePath": "merge-lanes.main.runtime.ts",
2634
- "line": 592,
2634
+ "line": 593,
2635
2635
  "character": 18
2636
2636
  },
2637
2637
  "name": "ComponentID"
@@ -2644,7 +2644,7 @@
2644
2644
  "__schema": "ParameterSchema",
2645
2645
  "location": {
2646
2646
  "filePath": "merge-lanes.main.runtime.ts",
2647
- "line": 593,
2647
+ "line": 594,
2648
2648
  "character": 3
2649
2649
  },
2650
2650
  "name": "allBitIds",
@@ -2652,14 +2652,14 @@
2652
2652
  "__schema": "TypeArraySchema",
2653
2653
  "location": {
2654
2654
  "filePath": "merge-lanes.main.runtime.ts",
2655
- "line": 593,
2655
+ "line": 594,
2656
2656
  "character": 14
2657
2657
  },
2658
2658
  "type": {
2659
2659
  "__schema": "TypeRefSchema",
2660
2660
  "location": {
2661
2661
  "filePath": "merge-lanes.main.runtime.ts",
2662
- "line": 593,
2662
+ "line": 594,
2663
2663
  "character": 14
2664
2664
  },
2665
2665
  "name": "ComponentID"
@@ -2672,7 +2672,7 @@
2672
2672
  "__schema": "ParameterSchema",
2673
2673
  "location": {
2674
2674
  "filePath": "merge-lanes.main.runtime.ts",
2675
- "line": 594,
2675
+ "line": 595,
2676
2676
  "character": 3
2677
2677
  },
2678
2678
  "name": "legacyScope",
@@ -2680,7 +2680,7 @@
2680
2680
  "__schema": "TypeRefSchema",
2681
2681
  "location": {
2682
2682
  "filePath": "merge-lanes.main.runtime.ts",
2683
- "line": 594,
2683
+ "line": 595,
2684
2684
  "character": 16
2685
2685
  },
2686
2686
  "name": "LegacyScope"
@@ -2692,7 +2692,7 @@
2692
2692
  "__schema": "ParameterSchema",
2693
2693
  "location": {
2694
2694
  "filePath": "merge-lanes.main.runtime.ts",
2695
- "line": 595,
2695
+ "line": 596,
2696
2696
  "character": 3
2697
2697
  },
2698
2698
  "name": "includeDeps",
@@ -2700,7 +2700,7 @@
2700
2700
  "__schema": "InferenceTypeSchema",
2701
2701
  "location": {
2702
2702
  "filePath": "merge-lanes.main.runtime.ts",
2703
- "line": 595,
2703
+ "line": 596,
2704
2704
  "character": 3
2705
2705
  },
2706
2706
  "type": "boolean"
@@ -2713,7 +2713,7 @@
2713
2713
  "__schema": "ParameterSchema",
2714
2714
  "location": {
2715
2715
  "filePath": "merge-lanes.main.runtime.ts",
2716
- "line": 596,
2716
+ "line": 597,
2717
2717
  "character": 3
2718
2718
  },
2719
2719
  "name": "otherLane",
@@ -2721,7 +2721,7 @@
2721
2721
  "__schema": "TypeRefSchema",
2722
2722
  "location": {
2723
2723
  "filePath": "merge-lanes.main.runtime.ts",
2724
- "line": 596,
2724
+ "line": 597,
2725
2725
  "character": 15
2726
2726
  },
2727
2727
  "name": "Lane"
@@ -2733,7 +2733,7 @@
2733
2733
  "__schema": "ParameterSchema",
2734
2734
  "location": {
2735
2735
  "filePath": "merge-lanes.main.runtime.ts",
2736
- "line": 597,
2736
+ "line": 598,
2737
2737
  "character": 3
2738
2738
  },
2739
2739
  "name": "shouldSquash",
@@ -2741,7 +2741,7 @@
2741
2741
  "__schema": "KeywordTypeSchema",
2742
2742
  "location": {
2743
2743
  "filePath": "merge-lanes.main.runtime.ts",
2744
- "line": 597,
2744
+ "line": 598,
2745
2745
  "character": 18
2746
2746
  },
2747
2747
  "name": "boolean"
@@ -2754,7 +2754,7 @@
2754
2754
  "__schema": "TypeRefSchema",
2755
2755
  "location": {
2756
2756
  "filePath": "merge-lanes.main.runtime.ts",
2757
- "line": 598,
2757
+ "line": 599,
2758
2758
  "character": 4
2759
2759
  },
2760
2760
  "name": "Promise",
@@ -2763,14 +2763,14 @@
2763
2763
  "__schema": "TypeArraySchema",
2764
2764
  "location": {
2765
2765
  "filePath": "merge-lanes.main.runtime.ts",
2766
- "line": 598,
2766
+ "line": 599,
2767
2767
  "character": 12
2768
2768
  },
2769
2769
  "type": {
2770
2770
  "__schema": "TypeRefSchema",
2771
2771
  "location": {
2772
2772
  "filePath": "merge-lanes.main.runtime.ts",
2773
- "line": 598,
2773
+ "line": 599,
2774
2774
  "character": 12
2775
2775
  },
2776
2776
  "name": "ComponentMergeStatus"
@@ -2786,7 +2786,7 @@
2786
2786
  "__schema": "FunctionLikeSchema",
2787
2787
  "location": {
2788
2788
  "filePath": "merge-lanes.main.runtime.ts",
2789
- "line": 707,
2789
+ "line": 708,
2790
2790
  "character": 1
2791
2791
  },
2792
2792
  "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
@@ -2796,7 +2796,7 @@
2796
2796
  "__schema": "ParameterSchema",
2797
2797
  "location": {
2798
2798
  "filePath": "merge-lanes.main.runtime.ts",
2799
- "line": 707,
2799
+ "line": 708,
2800
2800
  "character": 32
2801
2801
  },
2802
2802
  "name": "otherLaneId",
@@ -2804,7 +2804,7 @@
2804
2804
  "__schema": "TypeRefSchema",
2805
2805
  "location": {
2806
2806
  "filePath": "merge-lanes.main.runtime.ts",
2807
- "line": 707,
2807
+ "line": 708,
2808
2808
  "character": 45
2809
2809
  },
2810
2810
  "name": "LaneId"
@@ -2817,7 +2817,7 @@
2817
2817
  "__schema": "InferenceTypeSchema",
2818
2818
  "location": {
2819
2819
  "filePath": "merge-lanes.main.runtime.ts",
2820
- "line": 707,
2820
+ "line": 708,
2821
2821
  "character": 1
2822
2822
  },
2823
2823
  "type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
@@ -2830,7 +2830,7 @@
2830
2830
  "__schema": "FunctionLikeSchema",
2831
2831
  "location": {
2832
2832
  "filePath": "merge-lanes.main.runtime.ts",
2833
- "line": 716,
2833
+ "line": 717,
2834
2834
  "character": 1
2835
2835
  },
2836
2836
  "signature": "function squashSnaps(allComponentsStatus: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope): Promise<void>",
@@ -2840,7 +2840,7 @@
2840
2840
  "__schema": "ParameterSchema",
2841
2841
  "location": {
2842
2842
  "filePath": "merge-lanes.main.runtime.ts",
2843
- "line": 717,
2843
+ "line": 718,
2844
2844
  "character": 3
2845
2845
  },
2846
2846
  "name": "allComponentsStatus",
@@ -2848,14 +2848,14 @@
2848
2848
  "__schema": "TypeArraySchema",
2849
2849
  "location": {
2850
2850
  "filePath": "merge-lanes.main.runtime.ts",
2851
- "line": 717,
2851
+ "line": 718,
2852
2852
  "character": 24
2853
2853
  },
2854
2854
  "type": {
2855
2855
  "__schema": "TypeRefSchema",
2856
2856
  "location": {
2857
2857
  "filePath": "merge-lanes.main.runtime.ts",
2858
- "line": 717,
2858
+ "line": 718,
2859
2859
  "character": 24
2860
2860
  },
2861
2861
  "name": "ComponentMergeStatus"
@@ -2868,7 +2868,7 @@
2868
2868
  "__schema": "ParameterSchema",
2869
2869
  "location": {
2870
2870
  "filePath": "merge-lanes.main.runtime.ts",
2871
- "line": 718,
2871
+ "line": 719,
2872
2872
  "character": 3
2873
2873
  },
2874
2874
  "name": "currentLaneId",
@@ -2876,7 +2876,7 @@
2876
2876
  "__schema": "TypeRefSchema",
2877
2877
  "location": {
2878
2878
  "filePath": "merge-lanes.main.runtime.ts",
2879
- "line": 718,
2879
+ "line": 719,
2880
2880
  "character": 18
2881
2881
  },
2882
2882
  "name": "LaneId"
@@ -2888,7 +2888,7 @@
2888
2888
  "__schema": "ParameterSchema",
2889
2889
  "location": {
2890
2890
  "filePath": "merge-lanes.main.runtime.ts",
2891
- "line": 719,
2891
+ "line": 720,
2892
2892
  "character": 3
2893
2893
  },
2894
2894
  "name": "otherLaneId",
@@ -2896,7 +2896,7 @@
2896
2896
  "__schema": "TypeRefSchema",
2897
2897
  "location": {
2898
2898
  "filePath": "merge-lanes.main.runtime.ts",
2899
- "line": 719,
2899
+ "line": 720,
2900
2900
  "character": 16
2901
2901
  },
2902
2902
  "name": "LaneId"
@@ -2908,7 +2908,7 @@
2908
2908
  "__schema": "ParameterSchema",
2909
2909
  "location": {
2910
2910
  "filePath": "merge-lanes.main.runtime.ts",
2911
- "line": 720,
2911
+ "line": 721,
2912
2912
  "character": 3
2913
2913
  },
2914
2914
  "name": "scope",
@@ -2916,7 +2916,7 @@
2916
2916
  "__schema": "TypeRefSchema",
2917
2917
  "location": {
2918
2918
  "filePath": "merge-lanes.main.runtime.ts",
2919
- "line": 720,
2919
+ "line": 721,
2920
2920
  "character": 10
2921
2921
  },
2922
2922
  "name": "LegacyScope"
@@ -2929,7 +2929,7 @@
2929
2929
  "__schema": "InferenceTypeSchema",
2930
2930
  "location": {
2931
2931
  "filePath": "merge-lanes.main.runtime.ts",
2932
- "line": 716,
2932
+ "line": 717,
2933
2933
  "character": 1
2934
2934
  },
2935
2935
  "type": "Promise<void>"
@@ -2942,14 +2942,14 @@
2942
2942
  "__schema": "FunctionLikeSchema",
2943
2943
  "location": {
2944
2944
  "filePath": "merge-lanes.main.runtime.ts",
2945
- "line": 754,
2945
+ "line": 755,
2946
2946
  "character": 1
2947
2947
  },
2948
2948
  "doc": {
2949
2949
  "__schema": "DocSchema",
2950
2950
  "location": {
2951
2951
  "filePath": "merge-lanes.main.runtime.ts",
2952
- "line": 751,
2952
+ "line": 752,
2953
2953
  "character": 1
2954
2954
  },
2955
2955
  "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -2962,7 +2962,7 @@
2962
2962
  "__schema": "ParameterSchema",
2963
2963
  "location": {
2964
2964
  "filePath": "merge-lanes.main.runtime.ts",
2965
- "line": 755,
2965
+ "line": 756,
2966
2966
  "character": 3
2967
2967
  },
2968
2968
  "name": "currentLaneName",
@@ -2970,7 +2970,7 @@
2970
2970
  "__schema": "KeywordTypeSchema",
2971
2971
  "location": {
2972
2972
  "filePath": "merge-lanes.main.runtime.ts",
2973
- "line": 755,
2973
+ "line": 756,
2974
2974
  "character": 20
2975
2975
  },
2976
2976
  "name": "string"
@@ -2982,7 +2982,7 @@
2982
2982
  "__schema": "ParameterSchema",
2983
2983
  "location": {
2984
2984
  "filePath": "merge-lanes.main.runtime.ts",
2985
- "line": 756,
2985
+ "line": 757,
2986
2986
  "character": 3
2987
2987
  },
2988
2988
  "name": "otherLaneId",
@@ -2990,7 +2990,7 @@
2990
2990
  "__schema": "TypeRefSchema",
2991
2991
  "location": {
2992
2992
  "filePath": "merge-lanes.main.runtime.ts",
2993
- "line": 756,
2993
+ "line": 757,
2994
2994
  "character": 16
2995
2995
  },
2996
2996
  "name": "LaneId"
@@ -3002,7 +3002,7 @@
3002
3002
  "__schema": "ParameterSchema",
3003
3003
  "location": {
3004
3004
  "filePath": "merge-lanes.main.runtime.ts",
3005
- "line": 757,
3005
+ "line": 758,
3006
3006
  "character": 3
3007
3007
  },
3008
3008
  "name": "id",
@@ -3010,7 +3010,7 @@
3010
3010
  "__schema": "TypeRefSchema",
3011
3011
  "location": {
3012
3012
  "filePath": "merge-lanes.main.runtime.ts",
3013
- "line": 757,
3013
+ "line": 758,
3014
3014
  "character": 7
3015
3015
  },
3016
3016
  "name": "ComponentID"
@@ -3022,7 +3022,7 @@
3022
3022
  "__schema": "ParameterSchema",
3023
3023
  "location": {
3024
3024
  "filePath": "merge-lanes.main.runtime.ts",
3025
- "line": 758,
3025
+ "line": 759,
3026
3026
  "character": 3
3027
3027
  },
3028
3028
  "name": "divergeData",
@@ -3030,7 +3030,7 @@
3030
3030
  "__schema": "TypeRefSchema",
3031
3031
  "location": {
3032
3032
  "filePath": "merge-lanes.main.runtime.ts",
3033
- "line": 758,
3033
+ "line": 759,
3034
3034
  "character": 16
3035
3035
  },
3036
3036
  "name": "SnapsDistance"
@@ -3042,7 +3042,7 @@
3042
3042
  "__schema": "ParameterSchema",
3043
3043
  "location": {
3044
3044
  "filePath": "merge-lanes.main.runtime.ts",
3045
- "line": 759,
3045
+ "line": 760,
3046
3046
  "character": 3
3047
3047
  },
3048
3048
  "name": "log",
@@ -3050,7 +3050,7 @@
3050
3050
  "__schema": "TypeRefSchema",
3051
3051
  "location": {
3052
3052
  "filePath": "merge-lanes.main.runtime.ts",
3053
- "line": 759,
3053
+ "line": 760,
3054
3054
  "character": 8
3055
3055
  },
3056
3056
  "name": "Log"
@@ -3062,7 +3062,7 @@
3062
3062
  "__schema": "ParameterSchema",
3063
3063
  "location": {
3064
3064
  "filePath": "merge-lanes.main.runtime.ts",
3065
- "line": 760,
3065
+ "line": 761,
3066
3066
  "character": 3
3067
3067
  },
3068
3068
  "name": "scope",
@@ -3070,7 +3070,7 @@
3070
3070
  "__schema": "TypeRefSchema",
3071
3071
  "location": {
3072
3072
  "filePath": "merge-lanes.main.runtime.ts",
3073
- "line": 760,
3073
+ "line": 761,
3074
3074
  "character": 10
3075
3075
  },
3076
3076
  "name": "LegacyScope"
@@ -3082,7 +3082,7 @@
3082
3082
  "__schema": "ParameterSchema",
3083
3083
  "location": {
3084
3084
  "filePath": "merge-lanes.main.runtime.ts",
3085
- "line": 761,
3085
+ "line": 762,
3086
3086
  "character": 3
3087
3087
  },
3088
3088
  "name": "componentFromModel",
@@ -3090,7 +3090,7 @@
3090
3090
  "__schema": "TypeRefSchema",
3091
3091
  "location": {
3092
3092
  "filePath": "merge-lanes.main.runtime.ts",
3093
- "line": 761,
3093
+ "line": 762,
3094
3094
  "character": 24
3095
3095
  },
3096
3096
  "name": "Version"
@@ -3102,7 +3102,7 @@
3102
3102
  "__schema": "ParameterSchema",
3103
3103
  "location": {
3104
3104
  "filePath": "merge-lanes.main.runtime.ts",
3105
- "line": 762,
3105
+ "line": 763,
3106
3106
  "character": 3
3107
3107
  },
3108
3108
  "name": "messageTitle",
@@ -3110,7 +3110,7 @@
3110
3110
  "__schema": "KeywordTypeSchema",
3111
3111
  "location": {
3112
3112
  "filePath": "merge-lanes.main.runtime.ts",
3113
- "line": 762,
3113
+ "line": 763,
3114
3114
  "character": 18
3115
3115
  },
3116
3116
  "name": "string"
@@ -3123,7 +3123,7 @@
3123
3123
  "__schema": "TypeRefSchema",
3124
3124
  "location": {
3125
3125
  "filePath": "merge-lanes.main.runtime.ts",
3126
- "line": 763,
3126
+ "line": 764,
3127
3127
  "character": 4
3128
3128
  },
3129
3129
  "name": "Promise",
@@ -3132,7 +3132,7 @@
3132
3132
  "__schema": "TypeUnionSchema",
3133
3133
  "location": {
3134
3134
  "filePath": "merge-lanes.main.runtime.ts",
3135
- "line": 763,
3135
+ "line": 764,
3136
3136
  "character": 12
3137
3137
  },
3138
3138
  "types": [
@@ -3140,7 +3140,7 @@
3140
3140
  "__schema": "TypeRefSchema",
3141
3141
  "location": {
3142
3142
  "filePath": "merge-lanes.main.runtime.ts",
3143
- "line": 763,
3143
+ "line": 764,
3144
3144
  "character": 12
3145
3145
  },
3146
3146
  "name": "Version"
@@ -3149,7 +3149,7 @@
3149
3149
  "__schema": "KeywordTypeSchema",
3150
3150
  "location": {
3151
3151
  "filePath": "merge-lanes.main.runtime.ts",
3152
- "line": 763,
3152
+ "line": 764,
3153
3153
  "character": 22
3154
3154
  },
3155
3155
  "name": "undefined"
@@ -3166,7 +3166,7 @@
3166
3166
  "__schema": "UnImplementedSchema",
3167
3167
  "location": {
3168
3168
  "filePath": "merge-lanes.main.runtime.ts",
3169
- "line": 836,
3169
+ "line": 837,
3170
3170
  "character": 1
3171
3171
  },
3172
3172
  "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -3215,7 +3215,7 @@
3215
3215
  "componentId": {
3216
3216
  "scope": "teambit.lanes",
3217
3217
  "name": "merge-lanes",
3218
- "version": "1.0.169"
3218
+ "version": "1.0.171"
3219
3219
  },
3220
3220
  "taggedModuleExports": []
3221
3221
  }