@teambit/merge-lanes 1.0.392 → 1.0.394
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 +358 -338
- package/dist/merge-lane.cmd.d.ts +2 -1
- package/dist/merge-lane.cmd.js +9 -3
- package/dist/merge-lane.cmd.js.map +1 -1
- package/dist/merge-lanes.main.runtime.d.ts +1 -0
- package/dist/merge-lanes.main.runtime.js +4 -1
- package/dist/merge-lanes.main.runtime.js.map +1 -1
- package/package.json +18 -18
- /package/dist/{preview-1724815130473.js → preview-1725074428767.js} +0 -0
package/artifacts/schema.json
CHANGED
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"__schema": "ClassSchema",
|
|
26
26
|
"location": {
|
|
27
27
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
28
|
-
"line":
|
|
28
|
+
"line": 76,
|
|
29
29
|
"character": 1
|
|
30
30
|
},
|
|
31
31
|
"signature": "class MergeLanesMain",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"__schema": "ConstructorSchema",
|
|
36
36
|
"location": {
|
|
37
37
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
38
|
-
"line":
|
|
38
|
+
"line": 77,
|
|
39
39
|
"character": 3
|
|
40
40
|
},
|
|
41
41
|
"signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"__schema": "ParameterSchema",
|
|
46
46
|
"location": {
|
|
47
47
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
48
|
-
"line":
|
|
48
|
+
"line": 78,
|
|
49
49
|
"character": 5
|
|
50
50
|
},
|
|
51
51
|
"name": "workspace",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"__schema": "TypeUnionSchema",
|
|
54
54
|
"location": {
|
|
55
55
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
56
|
-
"line":
|
|
56
|
+
"line": 78,
|
|
57
57
|
"character": 24
|
|
58
58
|
},
|
|
59
59
|
"types": [
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"__schema": "TypeRefSchema",
|
|
62
62
|
"location": {
|
|
63
63
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
64
|
-
"line":
|
|
64
|
+
"line": 78,
|
|
65
65
|
"character": 24
|
|
66
66
|
},
|
|
67
67
|
"name": "Workspace"
|
|
@@ -70,7 +70,7 @@
|
|
|
70
70
|
"__schema": "KeywordTypeSchema",
|
|
71
71
|
"location": {
|
|
72
72
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
73
|
-
"line":
|
|
73
|
+
"line": 78,
|
|
74
74
|
"character": 36
|
|
75
75
|
},
|
|
76
76
|
"name": "undefined"
|
|
@@ -84,7 +84,7 @@
|
|
|
84
84
|
"__schema": "ParameterSchema",
|
|
85
85
|
"location": {
|
|
86
86
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
87
|
-
"line":
|
|
87
|
+
"line": 79,
|
|
88
88
|
"character": 5
|
|
89
89
|
},
|
|
90
90
|
"name": "merging",
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"__schema": "TypeRefSchema",
|
|
93
93
|
"location": {
|
|
94
94
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
95
|
-
"line":
|
|
95
|
+
"line": 79,
|
|
96
96
|
"character": 22
|
|
97
97
|
},
|
|
98
98
|
"name": "MergingMain"
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
"__schema": "ParameterSchema",
|
|
105
105
|
"location": {
|
|
106
106
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
107
|
-
"line":
|
|
107
|
+
"line": 80,
|
|
108
108
|
"character": 5
|
|
109
109
|
},
|
|
110
110
|
"name": "lanes",
|
|
@@ -112,7 +112,7 @@
|
|
|
112
112
|
"__schema": "TypeRefSchema",
|
|
113
113
|
"location": {
|
|
114
114
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
115
|
-
"line":
|
|
115
|
+
"line": 80,
|
|
116
116
|
"character": 21
|
|
117
117
|
},
|
|
118
118
|
"name": "LanesMain"
|
|
@@ -124,7 +124,7 @@
|
|
|
124
124
|
"__schema": "ParameterSchema",
|
|
125
125
|
"location": {
|
|
126
126
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
127
|
-
"line":
|
|
127
|
+
"line": 81,
|
|
128
128
|
"character": 5
|
|
129
129
|
},
|
|
130
130
|
"name": "logger",
|
|
@@ -132,7 +132,7 @@
|
|
|
132
132
|
"__schema": "TypeRefSchema",
|
|
133
133
|
"location": {
|
|
134
134
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
135
|
-
"line":
|
|
135
|
+
"line": 81,
|
|
136
136
|
"character": 22
|
|
137
137
|
},
|
|
138
138
|
"name": "Logger"
|
|
@@ -144,7 +144,7 @@
|
|
|
144
144
|
"__schema": "ParameterSchema",
|
|
145
145
|
"location": {
|
|
146
146
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
147
|
-
"line":
|
|
147
|
+
"line": 82,
|
|
148
148
|
"character": 5
|
|
149
149
|
},
|
|
150
150
|
"name": "remove",
|
|
@@ -152,7 +152,7 @@
|
|
|
152
152
|
"__schema": "TypeRefSchema",
|
|
153
153
|
"location": {
|
|
154
154
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
155
|
-
"line":
|
|
155
|
+
"line": 82,
|
|
156
156
|
"character": 21
|
|
157
157
|
},
|
|
158
158
|
"name": "RemoveMain"
|
|
@@ -164,7 +164,7 @@
|
|
|
164
164
|
"__schema": "ParameterSchema",
|
|
165
165
|
"location": {
|
|
166
166
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
167
|
-
"line":
|
|
167
|
+
"line": 83,
|
|
168
168
|
"character": 5
|
|
169
169
|
},
|
|
170
170
|
"name": "scope",
|
|
@@ -172,7 +172,7 @@
|
|
|
172
172
|
"__schema": "TypeRefSchema",
|
|
173
173
|
"location": {
|
|
174
174
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
175
|
-
"line":
|
|
175
|
+
"line": 83,
|
|
176
176
|
"character": 20
|
|
177
177
|
},
|
|
178
178
|
"name": "ScopeMain"
|
|
@@ -184,7 +184,7 @@
|
|
|
184
184
|
"__schema": "ParameterSchema",
|
|
185
185
|
"location": {
|
|
186
186
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
187
|
-
"line":
|
|
187
|
+
"line": 84,
|
|
188
188
|
"character": 5
|
|
189
189
|
},
|
|
190
190
|
"name": "exporter",
|
|
@@ -192,7 +192,7 @@
|
|
|
192
192
|
"__schema": "TypeRefSchema",
|
|
193
193
|
"location": {
|
|
194
194
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
195
|
-
"line":
|
|
195
|
+
"line": 84,
|
|
196
196
|
"character": 23
|
|
197
197
|
},
|
|
198
198
|
"name": "ExportMain"
|
|
@@ -204,7 +204,7 @@
|
|
|
204
204
|
"__schema": "ParameterSchema",
|
|
205
205
|
"location": {
|
|
206
206
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
207
|
-
"line":
|
|
207
|
+
"line": 85,
|
|
208
208
|
"character": 5
|
|
209
209
|
},
|
|
210
210
|
"name": "importer",
|
|
@@ -212,7 +212,7 @@
|
|
|
212
212
|
"__schema": "TypeRefSchema",
|
|
213
213
|
"location": {
|
|
214
214
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
215
|
-
"line":
|
|
215
|
+
"line": 85,
|
|
216
216
|
"character": 23
|
|
217
217
|
},
|
|
218
218
|
"name": "ImporterMain"
|
|
@@ -224,7 +224,7 @@
|
|
|
224
224
|
"__schema": "ParameterSchema",
|
|
225
225
|
"location": {
|
|
226
226
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
227
|
-
"line":
|
|
227
|
+
"line": 86,
|
|
228
228
|
"character": 5
|
|
229
229
|
},
|
|
230
230
|
"name": "checkout",
|
|
@@ -232,7 +232,7 @@
|
|
|
232
232
|
"__schema": "TypeRefSchema",
|
|
233
233
|
"location": {
|
|
234
234
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
235
|
-
"line":
|
|
235
|
+
"line": 86,
|
|
236
236
|
"character": 23
|
|
237
237
|
},
|
|
238
238
|
"name": "CheckoutMain"
|
|
@@ -245,7 +245,7 @@
|
|
|
245
245
|
"__schema": "ThisTypeSchema",
|
|
246
246
|
"location": {
|
|
247
247
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
248
|
-
"line":
|
|
248
|
+
"line": 76,
|
|
249
249
|
"character": 1
|
|
250
250
|
},
|
|
251
251
|
"name": "MergeLanesMain"
|
|
@@ -256,7 +256,7 @@
|
|
|
256
256
|
"__schema": "FunctionLikeSchema",
|
|
257
257
|
"location": {
|
|
258
258
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
259
|
-
"line":
|
|
259
|
+
"line": 89,
|
|
260
260
|
"character": 3
|
|
261
261
|
},
|
|
262
262
|
"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}>",
|
|
@@ -266,7 +266,7 @@
|
|
|
266
266
|
"__schema": "ParameterSchema",
|
|
267
267
|
"location": {
|
|
268
268
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
269
|
-
"line":
|
|
269
|
+
"line": 89,
|
|
270
270
|
"character": 24
|
|
271
271
|
},
|
|
272
272
|
"name": "laneName",
|
|
@@ -274,7 +274,7 @@
|
|
|
274
274
|
"__schema": "KeywordTypeSchema",
|
|
275
275
|
"location": {
|
|
276
276
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
277
|
-
"line":
|
|
277
|
+
"line": 89,
|
|
278
278
|
"character": 34
|
|
279
279
|
},
|
|
280
280
|
"name": "string"
|
|
@@ -286,7 +286,7 @@
|
|
|
286
286
|
"__schema": "ParameterSchema",
|
|
287
287
|
"location": {
|
|
288
288
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
289
|
-
"line":
|
|
289
|
+
"line": 89,
|
|
290
290
|
"character": 42
|
|
291
291
|
},
|
|
292
292
|
"name": "options",
|
|
@@ -294,7 +294,7 @@
|
|
|
294
294
|
"__schema": "TypeRefSchema",
|
|
295
295
|
"location": {
|
|
296
296
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
297
|
-
"line":
|
|
297
|
+
"line": 89,
|
|
298
298
|
"character": 51
|
|
299
299
|
},
|
|
300
300
|
"name": "MergeLaneOptions"
|
|
@@ -307,7 +307,7 @@
|
|
|
307
307
|
"__schema": "InferenceTypeSchema",
|
|
308
308
|
"location": {
|
|
309
309
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
310
|
-
"line":
|
|
310
|
+
"line": 89,
|
|
311
311
|
"character": 3
|
|
312
312
|
},
|
|
313
313
|
"type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
|
|
@@ -320,7 +320,7 @@
|
|
|
320
320
|
"__schema": "FunctionLikeSchema",
|
|
321
321
|
"location": {
|
|
322
322
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
323
|
-
"line":
|
|
323
|
+
"line": 99,
|
|
324
324
|
"character": 3
|
|
325
325
|
},
|
|
326
326
|
"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}>",
|
|
@@ -330,7 +330,7 @@
|
|
|
330
330
|
"__schema": "ParameterSchema",
|
|
331
331
|
"location": {
|
|
332
332
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
333
|
-
"line":
|
|
333
|
+
"line": 100,
|
|
334
334
|
"character": 5
|
|
335
335
|
},
|
|
336
336
|
"name": "otherLaneId",
|
|
@@ -338,7 +338,7 @@
|
|
|
338
338
|
"__schema": "TypeRefSchema",
|
|
339
339
|
"location": {
|
|
340
340
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
341
|
-
"line":
|
|
341
|
+
"line": 100,
|
|
342
342
|
"character": 18
|
|
343
343
|
},
|
|
344
344
|
"name": "LaneId"
|
|
@@ -350,7 +350,7 @@
|
|
|
350
350
|
"__schema": "ParameterSchema",
|
|
351
351
|
"location": {
|
|
352
352
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
353
|
-
"line":
|
|
353
|
+
"line": 101,
|
|
354
354
|
"character": 5
|
|
355
355
|
},
|
|
356
356
|
"name": "currentLaneId",
|
|
@@ -358,7 +358,7 @@
|
|
|
358
358
|
"__schema": "TypeRefSchema",
|
|
359
359
|
"location": {
|
|
360
360
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
361
|
-
"line":
|
|
361
|
+
"line": 101,
|
|
362
362
|
"character": 20
|
|
363
363
|
},
|
|
364
364
|
"name": "LaneId"
|
|
@@ -370,7 +370,7 @@
|
|
|
370
370
|
"__schema": "ParameterSchema",
|
|
371
371
|
"location": {
|
|
372
372
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
373
|
-
"line":
|
|
373
|
+
"line": 102,
|
|
374
374
|
"character": 5
|
|
375
375
|
},
|
|
376
376
|
"name": "options",
|
|
@@ -378,7 +378,7 @@
|
|
|
378
378
|
"__schema": "TypeRefSchema",
|
|
379
379
|
"location": {
|
|
380
380
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
381
|
-
"line":
|
|
381
|
+
"line": 102,
|
|
382
382
|
"character": 14
|
|
383
383
|
},
|
|
384
384
|
"name": "MergeLaneOptions"
|
|
@@ -391,7 +391,7 @@
|
|
|
391
391
|
"__schema": "TypeRefSchema",
|
|
392
392
|
"location": {
|
|
393
393
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
394
|
-
"line":
|
|
394
|
+
"line": 103,
|
|
395
395
|
"character": 6
|
|
396
396
|
},
|
|
397
397
|
"name": "Promise",
|
|
@@ -400,7 +400,7 @@
|
|
|
400
400
|
"__schema": "TypeLiteralSchema",
|
|
401
401
|
"location": {
|
|
402
402
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
403
|
-
"line":
|
|
403
|
+
"line": 103,
|
|
404
404
|
"character": 14
|
|
405
405
|
},
|
|
406
406
|
"members": [
|
|
@@ -408,7 +408,7 @@
|
|
|
408
408
|
"__schema": "VariableLikeSchema",
|
|
409
409
|
"location": {
|
|
410
410
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
411
|
-
"line":
|
|
411
|
+
"line": 104,
|
|
412
412
|
"character": 5
|
|
413
413
|
},
|
|
414
414
|
"signature": "(property) mergeResults: ApplyVersionResults",
|
|
@@ -417,7 +417,7 @@
|
|
|
417
417
|
"__schema": "TypeRefSchema",
|
|
418
418
|
"location": {
|
|
419
419
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
420
|
-
"line":
|
|
420
|
+
"line": 104,
|
|
421
421
|
"character": 5
|
|
422
422
|
},
|
|
423
423
|
"name": "ApplyVersionResults",
|
|
@@ -432,7 +432,7 @@
|
|
|
432
432
|
"__schema": "VariableLikeSchema",
|
|
433
433
|
"location": {
|
|
434
434
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
435
|
-
"line":
|
|
435
|
+
"line": 105,
|
|
436
436
|
"character": 5
|
|
437
437
|
},
|
|
438
438
|
"signature": "(property) deleteResults: any",
|
|
@@ -441,7 +441,7 @@
|
|
|
441
441
|
"__schema": "KeywordTypeSchema",
|
|
442
442
|
"location": {
|
|
443
443
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
444
|
-
"line":
|
|
444
|
+
"line": 105,
|
|
445
445
|
"character": 20
|
|
446
446
|
},
|
|
447
447
|
"name": "any"
|
|
@@ -452,7 +452,7 @@
|
|
|
452
452
|
"__schema": "VariableLikeSchema",
|
|
453
453
|
"location": {
|
|
454
454
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
455
|
-
"line":
|
|
455
|
+
"line": 106,
|
|
456
456
|
"character": 5
|
|
457
457
|
},
|
|
458
458
|
"signature": "(property) configMergeResults: ConfigMergeResult[]",
|
|
@@ -461,14 +461,14 @@
|
|
|
461
461
|
"__schema": "TypeArraySchema",
|
|
462
462
|
"location": {
|
|
463
463
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
464
|
-
"line":
|
|
464
|
+
"line": 106,
|
|
465
465
|
"character": 25
|
|
466
466
|
},
|
|
467
467
|
"type": {
|
|
468
468
|
"__schema": "TypeRefSchema",
|
|
469
469
|
"location": {
|
|
470
470
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
471
|
-
"line":
|
|
471
|
+
"line": 106,
|
|
472
472
|
"character": 25
|
|
473
473
|
},
|
|
474
474
|
"name": "ConfigMergeResult"
|
|
@@ -480,7 +480,7 @@
|
|
|
480
480
|
"__schema": "VariableLikeSchema",
|
|
481
481
|
"location": {
|
|
482
482
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
483
|
-
"line":
|
|
483
|
+
"line": 107,
|
|
484
484
|
"character": 5
|
|
485
485
|
},
|
|
486
486
|
"signature": "(property) mergedSuccessfullyIds: ComponentID[]",
|
|
@@ -489,14 +489,14 @@
|
|
|
489
489
|
"__schema": "TypeArraySchema",
|
|
490
490
|
"location": {
|
|
491
491
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
492
|
-
"line":
|
|
492
|
+
"line": 107,
|
|
493
493
|
"character": 28
|
|
494
494
|
},
|
|
495
495
|
"type": {
|
|
496
496
|
"__schema": "TypeRefSchema",
|
|
497
497
|
"location": {
|
|
498
498
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
499
|
-
"line":
|
|
499
|
+
"line": 107,
|
|
500
500
|
"character": 28
|
|
501
501
|
},
|
|
502
502
|
"name": "ComponentID"
|
|
@@ -508,7 +508,7 @@
|
|
|
508
508
|
"__schema": "VariableLikeSchema",
|
|
509
509
|
"location": {
|
|
510
510
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
511
|
-
"line":
|
|
511
|
+
"line": 108,
|
|
512
512
|
"character": 5
|
|
513
513
|
},
|
|
514
514
|
"signature": "(property) conflicts: ConflictPerId[]",
|
|
@@ -517,14 +517,14 @@
|
|
|
517
517
|
"__schema": "TypeArraySchema",
|
|
518
518
|
"location": {
|
|
519
519
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
520
|
-
"line":
|
|
520
|
+
"line": 108,
|
|
521
521
|
"character": 16
|
|
522
522
|
},
|
|
523
523
|
"type": {
|
|
524
524
|
"__schema": "TypeRefSchema",
|
|
525
525
|
"location": {
|
|
526
526
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
527
|
-
"line":
|
|
527
|
+
"line": 108,
|
|
528
528
|
"character": 16
|
|
529
529
|
},
|
|
530
530
|
"name": "ConflictPerId"
|
|
@@ -544,7 +544,7 @@
|
|
|
544
544
|
"__schema": "FunctionLikeSchema",
|
|
545
545
|
"location": {
|
|
546
546
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
547
|
-
"line":
|
|
547
|
+
"line": 324,
|
|
548
548
|
"character": 3
|
|
549
549
|
},
|
|
550
550
|
"signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
|
|
@@ -554,7 +554,7 @@
|
|
|
554
554
|
"__schema": "ParameterSchema",
|
|
555
555
|
"location": {
|
|
556
556
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
557
|
-
"line":
|
|
557
|
+
"line": 324,
|
|
558
558
|
"character": 19
|
|
559
559
|
},
|
|
560
560
|
"name": "newLaneName",
|
|
@@ -562,7 +562,7 @@
|
|
|
562
562
|
"__schema": "KeywordTypeSchema",
|
|
563
563
|
"location": {
|
|
564
564
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
565
|
-
"line":
|
|
565
|
+
"line": 324,
|
|
566
566
|
"character": 32
|
|
567
567
|
},
|
|
568
568
|
"name": "string"
|
|
@@ -574,7 +574,7 @@
|
|
|
574
574
|
"__schema": "ParameterSchema",
|
|
575
575
|
"location": {
|
|
576
576
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
577
|
-
"line":
|
|
577
|
+
"line": 324,
|
|
578
578
|
"character": 40
|
|
579
579
|
},
|
|
580
580
|
"name": "options",
|
|
@@ -582,7 +582,7 @@
|
|
|
582
582
|
"__schema": "TypeLiteralSchema",
|
|
583
583
|
"location": {
|
|
584
584
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
585
|
-
"line":
|
|
585
|
+
"line": 324,
|
|
586
586
|
"character": 49
|
|
587
587
|
},
|
|
588
588
|
"members": [
|
|
@@ -590,7 +590,7 @@
|
|
|
590
590
|
"__schema": "VariableLikeSchema",
|
|
591
591
|
"location": {
|
|
592
592
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
593
|
-
"line":
|
|
593
|
+
"line": 324,
|
|
594
594
|
"character": 51
|
|
595
595
|
},
|
|
596
596
|
"signature": "(property) scope?: string | undefined",
|
|
@@ -599,7 +599,7 @@
|
|
|
599
599
|
"__schema": "KeywordTypeSchema",
|
|
600
600
|
"location": {
|
|
601
601
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
602
|
-
"line":
|
|
602
|
+
"line": 324,
|
|
603
603
|
"character": 59
|
|
604
604
|
},
|
|
605
605
|
"name": "string"
|
|
@@ -616,7 +616,7 @@
|
|
|
616
616
|
"__schema": "InferenceTypeSchema",
|
|
617
617
|
"location": {
|
|
618
618
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
619
|
-
"line":
|
|
619
|
+
"line": 324,
|
|
620
620
|
"character": 3
|
|
621
621
|
},
|
|
622
622
|
"type": "Promise<CreateLaneResult>"
|
|
@@ -629,7 +629,7 @@
|
|
|
629
629
|
"__schema": "FunctionLikeSchema",
|
|
630
630
|
"location": {
|
|
631
631
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
632
|
-
"line":
|
|
632
|
+
"line": 332,
|
|
633
633
|
"character": 3
|
|
634
634
|
},
|
|
635
635
|
"signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
|
|
@@ -639,7 +639,7 @@
|
|
|
639
639
|
"__schema": "ParameterSchema",
|
|
640
640
|
"location": {
|
|
641
641
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
642
|
-
"line":
|
|
642
|
+
"line": 332,
|
|
643
643
|
"character": 24
|
|
644
644
|
},
|
|
645
645
|
"name": "checkoutProps",
|
|
@@ -647,7 +647,7 @@
|
|
|
647
647
|
"__schema": "TypeRefSchema",
|
|
648
648
|
"location": {
|
|
649
649
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
650
|
-
"line":
|
|
650
|
+
"line": 332,
|
|
651
651
|
"character": 39
|
|
652
652
|
},
|
|
653
653
|
"name": "CheckoutProps"
|
|
@@ -659,7 +659,7 @@
|
|
|
659
659
|
"__schema": "ParameterSchema",
|
|
660
660
|
"location": {
|
|
661
661
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
662
|
-
"line":
|
|
662
|
+
"line": 332,
|
|
663
663
|
"character": 54
|
|
664
664
|
},
|
|
665
665
|
"name": "mergeAbortOpts",
|
|
@@ -667,7 +667,7 @@
|
|
|
667
667
|
"__schema": "TypeRefSchema",
|
|
668
668
|
"location": {
|
|
669
669
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
670
|
-
"line":
|
|
670
|
+
"line": 332,
|
|
671
671
|
"character": 70
|
|
672
672
|
},
|
|
673
673
|
"name": "MergeAbortOpts"
|
|
@@ -680,7 +680,7 @@
|
|
|
680
680
|
"__schema": "InferenceTypeSchema",
|
|
681
681
|
"location": {
|
|
682
682
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
683
|
-
"line":
|
|
683
|
+
"line": 332,
|
|
684
684
|
"character": 3
|
|
685
685
|
},
|
|
686
686
|
"type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
|
|
@@ -693,7 +693,7 @@
|
|
|
693
693
|
"__schema": "FunctionLikeSchema",
|
|
694
694
|
"location": {
|
|
695
695
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
696
|
-
"line":
|
|
696
|
+
"line": 388,
|
|
697
697
|
"character": 3
|
|
698
698
|
},
|
|
699
699
|
"signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
|
|
@@ -703,7 +703,7 @@
|
|
|
703
703
|
"__schema": "ParameterSchema",
|
|
704
704
|
"location": {
|
|
705
705
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
706
|
-
"line":
|
|
706
|
+
"line": 389,
|
|
707
707
|
"character": 5
|
|
708
708
|
},
|
|
709
709
|
"name": "fromLane",
|
|
@@ -711,7 +711,7 @@
|
|
|
711
711
|
"__schema": "KeywordTypeSchema",
|
|
712
712
|
"location": {
|
|
713
713
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
714
|
-
"line":
|
|
714
|
+
"line": 389,
|
|
715
715
|
"character": 15
|
|
716
716
|
},
|
|
717
717
|
"name": "string"
|
|
@@ -723,7 +723,7 @@
|
|
|
723
723
|
"__schema": "ParameterSchema",
|
|
724
724
|
"location": {
|
|
725
725
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
726
|
-
"line":
|
|
726
|
+
"line": 390,
|
|
727
727
|
"character": 5
|
|
728
728
|
},
|
|
729
729
|
"name": "toLane",
|
|
@@ -731,7 +731,7 @@
|
|
|
731
731
|
"__schema": "KeywordTypeSchema",
|
|
732
732
|
"location": {
|
|
733
733
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
734
|
-
"line":
|
|
734
|
+
"line": 390,
|
|
735
735
|
"character": 13
|
|
736
736
|
},
|
|
737
737
|
"name": "string"
|
|
@@ -743,7 +743,7 @@
|
|
|
743
743
|
"__schema": "ParameterSchema",
|
|
744
744
|
"location": {
|
|
745
745
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
746
|
-
"line":
|
|
746
|
+
"line": 391,
|
|
747
747
|
"character": 5
|
|
748
748
|
},
|
|
749
749
|
"name": "options",
|
|
@@ -751,7 +751,7 @@
|
|
|
751
751
|
"__schema": "TypeIntersectionSchema",
|
|
752
752
|
"location": {
|
|
753
753
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
754
|
-
"line":
|
|
754
|
+
"line": 391,
|
|
755
755
|
"character": 14
|
|
756
756
|
},
|
|
757
757
|
"types": [
|
|
@@ -759,7 +759,7 @@
|
|
|
759
759
|
"__schema": "TypeRefSchema",
|
|
760
760
|
"location": {
|
|
761
761
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
762
|
-
"line":
|
|
762
|
+
"line": 391,
|
|
763
763
|
"character": 14
|
|
764
764
|
},
|
|
765
765
|
"name": "Partial",
|
|
@@ -768,7 +768,7 @@
|
|
|
768
768
|
"__schema": "TypeRefSchema",
|
|
769
769
|
"location": {
|
|
770
770
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
771
|
-
"line":
|
|
771
|
+
"line": 391,
|
|
772
772
|
"character": 22
|
|
773
773
|
},
|
|
774
774
|
"name": "MergeLaneOptions"
|
|
@@ -779,7 +779,7 @@
|
|
|
779
779
|
"__schema": "TypeLiteralSchema",
|
|
780
780
|
"location": {
|
|
781
781
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
782
|
-
"line":
|
|
782
|
+
"line": 391,
|
|
783
783
|
"character": 42
|
|
784
784
|
},
|
|
785
785
|
"members": [
|
|
@@ -787,7 +787,7 @@
|
|
|
787
787
|
"__schema": "VariableLikeSchema",
|
|
788
788
|
"location": {
|
|
789
789
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
790
|
-
"line":
|
|
790
|
+
"line": 391,
|
|
791
791
|
"character": 44
|
|
792
792
|
},
|
|
793
793
|
"signature": "(property) push?: boolean | undefined",
|
|
@@ -796,7 +796,7 @@
|
|
|
796
796
|
"__schema": "KeywordTypeSchema",
|
|
797
797
|
"location": {
|
|
798
798
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
799
|
-
"line":
|
|
799
|
+
"line": 391,
|
|
800
800
|
"character": 51
|
|
801
801
|
},
|
|
802
802
|
"name": "boolean"
|
|
@@ -807,7 +807,7 @@
|
|
|
807
807
|
"__schema": "VariableLikeSchema",
|
|
808
808
|
"location": {
|
|
809
809
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
810
|
-
"line":
|
|
810
|
+
"line": 391,
|
|
811
811
|
"character": 60
|
|
812
812
|
},
|
|
813
813
|
"signature": "(property) reMerge?: boolean | undefined",
|
|
@@ -816,7 +816,7 @@
|
|
|
816
816
|
"__schema": "KeywordTypeSchema",
|
|
817
817
|
"location": {
|
|
818
818
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
819
|
-
"line":
|
|
819
|
+
"line": 391,
|
|
820
820
|
"character": 70
|
|
821
821
|
},
|
|
822
822
|
"name": "boolean"
|
|
@@ -835,7 +835,7 @@
|
|
|
835
835
|
"__schema": "TypeRefSchema",
|
|
836
836
|
"location": {
|
|
837
837
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
838
|
-
"line":
|
|
838
|
+
"line": 392,
|
|
839
839
|
"character": 6
|
|
840
840
|
},
|
|
841
841
|
"name": "Promise",
|
|
@@ -844,7 +844,7 @@
|
|
|
844
844
|
"__schema": "TypeRefSchema",
|
|
845
845
|
"location": {
|
|
846
846
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
847
|
-
"line":
|
|
847
|
+
"line": 392,
|
|
848
848
|
"character": 14
|
|
849
849
|
},
|
|
850
850
|
"name": "MergeFromScopeResult"
|
|
@@ -859,7 +859,7 @@
|
|
|
859
859
|
"__schema": "VariableLikeSchema",
|
|
860
860
|
"location": {
|
|
861
861
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
862
|
-
"line":
|
|
862
|
+
"line": 486,
|
|
863
863
|
"character": 3
|
|
864
864
|
},
|
|
865
865
|
"signature": "(property) MergeLanesMain.slots: never[]",
|
|
@@ -868,7 +868,7 @@
|
|
|
868
868
|
"__schema": "InferenceTypeSchema",
|
|
869
869
|
"location": {
|
|
870
870
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
871
|
-
"line":
|
|
871
|
+
"line": 486,
|
|
872
872
|
"character": 3
|
|
873
873
|
},
|
|
874
874
|
"type": "never[]"
|
|
@@ -880,7 +880,7 @@
|
|
|
880
880
|
"__schema": "VariableLikeSchema",
|
|
881
881
|
"location": {
|
|
882
882
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
883
|
-
"line":
|
|
883
|
+
"line": 487,
|
|
884
884
|
"character": 3
|
|
885
885
|
},
|
|
886
886
|
"signature": "(property) MergeLanesMain.dependencies: Aspect[]",
|
|
@@ -889,7 +889,7 @@
|
|
|
889
889
|
"__schema": "InferenceTypeSchema",
|
|
890
890
|
"location": {
|
|
891
891
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
892
|
-
"line":
|
|
892
|
+
"line": 487,
|
|
893
893
|
"character": 3
|
|
894
894
|
},
|
|
895
895
|
"type": "Aspect[]"
|
|
@@ -901,7 +901,7 @@
|
|
|
901
901
|
"__schema": "VariableLikeSchema",
|
|
902
902
|
"location": {
|
|
903
903
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
904
|
-
"line":
|
|
904
|
+
"line": 500,
|
|
905
905
|
"character": 3
|
|
906
906
|
},
|
|
907
907
|
"signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
|
|
@@ -910,7 +910,7 @@
|
|
|
910
910
|
"__schema": "InferenceTypeSchema",
|
|
911
911
|
"location": {
|
|
912
912
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
913
|
-
"line":
|
|
913
|
+
"line": 500,
|
|
914
914
|
"character": 3
|
|
915
915
|
},
|
|
916
916
|
"type": "RuntimeDefinition"
|
|
@@ -922,7 +922,7 @@
|
|
|
922
922
|
"__schema": "FunctionLikeSchema",
|
|
923
923
|
"location": {
|
|
924
924
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
925
|
-
"line":
|
|
925
|
+
"line": 502,
|
|
926
926
|
"character": 3
|
|
927
927
|
},
|
|
928
928
|
"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>",
|
|
@@ -932,7 +932,7 @@
|
|
|
932
932
|
"__schema": "ParameterSchema",
|
|
933
933
|
"location": {
|
|
934
934
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
935
|
-
"line":
|
|
935
|
+
"line": 502,
|
|
936
936
|
"character": 25
|
|
937
937
|
},
|
|
938
938
|
"name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
|
|
@@ -940,7 +940,7 @@
|
|
|
940
940
|
"__schema": "TupleTypeSchema",
|
|
941
941
|
"location": {
|
|
942
942
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
943
|
-
"line":
|
|
943
|
+
"line": 514,
|
|
944
944
|
"character": 6
|
|
945
945
|
},
|
|
946
946
|
"elements": [
|
|
@@ -948,7 +948,7 @@
|
|
|
948
948
|
"__schema": "TypeRefSchema",
|
|
949
949
|
"location": {
|
|
950
950
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
951
|
-
"line":
|
|
951
|
+
"line": 515,
|
|
952
952
|
"character": 5
|
|
953
953
|
},
|
|
954
954
|
"name": "LanesMain"
|
|
@@ -957,7 +957,7 @@
|
|
|
957
957
|
"__schema": "TypeRefSchema",
|
|
958
958
|
"location": {
|
|
959
959
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
960
|
-
"line":
|
|
960
|
+
"line": 516,
|
|
961
961
|
"character": 5
|
|
962
962
|
},
|
|
963
963
|
"name": "CLIMain"
|
|
@@ -966,7 +966,7 @@
|
|
|
966
966
|
"__schema": "TypeRefSchema",
|
|
967
967
|
"location": {
|
|
968
968
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
969
|
-
"line":
|
|
969
|
+
"line": 517,
|
|
970
970
|
"character": 5
|
|
971
971
|
},
|
|
972
972
|
"name": "Workspace"
|
|
@@ -975,7 +975,7 @@
|
|
|
975
975
|
"__schema": "TypeRefSchema",
|
|
976
976
|
"location": {
|
|
977
977
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
978
|
-
"line":
|
|
978
|
+
"line": 518,
|
|
979
979
|
"character": 5
|
|
980
980
|
},
|
|
981
981
|
"name": "MergingMain"
|
|
@@ -984,7 +984,7 @@
|
|
|
984
984
|
"__schema": "TypeRefSchema",
|
|
985
985
|
"location": {
|
|
986
986
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
987
|
-
"line":
|
|
987
|
+
"line": 519,
|
|
988
988
|
"character": 5
|
|
989
989
|
},
|
|
990
990
|
"name": "LoggerMain"
|
|
@@ -993,7 +993,7 @@
|
|
|
993
993
|
"__schema": "TypeRefSchema",
|
|
994
994
|
"location": {
|
|
995
995
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
996
|
-
"line":
|
|
996
|
+
"line": 520,
|
|
997
997
|
"character": 5
|
|
998
998
|
},
|
|
999
999
|
"name": "RemoveMain"
|
|
@@ -1002,7 +1002,7 @@
|
|
|
1002
1002
|
"__schema": "TypeRefSchema",
|
|
1003
1003
|
"location": {
|
|
1004
1004
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1005
|
-
"line":
|
|
1005
|
+
"line": 521,
|
|
1006
1006
|
"character": 5
|
|
1007
1007
|
},
|
|
1008
1008
|
"name": "ScopeMain"
|
|
@@ -1011,7 +1011,7 @@
|
|
|
1011
1011
|
"__schema": "TypeRefSchema",
|
|
1012
1012
|
"location": {
|
|
1013
1013
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1014
|
-
"line":
|
|
1014
|
+
"line": 522,
|
|
1015
1015
|
"character": 5
|
|
1016
1016
|
},
|
|
1017
1017
|
"name": "ExportMain"
|
|
@@ -1020,7 +1020,7 @@
|
|
|
1020
1020
|
"__schema": "TypeRefSchema",
|
|
1021
1021
|
"location": {
|
|
1022
1022
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1023
|
-
"line":
|
|
1023
|
+
"line": 523,
|
|
1024
1024
|
"character": 5
|
|
1025
1025
|
},
|
|
1026
1026
|
"name": "ImporterMain"
|
|
@@ -1029,7 +1029,7 @@
|
|
|
1029
1029
|
"__schema": "TypeRefSchema",
|
|
1030
1030
|
"location": {
|
|
1031
1031
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1032
|
-
"line":
|
|
1032
|
+
"line": 524,
|
|
1033
1033
|
"character": 5
|
|
1034
1034
|
},
|
|
1035
1035
|
"name": "CheckoutMain"
|
|
@@ -1038,7 +1038,7 @@
|
|
|
1038
1038
|
"__schema": "TypeRefSchema",
|
|
1039
1039
|
"location": {
|
|
1040
1040
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1041
|
-
"line":
|
|
1041
|
+
"line": 525,
|
|
1042
1042
|
"character": 5
|
|
1043
1043
|
},
|
|
1044
1044
|
"name": "GlobalConfigMain"
|
|
@@ -1053,7 +1053,7 @@
|
|
|
1053
1053
|
"__schema": "InferenceTypeSchema",
|
|
1054
1054
|
"location": {
|
|
1055
1055
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1056
|
-
"line":
|
|
1056
|
+
"line": 502,
|
|
1057
1057
|
"character": 3
|
|
1058
1058
|
},
|
|
1059
1059
|
"type": "Promise<MergeLanesMain>"
|
|
@@ -1132,7 +1132,7 @@
|
|
|
1132
1132
|
"line": 41,
|
|
1133
1133
|
"character": 1
|
|
1134
1134
|
},
|
|
1135
|
-
"signature": "type MergeLaneOptions = {\n mergeStrategy: MergeStrategy;\n ours?: boolean | undefined;\n theirs?: boolean | undefined;\n noSnap?: boolean | undefined;\n snapMessage?: string | undefined;\n existingOnWorkspaceOnly?: boolean | undefined;\n ... 14 more ...;\n fetchCurrent?: boolean | undefined;\n}",
|
|
1135
|
+
"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}",
|
|
1136
1136
|
"name": "MergeLaneOptions",
|
|
1137
1137
|
"type": {
|
|
1138
1138
|
"__schema": "TypeLiteralSchema",
|
|
@@ -1209,13 +1209,33 @@
|
|
|
1209
1209
|
"line": 45,
|
|
1210
1210
|
"character": 3
|
|
1211
1211
|
},
|
|
1212
|
+
"signature": "(property) noAutoSnap?: boolean | undefined",
|
|
1213
|
+
"name": "noAutoSnap",
|
|
1214
|
+
"type": {
|
|
1215
|
+
"__schema": "KeywordTypeSchema",
|
|
1216
|
+
"location": {
|
|
1217
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
1218
|
+
"line": 45,
|
|
1219
|
+
"character": 16
|
|
1220
|
+
},
|
|
1221
|
+
"name": "boolean"
|
|
1222
|
+
},
|
|
1223
|
+
"isOptional": true
|
|
1224
|
+
},
|
|
1225
|
+
{
|
|
1226
|
+
"__schema": "VariableLikeSchema",
|
|
1227
|
+
"location": {
|
|
1228
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
1229
|
+
"line": 46,
|
|
1230
|
+
"character": 3
|
|
1231
|
+
},
|
|
1212
1232
|
"signature": "(property) noSnap?: boolean | undefined",
|
|
1213
1233
|
"name": "noSnap",
|
|
1214
1234
|
"type": {
|
|
1215
1235
|
"__schema": "KeywordTypeSchema",
|
|
1216
1236
|
"location": {
|
|
1217
1237
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1218
|
-
"line":
|
|
1238
|
+
"line": 46,
|
|
1219
1239
|
"character": 12
|
|
1220
1240
|
},
|
|
1221
1241
|
"name": "boolean"
|
|
@@ -1226,7 +1246,7 @@
|
|
|
1226
1246
|
"__schema": "VariableLikeSchema",
|
|
1227
1247
|
"location": {
|
|
1228
1248
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1229
|
-
"line":
|
|
1249
|
+
"line": 47,
|
|
1230
1250
|
"character": 3
|
|
1231
1251
|
},
|
|
1232
1252
|
"signature": "(property) snapMessage?: string | undefined",
|
|
@@ -1235,7 +1255,7 @@
|
|
|
1235
1255
|
"__schema": "KeywordTypeSchema",
|
|
1236
1256
|
"location": {
|
|
1237
1257
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1238
|
-
"line":
|
|
1258
|
+
"line": 47,
|
|
1239
1259
|
"character": 17
|
|
1240
1260
|
},
|
|
1241
1261
|
"name": "string"
|
|
@@ -1246,7 +1266,7 @@
|
|
|
1246
1266
|
"__schema": "VariableLikeSchema",
|
|
1247
1267
|
"location": {
|
|
1248
1268
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1249
|
-
"line":
|
|
1269
|
+
"line": 48,
|
|
1250
1270
|
"character": 3
|
|
1251
1271
|
},
|
|
1252
1272
|
"signature": "(property) existingOnWorkspaceOnly?: boolean | undefined",
|
|
@@ -1255,7 +1275,7 @@
|
|
|
1255
1275
|
"__schema": "KeywordTypeSchema",
|
|
1256
1276
|
"location": {
|
|
1257
1277
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1258
|
-
"line":
|
|
1278
|
+
"line": 48,
|
|
1259
1279
|
"character": 29
|
|
1260
1280
|
},
|
|
1261
1281
|
"name": "boolean"
|
|
@@ -1266,7 +1286,7 @@
|
|
|
1266
1286
|
"__schema": "VariableLikeSchema",
|
|
1267
1287
|
"location": {
|
|
1268
1288
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1269
|
-
"line":
|
|
1289
|
+
"line": 49,
|
|
1270
1290
|
"character": 3
|
|
1271
1291
|
},
|
|
1272
1292
|
"signature": "(property) build?: boolean | undefined",
|
|
@@ -1275,7 +1295,7 @@
|
|
|
1275
1295
|
"__schema": "KeywordTypeSchema",
|
|
1276
1296
|
"location": {
|
|
1277
1297
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1278
|
-
"line":
|
|
1298
|
+
"line": 49,
|
|
1279
1299
|
"character": 11
|
|
1280
1300
|
},
|
|
1281
1301
|
"name": "boolean"
|
|
@@ -1286,7 +1306,7 @@
|
|
|
1286
1306
|
"__schema": "VariableLikeSchema",
|
|
1287
1307
|
"location": {
|
|
1288
1308
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1289
|
-
"line":
|
|
1309
|
+
"line": 50,
|
|
1290
1310
|
"character": 3
|
|
1291
1311
|
},
|
|
1292
1312
|
"signature": "(property) keepReadme?: boolean | undefined",
|
|
@@ -1295,7 +1315,7 @@
|
|
|
1295
1315
|
"__schema": "KeywordTypeSchema",
|
|
1296
1316
|
"location": {
|
|
1297
1317
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1298
|
-
"line":
|
|
1318
|
+
"line": 50,
|
|
1299
1319
|
"character": 16
|
|
1300
1320
|
},
|
|
1301
1321
|
"name": "boolean"
|
|
@@ -1306,7 +1326,7 @@
|
|
|
1306
1326
|
"__schema": "VariableLikeSchema",
|
|
1307
1327
|
"location": {
|
|
1308
1328
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1309
|
-
"line":
|
|
1329
|
+
"line": 51,
|
|
1310
1330
|
"character": 3
|
|
1311
1331
|
},
|
|
1312
1332
|
"signature": "(property) squash?: boolean | undefined",
|
|
@@ -1315,7 +1335,7 @@
|
|
|
1315
1335
|
"__schema": "KeywordTypeSchema",
|
|
1316
1336
|
"location": {
|
|
1317
1337
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1318
|
-
"line":
|
|
1338
|
+
"line": 51,
|
|
1319
1339
|
"character": 12
|
|
1320
1340
|
},
|
|
1321
1341
|
"name": "boolean"
|
|
@@ -1326,7 +1346,7 @@
|
|
|
1326
1346
|
"__schema": "VariableLikeSchema",
|
|
1327
1347
|
"location": {
|
|
1328
1348
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1329
|
-
"line":
|
|
1349
|
+
"line": 52,
|
|
1330
1350
|
"character": 3
|
|
1331
1351
|
},
|
|
1332
1352
|
"signature": "(property) noSquash?: boolean | undefined",
|
|
@@ -1335,7 +1355,7 @@
|
|
|
1335
1355
|
"__schema": "KeywordTypeSchema",
|
|
1336
1356
|
"location": {
|
|
1337
1357
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1338
|
-
"line":
|
|
1358
|
+
"line": 52,
|
|
1339
1359
|
"character": 14
|
|
1340
1360
|
},
|
|
1341
1361
|
"name": "boolean"
|
|
@@ -1346,7 +1366,7 @@
|
|
|
1346
1366
|
"__schema": "VariableLikeSchema",
|
|
1347
1367
|
"location": {
|
|
1348
1368
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1349
|
-
"line":
|
|
1369
|
+
"line": 53,
|
|
1350
1370
|
"character": 3
|
|
1351
1371
|
},
|
|
1352
1372
|
"signature": "(property) tag?: boolean | undefined",
|
|
@@ -1355,7 +1375,7 @@
|
|
|
1355
1375
|
"__schema": "KeywordTypeSchema",
|
|
1356
1376
|
"location": {
|
|
1357
1377
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1358
|
-
"line":
|
|
1378
|
+
"line": 53,
|
|
1359
1379
|
"character": 9
|
|
1360
1380
|
},
|
|
1361
1381
|
"name": "boolean"
|
|
@@ -1366,7 +1386,7 @@
|
|
|
1366
1386
|
"__schema": "VariableLikeSchema",
|
|
1367
1387
|
"location": {
|
|
1368
1388
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1369
|
-
"line":
|
|
1389
|
+
"line": 54,
|
|
1370
1390
|
"character": 3
|
|
1371
1391
|
},
|
|
1372
1392
|
"signature": "(property) pattern?: string | undefined",
|
|
@@ -1375,7 +1395,7 @@
|
|
|
1375
1395
|
"__schema": "KeywordTypeSchema",
|
|
1376
1396
|
"location": {
|
|
1377
1397
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1378
|
-
"line":
|
|
1398
|
+
"line": 54,
|
|
1379
1399
|
"character": 13
|
|
1380
1400
|
},
|
|
1381
1401
|
"name": "string"
|
|
@@ -1386,7 +1406,7 @@
|
|
|
1386
1406
|
"__schema": "VariableLikeSchema",
|
|
1387
1407
|
"location": {
|
|
1388
1408
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1389
|
-
"line":
|
|
1409
|
+
"line": 55,
|
|
1390
1410
|
"character": 3
|
|
1391
1411
|
},
|
|
1392
1412
|
"signature": "(property) includeDeps?: boolean | undefined",
|
|
@@ -1395,7 +1415,7 @@
|
|
|
1395
1415
|
"__schema": "KeywordTypeSchema",
|
|
1396
1416
|
"location": {
|
|
1397
1417
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1398
|
-
"line":
|
|
1418
|
+
"line": 55,
|
|
1399
1419
|
"character": 17
|
|
1400
1420
|
},
|
|
1401
1421
|
"name": "boolean"
|
|
@@ -1406,7 +1426,7 @@
|
|
|
1406
1426
|
"__schema": "VariableLikeSchema",
|
|
1407
1427
|
"location": {
|
|
1408
1428
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1409
|
-
"line":
|
|
1429
|
+
"line": 56,
|
|
1410
1430
|
"character": 3
|
|
1411
1431
|
},
|
|
1412
1432
|
"signature": "(property) skipDependencyInstallation?: boolean | undefined",
|
|
@@ -1415,7 +1435,7 @@
|
|
|
1415
1435
|
"__schema": "KeywordTypeSchema",
|
|
1416
1436
|
"location": {
|
|
1417
1437
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1418
|
-
"line":
|
|
1438
|
+
"line": 56,
|
|
1419
1439
|
"character": 32
|
|
1420
1440
|
},
|
|
1421
1441
|
"name": "boolean"
|
|
@@ -1426,7 +1446,7 @@
|
|
|
1426
1446
|
"__schema": "VariableLikeSchema",
|
|
1427
1447
|
"location": {
|
|
1428
1448
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1429
|
-
"line":
|
|
1449
|
+
"line": 57,
|
|
1430
1450
|
"character": 3
|
|
1431
1451
|
},
|
|
1432
1452
|
"signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
|
|
@@ -1435,7 +1455,7 @@
|
|
|
1435
1455
|
"__schema": "TypeRefSchema",
|
|
1436
1456
|
"location": {
|
|
1437
1457
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1438
|
-
"line":
|
|
1458
|
+
"line": 57,
|
|
1439
1459
|
"character": 22
|
|
1440
1460
|
},
|
|
1441
1461
|
"name": "MergeStrategy"
|
|
@@ -1446,7 +1466,7 @@
|
|
|
1446
1466
|
"__schema": "VariableLikeSchema",
|
|
1447
1467
|
"location": {
|
|
1448
1468
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1449
|
-
"line":
|
|
1469
|
+
"line": 58,
|
|
1450
1470
|
"character": 3
|
|
1451
1471
|
},
|
|
1452
1472
|
"signature": "(property) ignoreConfigChanges?: boolean | undefined",
|
|
@@ -1455,7 +1475,7 @@
|
|
|
1455
1475
|
"__schema": "KeywordTypeSchema",
|
|
1456
1476
|
"location": {
|
|
1457
1477
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1458
|
-
"line":
|
|
1478
|
+
"line": 58,
|
|
1459
1479
|
"character": 25
|
|
1460
1480
|
},
|
|
1461
1481
|
"name": "boolean"
|
|
@@ -1466,7 +1486,7 @@
|
|
|
1466
1486
|
"__schema": "VariableLikeSchema",
|
|
1467
1487
|
"location": {
|
|
1468
1488
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1469
|
-
"line":
|
|
1489
|
+
"line": 59,
|
|
1470
1490
|
"character": 3
|
|
1471
1491
|
},
|
|
1472
1492
|
"signature": "(property) skipFetch?: boolean | undefined",
|
|
@@ -1475,7 +1495,7 @@
|
|
|
1475
1495
|
"__schema": "KeywordTypeSchema",
|
|
1476
1496
|
"location": {
|
|
1477
1497
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1478
|
-
"line":
|
|
1498
|
+
"line": 59,
|
|
1479
1499
|
"character": 15
|
|
1480
1500
|
},
|
|
1481
1501
|
"name": "boolean"
|
|
@@ -1486,7 +1506,7 @@
|
|
|
1486
1506
|
"__schema": "VariableLikeSchema",
|
|
1487
1507
|
"location": {
|
|
1488
1508
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1489
|
-
"line":
|
|
1509
|
+
"line": 60,
|
|
1490
1510
|
"character": 3
|
|
1491
1511
|
},
|
|
1492
1512
|
"signature": "(property) excludeNonLaneComps?: boolean | undefined",
|
|
@@ -1495,7 +1515,7 @@
|
|
|
1495
1515
|
"__schema": "KeywordTypeSchema",
|
|
1496
1516
|
"location": {
|
|
1497
1517
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1498
|
-
"line":
|
|
1518
|
+
"line": 60,
|
|
1499
1519
|
"character": 25
|
|
1500
1520
|
},
|
|
1501
1521
|
"name": "boolean"
|
|
@@ -1506,7 +1526,7 @@
|
|
|
1506
1526
|
"__schema": "VariableLikeSchema",
|
|
1507
1527
|
"location": {
|
|
1508
1528
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1509
|
-
"line":
|
|
1529
|
+
"line": 61,
|
|
1510
1530
|
"character": 3
|
|
1511
1531
|
},
|
|
1512
1532
|
"signature": "(property) shouldIncludeUpdateDependents?: boolean | undefined",
|
|
@@ -1515,7 +1535,7 @@
|
|
|
1515
1535
|
"__schema": "KeywordTypeSchema",
|
|
1516
1536
|
"location": {
|
|
1517
1537
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1518
|
-
"line":
|
|
1538
|
+
"line": 61,
|
|
1519
1539
|
"character": 35
|
|
1520
1540
|
},
|
|
1521
1541
|
"name": "boolean"
|
|
@@ -1526,7 +1546,7 @@
|
|
|
1526
1546
|
"__schema": "VariableLikeSchema",
|
|
1527
1547
|
"location": {
|
|
1528
1548
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1529
|
-
"line":
|
|
1549
|
+
"line": 62,
|
|
1530
1550
|
"character": 3
|
|
1531
1551
|
},
|
|
1532
1552
|
"signature": "(property) throwIfNotUpToDate?: boolean | undefined",
|
|
@@ -1535,7 +1555,7 @@
|
|
|
1535
1555
|
"__schema": "KeywordTypeSchema",
|
|
1536
1556
|
"location": {
|
|
1537
1557
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1538
|
-
"line":
|
|
1558
|
+
"line": 62,
|
|
1539
1559
|
"character": 24
|
|
1540
1560
|
},
|
|
1541
1561
|
"name": "boolean"
|
|
@@ -1546,7 +1566,7 @@
|
|
|
1546
1566
|
"__schema": "VariableLikeSchema",
|
|
1547
1567
|
"location": {
|
|
1548
1568
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1549
|
-
"line":
|
|
1569
|
+
"line": 63,
|
|
1550
1570
|
"character": 3
|
|
1551
1571
|
},
|
|
1552
1572
|
"signature": "(property) fetchCurrent?: boolean | undefined",
|
|
@@ -1555,7 +1575,7 @@
|
|
|
1555
1575
|
"__schema": "KeywordTypeSchema",
|
|
1556
1576
|
"location": {
|
|
1557
1577
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1558
|
-
"line":
|
|
1578
|
+
"line": 63,
|
|
1559
1579
|
"character": 18
|
|
1560
1580
|
},
|
|
1561
1581
|
"name": "boolean"
|
|
@@ -1569,7 +1589,7 @@
|
|
|
1569
1589
|
"__schema": "TypeSchema",
|
|
1570
1590
|
"location": {
|
|
1571
1591
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1572
|
-
"line":
|
|
1592
|
+
"line": 65,
|
|
1573
1593
|
"character": 1
|
|
1574
1594
|
},
|
|
1575
1595
|
"signature": "type ConflictPerId = {\n id: ComponentID;\n files: string[];\n config?: boolean | undefined;\n}",
|
|
@@ -1578,7 +1598,7 @@
|
|
|
1578
1598
|
"__schema": "TypeLiteralSchema",
|
|
1579
1599
|
"location": {
|
|
1580
1600
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1581
|
-
"line":
|
|
1601
|
+
"line": 65,
|
|
1582
1602
|
"character": 29
|
|
1583
1603
|
},
|
|
1584
1604
|
"members": [
|
|
@@ -1586,7 +1606,7 @@
|
|
|
1586
1606
|
"__schema": "VariableLikeSchema",
|
|
1587
1607
|
"location": {
|
|
1588
1608
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1589
|
-
"line":
|
|
1609
|
+
"line": 65,
|
|
1590
1610
|
"character": 31
|
|
1591
1611
|
},
|
|
1592
1612
|
"signature": "(property) id: ComponentID",
|
|
@@ -1595,7 +1615,7 @@
|
|
|
1595
1615
|
"__schema": "TypeRefSchema",
|
|
1596
1616
|
"location": {
|
|
1597
1617
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1598
|
-
"line":
|
|
1618
|
+
"line": 65,
|
|
1599
1619
|
"character": 31
|
|
1600
1620
|
},
|
|
1601
1621
|
"name": "ComponentID",
|
|
@@ -1611,7 +1631,7 @@
|
|
|
1611
1631
|
"__schema": "VariableLikeSchema",
|
|
1612
1632
|
"location": {
|
|
1613
1633
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1614
|
-
"line":
|
|
1634
|
+
"line": 65,
|
|
1615
1635
|
"character": 48
|
|
1616
1636
|
},
|
|
1617
1637
|
"signature": "(property) files: string[]",
|
|
@@ -1620,14 +1640,14 @@
|
|
|
1620
1640
|
"__schema": "TypeArraySchema",
|
|
1621
1641
|
"location": {
|
|
1622
1642
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1623
|
-
"line":
|
|
1643
|
+
"line": 65,
|
|
1624
1644
|
"character": 55
|
|
1625
1645
|
},
|
|
1626
1646
|
"type": {
|
|
1627
1647
|
"__schema": "KeywordTypeSchema",
|
|
1628
1648
|
"location": {
|
|
1629
1649
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1630
|
-
"line":
|
|
1650
|
+
"line": 65,
|
|
1631
1651
|
"character": 55
|
|
1632
1652
|
},
|
|
1633
1653
|
"name": "string"
|
|
@@ -1639,7 +1659,7 @@
|
|
|
1639
1659
|
"__schema": "VariableLikeSchema",
|
|
1640
1660
|
"location": {
|
|
1641
1661
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1642
|
-
"line":
|
|
1662
|
+
"line": 65,
|
|
1643
1663
|
"character": 65
|
|
1644
1664
|
},
|
|
1645
1665
|
"signature": "(property) config?: boolean | undefined",
|
|
@@ -1648,7 +1668,7 @@
|
|
|
1648
1668
|
"__schema": "KeywordTypeSchema",
|
|
1649
1669
|
"location": {
|
|
1650
1670
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1651
|
-
"line":
|
|
1671
|
+
"line": 65,
|
|
1652
1672
|
"character": 74
|
|
1653
1673
|
},
|
|
1654
1674
|
"name": "boolean"
|
|
@@ -1662,7 +1682,7 @@
|
|
|
1662
1682
|
"__schema": "TypeSchema",
|
|
1663
1683
|
"location": {
|
|
1664
1684
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1665
|
-
"line":
|
|
1685
|
+
"line": 66,
|
|
1666
1686
|
"character": 1
|
|
1667
1687
|
},
|
|
1668
1688
|
"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}",
|
|
@@ -1671,7 +1691,7 @@
|
|
|
1671
1691
|
"__schema": "TypeLiteralSchema",
|
|
1672
1692
|
"location": {
|
|
1673
1693
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1674
|
-
"line":
|
|
1694
|
+
"line": 66,
|
|
1675
1695
|
"character": 36
|
|
1676
1696
|
},
|
|
1677
1697
|
"members": [
|
|
@@ -1679,7 +1699,7 @@
|
|
|
1679
1699
|
"__schema": "VariableLikeSchema",
|
|
1680
1700
|
"location": {
|
|
1681
1701
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1682
|
-
"line":
|
|
1702
|
+
"line": 67,
|
|
1683
1703
|
"character": 3
|
|
1684
1704
|
},
|
|
1685
1705
|
"signature": "(property) mergedNow: ComponentID[]",
|
|
@@ -1688,14 +1708,14 @@
|
|
|
1688
1708
|
"__schema": "TypeArraySchema",
|
|
1689
1709
|
"location": {
|
|
1690
1710
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1691
|
-
"line":
|
|
1711
|
+
"line": 67,
|
|
1692
1712
|
"character": 14
|
|
1693
1713
|
},
|
|
1694
1714
|
"type": {
|
|
1695
1715
|
"__schema": "TypeRefSchema",
|
|
1696
1716
|
"location": {
|
|
1697
1717
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1698
|
-
"line":
|
|
1718
|
+
"line": 67,
|
|
1699
1719
|
"character": 14
|
|
1700
1720
|
},
|
|
1701
1721
|
"name": "ComponentID"
|
|
@@ -1707,7 +1727,7 @@
|
|
|
1707
1727
|
"__schema": "VariableLikeSchema",
|
|
1708
1728
|
"location": {
|
|
1709
1729
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1710
|
-
"line":
|
|
1730
|
+
"line": 68,
|
|
1711
1731
|
"character": 3
|
|
1712
1732
|
},
|
|
1713
1733
|
"signature": "(property) exportedIds: ComponentID[]",
|
|
@@ -1716,14 +1736,14 @@
|
|
|
1716
1736
|
"__schema": "TypeArraySchema",
|
|
1717
1737
|
"location": {
|
|
1718
1738
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1719
|
-
"line":
|
|
1739
|
+
"line": 68,
|
|
1720
1740
|
"character": 16
|
|
1721
1741
|
},
|
|
1722
1742
|
"type": {
|
|
1723
1743
|
"__schema": "TypeRefSchema",
|
|
1724
1744
|
"location": {
|
|
1725
1745
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1726
|
-
"line":
|
|
1746
|
+
"line": 68,
|
|
1727
1747
|
"character": 16
|
|
1728
1748
|
},
|
|
1729
1749
|
"name": "ComponentID"
|
|
@@ -1735,7 +1755,7 @@
|
|
|
1735
1755
|
"__schema": "VariableLikeSchema",
|
|
1736
1756
|
"location": {
|
|
1737
1757
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1738
|
-
"line":
|
|
1758
|
+
"line": 69,
|
|
1739
1759
|
"character": 3
|
|
1740
1760
|
},
|
|
1741
1761
|
"signature": "(property) unmerged: {\n id: ComponentID;\n reason: string;\n}[]",
|
|
@@ -1744,14 +1764,14 @@
|
|
|
1744
1764
|
"__schema": "TypeArraySchema",
|
|
1745
1765
|
"location": {
|
|
1746
1766
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1747
|
-
"line":
|
|
1767
|
+
"line": 69,
|
|
1748
1768
|
"character": 13
|
|
1749
1769
|
},
|
|
1750
1770
|
"type": {
|
|
1751
1771
|
"__schema": "TypeLiteralSchema",
|
|
1752
1772
|
"location": {
|
|
1753
1773
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1754
|
-
"line":
|
|
1774
|
+
"line": 69,
|
|
1755
1775
|
"character": 13
|
|
1756
1776
|
},
|
|
1757
1777
|
"members": [
|
|
@@ -1759,7 +1779,7 @@
|
|
|
1759
1779
|
"__schema": "VariableLikeSchema",
|
|
1760
1780
|
"location": {
|
|
1761
1781
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1762
|
-
"line":
|
|
1782
|
+
"line": 69,
|
|
1763
1783
|
"character": 15
|
|
1764
1784
|
},
|
|
1765
1785
|
"signature": "(property) id: ComponentID",
|
|
@@ -1768,7 +1788,7 @@
|
|
|
1768
1788
|
"__schema": "TypeRefSchema",
|
|
1769
1789
|
"location": {
|
|
1770
1790
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1771
|
-
"line":
|
|
1791
|
+
"line": 69,
|
|
1772
1792
|
"character": 15
|
|
1773
1793
|
},
|
|
1774
1794
|
"name": "ComponentID",
|
|
@@ -1784,7 +1804,7 @@
|
|
|
1784
1804
|
"__schema": "VariableLikeSchema",
|
|
1785
1805
|
"location": {
|
|
1786
1806
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1787
|
-
"line":
|
|
1807
|
+
"line": 69,
|
|
1788
1808
|
"character": 32
|
|
1789
1809
|
},
|
|
1790
1810
|
"signature": "(property) reason: string",
|
|
@@ -1793,7 +1813,7 @@
|
|
|
1793
1813
|
"__schema": "KeywordTypeSchema",
|
|
1794
1814
|
"location": {
|
|
1795
1815
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1796
|
-
"line":
|
|
1816
|
+
"line": 69,
|
|
1797
1817
|
"character": 40
|
|
1798
1818
|
},
|
|
1799
1819
|
"name": "string"
|
|
@@ -1809,7 +1829,7 @@
|
|
|
1809
1829
|
"__schema": "VariableLikeSchema",
|
|
1810
1830
|
"location": {
|
|
1811
1831
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1812
|
-
"line":
|
|
1832
|
+
"line": 70,
|
|
1813
1833
|
"character": 3
|
|
1814
1834
|
},
|
|
1815
1835
|
"signature": "(property) conflicts?: ConflictPerId[] | undefined",
|
|
@@ -1818,14 +1838,14 @@
|
|
|
1818
1838
|
"__schema": "TypeArraySchema",
|
|
1819
1839
|
"location": {
|
|
1820
1840
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1821
|
-
"line":
|
|
1841
|
+
"line": 70,
|
|
1822
1842
|
"character": 15
|
|
1823
1843
|
},
|
|
1824
1844
|
"type": {
|
|
1825
1845
|
"__schema": "TypeRefSchema",
|
|
1826
1846
|
"location": {
|
|
1827
1847
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1828
|
-
"line":
|
|
1848
|
+
"line": 70,
|
|
1829
1849
|
"character": 15
|
|
1830
1850
|
},
|
|
1831
1851
|
"name": "ConflictPerId"
|
|
@@ -1837,7 +1857,7 @@
|
|
|
1837
1857
|
"__schema": "VariableLikeSchema",
|
|
1838
1858
|
"location": {
|
|
1839
1859
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1840
|
-
"line":
|
|
1860
|
+
"line": 71,
|
|
1841
1861
|
"character": 3
|
|
1842
1862
|
},
|
|
1843
1863
|
"signature": "(property) snappedIds?: ComponentID[] | undefined",
|
|
@@ -1846,14 +1866,14 @@
|
|
|
1846
1866
|
"__schema": "TypeArraySchema",
|
|
1847
1867
|
"location": {
|
|
1848
1868
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1849
|
-
"line":
|
|
1869
|
+
"line": 71,
|
|
1850
1870
|
"character": 16
|
|
1851
1871
|
},
|
|
1852
1872
|
"type": {
|
|
1853
1873
|
"__schema": "TypeRefSchema",
|
|
1854
1874
|
"location": {
|
|
1855
1875
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1856
|
-
"line":
|
|
1876
|
+
"line": 71,
|
|
1857
1877
|
"character": 16
|
|
1858
1878
|
},
|
|
1859
1879
|
"name": "ComponentID"
|
|
@@ -1865,7 +1885,7 @@
|
|
|
1865
1885
|
"__schema": "VariableLikeSchema",
|
|
1866
1886
|
"location": {
|
|
1867
1887
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1868
|
-
"line":
|
|
1888
|
+
"line": 72,
|
|
1869
1889
|
"character": 3
|
|
1870
1890
|
},
|
|
1871
1891
|
"signature": "(property) mergedPreviously: ComponentID[]",
|
|
@@ -1874,14 +1894,14 @@
|
|
|
1874
1894
|
"__schema": "TypeArraySchema",
|
|
1875
1895
|
"location": {
|
|
1876
1896
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1877
|
-
"line":
|
|
1897
|
+
"line": 72,
|
|
1878
1898
|
"character": 21
|
|
1879
1899
|
},
|
|
1880
1900
|
"type": {
|
|
1881
1901
|
"__schema": "TypeRefSchema",
|
|
1882
1902
|
"location": {
|
|
1883
1903
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1884
|
-
"line":
|
|
1904
|
+
"line": 72,
|
|
1885
1905
|
"character": 21
|
|
1886
1906
|
},
|
|
1887
1907
|
"name": "ComponentID"
|
|
@@ -1893,7 +1913,7 @@
|
|
|
1893
1913
|
"__schema": "VariableLikeSchema",
|
|
1894
1914
|
"location": {
|
|
1895
1915
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1896
|
-
"line":
|
|
1916
|
+
"line": 73,
|
|
1897
1917
|
"character": 3
|
|
1898
1918
|
},
|
|
1899
1919
|
"signature": "(property) mergeSnapError?: Error | undefined",
|
|
@@ -1902,7 +1922,7 @@
|
|
|
1902
1922
|
"__schema": "TypeRefSchema",
|
|
1903
1923
|
"location": {
|
|
1904
1924
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1905
|
-
"line":
|
|
1925
|
+
"line": 73,
|
|
1906
1926
|
"character": 20
|
|
1907
1927
|
},
|
|
1908
1928
|
"name": "Error"
|
|
@@ -1916,7 +1936,7 @@
|
|
|
1916
1936
|
"__schema": "ClassSchema",
|
|
1917
1937
|
"location": {
|
|
1918
1938
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1919
|
-
"line":
|
|
1939
|
+
"line": 76,
|
|
1920
1940
|
"character": 1
|
|
1921
1941
|
},
|
|
1922
1942
|
"signature": "class MergeLanesMain",
|
|
@@ -1926,7 +1946,7 @@
|
|
|
1926
1946
|
"__schema": "ConstructorSchema",
|
|
1927
1947
|
"location": {
|
|
1928
1948
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1929
|
-
"line":
|
|
1949
|
+
"line": 77,
|
|
1930
1950
|
"character": 3
|
|
1931
1951
|
},
|
|
1932
1952
|
"signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
|
|
@@ -1936,7 +1956,7 @@
|
|
|
1936
1956
|
"__schema": "ParameterSchema",
|
|
1937
1957
|
"location": {
|
|
1938
1958
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1939
|
-
"line":
|
|
1959
|
+
"line": 78,
|
|
1940
1960
|
"character": 5
|
|
1941
1961
|
},
|
|
1942
1962
|
"name": "workspace",
|
|
@@ -1944,7 +1964,7 @@
|
|
|
1944
1964
|
"__schema": "TypeUnionSchema",
|
|
1945
1965
|
"location": {
|
|
1946
1966
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1947
|
-
"line":
|
|
1967
|
+
"line": 78,
|
|
1948
1968
|
"character": 24
|
|
1949
1969
|
},
|
|
1950
1970
|
"types": [
|
|
@@ -1952,7 +1972,7 @@
|
|
|
1952
1972
|
"__schema": "TypeRefSchema",
|
|
1953
1973
|
"location": {
|
|
1954
1974
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1955
|
-
"line":
|
|
1975
|
+
"line": 78,
|
|
1956
1976
|
"character": 24
|
|
1957
1977
|
},
|
|
1958
1978
|
"name": "Workspace"
|
|
@@ -1961,7 +1981,7 @@
|
|
|
1961
1981
|
"__schema": "KeywordTypeSchema",
|
|
1962
1982
|
"location": {
|
|
1963
1983
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1964
|
-
"line":
|
|
1984
|
+
"line": 78,
|
|
1965
1985
|
"character": 36
|
|
1966
1986
|
},
|
|
1967
1987
|
"name": "undefined"
|
|
@@ -1975,7 +1995,7 @@
|
|
|
1975
1995
|
"__schema": "ParameterSchema",
|
|
1976
1996
|
"location": {
|
|
1977
1997
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1978
|
-
"line":
|
|
1998
|
+
"line": 79,
|
|
1979
1999
|
"character": 5
|
|
1980
2000
|
},
|
|
1981
2001
|
"name": "merging",
|
|
@@ -1983,7 +2003,7 @@
|
|
|
1983
2003
|
"__schema": "TypeRefSchema",
|
|
1984
2004
|
"location": {
|
|
1985
2005
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1986
|
-
"line":
|
|
2006
|
+
"line": 79,
|
|
1987
2007
|
"character": 22
|
|
1988
2008
|
},
|
|
1989
2009
|
"name": "MergingMain"
|
|
@@ -1995,7 +2015,7 @@
|
|
|
1995
2015
|
"__schema": "ParameterSchema",
|
|
1996
2016
|
"location": {
|
|
1997
2017
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1998
|
-
"line":
|
|
2018
|
+
"line": 80,
|
|
1999
2019
|
"character": 5
|
|
2000
2020
|
},
|
|
2001
2021
|
"name": "lanes",
|
|
@@ -2003,7 +2023,7 @@
|
|
|
2003
2023
|
"__schema": "TypeRefSchema",
|
|
2004
2024
|
"location": {
|
|
2005
2025
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2006
|
-
"line":
|
|
2026
|
+
"line": 80,
|
|
2007
2027
|
"character": 21
|
|
2008
2028
|
},
|
|
2009
2029
|
"name": "LanesMain"
|
|
@@ -2015,7 +2035,7 @@
|
|
|
2015
2035
|
"__schema": "ParameterSchema",
|
|
2016
2036
|
"location": {
|
|
2017
2037
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2018
|
-
"line":
|
|
2038
|
+
"line": 81,
|
|
2019
2039
|
"character": 5
|
|
2020
2040
|
},
|
|
2021
2041
|
"name": "logger",
|
|
@@ -2023,7 +2043,7 @@
|
|
|
2023
2043
|
"__schema": "TypeRefSchema",
|
|
2024
2044
|
"location": {
|
|
2025
2045
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2026
|
-
"line":
|
|
2046
|
+
"line": 81,
|
|
2027
2047
|
"character": 22
|
|
2028
2048
|
},
|
|
2029
2049
|
"name": "Logger"
|
|
@@ -2035,7 +2055,7 @@
|
|
|
2035
2055
|
"__schema": "ParameterSchema",
|
|
2036
2056
|
"location": {
|
|
2037
2057
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2038
|
-
"line":
|
|
2058
|
+
"line": 82,
|
|
2039
2059
|
"character": 5
|
|
2040
2060
|
},
|
|
2041
2061
|
"name": "remove",
|
|
@@ -2043,7 +2063,7 @@
|
|
|
2043
2063
|
"__schema": "TypeRefSchema",
|
|
2044
2064
|
"location": {
|
|
2045
2065
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2046
|
-
"line":
|
|
2066
|
+
"line": 82,
|
|
2047
2067
|
"character": 21
|
|
2048
2068
|
},
|
|
2049
2069
|
"name": "RemoveMain"
|
|
@@ -2055,7 +2075,7 @@
|
|
|
2055
2075
|
"__schema": "ParameterSchema",
|
|
2056
2076
|
"location": {
|
|
2057
2077
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2058
|
-
"line":
|
|
2078
|
+
"line": 83,
|
|
2059
2079
|
"character": 5
|
|
2060
2080
|
},
|
|
2061
2081
|
"name": "scope",
|
|
@@ -2063,7 +2083,7 @@
|
|
|
2063
2083
|
"__schema": "TypeRefSchema",
|
|
2064
2084
|
"location": {
|
|
2065
2085
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2066
|
-
"line":
|
|
2086
|
+
"line": 83,
|
|
2067
2087
|
"character": 20
|
|
2068
2088
|
},
|
|
2069
2089
|
"name": "ScopeMain"
|
|
@@ -2075,7 +2095,7 @@
|
|
|
2075
2095
|
"__schema": "ParameterSchema",
|
|
2076
2096
|
"location": {
|
|
2077
2097
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2078
|
-
"line":
|
|
2098
|
+
"line": 84,
|
|
2079
2099
|
"character": 5
|
|
2080
2100
|
},
|
|
2081
2101
|
"name": "exporter",
|
|
@@ -2083,7 +2103,7 @@
|
|
|
2083
2103
|
"__schema": "TypeRefSchema",
|
|
2084
2104
|
"location": {
|
|
2085
2105
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2086
|
-
"line":
|
|
2106
|
+
"line": 84,
|
|
2087
2107
|
"character": 23
|
|
2088
2108
|
},
|
|
2089
2109
|
"name": "ExportMain"
|
|
@@ -2095,7 +2115,7 @@
|
|
|
2095
2115
|
"__schema": "ParameterSchema",
|
|
2096
2116
|
"location": {
|
|
2097
2117
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2098
|
-
"line":
|
|
2118
|
+
"line": 85,
|
|
2099
2119
|
"character": 5
|
|
2100
2120
|
},
|
|
2101
2121
|
"name": "importer",
|
|
@@ -2103,7 +2123,7 @@
|
|
|
2103
2123
|
"__schema": "TypeRefSchema",
|
|
2104
2124
|
"location": {
|
|
2105
2125
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2106
|
-
"line":
|
|
2126
|
+
"line": 85,
|
|
2107
2127
|
"character": 23
|
|
2108
2128
|
},
|
|
2109
2129
|
"name": "ImporterMain"
|
|
@@ -2115,7 +2135,7 @@
|
|
|
2115
2135
|
"__schema": "ParameterSchema",
|
|
2116
2136
|
"location": {
|
|
2117
2137
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2118
|
-
"line":
|
|
2138
|
+
"line": 86,
|
|
2119
2139
|
"character": 5
|
|
2120
2140
|
},
|
|
2121
2141
|
"name": "checkout",
|
|
@@ -2123,7 +2143,7 @@
|
|
|
2123
2143
|
"__schema": "TypeRefSchema",
|
|
2124
2144
|
"location": {
|
|
2125
2145
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2126
|
-
"line":
|
|
2146
|
+
"line": 86,
|
|
2127
2147
|
"character": 23
|
|
2128
2148
|
},
|
|
2129
2149
|
"name": "CheckoutMain"
|
|
@@ -2136,7 +2156,7 @@
|
|
|
2136
2156
|
"__schema": "ThisTypeSchema",
|
|
2137
2157
|
"location": {
|
|
2138
2158
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2139
|
-
"line":
|
|
2159
|
+
"line": 76,
|
|
2140
2160
|
"character": 1
|
|
2141
2161
|
},
|
|
2142
2162
|
"name": "MergeLanesMain"
|
|
@@ -2147,7 +2167,7 @@
|
|
|
2147
2167
|
"__schema": "FunctionLikeSchema",
|
|
2148
2168
|
"location": {
|
|
2149
2169
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2150
|
-
"line":
|
|
2170
|
+
"line": 89,
|
|
2151
2171
|
"character": 3
|
|
2152
2172
|
},
|
|
2153
2173
|
"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}>",
|
|
@@ -2157,7 +2177,7 @@
|
|
|
2157
2177
|
"__schema": "ParameterSchema",
|
|
2158
2178
|
"location": {
|
|
2159
2179
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2160
|
-
"line":
|
|
2180
|
+
"line": 89,
|
|
2161
2181
|
"character": 24
|
|
2162
2182
|
},
|
|
2163
2183
|
"name": "laneName",
|
|
@@ -2165,7 +2185,7 @@
|
|
|
2165
2185
|
"__schema": "KeywordTypeSchema",
|
|
2166
2186
|
"location": {
|
|
2167
2187
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2168
|
-
"line":
|
|
2188
|
+
"line": 89,
|
|
2169
2189
|
"character": 34
|
|
2170
2190
|
},
|
|
2171
2191
|
"name": "string"
|
|
@@ -2177,7 +2197,7 @@
|
|
|
2177
2197
|
"__schema": "ParameterSchema",
|
|
2178
2198
|
"location": {
|
|
2179
2199
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2180
|
-
"line":
|
|
2200
|
+
"line": 89,
|
|
2181
2201
|
"character": 42
|
|
2182
2202
|
},
|
|
2183
2203
|
"name": "options",
|
|
@@ -2185,7 +2205,7 @@
|
|
|
2185
2205
|
"__schema": "TypeRefSchema",
|
|
2186
2206
|
"location": {
|
|
2187
2207
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2188
|
-
"line":
|
|
2208
|
+
"line": 89,
|
|
2189
2209
|
"character": 51
|
|
2190
2210
|
},
|
|
2191
2211
|
"name": "MergeLaneOptions"
|
|
@@ -2198,7 +2218,7 @@
|
|
|
2198
2218
|
"__schema": "InferenceTypeSchema",
|
|
2199
2219
|
"location": {
|
|
2200
2220
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2201
|
-
"line":
|
|
2221
|
+
"line": 89,
|
|
2202
2222
|
"character": 3
|
|
2203
2223
|
},
|
|
2204
2224
|
"type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
|
|
@@ -2211,7 +2231,7 @@
|
|
|
2211
2231
|
"__schema": "FunctionLikeSchema",
|
|
2212
2232
|
"location": {
|
|
2213
2233
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2214
|
-
"line":
|
|
2234
|
+
"line": 99,
|
|
2215
2235
|
"character": 3
|
|
2216
2236
|
},
|
|
2217
2237
|
"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}>",
|
|
@@ -2221,7 +2241,7 @@
|
|
|
2221
2241
|
"__schema": "ParameterSchema",
|
|
2222
2242
|
"location": {
|
|
2223
2243
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2224
|
-
"line":
|
|
2244
|
+
"line": 100,
|
|
2225
2245
|
"character": 5
|
|
2226
2246
|
},
|
|
2227
2247
|
"name": "otherLaneId",
|
|
@@ -2229,7 +2249,7 @@
|
|
|
2229
2249
|
"__schema": "TypeRefSchema",
|
|
2230
2250
|
"location": {
|
|
2231
2251
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2232
|
-
"line":
|
|
2252
|
+
"line": 100,
|
|
2233
2253
|
"character": 18
|
|
2234
2254
|
},
|
|
2235
2255
|
"name": "LaneId"
|
|
@@ -2241,7 +2261,7 @@
|
|
|
2241
2261
|
"__schema": "ParameterSchema",
|
|
2242
2262
|
"location": {
|
|
2243
2263
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2244
|
-
"line":
|
|
2264
|
+
"line": 101,
|
|
2245
2265
|
"character": 5
|
|
2246
2266
|
},
|
|
2247
2267
|
"name": "currentLaneId",
|
|
@@ -2249,7 +2269,7 @@
|
|
|
2249
2269
|
"__schema": "TypeRefSchema",
|
|
2250
2270
|
"location": {
|
|
2251
2271
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2252
|
-
"line":
|
|
2272
|
+
"line": 101,
|
|
2253
2273
|
"character": 20
|
|
2254
2274
|
},
|
|
2255
2275
|
"name": "LaneId"
|
|
@@ -2261,7 +2281,7 @@
|
|
|
2261
2281
|
"__schema": "ParameterSchema",
|
|
2262
2282
|
"location": {
|
|
2263
2283
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2264
|
-
"line":
|
|
2284
|
+
"line": 102,
|
|
2265
2285
|
"character": 5
|
|
2266
2286
|
},
|
|
2267
2287
|
"name": "options",
|
|
@@ -2269,7 +2289,7 @@
|
|
|
2269
2289
|
"__schema": "TypeRefSchema",
|
|
2270
2290
|
"location": {
|
|
2271
2291
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2272
|
-
"line":
|
|
2292
|
+
"line": 102,
|
|
2273
2293
|
"character": 14
|
|
2274
2294
|
},
|
|
2275
2295
|
"name": "MergeLaneOptions"
|
|
@@ -2282,7 +2302,7 @@
|
|
|
2282
2302
|
"__schema": "TypeRefSchema",
|
|
2283
2303
|
"location": {
|
|
2284
2304
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2285
|
-
"line":
|
|
2305
|
+
"line": 103,
|
|
2286
2306
|
"character": 6
|
|
2287
2307
|
},
|
|
2288
2308
|
"name": "Promise",
|
|
@@ -2291,7 +2311,7 @@
|
|
|
2291
2311
|
"__schema": "TypeLiteralSchema",
|
|
2292
2312
|
"location": {
|
|
2293
2313
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2294
|
-
"line":
|
|
2314
|
+
"line": 103,
|
|
2295
2315
|
"character": 14
|
|
2296
2316
|
},
|
|
2297
2317
|
"members": [
|
|
@@ -2299,7 +2319,7 @@
|
|
|
2299
2319
|
"__schema": "VariableLikeSchema",
|
|
2300
2320
|
"location": {
|
|
2301
2321
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2302
|
-
"line":
|
|
2322
|
+
"line": 104,
|
|
2303
2323
|
"character": 5
|
|
2304
2324
|
},
|
|
2305
2325
|
"signature": "(property) mergeResults: ApplyVersionResults",
|
|
@@ -2308,7 +2328,7 @@
|
|
|
2308
2328
|
"__schema": "TypeRefSchema",
|
|
2309
2329
|
"location": {
|
|
2310
2330
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2311
|
-
"line":
|
|
2331
|
+
"line": 104,
|
|
2312
2332
|
"character": 5
|
|
2313
2333
|
},
|
|
2314
2334
|
"name": "ApplyVersionResults",
|
|
@@ -2323,7 +2343,7 @@
|
|
|
2323
2343
|
"__schema": "VariableLikeSchema",
|
|
2324
2344
|
"location": {
|
|
2325
2345
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2326
|
-
"line":
|
|
2346
|
+
"line": 105,
|
|
2327
2347
|
"character": 5
|
|
2328
2348
|
},
|
|
2329
2349
|
"signature": "(property) deleteResults: any",
|
|
@@ -2332,7 +2352,7 @@
|
|
|
2332
2352
|
"__schema": "KeywordTypeSchema",
|
|
2333
2353
|
"location": {
|
|
2334
2354
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2335
|
-
"line":
|
|
2355
|
+
"line": 105,
|
|
2336
2356
|
"character": 20
|
|
2337
2357
|
},
|
|
2338
2358
|
"name": "any"
|
|
@@ -2343,7 +2363,7 @@
|
|
|
2343
2363
|
"__schema": "VariableLikeSchema",
|
|
2344
2364
|
"location": {
|
|
2345
2365
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2346
|
-
"line":
|
|
2366
|
+
"line": 106,
|
|
2347
2367
|
"character": 5
|
|
2348
2368
|
},
|
|
2349
2369
|
"signature": "(property) configMergeResults: ConfigMergeResult[]",
|
|
@@ -2352,14 +2372,14 @@
|
|
|
2352
2372
|
"__schema": "TypeArraySchema",
|
|
2353
2373
|
"location": {
|
|
2354
2374
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2355
|
-
"line":
|
|
2375
|
+
"line": 106,
|
|
2356
2376
|
"character": 25
|
|
2357
2377
|
},
|
|
2358
2378
|
"type": {
|
|
2359
2379
|
"__schema": "TypeRefSchema",
|
|
2360
2380
|
"location": {
|
|
2361
2381
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2362
|
-
"line":
|
|
2382
|
+
"line": 106,
|
|
2363
2383
|
"character": 25
|
|
2364
2384
|
},
|
|
2365
2385
|
"name": "ConfigMergeResult"
|
|
@@ -2371,7 +2391,7 @@
|
|
|
2371
2391
|
"__schema": "VariableLikeSchema",
|
|
2372
2392
|
"location": {
|
|
2373
2393
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2374
|
-
"line":
|
|
2394
|
+
"line": 107,
|
|
2375
2395
|
"character": 5
|
|
2376
2396
|
},
|
|
2377
2397
|
"signature": "(property) mergedSuccessfullyIds: ComponentID[]",
|
|
@@ -2380,14 +2400,14 @@
|
|
|
2380
2400
|
"__schema": "TypeArraySchema",
|
|
2381
2401
|
"location": {
|
|
2382
2402
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2383
|
-
"line":
|
|
2403
|
+
"line": 107,
|
|
2384
2404
|
"character": 28
|
|
2385
2405
|
},
|
|
2386
2406
|
"type": {
|
|
2387
2407
|
"__schema": "TypeRefSchema",
|
|
2388
2408
|
"location": {
|
|
2389
2409
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2390
|
-
"line":
|
|
2410
|
+
"line": 107,
|
|
2391
2411
|
"character": 28
|
|
2392
2412
|
},
|
|
2393
2413
|
"name": "ComponentID"
|
|
@@ -2399,7 +2419,7 @@
|
|
|
2399
2419
|
"__schema": "VariableLikeSchema",
|
|
2400
2420
|
"location": {
|
|
2401
2421
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2402
|
-
"line":
|
|
2422
|
+
"line": 108,
|
|
2403
2423
|
"character": 5
|
|
2404
2424
|
},
|
|
2405
2425
|
"signature": "(property) conflicts: ConflictPerId[]",
|
|
@@ -2408,14 +2428,14 @@
|
|
|
2408
2428
|
"__schema": "TypeArraySchema",
|
|
2409
2429
|
"location": {
|
|
2410
2430
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2411
|
-
"line":
|
|
2431
|
+
"line": 108,
|
|
2412
2432
|
"character": 16
|
|
2413
2433
|
},
|
|
2414
2434
|
"type": {
|
|
2415
2435
|
"__schema": "TypeRefSchema",
|
|
2416
2436
|
"location": {
|
|
2417
2437
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2418
|
-
"line":
|
|
2438
|
+
"line": 108,
|
|
2419
2439
|
"character": 16
|
|
2420
2440
|
},
|
|
2421
2441
|
"name": "ConflictPerId"
|
|
@@ -2435,7 +2455,7 @@
|
|
|
2435
2455
|
"__schema": "FunctionLikeSchema",
|
|
2436
2456
|
"location": {
|
|
2437
2457
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2438
|
-
"line":
|
|
2458
|
+
"line": 324,
|
|
2439
2459
|
"character": 3
|
|
2440
2460
|
},
|
|
2441
2461
|
"signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
|
|
@@ -2445,7 +2465,7 @@
|
|
|
2445
2465
|
"__schema": "ParameterSchema",
|
|
2446
2466
|
"location": {
|
|
2447
2467
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2448
|
-
"line":
|
|
2468
|
+
"line": 324,
|
|
2449
2469
|
"character": 19
|
|
2450
2470
|
},
|
|
2451
2471
|
"name": "newLaneName",
|
|
@@ -2453,7 +2473,7 @@
|
|
|
2453
2473
|
"__schema": "KeywordTypeSchema",
|
|
2454
2474
|
"location": {
|
|
2455
2475
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2456
|
-
"line":
|
|
2476
|
+
"line": 324,
|
|
2457
2477
|
"character": 32
|
|
2458
2478
|
},
|
|
2459
2479
|
"name": "string"
|
|
@@ -2465,7 +2485,7 @@
|
|
|
2465
2485
|
"__schema": "ParameterSchema",
|
|
2466
2486
|
"location": {
|
|
2467
2487
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2468
|
-
"line":
|
|
2488
|
+
"line": 324,
|
|
2469
2489
|
"character": 40
|
|
2470
2490
|
},
|
|
2471
2491
|
"name": "options",
|
|
@@ -2473,7 +2493,7 @@
|
|
|
2473
2493
|
"__schema": "TypeLiteralSchema",
|
|
2474
2494
|
"location": {
|
|
2475
2495
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2476
|
-
"line":
|
|
2496
|
+
"line": 324,
|
|
2477
2497
|
"character": 49
|
|
2478
2498
|
},
|
|
2479
2499
|
"members": [
|
|
@@ -2481,7 +2501,7 @@
|
|
|
2481
2501
|
"__schema": "VariableLikeSchema",
|
|
2482
2502
|
"location": {
|
|
2483
2503
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2484
|
-
"line":
|
|
2504
|
+
"line": 324,
|
|
2485
2505
|
"character": 51
|
|
2486
2506
|
},
|
|
2487
2507
|
"signature": "(property) scope?: string | undefined",
|
|
@@ -2490,7 +2510,7 @@
|
|
|
2490
2510
|
"__schema": "KeywordTypeSchema",
|
|
2491
2511
|
"location": {
|
|
2492
2512
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2493
|
-
"line":
|
|
2513
|
+
"line": 324,
|
|
2494
2514
|
"character": 59
|
|
2495
2515
|
},
|
|
2496
2516
|
"name": "string"
|
|
@@ -2507,7 +2527,7 @@
|
|
|
2507
2527
|
"__schema": "InferenceTypeSchema",
|
|
2508
2528
|
"location": {
|
|
2509
2529
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2510
|
-
"line":
|
|
2530
|
+
"line": 324,
|
|
2511
2531
|
"character": 3
|
|
2512
2532
|
},
|
|
2513
2533
|
"type": "Promise<CreateLaneResult>"
|
|
@@ -2520,7 +2540,7 @@
|
|
|
2520
2540
|
"__schema": "FunctionLikeSchema",
|
|
2521
2541
|
"location": {
|
|
2522
2542
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2523
|
-
"line":
|
|
2543
|
+
"line": 332,
|
|
2524
2544
|
"character": 3
|
|
2525
2545
|
},
|
|
2526
2546
|
"signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
|
|
@@ -2530,7 +2550,7 @@
|
|
|
2530
2550
|
"__schema": "ParameterSchema",
|
|
2531
2551
|
"location": {
|
|
2532
2552
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2533
|
-
"line":
|
|
2553
|
+
"line": 332,
|
|
2534
2554
|
"character": 24
|
|
2535
2555
|
},
|
|
2536
2556
|
"name": "checkoutProps",
|
|
@@ -2538,7 +2558,7 @@
|
|
|
2538
2558
|
"__schema": "TypeRefSchema",
|
|
2539
2559
|
"location": {
|
|
2540
2560
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2541
|
-
"line":
|
|
2561
|
+
"line": 332,
|
|
2542
2562
|
"character": 39
|
|
2543
2563
|
},
|
|
2544
2564
|
"name": "CheckoutProps"
|
|
@@ -2550,7 +2570,7 @@
|
|
|
2550
2570
|
"__schema": "ParameterSchema",
|
|
2551
2571
|
"location": {
|
|
2552
2572
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2553
|
-
"line":
|
|
2573
|
+
"line": 332,
|
|
2554
2574
|
"character": 54
|
|
2555
2575
|
},
|
|
2556
2576
|
"name": "mergeAbortOpts",
|
|
@@ -2558,7 +2578,7 @@
|
|
|
2558
2578
|
"__schema": "TypeRefSchema",
|
|
2559
2579
|
"location": {
|
|
2560
2580
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2561
|
-
"line":
|
|
2581
|
+
"line": 332,
|
|
2562
2582
|
"character": 70
|
|
2563
2583
|
},
|
|
2564
2584
|
"name": "MergeAbortOpts"
|
|
@@ -2571,7 +2591,7 @@
|
|
|
2571
2591
|
"__schema": "InferenceTypeSchema",
|
|
2572
2592
|
"location": {
|
|
2573
2593
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2574
|
-
"line":
|
|
2594
|
+
"line": 332,
|
|
2575
2595
|
"character": 3
|
|
2576
2596
|
},
|
|
2577
2597
|
"type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
|
|
@@ -2584,7 +2604,7 @@
|
|
|
2584
2604
|
"__schema": "FunctionLikeSchema",
|
|
2585
2605
|
"location": {
|
|
2586
2606
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2587
|
-
"line":
|
|
2607
|
+
"line": 388,
|
|
2588
2608
|
"character": 3
|
|
2589
2609
|
},
|
|
2590
2610
|
"signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
|
|
@@ -2594,7 +2614,7 @@
|
|
|
2594
2614
|
"__schema": "ParameterSchema",
|
|
2595
2615
|
"location": {
|
|
2596
2616
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2597
|
-
"line":
|
|
2617
|
+
"line": 389,
|
|
2598
2618
|
"character": 5
|
|
2599
2619
|
},
|
|
2600
2620
|
"name": "fromLane",
|
|
@@ -2602,7 +2622,7 @@
|
|
|
2602
2622
|
"__schema": "KeywordTypeSchema",
|
|
2603
2623
|
"location": {
|
|
2604
2624
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2605
|
-
"line":
|
|
2625
|
+
"line": 389,
|
|
2606
2626
|
"character": 15
|
|
2607
2627
|
},
|
|
2608
2628
|
"name": "string"
|
|
@@ -2614,7 +2634,7 @@
|
|
|
2614
2634
|
"__schema": "ParameterSchema",
|
|
2615
2635
|
"location": {
|
|
2616
2636
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2617
|
-
"line":
|
|
2637
|
+
"line": 390,
|
|
2618
2638
|
"character": 5
|
|
2619
2639
|
},
|
|
2620
2640
|
"name": "toLane",
|
|
@@ -2622,7 +2642,7 @@
|
|
|
2622
2642
|
"__schema": "KeywordTypeSchema",
|
|
2623
2643
|
"location": {
|
|
2624
2644
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2625
|
-
"line":
|
|
2645
|
+
"line": 390,
|
|
2626
2646
|
"character": 13
|
|
2627
2647
|
},
|
|
2628
2648
|
"name": "string"
|
|
@@ -2634,7 +2654,7 @@
|
|
|
2634
2654
|
"__schema": "ParameterSchema",
|
|
2635
2655
|
"location": {
|
|
2636
2656
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2637
|
-
"line":
|
|
2657
|
+
"line": 391,
|
|
2638
2658
|
"character": 5
|
|
2639
2659
|
},
|
|
2640
2660
|
"name": "options",
|
|
@@ -2642,7 +2662,7 @@
|
|
|
2642
2662
|
"__schema": "TypeIntersectionSchema",
|
|
2643
2663
|
"location": {
|
|
2644
2664
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2645
|
-
"line":
|
|
2665
|
+
"line": 391,
|
|
2646
2666
|
"character": 14
|
|
2647
2667
|
},
|
|
2648
2668
|
"types": [
|
|
@@ -2650,7 +2670,7 @@
|
|
|
2650
2670
|
"__schema": "TypeRefSchema",
|
|
2651
2671
|
"location": {
|
|
2652
2672
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2653
|
-
"line":
|
|
2673
|
+
"line": 391,
|
|
2654
2674
|
"character": 14
|
|
2655
2675
|
},
|
|
2656
2676
|
"name": "Partial",
|
|
@@ -2659,7 +2679,7 @@
|
|
|
2659
2679
|
"__schema": "TypeRefSchema",
|
|
2660
2680
|
"location": {
|
|
2661
2681
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2662
|
-
"line":
|
|
2682
|
+
"line": 391,
|
|
2663
2683
|
"character": 22
|
|
2664
2684
|
},
|
|
2665
2685
|
"name": "MergeLaneOptions"
|
|
@@ -2670,7 +2690,7 @@
|
|
|
2670
2690
|
"__schema": "TypeLiteralSchema",
|
|
2671
2691
|
"location": {
|
|
2672
2692
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2673
|
-
"line":
|
|
2693
|
+
"line": 391,
|
|
2674
2694
|
"character": 42
|
|
2675
2695
|
},
|
|
2676
2696
|
"members": [
|
|
@@ -2678,7 +2698,7 @@
|
|
|
2678
2698
|
"__schema": "VariableLikeSchema",
|
|
2679
2699
|
"location": {
|
|
2680
2700
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2681
|
-
"line":
|
|
2701
|
+
"line": 391,
|
|
2682
2702
|
"character": 44
|
|
2683
2703
|
},
|
|
2684
2704
|
"signature": "(property) push?: boolean | undefined",
|
|
@@ -2687,7 +2707,7 @@
|
|
|
2687
2707
|
"__schema": "KeywordTypeSchema",
|
|
2688
2708
|
"location": {
|
|
2689
2709
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2690
|
-
"line":
|
|
2710
|
+
"line": 391,
|
|
2691
2711
|
"character": 51
|
|
2692
2712
|
},
|
|
2693
2713
|
"name": "boolean"
|
|
@@ -2698,7 +2718,7 @@
|
|
|
2698
2718
|
"__schema": "VariableLikeSchema",
|
|
2699
2719
|
"location": {
|
|
2700
2720
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2701
|
-
"line":
|
|
2721
|
+
"line": 391,
|
|
2702
2722
|
"character": 60
|
|
2703
2723
|
},
|
|
2704
2724
|
"signature": "(property) reMerge?: boolean | undefined",
|
|
@@ -2707,7 +2727,7 @@
|
|
|
2707
2727
|
"__schema": "KeywordTypeSchema",
|
|
2708
2728
|
"location": {
|
|
2709
2729
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2710
|
-
"line":
|
|
2730
|
+
"line": 391,
|
|
2711
2731
|
"character": 70
|
|
2712
2732
|
},
|
|
2713
2733
|
"name": "boolean"
|
|
@@ -2726,7 +2746,7 @@
|
|
|
2726
2746
|
"__schema": "TypeRefSchema",
|
|
2727
2747
|
"location": {
|
|
2728
2748
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2729
|
-
"line":
|
|
2749
|
+
"line": 392,
|
|
2730
2750
|
"character": 6
|
|
2731
2751
|
},
|
|
2732
2752
|
"name": "Promise",
|
|
@@ -2735,7 +2755,7 @@
|
|
|
2735
2755
|
"__schema": "TypeRefSchema",
|
|
2736
2756
|
"location": {
|
|
2737
2757
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2738
|
-
"line":
|
|
2758
|
+
"line": 392,
|
|
2739
2759
|
"character": 14
|
|
2740
2760
|
},
|
|
2741
2761
|
"name": "MergeFromScopeResult"
|
|
@@ -2750,7 +2770,7 @@
|
|
|
2750
2770
|
"__schema": "VariableLikeSchema",
|
|
2751
2771
|
"location": {
|
|
2752
2772
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2753
|
-
"line":
|
|
2773
|
+
"line": 486,
|
|
2754
2774
|
"character": 3
|
|
2755
2775
|
},
|
|
2756
2776
|
"signature": "(property) MergeLanesMain.slots: never[]",
|
|
@@ -2759,7 +2779,7 @@
|
|
|
2759
2779
|
"__schema": "InferenceTypeSchema",
|
|
2760
2780
|
"location": {
|
|
2761
2781
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2762
|
-
"line":
|
|
2782
|
+
"line": 486,
|
|
2763
2783
|
"character": 3
|
|
2764
2784
|
},
|
|
2765
2785
|
"type": "never[]"
|
|
@@ -2771,7 +2791,7 @@
|
|
|
2771
2791
|
"__schema": "VariableLikeSchema",
|
|
2772
2792
|
"location": {
|
|
2773
2793
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2774
|
-
"line":
|
|
2794
|
+
"line": 487,
|
|
2775
2795
|
"character": 3
|
|
2776
2796
|
},
|
|
2777
2797
|
"signature": "(property) MergeLanesMain.dependencies: Aspect[]",
|
|
@@ -2780,7 +2800,7 @@
|
|
|
2780
2800
|
"__schema": "InferenceTypeSchema",
|
|
2781
2801
|
"location": {
|
|
2782
2802
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2783
|
-
"line":
|
|
2803
|
+
"line": 487,
|
|
2784
2804
|
"character": 3
|
|
2785
2805
|
},
|
|
2786
2806
|
"type": "Aspect[]"
|
|
@@ -2792,7 +2812,7 @@
|
|
|
2792
2812
|
"__schema": "VariableLikeSchema",
|
|
2793
2813
|
"location": {
|
|
2794
2814
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2795
|
-
"line":
|
|
2815
|
+
"line": 500,
|
|
2796
2816
|
"character": 3
|
|
2797
2817
|
},
|
|
2798
2818
|
"signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
|
|
@@ -2801,7 +2821,7 @@
|
|
|
2801
2821
|
"__schema": "InferenceTypeSchema",
|
|
2802
2822
|
"location": {
|
|
2803
2823
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2804
|
-
"line":
|
|
2824
|
+
"line": 500,
|
|
2805
2825
|
"character": 3
|
|
2806
2826
|
},
|
|
2807
2827
|
"type": "RuntimeDefinition"
|
|
@@ -2813,7 +2833,7 @@
|
|
|
2813
2833
|
"__schema": "FunctionLikeSchema",
|
|
2814
2834
|
"location": {
|
|
2815
2835
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2816
|
-
"line":
|
|
2836
|
+
"line": 502,
|
|
2817
2837
|
"character": 3
|
|
2818
2838
|
},
|
|
2819
2839
|
"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>",
|
|
@@ -2823,7 +2843,7 @@
|
|
|
2823
2843
|
"__schema": "ParameterSchema",
|
|
2824
2844
|
"location": {
|
|
2825
2845
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2826
|
-
"line":
|
|
2846
|
+
"line": 502,
|
|
2827
2847
|
"character": 25
|
|
2828
2848
|
},
|
|
2829
2849
|
"name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
|
|
@@ -2831,7 +2851,7 @@
|
|
|
2831
2851
|
"__schema": "TupleTypeSchema",
|
|
2832
2852
|
"location": {
|
|
2833
2853
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2834
|
-
"line":
|
|
2854
|
+
"line": 514,
|
|
2835
2855
|
"character": 6
|
|
2836
2856
|
},
|
|
2837
2857
|
"elements": [
|
|
@@ -2839,7 +2859,7 @@
|
|
|
2839
2859
|
"__schema": "TypeRefSchema",
|
|
2840
2860
|
"location": {
|
|
2841
2861
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2842
|
-
"line":
|
|
2862
|
+
"line": 515,
|
|
2843
2863
|
"character": 5
|
|
2844
2864
|
},
|
|
2845
2865
|
"name": "LanesMain"
|
|
@@ -2848,7 +2868,7 @@
|
|
|
2848
2868
|
"__schema": "TypeRefSchema",
|
|
2849
2869
|
"location": {
|
|
2850
2870
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2851
|
-
"line":
|
|
2871
|
+
"line": 516,
|
|
2852
2872
|
"character": 5
|
|
2853
2873
|
},
|
|
2854
2874
|
"name": "CLIMain"
|
|
@@ -2857,7 +2877,7 @@
|
|
|
2857
2877
|
"__schema": "TypeRefSchema",
|
|
2858
2878
|
"location": {
|
|
2859
2879
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2860
|
-
"line":
|
|
2880
|
+
"line": 517,
|
|
2861
2881
|
"character": 5
|
|
2862
2882
|
},
|
|
2863
2883
|
"name": "Workspace"
|
|
@@ -2866,7 +2886,7 @@
|
|
|
2866
2886
|
"__schema": "TypeRefSchema",
|
|
2867
2887
|
"location": {
|
|
2868
2888
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2869
|
-
"line":
|
|
2889
|
+
"line": 518,
|
|
2870
2890
|
"character": 5
|
|
2871
2891
|
},
|
|
2872
2892
|
"name": "MergingMain"
|
|
@@ -2875,7 +2895,7 @@
|
|
|
2875
2895
|
"__schema": "TypeRefSchema",
|
|
2876
2896
|
"location": {
|
|
2877
2897
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2878
|
-
"line":
|
|
2898
|
+
"line": 519,
|
|
2879
2899
|
"character": 5
|
|
2880
2900
|
},
|
|
2881
2901
|
"name": "LoggerMain"
|
|
@@ -2884,7 +2904,7 @@
|
|
|
2884
2904
|
"__schema": "TypeRefSchema",
|
|
2885
2905
|
"location": {
|
|
2886
2906
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2887
|
-
"line":
|
|
2907
|
+
"line": 520,
|
|
2888
2908
|
"character": 5
|
|
2889
2909
|
},
|
|
2890
2910
|
"name": "RemoveMain"
|
|
@@ -2893,7 +2913,7 @@
|
|
|
2893
2913
|
"__schema": "TypeRefSchema",
|
|
2894
2914
|
"location": {
|
|
2895
2915
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2896
|
-
"line":
|
|
2916
|
+
"line": 521,
|
|
2897
2917
|
"character": 5
|
|
2898
2918
|
},
|
|
2899
2919
|
"name": "ScopeMain"
|
|
@@ -2902,7 +2922,7 @@
|
|
|
2902
2922
|
"__schema": "TypeRefSchema",
|
|
2903
2923
|
"location": {
|
|
2904
2924
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2905
|
-
"line":
|
|
2925
|
+
"line": 522,
|
|
2906
2926
|
"character": 5
|
|
2907
2927
|
},
|
|
2908
2928
|
"name": "ExportMain"
|
|
@@ -2911,7 +2931,7 @@
|
|
|
2911
2931
|
"__schema": "TypeRefSchema",
|
|
2912
2932
|
"location": {
|
|
2913
2933
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2914
|
-
"line":
|
|
2934
|
+
"line": 523,
|
|
2915
2935
|
"character": 5
|
|
2916
2936
|
},
|
|
2917
2937
|
"name": "ImporterMain"
|
|
@@ -2920,7 +2940,7 @@
|
|
|
2920
2940
|
"__schema": "TypeRefSchema",
|
|
2921
2941
|
"location": {
|
|
2922
2942
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2923
|
-
"line":
|
|
2943
|
+
"line": 524,
|
|
2924
2944
|
"character": 5
|
|
2925
2945
|
},
|
|
2926
2946
|
"name": "CheckoutMain"
|
|
@@ -2929,7 +2949,7 @@
|
|
|
2929
2949
|
"__schema": "TypeRefSchema",
|
|
2930
2950
|
"location": {
|
|
2931
2951
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2932
|
-
"line":
|
|
2952
|
+
"line": 525,
|
|
2933
2953
|
"character": 5
|
|
2934
2954
|
},
|
|
2935
2955
|
"name": "GlobalConfigMain"
|
|
@@ -2944,7 +2964,7 @@
|
|
|
2944
2964
|
"__schema": "InferenceTypeSchema",
|
|
2945
2965
|
"location": {
|
|
2946
2966
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2947
|
-
"line":
|
|
2967
|
+
"line": 502,
|
|
2948
2968
|
"character": 3
|
|
2949
2969
|
},
|
|
2950
2970
|
"type": "Promise<MergeLanesMain>"
|
|
@@ -2962,7 +2982,7 @@
|
|
|
2962
2982
|
"__schema": "UnImplementedSchema",
|
|
2963
2983
|
"location": {
|
|
2964
2984
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2965
|
-
"line":
|
|
2985
|
+
"line": 797,
|
|
2966
2986
|
"character": 16
|
|
2967
2987
|
},
|
|
2968
2988
|
"name": "MergeLanesMain",
|
|
@@ -2974,7 +2994,7 @@
|
|
|
2974
2994
|
"__schema": "FunctionLikeSchema",
|
|
2975
2995
|
"location": {
|
|
2976
2996
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2977
|
-
"line":
|
|
2997
|
+
"line": 548,
|
|
2978
2998
|
"character": 1
|
|
2979
2999
|
},
|
|
2980
3000
|
"signature": "function filterComponentsStatus(allComponentsStatus: ComponentMergeStatus[], compIdsToKeep: ComponentID[], allBitIds: ComponentID[], legacyScope: LegacyScope, includeDeps?: boolean, otherLane?: Lane, shouldSquash?: boolean): Promise<ComponentMergeStatus[]>",
|
|
@@ -2984,7 +3004,7 @@
|
|
|
2984
3004
|
"__schema": "ParameterSchema",
|
|
2985
3005
|
"location": {
|
|
2986
3006
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2987
|
-
"line":
|
|
3007
|
+
"line": 549,
|
|
2988
3008
|
"character": 3
|
|
2989
3009
|
},
|
|
2990
3010
|
"name": "allComponentsStatus",
|
|
@@ -2992,14 +3012,14 @@
|
|
|
2992
3012
|
"__schema": "TypeArraySchema",
|
|
2993
3013
|
"location": {
|
|
2994
3014
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
2995
|
-
"line":
|
|
3015
|
+
"line": 549,
|
|
2996
3016
|
"character": 24
|
|
2997
3017
|
},
|
|
2998
3018
|
"type": {
|
|
2999
3019
|
"__schema": "TypeRefSchema",
|
|
3000
3020
|
"location": {
|
|
3001
3021
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3002
|
-
"line":
|
|
3022
|
+
"line": 549,
|
|
3003
3023
|
"character": 24
|
|
3004
3024
|
},
|
|
3005
3025
|
"name": "ComponentMergeStatus"
|
|
@@ -3012,7 +3032,7 @@
|
|
|
3012
3032
|
"__schema": "ParameterSchema",
|
|
3013
3033
|
"location": {
|
|
3014
3034
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3015
|
-
"line":
|
|
3035
|
+
"line": 550,
|
|
3016
3036
|
"character": 3
|
|
3017
3037
|
},
|
|
3018
3038
|
"name": "compIdsToKeep",
|
|
@@ -3020,14 +3040,14 @@
|
|
|
3020
3040
|
"__schema": "TypeArraySchema",
|
|
3021
3041
|
"location": {
|
|
3022
3042
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3023
|
-
"line":
|
|
3043
|
+
"line": 550,
|
|
3024
3044
|
"character": 18
|
|
3025
3045
|
},
|
|
3026
3046
|
"type": {
|
|
3027
3047
|
"__schema": "TypeRefSchema",
|
|
3028
3048
|
"location": {
|
|
3029
3049
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3030
|
-
"line":
|
|
3050
|
+
"line": 550,
|
|
3031
3051
|
"character": 18
|
|
3032
3052
|
},
|
|
3033
3053
|
"name": "ComponentID"
|
|
@@ -3040,7 +3060,7 @@
|
|
|
3040
3060
|
"__schema": "ParameterSchema",
|
|
3041
3061
|
"location": {
|
|
3042
3062
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3043
|
-
"line":
|
|
3063
|
+
"line": 551,
|
|
3044
3064
|
"character": 3
|
|
3045
3065
|
},
|
|
3046
3066
|
"name": "allBitIds",
|
|
@@ -3048,14 +3068,14 @@
|
|
|
3048
3068
|
"__schema": "TypeArraySchema",
|
|
3049
3069
|
"location": {
|
|
3050
3070
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3051
|
-
"line":
|
|
3071
|
+
"line": 551,
|
|
3052
3072
|
"character": 14
|
|
3053
3073
|
},
|
|
3054
3074
|
"type": {
|
|
3055
3075
|
"__schema": "TypeRefSchema",
|
|
3056
3076
|
"location": {
|
|
3057
3077
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3058
|
-
"line":
|
|
3078
|
+
"line": 551,
|
|
3059
3079
|
"character": 14
|
|
3060
3080
|
},
|
|
3061
3081
|
"name": "ComponentID"
|
|
@@ -3068,7 +3088,7 @@
|
|
|
3068
3088
|
"__schema": "ParameterSchema",
|
|
3069
3089
|
"location": {
|
|
3070
3090
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3071
|
-
"line":
|
|
3091
|
+
"line": 552,
|
|
3072
3092
|
"character": 3
|
|
3073
3093
|
},
|
|
3074
3094
|
"name": "legacyScope",
|
|
@@ -3076,7 +3096,7 @@
|
|
|
3076
3096
|
"__schema": "TypeRefSchema",
|
|
3077
3097
|
"location": {
|
|
3078
3098
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3079
|
-
"line":
|
|
3099
|
+
"line": 552,
|
|
3080
3100
|
"character": 16
|
|
3081
3101
|
},
|
|
3082
3102
|
"name": "LegacyScope"
|
|
@@ -3088,7 +3108,7 @@
|
|
|
3088
3108
|
"__schema": "ParameterSchema",
|
|
3089
3109
|
"location": {
|
|
3090
3110
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3091
|
-
"line":
|
|
3111
|
+
"line": 553,
|
|
3092
3112
|
"character": 3
|
|
3093
3113
|
},
|
|
3094
3114
|
"name": "includeDeps",
|
|
@@ -3096,7 +3116,7 @@
|
|
|
3096
3116
|
"__schema": "InferenceTypeSchema",
|
|
3097
3117
|
"location": {
|
|
3098
3118
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3099
|
-
"line":
|
|
3119
|
+
"line": 553,
|
|
3100
3120
|
"character": 3
|
|
3101
3121
|
},
|
|
3102
3122
|
"type": "boolean"
|
|
@@ -3109,7 +3129,7 @@
|
|
|
3109
3129
|
"__schema": "ParameterSchema",
|
|
3110
3130
|
"location": {
|
|
3111
3131
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3112
|
-
"line":
|
|
3132
|
+
"line": 554,
|
|
3113
3133
|
"character": 3
|
|
3114
3134
|
},
|
|
3115
3135
|
"name": "otherLane",
|
|
@@ -3117,7 +3137,7 @@
|
|
|
3117
3137
|
"__schema": "TypeRefSchema",
|
|
3118
3138
|
"location": {
|
|
3119
3139
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3120
|
-
"line":
|
|
3140
|
+
"line": 554,
|
|
3121
3141
|
"character": 15
|
|
3122
3142
|
},
|
|
3123
3143
|
"name": "Lane"
|
|
@@ -3129,7 +3149,7 @@
|
|
|
3129
3149
|
"__schema": "ParameterSchema",
|
|
3130
3150
|
"location": {
|
|
3131
3151
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3132
|
-
"line":
|
|
3152
|
+
"line": 555,
|
|
3133
3153
|
"character": 3
|
|
3134
3154
|
},
|
|
3135
3155
|
"name": "shouldSquash",
|
|
@@ -3137,7 +3157,7 @@
|
|
|
3137
3157
|
"__schema": "KeywordTypeSchema",
|
|
3138
3158
|
"location": {
|
|
3139
3159
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3140
|
-
"line":
|
|
3160
|
+
"line": 555,
|
|
3141
3161
|
"character": 18
|
|
3142
3162
|
},
|
|
3143
3163
|
"name": "boolean"
|
|
@@ -3150,7 +3170,7 @@
|
|
|
3150
3170
|
"__schema": "TypeRefSchema",
|
|
3151
3171
|
"location": {
|
|
3152
3172
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3153
|
-
"line":
|
|
3173
|
+
"line": 556,
|
|
3154
3174
|
"character": 4
|
|
3155
3175
|
},
|
|
3156
3176
|
"name": "Promise",
|
|
@@ -3159,14 +3179,14 @@
|
|
|
3159
3179
|
"__schema": "TypeArraySchema",
|
|
3160
3180
|
"location": {
|
|
3161
3181
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3162
|
-
"line":
|
|
3182
|
+
"line": 556,
|
|
3163
3183
|
"character": 12
|
|
3164
3184
|
},
|
|
3165
3185
|
"type": {
|
|
3166
3186
|
"__schema": "TypeRefSchema",
|
|
3167
3187
|
"location": {
|
|
3168
3188
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3169
|
-
"line":
|
|
3189
|
+
"line": 556,
|
|
3170
3190
|
"character": 12
|
|
3171
3191
|
},
|
|
3172
3192
|
"name": "ComponentMergeStatus"
|
|
@@ -3182,7 +3202,7 @@
|
|
|
3182
3202
|
"__schema": "FunctionLikeSchema",
|
|
3183
3203
|
"location": {
|
|
3184
3204
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3185
|
-
"line":
|
|
3205
|
+
"line": 665,
|
|
3186
3206
|
"character": 1
|
|
3187
3207
|
},
|
|
3188
3208
|
"signature": "function getLogForSquash(otherLaneId: LaneId): Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>",
|
|
@@ -3192,7 +3212,7 @@
|
|
|
3192
3212
|
"__schema": "ParameterSchema",
|
|
3193
3213
|
"location": {
|
|
3194
3214
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3195
|
-
"line":
|
|
3215
|
+
"line": 665,
|
|
3196
3216
|
"character": 32
|
|
3197
3217
|
},
|
|
3198
3218
|
"name": "otherLaneId",
|
|
@@ -3200,7 +3220,7 @@
|
|
|
3200
3220
|
"__schema": "TypeRefSchema",
|
|
3201
3221
|
"location": {
|
|
3202
3222
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3203
|
-
"line":
|
|
3223
|
+
"line": 665,
|
|
3204
3224
|
"character": 45
|
|
3205
3225
|
},
|
|
3206
3226
|
"name": "LaneId"
|
|
@@ -3213,7 +3233,7 @@
|
|
|
3213
3233
|
"__schema": "InferenceTypeSchema",
|
|
3214
3234
|
"location": {
|
|
3215
3235
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3216
|
-
"line":
|
|
3236
|
+
"line": 665,
|
|
3217
3237
|
"character": 1
|
|
3218
3238
|
},
|
|
3219
3239
|
"type": "Promise<{\n message: string;\n date: string;\n username: string | undefined;\n email: string | undefined;\n}>"
|
|
@@ -3226,7 +3246,7 @@
|
|
|
3226
3246
|
"__schema": "FunctionLikeSchema",
|
|
3227
3247
|
"location": {
|
|
3228
3248
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3229
|
-
"line":
|
|
3249
|
+
"line": 674,
|
|
3230
3250
|
"character": 1
|
|
3231
3251
|
},
|
|
3232
3252
|
"signature": "function squashSnaps(succeededComponents: ComponentMergeStatus[], currentLaneId: LaneId, otherLaneId: LaneId, scope: LegacyScope, messageTitle?: string): Promise<void>",
|
|
@@ -3236,7 +3256,7 @@
|
|
|
3236
3256
|
"__schema": "ParameterSchema",
|
|
3237
3257
|
"location": {
|
|
3238
3258
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3239
|
-
"line":
|
|
3259
|
+
"line": 675,
|
|
3240
3260
|
"character": 3
|
|
3241
3261
|
},
|
|
3242
3262
|
"name": "succeededComponents",
|
|
@@ -3244,14 +3264,14 @@
|
|
|
3244
3264
|
"__schema": "TypeArraySchema",
|
|
3245
3265
|
"location": {
|
|
3246
3266
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3247
|
-
"line":
|
|
3267
|
+
"line": 675,
|
|
3248
3268
|
"character": 24
|
|
3249
3269
|
},
|
|
3250
3270
|
"type": {
|
|
3251
3271
|
"__schema": "TypeRefSchema",
|
|
3252
3272
|
"location": {
|
|
3253
3273
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3254
|
-
"line":
|
|
3274
|
+
"line": 675,
|
|
3255
3275
|
"character": 24
|
|
3256
3276
|
},
|
|
3257
3277
|
"name": "ComponentMergeStatus"
|
|
@@ -3264,7 +3284,7 @@
|
|
|
3264
3284
|
"__schema": "ParameterSchema",
|
|
3265
3285
|
"location": {
|
|
3266
3286
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3267
|
-
"line":
|
|
3287
|
+
"line": 676,
|
|
3268
3288
|
"character": 3
|
|
3269
3289
|
},
|
|
3270
3290
|
"name": "currentLaneId",
|
|
@@ -3272,7 +3292,7 @@
|
|
|
3272
3292
|
"__schema": "TypeRefSchema",
|
|
3273
3293
|
"location": {
|
|
3274
3294
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3275
|
-
"line":
|
|
3295
|
+
"line": 676,
|
|
3276
3296
|
"character": 18
|
|
3277
3297
|
},
|
|
3278
3298
|
"name": "LaneId"
|
|
@@ -3284,7 +3304,7 @@
|
|
|
3284
3304
|
"__schema": "ParameterSchema",
|
|
3285
3305
|
"location": {
|
|
3286
3306
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3287
|
-
"line":
|
|
3307
|
+
"line": 677,
|
|
3288
3308
|
"character": 3
|
|
3289
3309
|
},
|
|
3290
3310
|
"name": "otherLaneId",
|
|
@@ -3292,7 +3312,7 @@
|
|
|
3292
3312
|
"__schema": "TypeRefSchema",
|
|
3293
3313
|
"location": {
|
|
3294
3314
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3295
|
-
"line":
|
|
3315
|
+
"line": 677,
|
|
3296
3316
|
"character": 16
|
|
3297
3317
|
},
|
|
3298
3318
|
"name": "LaneId"
|
|
@@ -3304,7 +3324,7 @@
|
|
|
3304
3324
|
"__schema": "ParameterSchema",
|
|
3305
3325
|
"location": {
|
|
3306
3326
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3307
|
-
"line":
|
|
3327
|
+
"line": 678,
|
|
3308
3328
|
"character": 3
|
|
3309
3329
|
},
|
|
3310
3330
|
"name": "scope",
|
|
@@ -3312,7 +3332,7 @@
|
|
|
3312
3332
|
"__schema": "TypeRefSchema",
|
|
3313
3333
|
"location": {
|
|
3314
3334
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3315
|
-
"line":
|
|
3335
|
+
"line": 678,
|
|
3316
3336
|
"character": 10
|
|
3317
3337
|
},
|
|
3318
3338
|
"name": "LegacyScope"
|
|
@@ -3324,7 +3344,7 @@
|
|
|
3324
3344
|
"__schema": "ParameterSchema",
|
|
3325
3345
|
"location": {
|
|
3326
3346
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3327
|
-
"line":
|
|
3347
|
+
"line": 679,
|
|
3328
3348
|
"character": 3
|
|
3329
3349
|
},
|
|
3330
3350
|
"name": "messageTitle",
|
|
@@ -3332,7 +3352,7 @@
|
|
|
3332
3352
|
"__schema": "KeywordTypeSchema",
|
|
3333
3353
|
"location": {
|
|
3334
3354
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3335
|
-
"line":
|
|
3355
|
+
"line": 679,
|
|
3336
3356
|
"character": 18
|
|
3337
3357
|
},
|
|
3338
3358
|
"name": "string"
|
|
@@ -3345,7 +3365,7 @@
|
|
|
3345
3365
|
"__schema": "InferenceTypeSchema",
|
|
3346
3366
|
"location": {
|
|
3347
3367
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3348
|
-
"line":
|
|
3368
|
+
"line": 674,
|
|
3349
3369
|
"character": 1
|
|
3350
3370
|
},
|
|
3351
3371
|
"type": "Promise<void>"
|
|
@@ -3358,14 +3378,14 @@
|
|
|
3358
3378
|
"__schema": "FunctionLikeSchema",
|
|
3359
3379
|
"location": {
|
|
3360
3380
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3361
|
-
"line":
|
|
3381
|
+
"line": 713,
|
|
3362
3382
|
"character": 1
|
|
3363
3383
|
},
|
|
3364
3384
|
"doc": {
|
|
3365
3385
|
"__schema": "DocSchema",
|
|
3366
3386
|
"location": {
|
|
3367
3387
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3368
|
-
"line":
|
|
3388
|
+
"line": 710,
|
|
3369
3389
|
"character": 1
|
|
3370
3390
|
},
|
|
3371
3391
|
"raw": "/**\n * returns Version object if it was modified. otherwise, returns undefined\n */",
|
|
@@ -3379,7 +3399,7 @@
|
|
|
3379
3399
|
"__schema": "ParameterSchema",
|
|
3380
3400
|
"location": {
|
|
3381
3401
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3382
|
-
"line":
|
|
3402
|
+
"line": 714,
|
|
3383
3403
|
"character": 3
|
|
3384
3404
|
},
|
|
3385
3405
|
"name": "currentLaneName",
|
|
@@ -3387,7 +3407,7 @@
|
|
|
3387
3407
|
"__schema": "KeywordTypeSchema",
|
|
3388
3408
|
"location": {
|
|
3389
3409
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3390
|
-
"line":
|
|
3410
|
+
"line": 714,
|
|
3391
3411
|
"character": 20
|
|
3392
3412
|
},
|
|
3393
3413
|
"name": "string"
|
|
@@ -3399,7 +3419,7 @@
|
|
|
3399
3419
|
"__schema": "ParameterSchema",
|
|
3400
3420
|
"location": {
|
|
3401
3421
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3402
|
-
"line":
|
|
3422
|
+
"line": 715,
|
|
3403
3423
|
"character": 3
|
|
3404
3424
|
},
|
|
3405
3425
|
"name": "otherLaneId",
|
|
@@ -3407,7 +3427,7 @@
|
|
|
3407
3427
|
"__schema": "TypeRefSchema",
|
|
3408
3428
|
"location": {
|
|
3409
3429
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3410
|
-
"line":
|
|
3430
|
+
"line": 715,
|
|
3411
3431
|
"character": 16
|
|
3412
3432
|
},
|
|
3413
3433
|
"name": "LaneId"
|
|
@@ -3419,7 +3439,7 @@
|
|
|
3419
3439
|
"__schema": "ParameterSchema",
|
|
3420
3440
|
"location": {
|
|
3421
3441
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3422
|
-
"line":
|
|
3442
|
+
"line": 716,
|
|
3423
3443
|
"character": 3
|
|
3424
3444
|
},
|
|
3425
3445
|
"name": "id",
|
|
@@ -3427,7 +3447,7 @@
|
|
|
3427
3447
|
"__schema": "TypeRefSchema",
|
|
3428
3448
|
"location": {
|
|
3429
3449
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3430
|
-
"line":
|
|
3450
|
+
"line": 716,
|
|
3431
3451
|
"character": 7
|
|
3432
3452
|
},
|
|
3433
3453
|
"name": "ComponentID"
|
|
@@ -3439,7 +3459,7 @@
|
|
|
3439
3459
|
"__schema": "ParameterSchema",
|
|
3440
3460
|
"location": {
|
|
3441
3461
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3442
|
-
"line":
|
|
3462
|
+
"line": 717,
|
|
3443
3463
|
"character": 3
|
|
3444
3464
|
},
|
|
3445
3465
|
"name": "divergeData",
|
|
@@ -3447,7 +3467,7 @@
|
|
|
3447
3467
|
"__schema": "TypeRefSchema",
|
|
3448
3468
|
"location": {
|
|
3449
3469
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3450
|
-
"line":
|
|
3470
|
+
"line": 717,
|
|
3451
3471
|
"character": 16
|
|
3452
3472
|
},
|
|
3453
3473
|
"name": "SnapsDistance"
|
|
@@ -3459,7 +3479,7 @@
|
|
|
3459
3479
|
"__schema": "ParameterSchema",
|
|
3460
3480
|
"location": {
|
|
3461
3481
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3462
|
-
"line":
|
|
3482
|
+
"line": 718,
|
|
3463
3483
|
"character": 3
|
|
3464
3484
|
},
|
|
3465
3485
|
"name": "log",
|
|
@@ -3467,7 +3487,7 @@
|
|
|
3467
3487
|
"__schema": "TypeRefSchema",
|
|
3468
3488
|
"location": {
|
|
3469
3489
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3470
|
-
"line":
|
|
3490
|
+
"line": 718,
|
|
3471
3491
|
"character": 8
|
|
3472
3492
|
},
|
|
3473
3493
|
"name": "Log"
|
|
@@ -3479,7 +3499,7 @@
|
|
|
3479
3499
|
"__schema": "ParameterSchema",
|
|
3480
3500
|
"location": {
|
|
3481
3501
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3482
|
-
"line":
|
|
3502
|
+
"line": 719,
|
|
3483
3503
|
"character": 3
|
|
3484
3504
|
},
|
|
3485
3505
|
"name": "scope",
|
|
@@ -3487,7 +3507,7 @@
|
|
|
3487
3507
|
"__schema": "TypeRefSchema",
|
|
3488
3508
|
"location": {
|
|
3489
3509
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3490
|
-
"line":
|
|
3510
|
+
"line": 719,
|
|
3491
3511
|
"character": 10
|
|
3492
3512
|
},
|
|
3493
3513
|
"name": "LegacyScope"
|
|
@@ -3499,7 +3519,7 @@
|
|
|
3499
3519
|
"__schema": "ParameterSchema",
|
|
3500
3520
|
"location": {
|
|
3501
3521
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3502
|
-
"line":
|
|
3522
|
+
"line": 720,
|
|
3503
3523
|
"character": 3
|
|
3504
3524
|
},
|
|
3505
3525
|
"name": "componentFromModel",
|
|
@@ -3507,7 +3527,7 @@
|
|
|
3507
3527
|
"__schema": "TypeRefSchema",
|
|
3508
3528
|
"location": {
|
|
3509
3529
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3510
|
-
"line":
|
|
3530
|
+
"line": 720,
|
|
3511
3531
|
"character": 24
|
|
3512
3532
|
},
|
|
3513
3533
|
"name": "Version"
|
|
@@ -3519,7 +3539,7 @@
|
|
|
3519
3539
|
"__schema": "ParameterSchema",
|
|
3520
3540
|
"location": {
|
|
3521
3541
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3522
|
-
"line":
|
|
3542
|
+
"line": 721,
|
|
3523
3543
|
"character": 3
|
|
3524
3544
|
},
|
|
3525
3545
|
"name": "messageTitle",
|
|
@@ -3527,7 +3547,7 @@
|
|
|
3527
3547
|
"__schema": "KeywordTypeSchema",
|
|
3528
3548
|
"location": {
|
|
3529
3549
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3530
|
-
"line":
|
|
3550
|
+
"line": 721,
|
|
3531
3551
|
"character": 18
|
|
3532
3552
|
},
|
|
3533
3553
|
"name": "string"
|
|
@@ -3540,7 +3560,7 @@
|
|
|
3540
3560
|
"__schema": "TypeRefSchema",
|
|
3541
3561
|
"location": {
|
|
3542
3562
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3543
|
-
"line":
|
|
3563
|
+
"line": 722,
|
|
3544
3564
|
"character": 4
|
|
3545
3565
|
},
|
|
3546
3566
|
"name": "Promise",
|
|
@@ -3549,7 +3569,7 @@
|
|
|
3549
3569
|
"__schema": "TypeUnionSchema",
|
|
3550
3570
|
"location": {
|
|
3551
3571
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3552
|
-
"line":
|
|
3572
|
+
"line": 722,
|
|
3553
3573
|
"character": 12
|
|
3554
3574
|
},
|
|
3555
3575
|
"types": [
|
|
@@ -3557,7 +3577,7 @@
|
|
|
3557
3577
|
"__schema": "TypeRefSchema",
|
|
3558
3578
|
"location": {
|
|
3559
3579
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3560
|
-
"line":
|
|
3580
|
+
"line": 722,
|
|
3561
3581
|
"character": 12
|
|
3562
3582
|
},
|
|
3563
3583
|
"name": "Version"
|
|
@@ -3566,7 +3586,7 @@
|
|
|
3566
3586
|
"__schema": "KeywordTypeSchema",
|
|
3567
3587
|
"location": {
|
|
3568
3588
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3569
|
-
"line":
|
|
3589
|
+
"line": 722,
|
|
3570
3590
|
"character": 22
|
|
3571
3591
|
},
|
|
3572
3592
|
"name": "undefined"
|
|
@@ -3583,7 +3603,7 @@
|
|
|
3583
3603
|
"__schema": "UnImplementedSchema",
|
|
3584
3604
|
"location": {
|
|
3585
3605
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
3586
|
-
"line":
|
|
3606
|
+
"line": 795,
|
|
3587
3607
|
"character": 1
|
|
3588
3608
|
},
|
|
3589
3609
|
"name": "MergeLanesAspect.addRuntime(MergeLanesMain);",
|
|
@@ -3632,7 +3652,7 @@
|
|
|
3632
3652
|
"componentId": {
|
|
3633
3653
|
"scope": "teambit.lanes",
|
|
3634
3654
|
"name": "merge-lanes",
|
|
3635
|
-
"version": "1.0.
|
|
3655
|
+
"version": "1.0.394"
|
|
3636
3656
|
},
|
|
3637
3657
|
"taggedModuleExports": []
|
|
3638
3658
|
}
|