@teambit/merge-lanes 1.0.496 → 1.0.497

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