@teambit/merge-lanes 1.0.486 → 1.0.488
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 +348 -348
- package/dist/last-merged.d.ts +2 -2
- package/dist/last-merged.js +13 -13
- package/dist/last-merged.js.map +1 -1
- package/dist/merge-lane.cmd.js +5 -5
- package/dist/merge-lane.cmd.js.map +1 -1
- package/dist/merge-lanes.main.runtime.js.map +1 -1
- package/package.json +27 -22
- /package/dist/{preview-1733541556857.js → preview-1733830651067.js} +0 -0
package/artifacts/schema.json
CHANGED
@@ -26,7 +26,7 @@
|
|
26
26
|
"__schema": "ClassSchema",
|
27
27
|
"location": {
|
28
28
|
"filePath": "merge-lanes.main.runtime.ts",
|
29
|
-
"line":
|
29
|
+
"line": 74,
|
30
30
|
"character": 1
|
31
31
|
},
|
32
32
|
"signature": "class MergeLanesMain",
|
@@ -36,7 +36,7 @@
|
|
36
36
|
"__schema": "ConstructorSchema",
|
37
37
|
"location": {
|
38
38
|
"filePath": "merge-lanes.main.runtime.ts",
|
39
|
-
"line":
|
39
|
+
"line": 75,
|
40
40
|
"character": 3
|
41
41
|
},
|
42
42
|
"signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
|
@@ -46,7 +46,7 @@
|
|
46
46
|
"__schema": "ParameterSchema",
|
47
47
|
"location": {
|
48
48
|
"filePath": "merge-lanes.main.runtime.ts",
|
49
|
-
"line":
|
49
|
+
"line": 76,
|
50
50
|
"character": 5
|
51
51
|
},
|
52
52
|
"name": "workspace",
|
@@ -54,7 +54,7 @@
|
|
54
54
|
"__schema": "TypeUnionSchema",
|
55
55
|
"location": {
|
56
56
|
"filePath": "merge-lanes.main.runtime.ts",
|
57
|
-
"line":
|
57
|
+
"line": 76,
|
58
58
|
"character": 24
|
59
59
|
},
|
60
60
|
"types": [
|
@@ -62,7 +62,7 @@
|
|
62
62
|
"__schema": "TypeRefSchema",
|
63
63
|
"location": {
|
64
64
|
"filePath": "merge-lanes.main.runtime.ts",
|
65
|
-
"line":
|
65
|
+
"line": 76,
|
66
66
|
"character": 24
|
67
67
|
},
|
68
68
|
"name": "Workspace"
|
@@ -71,7 +71,7 @@
|
|
71
71
|
"__schema": "KeywordTypeSchema",
|
72
72
|
"location": {
|
73
73
|
"filePath": "merge-lanes.main.runtime.ts",
|
74
|
-
"line":
|
74
|
+
"line": 76,
|
75
75
|
"character": 36
|
76
76
|
},
|
77
77
|
"name": "undefined"
|
@@ -85,7 +85,7 @@
|
|
85
85
|
"__schema": "ParameterSchema",
|
86
86
|
"location": {
|
87
87
|
"filePath": "merge-lanes.main.runtime.ts",
|
88
|
-
"line":
|
88
|
+
"line": 77,
|
89
89
|
"character": 5
|
90
90
|
},
|
91
91
|
"name": "merging",
|
@@ -93,7 +93,7 @@
|
|
93
93
|
"__schema": "TypeRefSchema",
|
94
94
|
"location": {
|
95
95
|
"filePath": "merge-lanes.main.runtime.ts",
|
96
|
-
"line":
|
96
|
+
"line": 77,
|
97
97
|
"character": 22
|
98
98
|
},
|
99
99
|
"name": "MergingMain"
|
@@ -105,7 +105,7 @@
|
|
105
105
|
"__schema": "ParameterSchema",
|
106
106
|
"location": {
|
107
107
|
"filePath": "merge-lanes.main.runtime.ts",
|
108
|
-
"line":
|
108
|
+
"line": 78,
|
109
109
|
"character": 5
|
110
110
|
},
|
111
111
|
"name": "lanes",
|
@@ -113,7 +113,7 @@
|
|
113
113
|
"__schema": "TypeRefSchema",
|
114
114
|
"location": {
|
115
115
|
"filePath": "merge-lanes.main.runtime.ts",
|
116
|
-
"line":
|
116
|
+
"line": 78,
|
117
117
|
"character": 21
|
118
118
|
},
|
119
119
|
"name": "LanesMain"
|
@@ -125,7 +125,7 @@
|
|
125
125
|
"__schema": "ParameterSchema",
|
126
126
|
"location": {
|
127
127
|
"filePath": "merge-lanes.main.runtime.ts",
|
128
|
-
"line":
|
128
|
+
"line": 79,
|
129
129
|
"character": 5
|
130
130
|
},
|
131
131
|
"name": "logger",
|
@@ -133,7 +133,7 @@
|
|
133
133
|
"__schema": "TypeRefSchema",
|
134
134
|
"location": {
|
135
135
|
"filePath": "merge-lanes.main.runtime.ts",
|
136
|
-
"line":
|
136
|
+
"line": 79,
|
137
137
|
"character": 22
|
138
138
|
},
|
139
139
|
"name": "Logger"
|
@@ -145,7 +145,7 @@
|
|
145
145
|
"__schema": "ParameterSchema",
|
146
146
|
"location": {
|
147
147
|
"filePath": "merge-lanes.main.runtime.ts",
|
148
|
-
"line":
|
148
|
+
"line": 80,
|
149
149
|
"character": 5
|
150
150
|
},
|
151
151
|
"name": "remove",
|
@@ -153,7 +153,7 @@
|
|
153
153
|
"__schema": "TypeRefSchema",
|
154
154
|
"location": {
|
155
155
|
"filePath": "merge-lanes.main.runtime.ts",
|
156
|
-
"line":
|
156
|
+
"line": 80,
|
157
157
|
"character": 21
|
158
158
|
},
|
159
159
|
"name": "RemoveMain"
|
@@ -165,7 +165,7 @@
|
|
165
165
|
"__schema": "ParameterSchema",
|
166
166
|
"location": {
|
167
167
|
"filePath": "merge-lanes.main.runtime.ts",
|
168
|
-
"line":
|
168
|
+
"line": 81,
|
169
169
|
"character": 5
|
170
170
|
},
|
171
171
|
"name": "scope",
|
@@ -173,7 +173,7 @@
|
|
173
173
|
"__schema": "TypeRefSchema",
|
174
174
|
"location": {
|
175
175
|
"filePath": "merge-lanes.main.runtime.ts",
|
176
|
-
"line":
|
176
|
+
"line": 81,
|
177
177
|
"character": 20
|
178
178
|
},
|
179
179
|
"name": "ScopeMain"
|
@@ -185,7 +185,7 @@
|
|
185
185
|
"__schema": "ParameterSchema",
|
186
186
|
"location": {
|
187
187
|
"filePath": "merge-lanes.main.runtime.ts",
|
188
|
-
"line":
|
188
|
+
"line": 82,
|
189
189
|
"character": 5
|
190
190
|
},
|
191
191
|
"name": "exporter",
|
@@ -193,7 +193,7 @@
|
|
193
193
|
"__schema": "TypeRefSchema",
|
194
194
|
"location": {
|
195
195
|
"filePath": "merge-lanes.main.runtime.ts",
|
196
|
-
"line":
|
196
|
+
"line": 82,
|
197
197
|
"character": 23
|
198
198
|
},
|
199
199
|
"name": "ExportMain"
|
@@ -205,7 +205,7 @@
|
|
205
205
|
"__schema": "ParameterSchema",
|
206
206
|
"location": {
|
207
207
|
"filePath": "merge-lanes.main.runtime.ts",
|
208
|
-
"line":
|
208
|
+
"line": 83,
|
209
209
|
"character": 5
|
210
210
|
},
|
211
211
|
"name": "importer",
|
@@ -213,7 +213,7 @@
|
|
213
213
|
"__schema": "TypeRefSchema",
|
214
214
|
"location": {
|
215
215
|
"filePath": "merge-lanes.main.runtime.ts",
|
216
|
-
"line":
|
216
|
+
"line": 83,
|
217
217
|
"character": 23
|
218
218
|
},
|
219
219
|
"name": "ImporterMain"
|
@@ -225,7 +225,7 @@
|
|
225
225
|
"__schema": "ParameterSchema",
|
226
226
|
"location": {
|
227
227
|
"filePath": "merge-lanes.main.runtime.ts",
|
228
|
-
"line":
|
228
|
+
"line": 84,
|
229
229
|
"character": 5
|
230
230
|
},
|
231
231
|
"name": "checkout",
|
@@ -233,7 +233,7 @@
|
|
233
233
|
"__schema": "TypeRefSchema",
|
234
234
|
"location": {
|
235
235
|
"filePath": "merge-lanes.main.runtime.ts",
|
236
|
-
"line":
|
236
|
+
"line": 84,
|
237
237
|
"character": 23
|
238
238
|
},
|
239
239
|
"name": "CheckoutMain"
|
@@ -246,7 +246,7 @@
|
|
246
246
|
"__schema": "ThisTypeSchema",
|
247
247
|
"location": {
|
248
248
|
"filePath": "merge-lanes.main.runtime.ts",
|
249
|
-
"line":
|
249
|
+
"line": 74,
|
250
250
|
"character": 1
|
251
251
|
},
|
252
252
|
"name": "MergeLanesMain"
|
@@ -257,7 +257,7 @@
|
|
257
257
|
"__schema": "FunctionLikeSchema",
|
258
258
|
"location": {
|
259
259
|
"filePath": "merge-lanes.main.runtime.ts",
|
260
|
-
"line":
|
260
|
+
"line": 87,
|
261
261
|
"character": 3
|
262
262
|
},
|
263
263
|
"signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
|
@@ -267,7 +267,7 @@
|
|
267
267
|
"__schema": "ParameterSchema",
|
268
268
|
"location": {
|
269
269
|
"filePath": "merge-lanes.main.runtime.ts",
|
270
|
-
"line":
|
270
|
+
"line": 87,
|
271
271
|
"character": 24
|
272
272
|
},
|
273
273
|
"name": "laneName",
|
@@ -275,7 +275,7 @@
|
|
275
275
|
"__schema": "KeywordTypeSchema",
|
276
276
|
"location": {
|
277
277
|
"filePath": "merge-lanes.main.runtime.ts",
|
278
|
-
"line":
|
278
|
+
"line": 87,
|
279
279
|
"character": 34
|
280
280
|
},
|
281
281
|
"name": "string"
|
@@ -287,7 +287,7 @@
|
|
287
287
|
"__schema": "ParameterSchema",
|
288
288
|
"location": {
|
289
289
|
"filePath": "merge-lanes.main.runtime.ts",
|
290
|
-
"line":
|
290
|
+
"line": 87,
|
291
291
|
"character": 42
|
292
292
|
},
|
293
293
|
"name": "options",
|
@@ -295,7 +295,7 @@
|
|
295
295
|
"__schema": "TypeRefSchema",
|
296
296
|
"location": {
|
297
297
|
"filePath": "merge-lanes.main.runtime.ts",
|
298
|
-
"line":
|
298
|
+
"line": 87,
|
299
299
|
"character": 51
|
300
300
|
},
|
301
301
|
"name": "MergeLaneOptions"
|
@@ -308,7 +308,7 @@
|
|
308
308
|
"__schema": "InferenceTypeSchema",
|
309
309
|
"location": {
|
310
310
|
"filePath": "merge-lanes.main.runtime.ts",
|
311
|
-
"line":
|
311
|
+
"line": 87,
|
312
312
|
"character": 3
|
313
313
|
},
|
314
314
|
"type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
|
@@ -321,7 +321,7 @@
|
|
321
321
|
"__schema": "FunctionLikeSchema",
|
322
322
|
"location": {
|
323
323
|
"filePath": "merge-lanes.main.runtime.ts",
|
324
|
-
"line":
|
324
|
+
"line": 97,
|
325
325
|
"character": 3
|
326
326
|
},
|
327
327
|
"signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
|
@@ -331,7 +331,7 @@
|
|
331
331
|
"__schema": "ParameterSchema",
|
332
332
|
"location": {
|
333
333
|
"filePath": "merge-lanes.main.runtime.ts",
|
334
|
-
"line":
|
334
|
+
"line": 98,
|
335
335
|
"character": 5
|
336
336
|
},
|
337
337
|
"name": "otherLaneId",
|
@@ -339,7 +339,7 @@
|
|
339
339
|
"__schema": "TypeRefSchema",
|
340
340
|
"location": {
|
341
341
|
"filePath": "merge-lanes.main.runtime.ts",
|
342
|
-
"line":
|
342
|
+
"line": 98,
|
343
343
|
"character": 18
|
344
344
|
},
|
345
345
|
"name": "LaneId"
|
@@ -351,7 +351,7 @@
|
|
351
351
|
"__schema": "ParameterSchema",
|
352
352
|
"location": {
|
353
353
|
"filePath": "merge-lanes.main.runtime.ts",
|
354
|
-
"line":
|
354
|
+
"line": 99,
|
355
355
|
"character": 5
|
356
356
|
},
|
357
357
|
"name": "currentLaneId",
|
@@ -359,7 +359,7 @@
|
|
359
359
|
"__schema": "TypeRefSchema",
|
360
360
|
"location": {
|
361
361
|
"filePath": "merge-lanes.main.runtime.ts",
|
362
|
-
"line":
|
362
|
+
"line": 99,
|
363
363
|
"character": 20
|
364
364
|
},
|
365
365
|
"name": "LaneId"
|
@@ -371,7 +371,7 @@
|
|
371
371
|
"__schema": "ParameterSchema",
|
372
372
|
"location": {
|
373
373
|
"filePath": "merge-lanes.main.runtime.ts",
|
374
|
-
"line":
|
374
|
+
"line": 100,
|
375
375
|
"character": 5
|
376
376
|
},
|
377
377
|
"name": "options",
|
@@ -379,7 +379,7 @@
|
|
379
379
|
"__schema": "TypeRefSchema",
|
380
380
|
"location": {
|
381
381
|
"filePath": "merge-lanes.main.runtime.ts",
|
382
|
-
"line":
|
382
|
+
"line": 100,
|
383
383
|
"character": 14
|
384
384
|
},
|
385
385
|
"name": "MergeLaneOptions"
|
@@ -392,7 +392,7 @@
|
|
392
392
|
"__schema": "TypeRefSchema",
|
393
393
|
"location": {
|
394
394
|
"filePath": "merge-lanes.main.runtime.ts",
|
395
|
-
"line":
|
395
|
+
"line": 101,
|
396
396
|
"character": 6
|
397
397
|
},
|
398
398
|
"name": "Promise",
|
@@ -401,7 +401,7 @@
|
|
401
401
|
"__schema": "TypeLiteralSchema",
|
402
402
|
"location": {
|
403
403
|
"filePath": "merge-lanes.main.runtime.ts",
|
404
|
-
"line":
|
404
|
+
"line": 101,
|
405
405
|
"character": 14
|
406
406
|
},
|
407
407
|
"members": [
|
@@ -409,7 +409,7 @@
|
|
409
409
|
"__schema": "VariableLikeSchema",
|
410
410
|
"location": {
|
411
411
|
"filePath": "merge-lanes.main.runtime.ts",
|
412
|
-
"line":
|
412
|
+
"line": 102,
|
413
413
|
"character": 5
|
414
414
|
},
|
415
415
|
"signature": "(property) mergeResults: ApplyVersionResults",
|
@@ -418,7 +418,7 @@
|
|
418
418
|
"__schema": "TypeRefSchema",
|
419
419
|
"location": {
|
420
420
|
"filePath": "merge-lanes.main.runtime.ts",
|
421
|
-
"line":
|
421
|
+
"line": 102,
|
422
422
|
"character": 5
|
423
423
|
},
|
424
424
|
"name": "ApplyVersionResults",
|
@@ -433,7 +433,7 @@
|
|
433
433
|
"__schema": "VariableLikeSchema",
|
434
434
|
"location": {
|
435
435
|
"filePath": "merge-lanes.main.runtime.ts",
|
436
|
-
"line":
|
436
|
+
"line": 103,
|
437
437
|
"character": 5
|
438
438
|
},
|
439
439
|
"signature": "(property) deleteResults: any",
|
@@ -442,7 +442,7 @@
|
|
442
442
|
"__schema": "KeywordTypeSchema",
|
443
443
|
"location": {
|
444
444
|
"filePath": "merge-lanes.main.runtime.ts",
|
445
|
-
"line":
|
445
|
+
"line": 103,
|
446
446
|
"character": 20
|
447
447
|
},
|
448
448
|
"name": "any"
|
@@ -453,7 +453,7 @@
|
|
453
453
|
"__schema": "VariableLikeSchema",
|
454
454
|
"location": {
|
455
455
|
"filePath": "merge-lanes.main.runtime.ts",
|
456
|
-
"line":
|
456
|
+
"line": 104,
|
457
457
|
"character": 5
|
458
458
|
},
|
459
459
|
"signature": "(property) configMergeResults: ConfigMergeResult[]",
|
@@ -462,14 +462,14 @@
|
|
462
462
|
"__schema": "TypeArraySchema",
|
463
463
|
"location": {
|
464
464
|
"filePath": "merge-lanes.main.runtime.ts",
|
465
|
-
"line":
|
465
|
+
"line": 104,
|
466
466
|
"character": 25
|
467
467
|
},
|
468
468
|
"type": {
|
469
469
|
"__schema": "TypeRefSchema",
|
470
470
|
"location": {
|
471
471
|
"filePath": "merge-lanes.main.runtime.ts",
|
472
|
-
"line":
|
472
|
+
"line": 104,
|
473
473
|
"character": 25
|
474
474
|
},
|
475
475
|
"name": "ConfigMergeResult"
|
@@ -481,7 +481,7 @@
|
|
481
481
|
"__schema": "VariableLikeSchema",
|
482
482
|
"location": {
|
483
483
|
"filePath": "merge-lanes.main.runtime.ts",
|
484
|
-
"line":
|
484
|
+
"line": 105,
|
485
485
|
"character": 5
|
486
486
|
},
|
487
487
|
"signature": "(property) mergedSuccessfullyIds: ComponentID[]",
|
@@ -490,14 +490,14 @@
|
|
490
490
|
"__schema": "TypeArraySchema",
|
491
491
|
"location": {
|
492
492
|
"filePath": "merge-lanes.main.runtime.ts",
|
493
|
-
"line":
|
493
|
+
"line": 105,
|
494
494
|
"character": 28
|
495
495
|
},
|
496
496
|
"type": {
|
497
497
|
"__schema": "TypeRefSchema",
|
498
498
|
"location": {
|
499
499
|
"filePath": "merge-lanes.main.runtime.ts",
|
500
|
-
"line":
|
500
|
+
"line": 105,
|
501
501
|
"character": 28
|
502
502
|
},
|
503
503
|
"name": "ComponentID"
|
@@ -509,7 +509,7 @@
|
|
509
509
|
"__schema": "VariableLikeSchema",
|
510
510
|
"location": {
|
511
511
|
"filePath": "merge-lanes.main.runtime.ts",
|
512
|
-
"line":
|
512
|
+
"line": 106,
|
513
513
|
"character": 5
|
514
514
|
},
|
515
515
|
"signature": "(property) conflicts: ConflictPerId[]",
|
@@ -518,14 +518,14 @@
|
|
518
518
|
"__schema": "TypeArraySchema",
|
519
519
|
"location": {
|
520
520
|
"filePath": "merge-lanes.main.runtime.ts",
|
521
|
-
"line":
|
521
|
+
"line": 106,
|
522
522
|
"character": 16
|
523
523
|
},
|
524
524
|
"type": {
|
525
525
|
"__schema": "TypeRefSchema",
|
526
526
|
"location": {
|
527
527
|
"filePath": "merge-lanes.main.runtime.ts",
|
528
|
-
"line":
|
528
|
+
"line": 106,
|
529
529
|
"character": 16
|
530
530
|
},
|
531
531
|
"name": "ConflictPerId"
|
@@ -545,7 +545,7 @@
|
|
545
545
|
"__schema": "FunctionLikeSchema",
|
546
546
|
"location": {
|
547
547
|
"filePath": "merge-lanes.main.runtime.ts",
|
548
|
-
"line":
|
548
|
+
"line": 322,
|
549
549
|
"character": 3
|
550
550
|
},
|
551
551
|
"signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
|
@@ -555,7 +555,7 @@
|
|
555
555
|
"__schema": "ParameterSchema",
|
556
556
|
"location": {
|
557
557
|
"filePath": "merge-lanes.main.runtime.ts",
|
558
|
-
"line":
|
558
|
+
"line": 322,
|
559
559
|
"character": 19
|
560
560
|
},
|
561
561
|
"name": "newLaneName",
|
@@ -563,7 +563,7 @@
|
|
563
563
|
"__schema": "KeywordTypeSchema",
|
564
564
|
"location": {
|
565
565
|
"filePath": "merge-lanes.main.runtime.ts",
|
566
|
-
"line":
|
566
|
+
"line": 322,
|
567
567
|
"character": 32
|
568
568
|
},
|
569
569
|
"name": "string"
|
@@ -575,7 +575,7 @@
|
|
575
575
|
"__schema": "ParameterSchema",
|
576
576
|
"location": {
|
577
577
|
"filePath": "merge-lanes.main.runtime.ts",
|
578
|
-
"line":
|
578
|
+
"line": 322,
|
579
579
|
"character": 40
|
580
580
|
},
|
581
581
|
"name": "options",
|
@@ -583,7 +583,7 @@
|
|
583
583
|
"__schema": "TypeLiteralSchema",
|
584
584
|
"location": {
|
585
585
|
"filePath": "merge-lanes.main.runtime.ts",
|
586
|
-
"line":
|
586
|
+
"line": 322,
|
587
587
|
"character": 49
|
588
588
|
},
|
589
589
|
"members": [
|
@@ -591,7 +591,7 @@
|
|
591
591
|
"__schema": "VariableLikeSchema",
|
592
592
|
"location": {
|
593
593
|
"filePath": "merge-lanes.main.runtime.ts",
|
594
|
-
"line":
|
594
|
+
"line": 322,
|
595
595
|
"character": 51
|
596
596
|
},
|
597
597
|
"signature": "(property) scope?: string | undefined",
|
@@ -600,7 +600,7 @@
|
|
600
600
|
"__schema": "KeywordTypeSchema",
|
601
601
|
"location": {
|
602
602
|
"filePath": "merge-lanes.main.runtime.ts",
|
603
|
-
"line":
|
603
|
+
"line": 322,
|
604
604
|
"character": 59
|
605
605
|
},
|
606
606
|
"name": "string"
|
@@ -617,7 +617,7 @@
|
|
617
617
|
"__schema": "InferenceTypeSchema",
|
618
618
|
"location": {
|
619
619
|
"filePath": "merge-lanes.main.runtime.ts",
|
620
|
-
"line":
|
620
|
+
"line": 322,
|
621
621
|
"character": 3
|
622
622
|
},
|
623
623
|
"type": "Promise<CreateLaneResult>"
|
@@ -630,7 +630,7 @@
|
|
630
630
|
"__schema": "FunctionLikeSchema",
|
631
631
|
"location": {
|
632
632
|
"filePath": "merge-lanes.main.runtime.ts",
|
633
|
-
"line":
|
633
|
+
"line": 330,
|
634
634
|
"character": 3
|
635
635
|
},
|
636
636
|
"signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
|
@@ -640,7 +640,7 @@
|
|
640
640
|
"__schema": "ParameterSchema",
|
641
641
|
"location": {
|
642
642
|
"filePath": "merge-lanes.main.runtime.ts",
|
643
|
-
"line":
|
643
|
+
"line": 330,
|
644
644
|
"character": 24
|
645
645
|
},
|
646
646
|
"name": "checkoutProps",
|
@@ -648,7 +648,7 @@
|
|
648
648
|
"__schema": "TypeRefSchema",
|
649
649
|
"location": {
|
650
650
|
"filePath": "merge-lanes.main.runtime.ts",
|
651
|
-
"line":
|
651
|
+
"line": 330,
|
652
652
|
"character": 39
|
653
653
|
},
|
654
654
|
"name": "CheckoutProps"
|
@@ -660,7 +660,7 @@
|
|
660
660
|
"__schema": "ParameterSchema",
|
661
661
|
"location": {
|
662
662
|
"filePath": "merge-lanes.main.runtime.ts",
|
663
|
-
"line":
|
663
|
+
"line": 330,
|
664
664
|
"character": 54
|
665
665
|
},
|
666
666
|
"name": "mergeAbortOpts",
|
@@ -668,7 +668,7 @@
|
|
668
668
|
"__schema": "TypeRefSchema",
|
669
669
|
"location": {
|
670
670
|
"filePath": "merge-lanes.main.runtime.ts",
|
671
|
-
"line":
|
671
|
+
"line": 330,
|
672
672
|
"character": 70
|
673
673
|
},
|
674
674
|
"name": "MergeAbortOpts"
|
@@ -681,7 +681,7 @@
|
|
681
681
|
"__schema": "InferenceTypeSchema",
|
682
682
|
"location": {
|
683
683
|
"filePath": "merge-lanes.main.runtime.ts",
|
684
|
-
"line":
|
684
|
+
"line": 330,
|
685
685
|
"character": 3
|
686
686
|
},
|
687
687
|
"type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
|
@@ -694,7 +694,7 @@
|
|
694
694
|
"__schema": "FunctionLikeSchema",
|
695
695
|
"location": {
|
696
696
|
"filePath": "merge-lanes.main.runtime.ts",
|
697
|
-
"line":
|
697
|
+
"line": 386,
|
698
698
|
"character": 3
|
699
699
|
},
|
700
700
|
"signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
|
@@ -704,7 +704,7 @@
|
|
704
704
|
"__schema": "ParameterSchema",
|
705
705
|
"location": {
|
706
706
|
"filePath": "merge-lanes.main.runtime.ts",
|
707
|
-
"line":
|
707
|
+
"line": 387,
|
708
708
|
"character": 5
|
709
709
|
},
|
710
710
|
"name": "fromLane",
|
@@ -712,7 +712,7 @@
|
|
712
712
|
"__schema": "KeywordTypeSchema",
|
713
713
|
"location": {
|
714
714
|
"filePath": "merge-lanes.main.runtime.ts",
|
715
|
-
"line":
|
715
|
+
"line": 387,
|
716
716
|
"character": 15
|
717
717
|
},
|
718
718
|
"name": "string"
|
@@ -724,7 +724,7 @@
|
|
724
724
|
"__schema": "ParameterSchema",
|
725
725
|
"location": {
|
726
726
|
"filePath": "merge-lanes.main.runtime.ts",
|
727
|
-
"line":
|
727
|
+
"line": 388,
|
728
728
|
"character": 5
|
729
729
|
},
|
730
730
|
"name": "toLane",
|
@@ -732,7 +732,7 @@
|
|
732
732
|
"__schema": "KeywordTypeSchema",
|
733
733
|
"location": {
|
734
734
|
"filePath": "merge-lanes.main.runtime.ts",
|
735
|
-
"line":
|
735
|
+
"line": 388,
|
736
736
|
"character": 13
|
737
737
|
},
|
738
738
|
"name": "string"
|
@@ -744,7 +744,7 @@
|
|
744
744
|
"__schema": "ParameterSchema",
|
745
745
|
"location": {
|
746
746
|
"filePath": "merge-lanes.main.runtime.ts",
|
747
|
-
"line":
|
747
|
+
"line": 389,
|
748
748
|
"character": 5
|
749
749
|
},
|
750
750
|
"name": "options",
|
@@ -752,7 +752,7 @@
|
|
752
752
|
"__schema": "TypeIntersectionSchema",
|
753
753
|
"location": {
|
754
754
|
"filePath": "merge-lanes.main.runtime.ts",
|
755
|
-
"line":
|
755
|
+
"line": 389,
|
756
756
|
"character": 14
|
757
757
|
},
|
758
758
|
"types": [
|
@@ -760,7 +760,7 @@
|
|
760
760
|
"__schema": "TypeRefSchema",
|
761
761
|
"location": {
|
762
762
|
"filePath": "merge-lanes.main.runtime.ts",
|
763
|
-
"line":
|
763
|
+
"line": 389,
|
764
764
|
"character": 14
|
765
765
|
},
|
766
766
|
"name": "Partial",
|
@@ -769,7 +769,7 @@
|
|
769
769
|
"__schema": "TypeRefSchema",
|
770
770
|
"location": {
|
771
771
|
"filePath": "merge-lanes.main.runtime.ts",
|
772
|
-
"line":
|
772
|
+
"line": 389,
|
773
773
|
"character": 22
|
774
774
|
},
|
775
775
|
"name": "MergeLaneOptions"
|
@@ -780,7 +780,7 @@
|
|
780
780
|
"__schema": "TypeLiteralSchema",
|
781
781
|
"location": {
|
782
782
|
"filePath": "merge-lanes.main.runtime.ts",
|
783
|
-
"line":
|
783
|
+
"line": 389,
|
784
784
|
"character": 42
|
785
785
|
},
|
786
786
|
"members": [
|
@@ -788,7 +788,7 @@
|
|
788
788
|
"__schema": "VariableLikeSchema",
|
789
789
|
"location": {
|
790
790
|
"filePath": "merge-lanes.main.runtime.ts",
|
791
|
-
"line":
|
791
|
+
"line": 389,
|
792
792
|
"character": 44
|
793
793
|
},
|
794
794
|
"signature": "(property) push?: boolean | undefined",
|
@@ -797,7 +797,7 @@
|
|
797
797
|
"__schema": "KeywordTypeSchema",
|
798
798
|
"location": {
|
799
799
|
"filePath": "merge-lanes.main.runtime.ts",
|
800
|
-
"line":
|
800
|
+
"line": 389,
|
801
801
|
"character": 51
|
802
802
|
},
|
803
803
|
"name": "boolean"
|
@@ -808,7 +808,7 @@
|
|
808
808
|
"__schema": "VariableLikeSchema",
|
809
809
|
"location": {
|
810
810
|
"filePath": "merge-lanes.main.runtime.ts",
|
811
|
-
"line":
|
811
|
+
"line": 389,
|
812
812
|
"character": 60
|
813
813
|
},
|
814
814
|
"signature": "(property) reMerge?: boolean | undefined",
|
@@ -817,7 +817,7 @@
|
|
817
817
|
"__schema": "KeywordTypeSchema",
|
818
818
|
"location": {
|
819
819
|
"filePath": "merge-lanes.main.runtime.ts",
|
820
|
-
"line":
|
820
|
+
"line": 389,
|
821
821
|
"character": 70
|
822
822
|
},
|
823
823
|
"name": "boolean"
|
@@ -836,7 +836,7 @@
|
|
836
836
|
"__schema": "TypeRefSchema",
|
837
837
|
"location": {
|
838
838
|
"filePath": "merge-lanes.main.runtime.ts",
|
839
|
-
"line":
|
839
|
+
"line": 390,
|
840
840
|
"character": 6
|
841
841
|
},
|
842
842
|
"name": "Promise",
|
@@ -845,7 +845,7 @@
|
|
845
845
|
"__schema": "TypeRefSchema",
|
846
846
|
"location": {
|
847
847
|
"filePath": "merge-lanes.main.runtime.ts",
|
848
|
-
"line":
|
848
|
+
"line": 390,
|
849
849
|
"character": 14
|
850
850
|
},
|
851
851
|
"name": "MergeFromScopeResult"
|
@@ -860,7 +860,7 @@
|
|
860
860
|
"__schema": "VariableLikeSchema",
|
861
861
|
"location": {
|
862
862
|
"filePath": "merge-lanes.main.runtime.ts",
|
863
|
-
"line":
|
863
|
+
"line": 483,
|
864
864
|
"character": 3
|
865
865
|
},
|
866
866
|
"signature": "(property) MergeLanesMain.slots: never[]",
|
@@ -869,7 +869,7 @@
|
|
869
869
|
"__schema": "InferenceTypeSchema",
|
870
870
|
"location": {
|
871
871
|
"filePath": "merge-lanes.main.runtime.ts",
|
872
|
-
"line":
|
872
|
+
"line": 483,
|
873
873
|
"character": 3
|
874
874
|
},
|
875
875
|
"type": "never[]"
|
@@ -881,7 +881,7 @@
|
|
881
881
|
"__schema": "VariableLikeSchema",
|
882
882
|
"location": {
|
883
883
|
"filePath": "merge-lanes.main.runtime.ts",
|
884
|
-
"line":
|
884
|
+
"line": 484,
|
885
885
|
"character": 3
|
886
886
|
},
|
887
887
|
"signature": "(property) MergeLanesMain.dependencies: Aspect[]",
|
@@ -890,7 +890,7 @@
|
|
890
890
|
"__schema": "InferenceTypeSchema",
|
891
891
|
"location": {
|
892
892
|
"filePath": "merge-lanes.main.runtime.ts",
|
893
|
-
"line":
|
893
|
+
"line": 484,
|
894
894
|
"character": 3
|
895
895
|
},
|
896
896
|
"type": "Aspect[]"
|
@@ -902,7 +902,7 @@
|
|
902
902
|
"__schema": "VariableLikeSchema",
|
903
903
|
"location": {
|
904
904
|
"filePath": "merge-lanes.main.runtime.ts",
|
905
|
-
"line":
|
905
|
+
"line": 497,
|
906
906
|
"character": 3
|
907
907
|
},
|
908
908
|
"signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
|
@@ -911,7 +911,7 @@
|
|
911
911
|
"__schema": "InferenceTypeSchema",
|
912
912
|
"location": {
|
913
913
|
"filePath": "merge-lanes.main.runtime.ts",
|
914
|
-
"line":
|
914
|
+
"line": 497,
|
915
915
|
"character": 3
|
916
916
|
},
|
917
917
|
"type": "RuntimeDefinition"
|
@@ -923,7 +923,7 @@
|
|
923
923
|
"__schema": "FunctionLikeSchema",
|
924
924
|
"location": {
|
925
925
|
"filePath": "merge-lanes.main.runtime.ts",
|
926
|
-
"line":
|
926
|
+
"line": 499,
|
927
927
|
"character": 3
|
928
928
|
},
|
929
929
|
"signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n]): Promise<MergeLanesMain>",
|
@@ -933,7 +933,7 @@
|
|
933
933
|
"__schema": "ParameterSchema",
|
934
934
|
"location": {
|
935
935
|
"filePath": "merge-lanes.main.runtime.ts",
|
936
|
-
"line":
|
936
|
+
"line": 499,
|
937
937
|
"character": 25
|
938
938
|
},
|
939
939
|
"name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
|
@@ -941,7 +941,7 @@
|
|
941
941
|
"__schema": "TupleTypeSchema",
|
942
942
|
"location": {
|
943
943
|
"filePath": "merge-lanes.main.runtime.ts",
|
944
|
-
"line":
|
944
|
+
"line": 511,
|
945
945
|
"character": 6
|
946
946
|
},
|
947
947
|
"elements": [
|
@@ -949,7 +949,7 @@
|
|
949
949
|
"__schema": "TypeRefSchema",
|
950
950
|
"location": {
|
951
951
|
"filePath": "merge-lanes.main.runtime.ts",
|
952
|
-
"line":
|
952
|
+
"line": 512,
|
953
953
|
"character": 5
|
954
954
|
},
|
955
955
|
"name": "LanesMain"
|
@@ -958,7 +958,7 @@
|
|
958
958
|
"__schema": "TypeRefSchema",
|
959
959
|
"location": {
|
960
960
|
"filePath": "merge-lanes.main.runtime.ts",
|
961
|
-
"line":
|
961
|
+
"line": 513,
|
962
962
|
"character": 5
|
963
963
|
},
|
964
964
|
"name": "CLIMain"
|
@@ -967,7 +967,7 @@
|
|
967
967
|
"__schema": "TypeRefSchema",
|
968
968
|
"location": {
|
969
969
|
"filePath": "merge-lanes.main.runtime.ts",
|
970
|
-
"line":
|
970
|
+
"line": 514,
|
971
971
|
"character": 5
|
972
972
|
},
|
973
973
|
"name": "Workspace"
|
@@ -976,7 +976,7 @@
|
|
976
976
|
"__schema": "TypeRefSchema",
|
977
977
|
"location": {
|
978
978
|
"filePath": "merge-lanes.main.runtime.ts",
|
979
|
-
"line":
|
979
|
+
"line": 515,
|
980
980
|
"character": 5
|
981
981
|
},
|
982
982
|
"name": "MergingMain"
|
@@ -985,7 +985,7 @@
|
|
985
985
|
"__schema": "TypeRefSchema",
|
986
986
|
"location": {
|
987
987
|
"filePath": "merge-lanes.main.runtime.ts",
|
988
|
-
"line":
|
988
|
+
"line": 516,
|
989
989
|
"character": 5
|
990
990
|
},
|
991
991
|
"name": "LoggerMain"
|
@@ -994,7 +994,7 @@
|
|
994
994
|
"__schema": "TypeRefSchema",
|
995
995
|
"location": {
|
996
996
|
"filePath": "merge-lanes.main.runtime.ts",
|
997
|
-
"line":
|
997
|
+
"line": 517,
|
998
998
|
"character": 5
|
999
999
|
},
|
1000
1000
|
"name": "RemoveMain"
|
@@ -1003,7 +1003,7 @@
|
|
1003
1003
|
"__schema": "TypeRefSchema",
|
1004
1004
|
"location": {
|
1005
1005
|
"filePath": "merge-lanes.main.runtime.ts",
|
1006
|
-
"line":
|
1006
|
+
"line": 518,
|
1007
1007
|
"character": 5
|
1008
1008
|
},
|
1009
1009
|
"name": "ScopeMain"
|
@@ -1012,7 +1012,7 @@
|
|
1012
1012
|
"__schema": "TypeRefSchema",
|
1013
1013
|
"location": {
|
1014
1014
|
"filePath": "merge-lanes.main.runtime.ts",
|
1015
|
-
"line":
|
1015
|
+
"line": 519,
|
1016
1016
|
"character": 5
|
1017
1017
|
},
|
1018
1018
|
"name": "ExportMain"
|
@@ -1021,7 +1021,7 @@
|
|
1021
1021
|
"__schema": "TypeRefSchema",
|
1022
1022
|
"location": {
|
1023
1023
|
"filePath": "merge-lanes.main.runtime.ts",
|
1024
|
-
"line":
|
1024
|
+
"line": 520,
|
1025
1025
|
"character": 5
|
1026
1026
|
},
|
1027
1027
|
"name": "ImporterMain"
|
@@ -1030,7 +1030,7 @@
|
|
1030
1030
|
"__schema": "TypeRefSchema",
|
1031
1031
|
"location": {
|
1032
1032
|
"filePath": "merge-lanes.main.runtime.ts",
|
1033
|
-
"line":
|
1033
|
+
"line": 521,
|
1034
1034
|
"character": 5
|
1035
1035
|
},
|
1036
1036
|
"name": "CheckoutMain"
|
@@ -1039,7 +1039,7 @@
|
|
1039
1039
|
"__schema": "TypeRefSchema",
|
1040
1040
|
"location": {
|
1041
1041
|
"filePath": "merge-lanes.main.runtime.ts",
|
1042
|
-
"line":
|
1042
|
+
"line": 522,
|
1043
1043
|
"character": 5
|
1044
1044
|
},
|
1045
1045
|
"name": "GlobalConfigMain"
|
@@ -1054,7 +1054,7 @@
|
|
1054
1054
|
"__schema": "InferenceTypeSchema",
|
1055
1055
|
"location": {
|
1056
1056
|
"filePath": "merge-lanes.main.runtime.ts",
|
1057
|
-
"line":
|
1057
|
+
"line": 499,
|
1058
1058
|
"character": 3
|
1059
1059
|
},
|
1060
1060
|
"type": "Promise<MergeLanesMain>"
|
@@ -1131,7 +1131,7 @@
|
|
1131
1131
|
"__schema": "TypeSchema",
|
1132
1132
|
"location": {
|
1133
1133
|
"filePath": "merge-lanes.main.runtime.ts",
|
1134
|
-
"line":
|
1134
|
+
"line": 39,
|
1135
1135
|
"character": 1
|
1136
1136
|
},
|
1137
1137
|
"signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noAutoSnap?: boolean | undefined;\n noSnap?: boolean | undefined;\n snapMessage?: string | undefined;\n existingOnWorkspaceOnly?: boolean | undefined;\n ... 14 more ...;\n fetchCurrent?: boolean | undefined;\n}",
|
@@ -1140,7 +1140,7 @@
|
|
1140
1140
|
"__schema": "TypeLiteralSchema",
|
1141
1141
|
"location": {
|
1142
1142
|
"filePath": "merge-lanes.main.runtime.ts",
|
1143
|
-
"line":
|
1143
|
+
"line": 39,
|
1144
1144
|
"character": 32
|
1145
1145
|
},
|
1146
1146
|
"members": [
|
@@ -1148,7 +1148,7 @@
|
|
1148
1148
|
"__schema": "VariableLikeSchema",
|
1149
1149
|
"location": {
|
1150
1150
|
"filePath": "merge-lanes.main.runtime.ts",
|
1151
|
-
"line":
|
1151
|
+
"line": 40,
|
1152
1152
|
"character": 3
|
1153
1153
|
},
|
1154
1154
|
"signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
|
@@ -1157,7 +1157,7 @@
|
|
1157
1157
|
"__schema": "TypeRefSchema",
|
1158
1158
|
"location": {
|
1159
1159
|
"filePath": "merge-lanes.main.runtime.ts",
|
1160
|
-
"line":
|
1160
|
+
"line": 40,
|
1161
1161
|
"character": 18
|
1162
1162
|
},
|
1163
1163
|
"name": "MergeStrategy"
|
@@ -1168,7 +1168,7 @@
|
|
1168
1168
|
"__schema": "VariableLikeSchema",
|
1169
1169
|
"location": {
|
1170
1170
|
"filePath": "merge-lanes.main.runtime.ts",
|
1171
|
-
"line":
|
1171
|
+
"line": 41,
|
1172
1172
|
"character": 3
|
1173
1173
|
},
|
1174
1174
|
"signature": "(property) ours?: boolean | undefined",
|
@@ -1177,7 +1177,7 @@
|
|
1177
1177
|
"__schema": "KeywordTypeSchema",
|
1178
1178
|
"location": {
|
1179
1179
|
"filePath": "merge-lanes.main.runtime.ts",
|
1180
|
-
"line":
|
1180
|
+
"line": 41,
|
1181
1181
|
"character": 10
|
1182
1182
|
},
|
1183
1183
|
"name": "boolean"
|
@@ -1188,7 +1188,7 @@
|
|
1188
1188
|
"__schema": "VariableLikeSchema",
|
1189
1189
|
"location": {
|
1190
1190
|
"filePath": "merge-lanes.main.runtime.ts",
|
1191
|
-
"line":
|
1191
|
+
"line": 42,
|
1192
1192
|
"character": 3
|
1193
1193
|
},
|
1194
1194
|
"signature": "(property) theirs?: boolean | undefined",
|
@@ -1197,7 +1197,7 @@
|
|
1197
1197
|
"__schema": "KeywordTypeSchema",
|
1198
1198
|
"location": {
|
1199
1199
|
"filePath": "merge-lanes.main.runtime.ts",
|
1200
|
-
"line":
|
1200
|
+
"line": 42,
|
1201
1201
|
"character": 12
|
1202
1202
|
},
|
1203
1203
|
"name": "boolean"
|
@@ -1208,7 +1208,7 @@
|
|
1208
1208
|
"__schema": "VariableLikeSchema",
|
1209
1209
|
"location": {
|
1210
1210
|
"filePath": "merge-lanes.main.runtime.ts",
|
1211
|
-
"line":
|
1211
|
+
"line": 43,
|
1212
1212
|
"character": 3
|
1213
1213
|
},
|
1214
1214
|
"signature": "(property) noAutoSnap?: boolean | undefined",
|
@@ -1217,7 +1217,7 @@
|
|
1217
1217
|
"__schema": "KeywordTypeSchema",
|
1218
1218
|
"location": {
|
1219
1219
|
"filePath": "merge-lanes.main.runtime.ts",
|
1220
|
-
"line":
|
1220
|
+
"line": 43,
|
1221
1221
|
"character": 16
|
1222
1222
|
},
|
1223
1223
|
"name": "boolean"
|
@@ -1228,7 +1228,7 @@
|
|
1228
1228
|
"__schema": "VariableLikeSchema",
|
1229
1229
|
"location": {
|
1230
1230
|
"filePath": "merge-lanes.main.runtime.ts",
|
1231
|
-
"line":
|
1231
|
+
"line": 44,
|
1232
1232
|
"character": 3
|
1233
1233
|
},
|
1234
1234
|
"signature": "(property) noSnap?: boolean | undefined",
|
@@ -1237,7 +1237,7 @@
|
|
1237
1237
|
"__schema": "KeywordTypeSchema",
|
1238
1238
|
"location": {
|
1239
1239
|
"filePath": "merge-lanes.main.runtime.ts",
|
1240
|
-
"line":
|
1240
|
+
"line": 44,
|
1241
1241
|
"character": 12
|
1242
1242
|
},
|
1243
1243
|
"name": "boolean"
|
@@ -1248,7 +1248,7 @@
|
|
1248
1248
|
"__schema": "VariableLikeSchema",
|
1249
1249
|
"location": {
|
1250
1250
|
"filePath": "merge-lanes.main.runtime.ts",
|
1251
|
-
"line":
|
1251
|
+
"line": 45,
|
1252
1252
|
"character": 3
|
1253
1253
|
},
|
1254
1254
|
"signature": "(property) snapMessage?: string | undefined",
|
@@ -1257,7 +1257,7 @@
|
|
1257
1257
|
"__schema": "KeywordTypeSchema",
|
1258
1258
|
"location": {
|
1259
1259
|
"filePath": "merge-lanes.main.runtime.ts",
|
1260
|
-
"line":
|
1260
|
+
"line": 45,
|
1261
1261
|
"character": 17
|
1262
1262
|
},
|
1263
1263
|
"name": "string"
|
@@ -1268,7 +1268,7 @@
|
|
1268
1268
|
"__schema": "VariableLikeSchema",
|
1269
1269
|
"location": {
|
1270
1270
|
"filePath": "merge-lanes.main.runtime.ts",
|
1271
|
-
"line":
|
1271
|
+
"line": 46,
|
1272
1272
|
"character": 3
|
1273
1273
|
},
|
1274
1274
|
"signature": "(property) existingOnWorkspaceOnly?: boolean | undefined",
|
@@ -1277,7 +1277,7 @@
|
|
1277
1277
|
"__schema": "KeywordTypeSchema",
|
1278
1278
|
"location": {
|
1279
1279
|
"filePath": "merge-lanes.main.runtime.ts",
|
1280
|
-
"line":
|
1280
|
+
"line": 46,
|
1281
1281
|
"character": 29
|
1282
1282
|
},
|
1283
1283
|
"name": "boolean"
|
@@ -1288,7 +1288,7 @@
|
|
1288
1288
|
"__schema": "VariableLikeSchema",
|
1289
1289
|
"location": {
|
1290
1290
|
"filePath": "merge-lanes.main.runtime.ts",
|
1291
|
-
"line":
|
1291
|
+
"line": 47,
|
1292
1292
|
"character": 3
|
1293
1293
|
},
|
1294
1294
|
"signature": "(property) build?: boolean | undefined",
|
@@ -1297,7 +1297,7 @@
|
|
1297
1297
|
"__schema": "KeywordTypeSchema",
|
1298
1298
|
"location": {
|
1299
1299
|
"filePath": "merge-lanes.main.runtime.ts",
|
1300
|
-
"line":
|
1300
|
+
"line": 47,
|
1301
1301
|
"character": 11
|
1302
1302
|
},
|
1303
1303
|
"name": "boolean"
|
@@ -1308,7 +1308,7 @@
|
|
1308
1308
|
"__schema": "VariableLikeSchema",
|
1309
1309
|
"location": {
|
1310
1310
|
"filePath": "merge-lanes.main.runtime.ts",
|
1311
|
-
"line":
|
1311
|
+
"line": 48,
|
1312
1312
|
"character": 3
|
1313
1313
|
},
|
1314
1314
|
"signature": "(property) keepReadme?: boolean | undefined",
|
@@ -1317,7 +1317,7 @@
|
|
1317
1317
|
"__schema": "KeywordTypeSchema",
|
1318
1318
|
"location": {
|
1319
1319
|
"filePath": "merge-lanes.main.runtime.ts",
|
1320
|
-
"line":
|
1320
|
+
"line": 48,
|
1321
1321
|
"character": 16
|
1322
1322
|
},
|
1323
1323
|
"name": "boolean"
|
@@ -1328,7 +1328,7 @@
|
|
1328
1328
|
"__schema": "VariableLikeSchema",
|
1329
1329
|
"location": {
|
1330
1330
|
"filePath": "merge-lanes.main.runtime.ts",
|
1331
|
-
"line":
|
1331
|
+
"line": 49,
|
1332
1332
|
"character": 3
|
1333
1333
|
},
|
1334
1334
|
"signature": "(property) squash?: boolean | undefined",
|
@@ -1337,7 +1337,7 @@
|
|
1337
1337
|
"__schema": "KeywordTypeSchema",
|
1338
1338
|
"location": {
|
1339
1339
|
"filePath": "merge-lanes.main.runtime.ts",
|
1340
|
-
"line":
|
1340
|
+
"line": 49,
|
1341
1341
|
"character": 12
|
1342
1342
|
},
|
1343
1343
|
"name": "boolean"
|
@@ -1348,7 +1348,7 @@
|
|
1348
1348
|
"__schema": "VariableLikeSchema",
|
1349
1349
|
"location": {
|
1350
1350
|
"filePath": "merge-lanes.main.runtime.ts",
|
1351
|
-
"line":
|
1351
|
+
"line": 50,
|
1352
1352
|
"character": 3
|
1353
1353
|
},
|
1354
1354
|
"signature": "(property) noSquash?: boolean | undefined",
|
@@ -1357,7 +1357,7 @@
|
|
1357
1357
|
"__schema": "KeywordTypeSchema",
|
1358
1358
|
"location": {
|
1359
1359
|
"filePath": "merge-lanes.main.runtime.ts",
|
1360
|
-
"line":
|
1360
|
+
"line": 50,
|
1361
1361
|
"character": 14
|
1362
1362
|
},
|
1363
1363
|
"name": "boolean"
|
@@ -1368,7 +1368,7 @@
|
|
1368
1368
|
"__schema": "VariableLikeSchema",
|
1369
1369
|
"location": {
|
1370
1370
|
"filePath": "merge-lanes.main.runtime.ts",
|
1371
|
-
"line":
|
1371
|
+
"line": 51,
|
1372
1372
|
"character": 3
|
1373
1373
|
},
|
1374
1374
|
"signature": "(property) tag?: boolean | undefined",
|
@@ -1377,7 +1377,7 @@
|
|
1377
1377
|
"__schema": "KeywordTypeSchema",
|
1378
1378
|
"location": {
|
1379
1379
|
"filePath": "merge-lanes.main.runtime.ts",
|
1380
|
-
"line":
|
1380
|
+
"line": 51,
|
1381
1381
|
"character": 9
|
1382
1382
|
},
|
1383
1383
|
"name": "boolean"
|
@@ -1388,7 +1388,7 @@
|
|
1388
1388
|
"__schema": "VariableLikeSchema",
|
1389
1389
|
"location": {
|
1390
1390
|
"filePath": "merge-lanes.main.runtime.ts",
|
1391
|
-
"line":
|
1391
|
+
"line": 52,
|
1392
1392
|
"character": 3
|
1393
1393
|
},
|
1394
1394
|
"signature": "(property) pattern?: string | undefined",
|
@@ -1397,7 +1397,7 @@
|
|
1397
1397
|
"__schema": "KeywordTypeSchema",
|
1398
1398
|
"location": {
|
1399
1399
|
"filePath": "merge-lanes.main.runtime.ts",
|
1400
|
-
"line":
|
1400
|
+
"line": 52,
|
1401
1401
|
"character": 13
|
1402
1402
|
},
|
1403
1403
|
"name": "string"
|
@@ -1408,7 +1408,7 @@
|
|
1408
1408
|
"__schema": "VariableLikeSchema",
|
1409
1409
|
"location": {
|
1410
1410
|
"filePath": "merge-lanes.main.runtime.ts",
|
1411
|
-
"line":
|
1411
|
+
"line": 53,
|
1412
1412
|
"character": 3
|
1413
1413
|
},
|
1414
1414
|
"signature": "(property) includeDeps?: boolean | undefined",
|
@@ -1417,7 +1417,7 @@
|
|
1417
1417
|
"__schema": "KeywordTypeSchema",
|
1418
1418
|
"location": {
|
1419
1419
|
"filePath": "merge-lanes.main.runtime.ts",
|
1420
|
-
"line":
|
1420
|
+
"line": 53,
|
1421
1421
|
"character": 17
|
1422
1422
|
},
|
1423
1423
|
"name": "boolean"
|
@@ -1428,7 +1428,7 @@
|
|
1428
1428
|
"__schema": "VariableLikeSchema",
|
1429
1429
|
"location": {
|
1430
1430
|
"filePath": "merge-lanes.main.runtime.ts",
|
1431
|
-
"line":
|
1431
|
+
"line": 54,
|
1432
1432
|
"character": 3
|
1433
1433
|
},
|
1434
1434
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
@@ -1437,7 +1437,7 @@
|
|
1437
1437
|
"__schema": "KeywordTypeSchema",
|
1438
1438
|
"location": {
|
1439
1439
|
"filePath": "merge-lanes.main.runtime.ts",
|
1440
|
-
"line":
|
1440
|
+
"line": 54,
|
1441
1441
|
"character": 32
|
1442
1442
|
},
|
1443
1443
|
"name": "boolean"
|
@@ -1448,7 +1448,7 @@
|
|
1448
1448
|
"__schema": "VariableLikeSchema",
|
1449
1449
|
"location": {
|
1450
1450
|
"filePath": "merge-lanes.main.runtime.ts",
|
1451
|
-
"line":
|
1451
|
+
"line": 55,
|
1452
1452
|
"character": 3
|
1453
1453
|
},
|
1454
1454
|
"signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
|
@@ -1457,7 +1457,7 @@
|
|
1457
1457
|
"__schema": "TypeRefSchema",
|
1458
1458
|
"location": {
|
1459
1459
|
"filePath": "merge-lanes.main.runtime.ts",
|
1460
|
-
"line":
|
1460
|
+
"line": 55,
|
1461
1461
|
"character": 22
|
1462
1462
|
},
|
1463
1463
|
"name": "MergeStrategy"
|
@@ -1468,7 +1468,7 @@
|
|
1468
1468
|
"__schema": "VariableLikeSchema",
|
1469
1469
|
"location": {
|
1470
1470
|
"filePath": "merge-lanes.main.runtime.ts",
|
1471
|
-
"line":
|
1471
|
+
"line": 56,
|
1472
1472
|
"character": 3
|
1473
1473
|
},
|
1474
1474
|
"signature": "(property) ignoreConfigChanges?: boolean | undefined",
|
@@ -1477,7 +1477,7 @@
|
|
1477
1477
|
"__schema": "KeywordTypeSchema",
|
1478
1478
|
"location": {
|
1479
1479
|
"filePath": "merge-lanes.main.runtime.ts",
|
1480
|
-
"line":
|
1480
|
+
"line": 56,
|
1481
1481
|
"character": 25
|
1482
1482
|
},
|
1483
1483
|
"name": "boolean"
|
@@ -1488,7 +1488,7 @@
|
|
1488
1488
|
"__schema": "VariableLikeSchema",
|
1489
1489
|
"location": {
|
1490
1490
|
"filePath": "merge-lanes.main.runtime.ts",
|
1491
|
-
"line":
|
1491
|
+
"line": 57,
|
1492
1492
|
"character": 3
|
1493
1493
|
},
|
1494
1494
|
"signature": "(property) skipFetch?: boolean | undefined",
|
@@ -1497,7 +1497,7 @@
|
|
1497
1497
|
"__schema": "KeywordTypeSchema",
|
1498
1498
|
"location": {
|
1499
1499
|
"filePath": "merge-lanes.main.runtime.ts",
|
1500
|
-
"line":
|
1500
|
+
"line": 57,
|
1501
1501
|
"character": 15
|
1502
1502
|
},
|
1503
1503
|
"name": "boolean"
|
@@ -1508,7 +1508,7 @@
|
|
1508
1508
|
"__schema": "VariableLikeSchema",
|
1509
1509
|
"location": {
|
1510
1510
|
"filePath": "merge-lanes.main.runtime.ts",
|
1511
|
-
"line":
|
1511
|
+
"line": 58,
|
1512
1512
|
"character": 3
|
1513
1513
|
},
|
1514
1514
|
"signature": "(property) excludeNonLaneComps?: boolean | undefined",
|
@@ -1517,7 +1517,7 @@
|
|
1517
1517
|
"__schema": "KeywordTypeSchema",
|
1518
1518
|
"location": {
|
1519
1519
|
"filePath": "merge-lanes.main.runtime.ts",
|
1520
|
-
"line":
|
1520
|
+
"line": 58,
|
1521
1521
|
"character": 25
|
1522
1522
|
},
|
1523
1523
|
"name": "boolean"
|
@@ -1528,7 +1528,7 @@
|
|
1528
1528
|
"__schema": "VariableLikeSchema",
|
1529
1529
|
"location": {
|
1530
1530
|
"filePath": "merge-lanes.main.runtime.ts",
|
1531
|
-
"line":
|
1531
|
+
"line": 59,
|
1532
1532
|
"character": 3
|
1533
1533
|
},
|
1534
1534
|
"signature": "(property) shouldIncludeUpdateDependents?: boolean | undefined",
|
@@ -1537,7 +1537,7 @@
|
|
1537
1537
|
"__schema": "KeywordTypeSchema",
|
1538
1538
|
"location": {
|
1539
1539
|
"filePath": "merge-lanes.main.runtime.ts",
|
1540
|
-
"line":
|
1540
|
+
"line": 59,
|
1541
1541
|
"character": 35
|
1542
1542
|
},
|
1543
1543
|
"name": "boolean"
|
@@ -1548,7 +1548,7 @@
|
|
1548
1548
|
"__schema": "VariableLikeSchema",
|
1549
1549
|
"location": {
|
1550
1550
|
"filePath": "merge-lanes.main.runtime.ts",
|
1551
|
-
"line":
|
1551
|
+
"line": 60,
|
1552
1552
|
"character": 3
|
1553
1553
|
},
|
1554
1554
|
"signature": "(property) throwIfNotUpToDate?: boolean | undefined",
|
@@ -1557,7 +1557,7 @@
|
|
1557
1557
|
"__schema": "KeywordTypeSchema",
|
1558
1558
|
"location": {
|
1559
1559
|
"filePath": "merge-lanes.main.runtime.ts",
|
1560
|
-
"line":
|
1560
|
+
"line": 60,
|
1561
1561
|
"character": 24
|
1562
1562
|
},
|
1563
1563
|
"name": "boolean"
|
@@ -1568,7 +1568,7 @@
|
|
1568
1568
|
"__schema": "VariableLikeSchema",
|
1569
1569
|
"location": {
|
1570
1570
|
"filePath": "merge-lanes.main.runtime.ts",
|
1571
|
-
"line":
|
1571
|
+
"line": 61,
|
1572
1572
|
"character": 3
|
1573
1573
|
},
|
1574
1574
|
"signature": "(property) fetchCurrent?: boolean | undefined",
|
@@ -1577,7 +1577,7 @@
|
|
1577
1577
|
"__schema": "KeywordTypeSchema",
|
1578
1578
|
"location": {
|
1579
1579
|
"filePath": "merge-lanes.main.runtime.ts",
|
1580
|
-
"line":
|
1580
|
+
"line": 61,
|
1581
1581
|
"character": 18
|
1582
1582
|
},
|
1583
1583
|
"name": "boolean"
|
@@ -1591,7 +1591,7 @@
|
|
1591
1591
|
"__schema": "TypeSchema",
|
1592
1592
|
"location": {
|
1593
1593
|
"filePath": "merge-lanes.main.runtime.ts",
|
1594
|
-
"line":
|
1594
|
+
"line": 63,
|
1595
1595
|
"character": 1
|
1596
1596
|
},
|
1597
1597
|
"signature": "type ConflictPerId = {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n}",
|
@@ -1600,7 +1600,7 @@
|
|
1600
1600
|
"__schema": "TypeLiteralSchema",
|
1601
1601
|
"location": {
|
1602
1602
|
"filePath": "merge-lanes.main.runtime.ts",
|
1603
|
-
"line":
|
1603
|
+
"line": 63,
|
1604
1604
|
"character": 29
|
1605
1605
|
},
|
1606
1606
|
"members": [
|
@@ -1608,7 +1608,7 @@
|
|
1608
1608
|
"__schema": "VariableLikeSchema",
|
1609
1609
|
"location": {
|
1610
1610
|
"filePath": "merge-lanes.main.runtime.ts",
|
1611
|
-
"line":
|
1611
|
+
"line": 63,
|
1612
1612
|
"character": 31
|
1613
1613
|
},
|
1614
1614
|
"signature": "(property) id: ComponentID",
|
@@ -1617,7 +1617,7 @@
|
|
1617
1617
|
"__schema": "TypeRefSchema",
|
1618
1618
|
"location": {
|
1619
1619
|
"filePath": "merge-lanes.main.runtime.ts",
|
1620
|
-
"line":
|
1620
|
+
"line": 63,
|
1621
1621
|
"character": 31
|
1622
1622
|
},
|
1623
1623
|
"name": "ComponentID",
|
@@ -1633,7 +1633,7 @@
|
|
1633
1633
|
"__schema": "VariableLikeSchema",
|
1634
1634
|
"location": {
|
1635
1635
|
"filePath": "merge-lanes.main.runtime.ts",
|
1636
|
-
"line":
|
1636
|
+
"line": 63,
|
1637
1637
|
"character": 48
|
1638
1638
|
},
|
1639
1639
|
"signature": "(property) files: string[]",
|
@@ -1642,14 +1642,14 @@
|
|
1642
1642
|
"__schema": "TypeArraySchema",
|
1643
1643
|
"location": {
|
1644
1644
|
"filePath": "merge-lanes.main.runtime.ts",
|
1645
|
-
"line":
|
1645
|
+
"line": 63,
|
1646
1646
|
"character": 55
|
1647
1647
|
},
|
1648
1648
|
"type": {
|
1649
1649
|
"__schema": "KeywordTypeSchema",
|
1650
1650
|
"location": {
|
1651
1651
|
"filePath": "merge-lanes.main.runtime.ts",
|
1652
|
-
"line":
|
1652
|
+
"line": 63,
|
1653
1653
|
"character": 55
|
1654
1654
|
},
|
1655
1655
|
"name": "string"
|
@@ -1661,7 +1661,7 @@
|
|
1661
1661
|
"__schema": "VariableLikeSchema",
|
1662
1662
|
"location": {
|
1663
1663
|
"filePath": "merge-lanes.main.runtime.ts",
|
1664
|
-
"line":
|
1664
|
+
"line": 63,
|
1665
1665
|
"character": 65
|
1666
1666
|
},
|
1667
1667
|
"signature": "(property) config?: boolean | undefined",
|
@@ -1670,7 +1670,7 @@
|
|
1670
1670
|
"__schema": "KeywordTypeSchema",
|
1671
1671
|
"location": {
|
1672
1672
|
"filePath": "merge-lanes.main.runtime.ts",
|
1673
|
-
"line":
|
1673
|
+
"line": 63,
|
1674
1674
|
"character": 74
|
1675
1675
|
},
|
1676
1676
|
"name": "boolean"
|
@@ -1684,7 +1684,7 @@
|
|
1684
1684
|
"__schema": "TypeSchema",
|
1685
1685
|
"location": {
|
1686
1686
|
"filePath": "merge-lanes.main.runtime.ts",
|
1687
|
-
"line":
|
1687
|
+
"line": 64,
|
1688
1688
|
"character": 1
|
1689
1689
|
},
|
1690
1690
|
"signature": "type MergeFromScopeResult = {\n mergedNow: ComponentID[];\n exportedIds: ComponentID[];\n unmerged: {\n id: ComponentID;\n reason: string;\n }[];\n conflicts?: ConflictPerId[] | undefined;\n snappedIds?: ComponentID[] | undefined;\n mergedPreviously: ComponentID[];\n mergeSnapError?: Error | undefined;\n}",
|
@@ -1693,7 +1693,7 @@
|
|
1693
1693
|
"__schema": "TypeLiteralSchema",
|
1694
1694
|
"location": {
|
1695
1695
|
"filePath": "merge-lanes.main.runtime.ts",
|
1696
|
-
"line":
|
1696
|
+
"line": 64,
|
1697
1697
|
"character": 36
|
1698
1698
|
},
|
1699
1699
|
"members": [
|
@@ -1701,7 +1701,7 @@
|
|
1701
1701
|
"__schema": "VariableLikeSchema",
|
1702
1702
|
"location": {
|
1703
1703
|
"filePath": "merge-lanes.main.runtime.ts",
|
1704
|
-
"line":
|
1704
|
+
"line": 65,
|
1705
1705
|
"character": 3
|
1706
1706
|
},
|
1707
1707
|
"signature": "(property) mergedNow: ComponentID[]",
|
@@ -1710,14 +1710,14 @@
|
|
1710
1710
|
"__schema": "TypeArraySchema",
|
1711
1711
|
"location": {
|
1712
1712
|
"filePath": "merge-lanes.main.runtime.ts",
|
1713
|
-
"line":
|
1713
|
+
"line": 65,
|
1714
1714
|
"character": 14
|
1715
1715
|
},
|
1716
1716
|
"type": {
|
1717
1717
|
"__schema": "TypeRefSchema",
|
1718
1718
|
"location": {
|
1719
1719
|
"filePath": "merge-lanes.main.runtime.ts",
|
1720
|
-
"line":
|
1720
|
+
"line": 65,
|
1721
1721
|
"character": 14
|
1722
1722
|
},
|
1723
1723
|
"name": "ComponentID"
|
@@ -1729,7 +1729,7 @@
|
|
1729
1729
|
"__schema": "VariableLikeSchema",
|
1730
1730
|
"location": {
|
1731
1731
|
"filePath": "merge-lanes.main.runtime.ts",
|
1732
|
-
"line":
|
1732
|
+
"line": 66,
|
1733
1733
|
"character": 3
|
1734
1734
|
},
|
1735
1735
|
"signature": "(property) exportedIds: ComponentID[]",
|
@@ -1738,14 +1738,14 @@
|
|
1738
1738
|
"__schema": "TypeArraySchema",
|
1739
1739
|
"location": {
|
1740
1740
|
"filePath": "merge-lanes.main.runtime.ts",
|
1741
|
-
"line":
|
1741
|
+
"line": 66,
|
1742
1742
|
"character": 16
|
1743
1743
|
},
|
1744
1744
|
"type": {
|
1745
1745
|
"__schema": "TypeRefSchema",
|
1746
1746
|
"location": {
|
1747
1747
|
"filePath": "merge-lanes.main.runtime.ts",
|
1748
|
-
"line":
|
1748
|
+
"line": 66,
|
1749
1749
|
"character": 16
|
1750
1750
|
},
|
1751
1751
|
"name": "ComponentID"
|
@@ -1757,7 +1757,7 @@
|
|
1757
1757
|
"__schema": "VariableLikeSchema",
|
1758
1758
|
"location": {
|
1759
1759
|
"filePath": "merge-lanes.main.runtime.ts",
|
1760
|
-
"line":
|
1760
|
+
"line": 67,
|
1761
1761
|
"character": 3
|
1762
1762
|
},
|
1763
1763
|
"signature": "(property) unmerged: {\n id: ComponentID;\n reason: string;\n}[]",
|
@@ -1766,14 +1766,14 @@
|
|
1766
1766
|
"__schema": "TypeArraySchema",
|
1767
1767
|
"location": {
|
1768
1768
|
"filePath": "merge-lanes.main.runtime.ts",
|
1769
|
-
"line":
|
1769
|
+
"line": 67,
|
1770
1770
|
"character": 13
|
1771
1771
|
},
|
1772
1772
|
"type": {
|
1773
1773
|
"__schema": "TypeLiteralSchema",
|
1774
1774
|
"location": {
|
1775
1775
|
"filePath": "merge-lanes.main.runtime.ts",
|
1776
|
-
"line":
|
1776
|
+
"line": 67,
|
1777
1777
|
"character": 13
|
1778
1778
|
},
|
1779
1779
|
"members": [
|
@@ -1781,7 +1781,7 @@
|
|
1781
1781
|
"__schema": "VariableLikeSchema",
|
1782
1782
|
"location": {
|
1783
1783
|
"filePath": "merge-lanes.main.runtime.ts",
|
1784
|
-
"line":
|
1784
|
+
"line": 67,
|
1785
1785
|
"character": 15
|
1786
1786
|
},
|
1787
1787
|
"signature": "(property) id: ComponentID",
|
@@ -1790,7 +1790,7 @@
|
|
1790
1790
|
"__schema": "TypeRefSchema",
|
1791
1791
|
"location": {
|
1792
1792
|
"filePath": "merge-lanes.main.runtime.ts",
|
1793
|
-
"line":
|
1793
|
+
"line": 67,
|
1794
1794
|
"character": 15
|
1795
1795
|
},
|
1796
1796
|
"name": "ComponentID",
|
@@ -1806,7 +1806,7 @@
|
|
1806
1806
|
"__schema": "VariableLikeSchema",
|
1807
1807
|
"location": {
|
1808
1808
|
"filePath": "merge-lanes.main.runtime.ts",
|
1809
|
-
"line":
|
1809
|
+
"line": 67,
|
1810
1810
|
"character": 32
|
1811
1811
|
},
|
1812
1812
|
"signature": "(property) reason: string",
|
@@ -1815,7 +1815,7 @@
|
|
1815
1815
|
"__schema": "KeywordTypeSchema",
|
1816
1816
|
"location": {
|
1817
1817
|
"filePath": "merge-lanes.main.runtime.ts",
|
1818
|
-
"line":
|
1818
|
+
"line": 67,
|
1819
1819
|
"character": 40
|
1820
1820
|
},
|
1821
1821
|
"name": "string"
|
@@ -1831,7 +1831,7 @@
|
|
1831
1831
|
"__schema": "VariableLikeSchema",
|
1832
1832
|
"location": {
|
1833
1833
|
"filePath": "merge-lanes.main.runtime.ts",
|
1834
|
-
"line":
|
1834
|
+
"line": 68,
|
1835
1835
|
"character": 3
|
1836
1836
|
},
|
1837
1837
|
"signature": "(property) conflicts?: ConflictPerId[] | undefined",
|
@@ -1840,14 +1840,14 @@
|
|
1840
1840
|
"__schema": "TypeArraySchema",
|
1841
1841
|
"location": {
|
1842
1842
|
"filePath": "merge-lanes.main.runtime.ts",
|
1843
|
-
"line":
|
1843
|
+
"line": 68,
|
1844
1844
|
"character": 15
|
1845
1845
|
},
|
1846
1846
|
"type": {
|
1847
1847
|
"__schema": "TypeRefSchema",
|
1848
1848
|
"location": {
|
1849
1849
|
"filePath": "merge-lanes.main.runtime.ts",
|
1850
|
-
"line":
|
1850
|
+
"line": 68,
|
1851
1851
|
"character": 15
|
1852
1852
|
},
|
1853
1853
|
"name": "ConflictPerId"
|
@@ -1859,7 +1859,7 @@
|
|
1859
1859
|
"__schema": "VariableLikeSchema",
|
1860
1860
|
"location": {
|
1861
1861
|
"filePath": "merge-lanes.main.runtime.ts",
|
1862
|
-
"line":
|
1862
|
+
"line": 69,
|
1863
1863
|
"character": 3
|
1864
1864
|
},
|
1865
1865
|
"signature": "(property) snappedIds?: ComponentID[] | undefined",
|
@@ -1868,14 +1868,14 @@
|
|
1868
1868
|
"__schema": "TypeArraySchema",
|
1869
1869
|
"location": {
|
1870
1870
|
"filePath": "merge-lanes.main.runtime.ts",
|
1871
|
-
"line":
|
1871
|
+
"line": 69,
|
1872
1872
|
"character": 16
|
1873
1873
|
},
|
1874
1874
|
"type": {
|
1875
1875
|
"__schema": "TypeRefSchema",
|
1876
1876
|
"location": {
|
1877
1877
|
"filePath": "merge-lanes.main.runtime.ts",
|
1878
|
-
"line":
|
1878
|
+
"line": 69,
|
1879
1879
|
"character": 16
|
1880
1880
|
},
|
1881
1881
|
"name": "ComponentID"
|
@@ -1887,7 +1887,7 @@
|
|
1887
1887
|
"__schema": "VariableLikeSchema",
|
1888
1888
|
"location": {
|
1889
1889
|
"filePath": "merge-lanes.main.runtime.ts",
|
1890
|
-
"line":
|
1890
|
+
"line": 70,
|
1891
1891
|
"character": 3
|
1892
1892
|
},
|
1893
1893
|
"signature": "(property) mergedPreviously: ComponentID[]",
|
@@ -1896,14 +1896,14 @@
|
|
1896
1896
|
"__schema": "TypeArraySchema",
|
1897
1897
|
"location": {
|
1898
1898
|
"filePath": "merge-lanes.main.runtime.ts",
|
1899
|
-
"line":
|
1899
|
+
"line": 70,
|
1900
1900
|
"character": 21
|
1901
1901
|
},
|
1902
1902
|
"type": {
|
1903
1903
|
"__schema": "TypeRefSchema",
|
1904
1904
|
"location": {
|
1905
1905
|
"filePath": "merge-lanes.main.runtime.ts",
|
1906
|
-
"line":
|
1906
|
+
"line": 70,
|
1907
1907
|
"character": 21
|
1908
1908
|
},
|
1909
1909
|
"name": "ComponentID"
|
@@ -1915,7 +1915,7 @@
|
|
1915
1915
|
"__schema": "VariableLikeSchema",
|
1916
1916
|
"location": {
|
1917
1917
|
"filePath": "merge-lanes.main.runtime.ts",
|
1918
|
-
"line":
|
1918
|
+
"line": 71,
|
1919
1919
|
"character": 3
|
1920
1920
|
},
|
1921
1921
|
"signature": "(property) mergeSnapError?: Error | undefined",
|
@@ -1924,7 +1924,7 @@
|
|
1924
1924
|
"__schema": "TypeRefSchema",
|
1925
1925
|
"location": {
|
1926
1926
|
"filePath": "merge-lanes.main.runtime.ts",
|
1927
|
-
"line":
|
1927
|
+
"line": 71,
|
1928
1928
|
"character": 20
|
1929
1929
|
},
|
1930
1930
|
"name": "Error"
|
@@ -1938,7 +1938,7 @@
|
|
1938
1938
|
"__schema": "ClassSchema",
|
1939
1939
|
"location": {
|
1940
1940
|
"filePath": "merge-lanes.main.runtime.ts",
|
1941
|
-
"line":
|
1941
|
+
"line": 74,
|
1942
1942
|
"character": 1
|
1943
1943
|
},
|
1944
1944
|
"signature": "class MergeLanesMain",
|
@@ -1948,7 +1948,7 @@
|
|
1948
1948
|
"__schema": "ConstructorSchema",
|
1949
1949
|
"location": {
|
1950
1950
|
"filePath": "merge-lanes.main.runtime.ts",
|
1951
|
-
"line":
|
1951
|
+
"line": 75,
|
1952
1952
|
"character": 3
|
1953
1953
|
},
|
1954
1954
|
"signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
|
@@ -1958,7 +1958,7 @@
|
|
1958
1958
|
"__schema": "ParameterSchema",
|
1959
1959
|
"location": {
|
1960
1960
|
"filePath": "merge-lanes.main.runtime.ts",
|
1961
|
-
"line":
|
1961
|
+
"line": 76,
|
1962
1962
|
"character": 5
|
1963
1963
|
},
|
1964
1964
|
"name": "workspace",
|
@@ -1966,7 +1966,7 @@
|
|
1966
1966
|
"__schema": "TypeUnionSchema",
|
1967
1967
|
"location": {
|
1968
1968
|
"filePath": "merge-lanes.main.runtime.ts",
|
1969
|
-
"line":
|
1969
|
+
"line": 76,
|
1970
1970
|
"character": 24
|
1971
1971
|
},
|
1972
1972
|
"types": [
|
@@ -1974,7 +1974,7 @@
|
|
1974
1974
|
"__schema": "TypeRefSchema",
|
1975
1975
|
"location": {
|
1976
1976
|
"filePath": "merge-lanes.main.runtime.ts",
|
1977
|
-
"line":
|
1977
|
+
"line": 76,
|
1978
1978
|
"character": 24
|
1979
1979
|
},
|
1980
1980
|
"name": "Workspace"
|
@@ -1983,7 +1983,7 @@
|
|
1983
1983
|
"__schema": "KeywordTypeSchema",
|
1984
1984
|
"location": {
|
1985
1985
|
"filePath": "merge-lanes.main.runtime.ts",
|
1986
|
-
"line":
|
1986
|
+
"line": 76,
|
1987
1987
|
"character": 36
|
1988
1988
|
},
|
1989
1989
|
"name": "undefined"
|
@@ -1997,7 +1997,7 @@
|
|
1997
1997
|
"__schema": "ParameterSchema",
|
1998
1998
|
"location": {
|
1999
1999
|
"filePath": "merge-lanes.main.runtime.ts",
|
2000
|
-
"line":
|
2000
|
+
"line": 77,
|
2001
2001
|
"character": 5
|
2002
2002
|
},
|
2003
2003
|
"name": "merging",
|
@@ -2005,7 +2005,7 @@
|
|
2005
2005
|
"__schema": "TypeRefSchema",
|
2006
2006
|
"location": {
|
2007
2007
|
"filePath": "merge-lanes.main.runtime.ts",
|
2008
|
-
"line":
|
2008
|
+
"line": 77,
|
2009
2009
|
"character": 22
|
2010
2010
|
},
|
2011
2011
|
"name": "MergingMain"
|
@@ -2017,7 +2017,7 @@
|
|
2017
2017
|
"__schema": "ParameterSchema",
|
2018
2018
|
"location": {
|
2019
2019
|
"filePath": "merge-lanes.main.runtime.ts",
|
2020
|
-
"line":
|
2020
|
+
"line": 78,
|
2021
2021
|
"character": 5
|
2022
2022
|
},
|
2023
2023
|
"name": "lanes",
|
@@ -2025,7 +2025,7 @@
|
|
2025
2025
|
"__schema": "TypeRefSchema",
|
2026
2026
|
"location": {
|
2027
2027
|
"filePath": "merge-lanes.main.runtime.ts",
|
2028
|
-
"line":
|
2028
|
+
"line": 78,
|
2029
2029
|
"character": 21
|
2030
2030
|
},
|
2031
2031
|
"name": "LanesMain"
|
@@ -2037,7 +2037,7 @@
|
|
2037
2037
|
"__schema": "ParameterSchema",
|
2038
2038
|
"location": {
|
2039
2039
|
"filePath": "merge-lanes.main.runtime.ts",
|
2040
|
-
"line":
|
2040
|
+
"line": 79,
|
2041
2041
|
"character": 5
|
2042
2042
|
},
|
2043
2043
|
"name": "logger",
|
@@ -2045,7 +2045,7 @@
|
|
2045
2045
|
"__schema": "TypeRefSchema",
|
2046
2046
|
"location": {
|
2047
2047
|
"filePath": "merge-lanes.main.runtime.ts",
|
2048
|
-
"line":
|
2048
|
+
"line": 79,
|
2049
2049
|
"character": 22
|
2050
2050
|
},
|
2051
2051
|
"name": "Logger"
|
@@ -2057,7 +2057,7 @@
|
|
2057
2057
|
"__schema": "ParameterSchema",
|
2058
2058
|
"location": {
|
2059
2059
|
"filePath": "merge-lanes.main.runtime.ts",
|
2060
|
-
"line":
|
2060
|
+
"line": 80,
|
2061
2061
|
"character": 5
|
2062
2062
|
},
|
2063
2063
|
"name": "remove",
|
@@ -2065,7 +2065,7 @@
|
|
2065
2065
|
"__schema": "TypeRefSchema",
|
2066
2066
|
"location": {
|
2067
2067
|
"filePath": "merge-lanes.main.runtime.ts",
|
2068
|
-
"line":
|
2068
|
+
"line": 80,
|
2069
2069
|
"character": 21
|
2070
2070
|
},
|
2071
2071
|
"name": "RemoveMain"
|
@@ -2077,7 +2077,7 @@
|
|
2077
2077
|
"__schema": "ParameterSchema",
|
2078
2078
|
"location": {
|
2079
2079
|
"filePath": "merge-lanes.main.runtime.ts",
|
2080
|
-
"line":
|
2080
|
+
"line": 81,
|
2081
2081
|
"character": 5
|
2082
2082
|
},
|
2083
2083
|
"name": "scope",
|
@@ -2085,7 +2085,7 @@
|
|
2085
2085
|
"__schema": "TypeRefSchema",
|
2086
2086
|
"location": {
|
2087
2087
|
"filePath": "merge-lanes.main.runtime.ts",
|
2088
|
-
"line":
|
2088
|
+
"line": 81,
|
2089
2089
|
"character": 20
|
2090
2090
|
},
|
2091
2091
|
"name": "ScopeMain"
|
@@ -2097,7 +2097,7 @@
|
|
2097
2097
|
"__schema": "ParameterSchema",
|
2098
2098
|
"location": {
|
2099
2099
|
"filePath": "merge-lanes.main.runtime.ts",
|
2100
|
-
"line":
|
2100
|
+
"line": 82,
|
2101
2101
|
"character": 5
|
2102
2102
|
},
|
2103
2103
|
"name": "exporter",
|
@@ -2105,7 +2105,7 @@
|
|
2105
2105
|
"__schema": "TypeRefSchema",
|
2106
2106
|
"location": {
|
2107
2107
|
"filePath": "merge-lanes.main.runtime.ts",
|
2108
|
-
"line":
|
2108
|
+
"line": 82,
|
2109
2109
|
"character": 23
|
2110
2110
|
},
|
2111
2111
|
"name": "ExportMain"
|
@@ -2117,7 +2117,7 @@
|
|
2117
2117
|
"__schema": "ParameterSchema",
|
2118
2118
|
"location": {
|
2119
2119
|
"filePath": "merge-lanes.main.runtime.ts",
|
2120
|
-
"line":
|
2120
|
+
"line": 83,
|
2121
2121
|
"character": 5
|
2122
2122
|
},
|
2123
2123
|
"name": "importer",
|
@@ -2125,7 +2125,7 @@
|
|
2125
2125
|
"__schema": "TypeRefSchema",
|
2126
2126
|
"location": {
|
2127
2127
|
"filePath": "merge-lanes.main.runtime.ts",
|
2128
|
-
"line":
|
2128
|
+
"line": 83,
|
2129
2129
|
"character": 23
|
2130
2130
|
},
|
2131
2131
|
"name": "ImporterMain"
|
@@ -2137,7 +2137,7 @@
|
|
2137
2137
|
"__schema": "ParameterSchema",
|
2138
2138
|
"location": {
|
2139
2139
|
"filePath": "merge-lanes.main.runtime.ts",
|
2140
|
-
"line":
|
2140
|
+
"line": 84,
|
2141
2141
|
"character": 5
|
2142
2142
|
},
|
2143
2143
|
"name": "checkout",
|
@@ -2145,7 +2145,7 @@
|
|
2145
2145
|
"__schema": "TypeRefSchema",
|
2146
2146
|
"location": {
|
2147
2147
|
"filePath": "merge-lanes.main.runtime.ts",
|
2148
|
-
"line":
|
2148
|
+
"line": 84,
|
2149
2149
|
"character": 23
|
2150
2150
|
},
|
2151
2151
|
"name": "CheckoutMain"
|
@@ -2158,7 +2158,7 @@
|
|
2158
2158
|
"__schema": "ThisTypeSchema",
|
2159
2159
|
"location": {
|
2160
2160
|
"filePath": "merge-lanes.main.runtime.ts",
|
2161
|
-
"line":
|
2161
|
+
"line": 74,
|
2162
2162
|
"character": 1
|
2163
2163
|
},
|
2164
2164
|
"name": "MergeLanesMain"
|
@@ -2169,7 +2169,7 @@
|
|
2169
2169
|
"__schema": "FunctionLikeSchema",
|
2170
2170
|
"location": {
|
2171
2171
|
"filePath": "merge-lanes.main.runtime.ts",
|
2172
|
-
"line":
|
2172
|
+
"line": 87,
|
2173
2173
|
"character": 3
|
2174
2174
|
},
|
2175
2175
|
"signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
|
@@ -2179,7 +2179,7 @@
|
|
2179
2179
|
"__schema": "ParameterSchema",
|
2180
2180
|
"location": {
|
2181
2181
|
"filePath": "merge-lanes.main.runtime.ts",
|
2182
|
-
"line":
|
2182
|
+
"line": 87,
|
2183
2183
|
"character": 24
|
2184
2184
|
},
|
2185
2185
|
"name": "laneName",
|
@@ -2187,7 +2187,7 @@
|
|
2187
2187
|
"__schema": "KeywordTypeSchema",
|
2188
2188
|
"location": {
|
2189
2189
|
"filePath": "merge-lanes.main.runtime.ts",
|
2190
|
-
"line":
|
2190
|
+
"line": 87,
|
2191
2191
|
"character": 34
|
2192
2192
|
},
|
2193
2193
|
"name": "string"
|
@@ -2199,7 +2199,7 @@
|
|
2199
2199
|
"__schema": "ParameterSchema",
|
2200
2200
|
"location": {
|
2201
2201
|
"filePath": "merge-lanes.main.runtime.ts",
|
2202
|
-
"line":
|
2202
|
+
"line": 87,
|
2203
2203
|
"character": 42
|
2204
2204
|
},
|
2205
2205
|
"name": "options",
|
@@ -2207,7 +2207,7 @@
|
|
2207
2207
|
"__schema": "TypeRefSchema",
|
2208
2208
|
"location": {
|
2209
2209
|
"filePath": "merge-lanes.main.runtime.ts",
|
2210
|
-
"line":
|
2210
|
+
"line": 87,
|
2211
2211
|
"character": 51
|
2212
2212
|
},
|
2213
2213
|
"name": "MergeLaneOptions"
|
@@ -2220,7 +2220,7 @@
|
|
2220
2220
|
"__schema": "InferenceTypeSchema",
|
2221
2221
|
"location": {
|
2222
2222
|
"filePath": "merge-lanes.main.runtime.ts",
|
2223
|
-
"line":
|
2223
|
+
"line": 87,
|
2224
2224
|
"character": 3
|
2225
2225
|
},
|
2226
2226
|
"type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
|
@@ -2233,7 +2233,7 @@
|
|
2233
2233
|
"__schema": "FunctionLikeSchema",
|
2234
2234
|
"location": {
|
2235
2235
|
"filePath": "merge-lanes.main.runtime.ts",
|
2236
|
-
"line":
|
2236
|
+
"line": 97,
|
2237
2237
|
"character": 3
|
2238
2238
|
},
|
2239
2239
|
"signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
|
@@ -2243,7 +2243,7 @@
|
|
2243
2243
|
"__schema": "ParameterSchema",
|
2244
2244
|
"location": {
|
2245
2245
|
"filePath": "merge-lanes.main.runtime.ts",
|
2246
|
-
"line":
|
2246
|
+
"line": 98,
|
2247
2247
|
"character": 5
|
2248
2248
|
},
|
2249
2249
|
"name": "otherLaneId",
|
@@ -2251,7 +2251,7 @@
|
|
2251
2251
|
"__schema": "TypeRefSchema",
|
2252
2252
|
"location": {
|
2253
2253
|
"filePath": "merge-lanes.main.runtime.ts",
|
2254
|
-
"line":
|
2254
|
+
"line": 98,
|
2255
2255
|
"character": 18
|
2256
2256
|
},
|
2257
2257
|
"name": "LaneId"
|
@@ -2263,7 +2263,7 @@
|
|
2263
2263
|
"__schema": "ParameterSchema",
|
2264
2264
|
"location": {
|
2265
2265
|
"filePath": "merge-lanes.main.runtime.ts",
|
2266
|
-
"line":
|
2266
|
+
"line": 99,
|
2267
2267
|
"character": 5
|
2268
2268
|
},
|
2269
2269
|
"name": "currentLaneId",
|
@@ -2271,7 +2271,7 @@
|
|
2271
2271
|
"__schema": "TypeRefSchema",
|
2272
2272
|
"location": {
|
2273
2273
|
"filePath": "merge-lanes.main.runtime.ts",
|
2274
|
-
"line":
|
2274
|
+
"line": 99,
|
2275
2275
|
"character": 20
|
2276
2276
|
},
|
2277
2277
|
"name": "LaneId"
|
@@ -2283,7 +2283,7 @@
|
|
2283
2283
|
"__schema": "ParameterSchema",
|
2284
2284
|
"location": {
|
2285
2285
|
"filePath": "merge-lanes.main.runtime.ts",
|
2286
|
-
"line":
|
2286
|
+
"line": 100,
|
2287
2287
|
"character": 5
|
2288
2288
|
},
|
2289
2289
|
"name": "options",
|
@@ -2291,7 +2291,7 @@
|
|
2291
2291
|
"__schema": "TypeRefSchema",
|
2292
2292
|
"location": {
|
2293
2293
|
"filePath": "merge-lanes.main.runtime.ts",
|
2294
|
-
"line":
|
2294
|
+
"line": 100,
|
2295
2295
|
"character": 14
|
2296
2296
|
},
|
2297
2297
|
"name": "MergeLaneOptions"
|
@@ -2304,7 +2304,7 @@
|
|
2304
2304
|
"__schema": "TypeRefSchema",
|
2305
2305
|
"location": {
|
2306
2306
|
"filePath": "merge-lanes.main.runtime.ts",
|
2307
|
-
"line":
|
2307
|
+
"line": 101,
|
2308
2308
|
"character": 6
|
2309
2309
|
},
|
2310
2310
|
"name": "Promise",
|
@@ -2313,7 +2313,7 @@
|
|
2313
2313
|
"__schema": "TypeLiteralSchema",
|
2314
2314
|
"location": {
|
2315
2315
|
"filePath": "merge-lanes.main.runtime.ts",
|
2316
|
-
"line":
|
2316
|
+
"line": 101,
|
2317
2317
|
"character": 14
|
2318
2318
|
},
|
2319
2319
|
"members": [
|
@@ -2321,7 +2321,7 @@
|
|
2321
2321
|
"__schema": "VariableLikeSchema",
|
2322
2322
|
"location": {
|
2323
2323
|
"filePath": "merge-lanes.main.runtime.ts",
|
2324
|
-
"line":
|
2324
|
+
"line": 102,
|
2325
2325
|
"character": 5
|
2326
2326
|
},
|
2327
2327
|
"signature": "(property) mergeResults: ApplyVersionResults",
|
@@ -2330,7 +2330,7 @@
|
|
2330
2330
|
"__schema": "TypeRefSchema",
|
2331
2331
|
"location": {
|
2332
2332
|
"filePath": "merge-lanes.main.runtime.ts",
|
2333
|
-
"line":
|
2333
|
+
"line": 102,
|
2334
2334
|
"character": 5
|
2335
2335
|
},
|
2336
2336
|
"name": "ApplyVersionResults",
|
@@ -2345,7 +2345,7 @@
|
|
2345
2345
|
"__schema": "VariableLikeSchema",
|
2346
2346
|
"location": {
|
2347
2347
|
"filePath": "merge-lanes.main.runtime.ts",
|
2348
|
-
"line":
|
2348
|
+
"line": 103,
|
2349
2349
|
"character": 5
|
2350
2350
|
},
|
2351
2351
|
"signature": "(property) deleteResults: any",
|
@@ -2354,7 +2354,7 @@
|
|
2354
2354
|
"__schema": "KeywordTypeSchema",
|
2355
2355
|
"location": {
|
2356
2356
|
"filePath": "merge-lanes.main.runtime.ts",
|
2357
|
-
"line":
|
2357
|
+
"line": 103,
|
2358
2358
|
"character": 20
|
2359
2359
|
},
|
2360
2360
|
"name": "any"
|
@@ -2365,7 +2365,7 @@
|
|
2365
2365
|
"__schema": "VariableLikeSchema",
|
2366
2366
|
"location": {
|
2367
2367
|
"filePath": "merge-lanes.main.runtime.ts",
|
2368
|
-
"line":
|
2368
|
+
"line": 104,
|
2369
2369
|
"character": 5
|
2370
2370
|
},
|
2371
2371
|
"signature": "(property) configMergeResults: ConfigMergeResult[]",
|
@@ -2374,14 +2374,14 @@
|
|
2374
2374
|
"__schema": "TypeArraySchema",
|
2375
2375
|
"location": {
|
2376
2376
|
"filePath": "merge-lanes.main.runtime.ts",
|
2377
|
-
"line":
|
2377
|
+
"line": 104,
|
2378
2378
|
"character": 25
|
2379
2379
|
},
|
2380
2380
|
"type": {
|
2381
2381
|
"__schema": "TypeRefSchema",
|
2382
2382
|
"location": {
|
2383
2383
|
"filePath": "merge-lanes.main.runtime.ts",
|
2384
|
-
"line":
|
2384
|
+
"line": 104,
|
2385
2385
|
"character": 25
|
2386
2386
|
},
|
2387
2387
|
"name": "ConfigMergeResult"
|
@@ -2393,7 +2393,7 @@
|
|
2393
2393
|
"__schema": "VariableLikeSchema",
|
2394
2394
|
"location": {
|
2395
2395
|
"filePath": "merge-lanes.main.runtime.ts",
|
2396
|
-
"line":
|
2396
|
+
"line": 105,
|
2397
2397
|
"character": 5
|
2398
2398
|
},
|
2399
2399
|
"signature": "(property) mergedSuccessfullyIds: ComponentID[]",
|
@@ -2402,14 +2402,14 @@
|
|
2402
2402
|
"__schema": "TypeArraySchema",
|
2403
2403
|
"location": {
|
2404
2404
|
"filePath": "merge-lanes.main.runtime.ts",
|
2405
|
-
"line":
|
2405
|
+
"line": 105,
|
2406
2406
|
"character": 28
|
2407
2407
|
},
|
2408
2408
|
"type": {
|
2409
2409
|
"__schema": "TypeRefSchema",
|
2410
2410
|
"location": {
|
2411
2411
|
"filePath": "merge-lanes.main.runtime.ts",
|
2412
|
-
"line":
|
2412
|
+
"line": 105,
|
2413
2413
|
"character": 28
|
2414
2414
|
},
|
2415
2415
|
"name": "ComponentID"
|
@@ -2421,7 +2421,7 @@
|
|
2421
2421
|
"__schema": "VariableLikeSchema",
|
2422
2422
|
"location": {
|
2423
2423
|
"filePath": "merge-lanes.main.runtime.ts",
|
2424
|
-
"line":
|
2424
|
+
"line": 106,
|
2425
2425
|
"character": 5
|
2426
2426
|
},
|
2427
2427
|
"signature": "(property) conflicts: ConflictPerId[]",
|
@@ -2430,14 +2430,14 @@
|
|
2430
2430
|
"__schema": "TypeArraySchema",
|
2431
2431
|
"location": {
|
2432
2432
|
"filePath": "merge-lanes.main.runtime.ts",
|
2433
|
-
"line":
|
2433
|
+
"line": 106,
|
2434
2434
|
"character": 16
|
2435
2435
|
},
|
2436
2436
|
"type": {
|
2437
2437
|
"__schema": "TypeRefSchema",
|
2438
2438
|
"location": {
|
2439
2439
|
"filePath": "merge-lanes.main.runtime.ts",
|
2440
|
-
"line":
|
2440
|
+
"line": 106,
|
2441
2441
|
"character": 16
|
2442
2442
|
},
|
2443
2443
|
"name": "ConflictPerId"
|
@@ -2457,7 +2457,7 @@
|
|
2457
2457
|
"__schema": "FunctionLikeSchema",
|
2458
2458
|
"location": {
|
2459
2459
|
"filePath": "merge-lanes.main.runtime.ts",
|
2460
|
-
"line":
|
2460
|
+
"line": 322,
|
2461
2461
|
"character": 3
|
2462
2462
|
},
|
2463
2463
|
"signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
|
@@ -2467,7 +2467,7 @@
|
|
2467
2467
|
"__schema": "ParameterSchema",
|
2468
2468
|
"location": {
|
2469
2469
|
"filePath": "merge-lanes.main.runtime.ts",
|
2470
|
-
"line":
|
2470
|
+
"line": 322,
|
2471
2471
|
"character": 19
|
2472
2472
|
},
|
2473
2473
|
"name": "newLaneName",
|
@@ -2475,7 +2475,7 @@
|
|
2475
2475
|
"__schema": "KeywordTypeSchema",
|
2476
2476
|
"location": {
|
2477
2477
|
"filePath": "merge-lanes.main.runtime.ts",
|
2478
|
-
"line":
|
2478
|
+
"line": 322,
|
2479
2479
|
"character": 32
|
2480
2480
|
},
|
2481
2481
|
"name": "string"
|
@@ -2487,7 +2487,7 @@
|
|
2487
2487
|
"__schema": "ParameterSchema",
|
2488
2488
|
"location": {
|
2489
2489
|
"filePath": "merge-lanes.main.runtime.ts",
|
2490
|
-
"line":
|
2490
|
+
"line": 322,
|
2491
2491
|
"character": 40
|
2492
2492
|
},
|
2493
2493
|
"name": "options",
|
@@ -2495,7 +2495,7 @@
|
|
2495
2495
|
"__schema": "TypeLiteralSchema",
|
2496
2496
|
"location": {
|
2497
2497
|
"filePath": "merge-lanes.main.runtime.ts",
|
2498
|
-
"line":
|
2498
|
+
"line": 322,
|
2499
2499
|
"character": 49
|
2500
2500
|
},
|
2501
2501
|
"members": [
|
@@ -2503,7 +2503,7 @@
|
|
2503
2503
|
"__schema": "VariableLikeSchema",
|
2504
2504
|
"location": {
|
2505
2505
|
"filePath": "merge-lanes.main.runtime.ts",
|
2506
|
-
"line":
|
2506
|
+
"line": 322,
|
2507
2507
|
"character": 51
|
2508
2508
|
},
|
2509
2509
|
"signature": "(property) scope?: string | undefined",
|
@@ -2512,7 +2512,7 @@
|
|
2512
2512
|
"__schema": "KeywordTypeSchema",
|
2513
2513
|
"location": {
|
2514
2514
|
"filePath": "merge-lanes.main.runtime.ts",
|
2515
|
-
"line":
|
2515
|
+
"line": 322,
|
2516
2516
|
"character": 59
|
2517
2517
|
},
|
2518
2518
|
"name": "string"
|
@@ -2529,7 +2529,7 @@
|
|
2529
2529
|
"__schema": "InferenceTypeSchema",
|
2530
2530
|
"location": {
|
2531
2531
|
"filePath": "merge-lanes.main.runtime.ts",
|
2532
|
-
"line":
|
2532
|
+
"line": 322,
|
2533
2533
|
"character": 3
|
2534
2534
|
},
|
2535
2535
|
"type": "Promise<CreateLaneResult>"
|
@@ -2542,7 +2542,7 @@
|
|
2542
2542
|
"__schema": "FunctionLikeSchema",
|
2543
2543
|
"location": {
|
2544
2544
|
"filePath": "merge-lanes.main.runtime.ts",
|
2545
|
-
"line":
|
2545
|
+
"line": 330,
|
2546
2546
|
"character": 3
|
2547
2547
|
},
|
2548
2548
|
"signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
|
@@ -2552,7 +2552,7 @@
|
|
2552
2552
|
"__schema": "ParameterSchema",
|
2553
2553
|
"location": {
|
2554
2554
|
"filePath": "merge-lanes.main.runtime.ts",
|
2555
|
-
"line":
|
2555
|
+
"line": 330,
|
2556
2556
|
"character": 24
|
2557
2557
|
},
|
2558
2558
|
"name": "checkoutProps",
|
@@ -2560,7 +2560,7 @@
|
|
2560
2560
|
"__schema": "TypeRefSchema",
|
2561
2561
|
"location": {
|
2562
2562
|
"filePath": "merge-lanes.main.runtime.ts",
|
2563
|
-
"line":
|
2563
|
+
"line": 330,
|
2564
2564
|
"character": 39
|
2565
2565
|
},
|
2566
2566
|
"name": "CheckoutProps"
|
@@ -2572,7 +2572,7 @@
|
|
2572
2572
|
"__schema": "ParameterSchema",
|
2573
2573
|
"location": {
|
2574
2574
|
"filePath": "merge-lanes.main.runtime.ts",
|
2575
|
-
"line":
|
2575
|
+
"line": 330,
|
2576
2576
|
"character": 54
|
2577
2577
|
},
|
2578
2578
|
"name": "mergeAbortOpts",
|
@@ -2580,7 +2580,7 @@
|
|
2580
2580
|
"__schema": "TypeRefSchema",
|
2581
2581
|
"location": {
|
2582
2582
|
"filePath": "merge-lanes.main.runtime.ts",
|
2583
|
-
"line":
|
2583
|
+
"line": 330,
|
2584
2584
|
"character": 70
|
2585
2585
|
},
|
2586
2586
|
"name": "MergeAbortOpts"
|
@@ -2593,7 +2593,7 @@
|
|
2593
2593
|
"__schema": "InferenceTypeSchema",
|
2594
2594
|
"location": {
|
2595
2595
|
"filePath": "merge-lanes.main.runtime.ts",
|
2596
|
-
"line":
|
2596
|
+
"line": 330,
|
2597
2597
|
"character": 3
|
2598
2598
|
},
|
2599
2599
|
"type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
|
@@ -2606,7 +2606,7 @@
|
|
2606
2606
|
"__schema": "FunctionLikeSchema",
|
2607
2607
|
"location": {
|
2608
2608
|
"filePath": "merge-lanes.main.runtime.ts",
|
2609
|
-
"line":
|
2609
|
+
"line": 386,
|
2610
2610
|
"character": 3
|
2611
2611
|
},
|
2612
2612
|
"signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
|
@@ -2616,7 +2616,7 @@
|
|
2616
2616
|
"__schema": "ParameterSchema",
|
2617
2617
|
"location": {
|
2618
2618
|
"filePath": "merge-lanes.main.runtime.ts",
|
2619
|
-
"line":
|
2619
|
+
"line": 387,
|
2620
2620
|
"character": 5
|
2621
2621
|
},
|
2622
2622
|
"name": "fromLane",
|
@@ -2624,7 +2624,7 @@
|
|
2624
2624
|
"__schema": "KeywordTypeSchema",
|
2625
2625
|
"location": {
|
2626
2626
|
"filePath": "merge-lanes.main.runtime.ts",
|
2627
|
-
"line":
|
2627
|
+
"line": 387,
|
2628
2628
|
"character": 15
|
2629
2629
|
},
|
2630
2630
|
"name": "string"
|
@@ -2636,7 +2636,7 @@
|
|
2636
2636
|
"__schema": "ParameterSchema",
|
2637
2637
|
"location": {
|
2638
2638
|
"filePath": "merge-lanes.main.runtime.ts",
|
2639
|
-
"line":
|
2639
|
+
"line": 388,
|
2640
2640
|
"character": 5
|
2641
2641
|
},
|
2642
2642
|
"name": "toLane",
|
@@ -2644,7 +2644,7 @@
|
|
2644
2644
|
"__schema": "KeywordTypeSchema",
|
2645
2645
|
"location": {
|
2646
2646
|
"filePath": "merge-lanes.main.runtime.ts",
|
2647
|
-
"line":
|
2647
|
+
"line": 388,
|
2648
2648
|
"character": 13
|
2649
2649
|
},
|
2650
2650
|
"name": "string"
|
@@ -2656,7 +2656,7 @@
|
|
2656
2656
|
"__schema": "ParameterSchema",
|
2657
2657
|
"location": {
|
2658
2658
|
"filePath": "merge-lanes.main.runtime.ts",
|
2659
|
-
"line":
|
2659
|
+
"line": 389,
|
2660
2660
|
"character": 5
|
2661
2661
|
},
|
2662
2662
|
"name": "options",
|
@@ -2664,7 +2664,7 @@
|
|
2664
2664
|
"__schema": "TypeIntersectionSchema",
|
2665
2665
|
"location": {
|
2666
2666
|
"filePath": "merge-lanes.main.runtime.ts",
|
2667
|
-
"line":
|
2667
|
+
"line": 389,
|
2668
2668
|
"character": 14
|
2669
2669
|
},
|
2670
2670
|
"types": [
|
@@ -2672,7 +2672,7 @@
|
|
2672
2672
|
"__schema": "TypeRefSchema",
|
2673
2673
|
"location": {
|
2674
2674
|
"filePath": "merge-lanes.main.runtime.ts",
|
2675
|
-
"line":
|
2675
|
+
"line": 389,
|
2676
2676
|
"character": 14
|
2677
2677
|
},
|
2678
2678
|
"name": "Partial",
|
@@ -2681,7 +2681,7 @@
|
|
2681
2681
|
"__schema": "TypeRefSchema",
|
2682
2682
|
"location": {
|
2683
2683
|
"filePath": "merge-lanes.main.runtime.ts",
|
2684
|
-
"line":
|
2684
|
+
"line": 389,
|
2685
2685
|
"character": 22
|
2686
2686
|
},
|
2687
2687
|
"name": "MergeLaneOptions"
|
@@ -2692,7 +2692,7 @@
|
|
2692
2692
|
"__schema": "TypeLiteralSchema",
|
2693
2693
|
"location": {
|
2694
2694
|
"filePath": "merge-lanes.main.runtime.ts",
|
2695
|
-
"line":
|
2695
|
+
"line": 389,
|
2696
2696
|
"character": 42
|
2697
2697
|
},
|
2698
2698
|
"members": [
|
@@ -2700,7 +2700,7 @@
|
|
2700
2700
|
"__schema": "VariableLikeSchema",
|
2701
2701
|
"location": {
|
2702
2702
|
"filePath": "merge-lanes.main.runtime.ts",
|
2703
|
-
"line":
|
2703
|
+
"line": 389,
|
2704
2704
|
"character": 44
|
2705
2705
|
},
|
2706
2706
|
"signature": "(property) push?: boolean | undefined",
|
@@ -2709,7 +2709,7 @@
|
|
2709
2709
|
"__schema": "KeywordTypeSchema",
|
2710
2710
|
"location": {
|
2711
2711
|
"filePath": "merge-lanes.main.runtime.ts",
|
2712
|
-
"line":
|
2712
|
+
"line": 389,
|
2713
2713
|
"character": 51
|
2714
2714
|
},
|
2715
2715
|
"name": "boolean"
|
@@ -2720,7 +2720,7 @@
|
|
2720
2720
|
"__schema": "VariableLikeSchema",
|
2721
2721
|
"location": {
|
2722
2722
|
"filePath": "merge-lanes.main.runtime.ts",
|
2723
|
-
"line":
|
2723
|
+
"line": 389,
|
2724
2724
|
"character": 60
|
2725
2725
|
},
|
2726
2726
|
"signature": "(property) reMerge?: boolean | undefined",
|
@@ -2729,7 +2729,7 @@
|
|
2729
2729
|
"__schema": "KeywordTypeSchema",
|
2730
2730
|
"location": {
|
2731
2731
|
"filePath": "merge-lanes.main.runtime.ts",
|
2732
|
-
"line":
|
2732
|
+
"line": 389,
|
2733
2733
|
"character": 70
|
2734
2734
|
},
|
2735
2735
|
"name": "boolean"
|
@@ -2748,7 +2748,7 @@
|
|
2748
2748
|
"__schema": "TypeRefSchema",
|
2749
2749
|
"location": {
|
2750
2750
|
"filePath": "merge-lanes.main.runtime.ts",
|
2751
|
-
"line":
|
2751
|
+
"line": 390,
|
2752
2752
|
"character": 6
|
2753
2753
|
},
|
2754
2754
|
"name": "Promise",
|
@@ -2757,7 +2757,7 @@
|
|
2757
2757
|
"__schema": "TypeRefSchema",
|
2758
2758
|
"location": {
|
2759
2759
|
"filePath": "merge-lanes.main.runtime.ts",
|
2760
|
-
"line":
|
2760
|
+
"line": 390,
|
2761
2761
|
"character": 14
|
2762
2762
|
},
|
2763
2763
|
"name": "MergeFromScopeResult"
|
@@ -2772,7 +2772,7 @@
|
|
2772
2772
|
"__schema": "VariableLikeSchema",
|
2773
2773
|
"location": {
|
2774
2774
|
"filePath": "merge-lanes.main.runtime.ts",
|
2775
|
-
"line":
|
2775
|
+
"line": 483,
|
2776
2776
|
"character": 3
|
2777
2777
|
},
|
2778
2778
|
"signature": "(property) MergeLanesMain.slots: never[]",
|
@@ -2781,7 +2781,7 @@
|
|
2781
2781
|
"__schema": "InferenceTypeSchema",
|
2782
2782
|
"location": {
|
2783
2783
|
"filePath": "merge-lanes.main.runtime.ts",
|
2784
|
-
"line":
|
2784
|
+
"line": 483,
|
2785
2785
|
"character": 3
|
2786
2786
|
},
|
2787
2787
|
"type": "never[]"
|
@@ -2793,7 +2793,7 @@
|
|
2793
2793
|
"__schema": "VariableLikeSchema",
|
2794
2794
|
"location": {
|
2795
2795
|
"filePath": "merge-lanes.main.runtime.ts",
|
2796
|
-
"line":
|
2796
|
+
"line": 484,
|
2797
2797
|
"character": 3
|
2798
2798
|
},
|
2799
2799
|
"signature": "(property) MergeLanesMain.dependencies: Aspect[]",
|
@@ -2802,7 +2802,7 @@
|
|
2802
2802
|
"__schema": "InferenceTypeSchema",
|
2803
2803
|
"location": {
|
2804
2804
|
"filePath": "merge-lanes.main.runtime.ts",
|
2805
|
-
"line":
|
2805
|
+
"line": 484,
|
2806
2806
|
"character": 3
|
2807
2807
|
},
|
2808
2808
|
"type": "Aspect[]"
|
@@ -2814,7 +2814,7 @@
|
|
2814
2814
|
"__schema": "VariableLikeSchema",
|
2815
2815
|
"location": {
|
2816
2816
|
"filePath": "merge-lanes.main.runtime.ts",
|
2817
|
-
"line":
|
2817
|
+
"line": 497,
|
2818
2818
|
"character": 3
|
2819
2819
|
},
|
2820
2820
|
"signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
|
@@ -2823,7 +2823,7 @@
|
|
2823
2823
|
"__schema": "InferenceTypeSchema",
|
2824
2824
|
"location": {
|
2825
2825
|
"filePath": "merge-lanes.main.runtime.ts",
|
2826
|
-
"line":
|
2826
|
+
"line": 497,
|
2827
2827
|
"character": 3
|
2828
2828
|
},
|
2829
2829
|
"type": "RuntimeDefinition"
|
@@ -2835,7 +2835,7 @@
|
|
2835
2835
|
"__schema": "FunctionLikeSchema",
|
2836
2836
|
"location": {
|
2837
2837
|
"filePath": "merge-lanes.main.runtime.ts",
|
2838
|
-
"line":
|
2838
|
+
"line": 499,
|
2839
2839
|
"character": 3
|
2840
2840
|
},
|
2841
2841
|
"signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n]): Promise<MergeLanesMain>",
|
@@ -2845,7 +2845,7 @@
|
|
2845
2845
|
"__schema": "ParameterSchema",
|
2846
2846
|
"location": {
|
2847
2847
|
"filePath": "merge-lanes.main.runtime.ts",
|
2848
|
-
"line":
|
2848
|
+
"line": 499,
|
2849
2849
|
"character": 25
|
2850
2850
|
},
|
2851
2851
|
"name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
|
@@ -2853,7 +2853,7 @@
|
|
2853
2853
|
"__schema": "TupleTypeSchema",
|
2854
2854
|
"location": {
|
2855
2855
|
"filePath": "merge-lanes.main.runtime.ts",
|
2856
|
-
"line":
|
2856
|
+
"line": 511,
|
2857
2857
|
"character": 6
|
2858
2858
|
},
|
2859
2859
|
"elements": [
|
@@ -2861,7 +2861,7 @@
|
|
2861
2861
|
"__schema": "TypeRefSchema",
|
2862
2862
|
"location": {
|
2863
2863
|
"filePath": "merge-lanes.main.runtime.ts",
|
2864
|
-
"line":
|
2864
|
+
"line": 512,
|
2865
2865
|
"character": 5
|
2866
2866
|
},
|
2867
2867
|
"name": "LanesMain"
|
@@ -2870,7 +2870,7 @@
|
|
2870
2870
|
"__schema": "TypeRefSchema",
|
2871
2871
|
"location": {
|
2872
2872
|
"filePath": "merge-lanes.main.runtime.ts",
|
2873
|
-
"line":
|
2873
|
+
"line": 513,
|
2874
2874
|
"character": 5
|
2875
2875
|
},
|
2876
2876
|
"name": "CLIMain"
|
@@ -2879,7 +2879,7 @@
|
|
2879
2879
|
"__schema": "TypeRefSchema",
|
2880
2880
|
"location": {
|
2881
2881
|
"filePath": "merge-lanes.main.runtime.ts",
|
2882
|
-
"line":
|
2882
|
+
"line": 514,
|
2883
2883
|
"character": 5
|
2884
2884
|
},
|
2885
2885
|
"name": "Workspace"
|
@@ -2888,7 +2888,7 @@
|
|
2888
2888
|
"__schema": "TypeRefSchema",
|
2889
2889
|
"location": {
|
2890
2890
|
"filePath": "merge-lanes.main.runtime.ts",
|
2891
|
-
"line":
|
2891
|
+
"line": 515,
|
2892
2892
|
"character": 5
|
2893
2893
|
},
|
2894
2894
|
"name": "MergingMain"
|
@@ -2897,7 +2897,7 @@
|
|
2897
2897
|
"__schema": "TypeRefSchema",
|
2898
2898
|
"location": {
|
2899
2899
|
"filePath": "merge-lanes.main.runtime.ts",
|
2900
|
-
"line":
|
2900
|
+
"line": 516,
|
2901
2901
|
"character": 5
|
2902
2902
|
},
|
2903
2903
|
"name": "LoggerMain"
|
@@ -2906,7 +2906,7 @@
|
|
2906
2906
|
"__schema": "TypeRefSchema",
|
2907
2907
|
"location": {
|
2908
2908
|
"filePath": "merge-lanes.main.runtime.ts",
|
2909
|
-
"line":
|
2909
|
+
"line": 517,
|
2910
2910
|
"character": 5
|
2911
2911
|
},
|
2912
2912
|
"name": "RemoveMain"
|
@@ -2915,7 +2915,7 @@
|
|
2915
2915
|
"__schema": "TypeRefSchema",
|
2916
2916
|
"location": {
|
2917
2917
|
"filePath": "merge-lanes.main.runtime.ts",
|
2918
|
-
"line":
|
2918
|
+
"line": 518,
|
2919
2919
|
"character": 5
|
2920
2920
|
},
|
2921
2921
|
"name": "ScopeMain"
|
@@ -2924,7 +2924,7 @@
|
|
2924
2924
|
"__schema": "TypeRefSchema",
|
2925
2925
|
"location": {
|
2926
2926
|
"filePath": "merge-lanes.main.runtime.ts",
|
2927
|
-
"line":
|
2927
|
+
"line": 519,
|
2928
2928
|
"character": 5
|
2929
2929
|
},
|
2930
2930
|
"name": "ExportMain"
|
@@ -2933,7 +2933,7 @@
|
|
2933
2933
|
"__schema": "TypeRefSchema",
|
2934
2934
|
"location": {
|
2935
2935
|
"filePath": "merge-lanes.main.runtime.ts",
|
2936
|
-
"line":
|
2936
|
+
"line": 520,
|
2937
2937
|
"character": 5
|
2938
2938
|
},
|
2939
2939
|
"name": "ImporterMain"
|
@@ -2942,7 +2942,7 @@
|
|
2942
2942
|
"__schema": "TypeRefSchema",
|
2943
2943
|
"location": {
|
2944
2944
|
"filePath": "merge-lanes.main.runtime.ts",
|
2945
|
-
"line":
|
2945
|
+
"line": 521,
|
2946
2946
|
"character": 5
|
2947
2947
|
},
|
2948
2948
|
"name": "CheckoutMain"
|
@@ -2951,7 +2951,7 @@
|
|
2951
2951
|
"__schema": "TypeRefSchema",
|
2952
2952
|
"location": {
|
2953
2953
|
"filePath": "merge-lanes.main.runtime.ts",
|
2954
|
-
"line":
|
2954
|
+
"line": 522,
|
2955
2955
|
"character": 5
|
2956
2956
|
},
|
2957
2957
|
"name": "GlobalConfigMain"
|
@@ -2966,7 +2966,7 @@
|
|
2966
2966
|
"__schema": "InferenceTypeSchema",
|
2967
2967
|
"location": {
|
2968
2968
|
"filePath": "merge-lanes.main.runtime.ts",
|
2969
|
-
"line":
|
2969
|
+
"line": 499,
|
2970
2970
|
"character": 3
|
2971
2971
|
},
|
2972
2972
|
"type": "Promise<MergeLanesMain>"
|
@@ -2984,7 +2984,7 @@
|
|
2984
2984
|
"__schema": "UnImplementedSchema",
|
2985
2985
|
"location": {
|
2986
2986
|
"filePath": "merge-lanes.main.runtime.ts",
|
2987
|
-
"line":
|
2987
|
+
"line": 794,
|
2988
2988
|
"character": 16
|
2989
2989
|
},
|
2990
2990
|
"name": "MergeLanesMain",
|
@@ -2996,7 +2996,7 @@
|
|
2996
2996
|
"__schema": "FunctionLikeSchema",
|
2997
2997
|
"location": {
|
2998
2998
|
"filePath": "merge-lanes.main.runtime.ts",
|
2999
|
-
"line":
|
2999
|
+
"line": 545,
|
3000
3000
|
"character": 1
|
3001
3001
|
},
|
3002
3002
|
"signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
|
@@ -3006,7 +3006,7 @@
|
|
3006
3006
|
"__schema": "ParameterSchema",
|
3007
3007
|
"location": {
|
3008
3008
|
"filePath": "merge-lanes.main.runtime.ts",
|
3009
|
-
"line":
|
3009
|
+
"line": 546,
|
3010
3010
|
"character": 3
|
3011
3011
|
},
|
3012
3012
|
"name": "allComponentsStatus",
|
@@ -3014,14 +3014,14 @@
|
|
3014
3014
|
"__schema": "TypeArraySchema",
|
3015
3015
|
"location": {
|
3016
3016
|
"filePath": "merge-lanes.main.runtime.ts",
|
3017
|
-
"line":
|
3017
|
+
"line": 546,
|
3018
3018
|
"character": 24
|
3019
3019
|
},
|
3020
3020
|
"type": {
|
3021
3021
|
"__schema": "TypeRefSchema",
|
3022
3022
|
"location": {
|
3023
3023
|
"filePath": "merge-lanes.main.runtime.ts",
|
3024
|
-
"line":
|
3024
|
+
"line": 546,
|
3025
3025
|
"character": 24
|
3026
3026
|
},
|
3027
3027
|
"name": "ComponentMergeStatus"
|
@@ -3034,7 +3034,7 @@
|
|
3034
3034
|
"__schema": "ParameterSchema",
|
3035
3035
|
"location": {
|
3036
3036
|
"filePath": "merge-lanes.main.runtime.ts",
|
3037
|
-
"line":
|
3037
|
+
"line": 547,
|
3038
3038
|
"character": 3
|
3039
3039
|
},
|
3040
3040
|
"name": "compIdsToKeep",
|
@@ -3042,14 +3042,14 @@
|
|
3042
3042
|
"__schema": "TypeArraySchema",
|
3043
3043
|
"location": {
|
3044
3044
|
"filePath": "merge-lanes.main.runtime.ts",
|
3045
|
-
"line":
|
3045
|
+
"line": 547,
|
3046
3046
|
"character": 18
|
3047
3047
|
},
|
3048
3048
|
"type": {
|
3049
3049
|
"__schema": "TypeRefSchema",
|
3050
3050
|
"location": {
|
3051
3051
|
"filePath": "merge-lanes.main.runtime.ts",
|
3052
|
-
"line":
|
3052
|
+
"line": 547,
|
3053
3053
|
"character": 18
|
3054
3054
|
},
|
3055
3055
|
"name": "ComponentID"
|
@@ -3062,7 +3062,7 @@
|
|
3062
3062
|
"__schema": "ParameterSchema",
|
3063
3063
|
"location": {
|
3064
3064
|
"filePath": "merge-lanes.main.runtime.ts",
|
3065
|
-
"line":
|
3065
|
+
"line": 548,
|
3066
3066
|
"character": 3
|
3067
3067
|
},
|
3068
3068
|
"name": "allBitIds",
|
@@ -3070,14 +3070,14 @@
|
|
3070
3070
|
"__schema": "TypeArraySchema",
|
3071
3071
|
"location": {
|
3072
3072
|
"filePath": "merge-lanes.main.runtime.ts",
|
3073
|
-
"line":
|
3073
|
+
"line": 548,
|
3074
3074
|
"character": 14
|
3075
3075
|
},
|
3076
3076
|
"type": {
|
3077
3077
|
"__schema": "TypeRefSchema",
|
3078
3078
|
"location": {
|
3079
3079
|
"filePath": "merge-lanes.main.runtime.ts",
|
3080
|
-
"line":
|
3080
|
+
"line": 548,
|
3081
3081
|
"character": 14
|
3082
3082
|
},
|
3083
3083
|
"name": "ComponentID"
|
@@ -3090,7 +3090,7 @@
|
|
3090
3090
|
"__schema": "ParameterSchema",
|
3091
3091
|
"location": {
|
3092
3092
|
"filePath": "merge-lanes.main.runtime.ts",
|
3093
|
-
"line":
|
3093
|
+
"line": 549,
|
3094
3094
|
"character": 3
|
3095
3095
|
},
|
3096
3096
|
"name": "legacyScope",
|
@@ -3098,7 +3098,7 @@
|
|
3098
3098
|
"__schema": "TypeRefSchema",
|
3099
3099
|
"location": {
|
3100
3100
|
"filePath": "merge-lanes.main.runtime.ts",
|
3101
|
-
"line":
|
3101
|
+
"line": 549,
|
3102
3102
|
"character": 16
|
3103
3103
|
},
|
3104
3104
|
"name": "LegacyScope"
|
@@ -3110,7 +3110,7 @@
|
|
3110
3110
|
"__schema": "ParameterSchema",
|
3111
3111
|
"location": {
|
3112
3112
|
"filePath": "merge-lanes.main.runtime.ts",
|
3113
|
-
"line":
|
3113
|
+
"line": 550,
|
3114
3114
|
"character": 3
|
3115
3115
|
},
|
3116
3116
|
"name": "includeDeps",
|
@@ -3118,7 +3118,7 @@
|
|
3118
3118
|
"__schema": "InferenceTypeSchema",
|
3119
3119
|
"location": {
|
3120
3120
|
"filePath": "merge-lanes.main.runtime.ts",
|
3121
|
-
"line":
|
3121
|
+
"line": 550,
|
3122
3122
|
"character": 3
|
3123
3123
|
},
|
3124
3124
|
"type": "boolean"
|
@@ -3131,7 +3131,7 @@
|
|
3131
3131
|
"__schema": "ParameterSchema",
|
3132
3132
|
"location": {
|
3133
3133
|
"filePath": "merge-lanes.main.runtime.ts",
|
3134
|
-
"line":
|
3134
|
+
"line": 551,
|
3135
3135
|
"character": 3
|
3136
3136
|
},
|
3137
3137
|
"name": "otherLane",
|
@@ -3139,7 +3139,7 @@
|
|
3139
3139
|
"__schema": "TypeRefSchema",
|
3140
3140
|
"location": {
|
3141
3141
|
"filePath": "merge-lanes.main.runtime.ts",
|
3142
|
-
"line":
|
3142
|
+
"line": 551,
|
3143
3143
|
"character": 15
|
3144
3144
|
},
|
3145
3145
|
"name": "Lane"
|
@@ -3151,7 +3151,7 @@
|
|
3151
3151
|
"__schema": "ParameterSchema",
|
3152
3152
|
"location": {
|
3153
3153
|
"filePath": "merge-lanes.main.runtime.ts",
|
3154
|
-
"line":
|
3154
|
+
"line": 552,
|
3155
3155
|
"character": 3
|
3156
3156
|
},
|
3157
3157
|
"name": "shouldSquash",
|
@@ -3159,7 +3159,7 @@
|
|
3159
3159
|
"__schema": "KeywordTypeSchema",
|
3160
3160
|
"location": {
|
3161
3161
|
"filePath": "merge-lanes.main.runtime.ts",
|
3162
|
-
"line":
|
3162
|
+
"line": 552,
|
3163
3163
|
"character": 18
|
3164
3164
|
},
|
3165
3165
|
"name": "boolean"
|
@@ -3172,7 +3172,7 @@
|
|
3172
3172
|
"__schema": "TypeRefSchema",
|
3173
3173
|
"location": {
|
3174
3174
|
"filePath": "merge-lanes.main.runtime.ts",
|
3175
|
-
"line":
|
3175
|
+
"line": 553,
|
3176
3176
|
"character": 4
|
3177
3177
|
},
|
3178
3178
|
"name": "Promise",
|
@@ -3181,14 +3181,14 @@
|
|
3181
3181
|
"__schema": "TypeArraySchema",
|
3182
3182
|
"location": {
|
3183
3183
|
"filePath": "merge-lanes.main.runtime.ts",
|
3184
|
-
"line":
|
3184
|
+
"line": 553,
|
3185
3185
|
"character": 12
|
3186
3186
|
},
|
3187
3187
|
"type": {
|
3188
3188
|
"__schema": "TypeRefSchema",
|
3189
3189
|
"location": {
|
3190
3190
|
"filePath": "merge-lanes.main.runtime.ts",
|
3191
|
-
"line":
|
3191
|
+
"line": 553,
|
3192
3192
|
"character": 12
|
3193
3193
|
},
|
3194
3194
|
"name": "ComponentMergeStatus"
|
@@ -3204,7 +3204,7 @@
|
|
3204
3204
|
"__schema": "FunctionLikeSchema",
|
3205
3205
|
"location": {
|
3206
3206
|
"filePath": "merge-lanes.main.runtime.ts",
|
3207
|
-
"line":
|
3207
|
+
"line": 662,
|
3208
3208
|
"character": 1
|
3209
3209
|
},
|
3210
3210
|
"signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
|
@@ -3214,7 +3214,7 @@
|
|
3214
3214
|
"__schema": "ParameterSchema",
|
3215
3215
|
"location": {
|
3216
3216
|
"filePath": "merge-lanes.main.runtime.ts",
|
3217
|
-
"line":
|
3217
|
+
"line": 662,
|
3218
3218
|
"character": 32
|
3219
3219
|
},
|
3220
3220
|
"name": "otherLaneId",
|
@@ -3222,7 +3222,7 @@
|
|
3222
3222
|
"__schema": "TypeRefSchema",
|
3223
3223
|
"location": {
|
3224
3224
|
"filePath": "merge-lanes.main.runtime.ts",
|
3225
|
-
"line":
|
3225
|
+
"line": 662,
|
3226
3226
|
"character": 45
|
3227
3227
|
},
|
3228
3228
|
"name": "LaneId"
|
@@ -3235,7 +3235,7 @@
|
|
3235
3235
|
"__schema": "InferenceTypeSchema",
|
3236
3236
|
"location": {
|
3237
3237
|
"filePath": "merge-lanes.main.runtime.ts",
|
3238
|
-
"line":
|
3238
|
+
"line": 662,
|
3239
3239
|
"character": 1
|
3240
3240
|
},
|
3241
3241
|
"type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
|
@@ -3248,7 +3248,7 @@
|
|
3248
3248
|
"__schema": "FunctionLikeSchema",
|
3249
3249
|
"location": {
|
3250
3250
|
"filePath": "merge-lanes.main.runtime.ts",
|
3251
|
-
"line":
|
3251
|
+
"line": 671,
|
3252
3252
|
"character": 1
|
3253
3253
|
},
|
3254
3254
|
"signature": "function squashSnaps(succeededComponents: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
|
@@ -3258,7 +3258,7 @@
|
|
3258
3258
|
"__schema": "ParameterSchema",
|
3259
3259
|
"location": {
|
3260
3260
|
"filePath": "merge-lanes.main.runtime.ts",
|
3261
|
-
"line":
|
3261
|
+
"line": 672,
|
3262
3262
|
"character": 3
|
3263
3263
|
},
|
3264
3264
|
"name": "succeededComponents",
|
@@ -3266,14 +3266,14 @@
|
|
3266
3266
|
"__schema": "TypeArraySchema",
|
3267
3267
|
"location": {
|
3268
3268
|
"filePath": "merge-lanes.main.runtime.ts",
|
3269
|
-
"line":
|
3269
|
+
"line": 672,
|
3270
3270
|
"character": 24
|
3271
3271
|
},
|
3272
3272
|
"type": {
|
3273
3273
|
"__schema": "TypeRefSchema",
|
3274
3274
|
"location": {
|
3275
3275
|
"filePath": "merge-lanes.main.runtime.ts",
|
3276
|
-
"line":
|
3276
|
+
"line": 672,
|
3277
3277
|
"character": 24
|
3278
3278
|
},
|
3279
3279
|
"name": "ComponentMergeStatus"
|
@@ -3286,7 +3286,7 @@
|
|
3286
3286
|
"__schema": "ParameterSchema",
|
3287
3287
|
"location": {
|
3288
3288
|
"filePath": "merge-lanes.main.runtime.ts",
|
3289
|
-
"line":
|
3289
|
+
"line": 673,
|
3290
3290
|
"character": 3
|
3291
3291
|
},
|
3292
3292
|
"name": "currentLaneId",
|
@@ -3294,7 +3294,7 @@
|
|
3294
3294
|
"__schema": "TypeRefSchema",
|
3295
3295
|
"location": {
|
3296
3296
|
"filePath": "merge-lanes.main.runtime.ts",
|
3297
|
-
"line":
|
3297
|
+
"line": 673,
|
3298
3298
|
"character": 18
|
3299
3299
|
},
|
3300
3300
|
"name": "LaneId"
|
@@ -3306,7 +3306,7 @@
|
|
3306
3306
|
"__schema": "ParameterSchema",
|
3307
3307
|
"location": {
|
3308
3308
|
"filePath": "merge-lanes.main.runtime.ts",
|
3309
|
-
"line":
|
3309
|
+
"line": 674,
|
3310
3310
|
"character": 3
|
3311
3311
|
},
|
3312
3312
|
"name": "otherLaneId",
|
@@ -3314,7 +3314,7 @@
|
|
3314
3314
|
"__schema": "TypeRefSchema",
|
3315
3315
|
"location": {
|
3316
3316
|
"filePath": "merge-lanes.main.runtime.ts",
|
3317
|
-
"line":
|
3317
|
+
"line": 674,
|
3318
3318
|
"character": 16
|
3319
3319
|
},
|
3320
3320
|
"name": "LaneId"
|
@@ -3326,7 +3326,7 @@
|
|
3326
3326
|
"__schema": "ParameterSchema",
|
3327
3327
|
"location": {
|
3328
3328
|
"filePath": "merge-lanes.main.runtime.ts",
|
3329
|
-
"line":
|
3329
|
+
"line": 675,
|
3330
3330
|
"character": 3
|
3331
3331
|
},
|
3332
3332
|
"name": "scope",
|
@@ -3334,7 +3334,7 @@
|
|
3334
3334
|
"__schema": "TypeRefSchema",
|
3335
3335
|
"location": {
|
3336
3336
|
"filePath": "merge-lanes.main.runtime.ts",
|
3337
|
-
"line":
|
3337
|
+
"line": 675,
|
3338
3338
|
"character": 10
|
3339
3339
|
},
|
3340
3340
|
"name": "LegacyScope"
|
@@ -3346,7 +3346,7 @@
|
|
3346
3346
|
"__schema": "ParameterSchema",
|
3347
3347
|
"location": {
|
3348
3348
|
"filePath": "merge-lanes.main.runtime.ts",
|
3349
|
-
"line":
|
3349
|
+
"line": 676,
|
3350
3350
|
"character": 3
|
3351
3351
|
},
|
3352
3352
|
"name": "messageTitle",
|
@@ -3354,7 +3354,7 @@
|
|
3354
3354
|
"__schema": "KeywordTypeSchema",
|
3355
3355
|
"location": {
|
3356
3356
|
"filePath": "merge-lanes.main.runtime.ts",
|
3357
|
-
"line":
|
3357
|
+
"line": 676,
|
3358
3358
|
"character": 18
|
3359
3359
|
},
|
3360
3360
|
"name": "string"
|
@@ -3367,7 +3367,7 @@
|
|
3367
3367
|
"__schema": "InferenceTypeSchema",
|
3368
3368
|
"location": {
|
3369
3369
|
"filePath": "merge-lanes.main.runtime.ts",
|
3370
|
-
"line":
|
3370
|
+
"line": 671,
|
3371
3371
|
"character": 1
|
3372
3372
|
},
|
3373
3373
|
"type": "Promise<void>"
|
@@ -3380,14 +3380,14 @@
|
|
3380
3380
|
"__schema": "FunctionLikeSchema",
|
3381
3381
|
"location": {
|
3382
3382
|
"filePath": "merge-lanes.main.runtime.ts",
|
3383
|
-
"line":
|
3383
|
+
"line": 710,
|
3384
3384
|
"character": 1
|
3385
3385
|
},
|
3386
3386
|
"doc": {
|
3387
3387
|
"__schema": "DocSchema",
|
3388
3388
|
"location": {
|
3389
3389
|
"filePath": "merge-lanes.main.runtime.ts",
|
3390
|
-
"line":
|
3390
|
+
"line": 707,
|
3391
3391
|
"character": 1
|
3392
3392
|
},
|
3393
3393
|
"raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
|
@@ -3401,7 +3401,7 @@
|
|
3401
3401
|
"__schema": "ParameterSchema",
|
3402
3402
|
"location": {
|
3403
3403
|
"filePath": "merge-lanes.main.runtime.ts",
|
3404
|
-
"line":
|
3404
|
+
"line": 711,
|
3405
3405
|
"character": 3
|
3406
3406
|
},
|
3407
3407
|
"name": "currentLaneName",
|
@@ -3409,7 +3409,7 @@
|
|
3409
3409
|
"__schema": "KeywordTypeSchema",
|
3410
3410
|
"location": {
|
3411
3411
|
"filePath": "merge-lanes.main.runtime.ts",
|
3412
|
-
"line":
|
3412
|
+
"line": 711,
|
3413
3413
|
"character": 20
|
3414
3414
|
},
|
3415
3415
|
"name": "string"
|
@@ -3421,7 +3421,7 @@
|
|
3421
3421
|
"__schema": "ParameterSchema",
|
3422
3422
|
"location": {
|
3423
3423
|
"filePath": "merge-lanes.main.runtime.ts",
|
3424
|
-
"line":
|
3424
|
+
"line": 712,
|
3425
3425
|
"character": 3
|
3426
3426
|
},
|
3427
3427
|
"name": "otherLaneId",
|
@@ -3429,7 +3429,7 @@
|
|
3429
3429
|
"__schema": "TypeRefSchema",
|
3430
3430
|
"location": {
|
3431
3431
|
"filePath": "merge-lanes.main.runtime.ts",
|
3432
|
-
"line":
|
3432
|
+
"line": 712,
|
3433
3433
|
"character": 16
|
3434
3434
|
},
|
3435
3435
|
"name": "LaneId"
|
@@ -3441,7 +3441,7 @@
|
|
3441
3441
|
"__schema": "ParameterSchema",
|
3442
3442
|
"location": {
|
3443
3443
|
"filePath": "merge-lanes.main.runtime.ts",
|
3444
|
-
"line":
|
3444
|
+
"line": 713,
|
3445
3445
|
"character": 3
|
3446
3446
|
},
|
3447
3447
|
"name": "id",
|
@@ -3449,7 +3449,7 @@
|
|
3449
3449
|
"__schema": "TypeRefSchema",
|
3450
3450
|
"location": {
|
3451
3451
|
"filePath": "merge-lanes.main.runtime.ts",
|
3452
|
-
"line":
|
3452
|
+
"line": 713,
|
3453
3453
|
"character": 7
|
3454
3454
|
},
|
3455
3455
|
"name": "ComponentID"
|
@@ -3461,7 +3461,7 @@
|
|
3461
3461
|
"__schema": "ParameterSchema",
|
3462
3462
|
"location": {
|
3463
3463
|
"filePath": "merge-lanes.main.runtime.ts",
|
3464
|
-
"line":
|
3464
|
+
"line": 714,
|
3465
3465
|
"character": 3
|
3466
3466
|
},
|
3467
3467
|
"name": "divergeData",
|
@@ -3469,7 +3469,7 @@
|
|
3469
3469
|
"__schema": "TypeRefSchema",
|
3470
3470
|
"location": {
|
3471
3471
|
"filePath": "merge-lanes.main.runtime.ts",
|
3472
|
-
"line":
|
3472
|
+
"line": 714,
|
3473
3473
|
"character": 16
|
3474
3474
|
},
|
3475
3475
|
"name": "SnapsDistance"
|
@@ -3481,7 +3481,7 @@
|
|
3481
3481
|
"__schema": "ParameterSchema",
|
3482
3482
|
"location": {
|
3483
3483
|
"filePath": "merge-lanes.main.runtime.ts",
|
3484
|
-
"line":
|
3484
|
+
"line": 715,
|
3485
3485
|
"character": 3
|
3486
3486
|
},
|
3487
3487
|
"name": "log",
|
@@ -3489,7 +3489,7 @@
|
|
3489
3489
|
"__schema": "TypeRefSchema",
|
3490
3490
|
"location": {
|
3491
3491
|
"filePath": "merge-lanes.main.runtime.ts",
|
3492
|
-
"line":
|
3492
|
+
"line": 715,
|
3493
3493
|
"character": 8
|
3494
3494
|
},
|
3495
3495
|
"name": "Log"
|
@@ -3501,7 +3501,7 @@
|
|
3501
3501
|
"__schema": "ParameterSchema",
|
3502
3502
|
"location": {
|
3503
3503
|
"filePath": "merge-lanes.main.runtime.ts",
|
3504
|
-
"line":
|
3504
|
+
"line": 716,
|
3505
3505
|
"character": 3
|
3506
3506
|
},
|
3507
3507
|
"name": "scope",
|
@@ -3509,7 +3509,7 @@
|
|
3509
3509
|
"__schema": "TypeRefSchema",
|
3510
3510
|
"location": {
|
3511
3511
|
"filePath": "merge-lanes.main.runtime.ts",
|
3512
|
-
"line":
|
3512
|
+
"line": 716,
|
3513
3513
|
"character": 10
|
3514
3514
|
},
|
3515
3515
|
"name": "LegacyScope"
|
@@ -3521,7 +3521,7 @@
|
|
3521
3521
|
"__schema": "ParameterSchema",
|
3522
3522
|
"location": {
|
3523
3523
|
"filePath": "merge-lanes.main.runtime.ts",
|
3524
|
-
"line":
|
3524
|
+
"line": 717,
|
3525
3525
|
"character": 3
|
3526
3526
|
},
|
3527
3527
|
"name": "componentFromModel",
|
@@ -3529,7 +3529,7 @@
|
|
3529
3529
|
"__schema": "TypeRefSchema",
|
3530
3530
|
"location": {
|
3531
3531
|
"filePath": "merge-lanes.main.runtime.ts",
|
3532
|
-
"line":
|
3532
|
+
"line": 717,
|
3533
3533
|
"character": 24
|
3534
3534
|
},
|
3535
3535
|
"name": "Version"
|
@@ -3541,7 +3541,7 @@
|
|
3541
3541
|
"__schema": "ParameterSchema",
|
3542
3542
|
"location": {
|
3543
3543
|
"filePath": "merge-lanes.main.runtime.ts",
|
3544
|
-
"line":
|
3544
|
+
"line": 718,
|
3545
3545
|
"character": 3
|
3546
3546
|
},
|
3547
3547
|
"name": "messageTitle",
|
@@ -3549,7 +3549,7 @@
|
|
3549
3549
|
"__schema": "KeywordTypeSchema",
|
3550
3550
|
"location": {
|
3551
3551
|
"filePath": "merge-lanes.main.runtime.ts",
|
3552
|
-
"line":
|
3552
|
+
"line": 718,
|
3553
3553
|
"character": 18
|
3554
3554
|
},
|
3555
3555
|
"name": "string"
|
@@ -3562,7 +3562,7 @@
|
|
3562
3562
|
"__schema": "TypeRefSchema",
|
3563
3563
|
"location": {
|
3564
3564
|
"filePath": "merge-lanes.main.runtime.ts",
|
3565
|
-
"line":
|
3565
|
+
"line": 719,
|
3566
3566
|
"character": 4
|
3567
3567
|
},
|
3568
3568
|
"name": "Promise",
|
@@ -3571,7 +3571,7 @@
|
|
3571
3571
|
"__schema": "TypeUnionSchema",
|
3572
3572
|
"location": {
|
3573
3573
|
"filePath": "merge-lanes.main.runtime.ts",
|
3574
|
-
"line":
|
3574
|
+
"line": 719,
|
3575
3575
|
"character": 12
|
3576
3576
|
},
|
3577
3577
|
"types": [
|
@@ -3579,7 +3579,7 @@
|
|
3579
3579
|
"__schema": "TypeRefSchema",
|
3580
3580
|
"location": {
|
3581
3581
|
"filePath": "merge-lanes.main.runtime.ts",
|
3582
|
-
"line":
|
3582
|
+
"line": 719,
|
3583
3583
|
"character": 12
|
3584
3584
|
},
|
3585
3585
|
"name": "Version"
|
@@ -3588,7 +3588,7 @@
|
|
3588
3588
|
"__schema": "KeywordTypeSchema",
|
3589
3589
|
"location": {
|
3590
3590
|
"filePath": "merge-lanes.main.runtime.ts",
|
3591
|
-
"line":
|
3591
|
+
"line": 719,
|
3592
3592
|
"character": 22
|
3593
3593
|
},
|
3594
3594
|
"name": "undefined"
|
@@ -3605,7 +3605,7 @@
|
|
3605
3605
|
"__schema": "UnImplementedSchema",
|
3606
3606
|
"location": {
|
3607
3607
|
"filePath": "merge-lanes.main.runtime.ts",
|
3608
|
-
"line":
|
3608
|
+
"line": 792,
|
3609
3609
|
"character": 1
|
3610
3610
|
},
|
3611
3611
|
"name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
|
@@ -3654,7 +3654,7 @@
|
|
3654
3654
|
"componentId": {
|
3655
3655
|
"scope": "teambit.lanes",
|
3656
3656
|
"name": "merge-lanes",
|
3657
|
-
"version": "1.0.
|
3657
|
+
"version": "1.0.488"
|
3658
3658
|
},
|
3659
3659
|
"taggedModuleExports": []
|
3660
3660
|
}
|