@teambit/merge-lanes 1.0.487 → 1.0.489

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.
@@ -26,7 +26,7 @@
26
26
  "__schema": "ClassSchema",
27
27
  "location": {
28
28
  "filePath": "merge-lanes.main.runtime.ts",
29
- "line": 76,
29
+ "line": 74,
30
30
  "character": 1
31
31
  },
32
32
  "signature": "class MergeLanesMain",
@@ -36,7 +36,7 @@
36
36
  "__schema": "ConstructorSchema",
37
37
  "location": {
38
38
  "filePath": "merge-lanes.main.runtime.ts",
39
- "line": 77,
39
+ "line": 75,
40
40
  "character": 3
41
41
  },
42
42
  "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -46,7 +46,7 @@
46
46
  "__schema": "ParameterSchema",
47
47
  "location": {
48
48
  "filePath": "merge-lanes.main.runtime.ts",
49
- "line": 78,
49
+ "line": 76,
50
50
  "character": 5
51
51
  },
52
52
  "name": "workspace",
@@ -54,7 +54,7 @@
54
54
  "__schema": "TypeUnionSchema",
55
55
  "location": {
56
56
  "filePath": "merge-lanes.main.runtime.ts",
57
- "line": 78,
57
+ "line": 76,
58
58
  "character": 24
59
59
  },
60
60
  "types": [
@@ -62,16 +62,20 @@
62
62
  "__schema": "TypeRefSchema",
63
63
  "location": {
64
64
  "filePath": "merge-lanes.main.runtime.ts",
65
- "line": 78,
65
+ "line": 76,
66
66
  "character": 24
67
67
  },
68
- "name": "Workspace"
68
+ "name": "Workspace",
69
+ "componentId": {
70
+ "scope": "teambit.workspace",
71
+ "name": "workspace"
72
+ }
69
73
  },
70
74
  {
71
75
  "__schema": "KeywordTypeSchema",
72
76
  "location": {
73
77
  "filePath": "merge-lanes.main.runtime.ts",
74
- "line": 78,
78
+ "line": 76,
75
79
  "character": 36
76
80
  },
77
81
  "name": "undefined"
@@ -85,7 +89,7 @@
85
89
  "__schema": "ParameterSchema",
86
90
  "location": {
87
91
  "filePath": "merge-lanes.main.runtime.ts",
88
- "line": 79,
92
+ "line": 77,
89
93
  "character": 5
90
94
  },
91
95
  "name": "merging",
@@ -93,10 +97,14 @@
93
97
  "__schema": "TypeRefSchema",
94
98
  "location": {
95
99
  "filePath": "merge-lanes.main.runtime.ts",
96
- "line": 79,
100
+ "line": 77,
97
101
  "character": 22
98
102
  },
99
- "name": "MergingMain"
103
+ "name": "MergingMain",
104
+ "componentId": {
105
+ "scope": "teambit.component",
106
+ "name": "merging"
107
+ }
100
108
  },
101
109
  "isOptional": false,
102
110
  "isSpread": false
@@ -105,7 +113,7 @@
105
113
  "__schema": "ParameterSchema",
106
114
  "location": {
107
115
  "filePath": "merge-lanes.main.runtime.ts",
108
- "line": 80,
116
+ "line": 78,
109
117
  "character": 5
110
118
  },
111
119
  "name": "lanes",
@@ -113,10 +121,14 @@
113
121
  "__schema": "TypeRefSchema",
114
122
  "location": {
115
123
  "filePath": "merge-lanes.main.runtime.ts",
116
- "line": 80,
124
+ "line": 78,
117
125
  "character": 21
118
126
  },
119
- "name": "LanesMain"
127
+ "name": "LanesMain",
128
+ "componentId": {
129
+ "scope": "teambit.lanes",
130
+ "name": "lanes"
131
+ }
120
132
  },
121
133
  "isOptional": false,
122
134
  "isSpread": false
@@ -125,7 +137,7 @@
125
137
  "__schema": "ParameterSchema",
126
138
  "location": {
127
139
  "filePath": "merge-lanes.main.runtime.ts",
128
- "line": 81,
140
+ "line": 79,
129
141
  "character": 5
130
142
  },
131
143
  "name": "logger",
@@ -133,10 +145,14 @@
133
145
  "__schema": "TypeRefSchema",
134
146
  "location": {
135
147
  "filePath": "merge-lanes.main.runtime.ts",
136
- "line": 81,
148
+ "line": 79,
137
149
  "character": 22
138
150
  },
139
- "name": "Logger"
151
+ "name": "Logger",
152
+ "componentId": {
153
+ "scope": "teambit.harmony",
154
+ "name": "logger"
155
+ }
140
156
  },
141
157
  "isOptional": false,
142
158
  "isSpread": false
@@ -145,7 +161,7 @@
145
161
  "__schema": "ParameterSchema",
146
162
  "location": {
147
163
  "filePath": "merge-lanes.main.runtime.ts",
148
- "line": 82,
164
+ "line": 80,
149
165
  "character": 5
150
166
  },
151
167
  "name": "remove",
@@ -153,10 +169,14 @@
153
169
  "__schema": "TypeRefSchema",
154
170
  "location": {
155
171
  "filePath": "merge-lanes.main.runtime.ts",
156
- "line": 82,
172
+ "line": 80,
157
173
  "character": 21
158
174
  },
159
- "name": "RemoveMain"
175
+ "name": "RemoveMain",
176
+ "componentId": {
177
+ "scope": "teambit.component",
178
+ "name": "remove"
179
+ }
160
180
  },
161
181
  "isOptional": false,
162
182
  "isSpread": false
@@ -165,7 +185,7 @@
165
185
  "__schema": "ParameterSchema",
166
186
  "location": {
167
187
  "filePath": "merge-lanes.main.runtime.ts",
168
- "line": 83,
188
+ "line": 81,
169
189
  "character": 5
170
190
  },
171
191
  "name": "scope",
@@ -173,10 +193,14 @@
173
193
  "__schema": "TypeRefSchema",
174
194
  "location": {
175
195
  "filePath": "merge-lanes.main.runtime.ts",
176
- "line": 83,
196
+ "line": 81,
177
197
  "character": 20
178
198
  },
179
- "name": "ScopeMain"
199
+ "name": "ScopeMain",
200
+ "componentId": {
201
+ "scope": "teambit.scope",
202
+ "name": "scope"
203
+ }
180
204
  },
181
205
  "isOptional": false,
182
206
  "isSpread": false
@@ -185,7 +209,7 @@
185
209
  "__schema": "ParameterSchema",
186
210
  "location": {
187
211
  "filePath": "merge-lanes.main.runtime.ts",
188
- "line": 84,
212
+ "line": 82,
189
213
  "character": 5
190
214
  },
191
215
  "name": "exporter",
@@ -193,10 +217,14 @@
193
217
  "__schema": "TypeRefSchema",
194
218
  "location": {
195
219
  "filePath": "merge-lanes.main.runtime.ts",
196
- "line": 84,
220
+ "line": 82,
197
221
  "character": 23
198
222
  },
199
- "name": "ExportMain"
223
+ "name": "ExportMain",
224
+ "componentId": {
225
+ "scope": "teambit.scope",
226
+ "name": "export"
227
+ }
200
228
  },
201
229
  "isOptional": false,
202
230
  "isSpread": false
@@ -205,7 +233,7 @@
205
233
  "__schema": "ParameterSchema",
206
234
  "location": {
207
235
  "filePath": "merge-lanes.main.runtime.ts",
208
- "line": 85,
236
+ "line": 83,
209
237
  "character": 5
210
238
  },
211
239
  "name": "importer",
@@ -213,10 +241,14 @@
213
241
  "__schema": "TypeRefSchema",
214
242
  "location": {
215
243
  "filePath": "merge-lanes.main.runtime.ts",
216
- "line": 85,
244
+ "line": 83,
217
245
  "character": 23
218
246
  },
219
- "name": "ImporterMain"
247
+ "name": "ImporterMain",
248
+ "componentId": {
249
+ "scope": "teambit.scope",
250
+ "name": "importer"
251
+ }
220
252
  },
221
253
  "isOptional": false,
222
254
  "isSpread": false
@@ -225,7 +257,7 @@
225
257
  "__schema": "ParameterSchema",
226
258
  "location": {
227
259
  "filePath": "merge-lanes.main.runtime.ts",
228
- "line": 86,
260
+ "line": 84,
229
261
  "character": 5
230
262
  },
231
263
  "name": "checkout",
@@ -233,10 +265,14 @@
233
265
  "__schema": "TypeRefSchema",
234
266
  "location": {
235
267
  "filePath": "merge-lanes.main.runtime.ts",
236
- "line": 86,
268
+ "line": 84,
237
269
  "character": 23
238
270
  },
239
- "name": "CheckoutMain"
271
+ "name": "CheckoutMain",
272
+ "componentId": {
273
+ "scope": "teambit.component",
274
+ "name": "checkout"
275
+ }
240
276
  },
241
277
  "isOptional": false,
242
278
  "isSpread": false
@@ -246,7 +282,7 @@
246
282
  "__schema": "ThisTypeSchema",
247
283
  "location": {
248
284
  "filePath": "merge-lanes.main.runtime.ts",
249
- "line": 76,
285
+ "line": 74,
250
286
  "character": 1
251
287
  },
252
288
  "name": "MergeLanesMain"
@@ -257,7 +293,7 @@
257
293
  "__schema": "FunctionLikeSchema",
258
294
  "location": {
259
295
  "filePath": "merge-lanes.main.runtime.ts",
260
- "line": 89,
296
+ "line": 87,
261
297
  "character": 3
262
298
  },
263
299
  "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
@@ -267,7 +303,7 @@
267
303
  "__schema": "ParameterSchema",
268
304
  "location": {
269
305
  "filePath": "merge-lanes.main.runtime.ts",
270
- "line": 89,
306
+ "line": 87,
271
307
  "character": 24
272
308
  },
273
309
  "name": "laneName",
@@ -275,7 +311,7 @@
275
311
  "__schema": "KeywordTypeSchema",
276
312
  "location": {
277
313
  "filePath": "merge-lanes.main.runtime.ts",
278
- "line": 89,
314
+ "line": 87,
279
315
  "character": 34
280
316
  },
281
317
  "name": "string"
@@ -287,7 +323,7 @@
287
323
  "__schema": "ParameterSchema",
288
324
  "location": {
289
325
  "filePath": "merge-lanes.main.runtime.ts",
290
- "line": 89,
326
+ "line": 87,
291
327
  "character": 42
292
328
  },
293
329
  "name": "options",
@@ -295,10 +331,11 @@
295
331
  "__schema": "TypeRefSchema",
296
332
  "location": {
297
333
  "filePath": "merge-lanes.main.runtime.ts",
298
- "line": 89,
334
+ "line": 87,
299
335
  "character": 51
300
336
  },
301
- "name": "MergeLaneOptions"
337
+ "name": "MergeLaneOptions",
338
+ "internalFilePath": "merge-lanes.main.runtime.ts"
302
339
  },
303
340
  "isOptional": false,
304
341
  "isSpread": false
@@ -308,7 +345,7 @@
308
345
  "__schema": "InferenceTypeSchema",
309
346
  "location": {
310
347
  "filePath": "merge-lanes.main.runtime.ts",
311
- "line": 89,
348
+ "line": 87,
312
349
  "character": 3
313
350
  },
314
351
  "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
@@ -321,7 +358,7 @@
321
358
  "__schema": "FunctionLikeSchema",
322
359
  "location": {
323
360
  "filePath": "merge-lanes.main.runtime.ts",
324
- "line": 99,
361
+ "line": 97,
325
362
  "character": 3
326
363
  },
327
364
  "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
@@ -331,7 +368,7 @@
331
368
  "__schema": "ParameterSchema",
332
369
  "location": {
333
370
  "filePath": "merge-lanes.main.runtime.ts",
334
- "line": 100,
371
+ "line": 98,
335
372
  "character": 5
336
373
  },
337
374
  "name": "otherLaneId",
@@ -339,10 +376,15 @@
339
376
  "__schema": "TypeRefSchema",
340
377
  "location": {
341
378
  "filePath": "merge-lanes.main.runtime.ts",
342
- "line": 100,
379
+ "line": 98,
343
380
  "character": 18
344
381
  },
345
- "name": "LaneId"
382
+ "name": "LaneId",
383
+ "componentId": {
384
+ "scope": "teambit.lanes",
385
+ "name": "lane-id",
386
+ "version": "0.0.311"
387
+ }
346
388
  },
347
389
  "isOptional": false,
348
390
  "isSpread": false
@@ -351,7 +393,7 @@
351
393
  "__schema": "ParameterSchema",
352
394
  "location": {
353
395
  "filePath": "merge-lanes.main.runtime.ts",
354
- "line": 101,
396
+ "line": 99,
355
397
  "character": 5
356
398
  },
357
399
  "name": "currentLaneId",
@@ -359,10 +401,15 @@
359
401
  "__schema": "TypeRefSchema",
360
402
  "location": {
361
403
  "filePath": "merge-lanes.main.runtime.ts",
362
- "line": 101,
404
+ "line": 99,
363
405
  "character": 20
364
406
  },
365
- "name": "LaneId"
407
+ "name": "LaneId",
408
+ "componentId": {
409
+ "scope": "teambit.lanes",
410
+ "name": "lane-id",
411
+ "version": "0.0.311"
412
+ }
366
413
  },
367
414
  "isOptional": false,
368
415
  "isSpread": false
@@ -371,7 +418,7 @@
371
418
  "__schema": "ParameterSchema",
372
419
  "location": {
373
420
  "filePath": "merge-lanes.main.runtime.ts",
374
- "line": 102,
421
+ "line": 100,
375
422
  "character": 5
376
423
  },
377
424
  "name": "options",
@@ -379,10 +426,11 @@
379
426
  "__schema": "TypeRefSchema",
380
427
  "location": {
381
428
  "filePath": "merge-lanes.main.runtime.ts",
382
- "line": 102,
429
+ "line": 100,
383
430
  "character": 14
384
431
  },
385
- "name": "MergeLaneOptions"
432
+ "name": "MergeLaneOptions",
433
+ "internalFilePath": "merge-lanes.main.runtime.ts"
386
434
  },
387
435
  "isOptional": false,
388
436
  "isSpread": false
@@ -392,7 +440,7 @@
392
440
  "__schema": "TypeRefSchema",
393
441
  "location": {
394
442
  "filePath": "merge-lanes.main.runtime.ts",
395
- "line": 103,
443
+ "line": 101,
396
444
  "character": 6
397
445
  },
398
446
  "name": "Promise",
@@ -401,7 +449,7 @@
401
449
  "__schema": "TypeLiteralSchema",
402
450
  "location": {
403
451
  "filePath": "merge-lanes.main.runtime.ts",
404
- "line": 103,
452
+ "line": 101,
405
453
  "character": 14
406
454
  },
407
455
  "members": [
@@ -409,7 +457,7 @@
409
457
  "__schema": "VariableLikeSchema",
410
458
  "location": {
411
459
  "filePath": "merge-lanes.main.runtime.ts",
412
- "line": 104,
460
+ "line": 102,
413
461
  "character": 5
414
462
  },
415
463
  "signature": "(property) mergeResults: ApplyVersionResults",
@@ -418,7 +466,7 @@
418
466
  "__schema": "TypeRefSchema",
419
467
  "location": {
420
468
  "filePath": "merge-lanes.main.runtime.ts",
421
- "line": 104,
469
+ "line": 102,
422
470
  "character": 5
423
471
  },
424
472
  "name": "ApplyVersionResults",
@@ -433,7 +481,7 @@
433
481
  "__schema": "VariableLikeSchema",
434
482
  "location": {
435
483
  "filePath": "merge-lanes.main.runtime.ts",
436
- "line": 105,
484
+ "line": 103,
437
485
  "character": 5
438
486
  },
439
487
  "signature": "(property) deleteResults: any",
@@ -442,7 +490,7 @@
442
490
  "__schema": "KeywordTypeSchema",
443
491
  "location": {
444
492
  "filePath": "merge-lanes.main.runtime.ts",
445
- "line": 105,
493
+ "line": 103,
446
494
  "character": 20
447
495
  },
448
496
  "name": "any"
@@ -453,7 +501,7 @@
453
501
  "__schema": "VariableLikeSchema",
454
502
  "location": {
455
503
  "filePath": "merge-lanes.main.runtime.ts",
456
- "line": 106,
504
+ "line": 104,
457
505
  "character": 5
458
506
  },
459
507
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -462,17 +510,21 @@
462
510
  "__schema": "TypeArraySchema",
463
511
  "location": {
464
512
  "filePath": "merge-lanes.main.runtime.ts",
465
- "line": 106,
513
+ "line": 104,
466
514
  "character": 25
467
515
  },
468
516
  "type": {
469
517
  "__schema": "TypeRefSchema",
470
518
  "location": {
471
519
  "filePath": "merge-lanes.main.runtime.ts",
472
- "line": 106,
520
+ "line": 104,
473
521
  "character": 25
474
522
  },
475
- "name": "ConfigMergeResult"
523
+ "name": "ConfigMergeResult",
524
+ "componentId": {
525
+ "scope": "teambit.workspace",
526
+ "name": "config-merger"
527
+ }
476
528
  }
477
529
  },
478
530
  "isOptional": false
@@ -481,7 +533,7 @@
481
533
  "__schema": "VariableLikeSchema",
482
534
  "location": {
483
535
  "filePath": "merge-lanes.main.runtime.ts",
484
- "line": 107,
536
+ "line": 105,
485
537
  "character": 5
486
538
  },
487
539
  "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
@@ -490,17 +542,22 @@
490
542
  "__schema": "TypeArraySchema",
491
543
  "location": {
492
544
  "filePath": "merge-lanes.main.runtime.ts",
493
- "line": 107,
545
+ "line": 105,
494
546
  "character": 28
495
547
  },
496
548
  "type": {
497
549
  "__schema": "TypeRefSchema",
498
550
  "location": {
499
551
  "filePath": "merge-lanes.main.runtime.ts",
500
- "line": 107,
552
+ "line": 105,
501
553
  "character": 28
502
554
  },
503
- "name": "ComponentID"
555
+ "name": "ComponentID",
556
+ "componentId": {
557
+ "scope": "teambit.component",
558
+ "name": "component-id",
559
+ "version": "1.2.2"
560
+ }
504
561
  }
505
562
  },
506
563
  "isOptional": false
@@ -509,7 +566,7 @@
509
566
  "__schema": "VariableLikeSchema",
510
567
  "location": {
511
568
  "filePath": "merge-lanes.main.runtime.ts",
512
- "line": 108,
569
+ "line": 106,
513
570
  "character": 5
514
571
  },
515
572
  "signature": "(property) conflicts: ConflictPerId[]",
@@ -518,17 +575,18 @@
518
575
  "__schema": "TypeArraySchema",
519
576
  "location": {
520
577
  "filePath": "merge-lanes.main.runtime.ts",
521
- "line": 108,
578
+ "line": 106,
522
579
  "character": 16
523
580
  },
524
581
  "type": {
525
582
  "__schema": "TypeRefSchema",
526
583
  "location": {
527
584
  "filePath": "merge-lanes.main.runtime.ts",
528
- "line": 108,
585
+ "line": 106,
529
586
  "character": 16
530
587
  },
531
- "name": "ConflictPerId"
588
+ "name": "ConflictPerId",
589
+ "internalFilePath": "merge-lanes.main.runtime.ts"
532
590
  }
533
591
  },
534
592
  "isOptional": false
@@ -545,7 +603,7 @@
545
603
  "__schema": "FunctionLikeSchema",
546
604
  "location": {
547
605
  "filePath": "merge-lanes.main.runtime.ts",
548
- "line": 324,
606
+ "line": 322,
549
607
  "character": 3
550
608
  },
551
609
  "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
@@ -555,7 +613,7 @@
555
613
  "__schema": "ParameterSchema",
556
614
  "location": {
557
615
  "filePath": "merge-lanes.main.runtime.ts",
558
- "line": 324,
616
+ "line": 322,
559
617
  "character": 19
560
618
  },
561
619
  "name": "newLaneName",
@@ -563,7 +621,7 @@
563
621
  "__schema": "KeywordTypeSchema",
564
622
  "location": {
565
623
  "filePath": "merge-lanes.main.runtime.ts",
566
- "line": 324,
624
+ "line": 322,
567
625
  "character": 32
568
626
  },
569
627
  "name": "string"
@@ -575,7 +633,7 @@
575
633
  "__schema": "ParameterSchema",
576
634
  "location": {
577
635
  "filePath": "merge-lanes.main.runtime.ts",
578
- "line": 324,
636
+ "line": 322,
579
637
  "character": 40
580
638
  },
581
639
  "name": "options",
@@ -583,7 +641,7 @@
583
641
  "__schema": "TypeLiteralSchema",
584
642
  "location": {
585
643
  "filePath": "merge-lanes.main.runtime.ts",
586
- "line": 324,
644
+ "line": 322,
587
645
  "character": 49
588
646
  },
589
647
  "members": [
@@ -591,7 +649,7 @@
591
649
  "__schema": "VariableLikeSchema",
592
650
  "location": {
593
651
  "filePath": "merge-lanes.main.runtime.ts",
594
- "line": 324,
652
+ "line": 322,
595
653
  "character": 51
596
654
  },
597
655
  "signature": "(property) scope?: string | undefined",
@@ -600,7 +658,7 @@
600
658
  "__schema": "KeywordTypeSchema",
601
659
  "location": {
602
660
  "filePath": "merge-lanes.main.runtime.ts",
603
- "line": 324,
661
+ "line": 322,
604
662
  "character": 59
605
663
  },
606
664
  "name": "string"
@@ -617,7 +675,7 @@
617
675
  "__schema": "InferenceTypeSchema",
618
676
  "location": {
619
677
  "filePath": "merge-lanes.main.runtime.ts",
620
- "line": 324,
678
+ "line": 322,
621
679
  "character": 3
622
680
  },
623
681
  "type": "Promise<CreateLaneResult>"
@@ -630,7 +688,7 @@
630
688
  "__schema": "FunctionLikeSchema",
631
689
  "location": {
632
690
  "filePath": "merge-lanes.main.runtime.ts",
633
- "line": 332,
691
+ "line": 330,
634
692
  "character": 3
635
693
  },
636
694
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -640,7 +698,7 @@
640
698
  "__schema": "ParameterSchema",
641
699
  "location": {
642
700
  "filePath": "merge-lanes.main.runtime.ts",
643
- "line": 332,
701
+ "line": 330,
644
702
  "character": 24
645
703
  },
646
704
  "name": "checkoutProps",
@@ -648,10 +706,14 @@
648
706
  "__schema": "TypeRefSchema",
649
707
  "location": {
650
708
  "filePath": "merge-lanes.main.runtime.ts",
651
- "line": 332,
709
+ "line": 330,
652
710
  "character": 39
653
711
  },
654
- "name": "CheckoutProps"
712
+ "name": "CheckoutProps",
713
+ "componentId": {
714
+ "scope": "teambit.component",
715
+ "name": "checkout"
716
+ }
655
717
  },
656
718
  "isOptional": false,
657
719
  "isSpread": false
@@ -660,7 +722,7 @@
660
722
  "__schema": "ParameterSchema",
661
723
  "location": {
662
724
  "filePath": "merge-lanes.main.runtime.ts",
663
- "line": 332,
725
+ "line": 330,
664
726
  "character": 54
665
727
  },
666
728
  "name": "mergeAbortOpts",
@@ -668,10 +730,11 @@
668
730
  "__schema": "TypeRefSchema",
669
731
  "location": {
670
732
  "filePath": "merge-lanes.main.runtime.ts",
671
- "line": 332,
733
+ "line": 330,
672
734
  "character": 70
673
735
  },
674
- "name": "MergeAbortOpts"
736
+ "name": "MergeAbortOpts",
737
+ "internalFilePath": "merge-abort.cmd.ts"
675
738
  },
676
739
  "isOptional": false,
677
740
  "isSpread": false
@@ -681,7 +744,7 @@
681
744
  "__schema": "InferenceTypeSchema",
682
745
  "location": {
683
746
  "filePath": "merge-lanes.main.runtime.ts",
684
- "line": 332,
747
+ "line": 330,
685
748
  "character": 3
686
749
  },
687
750
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -694,7 +757,7 @@
694
757
  "__schema": "FunctionLikeSchema",
695
758
  "location": {
696
759
  "filePath": "merge-lanes.main.runtime.ts",
697
- "line": 388,
760
+ "line": 386,
698
761
  "character": 3
699
762
  },
700
763
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -704,7 +767,7 @@
704
767
  "__schema": "ParameterSchema",
705
768
  "location": {
706
769
  "filePath": "merge-lanes.main.runtime.ts",
707
- "line": 389,
770
+ "line": 387,
708
771
  "character": 5
709
772
  },
710
773
  "name": "fromLane",
@@ -712,7 +775,7 @@
712
775
  "__schema": "KeywordTypeSchema",
713
776
  "location": {
714
777
  "filePath": "merge-lanes.main.runtime.ts",
715
- "line": 389,
778
+ "line": 387,
716
779
  "character": 15
717
780
  },
718
781
  "name": "string"
@@ -724,7 +787,7 @@
724
787
  "__schema": "ParameterSchema",
725
788
  "location": {
726
789
  "filePath": "merge-lanes.main.runtime.ts",
727
- "line": 390,
790
+ "line": 388,
728
791
  "character": 5
729
792
  },
730
793
  "name": "toLane",
@@ -732,7 +795,7 @@
732
795
  "__schema": "KeywordTypeSchema",
733
796
  "location": {
734
797
  "filePath": "merge-lanes.main.runtime.ts",
735
- "line": 390,
798
+ "line": 388,
736
799
  "character": 13
737
800
  },
738
801
  "name": "string"
@@ -744,7 +807,7 @@
744
807
  "__schema": "ParameterSchema",
745
808
  "location": {
746
809
  "filePath": "merge-lanes.main.runtime.ts",
747
- "line": 391,
810
+ "line": 389,
748
811
  "character": 5
749
812
  },
750
813
  "name": "options",
@@ -752,7 +815,7 @@
752
815
  "__schema": "TypeIntersectionSchema",
753
816
  "location": {
754
817
  "filePath": "merge-lanes.main.runtime.ts",
755
- "line": 391,
818
+ "line": 389,
756
819
  "character": 14
757
820
  },
758
821
  "types": [
@@ -760,7 +823,7 @@
760
823
  "__schema": "TypeRefSchema",
761
824
  "location": {
762
825
  "filePath": "merge-lanes.main.runtime.ts",
763
- "line": 391,
826
+ "line": 389,
764
827
  "character": 14
765
828
  },
766
829
  "name": "Partial",
@@ -769,10 +832,11 @@
769
832
  "__schema": "TypeRefSchema",
770
833
  "location": {
771
834
  "filePath": "merge-lanes.main.runtime.ts",
772
- "line": 391,
835
+ "line": 389,
773
836
  "character": 22
774
837
  },
775
- "name": "MergeLaneOptions"
838
+ "name": "MergeLaneOptions",
839
+ "internalFilePath": "merge-lanes.main.runtime.ts"
776
840
  }
777
841
  ]
778
842
  },
@@ -780,7 +844,7 @@
780
844
  "__schema": "TypeLiteralSchema",
781
845
  "location": {
782
846
  "filePath": "merge-lanes.main.runtime.ts",
783
- "line": 391,
847
+ "line": 389,
784
848
  "character": 42
785
849
  },
786
850
  "members": [
@@ -788,7 +852,7 @@
788
852
  "__schema": "VariableLikeSchema",
789
853
  "location": {
790
854
  "filePath": "merge-lanes.main.runtime.ts",
791
- "line": 391,
855
+ "line": 389,
792
856
  "character": 44
793
857
  },
794
858
  "signature": "(property) push?: boolean | undefined",
@@ -797,7 +861,7 @@
797
861
  "__schema": "KeywordTypeSchema",
798
862
  "location": {
799
863
  "filePath": "merge-lanes.main.runtime.ts",
800
- "line": 391,
864
+ "line": 389,
801
865
  "character": 51
802
866
  },
803
867
  "name": "boolean"
@@ -808,7 +872,7 @@
808
872
  "__schema": "VariableLikeSchema",
809
873
  "location": {
810
874
  "filePath": "merge-lanes.main.runtime.ts",
811
- "line": 391,
875
+ "line": 389,
812
876
  "character": 60
813
877
  },
814
878
  "signature": "(property) reMerge?: boolean | undefined",
@@ -817,7 +881,7 @@
817
881
  "__schema": "KeywordTypeSchema",
818
882
  "location": {
819
883
  "filePath": "merge-lanes.main.runtime.ts",
820
- "line": 391,
884
+ "line": 389,
821
885
  "character": 70
822
886
  },
823
887
  "name": "boolean"
@@ -836,7 +900,7 @@
836
900
  "__schema": "TypeRefSchema",
837
901
  "location": {
838
902
  "filePath": "merge-lanes.main.runtime.ts",
839
- "line": 392,
903
+ "line": 390,
840
904
  "character": 6
841
905
  },
842
906
  "name": "Promise",
@@ -845,10 +909,11 @@
845
909
  "__schema": "TypeRefSchema",
846
910
  "location": {
847
911
  "filePath": "merge-lanes.main.runtime.ts",
848
- "line": 392,
912
+ "line": 390,
849
913
  "character": 14
850
914
  },
851
- "name": "MergeFromScopeResult"
915
+ "name": "MergeFromScopeResult",
916
+ "internalFilePath": "merge-lanes.main.runtime.ts"
852
917
  }
853
918
  ]
854
919
  },
@@ -860,7 +925,7 @@
860
925
  "__schema": "VariableLikeSchema",
861
926
  "location": {
862
927
  "filePath": "merge-lanes.main.runtime.ts",
863
- "line": 485,
928
+ "line": 483,
864
929
  "character": 3
865
930
  },
866
931
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -869,7 +934,7 @@
869
934
  "__schema": "InferenceTypeSchema",
870
935
  "location": {
871
936
  "filePath": "merge-lanes.main.runtime.ts",
872
- "line": 485,
937
+ "line": 483,
873
938
  "character": 3
874
939
  },
875
940
  "type": "never[]"
@@ -881,7 +946,7 @@
881
946
  "__schema": "VariableLikeSchema",
882
947
  "location": {
883
948
  "filePath": "merge-lanes.main.runtime.ts",
884
- "line": 486,
949
+ "line": 484,
885
950
  "character": 3
886
951
  },
887
952
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -890,7 +955,7 @@
890
955
  "__schema": "InferenceTypeSchema",
891
956
  "location": {
892
957
  "filePath": "merge-lanes.main.runtime.ts",
893
- "line": 486,
958
+ "line": 484,
894
959
  "character": 3
895
960
  },
896
961
  "type": "Aspect[]"
@@ -902,7 +967,7 @@
902
967
  "__schema": "VariableLikeSchema",
903
968
  "location": {
904
969
  "filePath": "merge-lanes.main.runtime.ts",
905
- "line": 499,
970
+ "line": 497,
906
971
  "character": 3
907
972
  },
908
973
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -911,7 +976,7 @@
911
976
  "__schema": "InferenceTypeSchema",
912
977
  "location": {
913
978
  "filePath": "merge-lanes.main.runtime.ts",
914
- "line": 499,
979
+ "line": 497,
915
980
  "character": 3
916
981
  },
917
982
  "type": "RuntimeDefinition"
@@ -923,7 +988,7 @@
923
988
  "__schema": "FunctionLikeSchema",
924
989
  "location": {
925
990
  "filePath": "merge-lanes.main.runtime.ts",
926
- "line": 501,
991
+ "line": 499,
927
992
  "character": 3
928
993
  },
929
994
  "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>",
@@ -933,7 +998,7 @@
933
998
  "__schema": "ParameterSchema",
934
999
  "location": {
935
1000
  "filePath": "merge-lanes.main.runtime.ts",
936
- "line": 501,
1001
+ "line": 499,
937
1002
  "character": 25
938
1003
  },
939
1004
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -941,7 +1006,7 @@
941
1006
  "__schema": "TupleTypeSchema",
942
1007
  "location": {
943
1008
  "filePath": "merge-lanes.main.runtime.ts",
944
- "line": 513,
1009
+ "line": 511,
945
1010
  "character": 6
946
1011
  },
947
1012
  "elements": [
@@ -949,100 +1014,144 @@
949
1014
  "__schema": "TypeRefSchema",
950
1015
  "location": {
951
1016
  "filePath": "merge-lanes.main.runtime.ts",
952
- "line": 514,
1017
+ "line": 512,
953
1018
  "character": 5
954
1019
  },
955
- "name": "LanesMain"
1020
+ "name": "LanesMain",
1021
+ "componentId": {
1022
+ "scope": "teambit.lanes",
1023
+ "name": "lanes"
1024
+ }
956
1025
  },
957
1026
  {
958
1027
  "__schema": "TypeRefSchema",
959
1028
  "location": {
960
1029
  "filePath": "merge-lanes.main.runtime.ts",
961
- "line": 515,
1030
+ "line": 513,
962
1031
  "character": 5
963
1032
  },
964
- "name": "CLIMain"
1033
+ "name": "CLIMain",
1034
+ "componentId": {
1035
+ "scope": "teambit.harmony",
1036
+ "name": "cli"
1037
+ }
965
1038
  },
966
1039
  {
967
1040
  "__schema": "TypeRefSchema",
968
1041
  "location": {
969
1042
  "filePath": "merge-lanes.main.runtime.ts",
970
- "line": 516,
1043
+ "line": 514,
971
1044
  "character": 5
972
1045
  },
973
- "name": "Workspace"
1046
+ "name": "Workspace",
1047
+ "componentId": {
1048
+ "scope": "teambit.workspace",
1049
+ "name": "workspace"
1050
+ }
974
1051
  },
975
1052
  {
976
1053
  "__schema": "TypeRefSchema",
977
1054
  "location": {
978
1055
  "filePath": "merge-lanes.main.runtime.ts",
979
- "line": 517,
1056
+ "line": 515,
980
1057
  "character": 5
981
1058
  },
982
- "name": "MergingMain"
1059
+ "name": "MergingMain",
1060
+ "componentId": {
1061
+ "scope": "teambit.component",
1062
+ "name": "merging"
1063
+ }
983
1064
  },
984
1065
  {
985
1066
  "__schema": "TypeRefSchema",
986
1067
  "location": {
987
1068
  "filePath": "merge-lanes.main.runtime.ts",
988
- "line": 518,
1069
+ "line": 516,
989
1070
  "character": 5
990
1071
  },
991
- "name": "LoggerMain"
1072
+ "name": "LoggerMain",
1073
+ "componentId": {
1074
+ "scope": "teambit.harmony",
1075
+ "name": "logger"
1076
+ }
992
1077
  },
993
1078
  {
994
1079
  "__schema": "TypeRefSchema",
995
1080
  "location": {
996
1081
  "filePath": "merge-lanes.main.runtime.ts",
997
- "line": 519,
1082
+ "line": 517,
998
1083
  "character": 5
999
1084
  },
1000
- "name": "RemoveMain"
1085
+ "name": "RemoveMain",
1086
+ "componentId": {
1087
+ "scope": "teambit.component",
1088
+ "name": "remove"
1089
+ }
1001
1090
  },
1002
1091
  {
1003
1092
  "__schema": "TypeRefSchema",
1004
1093
  "location": {
1005
1094
  "filePath": "merge-lanes.main.runtime.ts",
1006
- "line": 520,
1095
+ "line": 518,
1007
1096
  "character": 5
1008
1097
  },
1009
- "name": "ScopeMain"
1098
+ "name": "ScopeMain",
1099
+ "componentId": {
1100
+ "scope": "teambit.scope",
1101
+ "name": "scope"
1102
+ }
1010
1103
  },
1011
1104
  {
1012
1105
  "__schema": "TypeRefSchema",
1013
1106
  "location": {
1014
1107
  "filePath": "merge-lanes.main.runtime.ts",
1015
- "line": 521,
1108
+ "line": 519,
1016
1109
  "character": 5
1017
1110
  },
1018
- "name": "ExportMain"
1111
+ "name": "ExportMain",
1112
+ "componentId": {
1113
+ "scope": "teambit.scope",
1114
+ "name": "export"
1115
+ }
1019
1116
  },
1020
1117
  {
1021
1118
  "__schema": "TypeRefSchema",
1022
1119
  "location": {
1023
1120
  "filePath": "merge-lanes.main.runtime.ts",
1024
- "line": 522,
1121
+ "line": 520,
1025
1122
  "character": 5
1026
1123
  },
1027
- "name": "ImporterMain"
1124
+ "name": "ImporterMain",
1125
+ "componentId": {
1126
+ "scope": "teambit.scope",
1127
+ "name": "importer"
1128
+ }
1028
1129
  },
1029
1130
  {
1030
1131
  "__schema": "TypeRefSchema",
1031
1132
  "location": {
1032
1133
  "filePath": "merge-lanes.main.runtime.ts",
1033
- "line": 523,
1134
+ "line": 521,
1034
1135
  "character": 5
1035
1136
  },
1036
- "name": "CheckoutMain"
1137
+ "name": "CheckoutMain",
1138
+ "componentId": {
1139
+ "scope": "teambit.component",
1140
+ "name": "checkout"
1141
+ }
1037
1142
  },
1038
1143
  {
1039
1144
  "__schema": "TypeRefSchema",
1040
1145
  "location": {
1041
1146
  "filePath": "merge-lanes.main.runtime.ts",
1042
- "line": 524,
1147
+ "line": 522,
1043
1148
  "character": 5
1044
1149
  },
1045
- "name": "GlobalConfigMain"
1150
+ "name": "GlobalConfigMain",
1151
+ "componentId": {
1152
+ "scope": "teambit.harmony",
1153
+ "name": "global-config"
1154
+ }
1046
1155
  }
1047
1156
  ]
1048
1157
  },
@@ -1054,7 +1163,7 @@
1054
1163
  "__schema": "InferenceTypeSchema",
1055
1164
  "location": {
1056
1165
  "filePath": "merge-lanes.main.runtime.ts",
1057
- "line": 501,
1166
+ "line": 499,
1058
1167
  "character": 3
1059
1168
  },
1060
1169
  "type": "Promise<MergeLanesMain>"
@@ -1131,7 +1240,7 @@
1131
1240
  "__schema": "TypeSchema",
1132
1241
  "location": {
1133
1242
  "filePath": "merge-lanes.main.runtime.ts",
1134
- "line": 41,
1243
+ "line": 39,
1135
1244
  "character": 1
1136
1245
  },
1137
1246
  "signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noAutoSnap?: boolean | undefined;\n noSnap?: boolean | undefined;\n snapMessage?: string | undefined;\n existingOnWorkspaceOnly?: boolean | undefined;\n ... 14 more ...;\n fetchCurrent?: boolean | undefined;\n}",
@@ -1140,7 +1249,7 @@
1140
1249
  "__schema": "TypeLiteralSchema",
1141
1250
  "location": {
1142
1251
  "filePath": "merge-lanes.main.runtime.ts",
1143
- "line": 41,
1252
+ "line": 39,
1144
1253
  "character": 32
1145
1254
  },
1146
1255
  "members": [
@@ -1148,7 +1257,7 @@
1148
1257
  "__schema": "VariableLikeSchema",
1149
1258
  "location": {
1150
1259
  "filePath": "merge-lanes.main.runtime.ts",
1151
- "line": 42,
1260
+ "line": 40,
1152
1261
  "character": 3
1153
1262
  },
1154
1263
  "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
@@ -1157,10 +1266,14 @@
1157
1266
  "__schema": "TypeRefSchema",
1158
1267
  "location": {
1159
1268
  "filePath": "merge-lanes.main.runtime.ts",
1160
- "line": 42,
1269
+ "line": 40,
1161
1270
  "character": 18
1162
1271
  },
1163
- "name": "MergeStrategy"
1272
+ "name": "MergeStrategy",
1273
+ "componentId": {
1274
+ "scope": "teambit.component",
1275
+ "name": "merging"
1276
+ }
1164
1277
  },
1165
1278
  "isOptional": false
1166
1279
  },
@@ -1168,7 +1281,7 @@
1168
1281
  "__schema": "VariableLikeSchema",
1169
1282
  "location": {
1170
1283
  "filePath": "merge-lanes.main.runtime.ts",
1171
- "line": 43,
1284
+ "line": 41,
1172
1285
  "character": 3
1173
1286
  },
1174
1287
  "signature": "(property) ours?: boolean | undefined",
@@ -1177,7 +1290,7 @@
1177
1290
  "__schema": "KeywordTypeSchema",
1178
1291
  "location": {
1179
1292
  "filePath": "merge-lanes.main.runtime.ts",
1180
- "line": 43,
1293
+ "line": 41,
1181
1294
  "character": 10
1182
1295
  },
1183
1296
  "name": "boolean"
@@ -1188,7 +1301,7 @@
1188
1301
  "__schema": "VariableLikeSchema",
1189
1302
  "location": {
1190
1303
  "filePath": "merge-lanes.main.runtime.ts",
1191
- "line": 44,
1304
+ "line": 42,
1192
1305
  "character": 3
1193
1306
  },
1194
1307
  "signature": "(property) theirs?: boolean | undefined",
@@ -1197,7 +1310,7 @@
1197
1310
  "__schema": "KeywordTypeSchema",
1198
1311
  "location": {
1199
1312
  "filePath": "merge-lanes.main.runtime.ts",
1200
- "line": 44,
1313
+ "line": 42,
1201
1314
  "character": 12
1202
1315
  },
1203
1316
  "name": "boolean"
@@ -1208,7 +1321,7 @@
1208
1321
  "__schema": "VariableLikeSchema",
1209
1322
  "location": {
1210
1323
  "filePath": "merge-lanes.main.runtime.ts",
1211
- "line": 45,
1324
+ "line": 43,
1212
1325
  "character": 3
1213
1326
  },
1214
1327
  "signature": "(property) noAutoSnap?: boolean | undefined",
@@ -1217,7 +1330,7 @@
1217
1330
  "__schema": "KeywordTypeSchema",
1218
1331
  "location": {
1219
1332
  "filePath": "merge-lanes.main.runtime.ts",
1220
- "line": 45,
1333
+ "line": 43,
1221
1334
  "character": 16
1222
1335
  },
1223
1336
  "name": "boolean"
@@ -1228,7 +1341,7 @@
1228
1341
  "__schema": "VariableLikeSchema",
1229
1342
  "location": {
1230
1343
  "filePath": "merge-lanes.main.runtime.ts",
1231
- "line": 46,
1344
+ "line": 44,
1232
1345
  "character": 3
1233
1346
  },
1234
1347
  "signature": "(property) noSnap?: boolean | undefined",
@@ -1237,7 +1350,7 @@
1237
1350
  "__schema": "KeywordTypeSchema",
1238
1351
  "location": {
1239
1352
  "filePath": "merge-lanes.main.runtime.ts",
1240
- "line": 46,
1353
+ "line": 44,
1241
1354
  "character": 12
1242
1355
  },
1243
1356
  "name": "boolean"
@@ -1248,7 +1361,7 @@
1248
1361
  "__schema": "VariableLikeSchema",
1249
1362
  "location": {
1250
1363
  "filePath": "merge-lanes.main.runtime.ts",
1251
- "line": 47,
1364
+ "line": 45,
1252
1365
  "character": 3
1253
1366
  },
1254
1367
  "signature": "(property) snapMessage?: string | undefined",
@@ -1257,7 +1370,7 @@
1257
1370
  "__schema": "KeywordTypeSchema",
1258
1371
  "location": {
1259
1372
  "filePath": "merge-lanes.main.runtime.ts",
1260
- "line": 47,
1373
+ "line": 45,
1261
1374
  "character": 17
1262
1375
  },
1263
1376
  "name": "string"
@@ -1268,7 +1381,7 @@
1268
1381
  "__schema": "VariableLikeSchema",
1269
1382
  "location": {
1270
1383
  "filePath": "merge-lanes.main.runtime.ts",
1271
- "line": 48,
1384
+ "line": 46,
1272
1385
  "character": 3
1273
1386
  },
1274
1387
  "signature": "(property) existingOnWorkspaceOnly?: boolean | undefined",
@@ -1277,7 +1390,7 @@
1277
1390
  "__schema": "KeywordTypeSchema",
1278
1391
  "location": {
1279
1392
  "filePath": "merge-lanes.main.runtime.ts",
1280
- "line": 48,
1393
+ "line": 46,
1281
1394
  "character": 29
1282
1395
  },
1283
1396
  "name": "boolean"
@@ -1288,7 +1401,7 @@
1288
1401
  "__schema": "VariableLikeSchema",
1289
1402
  "location": {
1290
1403
  "filePath": "merge-lanes.main.runtime.ts",
1291
- "line": 49,
1404
+ "line": 47,
1292
1405
  "character": 3
1293
1406
  },
1294
1407
  "signature": "(property) build?: boolean | undefined",
@@ -1297,7 +1410,7 @@
1297
1410
  "__schema": "KeywordTypeSchema",
1298
1411
  "location": {
1299
1412
  "filePath": "merge-lanes.main.runtime.ts",
1300
- "line": 49,
1413
+ "line": 47,
1301
1414
  "character": 11
1302
1415
  },
1303
1416
  "name": "boolean"
@@ -1308,7 +1421,7 @@
1308
1421
  "__schema": "VariableLikeSchema",
1309
1422
  "location": {
1310
1423
  "filePath": "merge-lanes.main.runtime.ts",
1311
- "line": 50,
1424
+ "line": 48,
1312
1425
  "character": 3
1313
1426
  },
1314
1427
  "signature": "(property) keepReadme?: boolean | undefined",
@@ -1317,7 +1430,7 @@
1317
1430
  "__schema": "KeywordTypeSchema",
1318
1431
  "location": {
1319
1432
  "filePath": "merge-lanes.main.runtime.ts",
1320
- "line": 50,
1433
+ "line": 48,
1321
1434
  "character": 16
1322
1435
  },
1323
1436
  "name": "boolean"
@@ -1328,7 +1441,7 @@
1328
1441
  "__schema": "VariableLikeSchema",
1329
1442
  "location": {
1330
1443
  "filePath": "merge-lanes.main.runtime.ts",
1331
- "line": 51,
1444
+ "line": 49,
1332
1445
  "character": 3
1333
1446
  },
1334
1447
  "signature": "(property) squash?: boolean | undefined",
@@ -1337,7 +1450,7 @@
1337
1450
  "__schema": "KeywordTypeSchema",
1338
1451
  "location": {
1339
1452
  "filePath": "merge-lanes.main.runtime.ts",
1340
- "line": 51,
1453
+ "line": 49,
1341
1454
  "character": 12
1342
1455
  },
1343
1456
  "name": "boolean"
@@ -1348,7 +1461,7 @@
1348
1461
  "__schema": "VariableLikeSchema",
1349
1462
  "location": {
1350
1463
  "filePath": "merge-lanes.main.runtime.ts",
1351
- "line": 52,
1464
+ "line": 50,
1352
1465
  "character": 3
1353
1466
  },
1354
1467
  "signature": "(property) noSquash?: boolean | undefined",
@@ -1357,7 +1470,7 @@
1357
1470
  "__schema": "KeywordTypeSchema",
1358
1471
  "location": {
1359
1472
  "filePath": "merge-lanes.main.runtime.ts",
1360
- "line": 52,
1473
+ "line": 50,
1361
1474
  "character": 14
1362
1475
  },
1363
1476
  "name": "boolean"
@@ -1368,7 +1481,7 @@
1368
1481
  "__schema": "VariableLikeSchema",
1369
1482
  "location": {
1370
1483
  "filePath": "merge-lanes.main.runtime.ts",
1371
- "line": 53,
1484
+ "line": 51,
1372
1485
  "character": 3
1373
1486
  },
1374
1487
  "signature": "(property) tag?: boolean | undefined",
@@ -1377,7 +1490,7 @@
1377
1490
  "__schema": "KeywordTypeSchema",
1378
1491
  "location": {
1379
1492
  "filePath": "merge-lanes.main.runtime.ts",
1380
- "line": 53,
1493
+ "line": 51,
1381
1494
  "character": 9
1382
1495
  },
1383
1496
  "name": "boolean"
@@ -1388,7 +1501,7 @@
1388
1501
  "__schema": "VariableLikeSchema",
1389
1502
  "location": {
1390
1503
  "filePath": "merge-lanes.main.runtime.ts",
1391
- "line": 54,
1504
+ "line": 52,
1392
1505
  "character": 3
1393
1506
  },
1394
1507
  "signature": "(property) pattern?: string | undefined",
@@ -1397,7 +1510,7 @@
1397
1510
  "__schema": "KeywordTypeSchema",
1398
1511
  "location": {
1399
1512
  "filePath": "merge-lanes.main.runtime.ts",
1400
- "line": 54,
1513
+ "line": 52,
1401
1514
  "character": 13
1402
1515
  },
1403
1516
  "name": "string"
@@ -1408,7 +1521,7 @@
1408
1521
  "__schema": "VariableLikeSchema",
1409
1522
  "location": {
1410
1523
  "filePath": "merge-lanes.main.runtime.ts",
1411
- "line": 55,
1524
+ "line": 53,
1412
1525
  "character": 3
1413
1526
  },
1414
1527
  "signature": "(property) includeDeps?: boolean | undefined",
@@ -1417,7 +1530,7 @@
1417
1530
  "__schema": "KeywordTypeSchema",
1418
1531
  "location": {
1419
1532
  "filePath": "merge-lanes.main.runtime.ts",
1420
- "line": 55,
1533
+ "line": 53,
1421
1534
  "character": 17
1422
1535
  },
1423
1536
  "name": "boolean"
@@ -1428,7 +1541,7 @@
1428
1541
  "__schema": "VariableLikeSchema",
1429
1542
  "location": {
1430
1543
  "filePath": "merge-lanes.main.runtime.ts",
1431
- "line": 56,
1544
+ "line": 54,
1432
1545
  "character": 3
1433
1546
  },
1434
1547
  "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -1437,7 +1550,7 @@
1437
1550
  "__schema": "KeywordTypeSchema",
1438
1551
  "location": {
1439
1552
  "filePath": "merge-lanes.main.runtime.ts",
1440
- "line": 56,
1553
+ "line": 54,
1441
1554
  "character": 32
1442
1555
  },
1443
1556
  "name": "boolean"
@@ -1448,7 +1561,7 @@
1448
1561
  "__schema": "VariableLikeSchema",
1449
1562
  "location": {
1450
1563
  "filePath": "merge-lanes.main.runtime.ts",
1451
- "line": 57,
1564
+ "line": 55,
1452
1565
  "character": 3
1453
1566
  },
1454
1567
  "signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
@@ -1457,10 +1570,14 @@
1457
1570
  "__schema": "TypeRefSchema",
1458
1571
  "location": {
1459
1572
  "filePath": "merge-lanes.main.runtime.ts",
1460
- "line": 57,
1573
+ "line": 55,
1461
1574
  "character": 22
1462
1575
  },
1463
- "name": "MergeStrategy"
1576
+ "name": "MergeStrategy",
1577
+ "componentId": {
1578
+ "scope": "teambit.component",
1579
+ "name": "merging"
1580
+ }
1464
1581
  },
1465
1582
  "isOptional": true
1466
1583
  },
@@ -1468,7 +1585,7 @@
1468
1585
  "__schema": "VariableLikeSchema",
1469
1586
  "location": {
1470
1587
  "filePath": "merge-lanes.main.runtime.ts",
1471
- "line": 58,
1588
+ "line": 56,
1472
1589
  "character": 3
1473
1590
  },
1474
1591
  "signature": "(property) ignoreConfigChanges?: boolean | undefined",
@@ -1477,7 +1594,7 @@
1477
1594
  "__schema": "KeywordTypeSchema",
1478
1595
  "location": {
1479
1596
  "filePath": "merge-lanes.main.runtime.ts",
1480
- "line": 58,
1597
+ "line": 56,
1481
1598
  "character": 25
1482
1599
  },
1483
1600
  "name": "boolean"
@@ -1488,7 +1605,7 @@
1488
1605
  "__schema": "VariableLikeSchema",
1489
1606
  "location": {
1490
1607
  "filePath": "merge-lanes.main.runtime.ts",
1491
- "line": 59,
1608
+ "line": 57,
1492
1609
  "character": 3
1493
1610
  },
1494
1611
  "signature": "(property) skipFetch?: boolean | undefined",
@@ -1497,7 +1614,7 @@
1497
1614
  "__schema": "KeywordTypeSchema",
1498
1615
  "location": {
1499
1616
  "filePath": "merge-lanes.main.runtime.ts",
1500
- "line": 59,
1617
+ "line": 57,
1501
1618
  "character": 15
1502
1619
  },
1503
1620
  "name": "boolean"
@@ -1508,7 +1625,7 @@
1508
1625
  "__schema": "VariableLikeSchema",
1509
1626
  "location": {
1510
1627
  "filePath": "merge-lanes.main.runtime.ts",
1511
- "line": 60,
1628
+ "line": 58,
1512
1629
  "character": 3
1513
1630
  },
1514
1631
  "signature": "(property) excludeNonLaneComps?: boolean | undefined",
@@ -1517,7 +1634,7 @@
1517
1634
  "__schema": "KeywordTypeSchema",
1518
1635
  "location": {
1519
1636
  "filePath": "merge-lanes.main.runtime.ts",
1520
- "line": 60,
1637
+ "line": 58,
1521
1638
  "character": 25
1522
1639
  },
1523
1640
  "name": "boolean"
@@ -1528,7 +1645,7 @@
1528
1645
  "__schema": "VariableLikeSchema",
1529
1646
  "location": {
1530
1647
  "filePath": "merge-lanes.main.runtime.ts",
1531
- "line": 61,
1648
+ "line": 59,
1532
1649
  "character": 3
1533
1650
  },
1534
1651
  "signature": "(property) shouldIncludeUpdateDependents?: boolean | undefined",
@@ -1537,7 +1654,7 @@
1537
1654
  "__schema": "KeywordTypeSchema",
1538
1655
  "location": {
1539
1656
  "filePath": "merge-lanes.main.runtime.ts",
1540
- "line": 61,
1657
+ "line": 59,
1541
1658
  "character": 35
1542
1659
  },
1543
1660
  "name": "boolean"
@@ -1548,7 +1665,7 @@
1548
1665
  "__schema": "VariableLikeSchema",
1549
1666
  "location": {
1550
1667
  "filePath": "merge-lanes.main.runtime.ts",
1551
- "line": 62,
1668
+ "line": 60,
1552
1669
  "character": 3
1553
1670
  },
1554
1671
  "signature": "(property) throwIfNotUpToDate?: boolean | undefined",
@@ -1557,7 +1674,7 @@
1557
1674
  "__schema": "KeywordTypeSchema",
1558
1675
  "location": {
1559
1676
  "filePath": "merge-lanes.main.runtime.ts",
1560
- "line": 62,
1677
+ "line": 60,
1561
1678
  "character": 24
1562
1679
  },
1563
1680
  "name": "boolean"
@@ -1568,7 +1685,7 @@
1568
1685
  "__schema": "VariableLikeSchema",
1569
1686
  "location": {
1570
1687
  "filePath": "merge-lanes.main.runtime.ts",
1571
- "line": 63,
1688
+ "line": 61,
1572
1689
  "character": 3
1573
1690
  },
1574
1691
  "signature": "(property) fetchCurrent?: boolean | undefined",
@@ -1577,7 +1694,7 @@
1577
1694
  "__schema": "KeywordTypeSchema",
1578
1695
  "location": {
1579
1696
  "filePath": "merge-lanes.main.runtime.ts",
1580
- "line": 63,
1697
+ "line": 61,
1581
1698
  "character": 18
1582
1699
  },
1583
1700
  "name": "boolean"
@@ -1591,7 +1708,7 @@
1591
1708
  "__schema": "TypeSchema",
1592
1709
  "location": {
1593
1710
  "filePath": "merge-lanes.main.runtime.ts",
1594
- "line": 65,
1711
+ "line": 63,
1595
1712
  "character": 1
1596
1713
  },
1597
1714
  "signature": "type ConflictPerId = {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n}",
@@ -1600,7 +1717,7 @@
1600
1717
  "__schema": "TypeLiteralSchema",
1601
1718
  "location": {
1602
1719
  "filePath": "merge-lanes.main.runtime.ts",
1603
- "line": 65,
1720
+ "line": 63,
1604
1721
  "character": 29
1605
1722
  },
1606
1723
  "members": [
@@ -1608,7 +1725,7 @@
1608
1725
  "__schema": "VariableLikeSchema",
1609
1726
  "location": {
1610
1727
  "filePath": "merge-lanes.main.runtime.ts",
1611
- "line": 65,
1728
+ "line": 63,
1612
1729
  "character": 31
1613
1730
  },
1614
1731
  "signature": "(property) id: ComponentID",
@@ -1617,7 +1734,7 @@
1617
1734
  "__schema": "TypeRefSchema",
1618
1735
  "location": {
1619
1736
  "filePath": "merge-lanes.main.runtime.ts",
1620
- "line": 65,
1737
+ "line": 63,
1621
1738
  "character": 31
1622
1739
  },
1623
1740
  "name": "ComponentID",
@@ -1633,7 +1750,7 @@
1633
1750
  "__schema": "VariableLikeSchema",
1634
1751
  "location": {
1635
1752
  "filePath": "merge-lanes.main.runtime.ts",
1636
- "line": 65,
1753
+ "line": 63,
1637
1754
  "character": 48
1638
1755
  },
1639
1756
  "signature": "(property) files: string[]",
@@ -1642,14 +1759,14 @@
1642
1759
  "__schema": "TypeArraySchema",
1643
1760
  "location": {
1644
1761
  "filePath": "merge-lanes.main.runtime.ts",
1645
- "line": 65,
1762
+ "line": 63,
1646
1763
  "character": 55
1647
1764
  },
1648
1765
  "type": {
1649
1766
  "__schema": "KeywordTypeSchema",
1650
1767
  "location": {
1651
1768
  "filePath": "merge-lanes.main.runtime.ts",
1652
- "line": 65,
1769
+ "line": 63,
1653
1770
  "character": 55
1654
1771
  },
1655
1772
  "name": "string"
@@ -1661,7 +1778,7 @@
1661
1778
  "__schema": "VariableLikeSchema",
1662
1779
  "location": {
1663
1780
  "filePath": "merge-lanes.main.runtime.ts",
1664
- "line": 65,
1781
+ "line": 63,
1665
1782
  "character": 65
1666
1783
  },
1667
1784
  "signature": "(property) config?: boolean | undefined",
@@ -1670,7 +1787,7 @@
1670
1787
  "__schema": "KeywordTypeSchema",
1671
1788
  "location": {
1672
1789
  "filePath": "merge-lanes.main.runtime.ts",
1673
- "line": 65,
1790
+ "line": 63,
1674
1791
  "character": 74
1675
1792
  },
1676
1793
  "name": "boolean"
@@ -1684,7 +1801,7 @@
1684
1801
  "__schema": "TypeSchema",
1685
1802
  "location": {
1686
1803
  "filePath": "merge-lanes.main.runtime.ts",
1687
- "line": 66,
1804
+ "line": 64,
1688
1805
  "character": 1
1689
1806
  },
1690
1807
  "signature": "type MergeFromScopeResult = {\n mergedNow: ComponentID[];\n exportedIds: ComponentID[];\n unmerged: {\n id: ComponentID;\n reason: string;\n }[];\n conflicts?: ConflictPerId[] | undefined;\n snappedIds?: ComponentID[] | undefined;\n mergedPreviously: ComponentID[];\n mergeSnapError?: Error | undefined;\n}",
@@ -1693,7 +1810,7 @@
1693
1810
  "__schema": "TypeLiteralSchema",
1694
1811
  "location": {
1695
1812
  "filePath": "merge-lanes.main.runtime.ts",
1696
- "line": 66,
1813
+ "line": 64,
1697
1814
  "character": 36
1698
1815
  },
1699
1816
  "members": [
@@ -1701,7 +1818,7 @@
1701
1818
  "__schema": "VariableLikeSchema",
1702
1819
  "location": {
1703
1820
  "filePath": "merge-lanes.main.runtime.ts",
1704
- "line": 67,
1821
+ "line": 65,
1705
1822
  "character": 3
1706
1823
  },
1707
1824
  "signature": "(property) mergedNow: ComponentID[]",
@@ -1710,17 +1827,22 @@
1710
1827
  "__schema": "TypeArraySchema",
1711
1828
  "location": {
1712
1829
  "filePath": "merge-lanes.main.runtime.ts",
1713
- "line": 67,
1830
+ "line": 65,
1714
1831
  "character": 14
1715
1832
  },
1716
1833
  "type": {
1717
1834
  "__schema": "TypeRefSchema",
1718
1835
  "location": {
1719
1836
  "filePath": "merge-lanes.main.runtime.ts",
1720
- "line": 67,
1837
+ "line": 65,
1721
1838
  "character": 14
1722
1839
  },
1723
- "name": "ComponentID"
1840
+ "name": "ComponentID",
1841
+ "componentId": {
1842
+ "scope": "teambit.component",
1843
+ "name": "component-id",
1844
+ "version": "1.2.2"
1845
+ }
1724
1846
  }
1725
1847
  },
1726
1848
  "isOptional": false
@@ -1729,7 +1851,7 @@
1729
1851
  "__schema": "VariableLikeSchema",
1730
1852
  "location": {
1731
1853
  "filePath": "merge-lanes.main.runtime.ts",
1732
- "line": 68,
1854
+ "line": 66,
1733
1855
  "character": 3
1734
1856
  },
1735
1857
  "signature": "(property) exportedIds: ComponentID[]",
@@ -1738,17 +1860,22 @@
1738
1860
  "__schema": "TypeArraySchema",
1739
1861
  "location": {
1740
1862
  "filePath": "merge-lanes.main.runtime.ts",
1741
- "line": 68,
1863
+ "line": 66,
1742
1864
  "character": 16
1743
1865
  },
1744
1866
  "type": {
1745
1867
  "__schema": "TypeRefSchema",
1746
1868
  "location": {
1747
1869
  "filePath": "merge-lanes.main.runtime.ts",
1748
- "line": 68,
1870
+ "line": 66,
1749
1871
  "character": 16
1750
1872
  },
1751
- "name": "ComponentID"
1873
+ "name": "ComponentID",
1874
+ "componentId": {
1875
+ "scope": "teambit.component",
1876
+ "name": "component-id",
1877
+ "version": "1.2.2"
1878
+ }
1752
1879
  }
1753
1880
  },
1754
1881
  "isOptional": false
@@ -1757,7 +1884,7 @@
1757
1884
  "__schema": "VariableLikeSchema",
1758
1885
  "location": {
1759
1886
  "filePath": "merge-lanes.main.runtime.ts",
1760
- "line": 69,
1887
+ "line": 67,
1761
1888
  "character": 3
1762
1889
  },
1763
1890
  "signature": "(property) unmerged: {\n id: ComponentID;\n reason: string;\n}[]",
@@ -1766,14 +1893,14 @@
1766
1893
  "__schema": "TypeArraySchema",
1767
1894
  "location": {
1768
1895
  "filePath": "merge-lanes.main.runtime.ts",
1769
- "line": 69,
1896
+ "line": 67,
1770
1897
  "character": 13
1771
1898
  },
1772
1899
  "type": {
1773
1900
  "__schema": "TypeLiteralSchema",
1774
1901
  "location": {
1775
1902
  "filePath": "merge-lanes.main.runtime.ts",
1776
- "line": 69,
1903
+ "line": 67,
1777
1904
  "character": 13
1778
1905
  },
1779
1906
  "members": [
@@ -1781,7 +1908,7 @@
1781
1908
  "__schema": "VariableLikeSchema",
1782
1909
  "location": {
1783
1910
  "filePath": "merge-lanes.main.runtime.ts",
1784
- "line": 69,
1911
+ "line": 67,
1785
1912
  "character": 15
1786
1913
  },
1787
1914
  "signature": "(property) id: ComponentID",
@@ -1790,7 +1917,7 @@
1790
1917
  "__schema": "TypeRefSchema",
1791
1918
  "location": {
1792
1919
  "filePath": "merge-lanes.main.runtime.ts",
1793
- "line": 69,
1920
+ "line": 67,
1794
1921
  "character": 15
1795
1922
  },
1796
1923
  "name": "ComponentID",
@@ -1806,7 +1933,7 @@
1806
1933
  "__schema": "VariableLikeSchema",
1807
1934
  "location": {
1808
1935
  "filePath": "merge-lanes.main.runtime.ts",
1809
- "line": 69,
1936
+ "line": 67,
1810
1937
  "character": 32
1811
1938
  },
1812
1939
  "signature": "(property) reason: string",
@@ -1815,7 +1942,7 @@
1815
1942
  "__schema": "KeywordTypeSchema",
1816
1943
  "location": {
1817
1944
  "filePath": "merge-lanes.main.runtime.ts",
1818
- "line": 69,
1945
+ "line": 67,
1819
1946
  "character": 40
1820
1947
  },
1821
1948
  "name": "string"
@@ -1831,7 +1958,7 @@
1831
1958
  "__schema": "VariableLikeSchema",
1832
1959
  "location": {
1833
1960
  "filePath": "merge-lanes.main.runtime.ts",
1834
- "line": 70,
1961
+ "line": 68,
1835
1962
  "character": 3
1836
1963
  },
1837
1964
  "signature": "(property) conflicts?: ConflictPerId[] | undefined",
@@ -1840,17 +1967,18 @@
1840
1967
  "__schema": "TypeArraySchema",
1841
1968
  "location": {
1842
1969
  "filePath": "merge-lanes.main.runtime.ts",
1843
- "line": 70,
1970
+ "line": 68,
1844
1971
  "character": 15
1845
1972
  },
1846
1973
  "type": {
1847
1974
  "__schema": "TypeRefSchema",
1848
1975
  "location": {
1849
1976
  "filePath": "merge-lanes.main.runtime.ts",
1850
- "line": 70,
1977
+ "line": 68,
1851
1978
  "character": 15
1852
1979
  },
1853
- "name": "ConflictPerId"
1980
+ "name": "ConflictPerId",
1981
+ "internalFilePath": "merge-lanes.main.runtime.ts"
1854
1982
  }
1855
1983
  },
1856
1984
  "isOptional": true
@@ -1859,7 +1987,7 @@
1859
1987
  "__schema": "VariableLikeSchema",
1860
1988
  "location": {
1861
1989
  "filePath": "merge-lanes.main.runtime.ts",
1862
- "line": 71,
1990
+ "line": 69,
1863
1991
  "character": 3
1864
1992
  },
1865
1993
  "signature": "(property) snappedIds?: ComponentID[] | undefined",
@@ -1868,17 +1996,22 @@
1868
1996
  "__schema": "TypeArraySchema",
1869
1997
  "location": {
1870
1998
  "filePath": "merge-lanes.main.runtime.ts",
1871
- "line": 71,
1999
+ "line": 69,
1872
2000
  "character": 16
1873
2001
  },
1874
2002
  "type": {
1875
2003
  "__schema": "TypeRefSchema",
1876
2004
  "location": {
1877
2005
  "filePath": "merge-lanes.main.runtime.ts",
1878
- "line": 71,
2006
+ "line": 69,
1879
2007
  "character": 16
1880
2008
  },
1881
- "name": "ComponentID"
2009
+ "name": "ComponentID",
2010
+ "componentId": {
2011
+ "scope": "teambit.component",
2012
+ "name": "component-id",
2013
+ "version": "1.2.2"
2014
+ }
1882
2015
  }
1883
2016
  },
1884
2017
  "isOptional": true
@@ -1887,7 +2020,7 @@
1887
2020
  "__schema": "VariableLikeSchema",
1888
2021
  "location": {
1889
2022
  "filePath": "merge-lanes.main.runtime.ts",
1890
- "line": 72,
2023
+ "line": 70,
1891
2024
  "character": 3
1892
2025
  },
1893
2026
  "signature": "(property) mergedPreviously: ComponentID[]",
@@ -1896,17 +2029,22 @@
1896
2029
  "__schema": "TypeArraySchema",
1897
2030
  "location": {
1898
2031
  "filePath": "merge-lanes.main.runtime.ts",
1899
- "line": 72,
2032
+ "line": 70,
1900
2033
  "character": 21
1901
2034
  },
1902
2035
  "type": {
1903
2036
  "__schema": "TypeRefSchema",
1904
2037
  "location": {
1905
2038
  "filePath": "merge-lanes.main.runtime.ts",
1906
- "line": 72,
2039
+ "line": 70,
1907
2040
  "character": 21
1908
2041
  },
1909
- "name": "ComponentID"
2042
+ "name": "ComponentID",
2043
+ "componentId": {
2044
+ "scope": "teambit.component",
2045
+ "name": "component-id",
2046
+ "version": "1.2.2"
2047
+ }
1910
2048
  }
1911
2049
  },
1912
2050
  "isOptional": false
@@ -1915,7 +2053,7 @@
1915
2053
  "__schema": "VariableLikeSchema",
1916
2054
  "location": {
1917
2055
  "filePath": "merge-lanes.main.runtime.ts",
1918
- "line": 73,
2056
+ "line": 71,
1919
2057
  "character": 3
1920
2058
  },
1921
2059
  "signature": "(property) mergeSnapError?: Error | undefined",
@@ -1924,7 +2062,7 @@
1924
2062
  "__schema": "TypeRefSchema",
1925
2063
  "location": {
1926
2064
  "filePath": "merge-lanes.main.runtime.ts",
1927
- "line": 73,
2065
+ "line": 71,
1928
2066
  "character": 20
1929
2067
  },
1930
2068
  "name": "Error"
@@ -1938,7 +2076,7 @@
1938
2076
  "__schema": "ClassSchema",
1939
2077
  "location": {
1940
2078
  "filePath": "merge-lanes.main.runtime.ts",
1941
- "line": 76,
2079
+ "line": 74,
1942
2080
  "character": 1
1943
2081
  },
1944
2082
  "signature": "class MergeLanesMain",
@@ -1948,7 +2086,7 @@
1948
2086
  "__schema": "ConstructorSchema",
1949
2087
  "location": {
1950
2088
  "filePath": "merge-lanes.main.runtime.ts",
1951
- "line": 77,
2089
+ "line": 75,
1952
2090
  "character": 3
1953
2091
  },
1954
2092
  "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -1958,7 +2096,7 @@
1958
2096
  "__schema": "ParameterSchema",
1959
2097
  "location": {
1960
2098
  "filePath": "merge-lanes.main.runtime.ts",
1961
- "line": 78,
2099
+ "line": 76,
1962
2100
  "character": 5
1963
2101
  },
1964
2102
  "name": "workspace",
@@ -1966,7 +2104,7 @@
1966
2104
  "__schema": "TypeUnionSchema",
1967
2105
  "location": {
1968
2106
  "filePath": "merge-lanes.main.runtime.ts",
1969
- "line": 78,
2107
+ "line": 76,
1970
2108
  "character": 24
1971
2109
  },
1972
2110
  "types": [
@@ -1974,16 +2112,20 @@
1974
2112
  "__schema": "TypeRefSchema",
1975
2113
  "location": {
1976
2114
  "filePath": "merge-lanes.main.runtime.ts",
1977
- "line": 78,
2115
+ "line": 76,
1978
2116
  "character": 24
1979
2117
  },
1980
- "name": "Workspace"
2118
+ "name": "Workspace",
2119
+ "componentId": {
2120
+ "scope": "teambit.workspace",
2121
+ "name": "workspace"
2122
+ }
1981
2123
  },
1982
2124
  {
1983
2125
  "__schema": "KeywordTypeSchema",
1984
2126
  "location": {
1985
2127
  "filePath": "merge-lanes.main.runtime.ts",
1986
- "line": 78,
2128
+ "line": 76,
1987
2129
  "character": 36
1988
2130
  },
1989
2131
  "name": "undefined"
@@ -1997,7 +2139,7 @@
1997
2139
  "__schema": "ParameterSchema",
1998
2140
  "location": {
1999
2141
  "filePath": "merge-lanes.main.runtime.ts",
2000
- "line": 79,
2142
+ "line": 77,
2001
2143
  "character": 5
2002
2144
  },
2003
2145
  "name": "merging",
@@ -2005,10 +2147,14 @@
2005
2147
  "__schema": "TypeRefSchema",
2006
2148
  "location": {
2007
2149
  "filePath": "merge-lanes.main.runtime.ts",
2008
- "line": 79,
2150
+ "line": 77,
2009
2151
  "character": 22
2010
2152
  },
2011
- "name": "MergingMain"
2153
+ "name": "MergingMain",
2154
+ "componentId": {
2155
+ "scope": "teambit.component",
2156
+ "name": "merging"
2157
+ }
2012
2158
  },
2013
2159
  "isOptional": false,
2014
2160
  "isSpread": false
@@ -2017,7 +2163,7 @@
2017
2163
  "__schema": "ParameterSchema",
2018
2164
  "location": {
2019
2165
  "filePath": "merge-lanes.main.runtime.ts",
2020
- "line": 80,
2166
+ "line": 78,
2021
2167
  "character": 5
2022
2168
  },
2023
2169
  "name": "lanes",
@@ -2025,10 +2171,14 @@
2025
2171
  "__schema": "TypeRefSchema",
2026
2172
  "location": {
2027
2173
  "filePath": "merge-lanes.main.runtime.ts",
2028
- "line": 80,
2174
+ "line": 78,
2029
2175
  "character": 21
2030
2176
  },
2031
- "name": "LanesMain"
2177
+ "name": "LanesMain",
2178
+ "componentId": {
2179
+ "scope": "teambit.lanes",
2180
+ "name": "lanes"
2181
+ }
2032
2182
  },
2033
2183
  "isOptional": false,
2034
2184
  "isSpread": false
@@ -2037,7 +2187,7 @@
2037
2187
  "__schema": "ParameterSchema",
2038
2188
  "location": {
2039
2189
  "filePath": "merge-lanes.main.runtime.ts",
2040
- "line": 81,
2190
+ "line": 79,
2041
2191
  "character": 5
2042
2192
  },
2043
2193
  "name": "logger",
@@ -2045,10 +2195,14 @@
2045
2195
  "__schema": "TypeRefSchema",
2046
2196
  "location": {
2047
2197
  "filePath": "merge-lanes.main.runtime.ts",
2048
- "line": 81,
2198
+ "line": 79,
2049
2199
  "character": 22
2050
2200
  },
2051
- "name": "Logger"
2201
+ "name": "Logger",
2202
+ "componentId": {
2203
+ "scope": "teambit.harmony",
2204
+ "name": "logger"
2205
+ }
2052
2206
  },
2053
2207
  "isOptional": false,
2054
2208
  "isSpread": false
@@ -2057,7 +2211,7 @@
2057
2211
  "__schema": "ParameterSchema",
2058
2212
  "location": {
2059
2213
  "filePath": "merge-lanes.main.runtime.ts",
2060
- "line": 82,
2214
+ "line": 80,
2061
2215
  "character": 5
2062
2216
  },
2063
2217
  "name": "remove",
@@ -2065,10 +2219,14 @@
2065
2219
  "__schema": "TypeRefSchema",
2066
2220
  "location": {
2067
2221
  "filePath": "merge-lanes.main.runtime.ts",
2068
- "line": 82,
2222
+ "line": 80,
2069
2223
  "character": 21
2070
2224
  },
2071
- "name": "RemoveMain"
2225
+ "name": "RemoveMain",
2226
+ "componentId": {
2227
+ "scope": "teambit.component",
2228
+ "name": "remove"
2229
+ }
2072
2230
  },
2073
2231
  "isOptional": false,
2074
2232
  "isSpread": false
@@ -2077,7 +2235,7 @@
2077
2235
  "__schema": "ParameterSchema",
2078
2236
  "location": {
2079
2237
  "filePath": "merge-lanes.main.runtime.ts",
2080
- "line": 83,
2238
+ "line": 81,
2081
2239
  "character": 5
2082
2240
  },
2083
2241
  "name": "scope",
@@ -2085,10 +2243,14 @@
2085
2243
  "__schema": "TypeRefSchema",
2086
2244
  "location": {
2087
2245
  "filePath": "merge-lanes.main.runtime.ts",
2088
- "line": 83,
2246
+ "line": 81,
2089
2247
  "character": 20
2090
2248
  },
2091
- "name": "ScopeMain"
2249
+ "name": "ScopeMain",
2250
+ "componentId": {
2251
+ "scope": "teambit.scope",
2252
+ "name": "scope"
2253
+ }
2092
2254
  },
2093
2255
  "isOptional": false,
2094
2256
  "isSpread": false
@@ -2097,7 +2259,7 @@
2097
2259
  "__schema": "ParameterSchema",
2098
2260
  "location": {
2099
2261
  "filePath": "merge-lanes.main.runtime.ts",
2100
- "line": 84,
2262
+ "line": 82,
2101
2263
  "character": 5
2102
2264
  },
2103
2265
  "name": "exporter",
@@ -2105,10 +2267,14 @@
2105
2267
  "__schema": "TypeRefSchema",
2106
2268
  "location": {
2107
2269
  "filePath": "merge-lanes.main.runtime.ts",
2108
- "line": 84,
2270
+ "line": 82,
2109
2271
  "character": 23
2110
2272
  },
2111
- "name": "ExportMain"
2273
+ "name": "ExportMain",
2274
+ "componentId": {
2275
+ "scope": "teambit.scope",
2276
+ "name": "export"
2277
+ }
2112
2278
  },
2113
2279
  "isOptional": false,
2114
2280
  "isSpread": false
@@ -2117,7 +2283,7 @@
2117
2283
  "__schema": "ParameterSchema",
2118
2284
  "location": {
2119
2285
  "filePath": "merge-lanes.main.runtime.ts",
2120
- "line": 85,
2286
+ "line": 83,
2121
2287
  "character": 5
2122
2288
  },
2123
2289
  "name": "importer",
@@ -2125,10 +2291,14 @@
2125
2291
  "__schema": "TypeRefSchema",
2126
2292
  "location": {
2127
2293
  "filePath": "merge-lanes.main.runtime.ts",
2128
- "line": 85,
2294
+ "line": 83,
2129
2295
  "character": 23
2130
2296
  },
2131
- "name": "ImporterMain"
2297
+ "name": "ImporterMain",
2298
+ "componentId": {
2299
+ "scope": "teambit.scope",
2300
+ "name": "importer"
2301
+ }
2132
2302
  },
2133
2303
  "isOptional": false,
2134
2304
  "isSpread": false
@@ -2137,7 +2307,7 @@
2137
2307
  "__schema": "ParameterSchema",
2138
2308
  "location": {
2139
2309
  "filePath": "merge-lanes.main.runtime.ts",
2140
- "line": 86,
2310
+ "line": 84,
2141
2311
  "character": 5
2142
2312
  },
2143
2313
  "name": "checkout",
@@ -2145,10 +2315,14 @@
2145
2315
  "__schema": "TypeRefSchema",
2146
2316
  "location": {
2147
2317
  "filePath": "merge-lanes.main.runtime.ts",
2148
- "line": 86,
2318
+ "line": 84,
2149
2319
  "character": 23
2150
2320
  },
2151
- "name": "CheckoutMain"
2321
+ "name": "CheckoutMain",
2322
+ "componentId": {
2323
+ "scope": "teambit.component",
2324
+ "name": "checkout"
2325
+ }
2152
2326
  },
2153
2327
  "isOptional": false,
2154
2328
  "isSpread": false
@@ -2158,7 +2332,7 @@
2158
2332
  "__schema": "ThisTypeSchema",
2159
2333
  "location": {
2160
2334
  "filePath": "merge-lanes.main.runtime.ts",
2161
- "line": 76,
2335
+ "line": 74,
2162
2336
  "character": 1
2163
2337
  },
2164
2338
  "name": "MergeLanesMain"
@@ -2169,7 +2343,7 @@
2169
2343
  "__schema": "FunctionLikeSchema",
2170
2344
  "location": {
2171
2345
  "filePath": "merge-lanes.main.runtime.ts",
2172
- "line": 89,
2346
+ "line": 87,
2173
2347
  "character": 3
2174
2348
  },
2175
2349
  "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
@@ -2179,7 +2353,7 @@
2179
2353
  "__schema": "ParameterSchema",
2180
2354
  "location": {
2181
2355
  "filePath": "merge-lanes.main.runtime.ts",
2182
- "line": 89,
2356
+ "line": 87,
2183
2357
  "character": 24
2184
2358
  },
2185
2359
  "name": "laneName",
@@ -2187,7 +2361,7 @@
2187
2361
  "__schema": "KeywordTypeSchema",
2188
2362
  "location": {
2189
2363
  "filePath": "merge-lanes.main.runtime.ts",
2190
- "line": 89,
2364
+ "line": 87,
2191
2365
  "character": 34
2192
2366
  },
2193
2367
  "name": "string"
@@ -2199,7 +2373,7 @@
2199
2373
  "__schema": "ParameterSchema",
2200
2374
  "location": {
2201
2375
  "filePath": "merge-lanes.main.runtime.ts",
2202
- "line": 89,
2376
+ "line": 87,
2203
2377
  "character": 42
2204
2378
  },
2205
2379
  "name": "options",
@@ -2207,10 +2381,11 @@
2207
2381
  "__schema": "TypeRefSchema",
2208
2382
  "location": {
2209
2383
  "filePath": "merge-lanes.main.runtime.ts",
2210
- "line": 89,
2384
+ "line": 87,
2211
2385
  "character": 51
2212
2386
  },
2213
- "name": "MergeLaneOptions"
2387
+ "name": "MergeLaneOptions",
2388
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2214
2389
  },
2215
2390
  "isOptional": false,
2216
2391
  "isSpread": false
@@ -2220,7 +2395,7 @@
2220
2395
  "__schema": "InferenceTypeSchema",
2221
2396
  "location": {
2222
2397
  "filePath": "merge-lanes.main.runtime.ts",
2223
- "line": 89,
2398
+ "line": 87,
2224
2399
  "character": 3
2225
2400
  },
2226
2401
  "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
@@ -2233,7 +2408,7 @@
2233
2408
  "__schema": "FunctionLikeSchema",
2234
2409
  "location": {
2235
2410
  "filePath": "merge-lanes.main.runtime.ts",
2236
- "line": 99,
2411
+ "line": 97,
2237
2412
  "character": 3
2238
2413
  },
2239
2414
  "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
@@ -2243,7 +2418,7 @@
2243
2418
  "__schema": "ParameterSchema",
2244
2419
  "location": {
2245
2420
  "filePath": "merge-lanes.main.runtime.ts",
2246
- "line": 100,
2421
+ "line": 98,
2247
2422
  "character": 5
2248
2423
  },
2249
2424
  "name": "otherLaneId",
@@ -2251,10 +2426,15 @@
2251
2426
  "__schema": "TypeRefSchema",
2252
2427
  "location": {
2253
2428
  "filePath": "merge-lanes.main.runtime.ts",
2254
- "line": 100,
2429
+ "line": 98,
2255
2430
  "character": 18
2256
2431
  },
2257
- "name": "LaneId"
2432
+ "name": "LaneId",
2433
+ "componentId": {
2434
+ "scope": "teambit.lanes",
2435
+ "name": "lane-id",
2436
+ "version": "0.0.311"
2437
+ }
2258
2438
  },
2259
2439
  "isOptional": false,
2260
2440
  "isSpread": false
@@ -2263,7 +2443,7 @@
2263
2443
  "__schema": "ParameterSchema",
2264
2444
  "location": {
2265
2445
  "filePath": "merge-lanes.main.runtime.ts",
2266
- "line": 101,
2446
+ "line": 99,
2267
2447
  "character": 5
2268
2448
  },
2269
2449
  "name": "currentLaneId",
@@ -2271,10 +2451,15 @@
2271
2451
  "__schema": "TypeRefSchema",
2272
2452
  "location": {
2273
2453
  "filePath": "merge-lanes.main.runtime.ts",
2274
- "line": 101,
2454
+ "line": 99,
2275
2455
  "character": 20
2276
2456
  },
2277
- "name": "LaneId"
2457
+ "name": "LaneId",
2458
+ "componentId": {
2459
+ "scope": "teambit.lanes",
2460
+ "name": "lane-id",
2461
+ "version": "0.0.311"
2462
+ }
2278
2463
  },
2279
2464
  "isOptional": false,
2280
2465
  "isSpread": false
@@ -2283,7 +2468,7 @@
2283
2468
  "__schema": "ParameterSchema",
2284
2469
  "location": {
2285
2470
  "filePath": "merge-lanes.main.runtime.ts",
2286
- "line": 102,
2471
+ "line": 100,
2287
2472
  "character": 5
2288
2473
  },
2289
2474
  "name": "options",
@@ -2291,10 +2476,11 @@
2291
2476
  "__schema": "TypeRefSchema",
2292
2477
  "location": {
2293
2478
  "filePath": "merge-lanes.main.runtime.ts",
2294
- "line": 102,
2479
+ "line": 100,
2295
2480
  "character": 14
2296
2481
  },
2297
- "name": "MergeLaneOptions"
2482
+ "name": "MergeLaneOptions",
2483
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2298
2484
  },
2299
2485
  "isOptional": false,
2300
2486
  "isSpread": false
@@ -2304,7 +2490,7 @@
2304
2490
  "__schema": "TypeRefSchema",
2305
2491
  "location": {
2306
2492
  "filePath": "merge-lanes.main.runtime.ts",
2307
- "line": 103,
2493
+ "line": 101,
2308
2494
  "character": 6
2309
2495
  },
2310
2496
  "name": "Promise",
@@ -2313,7 +2499,7 @@
2313
2499
  "__schema": "TypeLiteralSchema",
2314
2500
  "location": {
2315
2501
  "filePath": "merge-lanes.main.runtime.ts",
2316
- "line": 103,
2502
+ "line": 101,
2317
2503
  "character": 14
2318
2504
  },
2319
2505
  "members": [
@@ -2321,7 +2507,7 @@
2321
2507
  "__schema": "VariableLikeSchema",
2322
2508
  "location": {
2323
2509
  "filePath": "merge-lanes.main.runtime.ts",
2324
- "line": 104,
2510
+ "line": 102,
2325
2511
  "character": 5
2326
2512
  },
2327
2513
  "signature": "(property) mergeResults: ApplyVersionResults",
@@ -2330,7 +2516,7 @@
2330
2516
  "__schema": "TypeRefSchema",
2331
2517
  "location": {
2332
2518
  "filePath": "merge-lanes.main.runtime.ts",
2333
- "line": 104,
2519
+ "line": 102,
2334
2520
  "character": 5
2335
2521
  },
2336
2522
  "name": "ApplyVersionResults",
@@ -2345,7 +2531,7 @@
2345
2531
  "__schema": "VariableLikeSchema",
2346
2532
  "location": {
2347
2533
  "filePath": "merge-lanes.main.runtime.ts",
2348
- "line": 105,
2534
+ "line": 103,
2349
2535
  "character": 5
2350
2536
  },
2351
2537
  "signature": "(property) deleteResults: any",
@@ -2354,7 +2540,7 @@
2354
2540
  "__schema": "KeywordTypeSchema",
2355
2541
  "location": {
2356
2542
  "filePath": "merge-lanes.main.runtime.ts",
2357
- "line": 105,
2543
+ "line": 103,
2358
2544
  "character": 20
2359
2545
  },
2360
2546
  "name": "any"
@@ -2365,7 +2551,7 @@
2365
2551
  "__schema": "VariableLikeSchema",
2366
2552
  "location": {
2367
2553
  "filePath": "merge-lanes.main.runtime.ts",
2368
- "line": 106,
2554
+ "line": 104,
2369
2555
  "character": 5
2370
2556
  },
2371
2557
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -2374,17 +2560,21 @@
2374
2560
  "__schema": "TypeArraySchema",
2375
2561
  "location": {
2376
2562
  "filePath": "merge-lanes.main.runtime.ts",
2377
- "line": 106,
2563
+ "line": 104,
2378
2564
  "character": 25
2379
2565
  },
2380
2566
  "type": {
2381
2567
  "__schema": "TypeRefSchema",
2382
2568
  "location": {
2383
2569
  "filePath": "merge-lanes.main.runtime.ts",
2384
- "line": 106,
2570
+ "line": 104,
2385
2571
  "character": 25
2386
2572
  },
2387
- "name": "ConfigMergeResult"
2573
+ "name": "ConfigMergeResult",
2574
+ "componentId": {
2575
+ "scope": "teambit.workspace",
2576
+ "name": "config-merger"
2577
+ }
2388
2578
  }
2389
2579
  },
2390
2580
  "isOptional": false
@@ -2393,7 +2583,7 @@
2393
2583
  "__schema": "VariableLikeSchema",
2394
2584
  "location": {
2395
2585
  "filePath": "merge-lanes.main.runtime.ts",
2396
- "line": 107,
2586
+ "line": 105,
2397
2587
  "character": 5
2398
2588
  },
2399
2589
  "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
@@ -2402,17 +2592,22 @@
2402
2592
  "__schema": "TypeArraySchema",
2403
2593
  "location": {
2404
2594
  "filePath": "merge-lanes.main.runtime.ts",
2405
- "line": 107,
2595
+ "line": 105,
2406
2596
  "character": 28
2407
2597
  },
2408
2598
  "type": {
2409
2599
  "__schema": "TypeRefSchema",
2410
2600
  "location": {
2411
2601
  "filePath": "merge-lanes.main.runtime.ts",
2412
- "line": 107,
2602
+ "line": 105,
2413
2603
  "character": 28
2414
2604
  },
2415
- "name": "ComponentID"
2605
+ "name": "ComponentID",
2606
+ "componentId": {
2607
+ "scope": "teambit.component",
2608
+ "name": "component-id",
2609
+ "version": "1.2.2"
2610
+ }
2416
2611
  }
2417
2612
  },
2418
2613
  "isOptional": false
@@ -2421,7 +2616,7 @@
2421
2616
  "__schema": "VariableLikeSchema",
2422
2617
  "location": {
2423
2618
  "filePath": "merge-lanes.main.runtime.ts",
2424
- "line": 108,
2619
+ "line": 106,
2425
2620
  "character": 5
2426
2621
  },
2427
2622
  "signature": "(property) conflicts: ConflictPerId[]",
@@ -2430,17 +2625,18 @@
2430
2625
  "__schema": "TypeArraySchema",
2431
2626
  "location": {
2432
2627
  "filePath": "merge-lanes.main.runtime.ts",
2433
- "line": 108,
2628
+ "line": 106,
2434
2629
  "character": 16
2435
2630
  },
2436
2631
  "type": {
2437
2632
  "__schema": "TypeRefSchema",
2438
2633
  "location": {
2439
2634
  "filePath": "merge-lanes.main.runtime.ts",
2440
- "line": 108,
2635
+ "line": 106,
2441
2636
  "character": 16
2442
2637
  },
2443
- "name": "ConflictPerId"
2638
+ "name": "ConflictPerId",
2639
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2444
2640
  }
2445
2641
  },
2446
2642
  "isOptional": false
@@ -2457,7 +2653,7 @@
2457
2653
  "__schema": "FunctionLikeSchema",
2458
2654
  "location": {
2459
2655
  "filePath": "merge-lanes.main.runtime.ts",
2460
- "line": 324,
2656
+ "line": 322,
2461
2657
  "character": 3
2462
2658
  },
2463
2659
  "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
@@ -2467,7 +2663,7 @@
2467
2663
  "__schema": "ParameterSchema",
2468
2664
  "location": {
2469
2665
  "filePath": "merge-lanes.main.runtime.ts",
2470
- "line": 324,
2666
+ "line": 322,
2471
2667
  "character": 19
2472
2668
  },
2473
2669
  "name": "newLaneName",
@@ -2475,7 +2671,7 @@
2475
2671
  "__schema": "KeywordTypeSchema",
2476
2672
  "location": {
2477
2673
  "filePath": "merge-lanes.main.runtime.ts",
2478
- "line": 324,
2674
+ "line": 322,
2479
2675
  "character": 32
2480
2676
  },
2481
2677
  "name": "string"
@@ -2487,7 +2683,7 @@
2487
2683
  "__schema": "ParameterSchema",
2488
2684
  "location": {
2489
2685
  "filePath": "merge-lanes.main.runtime.ts",
2490
- "line": 324,
2686
+ "line": 322,
2491
2687
  "character": 40
2492
2688
  },
2493
2689
  "name": "options",
@@ -2495,7 +2691,7 @@
2495
2691
  "__schema": "TypeLiteralSchema",
2496
2692
  "location": {
2497
2693
  "filePath": "merge-lanes.main.runtime.ts",
2498
- "line": 324,
2694
+ "line": 322,
2499
2695
  "character": 49
2500
2696
  },
2501
2697
  "members": [
@@ -2503,7 +2699,7 @@
2503
2699
  "__schema": "VariableLikeSchema",
2504
2700
  "location": {
2505
2701
  "filePath": "merge-lanes.main.runtime.ts",
2506
- "line": 324,
2702
+ "line": 322,
2507
2703
  "character": 51
2508
2704
  },
2509
2705
  "signature": "(property) scope?: string | undefined",
@@ -2512,7 +2708,7 @@
2512
2708
  "__schema": "KeywordTypeSchema",
2513
2709
  "location": {
2514
2710
  "filePath": "merge-lanes.main.runtime.ts",
2515
- "line": 324,
2711
+ "line": 322,
2516
2712
  "character": 59
2517
2713
  },
2518
2714
  "name": "string"
@@ -2529,7 +2725,7 @@
2529
2725
  "__schema": "InferenceTypeSchema",
2530
2726
  "location": {
2531
2727
  "filePath": "merge-lanes.main.runtime.ts",
2532
- "line": 324,
2728
+ "line": 322,
2533
2729
  "character": 3
2534
2730
  },
2535
2731
  "type": "Promise<CreateLaneResult>"
@@ -2542,7 +2738,7 @@
2542
2738
  "__schema": "FunctionLikeSchema",
2543
2739
  "location": {
2544
2740
  "filePath": "merge-lanes.main.runtime.ts",
2545
- "line": 332,
2741
+ "line": 330,
2546
2742
  "character": 3
2547
2743
  },
2548
2744
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -2552,7 +2748,7 @@
2552
2748
  "__schema": "ParameterSchema",
2553
2749
  "location": {
2554
2750
  "filePath": "merge-lanes.main.runtime.ts",
2555
- "line": 332,
2751
+ "line": 330,
2556
2752
  "character": 24
2557
2753
  },
2558
2754
  "name": "checkoutProps",
@@ -2560,10 +2756,14 @@
2560
2756
  "__schema": "TypeRefSchema",
2561
2757
  "location": {
2562
2758
  "filePath": "merge-lanes.main.runtime.ts",
2563
- "line": 332,
2759
+ "line": 330,
2564
2760
  "character": 39
2565
2761
  },
2566
- "name": "CheckoutProps"
2762
+ "name": "CheckoutProps",
2763
+ "componentId": {
2764
+ "scope": "teambit.component",
2765
+ "name": "checkout"
2766
+ }
2567
2767
  },
2568
2768
  "isOptional": false,
2569
2769
  "isSpread": false
@@ -2572,7 +2772,7 @@
2572
2772
  "__schema": "ParameterSchema",
2573
2773
  "location": {
2574
2774
  "filePath": "merge-lanes.main.runtime.ts",
2575
- "line": 332,
2775
+ "line": 330,
2576
2776
  "character": 54
2577
2777
  },
2578
2778
  "name": "mergeAbortOpts",
@@ -2580,10 +2780,11 @@
2580
2780
  "__schema": "TypeRefSchema",
2581
2781
  "location": {
2582
2782
  "filePath": "merge-lanes.main.runtime.ts",
2583
- "line": 332,
2783
+ "line": 330,
2584
2784
  "character": 70
2585
2785
  },
2586
- "name": "MergeAbortOpts"
2786
+ "name": "MergeAbortOpts",
2787
+ "internalFilePath": "merge-abort.cmd.ts"
2587
2788
  },
2588
2789
  "isOptional": false,
2589
2790
  "isSpread": false
@@ -2593,7 +2794,7 @@
2593
2794
  "__schema": "InferenceTypeSchema",
2594
2795
  "location": {
2595
2796
  "filePath": "merge-lanes.main.runtime.ts",
2596
- "line": 332,
2797
+ "line": 330,
2597
2798
  "character": 3
2598
2799
  },
2599
2800
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -2606,7 +2807,7 @@
2606
2807
  "__schema": "FunctionLikeSchema",
2607
2808
  "location": {
2608
2809
  "filePath": "merge-lanes.main.runtime.ts",
2609
- "line": 388,
2810
+ "line": 386,
2610
2811
  "character": 3
2611
2812
  },
2612
2813
  "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
@@ -2616,7 +2817,7 @@
2616
2817
  "__schema": "ParameterSchema",
2617
2818
  "location": {
2618
2819
  "filePath": "merge-lanes.main.runtime.ts",
2619
- "line": 389,
2820
+ "line": 387,
2620
2821
  "character": 5
2621
2822
  },
2622
2823
  "name": "fromLane",
@@ -2624,7 +2825,7 @@
2624
2825
  "__schema": "KeywordTypeSchema",
2625
2826
  "location": {
2626
2827
  "filePath": "merge-lanes.main.runtime.ts",
2627
- "line": 389,
2828
+ "line": 387,
2628
2829
  "character": 15
2629
2830
  },
2630
2831
  "name": "string"
@@ -2636,7 +2837,7 @@
2636
2837
  "__schema": "ParameterSchema",
2637
2838
  "location": {
2638
2839
  "filePath": "merge-lanes.main.runtime.ts",
2639
- "line": 390,
2840
+ "line": 388,
2640
2841
  "character": 5
2641
2842
  },
2642
2843
  "name": "toLane",
@@ -2644,7 +2845,7 @@
2644
2845
  "__schema": "KeywordTypeSchema",
2645
2846
  "location": {
2646
2847
  "filePath": "merge-lanes.main.runtime.ts",
2647
- "line": 390,
2848
+ "line": 388,
2648
2849
  "character": 13
2649
2850
  },
2650
2851
  "name": "string"
@@ -2656,7 +2857,7 @@
2656
2857
  "__schema": "ParameterSchema",
2657
2858
  "location": {
2658
2859
  "filePath": "merge-lanes.main.runtime.ts",
2659
- "line": 391,
2860
+ "line": 389,
2660
2861
  "character": 5
2661
2862
  },
2662
2863
  "name": "options",
@@ -2664,7 +2865,7 @@
2664
2865
  "__schema": "TypeIntersectionSchema",
2665
2866
  "location": {
2666
2867
  "filePath": "merge-lanes.main.runtime.ts",
2667
- "line": 391,
2868
+ "line": 389,
2668
2869
  "character": 14
2669
2870
  },
2670
2871
  "types": [
@@ -2672,7 +2873,7 @@
2672
2873
  "__schema": "TypeRefSchema",
2673
2874
  "location": {
2674
2875
  "filePath": "merge-lanes.main.runtime.ts",
2675
- "line": 391,
2876
+ "line": 389,
2676
2877
  "character": 14
2677
2878
  },
2678
2879
  "name": "Partial",
@@ -2681,10 +2882,11 @@
2681
2882
  "__schema": "TypeRefSchema",
2682
2883
  "location": {
2683
2884
  "filePath": "merge-lanes.main.runtime.ts",
2684
- "line": 391,
2885
+ "line": 389,
2685
2886
  "character": 22
2686
2887
  },
2687
- "name": "MergeLaneOptions"
2888
+ "name": "MergeLaneOptions",
2889
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2688
2890
  }
2689
2891
  ]
2690
2892
  },
@@ -2692,7 +2894,7 @@
2692
2894
  "__schema": "TypeLiteralSchema",
2693
2895
  "location": {
2694
2896
  "filePath": "merge-lanes.main.runtime.ts",
2695
- "line": 391,
2897
+ "line": 389,
2696
2898
  "character": 42
2697
2899
  },
2698
2900
  "members": [
@@ -2700,7 +2902,7 @@
2700
2902
  "__schema": "VariableLikeSchema",
2701
2903
  "location": {
2702
2904
  "filePath": "merge-lanes.main.runtime.ts",
2703
- "line": 391,
2905
+ "line": 389,
2704
2906
  "character": 44
2705
2907
  },
2706
2908
  "signature": "(property) push?: boolean | undefined",
@@ -2709,7 +2911,7 @@
2709
2911
  "__schema": "KeywordTypeSchema",
2710
2912
  "location": {
2711
2913
  "filePath": "merge-lanes.main.runtime.ts",
2712
- "line": 391,
2914
+ "line": 389,
2713
2915
  "character": 51
2714
2916
  },
2715
2917
  "name": "boolean"
@@ -2720,7 +2922,7 @@
2720
2922
  "__schema": "VariableLikeSchema",
2721
2923
  "location": {
2722
2924
  "filePath": "merge-lanes.main.runtime.ts",
2723
- "line": 391,
2925
+ "line": 389,
2724
2926
  "character": 60
2725
2927
  },
2726
2928
  "signature": "(property) reMerge?: boolean | undefined",
@@ -2729,7 +2931,7 @@
2729
2931
  "__schema": "KeywordTypeSchema",
2730
2932
  "location": {
2731
2933
  "filePath": "merge-lanes.main.runtime.ts",
2732
- "line": 391,
2934
+ "line": 389,
2733
2935
  "character": 70
2734
2936
  },
2735
2937
  "name": "boolean"
@@ -2748,7 +2950,7 @@
2748
2950
  "__schema": "TypeRefSchema",
2749
2951
  "location": {
2750
2952
  "filePath": "merge-lanes.main.runtime.ts",
2751
- "line": 392,
2953
+ "line": 390,
2752
2954
  "character": 6
2753
2955
  },
2754
2956
  "name": "Promise",
@@ -2757,10 +2959,11 @@
2757
2959
  "__schema": "TypeRefSchema",
2758
2960
  "location": {
2759
2961
  "filePath": "merge-lanes.main.runtime.ts",
2760
- "line": 392,
2962
+ "line": 390,
2761
2963
  "character": 14
2762
2964
  },
2763
- "name": "MergeFromScopeResult"
2965
+ "name": "MergeFromScopeResult",
2966
+ "internalFilePath": "merge-lanes.main.runtime.ts"
2764
2967
  }
2765
2968
  ]
2766
2969
  },
@@ -2772,7 +2975,7 @@
2772
2975
  "__schema": "VariableLikeSchema",
2773
2976
  "location": {
2774
2977
  "filePath": "merge-lanes.main.runtime.ts",
2775
- "line": 485,
2978
+ "line": 483,
2776
2979
  "character": 3
2777
2980
  },
2778
2981
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2781,7 +2984,7 @@
2781
2984
  "__schema": "InferenceTypeSchema",
2782
2985
  "location": {
2783
2986
  "filePath": "merge-lanes.main.runtime.ts",
2784
- "line": 485,
2987
+ "line": 483,
2785
2988
  "character": 3
2786
2989
  },
2787
2990
  "type": "never[]"
@@ -2793,7 +2996,7 @@
2793
2996
  "__schema": "VariableLikeSchema",
2794
2997
  "location": {
2795
2998
  "filePath": "merge-lanes.main.runtime.ts",
2796
- "line": 486,
2999
+ "line": 484,
2797
3000
  "character": 3
2798
3001
  },
2799
3002
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2802,7 +3005,7 @@
2802
3005
  "__schema": "InferenceTypeSchema",
2803
3006
  "location": {
2804
3007
  "filePath": "merge-lanes.main.runtime.ts",
2805
- "line": 486,
3008
+ "line": 484,
2806
3009
  "character": 3
2807
3010
  },
2808
3011
  "type": "Aspect[]"
@@ -2814,7 +3017,7 @@
2814
3017
  "__schema": "VariableLikeSchema",
2815
3018
  "location": {
2816
3019
  "filePath": "merge-lanes.main.runtime.ts",
2817
- "line": 499,
3020
+ "line": 497,
2818
3021
  "character": 3
2819
3022
  },
2820
3023
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2823,7 +3026,7 @@
2823
3026
  "__schema": "InferenceTypeSchema",
2824
3027
  "location": {
2825
3028
  "filePath": "merge-lanes.main.runtime.ts",
2826
- "line": 499,
3029
+ "line": 497,
2827
3030
  "character": 3
2828
3031
  },
2829
3032
  "type": "RuntimeDefinition"
@@ -2835,7 +3038,7 @@
2835
3038
  "__schema": "FunctionLikeSchema",
2836
3039
  "location": {
2837
3040
  "filePath": "merge-lanes.main.runtime.ts",
2838
- "line": 501,
3041
+ "line": 499,
2839
3042
  "character": 3
2840
3043
  },
2841
3044
  "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>",
@@ -2845,7 +3048,7 @@
2845
3048
  "__schema": "ParameterSchema",
2846
3049
  "location": {
2847
3050
  "filePath": "merge-lanes.main.runtime.ts",
2848
- "line": 501,
3051
+ "line": 499,
2849
3052
  "character": 25
2850
3053
  },
2851
3054
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2853,7 +3056,7 @@
2853
3056
  "__schema": "TupleTypeSchema",
2854
3057
  "location": {
2855
3058
  "filePath": "merge-lanes.main.runtime.ts",
2856
- "line": 513,
3059
+ "line": 511,
2857
3060
  "character": 6
2858
3061
  },
2859
3062
  "elements": [
@@ -2861,100 +3064,144 @@
2861
3064
  "__schema": "TypeRefSchema",
2862
3065
  "location": {
2863
3066
  "filePath": "merge-lanes.main.runtime.ts",
2864
- "line": 514,
3067
+ "line": 512,
2865
3068
  "character": 5
2866
3069
  },
2867
- "name": "LanesMain"
3070
+ "name": "LanesMain",
3071
+ "componentId": {
3072
+ "scope": "teambit.lanes",
3073
+ "name": "lanes"
3074
+ }
2868
3075
  },
2869
3076
  {
2870
3077
  "__schema": "TypeRefSchema",
2871
3078
  "location": {
2872
3079
  "filePath": "merge-lanes.main.runtime.ts",
2873
- "line": 515,
3080
+ "line": 513,
2874
3081
  "character": 5
2875
3082
  },
2876
- "name": "CLIMain"
3083
+ "name": "CLIMain",
3084
+ "componentId": {
3085
+ "scope": "teambit.harmony",
3086
+ "name": "cli"
3087
+ }
2877
3088
  },
2878
3089
  {
2879
3090
  "__schema": "TypeRefSchema",
2880
3091
  "location": {
2881
3092
  "filePath": "merge-lanes.main.runtime.ts",
2882
- "line": 516,
3093
+ "line": 514,
2883
3094
  "character": 5
2884
3095
  },
2885
- "name": "Workspace"
3096
+ "name": "Workspace",
3097
+ "componentId": {
3098
+ "scope": "teambit.workspace",
3099
+ "name": "workspace"
3100
+ }
2886
3101
  },
2887
3102
  {
2888
3103
  "__schema": "TypeRefSchema",
2889
3104
  "location": {
2890
3105
  "filePath": "merge-lanes.main.runtime.ts",
2891
- "line": 517,
3106
+ "line": 515,
2892
3107
  "character": 5
2893
3108
  },
2894
- "name": "MergingMain"
3109
+ "name": "MergingMain",
3110
+ "componentId": {
3111
+ "scope": "teambit.component",
3112
+ "name": "merging"
3113
+ }
2895
3114
  },
2896
3115
  {
2897
3116
  "__schema": "TypeRefSchema",
2898
3117
  "location": {
2899
3118
  "filePath": "merge-lanes.main.runtime.ts",
2900
- "line": 518,
3119
+ "line": 516,
2901
3120
  "character": 5
2902
3121
  },
2903
- "name": "LoggerMain"
3122
+ "name": "LoggerMain",
3123
+ "componentId": {
3124
+ "scope": "teambit.harmony",
3125
+ "name": "logger"
3126
+ }
2904
3127
  },
2905
3128
  {
2906
3129
  "__schema": "TypeRefSchema",
2907
3130
  "location": {
2908
3131
  "filePath": "merge-lanes.main.runtime.ts",
2909
- "line": 519,
3132
+ "line": 517,
2910
3133
  "character": 5
2911
3134
  },
2912
- "name": "RemoveMain"
3135
+ "name": "RemoveMain",
3136
+ "componentId": {
3137
+ "scope": "teambit.component",
3138
+ "name": "remove"
3139
+ }
2913
3140
  },
2914
3141
  {
2915
3142
  "__schema": "TypeRefSchema",
2916
3143
  "location": {
2917
3144
  "filePath": "merge-lanes.main.runtime.ts",
2918
- "line": 520,
3145
+ "line": 518,
2919
3146
  "character": 5
2920
3147
  },
2921
- "name": "ScopeMain"
3148
+ "name": "ScopeMain",
3149
+ "componentId": {
3150
+ "scope": "teambit.scope",
3151
+ "name": "scope"
3152
+ }
2922
3153
  },
2923
3154
  {
2924
3155
  "__schema": "TypeRefSchema",
2925
3156
  "location": {
2926
3157
  "filePath": "merge-lanes.main.runtime.ts",
2927
- "line": 521,
3158
+ "line": 519,
2928
3159
  "character": 5
2929
3160
  },
2930
- "name": "ExportMain"
3161
+ "name": "ExportMain",
3162
+ "componentId": {
3163
+ "scope": "teambit.scope",
3164
+ "name": "export"
3165
+ }
2931
3166
  },
2932
3167
  {
2933
3168
  "__schema": "TypeRefSchema",
2934
3169
  "location": {
2935
3170
  "filePath": "merge-lanes.main.runtime.ts",
2936
- "line": 522,
3171
+ "line": 520,
2937
3172
  "character": 5
2938
3173
  },
2939
- "name": "ImporterMain"
3174
+ "name": "ImporterMain",
3175
+ "componentId": {
3176
+ "scope": "teambit.scope",
3177
+ "name": "importer"
3178
+ }
2940
3179
  },
2941
3180
  {
2942
3181
  "__schema": "TypeRefSchema",
2943
3182
  "location": {
2944
3183
  "filePath": "merge-lanes.main.runtime.ts",
2945
- "line": 523,
3184
+ "line": 521,
2946
3185
  "character": 5
2947
3186
  },
2948
- "name": "CheckoutMain"
3187
+ "name": "CheckoutMain",
3188
+ "componentId": {
3189
+ "scope": "teambit.component",
3190
+ "name": "checkout"
3191
+ }
2949
3192
  },
2950
3193
  {
2951
3194
  "__schema": "TypeRefSchema",
2952
3195
  "location": {
2953
3196
  "filePath": "merge-lanes.main.runtime.ts",
2954
- "line": 524,
3197
+ "line": 522,
2955
3198
  "character": 5
2956
3199
  },
2957
- "name": "GlobalConfigMain"
3200
+ "name": "GlobalConfigMain",
3201
+ "componentId": {
3202
+ "scope": "teambit.harmony",
3203
+ "name": "global-config"
3204
+ }
2958
3205
  }
2959
3206
  ]
2960
3207
  },
@@ -2966,7 +3213,7 @@
2966
3213
  "__schema": "InferenceTypeSchema",
2967
3214
  "location": {
2968
3215
  "filePath": "merge-lanes.main.runtime.ts",
2969
- "line": 501,
3216
+ "line": 499,
2970
3217
  "character": 3
2971
3218
  },
2972
3219
  "type": "Promise<MergeLanesMain>"
@@ -2984,7 +3231,7 @@
2984
3231
  "__schema": "UnImplementedSchema",
2985
3232
  "location": {
2986
3233
  "filePath": "merge-lanes.main.runtime.ts",
2987
- "line": 796,
3234
+ "line": 794,
2988
3235
  "character": 16
2989
3236
  },
2990
3237
  "name": "MergeLanesMain",
@@ -2996,7 +3243,7 @@
2996
3243
  "__schema": "FunctionLikeSchema",
2997
3244
  "location": {
2998
3245
  "filePath": "merge-lanes.main.runtime.ts",
2999
- "line": 547,
3246
+ "line": 545,
3000
3247
  "character": 1
3001
3248
  },
3002
3249
  "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
@@ -3006,7 +3253,7 @@
3006
3253
  "__schema": "ParameterSchema",
3007
3254
  "location": {
3008
3255
  "filePath": "merge-lanes.main.runtime.ts",
3009
- "line": 548,
3256
+ "line": 546,
3010
3257
  "character": 3
3011
3258
  },
3012
3259
  "name": "allComponentsStatus",
@@ -3014,17 +3261,21 @@
3014
3261
  "__schema": "TypeArraySchema",
3015
3262
  "location": {
3016
3263
  "filePath": "merge-lanes.main.runtime.ts",
3017
- "line": 548,
3264
+ "line": 546,
3018
3265
  "character": 24
3019
3266
  },
3020
3267
  "type": {
3021
3268
  "__schema": "TypeRefSchema",
3022
3269
  "location": {
3023
3270
  "filePath": "merge-lanes.main.runtime.ts",
3024
- "line": 548,
3271
+ "line": 546,
3025
3272
  "character": 24
3026
3273
  },
3027
- "name": "ComponentMergeStatus"
3274
+ "name": "ComponentMergeStatus",
3275
+ "componentId": {
3276
+ "scope": "teambit.component",
3277
+ "name": "merging"
3278
+ }
3028
3279
  }
3029
3280
  },
3030
3281
  "isOptional": false,
@@ -3034,7 +3285,7 @@
3034
3285
  "__schema": "ParameterSchema",
3035
3286
  "location": {
3036
3287
  "filePath": "merge-lanes.main.runtime.ts",
3037
- "line": 549,
3288
+ "line": 547,
3038
3289
  "character": 3
3039
3290
  },
3040
3291
  "name": "compIdsToKeep",
@@ -3042,17 +3293,22 @@
3042
3293
  "__schema": "TypeArraySchema",
3043
3294
  "location": {
3044
3295
  "filePath": "merge-lanes.main.runtime.ts",
3045
- "line": 549,
3296
+ "line": 547,
3046
3297
  "character": 18
3047
3298
  },
3048
3299
  "type": {
3049
3300
  "__schema": "TypeRefSchema",
3050
3301
  "location": {
3051
3302
  "filePath": "merge-lanes.main.runtime.ts",
3052
- "line": 549,
3303
+ "line": 547,
3053
3304
  "character": 18
3054
3305
  },
3055
- "name": "ComponentID"
3306
+ "name": "ComponentID",
3307
+ "componentId": {
3308
+ "scope": "teambit.component",
3309
+ "name": "component-id",
3310
+ "version": "1.2.2"
3311
+ }
3056
3312
  }
3057
3313
  },
3058
3314
  "isOptional": false,
@@ -3062,7 +3318,7 @@
3062
3318
  "__schema": "ParameterSchema",
3063
3319
  "location": {
3064
3320
  "filePath": "merge-lanes.main.runtime.ts",
3065
- "line": 550,
3321
+ "line": 548,
3066
3322
  "character": 3
3067
3323
  },
3068
3324
  "name": "allBitIds",
@@ -3070,17 +3326,22 @@
3070
3326
  "__schema": "TypeArraySchema",
3071
3327
  "location": {
3072
3328
  "filePath": "merge-lanes.main.runtime.ts",
3073
- "line": 550,
3329
+ "line": 548,
3074
3330
  "character": 14
3075
3331
  },
3076
3332
  "type": {
3077
3333
  "__schema": "TypeRefSchema",
3078
3334
  "location": {
3079
3335
  "filePath": "merge-lanes.main.runtime.ts",
3080
- "line": 550,
3336
+ "line": 548,
3081
3337
  "character": 14
3082
3338
  },
3083
- "name": "ComponentID"
3339
+ "name": "ComponentID",
3340
+ "componentId": {
3341
+ "scope": "teambit.component",
3342
+ "name": "component-id",
3343
+ "version": "1.2.2"
3344
+ }
3084
3345
  }
3085
3346
  },
3086
3347
  "isOptional": false,
@@ -3090,7 +3351,7 @@
3090
3351
  "__schema": "ParameterSchema",
3091
3352
  "location": {
3092
3353
  "filePath": "merge-lanes.main.runtime.ts",
3093
- "line": 551,
3354
+ "line": 549,
3094
3355
  "character": 3
3095
3356
  },
3096
3357
  "name": "legacyScope",
@@ -3098,7 +3359,7 @@
3098
3359
  "__schema": "TypeRefSchema",
3099
3360
  "location": {
3100
3361
  "filePath": "merge-lanes.main.runtime.ts",
3101
- "line": 551,
3362
+ "line": 549,
3102
3363
  "character": 16
3103
3364
  },
3104
3365
  "name": "LegacyScope"
@@ -3110,7 +3371,7 @@
3110
3371
  "__schema": "ParameterSchema",
3111
3372
  "location": {
3112
3373
  "filePath": "merge-lanes.main.runtime.ts",
3113
- "line": 552,
3374
+ "line": 550,
3114
3375
  "character": 3
3115
3376
  },
3116
3377
  "name": "includeDeps",
@@ -3118,7 +3379,7 @@
3118
3379
  "__schema": "InferenceTypeSchema",
3119
3380
  "location": {
3120
3381
  "filePath": "merge-lanes.main.runtime.ts",
3121
- "line": 552,
3382
+ "line": 550,
3122
3383
  "character": 3
3123
3384
  },
3124
3385
  "type": "boolean"
@@ -3131,7 +3392,7 @@
3131
3392
  "__schema": "ParameterSchema",
3132
3393
  "location": {
3133
3394
  "filePath": "merge-lanes.main.runtime.ts",
3134
- "line": 553,
3395
+ "line": 551,
3135
3396
  "character": 3
3136
3397
  },
3137
3398
  "name": "otherLane",
@@ -3139,10 +3400,15 @@
3139
3400
  "__schema": "TypeRefSchema",
3140
3401
  "location": {
3141
3402
  "filePath": "merge-lanes.main.runtime.ts",
3142
- "line": 553,
3403
+ "line": 551,
3143
3404
  "character": 15
3144
3405
  },
3145
- "name": "Lane"
3406
+ "name": "Lane",
3407
+ "componentId": {
3408
+ "scope": "teambit.scope",
3409
+ "name": "objects",
3410
+ "version": "0.0.2"
3411
+ }
3146
3412
  },
3147
3413
  "isOptional": true,
3148
3414
  "isSpread": false
@@ -3151,7 +3417,7 @@
3151
3417
  "__schema": "ParameterSchema",
3152
3418
  "location": {
3153
3419
  "filePath": "merge-lanes.main.runtime.ts",
3154
- "line": 554,
3420
+ "line": 552,
3155
3421
  "character": 3
3156
3422
  },
3157
3423
  "name": "shouldSquash",
@@ -3159,7 +3425,7 @@
3159
3425
  "__schema": "KeywordTypeSchema",
3160
3426
  "location": {
3161
3427
  "filePath": "merge-lanes.main.runtime.ts",
3162
- "line": 554,
3428
+ "line": 552,
3163
3429
  "character": 18
3164
3430
  },
3165
3431
  "name": "boolean"
@@ -3172,7 +3438,7 @@
3172
3438
  "__schema": "TypeRefSchema",
3173
3439
  "location": {
3174
3440
  "filePath": "merge-lanes.main.runtime.ts",
3175
- "line": 555,
3441
+ "line": 553,
3176
3442
  "character": 4
3177
3443
  },
3178
3444
  "name": "Promise",
@@ -3181,17 +3447,21 @@
3181
3447
  "__schema": "TypeArraySchema",
3182
3448
  "location": {
3183
3449
  "filePath": "merge-lanes.main.runtime.ts",
3184
- "line": 555,
3450
+ "line": 553,
3185
3451
  "character": 12
3186
3452
  },
3187
3453
  "type": {
3188
3454
  "__schema": "TypeRefSchema",
3189
3455
  "location": {
3190
3456
  "filePath": "merge-lanes.main.runtime.ts",
3191
- "line": 555,
3457
+ "line": 553,
3192
3458
  "character": 12
3193
3459
  },
3194
- "name": "ComponentMergeStatus"
3460
+ "name": "ComponentMergeStatus",
3461
+ "componentId": {
3462
+ "scope": "teambit.component",
3463
+ "name": "merging"
3464
+ }
3195
3465
  }
3196
3466
  }
3197
3467
  ]
@@ -3204,7 +3474,7 @@
3204
3474
  "__schema": "FunctionLikeSchema",
3205
3475
  "location": {
3206
3476
  "filePath": "merge-lanes.main.runtime.ts",
3207
- "line": 664,
3477
+ "line": 662,
3208
3478
  "character": 1
3209
3479
  },
3210
3480
  "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
@@ -3214,7 +3484,7 @@
3214
3484
  "__schema": "ParameterSchema",
3215
3485
  "location": {
3216
3486
  "filePath": "merge-lanes.main.runtime.ts",
3217
- "line": 664,
3487
+ "line": 662,
3218
3488
  "character": 32
3219
3489
  },
3220
3490
  "name": "otherLaneId",
@@ -3222,10 +3492,15 @@
3222
3492
  "__schema": "TypeRefSchema",
3223
3493
  "location": {
3224
3494
  "filePath": "merge-lanes.main.runtime.ts",
3225
- "line": 664,
3495
+ "line": 662,
3226
3496
  "character": 45
3227
3497
  },
3228
- "name": "LaneId"
3498
+ "name": "LaneId",
3499
+ "componentId": {
3500
+ "scope": "teambit.lanes",
3501
+ "name": "lane-id",
3502
+ "version": "0.0.311"
3503
+ }
3229
3504
  },
3230
3505
  "isOptional": false,
3231
3506
  "isSpread": false
@@ -3235,7 +3510,7 @@
3235
3510
  "__schema": "InferenceTypeSchema",
3236
3511
  "location": {
3237
3512
  "filePath": "merge-lanes.main.runtime.ts",
3238
- "line": 664,
3513
+ "line": 662,
3239
3514
  "character": 1
3240
3515
  },
3241
3516
  "type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
@@ -3248,7 +3523,7 @@
3248
3523
  "__schema": "FunctionLikeSchema",
3249
3524
  "location": {
3250
3525
  "filePath": "merge-lanes.main.runtime.ts",
3251
- "line": 673,
3526
+ "line": 671,
3252
3527
  "character": 1
3253
3528
  },
3254
3529
  "signature": "function squashSnaps(succeededComponents: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
@@ -3258,7 +3533,7 @@
3258
3533
  "__schema": "ParameterSchema",
3259
3534
  "location": {
3260
3535
  "filePath": "merge-lanes.main.runtime.ts",
3261
- "line": 674,
3536
+ "line": 672,
3262
3537
  "character": 3
3263
3538
  },
3264
3539
  "name": "succeededComponents",
@@ -3266,17 +3541,21 @@
3266
3541
  "__schema": "TypeArraySchema",
3267
3542
  "location": {
3268
3543
  "filePath": "merge-lanes.main.runtime.ts",
3269
- "line": 674,
3544
+ "line": 672,
3270
3545
  "character": 24
3271
3546
  },
3272
3547
  "type": {
3273
3548
  "__schema": "TypeRefSchema",
3274
3549
  "location": {
3275
3550
  "filePath": "merge-lanes.main.runtime.ts",
3276
- "line": 674,
3551
+ "line": 672,
3277
3552
  "character": 24
3278
3553
  },
3279
- "name": "ComponentMergeStatus"
3554
+ "name": "ComponentMergeStatus",
3555
+ "componentId": {
3556
+ "scope": "teambit.component",
3557
+ "name": "merging"
3558
+ }
3280
3559
  }
3281
3560
  },
3282
3561
  "isOptional": false,
@@ -3286,7 +3565,7 @@
3286
3565
  "__schema": "ParameterSchema",
3287
3566
  "location": {
3288
3567
  "filePath": "merge-lanes.main.runtime.ts",
3289
- "line": 675,
3568
+ "line": 673,
3290
3569
  "character": 3
3291
3570
  },
3292
3571
  "name": "currentLaneId",
@@ -3294,10 +3573,15 @@
3294
3573
  "__schema": "TypeRefSchema",
3295
3574
  "location": {
3296
3575
  "filePath": "merge-lanes.main.runtime.ts",
3297
- "line": 675,
3576
+ "line": 673,
3298
3577
  "character": 18
3299
3578
  },
3300
- "name": "LaneId"
3579
+ "name": "LaneId",
3580
+ "componentId": {
3581
+ "scope": "teambit.lanes",
3582
+ "name": "lane-id",
3583
+ "version": "0.0.311"
3584
+ }
3301
3585
  },
3302
3586
  "isOptional": false,
3303
3587
  "isSpread": false
@@ -3306,7 +3590,7 @@
3306
3590
  "__schema": "ParameterSchema",
3307
3591
  "location": {
3308
3592
  "filePath": "merge-lanes.main.runtime.ts",
3309
- "line": 676,
3593
+ "line": 674,
3310
3594
  "character": 3
3311
3595
  },
3312
3596
  "name": "otherLaneId",
@@ -3314,10 +3598,15 @@
3314
3598
  "__schema": "TypeRefSchema",
3315
3599
  "location": {
3316
3600
  "filePath": "merge-lanes.main.runtime.ts",
3317
- "line": 676,
3601
+ "line": 674,
3318
3602
  "character": 16
3319
3603
  },
3320
- "name": "LaneId"
3604
+ "name": "LaneId",
3605
+ "componentId": {
3606
+ "scope": "teambit.lanes",
3607
+ "name": "lane-id",
3608
+ "version": "0.0.311"
3609
+ }
3321
3610
  },
3322
3611
  "isOptional": false,
3323
3612
  "isSpread": false
@@ -3326,7 +3615,7 @@
3326
3615
  "__schema": "ParameterSchema",
3327
3616
  "location": {
3328
3617
  "filePath": "merge-lanes.main.runtime.ts",
3329
- "line": 677,
3618
+ "line": 675,
3330
3619
  "character": 3
3331
3620
  },
3332
3621
  "name": "scope",
@@ -3334,7 +3623,7 @@
3334
3623
  "__schema": "TypeRefSchema",
3335
3624
  "location": {
3336
3625
  "filePath": "merge-lanes.main.runtime.ts",
3337
- "line": 677,
3626
+ "line": 675,
3338
3627
  "character": 10
3339
3628
  },
3340
3629
  "name": "LegacyScope"
@@ -3346,7 +3635,7 @@
3346
3635
  "__schema": "ParameterSchema",
3347
3636
  "location": {
3348
3637
  "filePath": "merge-lanes.main.runtime.ts",
3349
- "line": 678,
3638
+ "line": 676,
3350
3639
  "character": 3
3351
3640
  },
3352
3641
  "name": "messageTitle",
@@ -3354,7 +3643,7 @@
3354
3643
  "__schema": "KeywordTypeSchema",
3355
3644
  "location": {
3356
3645
  "filePath": "merge-lanes.main.runtime.ts",
3357
- "line": 678,
3646
+ "line": 676,
3358
3647
  "character": 18
3359
3648
  },
3360
3649
  "name": "string"
@@ -3367,7 +3656,7 @@
3367
3656
  "__schema": "InferenceTypeSchema",
3368
3657
  "location": {
3369
3658
  "filePath": "merge-lanes.main.runtime.ts",
3370
- "line": 673,
3659
+ "line": 671,
3371
3660
  "character": 1
3372
3661
  },
3373
3662
  "type": "Promise<void>"
@@ -3380,14 +3669,14 @@
3380
3669
  "__schema": "FunctionLikeSchema",
3381
3670
  "location": {
3382
3671
  "filePath": "merge-lanes.main.runtime.ts",
3383
- "line": 712,
3672
+ "line": 710,
3384
3673
  "character": 1
3385
3674
  },
3386
3675
  "doc": {
3387
3676
  "__schema": "DocSchema",
3388
3677
  "location": {
3389
3678
  "filePath": "merge-lanes.main.runtime.ts",
3390
- "line": 709,
3679
+ "line": 707,
3391
3680
  "character": 1
3392
3681
  },
3393
3682
  "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -3401,7 +3690,7 @@
3401
3690
  "__schema": "ParameterSchema",
3402
3691
  "location": {
3403
3692
  "filePath": "merge-lanes.main.runtime.ts",
3404
- "line": 713,
3693
+ "line": 711,
3405
3694
  "character": 3
3406
3695
  },
3407
3696
  "name": "currentLaneName",
@@ -3409,7 +3698,7 @@
3409
3698
  "__schema": "KeywordTypeSchema",
3410
3699
  "location": {
3411
3700
  "filePath": "merge-lanes.main.runtime.ts",
3412
- "line": 713,
3701
+ "line": 711,
3413
3702
  "character": 20
3414
3703
  },
3415
3704
  "name": "string"
@@ -3421,7 +3710,7 @@
3421
3710
  "__schema": "ParameterSchema",
3422
3711
  "location": {
3423
3712
  "filePath": "merge-lanes.main.runtime.ts",
3424
- "line": 714,
3713
+ "line": 712,
3425
3714
  "character": 3
3426
3715
  },
3427
3716
  "name": "otherLaneId",
@@ -3429,10 +3718,15 @@
3429
3718
  "__schema": "TypeRefSchema",
3430
3719
  "location": {
3431
3720
  "filePath": "merge-lanes.main.runtime.ts",
3432
- "line": 714,
3721
+ "line": 712,
3433
3722
  "character": 16
3434
3723
  },
3435
- "name": "LaneId"
3724
+ "name": "LaneId",
3725
+ "componentId": {
3726
+ "scope": "teambit.lanes",
3727
+ "name": "lane-id",
3728
+ "version": "0.0.311"
3729
+ }
3436
3730
  },
3437
3731
  "isOptional": false,
3438
3732
  "isSpread": false
@@ -3441,7 +3735,7 @@
3441
3735
  "__schema": "ParameterSchema",
3442
3736
  "location": {
3443
3737
  "filePath": "merge-lanes.main.runtime.ts",
3444
- "line": 715,
3738
+ "line": 713,
3445
3739
  "character": 3
3446
3740
  },
3447
3741
  "name": "id",
@@ -3449,10 +3743,15 @@
3449
3743
  "__schema": "TypeRefSchema",
3450
3744
  "location": {
3451
3745
  "filePath": "merge-lanes.main.runtime.ts",
3452
- "line": 715,
3746
+ "line": 713,
3453
3747
  "character": 7
3454
3748
  },
3455
- "name": "ComponentID"
3749
+ "name": "ComponentID",
3750
+ "componentId": {
3751
+ "scope": "teambit.component",
3752
+ "name": "component-id",
3753
+ "version": "1.2.2"
3754
+ }
3456
3755
  },
3457
3756
  "isOptional": false,
3458
3757
  "isSpread": false
@@ -3461,7 +3760,7 @@
3461
3760
  "__schema": "ParameterSchema",
3462
3761
  "location": {
3463
3762
  "filePath": "merge-lanes.main.runtime.ts",
3464
- "line": 716,
3763
+ "line": 714,
3465
3764
  "character": 3
3466
3765
  },
3467
3766
  "name": "divergeData",
@@ -3469,10 +3768,15 @@
3469
3768
  "__schema": "TypeRefSchema",
3470
3769
  "location": {
3471
3770
  "filePath": "merge-lanes.main.runtime.ts",
3472
- "line": 716,
3771
+ "line": 714,
3473
3772
  "character": 16
3474
3773
  },
3475
- "name": "SnapsDistance"
3774
+ "name": "SnapsDistance",
3775
+ "componentId": {
3776
+ "scope": "teambit.component",
3777
+ "name": "snap-distance",
3778
+ "version": "0.0.2"
3779
+ }
3476
3780
  },
3477
3781
  "isOptional": false,
3478
3782
  "isSpread": false
@@ -3481,7 +3785,7 @@
3481
3785
  "__schema": "ParameterSchema",
3482
3786
  "location": {
3483
3787
  "filePath": "merge-lanes.main.runtime.ts",
3484
- "line": 717,
3788
+ "line": 715,
3485
3789
  "character": 3
3486
3790
  },
3487
3791
  "name": "log",
@@ -3489,10 +3793,15 @@
3489
3793
  "__schema": "TypeRefSchema",
3490
3794
  "location": {
3491
3795
  "filePath": "merge-lanes.main.runtime.ts",
3492
- "line": 717,
3796
+ "line": 715,
3493
3797
  "character": 8
3494
3798
  },
3495
- "name": "Log"
3799
+ "name": "Log",
3800
+ "componentId": {
3801
+ "scope": "teambit.scope",
3802
+ "name": "objects",
3803
+ "version": "0.0.2"
3804
+ }
3496
3805
  },
3497
3806
  "isOptional": false,
3498
3807
  "isSpread": false
@@ -3501,7 +3810,7 @@
3501
3810
  "__schema": "ParameterSchema",
3502
3811
  "location": {
3503
3812
  "filePath": "merge-lanes.main.runtime.ts",
3504
- "line": 718,
3813
+ "line": 716,
3505
3814
  "character": 3
3506
3815
  },
3507
3816
  "name": "scope",
@@ -3509,7 +3818,7 @@
3509
3818
  "__schema": "TypeRefSchema",
3510
3819
  "location": {
3511
3820
  "filePath": "merge-lanes.main.runtime.ts",
3512
- "line": 718,
3821
+ "line": 716,
3513
3822
  "character": 10
3514
3823
  },
3515
3824
  "name": "LegacyScope"
@@ -3521,7 +3830,7 @@
3521
3830
  "__schema": "ParameterSchema",
3522
3831
  "location": {
3523
3832
  "filePath": "merge-lanes.main.runtime.ts",
3524
- "line": 719,
3833
+ "line": 717,
3525
3834
  "character": 3
3526
3835
  },
3527
3836
  "name": "componentFromModel",
@@ -3529,10 +3838,15 @@
3529
3838
  "__schema": "TypeRefSchema",
3530
3839
  "location": {
3531
3840
  "filePath": "merge-lanes.main.runtime.ts",
3532
- "line": 719,
3841
+ "line": 717,
3533
3842
  "character": 24
3534
3843
  },
3535
- "name": "Version"
3844
+ "name": "Version",
3845
+ "componentId": {
3846
+ "scope": "teambit.scope",
3847
+ "name": "objects",
3848
+ "version": "0.0.2"
3849
+ }
3536
3850
  },
3537
3851
  "isOptional": true,
3538
3852
  "isSpread": false
@@ -3541,7 +3855,7 @@
3541
3855
  "__schema": "ParameterSchema",
3542
3856
  "location": {
3543
3857
  "filePath": "merge-lanes.main.runtime.ts",
3544
- "line": 720,
3858
+ "line": 718,
3545
3859
  "character": 3
3546
3860
  },
3547
3861
  "name": "messageTitle",
@@ -3549,7 +3863,7 @@
3549
3863
  "__schema": "KeywordTypeSchema",
3550
3864
  "location": {
3551
3865
  "filePath": "merge-lanes.main.runtime.ts",
3552
- "line": 720,
3866
+ "line": 718,
3553
3867
  "character": 18
3554
3868
  },
3555
3869
  "name": "string"
@@ -3562,7 +3876,7 @@
3562
3876
  "__schema": "TypeRefSchema",
3563
3877
  "location": {
3564
3878
  "filePath": "merge-lanes.main.runtime.ts",
3565
- "line": 721,
3879
+ "line": 719,
3566
3880
  "character": 4
3567
3881
  },
3568
3882
  "name": "Promise",
@@ -3571,7 +3885,7 @@
3571
3885
  "__schema": "TypeUnionSchema",
3572
3886
  "location": {
3573
3887
  "filePath": "merge-lanes.main.runtime.ts",
3574
- "line": 721,
3888
+ "line": 719,
3575
3889
  "character": 12
3576
3890
  },
3577
3891
  "types": [
@@ -3579,16 +3893,21 @@
3579
3893
  "__schema": "TypeRefSchema",
3580
3894
  "location": {
3581
3895
  "filePath": "merge-lanes.main.runtime.ts",
3582
- "line": 721,
3896
+ "line": 719,
3583
3897
  "character": 12
3584
3898
  },
3585
- "name": "Version"
3899
+ "name": "Version",
3900
+ "componentId": {
3901
+ "scope": "teambit.scope",
3902
+ "name": "objects",
3903
+ "version": "0.0.2"
3904
+ }
3586
3905
  },
3587
3906
  {
3588
3907
  "__schema": "KeywordTypeSchema",
3589
3908
  "location": {
3590
3909
  "filePath": "merge-lanes.main.runtime.ts",
3591
- "line": 721,
3910
+ "line": 719,
3592
3911
  "character": 22
3593
3912
  },
3594
3913
  "name": "undefined"
@@ -3605,7 +3924,7 @@
3605
3924
  "__schema": "UnImplementedSchema",
3606
3925
  "location": {
3607
3926
  "filePath": "merge-lanes.main.runtime.ts",
3608
- "line": 794,
3927
+ "line": 792,
3609
3928
  "character": 1
3610
3929
  },
3611
3930
  "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -3654,7 +3973,7 @@
3654
3973
  "componentId": {
3655
3974
  "scope": "teambit.lanes",
3656
3975
  "name": "merge-lanes",
3657
- "version": "1.0.487"
3976
+ "version": "1.0.489"
3658
3977
  },
3659
3978
  "taggedModuleExports": []
3660
3979
  }