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