@teambit/merge-lanes 1.0.161 → 1.0.163

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 (12) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +795 -466
  3. package/dist/merge-lane-from-scope.cmd.d.ts +15 -1
  4. package/dist/merge-lane-from-scope.cmd.js +39 -7
  5. package/dist/merge-lane-from-scope.cmd.js.map +1 -1
  6. package/dist/merge-lane.cmd.js +1 -1
  7. package/dist/merge-lane.cmd.js.map +1 -1
  8. package/dist/merge-lanes.main.runtime.d.ts +24 -6
  9. package/dist/merge-lanes.main.runtime.js +130 -72
  10. package/dist/merge-lanes.main.runtime.js.map +1 -1
  11. package/package.json +11 -11
  12. /package/dist/{preview-1707362166593.js → preview-1707621407297.js} +0 -0
package/artifacts/schema.json CHANGED
@@ -17,7 +17,7 @@
17
17
  "__schema": "ClassSchema",
18
18
  "location": {
19
19
  "filePath": "merge-lanes.main.runtime.ts",
20
- "line": 57,
20
+ "line": 68,
21
21
  "character": 1
22
22
  },
23
23
  "signature": "class MergeLanesMain",
@@ -27,7 +27,7 @@
27
27
  "__schema": "ConstructorSchema",
28
28
  "location": {
29
29
  "filePath": "merge-lanes.main.runtime.ts",
30
- "line": 58,
30
+ "line": 69,
31
31
  "character": 3
32
32
  },
33
33
  "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -37,7 +37,7 @@
37
37
  "__schema": "ParameterSchema",
38
38
  "location": {
39
39
  "filePath": "merge-lanes.main.runtime.ts",
40
- "line": 59,
40
+ "line": 70,
41
41
  "character": 5
42
42
  },
43
43
  "name": "workspace",
@@ -45,7 +45,7 @@
45
45
  "__schema": "TypeUnionSchema",
46
46
  "location": {
47
47
  "filePath": "merge-lanes.main.runtime.ts",
48
- "line": 59,
48
+ "line": 70,
49
49
  "character": 24
50
50
  },
51
51
  "types": [
@@ -53,7 +53,7 @@
53
53
  "__schema": "TypeRefSchema",
54
54
  "location": {
55
55
  "filePath": "merge-lanes.main.runtime.ts",
56
- "line": 59,
56
+ "line": 70,
57
57
  "character": 24
58
58
  },
59
59
  "name": "Workspace"
@@ -62,7 +62,7 @@
62
62
  "__schema": "KeywordTypeSchema",
63
63
  "location": {
64
64
  "filePath": "merge-lanes.main.runtime.ts",
65
- "line": 59,
65
+ "line": 70,
66
66
  "character": 36
67
67
  },
68
68
  "name": "undefined"
@@ -76,7 +76,7 @@
76
76
  "__schema": "ParameterSchema",
77
77
  "location": {
78
78
  "filePath": "merge-lanes.main.runtime.ts",
79
- "line": 60,
79
+ "line": 71,
80
80
  "character": 5
81
81
  },
82
82
  "name": "merging",
@@ -84,7 +84,7 @@
84
84
  "__schema": "TypeRefSchema",
85
85
  "location": {
86
86
  "filePath": "merge-lanes.main.runtime.ts",
87
- "line": 60,
87
+ "line": 71,
88
88
  "character": 22
89
89
  },
90
90
  "name": "MergingMain"
@@ -96,7 +96,7 @@
96
96
  "__schema": "ParameterSchema",
97
97
  "location": {
98
98
  "filePath": "merge-lanes.main.runtime.ts",
99
- "line": 61,
99
+ "line": 72,
100
100
  "character": 5
101
101
  },
102
102
  "name": "lanes",
@@ -104,7 +104,7 @@
104
104
  "__schema": "TypeRefSchema",
105
105
  "location": {
106
106
  "filePath": "merge-lanes.main.runtime.ts",
107
- "line": 61,
107
+ "line": 72,
108
108
  "character": 20
109
109
  },
110
110
  "name": "LanesMain"
@@ -116,7 +116,7 @@
116
116
  "__schema": "ParameterSchema",
117
117
  "location": {
118
118
  "filePath": "merge-lanes.main.runtime.ts",
119
- "line": 62,
119
+ "line": 73,
120
120
  "character": 5
121
121
  },
122
122
  "name": "logger",
@@ -124,7 +124,7 @@
124
124
  "__schema": "TypeRefSchema",
125
125
  "location": {
126
126
  "filePath": "merge-lanes.main.runtime.ts",
127
- "line": 62,
127
+ "line": 73,
128
128
  "character": 22
129
129
  },
130
130
  "name": "Logger"
@@ -136,7 +136,7 @@
136
136
  "__schema": "ParameterSchema",
137
137
  "location": {
138
138
  "filePath": "merge-lanes.main.runtime.ts",
139
- "line": 63,
139
+ "line": 74,
140
140
  "character": 5
141
141
  },
142
142
  "name": "remove",
@@ -144,7 +144,7 @@
144
144
  "__schema": "TypeRefSchema",
145
145
  "location": {
146
146
  "filePath": "merge-lanes.main.runtime.ts",
147
- "line": 63,
147
+ "line": 74,
148
148
  "character": 21
149
149
  },
150
150
  "name": "RemoveMain"
@@ -156,7 +156,7 @@
156
156
  "__schema": "ParameterSchema",
157
157
  "location": {
158
158
  "filePath": "merge-lanes.main.runtime.ts",
159
- "line": 64,
159
+ "line": 75,
160
160
  "character": 5
161
161
  },
162
162
  "name": "scope",
@@ -164,7 +164,7 @@
164
164
  "__schema": "TypeRefSchema",
165
165
  "location": {
166
166
  "filePath": "merge-lanes.main.runtime.ts",
167
- "line": 64,
167
+ "line": 75,
168
168
  "character": 20
169
169
  },
170
170
  "name": "ScopeMain"
@@ -176,7 +176,7 @@
176
176
  "__schema": "ParameterSchema",
177
177
  "location": {
178
178
  "filePath": "merge-lanes.main.runtime.ts",
179
- "line": 65,
179
+ "line": 76,
180
180
  "character": 5
181
181
  },
182
182
  "name": "exporter",
@@ -184,7 +184,7 @@
184
184
  "__schema": "TypeRefSchema",
185
185
  "location": {
186
186
  "filePath": "merge-lanes.main.runtime.ts",
187
- "line": 65,
187
+ "line": 76,
188
188
  "character": 23
189
189
  },
190
190
  "name": "ExportMain"
@@ -196,7 +196,7 @@
196
196
  "__schema": "ParameterSchema",
197
197
  "location": {
198
198
  "filePath": "merge-lanes.main.runtime.ts",
199
- "line": 66,
199
+ "line": 77,
200
200
  "character": 5
201
201
  },
202
202
  "name": "importer",
@@ -204,7 +204,7 @@
204
204
  "__schema": "TypeRefSchema",
205
205
  "location": {
206
206
  "filePath": "merge-lanes.main.runtime.ts",
207
- "line": 66,
207
+ "line": 77,
208
208
  "character": 23
209
209
  },
210
210
  "name": "ImporterMain"
@@ -216,7 +216,7 @@
216
216
  "__schema": "ParameterSchema",
217
217
  "location": {
218
218
  "filePath": "merge-lanes.main.runtime.ts",
219
- "line": 67,
219
+ "line": 78,
220
220
  "character": 5
221
221
  },
222
222
  "name": "checkout",
@@ -224,7 +224,7 @@
224
224
  "__schema": "TypeRefSchema",
225
225
  "location": {
226
226
  "filePath": "merge-lanes.main.runtime.ts",
227
- "line": 67,
227
+ "line": 78,
228
228
  "character": 23
229
229
  },
230
230
  "name": "CheckoutMain"
@@ -237,7 +237,7 @@
237
237
  "__schema": "ThisTypeSchema",
238
238
  "location": {
239
239
  "filePath": "merge-lanes.main.runtime.ts",
240
- "line": 57,
240
+ "line": 68,
241
241
  "character": 1
242
242
  },
243
243
  "name": "MergeLanesMain"
@@ -248,26 +248,26 @@
248
248
  "__schema": "FunctionLikeSchema",
249
249
  "location": {
250
250
  "filePath": "merge-lanes.main.runtime.ts",
251
- "line": 71,
251
+ "line": 81,
252
252
  "character": 3
253
253
  },
254
- "signature": "(method) MergeLanesMain.mergeLane(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
255
- "name": "mergeLane",
254
+ "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
255
+ "name": "mergeLaneByCLI",
256
256
  "params": [
257
257
  {
258
258
  "__schema": "ParameterSchema",
259
259
  "location": {
260
260
  "filePath": "merge-lanes.main.runtime.ts",
261
- "line": 72,
262
- "character": 5
261
+ "line": 81,
262
+ "character": 24
263
263
  },
264
264
  "name": "laneName",
265
265
  "type": {
266
266
  "__schema": "KeywordTypeSchema",
267
267
  "location": {
268
268
  "filePath": "merge-lanes.main.runtime.ts",
269
- "line": 72,
270
- "character": 15
269
+ "line": 81,
270
+ "character": 34
271
271
  },
272
272
  "name": "string"
273
273
  },
@@ -278,7 +278,91 @@
278
278
  "__schema": "ParameterSchema",
279
279
  "location": {
280
280
  "filePath": "merge-lanes.main.runtime.ts",
281
- "line": 73,
281
+ "line": 81,
282
+ "character": 42
283
+ },
284
+ "name": "options",
285
+ "type": {
286
+ "__schema": "TypeRefSchema",
287
+ "location": {
288
+ "filePath": "merge-lanes.main.runtime.ts",
289
+ "line": 81,
290
+ "character": 51
291
+ },
292
+ "name": "MergeLaneOptions"
293
+ },
294
+ "isOptional": false,
295
+ "isSpread": false
296
+ }
297
+ ],
298
+ "returnType": {
299
+ "__schema": "InferenceTypeSchema",
300
+ "location": {
301
+ "filePath": "merge-lanes.main.runtime.ts",
302
+ "line": 81,
303
+ "character": 3
304
+ },
305
+ "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>"
306
+ },
307
+ "modifiers": [
308
+ "async"
309
+ ]
310
+ },
311
+ {
312
+ "__schema": "FunctionLikeSchema",
313
+ "location": {
314
+ "filePath": "merge-lanes.main.runtime.ts",
315
+ "line": 91,
316
+ "character": 3
317
+ },
318
+ "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
319
+ "name": "mergeLane",
320
+ "params": [
321
+ {
322
+ "__schema": "ParameterSchema",
323
+ "location": {
324
+ "filePath": "merge-lanes.main.runtime.ts",
325
+ "line": 92,
326
+ "character": 5
327
+ },
328
+ "name": "otherLaneId",
329
+ "type": {
330
+ "__schema": "TypeRefSchema",
331
+ "location": {
332
+ "filePath": "merge-lanes.main.runtime.ts",
333
+ "line": 92,
334
+ "character": 18
335
+ },
336
+ "name": "LaneId"
337
+ },
338
+ "isOptional": false,
339
+ "isSpread": false
340
+ },
341
+ {
342
+ "__schema": "ParameterSchema",
343
+ "location": {
344
+ "filePath": "merge-lanes.main.runtime.ts",
345
+ "line": 93,
346
+ "character": 5
347
+ },
348
+ "name": "currentLaneId",
349
+ "type": {
350
+ "__schema": "TypeRefSchema",
351
+ "location": {
352
+ "filePath": "merge-lanes.main.runtime.ts",
353
+ "line": 93,
354
+ "character": 20
355
+ },
356
+ "name": "LaneId"
357
+ },
358
+ "isOptional": false,
359
+ "isSpread": false
360
+ },
361
+ {
362
+ "__schema": "ParameterSchema",
363
+ "location": {
364
+ "filePath": "merge-lanes.main.runtime.ts",
365
+ "line": 94,
282
366
  "character": 5
283
367
  },
284
368
  "name": "options",
@@ -286,7 +370,7 @@
286
370
  "__schema": "TypeRefSchema",
287
371
  "location": {
288
372
  "filePath": "merge-lanes.main.runtime.ts",
289
- "line": 73,
373
+ "line": 94,
290
374
  "character": 14
291
375
  },
292
376
  "name": "MergeLaneOptions"
@@ -299,7 +383,7 @@
299
383
  "__schema": "TypeRefSchema",
300
384
  "location": {
301
385
  "filePath": "merge-lanes.main.runtime.ts",
302
- "line": 74,
386
+ "line": 95,
303
387
  "character": 6
304
388
  },
305
389
  "name": "Promise",
@@ -308,7 +392,7 @@
308
392
  "__schema": "TypeLiteralSchema",
309
393
  "location": {
310
394
  "filePath": "merge-lanes.main.runtime.ts",
311
- "line": 74,
395
+ "line": 95,
312
396
  "character": 14
313
397
  },
314
398
  "members": [
@@ -316,7 +400,7 @@
316
400
  "__schema": "VariableLikeSchema",
317
401
  "location": {
318
402
  "filePath": "merge-lanes.main.runtime.ts",
319
- "line": 74,
403
+ "line": 95,
320
404
  "character": 16
321
405
  },
322
406
  "signature": "(property) mergeResults: ApplyVersionResults",
@@ -325,7 +409,7 @@
325
409
  "__schema": "TypeRefSchema",
326
410
  "location": {
327
411
  "filePath": "merge-lanes.main.runtime.ts",
328
- "line": 74,
412
+ "line": 95,
329
413
  "character": 16
330
414
  },
331
415
  "name": "ApplyVersionResults",
@@ -340,7 +424,7 @@
340
424
  "__schema": "VariableLikeSchema",
341
425
  "location": {
342
426
  "filePath": "merge-lanes.main.runtime.ts",
343
- "line": 74,
427
+ "line": 95,
344
428
  "character": 51
345
429
  },
346
430
  "signature": "(property) deleteResults: any",
@@ -349,7 +433,7 @@
349
433
  "__schema": "KeywordTypeSchema",
350
434
  "location": {
351
435
  "filePath": "merge-lanes.main.runtime.ts",
352
- "line": 74,
436
+ "line": 95,
353
437
  "character": 66
354
438
  },
355
439
  "name": "any"
@@ -360,7 +444,7 @@
360
444
  "__schema": "VariableLikeSchema",
361
445
  "location": {
362
446
  "filePath": "merge-lanes.main.runtime.ts",
363
- "line": 74,
447
+ "line": 95,
364
448
  "character": 71
365
449
  },
366
450
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -369,14 +453,14 @@
369
453
  "__schema": "TypeArraySchema",
370
454
  "location": {
371
455
  "filePath": "merge-lanes.main.runtime.ts",
372
- "line": 74,
456
+ "line": 95,
373
457
  "character": 91
374
458
  },
375
459
  "type": {
376
460
  "__schema": "TypeRefSchema",
377
461
  "location": {
378
462
  "filePath": "merge-lanes.main.runtime.ts",
379
- "line": 74,
463
+ "line": 95,
380
464
  "character": 91
381
465
  },
382
466
  "name": "ConfigMergeResult"
@@ -396,7 +480,7 @@
396
480
  "__schema": "FunctionLikeSchema",
397
481
  "location": {
398
482
  "filePath": "merge-lanes.main.runtime.ts",
399
- "line": 257,
483
+ "line": 276,
400
484
  "character": 3
401
485
  },
402
486
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -406,7 +490,7 @@
406
490
  "__schema": "ParameterSchema",
407
491
  "location": {
408
492
  "filePath": "merge-lanes.main.runtime.ts",
409
- "line": 257,
493
+ "line": 276,
410
494
  "character": 24
411
495
  },
412
496
  "name": "checkoutProps",
@@ -414,7 +498,7 @@
414
498
  "__schema": "TypeRefSchema",
415
499
  "location": {
416
500
  "filePath": "merge-lanes.main.runtime.ts",
417
- "line": 257,
501
+ "line": 276,
418
502
  "character": 39
419
503
  },
420
504
  "name": "CheckoutProps"
@@ -426,7 +510,7 @@
426
510
  "__schema": "ParameterSchema",
427
511
  "location": {
428
512
  "filePath": "merge-lanes.main.runtime.ts",
429
- "line": 257,
513
+ "line": 276,
430
514
  "character": 54
431
515
  },
432
516
  "name": "mergeAbortOpts",
@@ -434,7 +518,7 @@
434
518
  "__schema": "TypeRefSchema",
435
519
  "location": {
436
520
  "filePath": "merge-lanes.main.runtime.ts",
437
- "line": 257,
521
+ "line": 276,
438
522
  "character": 70
439
523
  },
440
524
  "name": "MergeAbortOpts"
@@ -447,7 +531,7 @@
447
531
  "__schema": "InferenceTypeSchema",
448
532
  "location": {
449
533
  "filePath": "merge-lanes.main.runtime.ts",
450
- "line": 257,
534
+ "line": 276,
451
535
  "character": 3
452
536
  },
453
537
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -460,17 +544,17 @@
460
544
  "__schema": "FunctionLikeSchema",
461
545
  "location": {
462
546
  "filePath": "merge-lanes.main.runtime.ts",
463
- "line": 313,
547
+ "line": 332,
464
548
  "character": 3
465
549
  },
466
- "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<{\n mergedPreviously: string[];\n mergedNow: string[];\n exportedIds: string[];\n}>",
550
+ "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
467
551
  "name": "mergeFromScope",
468
552
  "params": [
469
553
  {
470
554
  "__schema": "ParameterSchema",
471
555
  "location": {
472
556
  "filePath": "merge-lanes.main.runtime.ts",
473
- "line": 314,
557
+ "line": 333,
474
558
  "character": 5
475
559
  },
476
560
  "name": "fromLane",
@@ -478,7 +562,7 @@
478
562
  "__schema": "KeywordTypeSchema",
479
563
  "location": {
480
564
  "filePath": "merge-lanes.main.runtime.ts",
481
- "line": 314,
565
+ "line": 333,
482
566
  "character": 15
483
567
  },
484
568
  "name": "string"
@@ -490,7 +574,7 @@
490
574
  "__schema": "ParameterSchema",
491
575
  "location": {
492
576
  "filePath": "merge-lanes.main.runtime.ts",
493
- "line": 315,
577
+ "line": 334,
494
578
  "character": 5
495
579
  },
496
580
  "name": "toLane",
@@ -498,7 +582,7 @@
498
582
  "__schema": "KeywordTypeSchema",
499
583
  "location": {
500
584
  "filePath": "merge-lanes.main.runtime.ts",
501
- "line": 315,
585
+ "line": 334,
502
586
  "character": 13
503
587
  },
504
588
  "name": "string"
@@ -510,7 +594,7 @@
510
594
  "__schema": "ParameterSchema",
511
595
  "location": {
512
596
  "filePath": "merge-lanes.main.runtime.ts",
513
- "line": 316,
597
+ "line": 335,
514
598
  "character": 5
515
599
  },
516
600
  "name": "options",
@@ -518,7 +602,7 @@
518
602
  "__schema": "TypeIntersectionSchema",
519
603
  "location": {
520
604
  "filePath": "merge-lanes.main.runtime.ts",
521
- "line": 316,
605
+ "line": 335,
522
606
  "character": 14
523
607
  },
524
608
  "types": [
@@ -526,7 +610,7 @@
526
610
  "__schema": "TypeRefSchema",
527
611
  "location": {
528
612
  "filePath": "merge-lanes.main.runtime.ts",
529
- "line": 316,
613
+ "line": 335,
530
614
  "character": 14
531
615
  },
532
616
  "name": "Partial",
@@ -535,7 +619,7 @@
535
619
  "__schema": "TypeRefSchema",
536
620
  "location": {
537
621
  "filePath": "merge-lanes.main.runtime.ts",
538
- "line": 316,
622
+ "line": 335,
539
623
  "character": 22
540
624
  },
541
625
  "name": "MergeLaneOptions"
@@ -546,7 +630,7 @@
546
630
  "__schema": "TypeLiteralSchema",
547
631
  "location": {
548
632
  "filePath": "merge-lanes.main.runtime.ts",
549
- "line": 316,
633
+ "line": 335,
550
634
  "character": 42
551
635
  },
552
636
  "members": [
@@ -554,7 +638,7 @@
554
638
  "__schema": "VariableLikeSchema",
555
639
  "location": {
556
640
  "filePath": "merge-lanes.main.runtime.ts",
557
- "line": 316,
641
+ "line": 335,
558
642
  "character": 44
559
643
  },
560
644
  "signature": "(property) push?: boolean | undefined",
@@ -563,7 +647,7 @@
563
647
  "__schema": "KeywordTypeSchema",
564
648
  "location": {
565
649
  "filePath": "merge-lanes.main.runtime.ts",
566
- "line": 316,
650
+ "line": 335,
567
651
  "character": 51
568
652
  },
569
653
  "name": "boolean"
@@ -574,7 +658,7 @@
574
658
  "__schema": "VariableLikeSchema",
575
659
  "location": {
576
660
  "filePath": "merge-lanes.main.runtime.ts",
577
- "line": 316,
661
+ "line": 335,
578
662
  "character": 60
579
663
  },
580
664
  "signature": "(property) reMerge?: boolean | undefined",
@@ -583,7 +667,7 @@
583
667
  "__schema": "KeywordTypeSchema",
584
668
  "location": {
585
669
  "filePath": "merge-lanes.main.runtime.ts",
586
- "line": 316,
670
+ "line": 335,
587
671
  "character": 70
588
672
  },
589
673
  "name": "boolean"
@@ -602,104 +686,19 @@
602
686
  "__schema": "TypeRefSchema",
603
687
  "location": {
604
688
  "filePath": "merge-lanes.main.runtime.ts",
605
- "line": 317,
689
+ "line": 336,
606
690
  "character": 6
607
691
  },
608
692
  "name": "Promise",
609
693
  "typeArgs": [
610
694
  {
611
- "__schema": "TypeLiteralSchema",
695
+ "__schema": "TypeRefSchema",
612
696
  "location": {
613
697
  "filePath": "merge-lanes.main.runtime.ts",
614
- "line": 317,
698
+ "line": 336,
615
699
  "character": 14
616
700
  },
617
- "members": [
618
- {
619
- "__schema": "VariableLikeSchema",
620
- "location": {
621
- "filePath": "merge-lanes.main.runtime.ts",
622
- "line": 318,
623
- "character": 5
624
- },
625
- "signature": "(property) mergedPreviously: string[]",
626
- "name": "mergedPreviously",
627
- "type": {
628
- "__schema": "TypeArraySchema",
629
- "location": {
630
- "filePath": "merge-lanes.main.runtime.ts",
631
- "line": 318,
632
- "character": 23
633
- },
634
- "type": {
635
- "__schema": "KeywordTypeSchema",
636
- "location": {
637
- "filePath": "merge-lanes.main.runtime.ts",
638
- "line": 318,
639
- "character": 23
640
- },
641
- "name": "string"
642
- }
643
- },
644
- "isOptional": false
645
- },
646
- {
647
- "__schema": "VariableLikeSchema",
648
- "location": {
649
- "filePath": "merge-lanes.main.runtime.ts",
650
- "line": 319,
651
- "character": 5
652
- },
653
- "signature": "(property) mergedNow: string[]",
654
- "name": "mergedNow",
655
- "type": {
656
- "__schema": "TypeArraySchema",
657
- "location": {
658
- "filePath": "merge-lanes.main.runtime.ts",
659
- "line": 319,
660
- "character": 16
661
- },
662
- "type": {
663
- "__schema": "KeywordTypeSchema",
664
- "location": {
665
- "filePath": "merge-lanes.main.runtime.ts",
666
- "line": 319,
667
- "character": 16
668
- },
669
- "name": "string"
670
- }
671
- },
672
- "isOptional": false
673
- },
674
- {
675
- "__schema": "VariableLikeSchema",
676
- "location": {
677
- "filePath": "merge-lanes.main.runtime.ts",
678
- "line": 320,
679
- "character": 5
680
- },
681
- "signature": "(property) exportedIds: string[]",
682
- "name": "exportedIds",
683
- "type": {
684
- "__schema": "TypeArraySchema",
685
- "location": {
686
- "filePath": "merge-lanes.main.runtime.ts",
687
- "line": 320,
688
- "character": 18
689
- },
690
- "type": {
691
- "__schema": "KeywordTypeSchema",
692
- "location": {
693
- "filePath": "merge-lanes.main.runtime.ts",
694
- "line": 320,
695
- "character": 18
696
- },
697
- "name": "string"
698
- }
699
- },
700
- "isOptional": false
701
- }
702
- ]
701
+ "name": "MergeFromScopeResult"
703
702
  }
704
703
  ]
705
704
  },
@@ -711,7 +710,7 @@
711
710
  "__schema": "VariableLikeSchema",
712
711
  "location": {
713
712
  "filePath": "merge-lanes.main.runtime.ts",
714
- "line": 448,
713
+ "line": 525,
715
714
  "character": 3
716
715
  },
717
716
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -720,7 +719,7 @@
720
719
  "__schema": "InferenceTypeSchema",
721
720
  "location": {
722
721
  "filePath": "merge-lanes.main.runtime.ts",
723
- "line": 448,
722
+ "line": 525,
724
723
  "character": 3
725
724
  },
726
725
  "type": "never[]"
@@ -732,7 +731,7 @@
732
731
  "__schema": "VariableLikeSchema",
733
732
  "location": {
734
733
  "filePath": "merge-lanes.main.runtime.ts",
735
- "line": 449,
734
+ "line": 526,
736
735
  "character": 3
737
736
  },
738
737
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -741,7 +740,7 @@
741
740
  "__schema": "InferenceTypeSchema",
742
741
  "location": {
743
742
  "filePath": "merge-lanes.main.runtime.ts",
744
- "line": 449,
743
+ "line": 526,
745
744
  "character": 3
746
745
  },
747
746
  "type": "Aspect[]"
@@ -753,7 +752,7 @@
753
752
  "__schema": "VariableLikeSchema",
754
753
  "location": {
755
754
  "filePath": "merge-lanes.main.runtime.ts",
756
- "line": 462,
755
+ "line": 539,
757
756
  "character": 3
758
757
  },
759
758
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -762,7 +761,7 @@
762
761
  "__schema": "InferenceTypeSchema",
763
762
  "location": {
764
763
  "filePath": "merge-lanes.main.runtime.ts",
765
- "line": 462,
764
+ "line": 539,
766
765
  "character": 3
767
766
  },
768
767
  "type": "RuntimeDefinition"
@@ -774,7 +773,7 @@
774
773
  "__schema": "FunctionLikeSchema",
775
774
  "location": {
776
775
  "filePath": "merge-lanes.main.runtime.ts",
777
- "line": 464,
776
+ "line": 541,
778
777
  "character": 3
779
778
  },
780
779
  "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -784,7 +783,7 @@
784
783
  "__schema": "ParameterSchema",
785
784
  "location": {
786
785
  "filePath": "merge-lanes.main.runtime.ts",
787
- "line": 464,
786
+ "line": 541,
788
787
  "character": 25
789
788
  },
790
789
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -792,7 +791,7 @@
792
791
  "__schema": "TupleTypeSchema",
793
792
  "location": {
794
793
  "filePath": "merge-lanes.main.runtime.ts",
795
- "line": 476,
794
+ "line": 553,
796
795
  "character": 6
797
796
  },
798
797
  "elements": [
@@ -800,7 +799,7 @@
800
799
  "__schema": "TypeRefSchema",
801
800
  "location": {
802
801
  "filePath": "merge-lanes.main.runtime.ts",
803
- "line": 477,
802
+ "line": 554,
804
803
  "character": 5
805
804
  },
806
805
  "name": "LanesMain"
@@ -809,7 +808,7 @@
809
808
  "__schema": "TypeRefSchema",
810
809
  "location": {
811
810
  "filePath": "merge-lanes.main.runtime.ts",
812
- "line": 478,
811
+ "line": 555,
813
812
  "character": 5
814
813
  },
815
814
  "name": "CLIMain"
@@ -818,7 +817,7 @@
818
817
  "__schema": "TypeRefSchema",
819
818
  "location": {
820
819
  "filePath": "merge-lanes.main.runtime.ts",
821
- "line": 479,
820
+ "line": 556,
822
821
  "character": 5
823
822
  },
824
823
  "name": "Workspace"
@@ -827,7 +826,7 @@
827
826
  "__schema": "TypeRefSchema",
828
827
  "location": {
829
828
  "filePath": "merge-lanes.main.runtime.ts",
830
- "line": 480,
829
+ "line": 557,
831
830
  "character": 5
832
831
  },
833
832
  "name": "MergingMain"
@@ -836,7 +835,7 @@
836
835
  "__schema": "TypeRefSchema",
837
836
  "location": {
838
837
  "filePath": "merge-lanes.main.runtime.ts",
839
- "line": 481,
838
+ "line": 558,
840
839
  "character": 5
841
840
  },
842
841
  "name": "LoggerMain"
@@ -845,7 +844,7 @@
845
844
  "__schema": "TypeRefSchema",
846
845
  "location": {
847
846
  "filePath": "merge-lanes.main.runtime.ts",
848
- "line": 482,
847
+ "line": 559,
849
848
  "character": 5
850
849
  },
851
850
  "name": "RemoveMain"
@@ -854,7 +853,7 @@
854
853
  "__schema": "TypeRefSchema",
855
854
  "location": {
856
855
  "filePath": "merge-lanes.main.runtime.ts",
857
- "line": 483,
856
+ "line": 560,
858
857
  "character": 5
859
858
  },
860
859
  "name": "ScopeMain"
@@ -863,7 +862,7 @@
863
862
  "__schema": "TypeRefSchema",
864
863
  "location": {
865
864
  "filePath": "merge-lanes.main.runtime.ts",
866
- "line": 484,
865
+ "line": 561,
867
866
  "character": 5
868
867
  },
869
868
  "name": "ExportMain"
@@ -872,7 +871,7 @@
872
871
  "__schema": "TypeRefSchema",
873
872
  "location": {
874
873
  "filePath": "merge-lanes.main.runtime.ts",
875
- "line": 485,
874
+ "line": 562,
876
875
  "character": 5
877
876
  },
878
877
  "name": "ImporterMain"
@@ -881,7 +880,7 @@
881
880
  "__schema": "TypeRefSchema",
882
881
  "location": {
883
882
  "filePath": "merge-lanes.main.runtime.ts",
884
- "line": 486,
883
+ "line": 563,
885
884
  "character": 5
886
885
  },
887
886
  "name": "CheckoutMain"
@@ -890,7 +889,7 @@
890
889
  "__schema": "TypeRefSchema",
891
890
  "location": {
892
891
  "filePath": "merge-lanes.main.runtime.ts",
893
- "line": 487,
892
+ "line": 564,
894
893
  "character": 5
895
894
  },
896
895
  "name": "GlobalConfigMain"
@@ -905,7 +904,7 @@
905
904
  "__schema": "InferenceTypeSchema",
906
905
  "location": {
907
906
  "filePath": "merge-lanes.main.runtime.ts",
908
- "line": 464,
907
+ "line": 541,
909
908
  "character": 3
910
909
  },
911
910
  "type": "Promise<MergeLanesMain>"
@@ -971,7 +970,7 @@
971
970
  "__schema": "TypeSchema",
972
971
  "location": {
973
972
  "filePath": "merge-lanes.main.runtime.ts",
974
- "line": 36,
973
+ "line": 39,
975
974
  "character": 1
976
975
  },
977
976
  "signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noSnap: boolean;\n snapMessage: string;\n existingOnWorkspaceOnly: boolean;\n build: boolean;\n keepReadme: boolean;\n squash?: boolean | undefined;\n noSquash: boolean;\n ... 7 more ...;\n excludeNonLaneComps?: boolean | undefined;\n}",
@@ -980,7 +979,7 @@
980
979
  "__schema": "TypeLiteralSchema",
981
980
  "location": {
982
981
  "filePath": "merge-lanes.main.runtime.ts",
983
- "line": 36,
982
+ "line": 39,
984
983
  "character": 32
985
984
  },
986
985
  "members": [
@@ -988,7 +987,7 @@
988
987
  "__schema": "VariableLikeSchema",
989
988
  "location": {
990
989
  "filePath": "merge-lanes.main.runtime.ts",
991
- "line": 37,
990
+ "line": 40,
992
991
  "character": 3
993
992
  },
994
993
  "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
@@ -997,7 +996,7 @@
997
996
  "__schema": "TypeRefSchema",
998
997
  "location": {
999
998
  "filePath": "merge-lanes.main.runtime.ts",
1000
- "line": 37,
999
+ "line": 40,
1001
1000
  "character": 18
1002
1001
  },
1003
1002
  "name": "MergeStrategy"
@@ -1008,7 +1007,7 @@
1008
1007
  "__schema": "VariableLikeSchema",
1009
1008
  "location": {
1010
1009
  "filePath": "merge-lanes.main.runtime.ts",
1011
- "line": 38,
1010
+ "line": 41,
1012
1011
  "character": 3
1013
1012
  },
1014
1013
  "signature": "(property) ours?: boolean | undefined",
@@ -1017,7 +1016,7 @@
1017
1016
  "__schema": "KeywordTypeSchema",
1018
1017
  "location": {
1019
1018
  "filePath": "merge-lanes.main.runtime.ts",
1020
- "line": 38,
1019
+ "line": 41,
1021
1020
  "character": 10
1022
1021
  },
1023
1022
  "name": "boolean"
@@ -1028,7 +1027,7 @@
1028
1027
  "__schema": "VariableLikeSchema",
1029
1028
  "location": {
1030
1029
  "filePath": "merge-lanes.main.runtime.ts",
1031
- "line": 39,
1030
+ "line": 42,
1032
1031
  "character": 3
1033
1032
  },
1034
1033
  "signature": "(property) theirs?: boolean | undefined",
@@ -1037,7 +1036,7 @@
1037
1036
  "__schema": "KeywordTypeSchema",
1038
1037
  "location": {
1039
1038
  "filePath": "merge-lanes.main.runtime.ts",
1040
- "line": 39,
1039
+ "line": 42,
1041
1040
  "character": 12
1042
1041
  },
1043
1042
  "name": "boolean"
@@ -1048,7 +1047,7 @@
1048
1047
  "__schema": "VariableLikeSchema",
1049
1048
  "location": {
1050
1049
  "filePath": "merge-lanes.main.runtime.ts",
1051
- "line": 40,
1050
+ "line": 43,
1052
1051
  "character": 3
1053
1052
  },
1054
1053
  "signature": "(property) noSnap: boolean",
@@ -1057,7 +1056,7 @@
1057
1056
  "__schema": "KeywordTypeSchema",
1058
1057
  "location": {
1059
1058
  "filePath": "merge-lanes.main.runtime.ts",
1060
- "line": 40,
1059
+ "line": 43,
1061
1060
  "character": 11
1062
1061
  },
1063
1062
  "name": "boolean"
@@ -1068,7 +1067,7 @@
1068
1067
  "__schema": "VariableLikeSchema",
1069
1068
  "location": {
1070
1069
  "filePath": "merge-lanes.main.runtime.ts",
1071
- "line": 41,
1070
+ "line": 44,
1072
1071
  "character": 3
1073
1072
  },
1074
1073
  "signature": "(property) snapMessage: string",
@@ -1077,7 +1076,7 @@
1077
1076
  "__schema": "KeywordTypeSchema",
1078
1077
  "location": {
1079
1078
  "filePath": "merge-lanes.main.runtime.ts",
1080
- "line": 41,
1079
+ "line": 44,
1081
1080
  "character": 16
1082
1081
  },
1083
1082
  "name": "string"
@@ -1088,7 +1087,7 @@
1088
1087
  "__schema": "VariableLikeSchema",
1089
1088
  "location": {
1090
1089
  "filePath": "merge-lanes.main.runtime.ts",
1091
- "line": 42,
1090
+ "line": 45,
1092
1091
  "character": 3
1093
1092
  },
1094
1093
  "signature": "(property) existingOnWorkspaceOnly: boolean",
@@ -1097,7 +1096,7 @@
1097
1096
  "__schema": "KeywordTypeSchema",
1098
1097
  "location": {
1099
1098
  "filePath": "merge-lanes.main.runtime.ts",
1100
- "line": 42,
1099
+ "line": 45,
1101
1100
  "character": 28
1102
1101
  },
1103
1102
  "name": "boolean"
@@ -1108,7 +1107,7 @@
1108
1107
  "__schema": "VariableLikeSchema",
1109
1108
  "location": {
1110
1109
  "filePath": "merge-lanes.main.runtime.ts",
1111
- "line": 43,
1110
+ "line": 46,
1112
1111
  "character": 3
1113
1112
  },
1114
1113
  "signature": "(property) build: boolean",
@@ -1117,7 +1116,7 @@
1117
1116
  "__schema": "KeywordTypeSchema",
1118
1117
  "location": {
1119
1118
  "filePath": "merge-lanes.main.runtime.ts",
1120
- "line": 43,
1119
+ "line": 46,
1121
1120
  "character": 10
1122
1121
  },
1123
1122
  "name": "boolean"
@@ -1128,7 +1127,7 @@
1128
1127
  "__schema": "VariableLikeSchema",
1129
1128
  "location": {
1130
1129
  "filePath": "merge-lanes.main.runtime.ts",
1131
- "line": 44,
1130
+ "line": 47,
1132
1131
  "character": 3
1133
1132
  },
1134
1133
  "signature": "(property) keepReadme: boolean",
@@ -1137,7 +1136,7 @@
1137
1136
  "__schema": "KeywordTypeSchema",
1138
1137
  "location": {
1139
1138
  "filePath": "merge-lanes.main.runtime.ts",
1140
- "line": 44,
1139
+ "line": 47,
1141
1140
  "character": 15
1142
1141
  },
1143
1142
  "name": "boolean"
@@ -1148,7 +1147,7 @@
1148
1147
  "__schema": "VariableLikeSchema",
1149
1148
  "location": {
1150
1149
  "filePath": "merge-lanes.main.runtime.ts",
1151
- "line": 45,
1150
+ "line": 48,
1152
1151
  "character": 3
1153
1152
  },
1154
1153
  "signature": "(property) squash?: boolean | undefined",
@@ -1157,7 +1156,7 @@
1157
1156
  "__schema": "KeywordTypeSchema",
1158
1157
  "location": {
1159
1158
  "filePath": "merge-lanes.main.runtime.ts",
1160
- "line": 45,
1159
+ "line": 48,
1161
1160
  "character": 12
1162
1161
  },
1163
1162
  "name": "boolean"
@@ -1168,7 +1167,7 @@
1168
1167
  "__schema": "VariableLikeSchema",
1169
1168
  "location": {
1170
1169
  "filePath": "merge-lanes.main.runtime.ts",
1171
- "line": 46,
1170
+ "line": 49,
1172
1171
  "character": 3
1173
1172
  },
1174
1173
  "signature": "(property) noSquash: boolean",
@@ -1177,7 +1176,7 @@
1177
1176
  "__schema": "KeywordTypeSchema",
1178
1177
  "location": {
1179
1178
  "filePath": "merge-lanes.main.runtime.ts",
1180
- "line": 46,
1179
+ "line": 49,
1181
1180
  "character": 13
1182
1181
  },
1183
1182
  "name": "boolean"
@@ -1188,7 +1187,7 @@
1188
1187
  "__schema": "VariableLikeSchema",
1189
1188
  "location": {
1190
1189
  "filePath": "merge-lanes.main.runtime.ts",
1191
- "line": 47,
1190
+ "line": 50,
1192
1191
  "character": 3
1193
1192
  },
1194
1193
  "signature": "(property) tag?: boolean | undefined",
@@ -1197,7 +1196,7 @@
1197
1196
  "__schema": "KeywordTypeSchema",
1198
1197
  "location": {
1199
1198
  "filePath": "merge-lanes.main.runtime.ts",
1200
- "line": 47,
1199
+ "line": 50,
1201
1200
  "character": 9
1202
1201
  },
1203
1202
  "name": "boolean"
@@ -1208,7 +1207,7 @@
1208
1207
  "__schema": "VariableLikeSchema",
1209
1208
  "location": {
1210
1209
  "filePath": "merge-lanes.main.runtime.ts",
1211
- "line": 48,
1210
+ "line": 51,
1212
1211
  "character": 3
1213
1212
  },
1214
1213
  "signature": "(property) pattern?: string | undefined",
@@ -1217,7 +1216,7 @@
1217
1216
  "__schema": "KeywordTypeSchema",
1218
1217
  "location": {
1219
1218
  "filePath": "merge-lanes.main.runtime.ts",
1220
- "line": 48,
1219
+ "line": 51,
1221
1220
  "character": 13
1222
1221
  },
1223
1222
  "name": "string"
@@ -1228,7 +1227,7 @@
1228
1227
  "__schema": "VariableLikeSchema",
1229
1228
  "location": {
1230
1229
  "filePath": "merge-lanes.main.runtime.ts",
1231
- "line": 49,
1230
+ "line": 52,
1232
1231
  "character": 3
1233
1232
  },
1234
1233
  "signature": "(property) includeDeps?: boolean | undefined",
@@ -1237,7 +1236,7 @@
1237
1236
  "__schema": "KeywordTypeSchema",
1238
1237
  "location": {
1239
1238
  "filePath": "merge-lanes.main.runtime.ts",
1240
- "line": 49,
1239
+ "line": 52,
1241
1240
  "character": 17
1242
1241
  },
1243
1242
  "name": "boolean"
@@ -1248,7 +1247,7 @@
1248
1247
  "__schema": "VariableLikeSchema",
1249
1248
  "location": {
1250
1249
  "filePath": "merge-lanes.main.runtime.ts",
1251
- "line": 50,
1250
+ "line": 53,
1252
1251
  "character": 3
1253
1252
  },
1254
1253
  "signature": "(property) skipDependencyInstallation?: boolean | undefined",
@@ -1257,7 +1256,7 @@
1257
1256
  "__schema": "KeywordTypeSchema",
1258
1257
  "location": {
1259
1258
  "filePath": "merge-lanes.main.runtime.ts",
1260
- "line": 50,
1259
+ "line": 53,
1261
1260
  "character": 32
1262
1261
  },
1263
1262
  "name": "boolean"
@@ -1268,7 +1267,7 @@
1268
1267
  "__schema": "VariableLikeSchema",
1269
1268
  "location": {
1270
1269
  "filePath": "merge-lanes.main.runtime.ts",
1271
- "line": 51,
1270
+ "line": 54,
1272
1271
  "character": 3
1273
1272
  },
1274
1273
  "signature": "(property) resolveUnrelated?: \"manual\" | \"theirs\" | \"ours\" | undefined",
@@ -1277,7 +1276,7 @@
1277
1276
  "__schema": "TypeRefSchema",
1278
1277
  "location": {
1279
1278
  "filePath": "merge-lanes.main.runtime.ts",
1280
- "line": 51,
1279
+ "line": 54,
1281
1280
  "character": 22
1282
1281
  },
1283
1282
  "name": "MergeStrategy"
@@ -1288,7 +1287,7 @@
1288
1287
  "__schema": "VariableLikeSchema",
1289
1288
  "location": {
1290
1289
  "filePath": "merge-lanes.main.runtime.ts",
1291
- "line": 52,
1290
+ "line": 55,
1292
1291
  "character": 3
1293
1292
  },
1294
1293
  "signature": "(property) ignoreConfigChanges?: boolean | undefined",
@@ -1297,7 +1296,7 @@
1297
1296
  "__schema": "KeywordTypeSchema",
1298
1297
  "location": {
1299
1298
  "filePath": "merge-lanes.main.runtime.ts",
1300
- "line": 52,
1299
+ "line": 55,
1301
1300
  "character": 25
1302
1301
  },
1303
1302
  "name": "boolean"
@@ -1308,19 +1307,322 @@
1308
1307
  "__schema": "VariableLikeSchema",
1309
1308
  "location": {
1310
1309
  "filePath": "merge-lanes.main.runtime.ts",
1311
- "line": 53,
1310
+ "line": 56,
1311
+ "character": 3
1312
+ },
1313
+ "signature": "(property) skipFetch?: boolean | undefined",
1314
+ "name": "skipFetch",
1315
+ "type": {
1316
+ "__schema": "KeywordTypeSchema",
1317
+ "location": {
1318
+ "filePath": "merge-lanes.main.runtime.ts",
1319
+ "line": 56,
1320
+ "character": 15
1321
+ },
1322
+ "name": "boolean"
1323
+ },
1324
+ "isOptional": true
1325
+ },
1326
+ {
1327
+ "__schema": "VariableLikeSchema",
1328
+ "location": {
1329
+ "filePath": "merge-lanes.main.runtime.ts",
1330
+ "line": 57,
1331
+ "character": 3
1332
+ },
1333
+ "signature": "(property) excludeNonLaneComps?: boolean | undefined",
1334
+ "name": "excludeNonLaneComps",
1335
+ "type": {
1336
+ "__schema": "KeywordTypeSchema",
1337
+ "location": {
1338
+ "filePath": "merge-lanes.main.runtime.ts",
1339
+ "line": 57,
1340
+ "character": 25
1341
+ },
1342
+ "name": "boolean"
1343
+ },
1344
+ "isOptional": true
1345
+ }
1346
+ ]
1347
+ }
1348
+ },
1349
+ {
1350
+ "__schema": "TypeSchema",
1351
+ "location": {
1352
+ "filePath": "merge-lanes.main.runtime.ts",
1353
+ "line": 59,
1354
+ "character": 1
1355
+ },
1356
+ "signature": "type MergeFromScopeResult = {\n mergedNow: ComponentID[];\n exportedIds: ComponentID[];\n unmerged: {\n id: ComponentID;\n reason: string;\n }[];\n conflicts?: {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n }[] | undefined;\n snappedIds?: ComponentID[] | undefined;\n mergedPreviously: ComponentID[];\n}",
1357
+ "name": "MergeFromScopeResult",
1358
+ "type": {
1359
+ "__schema": "TypeLiteralSchema",
1360
+ "location": {
1361
+ "filePath": "merge-lanes.main.runtime.ts",
1362
+ "line": 59,
1363
+ "character": 36
1364
+ },
1365
+ "members": [
1366
+ {
1367
+ "__schema": "VariableLikeSchema",
1368
+ "location": {
1369
+ "filePath": "merge-lanes.main.runtime.ts",
1370
+ "line": 60,
1371
+ "character": 3
1372
+ },
1373
+ "signature": "(property) mergedNow: ComponentID[]",
1374
+ "name": "mergedNow",
1375
+ "type": {
1376
+ "__schema": "TypeArraySchema",
1377
+ "location": {
1378
+ "filePath": "merge-lanes.main.runtime.ts",
1379
+ "line": 60,
1380
+ "character": 14
1381
+ },
1382
+ "type": {
1383
+ "__schema": "TypeRefSchema",
1384
+ "location": {
1385
+ "filePath": "merge-lanes.main.runtime.ts",
1386
+ "line": 60,
1387
+ "character": 14
1388
+ },
1389
+ "name": "ComponentID"
1390
+ }
1391
+ },
1392
+ "isOptional": false
1393
+ },
1394
+ {
1395
+ "__schema": "VariableLikeSchema",
1396
+ "location": {
1397
+ "filePath": "merge-lanes.main.runtime.ts",
1398
+ "line": 61,
1399
+ "character": 3
1400
+ },
1401
+ "signature": "(property) exportedIds: ComponentID[]",
1402
+ "name": "exportedIds",
1403
+ "type": {
1404
+ "__schema": "TypeArraySchema",
1405
+ "location": {
1406
+ "filePath": "merge-lanes.main.runtime.ts",
1407
+ "line": 61,
1408
+ "character": 16
1409
+ },
1410
+ "type": {
1411
+ "__schema": "TypeRefSchema",
1412
+ "location": {
1413
+ "filePath": "merge-lanes.main.runtime.ts",
1414
+ "line": 61,
1415
+ "character": 16
1416
+ },
1417
+ "name": "ComponentID"
1418
+ }
1419
+ },
1420
+ "isOptional": false
1421
+ },
1422
+ {
1423
+ "__schema": "VariableLikeSchema",
1424
+ "location": {
1425
+ "filePath": "merge-lanes.main.runtime.ts",
1426
+ "line": 62,
1427
+ "character": 3
1428
+ },
1429
+ "signature": "(property) unmerged: {\n id: ComponentID;\n reason: string;\n}[]",
1430
+ "name": "unmerged",
1431
+ "type": {
1432
+ "__schema": "TypeArraySchema",
1433
+ "location": {
1434
+ "filePath": "merge-lanes.main.runtime.ts",
1435
+ "line": 62,
1436
+ "character": 13
1437
+ },
1438
+ "type": {
1439
+ "__schema": "TypeLiteralSchema",
1440
+ "location": {
1441
+ "filePath": "merge-lanes.main.runtime.ts",
1442
+ "line": 62,
1443
+ "character": 13
1444
+ },
1445
+ "members": [
1446
+ {
1447
+ "__schema": "VariableLikeSchema",
1448
+ "location": {
1449
+ "filePath": "merge-lanes.main.runtime.ts",
1450
+ "line": 62,
1451
+ "character": 15
1452
+ },
1453
+ "signature": "(property) id: ComponentID",
1454
+ "name": "id",
1455
+ "type": {
1456
+ "__schema": "TypeRefSchema",
1457
+ "location": {
1458
+ "filePath": "merge-lanes.main.runtime.ts",
1459
+ "line": 62,
1460
+ "character": 15
1461
+ },
1462
+ "name": "ComponentID",
1463
+ "componentId": {
1464
+ "scope": "teambit.component",
1465
+ "name": "component-id",
1466
+ "version": "1.2.0"
1467
+ }
1468
+ },
1469
+ "isOptional": false
1470
+ },
1471
+ {
1472
+ "__schema": "VariableLikeSchema",
1473
+ "location": {
1474
+ "filePath": "merge-lanes.main.runtime.ts",
1475
+ "line": 62,
1476
+ "character": 32
1477
+ },
1478
+ "signature": "(property) reason: string",
1479
+ "name": "reason",
1480
+ "type": {
1481
+ "__schema": "KeywordTypeSchema",
1482
+ "location": {
1483
+ "filePath": "merge-lanes.main.runtime.ts",
1484
+ "line": 62,
1485
+ "character": 40
1486
+ },
1487
+ "name": "string"
1488
+ },
1489
+ "isOptional": false
1490
+ }
1491
+ ]
1492
+ }
1493
+ },
1494
+ "isOptional": false
1495
+ },
1496
+ {
1497
+ "__schema": "VariableLikeSchema",
1498
+ "location": {
1499
+ "filePath": "merge-lanes.main.runtime.ts",
1500
+ "line": 63,
1501
+ "character": 3
1502
+ },
1503
+ "signature": "(property) conflicts?: {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n}[] | undefined",
1504
+ "name": "conflicts",
1505
+ "type": {
1506
+ "__schema": "TypeRefSchema",
1507
+ "location": {
1508
+ "filePath": "merge-lanes.main.runtime.ts",
1509
+ "line": 63,
1510
+ "character": 15
1511
+ },
1512
+ "name": "Array",
1513
+ "typeArgs": [
1514
+ {
1515
+ "__schema": "TypeLiteralSchema",
1516
+ "location": {
1517
+ "filePath": "merge-lanes.main.runtime.ts",
1518
+ "line": 63,
1519
+ "character": 21
1520
+ },
1521
+ "members": [
1522
+ {
1523
+ "__schema": "VariableLikeSchema",
1524
+ "location": {
1525
+ "filePath": "merge-lanes.main.runtime.ts",
1526
+ "line": 63,
1527
+ "character": 23
1528
+ },
1529
+ "signature": "(property) id: ComponentID",
1530
+ "name": "id",
1531
+ "type": {
1532
+ "__schema": "TypeRefSchema",
1533
+ "location": {
1534
+ "filePath": "merge-lanes.main.runtime.ts",
1535
+ "line": 63,
1536
+ "character": 23
1537
+ },
1538
+ "name": "ComponentID",
1539
+ "componentId": {
1540
+ "scope": "teambit.component",
1541
+ "name": "component-id",
1542
+ "version": "1.2.0"
1543
+ }
1544
+ },
1545
+ "isOptional": false
1546
+ },
1547
+ {
1548
+ "__schema": "VariableLikeSchema",
1549
+ "location": {
1550
+ "filePath": "merge-lanes.main.runtime.ts",
1551
+ "line": 63,
1552
+ "character": 40
1553
+ },
1554
+ "signature": "(property) files: string[]",
1555
+ "name": "files",
1556
+ "type": {
1557
+ "__schema": "TypeArraySchema",
1558
+ "location": {
1559
+ "filePath": "merge-lanes.main.runtime.ts",
1560
+ "line": 63,
1561
+ "character": 47
1562
+ },
1563
+ "type": {
1564
+ "__schema": "KeywordTypeSchema",
1565
+ "location": {
1566
+ "filePath": "merge-lanes.main.runtime.ts",
1567
+ "line": 63,
1568
+ "character": 47
1569
+ },
1570
+ "name": "string"
1571
+ }
1572
+ },
1573
+ "isOptional": false
1574
+ },
1575
+ {
1576
+ "__schema": "VariableLikeSchema",
1577
+ "location": {
1578
+ "filePath": "merge-lanes.main.runtime.ts",
1579
+ "line": 63,
1580
+ "character": 57
1581
+ },
1582
+ "signature": "(property) config?: boolean | undefined",
1583
+ "name": "config",
1584
+ "type": {
1585
+ "__schema": "KeywordTypeSchema",
1586
+ "location": {
1587
+ "filePath": "merge-lanes.main.runtime.ts",
1588
+ "line": 63,
1589
+ "character": 66
1590
+ },
1591
+ "name": "boolean"
1592
+ },
1593
+ "isOptional": true
1594
+ }
1595
+ ]
1596
+ }
1597
+ ]
1598
+ },
1599
+ "isOptional": true
1600
+ },
1601
+ {
1602
+ "__schema": "VariableLikeSchema",
1603
+ "location": {
1604
+ "filePath": "merge-lanes.main.runtime.ts",
1605
+ "line": 64,
1312
1606
  "character": 3
1313
1607
  },
1314
- "signature": "(property) skipFetch?: boolean | undefined",
1315
- "name": "skipFetch",
1608
+ "signature": "(property) snappedIds?: ComponentID[] | undefined",
1609
+ "name": "snappedIds",
1316
1610
  "type": {
1317
- "__schema": "KeywordTypeSchema",
1611
+ "__schema": "TypeArraySchema",
1318
1612
  "location": {
1319
1613
  "filePath": "merge-lanes.main.runtime.ts",
1320
- "line": 53,
1321
- "character": 15
1614
+ "line": 64,
1615
+ "character": 16
1322
1616
  },
1323
- "name": "boolean"
1617
+ "type": {
1618
+ "__schema": "TypeRefSchema",
1619
+ "location": {
1620
+ "filePath": "merge-lanes.main.runtime.ts",
1621
+ "line": 64,
1622
+ "character": 16
1623
+ },
1624
+ "name": "ComponentID"
1625
+ }
1324
1626
  },
1325
1627
  "isOptional": true
1326
1628
  },
@@ -1328,21 +1630,29 @@
1328
1630
  "__schema": "VariableLikeSchema",
1329
1631
  "location": {
1330
1632
  "filePath": "merge-lanes.main.runtime.ts",
1331
- "line": 54,
1633
+ "line": 65,
1332
1634
  "character": 3
1333
1635
  },
1334
- "signature": "(property) excludeNonLaneComps?: boolean | undefined",
1335
- "name": "excludeNonLaneComps",
1636
+ "signature": "(property) mergedPreviously: ComponentID[]",
1637
+ "name": "mergedPreviously",
1336
1638
  "type": {
1337
- "__schema": "KeywordTypeSchema",
1639
+ "__schema": "TypeArraySchema",
1338
1640
  "location": {
1339
1641
  "filePath": "merge-lanes.main.runtime.ts",
1340
- "line": 54,
1341
- "character": 25
1642
+ "line": 65,
1643
+ "character": 21
1342
1644
  },
1343
- "name": "boolean"
1645
+ "type": {
1646
+ "__schema": "TypeRefSchema",
1647
+ "location": {
1648
+ "filePath": "merge-lanes.main.runtime.ts",
1649
+ "line": 65,
1650
+ "character": 21
1651
+ },
1652
+ "name": "ComponentID"
1653
+ }
1344
1654
  },
1345
- "isOptional": true
1655
+ "isOptional": false
1346
1656
  }
1347
1657
  ]
1348
1658
  }
@@ -1351,7 +1661,7 @@
1351
1661
  "__schema": "ClassSchema",
1352
1662
  "location": {
1353
1663
  "filePath": "merge-lanes.main.runtime.ts",
1354
- "line": 57,
1664
+ "line": 68,
1355
1665
  "character": 1
1356
1666
  },
1357
1667
  "signature": "class MergeLanesMain",
@@ -1361,7 +1671,7 @@
1361
1671
  "__schema": "ConstructorSchema",
1362
1672
  "location": {
1363
1673
  "filePath": "merge-lanes.main.runtime.ts",
1364
- "line": 58,
1674
+ "line": 69,
1365
1675
  "character": 3
1366
1676
  },
1367
1677
  "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
@@ -1371,7 +1681,7 @@
1371
1681
  "__schema": "ParameterSchema",
1372
1682
  "location": {
1373
1683
  "filePath": "merge-lanes.main.runtime.ts",
1374
- "line": 59,
1684
+ "line": 70,
1375
1685
  "character": 5
1376
1686
  },
1377
1687
  "name": "workspace",
@@ -1379,7 +1689,7 @@
1379
1689
  "__schema": "TypeUnionSchema",
1380
1690
  "location": {
1381
1691
  "filePath": "merge-lanes.main.runtime.ts",
1382
- "line": 59,
1692
+ "line": 70,
1383
1693
  "character": 24
1384
1694
  },
1385
1695
  "types": [
@@ -1387,7 +1697,7 @@
1387
1697
  "__schema": "TypeRefSchema",
1388
1698
  "location": {
1389
1699
  "filePath": "merge-lanes.main.runtime.ts",
1390
- "line": 59,
1700
+ "line": 70,
1391
1701
  "character": 24
1392
1702
  },
1393
1703
  "name": "Workspace"
@@ -1396,7 +1706,7 @@
1396
1706
  "__schema": "KeywordTypeSchema",
1397
1707
  "location": {
1398
1708
  "filePath": "merge-lanes.main.runtime.ts",
1399
- "line": 59,
1709
+ "line": 70,
1400
1710
  "character": 36
1401
1711
  },
1402
1712
  "name": "undefined"
@@ -1410,7 +1720,7 @@
1410
1720
  "__schema": "ParameterSchema",
1411
1721
  "location": {
1412
1722
  "filePath": "merge-lanes.main.runtime.ts",
1413
- "line": 60,
1723
+ "line": 71,
1414
1724
  "character": 5
1415
1725
  },
1416
1726
  "name": "merging",
@@ -1418,7 +1728,7 @@
1418
1728
  "__schema": "TypeRefSchema",
1419
1729
  "location": {
1420
1730
  "filePath": "merge-lanes.main.runtime.ts",
1421
- "line": 60,
1731
+ "line": 71,
1422
1732
  "character": 22
1423
1733
  },
1424
1734
  "name": "MergingMain"
@@ -1430,7 +1740,7 @@
1430
1740
  "__schema": "ParameterSchema",
1431
1741
  "location": {
1432
1742
  "filePath": "merge-lanes.main.runtime.ts",
1433
- "line": 61,
1743
+ "line": 72,
1434
1744
  "character": 5
1435
1745
  },
1436
1746
  "name": "lanes",
@@ -1438,7 +1748,7 @@
1438
1748
  "__schema": "TypeRefSchema",
1439
1749
  "location": {
1440
1750
  "filePath": "merge-lanes.main.runtime.ts",
1441
- "line": 61,
1751
+ "line": 72,
1442
1752
  "character": 20
1443
1753
  },
1444
1754
  "name": "LanesMain"
@@ -1450,7 +1760,7 @@
1450
1760
  "__schema": "ParameterSchema",
1451
1761
  "location": {
1452
1762
  "filePath": "merge-lanes.main.runtime.ts",
1453
- "line": 62,
1763
+ "line": 73,
1454
1764
  "character": 5
1455
1765
  },
1456
1766
  "name": "logger",
@@ -1458,7 +1768,7 @@
1458
1768
  "__schema": "TypeRefSchema",
1459
1769
  "location": {
1460
1770
  "filePath": "merge-lanes.main.runtime.ts",
1461
- "line": 62,
1771
+ "line": 73,
1462
1772
  "character": 22
1463
1773
  },
1464
1774
  "name": "Logger"
@@ -1470,7 +1780,7 @@
1470
1780
  "__schema": "ParameterSchema",
1471
1781
  "location": {
1472
1782
  "filePath": "merge-lanes.main.runtime.ts",
1473
- "line": 63,
1783
+ "line": 74,
1474
1784
  "character": 5
1475
1785
  },
1476
1786
  "name": "remove",
@@ -1478,7 +1788,7 @@
1478
1788
  "__schema": "TypeRefSchema",
1479
1789
  "location": {
1480
1790
  "filePath": "merge-lanes.main.runtime.ts",
1481
- "line": 63,
1791
+ "line": 74,
1482
1792
  "character": 21
1483
1793
  },
1484
1794
  "name": "RemoveMain"
@@ -1490,7 +1800,7 @@
1490
1800
  "__schema": "ParameterSchema",
1491
1801
  "location": {
1492
1802
  "filePath": "merge-lanes.main.runtime.ts",
1493
- "line": 64,
1803
+ "line": 75,
1494
1804
  "character": 5
1495
1805
  },
1496
1806
  "name": "scope",
@@ -1498,7 +1808,7 @@
1498
1808
  "__schema": "TypeRefSchema",
1499
1809
  "location": {
1500
1810
  "filePath": "merge-lanes.main.runtime.ts",
1501
- "line": 64,
1811
+ "line": 75,
1502
1812
  "character": 20
1503
1813
  },
1504
1814
  "name": "ScopeMain"
@@ -1510,7 +1820,7 @@
1510
1820
  "__schema": "ParameterSchema",
1511
1821
  "location": {
1512
1822
  "filePath": "merge-lanes.main.runtime.ts",
1513
- "line": 65,
1823
+ "line": 76,
1514
1824
  "character": 5
1515
1825
  },
1516
1826
  "name": "exporter",
@@ -1518,7 +1828,7 @@
1518
1828
  "__schema": "TypeRefSchema",
1519
1829
  "location": {
1520
1830
  "filePath": "merge-lanes.main.runtime.ts",
1521
- "line": 65,
1831
+ "line": 76,
1522
1832
  "character": 23
1523
1833
  },
1524
1834
  "name": "ExportMain"
@@ -1530,7 +1840,7 @@
1530
1840
  "__schema": "ParameterSchema",
1531
1841
  "location": {
1532
1842
  "filePath": "merge-lanes.main.runtime.ts",
1533
- "line": 66,
1843
+ "line": 77,
1534
1844
  "character": 5
1535
1845
  },
1536
1846
  "name": "importer",
@@ -1538,7 +1848,7 @@
1538
1848
  "__schema": "TypeRefSchema",
1539
1849
  "location": {
1540
1850
  "filePath": "merge-lanes.main.runtime.ts",
1541
- "line": 66,
1851
+ "line": 77,
1542
1852
  "character": 23
1543
1853
  },
1544
1854
  "name": "ImporterMain"
@@ -1550,7 +1860,7 @@
1550
1860
  "__schema": "ParameterSchema",
1551
1861
  "location": {
1552
1862
  "filePath": "merge-lanes.main.runtime.ts",
1553
- "line": 67,
1863
+ "line": 78,
1554
1864
  "character": 5
1555
1865
  },
1556
1866
  "name": "checkout",
@@ -1558,7 +1868,7 @@
1558
1868
  "__schema": "TypeRefSchema",
1559
1869
  "location": {
1560
1870
  "filePath": "merge-lanes.main.runtime.ts",
1561
- "line": 67,
1871
+ "line": 78,
1562
1872
  "character": 23
1563
1873
  },
1564
1874
  "name": "CheckoutMain"
@@ -1571,7 +1881,7 @@
1571
1881
  "__schema": "ThisTypeSchema",
1572
1882
  "location": {
1573
1883
  "filePath": "merge-lanes.main.runtime.ts",
1574
- "line": 57,
1884
+ "line": 68,
1575
1885
  "character": 1
1576
1886
  },
1577
1887
  "name": "MergeLanesMain"
@@ -1582,26 +1892,26 @@
1582
1892
  "__schema": "FunctionLikeSchema",
1583
1893
  "location": {
1584
1894
  "filePath": "merge-lanes.main.runtime.ts",
1585
- "line": 71,
1895
+ "line": 81,
1586
1896
  "character": 3
1587
1897
  },
1588
- "signature": "(method) MergeLanesMain.mergeLane(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
1589
- "name": "mergeLane",
1898
+ "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
1899
+ "name": "mergeLaneByCLI",
1590
1900
  "params": [
1591
1901
  {
1592
1902
  "__schema": "ParameterSchema",
1593
1903
  "location": {
1594
1904
  "filePath": "merge-lanes.main.runtime.ts",
1595
- "line": 72,
1596
- "character": 5
1905
+ "line": 81,
1906
+ "character": 24
1597
1907
  },
1598
1908
  "name": "laneName",
1599
1909
  "type": {
1600
1910
  "__schema": "KeywordTypeSchema",
1601
1911
  "location": {
1602
1912
  "filePath": "merge-lanes.main.runtime.ts",
1603
- "line": 72,
1604
- "character": 15
1913
+ "line": 81,
1914
+ "character": 34
1605
1915
  },
1606
1916
  "name": "string"
1607
1917
  },
@@ -1612,7 +1922,91 @@
1612
1922
  "__schema": "ParameterSchema",
1613
1923
  "location": {
1614
1924
  "filePath": "merge-lanes.main.runtime.ts",
1615
- "line": 73,
1925
+ "line": 81,
1926
+ "character": 42
1927
+ },
1928
+ "name": "options",
1929
+ "type": {
1930
+ "__schema": "TypeRefSchema",
1931
+ "location": {
1932
+ "filePath": "merge-lanes.main.runtime.ts",
1933
+ "line": 81,
1934
+ "character": 51
1935
+ },
1936
+ "name": "MergeLaneOptions"
1937
+ },
1938
+ "isOptional": false,
1939
+ "isSpread": false
1940
+ }
1941
+ ],
1942
+ "returnType": {
1943
+ "__schema": "InferenceTypeSchema",
1944
+ "location": {
1945
+ "filePath": "merge-lanes.main.runtime.ts",
1946
+ "line": 81,
1947
+ "character": 3
1948
+ },
1949
+ "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>"
1950
+ },
1951
+ "modifiers": [
1952
+ "async"
1953
+ ]
1954
+ },
1955
+ {
1956
+ "__schema": "FunctionLikeSchema",
1957
+ "location": {
1958
+ "filePath": "merge-lanes.main.runtime.ts",
1959
+ "line": 91,
1960
+ "character": 3
1961
+ },
1962
+ "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n}>",
1963
+ "name": "mergeLane",
1964
+ "params": [
1965
+ {
1966
+ "__schema": "ParameterSchema",
1967
+ "location": {
1968
+ "filePath": "merge-lanes.main.runtime.ts",
1969
+ "line": 92,
1970
+ "character": 5
1971
+ },
1972
+ "name": "otherLaneId",
1973
+ "type": {
1974
+ "__schema": "TypeRefSchema",
1975
+ "location": {
1976
+ "filePath": "merge-lanes.main.runtime.ts",
1977
+ "line": 92,
1978
+ "character": 18
1979
+ },
1980
+ "name": "LaneId"
1981
+ },
1982
+ "isOptional": false,
1983
+ "isSpread": false
1984
+ },
1985
+ {
1986
+ "__schema": "ParameterSchema",
1987
+ "location": {
1988
+ "filePath": "merge-lanes.main.runtime.ts",
1989
+ "line": 93,
1990
+ "character": 5
1991
+ },
1992
+ "name": "currentLaneId",
1993
+ "type": {
1994
+ "__schema": "TypeRefSchema",
1995
+ "location": {
1996
+ "filePath": "merge-lanes.main.runtime.ts",
1997
+ "line": 93,
1998
+ "character": 20
1999
+ },
2000
+ "name": "LaneId"
2001
+ },
2002
+ "isOptional": false,
2003
+ "isSpread": false
2004
+ },
2005
+ {
2006
+ "__schema": "ParameterSchema",
2007
+ "location": {
2008
+ "filePath": "merge-lanes.main.runtime.ts",
2009
+ "line": 94,
1616
2010
  "character": 5
1617
2011
  },
1618
2012
  "name": "options",
@@ -1620,7 +2014,7 @@
1620
2014
  "__schema": "TypeRefSchema",
1621
2015
  "location": {
1622
2016
  "filePath": "merge-lanes.main.runtime.ts",
1623
- "line": 73,
2017
+ "line": 94,
1624
2018
  "character": 14
1625
2019
  },
1626
2020
  "name": "MergeLaneOptions"
@@ -1633,7 +2027,7 @@
1633
2027
  "__schema": "TypeRefSchema",
1634
2028
  "location": {
1635
2029
  "filePath": "merge-lanes.main.runtime.ts",
1636
- "line": 74,
2030
+ "line": 95,
1637
2031
  "character": 6
1638
2032
  },
1639
2033
  "name": "Promise",
@@ -1642,7 +2036,7 @@
1642
2036
  "__schema": "TypeLiteralSchema",
1643
2037
  "location": {
1644
2038
  "filePath": "merge-lanes.main.runtime.ts",
1645
- "line": 74,
2039
+ "line": 95,
1646
2040
  "character": 14
1647
2041
  },
1648
2042
  "members": [
@@ -1650,7 +2044,7 @@
1650
2044
  "__schema": "VariableLikeSchema",
1651
2045
  "location": {
1652
2046
  "filePath": "merge-lanes.main.runtime.ts",
1653
- "line": 74,
2047
+ "line": 95,
1654
2048
  "character": 16
1655
2049
  },
1656
2050
  "signature": "(property) mergeResults: ApplyVersionResults",
@@ -1659,7 +2053,7 @@
1659
2053
  "__schema": "TypeRefSchema",
1660
2054
  "location": {
1661
2055
  "filePath": "merge-lanes.main.runtime.ts",
1662
- "line": 74,
2056
+ "line": 95,
1663
2057
  "character": 16
1664
2058
  },
1665
2059
  "name": "ApplyVersionResults",
@@ -1674,7 +2068,7 @@
1674
2068
  "__schema": "VariableLikeSchema",
1675
2069
  "location": {
1676
2070
  "filePath": "merge-lanes.main.runtime.ts",
1677
- "line": 74,
2071
+ "line": 95,
1678
2072
  "character": 51
1679
2073
  },
1680
2074
  "signature": "(property) deleteResults: any",
@@ -1683,7 +2077,7 @@
1683
2077
  "__schema": "KeywordTypeSchema",
1684
2078
  "location": {
1685
2079
  "filePath": "merge-lanes.main.runtime.ts",
1686
- "line": 74,
2080
+ "line": 95,
1687
2081
  "character": 66
1688
2082
  },
1689
2083
  "name": "any"
@@ -1694,7 +2088,7 @@
1694
2088
  "__schema": "VariableLikeSchema",
1695
2089
  "location": {
1696
2090
  "filePath": "merge-lanes.main.runtime.ts",
1697
- "line": 74,
2091
+ "line": 95,
1698
2092
  "character": 71
1699
2093
  },
1700
2094
  "signature": "(property) configMergeResults: ConfigMergeResult[]",
@@ -1703,14 +2097,14 @@
1703
2097
  "__schema": "TypeArraySchema",
1704
2098
  "location": {
1705
2099
  "filePath": "merge-lanes.main.runtime.ts",
1706
- "line": 74,
2100
+ "line": 95,
1707
2101
  "character": 91
1708
2102
  },
1709
2103
  "type": {
1710
2104
  "__schema": "TypeRefSchema",
1711
2105
  "location": {
1712
2106
  "filePath": "merge-lanes.main.runtime.ts",
1713
- "line": 74,
2107
+ "line": 95,
1714
2108
  "character": 91
1715
2109
  },
1716
2110
  "name": "ConfigMergeResult"
@@ -1730,7 +2124,7 @@
1730
2124
  "__schema": "FunctionLikeSchema",
1731
2125
  "location": {
1732
2126
  "filePath": "merge-lanes.main.runtime.ts",
1733
- "line": 257,
2127
+ "line": 276,
1734
2128
  "character": 3
1735
2129
  },
1736
2130
  "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
@@ -1740,7 +2134,7 @@
1740
2134
  "__schema": "ParameterSchema",
1741
2135
  "location": {
1742
2136
  "filePath": "merge-lanes.main.runtime.ts",
1743
- "line": 257,
2137
+ "line": 276,
1744
2138
  "character": 24
1745
2139
  },
1746
2140
  "name": "checkoutProps",
@@ -1748,7 +2142,7 @@
1748
2142
  "__schema": "TypeRefSchema",
1749
2143
  "location": {
1750
2144
  "filePath": "merge-lanes.main.runtime.ts",
1751
- "line": 257,
2145
+ "line": 276,
1752
2146
  "character": 39
1753
2147
  },
1754
2148
  "name": "CheckoutProps"
@@ -1760,7 +2154,7 @@
1760
2154
  "__schema": "ParameterSchema",
1761
2155
  "location": {
1762
2156
  "filePath": "merge-lanes.main.runtime.ts",
1763
- "line": 257,
2157
+ "line": 276,
1764
2158
  "character": 54
1765
2159
  },
1766
2160
  "name": "mergeAbortOpts",
@@ -1768,7 +2162,7 @@
1768
2162
  "__schema": "TypeRefSchema",
1769
2163
  "location": {
1770
2164
  "filePath": "merge-lanes.main.runtime.ts",
1771
- "line": 257,
2165
+ "line": 276,
1772
2166
  "character": 70
1773
2167
  },
1774
2168
  "name": "MergeAbortOpts"
@@ -1781,7 +2175,7 @@
1781
2175
  "__schema": "InferenceTypeSchema",
1782
2176
  "location": {
1783
2177
  "filePath": "merge-lanes.main.runtime.ts",
1784
- "line": 257,
2178
+ "line": 276,
1785
2179
  "character": 3
1786
2180
  },
1787
2181
  "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
@@ -1794,17 +2188,17 @@
1794
2188
  "__schema": "FunctionLikeSchema",
1795
2189
  "location": {
1796
2190
  "filePath": "merge-lanes.main.runtime.ts",
1797
- "line": 313,
2191
+ "line": 332,
1798
2192
  "character": 3
1799
2193
  },
1800
- "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<{\n mergedPreviously: string[];\n mergedNow: string[];\n exportedIds: string[];\n}>",
2194
+ "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
1801
2195
  "name": "mergeFromScope",
1802
2196
  "params": [
1803
2197
  {
1804
2198
  "__schema": "ParameterSchema",
1805
2199
  "location": {
1806
2200
  "filePath": "merge-lanes.main.runtime.ts",
1807
- "line": 314,
2201
+ "line": 333,
1808
2202
  "character": 5
1809
2203
  },
1810
2204
  "name": "fromLane",
@@ -1812,7 +2206,7 @@
1812
2206
  "__schema": "KeywordTypeSchema",
1813
2207
  "location": {
1814
2208
  "filePath": "merge-lanes.main.runtime.ts",
1815
- "line": 314,
2209
+ "line": 333,
1816
2210
  "character": 15
1817
2211
  },
1818
2212
  "name": "string"
@@ -1824,7 +2218,7 @@
1824
2218
  "__schema": "ParameterSchema",
1825
2219
  "location": {
1826
2220
  "filePath": "merge-lanes.main.runtime.ts",
1827
- "line": 315,
2221
+ "line": 334,
1828
2222
  "character": 5
1829
2223
  },
1830
2224
  "name": "toLane",
@@ -1832,7 +2226,7 @@
1832
2226
  "__schema": "KeywordTypeSchema",
1833
2227
  "location": {
1834
2228
  "filePath": "merge-lanes.main.runtime.ts",
1835
- "line": 315,
2229
+ "line": 334,
1836
2230
  "character": 13
1837
2231
  },
1838
2232
  "name": "string"
@@ -1844,7 +2238,7 @@
1844
2238
  "__schema": "ParameterSchema",
1845
2239
  "location": {
1846
2240
  "filePath": "merge-lanes.main.runtime.ts",
1847
- "line": 316,
2241
+ "line": 335,
1848
2242
  "character": 5
1849
2243
  },
1850
2244
  "name": "options",
@@ -1852,7 +2246,7 @@
1852
2246
  "__schema": "TypeIntersectionSchema",
1853
2247
  "location": {
1854
2248
  "filePath": "merge-lanes.main.runtime.ts",
1855
- "line": 316,
2249
+ "line": 335,
1856
2250
  "character": 14
1857
2251
  },
1858
2252
  "types": [
@@ -1860,7 +2254,7 @@
1860
2254
  "__schema": "TypeRefSchema",
1861
2255
  "location": {
1862
2256
  "filePath": "merge-lanes.main.runtime.ts",
1863
- "line": 316,
2257
+ "line": 335,
1864
2258
  "character": 14
1865
2259
  },
1866
2260
  "name": "Partial",
@@ -1869,7 +2263,7 @@
1869
2263
  "__schema": "TypeRefSchema",
1870
2264
  "location": {
1871
2265
  "filePath": "merge-lanes.main.runtime.ts",
1872
- "line": 316,
2266
+ "line": 335,
1873
2267
  "character": 22
1874
2268
  },
1875
2269
  "name": "MergeLaneOptions"
@@ -1880,7 +2274,7 @@
1880
2274
  "__schema": "TypeLiteralSchema",
1881
2275
  "location": {
1882
2276
  "filePath": "merge-lanes.main.runtime.ts",
1883
- "line": 316,
2277
+ "line": 335,
1884
2278
  "character": 42
1885
2279
  },
1886
2280
  "members": [
@@ -1888,7 +2282,7 @@
1888
2282
  "__schema": "VariableLikeSchema",
1889
2283
  "location": {
1890
2284
  "filePath": "merge-lanes.main.runtime.ts",
1891
- "line": 316,
2285
+ "line": 335,
1892
2286
  "character": 44
1893
2287
  },
1894
2288
  "signature": "(property) push?: boolean | undefined",
@@ -1897,7 +2291,7 @@
1897
2291
  "__schema": "KeywordTypeSchema",
1898
2292
  "location": {
1899
2293
  "filePath": "merge-lanes.main.runtime.ts",
1900
- "line": 316,
2294
+ "line": 335,
1901
2295
  "character": 51
1902
2296
  },
1903
2297
  "name": "boolean"
@@ -1908,7 +2302,7 @@
1908
2302
  "__schema": "VariableLikeSchema",
1909
2303
  "location": {
1910
2304
  "filePath": "merge-lanes.main.runtime.ts",
1911
- "line": 316,
2305
+ "line": 335,
1912
2306
  "character": 60
1913
2307
  },
1914
2308
  "signature": "(property) reMerge?: boolean | undefined",
@@ -1917,7 +2311,7 @@
1917
2311
  "__schema": "KeywordTypeSchema",
1918
2312
  "location": {
1919
2313
  "filePath": "merge-lanes.main.runtime.ts",
1920
- "line": 316,
2314
+ "line": 335,
1921
2315
  "character": 70
1922
2316
  },
1923
2317
  "name": "boolean"
@@ -1936,104 +2330,19 @@
1936
2330
  "__schema": "TypeRefSchema",
1937
2331
  "location": {
1938
2332
  "filePath": "merge-lanes.main.runtime.ts",
1939
- "line": 317,
2333
+ "line": 336,
1940
2334
  "character": 6
1941
2335
  },
1942
2336
  "name": "Promise",
1943
2337
  "typeArgs": [
1944
2338
  {
1945
- "__schema": "TypeLiteralSchema",
2339
+ "__schema": "TypeRefSchema",
1946
2340
  "location": {
1947
2341
  "filePath": "merge-lanes.main.runtime.ts",
1948
- "line": 317,
2342
+ "line": 336,
1949
2343
  "character": 14
1950
2344
  },
1951
- "members": [
1952
- {
1953
- "__schema": "VariableLikeSchema",
1954
- "location": {
1955
- "filePath": "merge-lanes.main.runtime.ts",
1956
- "line": 318,
1957
- "character": 5
1958
- },
1959
- "signature": "(property) mergedPreviously: string[]",
1960
- "name": "mergedPreviously",
1961
- "type": {
1962
- "__schema": "TypeArraySchema",
1963
- "location": {
1964
- "filePath": "merge-lanes.main.runtime.ts",
1965
- "line": 318,
1966
- "character": 23
1967
- },
1968
- "type": {
1969
- "__schema": "KeywordTypeSchema",
1970
- "location": {
1971
- "filePath": "merge-lanes.main.runtime.ts",
1972
- "line": 318,
1973
- "character": 23
1974
- },
1975
- "name": "string"
1976
- }
1977
- },
1978
- "isOptional": false
1979
- },
1980
- {
1981
- "__schema": "VariableLikeSchema",
1982
- "location": {
1983
- "filePath": "merge-lanes.main.runtime.ts",
1984
- "line": 319,
1985
- "character": 5
1986
- },
1987
- "signature": "(property) mergedNow: string[]",
1988
- "name": "mergedNow",
1989
- "type": {
1990
- "__schema": "TypeArraySchema",
1991
- "location": {
1992
- "filePath": "merge-lanes.main.runtime.ts",
1993
- "line": 319,
1994
- "character": 16
1995
- },
1996
- "type": {
1997
- "__schema": "KeywordTypeSchema",
1998
- "location": {
1999
- "filePath": "merge-lanes.main.runtime.ts",
2000
- "line": 319,
2001
- "character": 16
2002
- },
2003
- "name": "string"
2004
- }
2005
- },
2006
- "isOptional": false
2007
- },
2008
- {
2009
- "__schema": "VariableLikeSchema",
2010
- "location": {
2011
- "filePath": "merge-lanes.main.runtime.ts",
2012
- "line": 320,
2013
- "character": 5
2014
- },
2015
- "signature": "(property) exportedIds: string[]",
2016
- "name": "exportedIds",
2017
- "type": {
2018
- "__schema": "TypeArraySchema",
2019
- "location": {
2020
- "filePath": "merge-lanes.main.runtime.ts",
2021
- "line": 320,
2022
- "character": 18
2023
- },
2024
- "type": {
2025
- "__schema": "KeywordTypeSchema",
2026
- "location": {
2027
- "filePath": "merge-lanes.main.runtime.ts",
2028
- "line": 320,
2029
- "character": 18
2030
- },
2031
- "name": "string"
2032
- }
2033
- },
2034
- "isOptional": false
2035
- }
2036
- ]
2345
+ "name": "MergeFromScopeResult"
2037
2346
  }
2038
2347
  ]
2039
2348
  },
@@ -2045,7 +2354,7 @@
2045
2354
  "__schema": "VariableLikeSchema",
2046
2355
  "location": {
2047
2356
  "filePath": "merge-lanes.main.runtime.ts",
2048
- "line": 448,
2357
+ "line": 525,
2049
2358
  "character": 3
2050
2359
  },
2051
2360
  "signature": "(property) MergeLanesMain.slots: never[]",
@@ -2054,7 +2363,7 @@
2054
2363
  "__schema": "InferenceTypeSchema",
2055
2364
  "location": {
2056
2365
  "filePath": "merge-lanes.main.runtime.ts",
2057
- "line": 448,
2366
+ "line": 525,
2058
2367
  "character": 3
2059
2368
  },
2060
2369
  "type": "never[]"
@@ -2066,7 +2375,7 @@
2066
2375
  "__schema": "VariableLikeSchema",
2067
2376
  "location": {
2068
2377
  "filePath": "merge-lanes.main.runtime.ts",
2069
- "line": 449,
2378
+ "line": 526,
2070
2379
  "character": 3
2071
2380
  },
2072
2381
  "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
@@ -2075,7 +2384,7 @@
2075
2384
  "__schema": "InferenceTypeSchema",
2076
2385
  "location": {
2077
2386
  "filePath": "merge-lanes.main.runtime.ts",
2078
- "line": 449,
2387
+ "line": 526,
2079
2388
  "character": 3
2080
2389
  },
2081
2390
  "type": "Aspect[]"
@@ -2087,7 +2396,7 @@
2087
2396
  "__schema": "VariableLikeSchema",
2088
2397
  "location": {
2089
2398
  "filePath": "merge-lanes.main.runtime.ts",
2090
- "line": 462,
2399
+ "line": 539,
2091
2400
  "character": 3
2092
2401
  },
2093
2402
  "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
@@ -2096,7 +2405,7 @@
2096
2405
  "__schema": "InferenceTypeSchema",
2097
2406
  "location": {
2098
2407
  "filePath": "merge-lanes.main.runtime.ts",
2099
- "line": 462,
2408
+ "line": 539,
2100
2409
  "character": 3
2101
2410
  },
2102
2411
  "type": "RuntimeDefinition"
@@ -2108,7 +2417,7 @@
2108
2417
  "__schema": "FunctionLikeSchema",
2109
2418
  "location": {
2110
2419
  "filePath": "merge-lanes.main.runtime.ts",
2111
- "line": 464,
2420
+ "line": 541,
2112
2421
  "character": 3
2113
2422
  },
2114
2423
  "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n]): Promise<MergeLanesMain>",
@@ -2118,7 +2427,7 @@
2118
2427
  "__schema": "ParameterSchema",
2119
2428
  "location": {
2120
2429
  "filePath": "merge-lanes.main.runtime.ts",
2121
- "line": 464,
2430
+ "line": 541,
2122
2431
  "character": 25
2123
2432
  },
2124
2433
  "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
@@ -2126,7 +2435,7 @@
2126
2435
  "__schema": "TupleTypeSchema",
2127
2436
  "location": {
2128
2437
  "filePath": "merge-lanes.main.runtime.ts",
2129
- "line": 476,
2438
+ "line": 553,
2130
2439
  "character": 6
2131
2440
  },
2132
2441
  "elements": [
@@ -2134,7 +2443,7 @@
2134
2443
  "__schema": "TypeRefSchema",
2135
2444
  "location": {
2136
2445
  "filePath": "merge-lanes.main.runtime.ts",
2137
- "line": 477,
2446
+ "line": 554,
2138
2447
  "character": 5
2139
2448
  },
2140
2449
  "name": "LanesMain"
@@ -2143,7 +2452,7 @@
2143
2452
  "__schema": "TypeRefSchema",
2144
2453
  "location": {
2145
2454
  "filePath": "merge-lanes.main.runtime.ts",
2146
- "line": 478,
2455
+ "line": 555,
2147
2456
  "character": 5
2148
2457
  },
2149
2458
  "name": "CLIMain"
@@ -2152,7 +2461,7 @@
2152
2461
  "__schema": "TypeRefSchema",
2153
2462
  "location": {
2154
2463
  "filePath": "merge-lanes.main.runtime.ts",
2155
- "line": 479,
2464
+ "line": 556,
2156
2465
  "character": 5
2157
2466
  },
2158
2467
  "name": "Workspace"
@@ -2161,7 +2470,7 @@
2161
2470
  "__schema": "TypeRefSchema",
2162
2471
  "location": {
2163
2472
  "filePath": "merge-lanes.main.runtime.ts",
2164
- "line": 480,
2473
+ "line": 557,
2165
2474
  "character": 5
2166
2475
  },
2167
2476
  "name": "MergingMain"
@@ -2170,7 +2479,7 @@
2170
2479
  "__schema": "TypeRefSchema",
2171
2480
  "location": {
2172
2481
  "filePath": "merge-lanes.main.runtime.ts",
2173
- "line": 481,
2482
+ "line": 558,
2174
2483
  "character": 5
2175
2484
  },
2176
2485
  "name": "LoggerMain"
@@ -2179,7 +2488,7 @@
2179
2488
  "__schema": "TypeRefSchema",
2180
2489
  "location": {
2181
2490
  "filePath": "merge-lanes.main.runtime.ts",
2182
- "line": 482,
2491
+ "line": 559,
2183
2492
  "character": 5
2184
2493
  },
2185
2494
  "name": "RemoveMain"
@@ -2188,7 +2497,7 @@
2188
2497
  "__schema": "TypeRefSchema",
2189
2498
  "location": {
2190
2499
  "filePath": "merge-lanes.main.runtime.ts",
2191
- "line": 483,
2500
+ "line": 560,
2192
2501
  "character": 5
2193
2502
  },
2194
2503
  "name": "ScopeMain"
@@ -2197,7 +2506,7 @@
2197
2506
  "__schema": "TypeRefSchema",
2198
2507
  "location": {
2199
2508
  "filePath": "merge-lanes.main.runtime.ts",
2200
- "line": 484,
2509
+ "line": 561,
2201
2510
  "character": 5
2202
2511
  },
2203
2512
  "name": "ExportMain"
@@ -2206,7 +2515,7 @@
2206
2515
  "__schema": "TypeRefSchema",
2207
2516
  "location": {
2208
2517
  "filePath": "merge-lanes.main.runtime.ts",
2209
- "line": 485,
2518
+ "line": 562,
2210
2519
  "character": 5
2211
2520
  },
2212
2521
  "name": "ImporterMain"
@@ -2215,7 +2524,7 @@
2215
2524
  "__schema": "TypeRefSchema",
2216
2525
  "location": {
2217
2526
  "filePath": "merge-lanes.main.runtime.ts",
2218
- "line": 486,
2527
+ "line": 563,
2219
2528
  "character": 5
2220
2529
  },
2221
2530
  "name": "CheckoutMain"
@@ -2224,7 +2533,7 @@
2224
2533
  "__schema": "TypeRefSchema",
2225
2534
  "location": {
2226
2535
  "filePath": "merge-lanes.main.runtime.ts",
2227
- "line": 487,
2536
+ "line": 564,
2228
2537
  "character": 5
2229
2538
  },
2230
2539
  "name": "GlobalConfigMain"
@@ -2239,7 +2548,7 @@
2239
2548
  "__schema": "InferenceTypeSchema",
2240
2549
  "location": {
2241
2550
  "filePath": "merge-lanes.main.runtime.ts",
2242
- "line": 464,
2551
+ "line": 541,
2243
2552
  "character": 3
2244
2553
  },
2245
2554
  "type": "Promise<MergeLanesMain>"
@@ -2257,7 +2566,7 @@
2257
2566
  "__schema": "UnImplementedSchema",
2258
2567
  "location": {
2259
2568
  "filePath": "merge-lanes.main.runtime.ts",
2260
- "line": 752,
2569
+ "line": 834,
2261
2570
  "character": 16
2262
2571
  },
2263
2572
  "name": "MergeLanesMain",
@@ -2269,17 +2578,17 @@
2269
2578
  "__schema": "FunctionLikeSchema",
2270
2579
  "location": {
2271
2580
  "filePath": "merge-lanes.main.runtime.ts",
2272
- "line": 509,
2581
+ "line": 586,
2273
2582
  "character": 1
2274
2583
  },
2275
- "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], workspace: Workspace, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
2584
+ "signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
2276
2585
  "name": "filterComponentsStatus",
2277
2586
  "params": [
2278
2587
  {
2279
2588
  "__schema": "ParameterSchema",
2280
2589
  "location": {
2281
2590
  "filePath": "merge-lanes.main.runtime.ts",
2282
- "line": 510,
2591
+ "line": 587,
2283
2592
  "character": 3
2284
2593
  },
2285
2594
  "name": "allComponentsStatus",
@@ -2287,14 +2596,14 @@
2287
2596
  "__schema": "TypeArraySchema",
2288
2597
  "location": {
2289
2598
  "filePath": "merge-lanes.main.runtime.ts",
2290
- "line": 510,
2599
+ "line": 587,
2291
2600
  "character": 24
2292
2601
  },
2293
2602
  "type": {
2294
2603
  "__schema": "TypeRefSchema",
2295
2604
  "location": {
2296
2605
  "filePath": "merge-lanes.main.runtime.ts",
2297
- "line": 510,
2606
+ "line": 587,
2298
2607
  "character": 24
2299
2608
  },
2300
2609
  "name": "ComponentMergeStatus"
@@ -2307,7 +2616,7 @@
2307
2616
  "__schema": "ParameterSchema",
2308
2617
  "location": {
2309
2618
  "filePath": "merge-lanes.main.runtime.ts",
2310
- "line": 511,
2619
+ "line": 588,
2311
2620
  "character": 3
2312
2621
  },
2313
2622
  "name": "compIdsToKeep",
@@ -2315,14 +2624,14 @@
2315
2624
  "__schema": "TypeArraySchema",
2316
2625
  "location": {
2317
2626
  "filePath": "merge-lanes.main.runtime.ts",
2318
- "line": 511,
2627
+ "line": 588,
2319
2628
  "character": 18
2320
2629
  },
2321
2630
  "type": {
2322
2631
  "__schema": "TypeRefSchema",
2323
2632
  "location": {
2324
2633
  "filePath": "merge-lanes.main.runtime.ts",
2325
- "line": 511,
2634
+ "line": 588,
2326
2635
  "character": 18
2327
2636
  },
2328
2637
  "name": "ComponentID"
@@ -2335,7 +2644,7 @@
2335
2644
  "__schema": "ParameterSchema",
2336
2645
  "location": {
2337
2646
  "filePath": "merge-lanes.main.runtime.ts",
2338
- "line": 512,
2647
+ "line": 589,
2339
2648
  "character": 3
2340
2649
  },
2341
2650
  "name": "allBitIds",
@@ -2343,14 +2652,14 @@
2343
2652
  "__schema": "TypeArraySchema",
2344
2653
  "location": {
2345
2654
  "filePath": "merge-lanes.main.runtime.ts",
2346
- "line": 512,
2655
+ "line": 589,
2347
2656
  "character": 14
2348
2657
  },
2349
2658
  "type": {
2350
2659
  "__schema": "TypeRefSchema",
2351
2660
  "location": {
2352
2661
  "filePath": "merge-lanes.main.runtime.ts",
2353
- "line": 512,
2662
+ "line": 589,
2354
2663
  "character": 14
2355
2664
  },
2356
2665
  "name": "ComponentID"
@@ -2363,18 +2672,18 @@
2363
2672
  "__schema": "ParameterSchema",
2364
2673
  "location": {
2365
2674
  "filePath": "merge-lanes.main.runtime.ts",
2366
- "line": 513,
2675
+ "line": 590,
2367
2676
  "character": 3
2368
2677
  },
2369
- "name": "workspace",
2678
+ "name": "legacyScope",
2370
2679
  "type": {
2371
2680
  "__schema": "TypeRefSchema",
2372
2681
  "location": {
2373
2682
  "filePath": "merge-lanes.main.runtime.ts",
2374
- "line": 513,
2375
- "character": 14
2683
+ "line": 590,
2684
+ "character": 16
2376
2685
  },
2377
- "name": "Workspace"
2686
+ "name": "LegacyScope"
2378
2687
  },
2379
2688
  "isOptional": false,
2380
2689
  "isSpread": false
@@ -2383,7 +2692,7 @@
2383
2692
  "__schema": "ParameterSchema",
2384
2693
  "location": {
2385
2694
  "filePath": "merge-lanes.main.runtime.ts",
2386
- "line": 514,
2695
+ "line": 591,
2387
2696
  "character": 3
2388
2697
  },
2389
2698
  "name": "includeDeps",
@@ -2391,7 +2700,7 @@
2391
2700
  "__schema": "InferenceTypeSchema",
2392
2701
  "location": {
2393
2702
  "filePath": "merge-lanes.main.runtime.ts",
2394
- "line": 514,
2703
+ "line": 591,
2395
2704
  "character": 3
2396
2705
  },
2397
2706
  "type": "boolean"
@@ -2404,7 +2713,7 @@
2404
2713
  "__schema": "ParameterSchema",
2405
2714
  "location": {
2406
2715
  "filePath": "merge-lanes.main.runtime.ts",
2407
- "line": 515,
2716
+ "line": 592,
2408
2717
  "character": 3
2409
2718
  },
2410
2719
  "name": "otherLane",
@@ -2412,7 +2721,7 @@
2412
2721
  "__schema": "TypeRefSchema",
2413
2722
  "location": {
2414
2723
  "filePath": "merge-lanes.main.runtime.ts",
2415
- "line": 515,
2724
+ "line": 592,
2416
2725
  "character": 15
2417
2726
  },
2418
2727
  "name": "Lane"
@@ -2424,7 +2733,7 @@
2424
2733
  "__schema": "ParameterSchema",
2425
2734
  "location": {
2426
2735
  "filePath": "merge-lanes.main.runtime.ts",
2427
- "line": 516,
2736
+ "line": 593,
2428
2737
  "character": 3
2429
2738
  },
2430
2739
  "name": "shouldSquash",
@@ -2432,7 +2741,7 @@
2432
2741
  "__schema": "KeywordTypeSchema",
2433
2742
  "location": {
2434
2743
  "filePath": "merge-lanes.main.runtime.ts",
2435
- "line": 516,
2744
+ "line": 593,
2436
2745
  "character": 18
2437
2746
  },
2438
2747
  "name": "boolean"
@@ -2445,7 +2754,7 @@
2445
2754
  "__schema": "TypeRefSchema",
2446
2755
  "location": {
2447
2756
  "filePath": "merge-lanes.main.runtime.ts",
2448
- "line": 517,
2757
+ "line": 594,
2449
2758
  "character": 4
2450
2759
  },
2451
2760
  "name": "Promise",
@@ -2454,14 +2763,14 @@
2454
2763
  "__schema": "TypeArraySchema",
2455
2764
  "location": {
2456
2765
  "filePath": "merge-lanes.main.runtime.ts",
2457
- "line": 517,
2766
+ "line": 594,
2458
2767
  "character": 12
2459
2768
  },
2460
2769
  "type": {
2461
2770
  "__schema": "TypeRefSchema",
2462
2771
  "location": {
2463
2772
  "filePath": "merge-lanes.main.runtime.ts",
2464
- "line": 517,
2773
+ "line": 594,
2465
2774
  "character": 12
2466
2775
  },
2467
2776
  "name": "ComponentMergeStatus"
@@ -2477,7 +2786,7 @@
2477
2786
  "__schema": "FunctionLikeSchema",
2478
2787
  "location": {
2479
2788
  "filePath": "merge-lanes.main.runtime.ts",
2480
- "line": 626,
2789
+ "line": 703,
2481
2790
  "character": 1
2482
2791
  },
2483
2792
  "signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
@@ -2487,7 +2796,7 @@
2487
2796
  "__schema": "ParameterSchema",
2488
2797
  "location": {
2489
2798
  "filePath": "merge-lanes.main.runtime.ts",
2490
- "line": 626,
2799
+ "line": 703,
2491
2800
  "character": 32
2492
2801
  },
2493
2802
  "name": "otherLaneId",
@@ -2495,7 +2804,7 @@
2495
2804
  "__schema": "TypeRefSchema",
2496
2805
  "location": {
2497
2806
  "filePath": "merge-lanes.main.runtime.ts",
2498
- "line": 626,
2807
+ "line": 703,
2499
2808
  "character": 45
2500
2809
  },
2501
2810
  "name": "LaneId"
@@ -2508,7 +2817,7 @@
2508
2817
  "__schema": "InferenceTypeSchema",
2509
2818
  "location": {
2510
2819
  "filePath": "merge-lanes.main.runtime.ts",
2511
- "line": 626,
2820
+ "line": 703,
2512
2821
  "character": 1
2513
2822
  },
2514
2823
  "type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
@@ -2521,33 +2830,33 @@
2521
2830
  "__schema": "FunctionLikeSchema",
2522
2831
  "location": {
2523
2832
  "filePath": "merge-lanes.main.runtime.ts",
2524
- "line": 635,
2833
+ "line": 712,
2525
2834
  "character": 1
2526
2835
  },
2527
- "signature": "function squashSnaps(allComponentsStatus: ComponentMergeStatus[], otherLaneId: LaneId, consumer: Consumer): Promise<void>",
2836
+ "signature": "function squashSnaps(allComponentsStatus: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope): Promise<void>",
2528
2837
  "name": "squashSnaps",
2529
2838
  "params": [
2530
2839
  {
2531
2840
  "__schema": "ParameterSchema",
2532
2841
  "location": {
2533
2842
  "filePath": "merge-lanes.main.runtime.ts",
2534
- "line": 635,
2535
- "character": 28
2843
+ "line": 713,
2844
+ "character": 3
2536
2845
  },
2537
2846
  "name": "allComponentsStatus",
2538
2847
  "type": {
2539
2848
  "__schema": "TypeArraySchema",
2540
2849
  "location": {
2541
2850
  "filePath": "merge-lanes.main.runtime.ts",
2542
- "line": 635,
2543
- "character": 49
2851
+ "line": 713,
2852
+ "character": 24
2544
2853
  },
2545
2854
  "type": {
2546
2855
  "__schema": "TypeRefSchema",
2547
2856
  "location": {
2548
2857
  "filePath": "merge-lanes.main.runtime.ts",
2549
- "line": 635,
2550
- "character": 49
2858
+ "line": 713,
2859
+ "character": 24
2551
2860
  },
2552
2861
  "name": "ComponentMergeStatus"
2553
2862
  }
@@ -2559,16 +2868,36 @@
2559
2868
  "__schema": "ParameterSchema",
2560
2869
  "location": {
2561
2870
  "filePath": "merge-lanes.main.runtime.ts",
2562
- "line": 635,
2563
- "character": 73
2871
+ "line": 714,
2872
+ "character": 3
2873
+ },
2874
+ "name": "currentLaneId",
2875
+ "type": {
2876
+ "__schema": "TypeRefSchema",
2877
+ "location": {
2878
+ "filePath": "merge-lanes.main.runtime.ts",
2879
+ "line": 714,
2880
+ "character": 18
2881
+ },
2882
+ "name": "LaneId"
2883
+ },
2884
+ "isOptional": false,
2885
+ "isSpread": false
2886
+ },
2887
+ {
2888
+ "__schema": "ParameterSchema",
2889
+ "location": {
2890
+ "filePath": "merge-lanes.main.runtime.ts",
2891
+ "line": 715,
2892
+ "character": 3
2564
2893
  },
2565
2894
  "name": "otherLaneId",
2566
2895
  "type": {
2567
2896
  "__schema": "TypeRefSchema",
2568
2897
  "location": {
2569
2898
  "filePath": "merge-lanes.main.runtime.ts",
2570
- "line": 635,
2571
- "character": 86
2899
+ "line": 715,
2900
+ "character": 16
2572
2901
  },
2573
2902
  "name": "LaneId"
2574
2903
  },
@@ -2579,18 +2908,18 @@
2579
2908
  "__schema": "ParameterSchema",
2580
2909
  "location": {
2581
2910
  "filePath": "merge-lanes.main.runtime.ts",
2582
- "line": 635,
2583
- "character": 94
2911
+ "line": 716,
2912
+ "character": 3
2584
2913
  },
2585
- "name": "consumer",
2914
+ "name": "scope",
2586
2915
  "type": {
2587
2916
  "__schema": "TypeRefSchema",
2588
2917
  "location": {
2589
2918
  "filePath": "merge-lanes.main.runtime.ts",
2590
- "line": 635,
2591
- "character": 104
2919
+ "line": 716,
2920
+ "character": 10
2592
2921
  },
2593
- "name": "Consumer"
2922
+ "name": "LegacyScope"
2594
2923
  },
2595
2924
  "isOptional": false,
2596
2925
  "isSpread": false
@@ -2600,7 +2929,7 @@
2600
2929
  "__schema": "InferenceTypeSchema",
2601
2930
  "location": {
2602
2931
  "filePath": "merge-lanes.main.runtime.ts",
2603
- "line": 635,
2932
+ "line": 712,
2604
2933
  "character": 1
2605
2934
  },
2606
2935
  "type": "Promise<void>"
@@ -2613,14 +2942,14 @@
2613
2942
  "__schema": "FunctionLikeSchema",
2614
2943
  "location": {
2615
2944
  "filePath": "merge-lanes.main.runtime.ts",
2616
- "line": 668,
2945
+ "line": 750,
2617
2946
  "character": 1
2618
2947
  },
2619
2948
  "doc": {
2620
2949
  "__schema": "DocSchema",
2621
2950
  "location": {
2622
2951
  "filePath": "merge-lanes.main.runtime.ts",
2623
- "line": 665,
2952
+ "line": 747,
2624
2953
  "character": 1
2625
2954
  },
2626
2955
  "raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
@@ -2633,7 +2962,7 @@
2633
2962
  "__schema": "ParameterSchema",
2634
2963
  "location": {
2635
2964
  "filePath": "merge-lanes.main.runtime.ts",
2636
- "line": 669,
2965
+ "line": 751,
2637
2966
  "character": 3
2638
2967
  },
2639
2968
  "name": "currentLaneName",
@@ -2641,7 +2970,7 @@
2641
2970
  "__schema": "KeywordTypeSchema",
2642
2971
  "location": {
2643
2972
  "filePath": "merge-lanes.main.runtime.ts",
2644
- "line": 669,
2973
+ "line": 751,
2645
2974
  "character": 20
2646
2975
  },
2647
2976
  "name": "string"
@@ -2653,7 +2982,7 @@
2653
2982
  "__schema": "ParameterSchema",
2654
2983
  "location": {
2655
2984
  "filePath": "merge-lanes.main.runtime.ts",
2656
- "line": 670,
2985
+ "line": 752,
2657
2986
  "character": 3
2658
2987
  },
2659
2988
  "name": "otherLaneId",
@@ -2661,7 +2990,7 @@
2661
2990
  "__schema": "TypeRefSchema",
2662
2991
  "location": {
2663
2992
  "filePath": "merge-lanes.main.runtime.ts",
2664
- "line": 670,
2993
+ "line": 752,
2665
2994
  "character": 16
2666
2995
  },
2667
2996
  "name": "LaneId"
@@ -2673,7 +3002,7 @@
2673
3002
  "__schema": "ParameterSchema",
2674
3003
  "location": {
2675
3004
  "filePath": "merge-lanes.main.runtime.ts",
2676
- "line": 671,
3005
+ "line": 753,
2677
3006
  "character": 3
2678
3007
  },
2679
3008
  "name": "id",
@@ -2681,7 +3010,7 @@
2681
3010
  "__schema": "TypeRefSchema",
2682
3011
  "location": {
2683
3012
  "filePath": "merge-lanes.main.runtime.ts",
2684
- "line": 671,
3013
+ "line": 753,
2685
3014
  "character": 7
2686
3015
  },
2687
3016
  "name": "ComponentID"
@@ -2693,7 +3022,7 @@
2693
3022
  "__schema": "ParameterSchema",
2694
3023
  "location": {
2695
3024
  "filePath": "merge-lanes.main.runtime.ts",
2696
- "line": 672,
3025
+ "line": 754,
2697
3026
  "character": 3
2698
3027
  },
2699
3028
  "name": "divergeData",
@@ -2701,7 +3030,7 @@
2701
3030
  "__schema": "TypeRefSchema",
2702
3031
  "location": {
2703
3032
  "filePath": "merge-lanes.main.runtime.ts",
2704
- "line": 672,
3033
+ "line": 754,
2705
3034
  "character": 16
2706
3035
  },
2707
3036
  "name": "SnapsDistance"
@@ -2713,7 +3042,7 @@
2713
3042
  "__schema": "ParameterSchema",
2714
3043
  "location": {
2715
3044
  "filePath": "merge-lanes.main.runtime.ts",
2716
- "line": 673,
3045
+ "line": 755,
2717
3046
  "character": 3
2718
3047
  },
2719
3048
  "name": "log",
@@ -2721,7 +3050,7 @@
2721
3050
  "__schema": "TypeRefSchema",
2722
3051
  "location": {
2723
3052
  "filePath": "merge-lanes.main.runtime.ts",
2724
- "line": 673,
3053
+ "line": 755,
2725
3054
  "character": 8
2726
3055
  },
2727
3056
  "name": "Log"
@@ -2733,7 +3062,7 @@
2733
3062
  "__schema": "ParameterSchema",
2734
3063
  "location": {
2735
3064
  "filePath": "merge-lanes.main.runtime.ts",
2736
- "line": 674,
3065
+ "line": 756,
2737
3066
  "character": 3
2738
3067
  },
2739
3068
  "name": "scope",
@@ -2741,7 +3070,7 @@
2741
3070
  "__schema": "TypeRefSchema",
2742
3071
  "location": {
2743
3072
  "filePath": "merge-lanes.main.runtime.ts",
2744
- "line": 674,
3073
+ "line": 756,
2745
3074
  "character": 10
2746
3075
  },
2747
3076
  "name": "LegacyScope"
@@ -2753,7 +3082,7 @@
2753
3082
  "__schema": "ParameterSchema",
2754
3083
  "location": {
2755
3084
  "filePath": "merge-lanes.main.runtime.ts",
2756
- "line": 675,
3085
+ "line": 757,
2757
3086
  "character": 3
2758
3087
  },
2759
3088
  "name": "componentFromModel",
@@ -2761,7 +3090,7 @@
2761
3090
  "__schema": "TypeRefSchema",
2762
3091
  "location": {
2763
3092
  "filePath": "merge-lanes.main.runtime.ts",
2764
- "line": 675,
3093
+ "line": 757,
2765
3094
  "character": 24
2766
3095
  },
2767
3096
  "name": "Version"
@@ -2773,7 +3102,7 @@
2773
3102
  "__schema": "ParameterSchema",
2774
3103
  "location": {
2775
3104
  "filePath": "merge-lanes.main.runtime.ts",
2776
- "line": 676,
3105
+ "line": 758,
2777
3106
  "character": 3
2778
3107
  },
2779
3108
  "name": "messageTitle",
@@ -2781,7 +3110,7 @@
2781
3110
  "__schema": "KeywordTypeSchema",
2782
3111
  "location": {
2783
3112
  "filePath": "merge-lanes.main.runtime.ts",
2784
- "line": 676,
3113
+ "line": 758,
2785
3114
  "character": 18
2786
3115
  },
2787
3116
  "name": "string"
@@ -2794,7 +3123,7 @@
2794
3123
  "__schema": "TypeRefSchema",
2795
3124
  "location": {
2796
3125
  "filePath": "merge-lanes.main.runtime.ts",
2797
- "line": 677,
3126
+ "line": 759,
2798
3127
  "character": 4
2799
3128
  },
2800
3129
  "name": "Promise",
@@ -2803,7 +3132,7 @@
2803
3132
  "__schema": "TypeUnionSchema",
2804
3133
  "location": {
2805
3134
  "filePath": "merge-lanes.main.runtime.ts",
2806
- "line": 677,
3135
+ "line": 759,
2807
3136
  "character": 12
2808
3137
  },
2809
3138
  "types": [
@@ -2811,7 +3140,7 @@
2811
3140
  "__schema": "TypeRefSchema",
2812
3141
  "location": {
2813
3142
  "filePath": "merge-lanes.main.runtime.ts",
2814
- "line": 677,
3143
+ "line": 759,
2815
3144
  "character": 12
2816
3145
  },
2817
3146
  "name": "Version"
@@ -2820,7 +3149,7 @@
2820
3149
  "__schema": "KeywordTypeSchema",
2821
3150
  "location": {
2822
3151
  "filePath": "merge-lanes.main.runtime.ts",
2823
- "line": 677,
3152
+ "line": 759,
2824
3153
  "character": 22
2825
3154
  },
2826
3155
  "name": "undefined"
@@ -2837,7 +3166,7 @@
2837
3166
  "__schema": "UnImplementedSchema",
2838
3167
  "location": {
2839
3168
  "filePath": "merge-lanes.main.runtime.ts",
2840
- "line": 750,
3169
+ "line": 832,
2841
3170
  "character": 1
2842
3171
  },
2843
3172
  "name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
@@ -2886,7 +3215,7 @@
2886
3215
  "componentId": {
2887
3216
  "scope": "teambit.lanes",
2888
3217
  "name": "merge-lanes",
2889
- "version": "1.0.161"
3218
+ "version": "1.0.163"
2890
3219
  },
2891
3220
  "taggedModuleExports": []
2892
3221
  }