@teambit/merge-lanes 1.0.257 → 1.0.259

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.
@@ -14,1159 +14,1168 @@
14
14
  },
15
15
  "exports": [
16
16
  {
17
- "__schema": "ClassSchema",
17
+ "__schema": "ExportSchema",
18
18
  "location": {
19
- "filePath": "merge-lanes.main.runtime.ts",
20
- "line": 74,
21
- "character": 1
19
+ "filePath": "index.ts",
20
+ "line": 3,
21
+ "character": 15
22
22
  },
23
- "signature": "class MergeLanesMain",
24
23
  "name": "MergeLanesMain",
25
- "members": [
26
- {
27
- "__schema": "ConstructorSchema",
28
- "location": {
29
- "filePath": "merge-lanes.main.runtime.ts",
30
- "line": 75,
31
- "character": 3
32
- },
33
- "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
34
- "name": "constructor",
35
- "params": [
36
- {
37
- "__schema": "ParameterSchema",
38
- "location": {
39
- "filePath": "merge-lanes.main.runtime.ts",
40
- "line": 76,
41
- "character": 5
42
- },
43
- "name": "workspace",
44
- "type": {
45
- "__schema": "TypeUnionSchema",
24
+ "exportNode": {
25
+ "__schema": "ClassSchema",
26
+ "location": {
27
+ "filePath": "merge-lanes.main.runtime.ts",
28
+ "line": 74,
29
+ "character": 1
30
+ },
31
+ "signature": "class MergeLanesMain",
32
+ "name": "MergeLanesMain",
33
+ "members": [
34
+ {
35
+ "__schema": "ConstructorSchema",
36
+ "location": {
37
+ "filePath": "merge-lanes.main.runtime.ts",
38
+ "line": 75,
39
+ "character": 3
40
+ },
41
+ "signature": "constructor MergeLanesMain(workspace: Workspace | undefined, merging: MergingMain, lanes: LanesMain, logger: Logger, remove: RemoveMain, scope: ScopeMain, exporter: ExportMain, importer: ImporterMain, checkout: CheckoutMain): MergeLanesMain",
42
+ "name": "constructor",
43
+ "params": [
44
+ {
45
+ "__schema": "ParameterSchema",
46
46
  "location": {
47
47
  "filePath": "merge-lanes.main.runtime.ts",
48
48
  "line": 76,
49
- "character": 24
49
+ "character": 5
50
50
  },
51
- "types": [
52
- {
53
- "__schema": "TypeRefSchema",
54
- "location": {
55
- "filePath": "merge-lanes.main.runtime.ts",
56
- "line": 76,
57
- "character": 24
58
- },
59
- "name": "Workspace",
60
- "componentId": {
61
- "scope": "teambit.workspace",
62
- "name": "workspace"
63
- }
51
+ "name": "workspace",
52
+ "type": {
53
+ "__schema": "TypeUnionSchema",
54
+ "location": {
55
+ "filePath": "merge-lanes.main.runtime.ts",
56
+ "line": 76,
57
+ "character": 24
64
58
  },
65
- {
66
- "__schema": "KeywordTypeSchema",
67
- "location": {
68
- "filePath": "merge-lanes.main.runtime.ts",
69
- "line": 76,
70
- "character": 36
59
+ "types": [
60
+ {
61
+ "__schema": "TypeRefSchema",
62
+ "location": {
63
+ "filePath": "merge-lanes.main.runtime.ts",
64
+ "line": 76,
65
+ "character": 24
66
+ },
67
+ "name": "Workspace",
68
+ "componentId": {
69
+ "scope": "teambit.workspace",
70
+ "name": "workspace"
71
+ }
71
72
  },
72
- "name": "undefined"
73
- }
74
- ]
75
- },
76
- "isOptional": false,
77
- "isSpread": false
78
- },
79
- {
80
- "__schema": "ParameterSchema",
81
- "location": {
82
- "filePath": "merge-lanes.main.runtime.ts",
83
- "line": 77,
84
- "character": 5
73
+ {
74
+ "__schema": "KeywordTypeSchema",
75
+ "location": {
76
+ "filePath": "merge-lanes.main.runtime.ts",
77
+ "line": 76,
78
+ "character": 36
79
+ },
80
+ "name": "undefined"
81
+ }
82
+ ]
83
+ },
84
+ "isOptional": false,
85
+ "isSpread": false
85
86
  },
86
- "name": "merging",
87
- "type": {
88
- "__schema": "TypeRefSchema",
87
+ {
88
+ "__schema": "ParameterSchema",
89
89
  "location": {
90
90
  "filePath": "merge-lanes.main.runtime.ts",
91
91
  "line": 77,
92
- "character": 22
92
+ "character": 5
93
93
  },
94
- "name": "MergingMain",
95
- "componentId": {
96
- "scope": "teambit.component",
97
- "name": "merging"
98
- }
99
- },
100
- "isOptional": false,
101
- "isSpread": false
102
- },
103
- {
104
- "__schema": "ParameterSchema",
105
- "location": {
106
- "filePath": "merge-lanes.main.runtime.ts",
107
- "line": 78,
108
- "character": 5
94
+ "name": "merging",
95
+ "type": {
96
+ "__schema": "TypeRefSchema",
97
+ "location": {
98
+ "filePath": "merge-lanes.main.runtime.ts",
99
+ "line": 77,
100
+ "character": 22
101
+ },
102
+ "name": "MergingMain",
103
+ "componentId": {
104
+ "scope": "teambit.component",
105
+ "name": "merging"
106
+ }
107
+ },
108
+ "isOptional": false,
109
+ "isSpread": false
109
110
  },
110
- "name": "lanes",
111
- "type": {
112
- "__schema": "TypeRefSchema",
111
+ {
112
+ "__schema": "ParameterSchema",
113
113
  "location": {
114
114
  "filePath": "merge-lanes.main.runtime.ts",
115
115
  "line": 78,
116
- "character": 21
116
+ "character": 5
117
117
  },
118
- "name": "LanesMain",
119
- "componentId": {
120
- "scope": "teambit.lanes",
121
- "name": "lanes"
122
- }
123
- },
124
- "isOptional": false,
125
- "isSpread": false
126
- },
127
- {
128
- "__schema": "ParameterSchema",
129
- "location": {
130
- "filePath": "merge-lanes.main.runtime.ts",
131
- "line": 79,
132
- "character": 5
118
+ "name": "lanes",
119
+ "type": {
120
+ "__schema": "TypeRefSchema",
121
+ "location": {
122
+ "filePath": "merge-lanes.main.runtime.ts",
123
+ "line": 78,
124
+ "character": 21
125
+ },
126
+ "name": "LanesMain",
127
+ "componentId": {
128
+ "scope": "teambit.lanes",
129
+ "name": "lanes"
130
+ }
131
+ },
132
+ "isOptional": false,
133
+ "isSpread": false
133
134
  },
134
- "name": "logger",
135
- "type": {
136
- "__schema": "TypeRefSchema",
135
+ {
136
+ "__schema": "ParameterSchema",
137
137
  "location": {
138
138
  "filePath": "merge-lanes.main.runtime.ts",
139
139
  "line": 79,
140
- "character": 22
140
+ "character": 5
141
141
  },
142
- "name": "Logger",
143
- "componentId": {
144
- "scope": "teambit.harmony",
145
- "name": "logger"
146
- }
147
- },
148
- "isOptional": false,
149
- "isSpread": false
150
- },
151
- {
152
- "__schema": "ParameterSchema",
153
- "location": {
154
- "filePath": "merge-lanes.main.runtime.ts",
155
- "line": 80,
156
- "character": 5
142
+ "name": "logger",
143
+ "type": {
144
+ "__schema": "TypeRefSchema",
145
+ "location": {
146
+ "filePath": "merge-lanes.main.runtime.ts",
147
+ "line": 79,
148
+ "character": 22
149
+ },
150
+ "name": "Logger",
151
+ "componentId": {
152
+ "scope": "teambit.harmony",
153
+ "name": "logger"
154
+ }
155
+ },
156
+ "isOptional": false,
157
+ "isSpread": false
157
158
  },
158
- "name": "remove",
159
- "type": {
160
- "__schema": "TypeRefSchema",
159
+ {
160
+ "__schema": "ParameterSchema",
161
161
  "location": {
162
162
  "filePath": "merge-lanes.main.runtime.ts",
163
163
  "line": 80,
164
- "character": 21
164
+ "character": 5
165
165
  },
166
- "name": "RemoveMain",
167
- "componentId": {
168
- "scope": "teambit.component",
169
- "name": "remove"
170
- }
171
- },
172
- "isOptional": false,
173
- "isSpread": false
174
- },
175
- {
176
- "__schema": "ParameterSchema",
177
- "location": {
178
- "filePath": "merge-lanes.main.runtime.ts",
179
- "line": 81,
180
- "character": 5
166
+ "name": "remove",
167
+ "type": {
168
+ "__schema": "TypeRefSchema",
169
+ "location": {
170
+ "filePath": "merge-lanes.main.runtime.ts",
171
+ "line": 80,
172
+ "character": 21
173
+ },
174
+ "name": "RemoveMain",
175
+ "componentId": {
176
+ "scope": "teambit.component",
177
+ "name": "remove"
178
+ }
179
+ },
180
+ "isOptional": false,
181
+ "isSpread": false
181
182
  },
182
- "name": "scope",
183
- "type": {
184
- "__schema": "TypeRefSchema",
183
+ {
184
+ "__schema": "ParameterSchema",
185
185
  "location": {
186
186
  "filePath": "merge-lanes.main.runtime.ts",
187
187
  "line": 81,
188
- "character": 20
188
+ "character": 5
189
189
  },
190
- "name": "ScopeMain",
191
- "componentId": {
192
- "scope": "teambit.scope",
193
- "name": "scope"
194
- }
195
- },
196
- "isOptional": false,
197
- "isSpread": false
198
- },
199
- {
200
- "__schema": "ParameterSchema",
201
- "location": {
202
- "filePath": "merge-lanes.main.runtime.ts",
203
- "line": 82,
204
- "character": 5
190
+ "name": "scope",
191
+ "type": {
192
+ "__schema": "TypeRefSchema",
193
+ "location": {
194
+ "filePath": "merge-lanes.main.runtime.ts",
195
+ "line": 81,
196
+ "character": 20
197
+ },
198
+ "name": "ScopeMain",
199
+ "componentId": {
200
+ "scope": "teambit.scope",
201
+ "name": "scope"
202
+ }
203
+ },
204
+ "isOptional": false,
205
+ "isSpread": false
205
206
  },
206
- "name": "exporter",
207
- "type": {
208
- "__schema": "TypeRefSchema",
207
+ {
208
+ "__schema": "ParameterSchema",
209
209
  "location": {
210
210
  "filePath": "merge-lanes.main.runtime.ts",
211
211
  "line": 82,
212
- "character": 23
212
+ "character": 5
213
213
  },
214
- "name": "ExportMain",
215
- "componentId": {
216
- "scope": "teambit.scope",
217
- "name": "export"
218
- }
219
- },
220
- "isOptional": false,
221
- "isSpread": false
222
- },
223
- {
224
- "__schema": "ParameterSchema",
225
- "location": {
226
- "filePath": "merge-lanes.main.runtime.ts",
227
- "line": 83,
228
- "character": 5
214
+ "name": "exporter",
215
+ "type": {
216
+ "__schema": "TypeRefSchema",
217
+ "location": {
218
+ "filePath": "merge-lanes.main.runtime.ts",
219
+ "line": 82,
220
+ "character": 23
221
+ },
222
+ "name": "ExportMain",
223
+ "componentId": {
224
+ "scope": "teambit.scope",
225
+ "name": "export"
226
+ }
227
+ },
228
+ "isOptional": false,
229
+ "isSpread": false
229
230
  },
230
- "name": "importer",
231
- "type": {
232
- "__schema": "TypeRefSchema",
231
+ {
232
+ "__schema": "ParameterSchema",
233
233
  "location": {
234
234
  "filePath": "merge-lanes.main.runtime.ts",
235
235
  "line": 83,
236
- "character": 23
236
+ "character": 5
237
+ },
238
+ "name": "importer",
239
+ "type": {
240
+ "__schema": "TypeRefSchema",
241
+ "location": {
242
+ "filePath": "merge-lanes.main.runtime.ts",
243
+ "line": 83,
244
+ "character": 23
245
+ },
246
+ "name": "ImporterMain",
247
+ "componentId": {
248
+ "scope": "teambit.scope",
249
+ "name": "importer"
250
+ }
251
+ },
252
+ "isOptional": false,
253
+ "isSpread": false
254
+ },
255
+ {
256
+ "__schema": "ParameterSchema",
257
+ "location": {
258
+ "filePath": "merge-lanes.main.runtime.ts",
259
+ "line": 84,
260
+ "character": 5
261
+ },
262
+ "name": "checkout",
263
+ "type": {
264
+ "__schema": "TypeRefSchema",
265
+ "location": {
266
+ "filePath": "merge-lanes.main.runtime.ts",
267
+ "line": 84,
268
+ "character": 23
269
+ },
270
+ "name": "CheckoutMain",
271
+ "componentId": {
272
+ "scope": "teambit.component",
273
+ "name": "checkout"
274
+ }
237
275
  },
238
- "name": "ImporterMain",
239
- "componentId": {
240
- "scope": "teambit.scope",
241
- "name": "importer"
242
- }
243
- },
244
- "isOptional": false,
245
- "isSpread": false
246
- },
247
- {
248
- "__schema": "ParameterSchema",
276
+ "isOptional": false,
277
+ "isSpread": false
278
+ }
279
+ ],
280
+ "returnType": {
281
+ "__schema": "ThisTypeSchema",
249
282
  "location": {
250
283
  "filePath": "merge-lanes.main.runtime.ts",
251
- "line": 84,
252
- "character": 5
253
- },
254
- "name": "checkout",
255
- "type": {
256
- "__schema": "TypeRefSchema",
257
- "location": {
258
- "filePath": "merge-lanes.main.runtime.ts",
259
- "line": 84,
260
- "character": 23
261
- },
262
- "name": "CheckoutMain",
263
- "componentId": {
264
- "scope": "teambit.component",
265
- "name": "checkout"
266
- }
284
+ "line": 74,
285
+ "character": 1
267
286
  },
268
- "isOptional": false,
269
- "isSpread": false
270
- }
271
- ],
272
- "returnType": {
273
- "__schema": "ThisTypeSchema",
287
+ "name": "MergeLanesMain"
288
+ },
289
+ "modifiers": []
290
+ },
291
+ {
292
+ "__schema": "FunctionLikeSchema",
274
293
  "location": {
275
294
  "filePath": "merge-lanes.main.runtime.ts",
276
- "line": 74,
277
- "character": 1
295
+ "line": 87,
296
+ "character": 3
278
297
  },
279
- "name": "MergeLanesMain"
280
- },
281
- "modifiers": []
282
- },
283
- {
284
- "__schema": "FunctionLikeSchema",
285
- "location": {
286
- "filePath": "merge-lanes.main.runtime.ts",
287
- "line": 87,
288
- "character": 3
289
- },
290
- "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}>",
291
- "name": "mergeLaneByCLI",
292
- "params": [
293
- {
294
- "__schema": "ParameterSchema",
295
- "location": {
296
- "filePath": "merge-lanes.main.runtime.ts",
297
- "line": 87,
298
- "character": 24
299
- },
300
- "name": "laneName",
301
- "type": {
302
- "__schema": "KeywordTypeSchema",
298
+ "signature": "(method) MergeLanesMain.mergeLaneByCLI(laneName: string, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
299
+ "name": "mergeLaneByCLI",
300
+ "params": [
301
+ {
302
+ "__schema": "ParameterSchema",
303
303
  "location": {
304
304
  "filePath": "merge-lanes.main.runtime.ts",
305
305
  "line": 87,
306
- "character": 34
306
+ "character": 24
307
307
  },
308
- "name": "string"
309
- },
310
- "isOptional": false,
311
- "isSpread": false
312
- },
313
- {
314
- "__schema": "ParameterSchema",
315
- "location": {
316
- "filePath": "merge-lanes.main.runtime.ts",
317
- "line": 87,
318
- "character": 42
308
+ "name": "laneName",
309
+ "type": {
310
+ "__schema": "KeywordTypeSchema",
311
+ "location": {
312
+ "filePath": "merge-lanes.main.runtime.ts",
313
+ "line": 87,
314
+ "character": 34
315
+ },
316
+ "name": "string"
317
+ },
318
+ "isOptional": false,
319
+ "isSpread": false
319
320
  },
320
- "name": "options",
321
- "type": {
322
- "__schema": "TypeRefSchema",
321
+ {
322
+ "__schema": "ParameterSchema",
323
323
  "location": {
324
324
  "filePath": "merge-lanes.main.runtime.ts",
325
325
  "line": 87,
326
- "character": 51
326
+ "character": 42
327
+ },
328
+ "name": "options",
329
+ "type": {
330
+ "__schema": "TypeRefSchema",
331
+ "location": {
332
+ "filePath": "merge-lanes.main.runtime.ts",
333
+ "line": 87,
334
+ "character": 51
335
+ },
336
+ "name": "MergeLaneOptions",
337
+ "internalFilePath": "merge-lanes.main.runtime.ts"
327
338
  },
328
- "name": "MergeLaneOptions",
329
- "internalFilePath": "merge-lanes.main.runtime.ts"
339
+ "isOptional": false,
340
+ "isSpread": false
341
+ }
342
+ ],
343
+ "returnType": {
344
+ "__schema": "InferenceTypeSchema",
345
+ "location": {
346
+ "filePath": "merge-lanes.main.runtime.ts",
347
+ "line": 87,
348
+ "character": 3
330
349
  },
331
- "isOptional": false,
332
- "isSpread": false
333
- }
334
- ],
335
- "returnType": {
336
- "__schema": "InferenceTypeSchema",
350
+ "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
351
+ },
352
+ "modifiers": [
353
+ "async"
354
+ ]
355
+ },
356
+ {
357
+ "__schema": "FunctionLikeSchema",
337
358
  "location": {
338
359
  "filePath": "merge-lanes.main.runtime.ts",
339
- "line": 87,
360
+ "line": 97,
340
361
  "character": 3
341
362
  },
342
- "type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
343
- },
344
- "modifiers": [
345
- "async"
346
- ]
347
- },
348
- {
349
- "__schema": "FunctionLikeSchema",
350
- "location": {
351
- "filePath": "merge-lanes.main.runtime.ts",
352
- "line": 97,
353
- "character": 3
354
- },
355
- "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}>",
356
- "name": "mergeLane",
357
- "params": [
358
- {
359
- "__schema": "ParameterSchema",
360
- "location": {
361
- "filePath": "merge-lanes.main.runtime.ts",
362
- "line": 98,
363
- "character": 5
364
- },
365
- "name": "otherLaneId",
366
- "type": {
367
- "__schema": "TypeRefSchema",
363
+ "signature": "(method) MergeLanesMain.mergeLane(otherLaneId: LaneId, currentLaneId: LaneId, options: MergeLaneOptions): Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>",
364
+ "name": "mergeLane",
365
+ "params": [
366
+ {
367
+ "__schema": "ParameterSchema",
368
368
  "location": {
369
369
  "filePath": "merge-lanes.main.runtime.ts",
370
370
  "line": 98,
371
- "character": 18
371
+ "character": 5
372
372
  },
373
- "name": "LaneId",
374
- "componentId": {
375
- "scope": "teambit.lanes",
376
- "name": "lane-id",
377
- "version": "0.0.311"
378
- }
379
- },
380
- "isOptional": false,
381
- "isSpread": false
382
- },
383
- {
384
- "__schema": "ParameterSchema",
385
- "location": {
386
- "filePath": "merge-lanes.main.runtime.ts",
387
- "line": 99,
388
- "character": 5
373
+ "name": "otherLaneId",
374
+ "type": {
375
+ "__schema": "TypeRefSchema",
376
+ "location": {
377
+ "filePath": "merge-lanes.main.runtime.ts",
378
+ "line": 98,
379
+ "character": 18
380
+ },
381
+ "name": "LaneId",
382
+ "componentId": {
383
+ "scope": "teambit.lanes",
384
+ "name": "lane-id",
385
+ "version": "0.0.311"
386
+ }
387
+ },
388
+ "isOptional": false,
389
+ "isSpread": false
389
390
  },
390
- "name": "currentLaneId",
391
- "type": {
392
- "__schema": "TypeRefSchema",
391
+ {
392
+ "__schema": "ParameterSchema",
393
393
  "location": {
394
394
  "filePath": "merge-lanes.main.runtime.ts",
395
395
  "line": 99,
396
- "character": 20
396
+ "character": 5
397
397
  },
398
- "name": "LaneId",
399
- "componentId": {
400
- "scope": "teambit.lanes",
401
- "name": "lane-id",
402
- "version": "0.0.311"
403
- }
404
- },
405
- "isOptional": false,
406
- "isSpread": false
407
- },
408
- {
409
- "__schema": "ParameterSchema",
410
- "location": {
411
- "filePath": "merge-lanes.main.runtime.ts",
412
- "line": 100,
413
- "character": 5
414
- },
415
- "name": "options",
416
- "type": {
417
- "__schema": "TypeRefSchema",
418
- "location": {
419
- "filePath": "merge-lanes.main.runtime.ts",
420
- "line": 100,
421
- "character": 14
398
+ "name": "currentLaneId",
399
+ "type": {
400
+ "__schema": "TypeRefSchema",
401
+ "location": {
402
+ "filePath": "merge-lanes.main.runtime.ts",
403
+ "line": 99,
404
+ "character": 20
405
+ },
406
+ "name": "LaneId",
407
+ "componentId": {
408
+ "scope": "teambit.lanes",
409
+ "name": "lane-id",
410
+ "version": "0.0.311"
411
+ }
422
412
  },
423
- "name": "MergeLaneOptions",
424
- "internalFilePath": "merge-lanes.main.runtime.ts"
413
+ "isOptional": false,
414
+ "isSpread": false
425
415
  },
426
- "isOptional": false,
427
- "isSpread": false
428
- }
429
- ],
430
- "returnType": {
431
- "__schema": "TypeRefSchema",
432
- "location": {
433
- "filePath": "merge-lanes.main.runtime.ts",
434
- "line": 101,
435
- "character": 6
436
- },
437
- "name": "Promise",
438
- "typeArgs": [
439
416
  {
440
- "__schema": "TypeLiteralSchema",
417
+ "__schema": "ParameterSchema",
441
418
  "location": {
442
419
  "filePath": "merge-lanes.main.runtime.ts",
443
- "line": 101,
444
- "character": 14
420
+ "line": 100,
421
+ "character": 5
445
422
  },
446
- "members": [
447
- {
448
- "__schema": "VariableLikeSchema",
449
- "location": {
450
- "filePath": "merge-lanes.main.runtime.ts",
451
- "line": 102,
452
- "character": 5
453
- },
454
- "signature": "(property) mergeResults: ApplyVersionResults",
455
- "name": "mergeResults",
456
- "type": {
457
- "__schema": "TypeRefSchema",
423
+ "name": "options",
424
+ "type": {
425
+ "__schema": "TypeRefSchema",
426
+ "location": {
427
+ "filePath": "merge-lanes.main.runtime.ts",
428
+ "line": 100,
429
+ "character": 14
430
+ },
431
+ "name": "MergeLaneOptions",
432
+ "internalFilePath": "merge-lanes.main.runtime.ts"
433
+ },
434
+ "isOptional": false,
435
+ "isSpread": false
436
+ }
437
+ ],
438
+ "returnType": {
439
+ "__schema": "TypeRefSchema",
440
+ "location": {
441
+ "filePath": "merge-lanes.main.runtime.ts",
442
+ "line": 101,
443
+ "character": 6
444
+ },
445
+ "name": "Promise",
446
+ "typeArgs": [
447
+ {
448
+ "__schema": "TypeLiteralSchema",
449
+ "location": {
450
+ "filePath": "merge-lanes.main.runtime.ts",
451
+ "line": 101,
452
+ "character": 14
453
+ },
454
+ "members": [
455
+ {
456
+ "__schema": "VariableLikeSchema",
458
457
  "location": {
459
458
  "filePath": "merge-lanes.main.runtime.ts",
460
459
  "line": 102,
461
460
  "character": 5
462
461
  },
463
- "name": "ApplyVersionResults",
464
- "componentId": {
465
- "scope": "teambit.component",
466
- "name": "merging"
467
- }
468
- },
469
- "isOptional": false
470
- },
471
- {
472
- "__schema": "VariableLikeSchema",
473
- "location": {
474
- "filePath": "merge-lanes.main.runtime.ts",
475
- "line": 103,
476
- "character": 5
462
+ "signature": "(property) mergeResults: ApplyVersionResults",
463
+ "name": "mergeResults",
464
+ "type": {
465
+ "__schema": "TypeRefSchema",
466
+ "location": {
467
+ "filePath": "merge-lanes.main.runtime.ts",
468
+ "line": 102,
469
+ "character": 5
470
+ },
471
+ "name": "ApplyVersionResults",
472
+ "componentId": {
473
+ "scope": "teambit.component",
474
+ "name": "merging"
475
+ }
476
+ },
477
+ "isOptional": false
477
478
  },
478
- "signature": "(property) deleteResults: any",
479
- "name": "deleteResults",
480
- "type": {
481
- "__schema": "KeywordTypeSchema",
479
+ {
480
+ "__schema": "VariableLikeSchema",
482
481
  "location": {
483
482
  "filePath": "merge-lanes.main.runtime.ts",
484
483
  "line": 103,
485
- "character": 20
484
+ "character": 5
486
485
  },
487
- "name": "any"
488
- },
489
- "isOptional": false
490
- },
491
- {
492
- "__schema": "VariableLikeSchema",
493
- "location": {
494
- "filePath": "merge-lanes.main.runtime.ts",
495
- "line": 104,
496
- "character": 5
486
+ "signature": "(property) deleteResults: any",
487
+ "name": "deleteResults",
488
+ "type": {
489
+ "__schema": "KeywordTypeSchema",
490
+ "location": {
491
+ "filePath": "merge-lanes.main.runtime.ts",
492
+ "line": 103,
493
+ "character": 20
494
+ },
495
+ "name": "any"
496
+ },
497
+ "isOptional": false
497
498
  },
498
- "signature": "(property) configMergeResults: ConfigMergeResult[]",
499
- "name": "configMergeResults",
500
- "type": {
501
- "__schema": "TypeArraySchema",
499
+ {
500
+ "__schema": "VariableLikeSchema",
502
501
  "location": {
503
502
  "filePath": "merge-lanes.main.runtime.ts",
504
503
  "line": 104,
505
- "character": 25
504
+ "character": 5
506
505
  },
506
+ "signature": "(property) configMergeResults: ConfigMergeResult[]",
507
+ "name": "configMergeResults",
507
508
  "type": {
508
- "__schema": "TypeRefSchema",
509
+ "__schema": "TypeArraySchema",
509
510
  "location": {
510
511
  "filePath": "merge-lanes.main.runtime.ts",
511
512
  "line": 104,
512
513
  "character": 25
513
514
  },
514
- "name": "ConfigMergeResult",
515
- "componentId": {
516
- "scope": "teambit.workspace",
517
- "name": "config-merger"
515
+ "type": {
516
+ "__schema": "TypeRefSchema",
517
+ "location": {
518
+ "filePath": "merge-lanes.main.runtime.ts",
519
+ "line": 104,
520
+ "character": 25
521
+ },
522
+ "name": "ConfigMergeResult",
523
+ "componentId": {
524
+ "scope": "teambit.workspace",
525
+ "name": "config-merger"
526
+ }
518
527
  }
519
- }
520
- },
521
- "isOptional": false
522
- },
523
- {
524
- "__schema": "VariableLikeSchema",
525
- "location": {
526
- "filePath": "merge-lanes.main.runtime.ts",
527
- "line": 105,
528
- "character": 5
528
+ },
529
+ "isOptional": false
529
530
  },
530
- "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
531
- "name": "mergedSuccessfullyIds",
532
- "type": {
533
- "__schema": "TypeArraySchema",
531
+ {
532
+ "__schema": "VariableLikeSchema",
534
533
  "location": {
535
534
  "filePath": "merge-lanes.main.runtime.ts",
536
535
  "line": 105,
537
- "character": 28
536
+ "character": 5
538
537
  },
538
+ "signature": "(property) mergedSuccessfullyIds: ComponentID[]",
539
+ "name": "mergedSuccessfullyIds",
539
540
  "type": {
540
- "__schema": "TypeRefSchema",
541
+ "__schema": "TypeArraySchema",
541
542
  "location": {
542
543
  "filePath": "merge-lanes.main.runtime.ts",
543
544
  "line": 105,
544
545
  "character": 28
545
546
  },
546
- "name": "ComponentID",
547
- "componentId": {
548
- "scope": "teambit.component",
549
- "name": "component-id",
550
- "version": "1.2.0"
547
+ "type": {
548
+ "__schema": "TypeRefSchema",
549
+ "location": {
550
+ "filePath": "merge-lanes.main.runtime.ts",
551
+ "line": 105,
552
+ "character": 28
553
+ },
554
+ "name": "ComponentID",
555
+ "componentId": {
556
+ "scope": "teambit.component",
557
+ "name": "component-id",
558
+ "version": "1.2.0"
559
+ }
551
560
  }
552
- }
553
- },
554
- "isOptional": false
555
- },
556
- {
557
- "__schema": "VariableLikeSchema",
558
- "location": {
559
- "filePath": "merge-lanes.main.runtime.ts",
560
- "line": 106,
561
- "character": 5
561
+ },
562
+ "isOptional": false
562
563
  },
563
- "signature": "(property) conflicts: ConflictPerId[]",
564
- "name": "conflicts",
565
- "type": {
566
- "__schema": "TypeArraySchema",
564
+ {
565
+ "__schema": "VariableLikeSchema",
567
566
  "location": {
568
567
  "filePath": "merge-lanes.main.runtime.ts",
569
568
  "line": 106,
570
- "character": 16
569
+ "character": 5
571
570
  },
571
+ "signature": "(property) conflicts: ConflictPerId[]",
572
+ "name": "conflicts",
572
573
  "type": {
573
- "__schema": "TypeRefSchema",
574
+ "__schema": "TypeArraySchema",
574
575
  "location": {
575
576
  "filePath": "merge-lanes.main.runtime.ts",
576
577
  "line": 106,
577
578
  "character": 16
578
579
  },
579
- "name": "ConflictPerId",
580
- "internalFilePath": "merge-lanes.main.runtime.ts"
581
- }
582
- },
583
- "isOptional": false
584
- }
585
- ]
586
- }
580
+ "type": {
581
+ "__schema": "TypeRefSchema",
582
+ "location": {
583
+ "filePath": "merge-lanes.main.runtime.ts",
584
+ "line": 106,
585
+ "character": 16
586
+ },
587
+ "name": "ConflictPerId",
588
+ "internalFilePath": "merge-lanes.main.runtime.ts"
589
+ }
590
+ },
591
+ "isOptional": false
592
+ }
593
+ ]
594
+ }
595
+ ]
596
+ },
597
+ "modifiers": [
598
+ "async"
587
599
  ]
588
600
  },
589
- "modifiers": [
590
- "async"
591
- ]
592
- },
593
- {
594
- "__schema": "FunctionLikeSchema",
595
- "location": {
596
- "filePath": "merge-lanes.main.runtime.ts",
597
- "line": 319,
598
- "character": 3
599
- },
600
- "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
601
- "name": "mergeMove",
602
- "params": [
603
- {
604
- "__schema": "ParameterSchema",
605
- "location": {
606
- "filePath": "merge-lanes.main.runtime.ts",
607
- "line": 319,
608
- "character": 19
609
- },
610
- "name": "newLaneName",
611
- "type": {
612
- "__schema": "KeywordTypeSchema",
601
+ {
602
+ "__schema": "FunctionLikeSchema",
603
+ "location": {
604
+ "filePath": "merge-lanes.main.runtime.ts",
605
+ "line": 319,
606
+ "character": 3
607
+ },
608
+ "signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
609
+ "name": "mergeMove",
610
+ "params": [
611
+ {
612
+ "__schema": "ParameterSchema",
613
613
  "location": {
614
614
  "filePath": "merge-lanes.main.runtime.ts",
615
615
  "line": 319,
616
- "character": 32
616
+ "character": 19
617
617
  },
618
- "name": "string"
619
- },
620
- "isOptional": false,
621
- "isSpread": false
622
- },
623
- {
624
- "__schema": "ParameterSchema",
625
- "location": {
626
- "filePath": "merge-lanes.main.runtime.ts",
627
- "line": 319,
628
- "character": 40
618
+ "name": "newLaneName",
619
+ "type": {
620
+ "__schema": "KeywordTypeSchema",
621
+ "location": {
622
+ "filePath": "merge-lanes.main.runtime.ts",
623
+ "line": 319,
624
+ "character": 32
625
+ },
626
+ "name": "string"
627
+ },
628
+ "isOptional": false,
629
+ "isSpread": false
629
630
  },
630
- "name": "options",
631
- "type": {
632
- "__schema": "TypeLiteralSchema",
631
+ {
632
+ "__schema": "ParameterSchema",
633
633
  "location": {
634
634
  "filePath": "merge-lanes.main.runtime.ts",
635
635
  "line": 319,
636
- "character": 49
637
- },
638
- "members": [
639
- {
640
- "__schema": "VariableLikeSchema",
641
- "location": {
642
- "filePath": "merge-lanes.main.runtime.ts",
643
- "line": 319,
644
- "character": 51
645
- },
646
- "signature": "(property) scope?: string | undefined",
647
- "name": "scope",
648
- "type": {
649
- "__schema": "KeywordTypeSchema",
636
+ "character": 40
637
+ },
638
+ "name": "options",
639
+ "type": {
640
+ "__schema": "TypeLiteralSchema",
641
+ "location": {
642
+ "filePath": "merge-lanes.main.runtime.ts",
643
+ "line": 319,
644
+ "character": 49
645
+ },
646
+ "members": [
647
+ {
648
+ "__schema": "VariableLikeSchema",
650
649
  "location": {
651
650
  "filePath": "merge-lanes.main.runtime.ts",
652
651
  "line": 319,
653
- "character": 59
652
+ "character": 51
654
653
  },
655
- "name": "string"
656
- },
657
- "isOptional": true
658
- }
659
- ]
654
+ "signature": "(property) scope?: string | undefined",
655
+ "name": "scope",
656
+ "type": {
657
+ "__schema": "KeywordTypeSchema",
658
+ "location": {
659
+ "filePath": "merge-lanes.main.runtime.ts",
660
+ "line": 319,
661
+ "character": 59
662
+ },
663
+ "name": "string"
664
+ },
665
+ "isOptional": true
666
+ }
667
+ ]
668
+ },
669
+ "isOptional": false,
670
+ "isSpread": false
671
+ }
672
+ ],
673
+ "returnType": {
674
+ "__schema": "InferenceTypeSchema",
675
+ "location": {
676
+ "filePath": "merge-lanes.main.runtime.ts",
677
+ "line": 319,
678
+ "character": 3
660
679
  },
661
- "isOptional": false,
662
- "isSpread": false
663
- }
664
- ],
665
- "returnType": {
666
- "__schema": "InferenceTypeSchema",
680
+ "type": "Promise<CreateLaneResult>"
681
+ },
682
+ "modifiers": [
683
+ "async"
684
+ ]
685
+ },
686
+ {
687
+ "__schema": "FunctionLikeSchema",
667
688
  "location": {
668
689
  "filePath": "merge-lanes.main.runtime.ts",
669
- "line": 319,
690
+ "line": 327,
670
691
  "character": 3
671
692
  },
672
- "type": "Promise<CreateLaneResult>"
673
- },
674
- "modifiers": [
675
- "async"
676
- ]
677
- },
678
- {
679
- "__schema": "FunctionLikeSchema",
680
- "location": {
681
- "filePath": "merge-lanes.main.runtime.ts",
682
- "line": 327,
683
- "character": 3
684
- },
685
- "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
686
- "name": "abortLaneMerge",
687
- "params": [
688
- {
689
- "__schema": "ParameterSchema",
690
- "location": {
691
- "filePath": "merge-lanes.main.runtime.ts",
692
- "line": 327,
693
- "character": 24
694
- },
695
- "name": "checkoutProps",
696
- "type": {
697
- "__schema": "TypeRefSchema",
693
+ "signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
694
+ "name": "abortLaneMerge",
695
+ "params": [
696
+ {
697
+ "__schema": "ParameterSchema",
698
698
  "location": {
699
699
  "filePath": "merge-lanes.main.runtime.ts",
700
700
  "line": 327,
701
- "character": 39
701
+ "character": 24
702
702
  },
703
- "name": "CheckoutProps",
704
- "componentId": {
705
- "scope": "teambit.component",
706
- "name": "checkout"
707
- }
703
+ "name": "checkoutProps",
704
+ "type": {
705
+ "__schema": "TypeRefSchema",
706
+ "location": {
707
+ "filePath": "merge-lanes.main.runtime.ts",
708
+ "line": 327,
709
+ "character": 39
710
+ },
711
+ "name": "CheckoutProps",
712
+ "componentId": {
713
+ "scope": "teambit.component",
714
+ "name": "checkout"
715
+ }
716
+ },
717
+ "isOptional": false,
718
+ "isSpread": false
708
719
  },
709
- "isOptional": false,
710
- "isSpread": false
711
- },
712
- {
713
- "__schema": "ParameterSchema",
720
+ {
721
+ "__schema": "ParameterSchema",
722
+ "location": {
723
+ "filePath": "merge-lanes.main.runtime.ts",
724
+ "line": 327,
725
+ "character": 54
726
+ },
727
+ "name": "mergeAbortOpts",
728
+ "type": {
729
+ "__schema": "TypeRefSchema",
730
+ "location": {
731
+ "filePath": "merge-lanes.main.runtime.ts",
732
+ "line": 327,
733
+ "character": 70
734
+ },
735
+ "name": "MergeAbortOpts",
736
+ "internalFilePath": "merge-abort.cmd.ts"
737
+ },
738
+ "isOptional": false,
739
+ "isSpread": false
740
+ }
741
+ ],
742
+ "returnType": {
743
+ "__schema": "InferenceTypeSchema",
714
744
  "location": {
715
745
  "filePath": "merge-lanes.main.runtime.ts",
716
746
  "line": 327,
717
- "character": 54
718
- },
719
- "name": "mergeAbortOpts",
720
- "type": {
721
- "__schema": "TypeRefSchema",
722
- "location": {
723
- "filePath": "merge-lanes.main.runtime.ts",
724
- "line": 327,
725
- "character": 70
726
- },
727
- "name": "MergeAbortOpts",
728
- "internalFilePath": "merge-abort.cmd.ts"
747
+ "character": 3
729
748
  },
730
- "isOptional": false,
731
- "isSpread": false
732
- }
733
- ],
734
- "returnType": {
735
- "__schema": "InferenceTypeSchema",
749
+ "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
750
+ },
751
+ "modifiers": [
752
+ "async"
753
+ ]
754
+ },
755
+ {
756
+ "__schema": "FunctionLikeSchema",
736
757
  "location": {
737
758
  "filePath": "merge-lanes.main.runtime.ts",
738
- "line": 327,
759
+ "line": 383,
739
760
  "character": 3
740
761
  },
741
- "type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
742
- },
743
- "modifiers": [
744
- "async"
745
- ]
746
- },
747
- {
748
- "__schema": "FunctionLikeSchema",
749
- "location": {
750
- "filePath": "merge-lanes.main.runtime.ts",
751
- "line": 383,
752
- "character": 3
753
- },
754
- "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
755
- "name": "mergeFromScope",
756
- "params": [
757
- {
758
- "__schema": "ParameterSchema",
759
- "location": {
760
- "filePath": "merge-lanes.main.runtime.ts",
761
- "line": 384,
762
- "character": 5
763
- },
764
- "name": "fromLane",
765
- "type": {
766
- "__schema": "KeywordTypeSchema",
762
+ "signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
763
+ "name": "mergeFromScope",
764
+ "params": [
765
+ {
766
+ "__schema": "ParameterSchema",
767
767
  "location": {
768
768
  "filePath": "merge-lanes.main.runtime.ts",
769
769
  "line": 384,
770
- "character": 15
770
+ "character": 5
771
771
  },
772
- "name": "string"
773
- },
774
- "isOptional": false,
775
- "isSpread": false
776
- },
777
- {
778
- "__schema": "ParameterSchema",
779
- "location": {
780
- "filePath": "merge-lanes.main.runtime.ts",
781
- "line": 385,
782
- "character": 5
772
+ "name": "fromLane",
773
+ "type": {
774
+ "__schema": "KeywordTypeSchema",
775
+ "location": {
776
+ "filePath": "merge-lanes.main.runtime.ts",
777
+ "line": 384,
778
+ "character": 15
779
+ },
780
+ "name": "string"
781
+ },
782
+ "isOptional": false,
783
+ "isSpread": false
783
784
  },
784
- "name": "toLane",
785
- "type": {
786
- "__schema": "KeywordTypeSchema",
785
+ {
786
+ "__schema": "ParameterSchema",
787
787
  "location": {
788
788
  "filePath": "merge-lanes.main.runtime.ts",
789
789
  "line": 385,
790
- "character": 13
790
+ "character": 5
791
791
  },
792
- "name": "string"
793
- },
794
- "isOptional": false,
795
- "isSpread": false
796
- },
797
- {
798
- "__schema": "ParameterSchema",
799
- "location": {
800
- "filePath": "merge-lanes.main.runtime.ts",
801
- "line": 386,
802
- "character": 5
792
+ "name": "toLane",
793
+ "type": {
794
+ "__schema": "KeywordTypeSchema",
795
+ "location": {
796
+ "filePath": "merge-lanes.main.runtime.ts",
797
+ "line": 385,
798
+ "character": 13
799
+ },
800
+ "name": "string"
801
+ },
802
+ "isOptional": false,
803
+ "isSpread": false
803
804
  },
804
- "name": "options",
805
- "type": {
806
- "__schema": "TypeIntersectionSchema",
805
+ {
806
+ "__schema": "ParameterSchema",
807
807
  "location": {
808
808
  "filePath": "merge-lanes.main.runtime.ts",
809
809
  "line": 386,
810
- "character": 14
810
+ "character": 5
811
811
  },
812
- "types": [
813
- {
814
- "__schema": "TypeRefSchema",
815
- "location": {
816
- "filePath": "merge-lanes.main.runtime.ts",
817
- "line": 386,
818
- "character": 14
819
- },
820
- "name": "Partial",
821
- "typeArgs": [
822
- {
823
- "__schema": "TypeRefSchema",
824
- "location": {
825
- "filePath": "merge-lanes.main.runtime.ts",
826
- "line": 386,
827
- "character": 22
828
- },
829
- "name": "MergeLaneOptions",
830
- "internalFilePath": "merge-lanes.main.runtime.ts"
831
- }
832
- ]
812
+ "name": "options",
813
+ "type": {
814
+ "__schema": "TypeIntersectionSchema",
815
+ "location": {
816
+ "filePath": "merge-lanes.main.runtime.ts",
817
+ "line": 386,
818
+ "character": 14
833
819
  },
834
- {
835
- "__schema": "TypeLiteralSchema",
836
- "location": {
837
- "filePath": "merge-lanes.main.runtime.ts",
838
- "line": 386,
839
- "character": 42
840
- },
841
- "members": [
842
- {
843
- "__schema": "VariableLikeSchema",
844
- "location": {
845
- "filePath": "merge-lanes.main.runtime.ts",
846
- "line": 386,
847
- "character": 44
848
- },
849
- "signature": "(property) push?: boolean | undefined",
850
- "name": "push",
851
- "type": {
852
- "__schema": "KeywordTypeSchema",
820
+ "types": [
821
+ {
822
+ "__schema": "TypeRefSchema",
823
+ "location": {
824
+ "filePath": "merge-lanes.main.runtime.ts",
825
+ "line": 386,
826
+ "character": 14
827
+ },
828
+ "name": "Partial",
829
+ "typeArgs": [
830
+ {
831
+ "__schema": "TypeRefSchema",
853
832
  "location": {
854
833
  "filePath": "merge-lanes.main.runtime.ts",
855
834
  "line": 386,
856
- "character": 51
835
+ "character": 22
857
836
  },
858
- "name": "boolean"
859
- },
860
- "isOptional": true
837
+ "name": "MergeLaneOptions",
838
+ "internalFilePath": "merge-lanes.main.runtime.ts"
839
+ }
840
+ ]
841
+ },
842
+ {
843
+ "__schema": "TypeLiteralSchema",
844
+ "location": {
845
+ "filePath": "merge-lanes.main.runtime.ts",
846
+ "line": 386,
847
+ "character": 42
861
848
  },
862
- {
863
- "__schema": "VariableLikeSchema",
864
- "location": {
865
- "filePath": "merge-lanes.main.runtime.ts",
866
- "line": 386,
867
- "character": 60
868
- },
869
- "signature": "(property) reMerge?: boolean | undefined",
870
- "name": "reMerge",
871
- "type": {
872
- "__schema": "KeywordTypeSchema",
849
+ "members": [
850
+ {
851
+ "__schema": "VariableLikeSchema",
873
852
  "location": {
874
853
  "filePath": "merge-lanes.main.runtime.ts",
875
854
  "line": 386,
876
- "character": 70
855
+ "character": 44
856
+ },
857
+ "signature": "(property) push?: boolean | undefined",
858
+ "name": "push",
859
+ "type": {
860
+ "__schema": "KeywordTypeSchema",
861
+ "location": {
862
+ "filePath": "merge-lanes.main.runtime.ts",
863
+ "line": 386,
864
+ "character": 51
865
+ },
866
+ "name": "boolean"
877
867
  },
878
- "name": "boolean"
868
+ "isOptional": true
879
869
  },
880
- "isOptional": true
881
- }
882
- ]
883
- }
884
- ]
885
- },
886
- "isOptional": false,
887
- "isSpread": false
888
- }
889
- ],
890
- "returnType": {
891
- "__schema": "TypeRefSchema",
892
- "location": {
893
- "filePath": "merge-lanes.main.runtime.ts",
894
- "line": 387,
895
- "character": 6
896
- },
897
- "name": "Promise",
898
- "typeArgs": [
899
- {
900
- "__schema": "TypeRefSchema",
901
- "location": {
902
- "filePath": "merge-lanes.main.runtime.ts",
903
- "line": 387,
904
- "character": 14
870
+ {
871
+ "__schema": "VariableLikeSchema",
872
+ "location": {
873
+ "filePath": "merge-lanes.main.runtime.ts",
874
+ "line": 386,
875
+ "character": 60
876
+ },
877
+ "signature": "(property) reMerge?: boolean | undefined",
878
+ "name": "reMerge",
879
+ "type": {
880
+ "__schema": "KeywordTypeSchema",
881
+ "location": {
882
+ "filePath": "merge-lanes.main.runtime.ts",
883
+ "line": 386,
884
+ "character": 70
885
+ },
886
+ "name": "boolean"
887
+ },
888
+ "isOptional": true
889
+ }
890
+ ]
891
+ }
892
+ ]
905
893
  },
906
- "name": "MergeFromScopeResult",
907
- "internalFilePath": "merge-lanes.main.runtime.ts"
894
+ "isOptional": false,
895
+ "isSpread": false
908
896
  }
897
+ ],
898
+ "returnType": {
899
+ "__schema": "TypeRefSchema",
900
+ "location": {
901
+ "filePath": "merge-lanes.main.runtime.ts",
902
+ "line": 387,
903
+ "character": 6
904
+ },
905
+ "name": "Promise",
906
+ "typeArgs": [
907
+ {
908
+ "__schema": "TypeRefSchema",
909
+ "location": {
910
+ "filePath": "merge-lanes.main.runtime.ts",
911
+ "line": 387,
912
+ "character": 14
913
+ },
914
+ "name": "MergeFromScopeResult",
915
+ "internalFilePath": "merge-lanes.main.runtime.ts"
916
+ }
917
+ ]
918
+ },
919
+ "modifiers": [
920
+ "async"
909
921
  ]
910
922
  },
911
- "modifiers": [
912
- "async"
913
- ]
914
- },
915
- {
916
- "__schema": "VariableLikeSchema",
917
- "location": {
918
- "filePath": "merge-lanes.main.runtime.ts",
919
- "line": 481,
920
- "character": 3
921
- },
922
- "signature": "(property) MergeLanesMain.slots: never[]",
923
- "name": "slots",
924
- "type": {
925
- "__schema": "InferenceTypeSchema",
923
+ {
924
+ "__schema": "VariableLikeSchema",
926
925
  "location": {
927
926
  "filePath": "merge-lanes.main.runtime.ts",
928
927
  "line": 481,
929
928
  "character": 3
930
929
  },
931
- "type": "never[]"
932
- },
933
- "isOptional": true,
934
- "defaultValue": "[]"
935
- },
936
- {
937
- "__schema": "VariableLikeSchema",
938
- "location": {
939
- "filePath": "merge-lanes.main.runtime.ts",
940
- "line": 482,
941
- "character": 3
930
+ "signature": "(property) MergeLanesMain.slots: never[]",
931
+ "name": "slots",
932
+ "type": {
933
+ "__schema": "InferenceTypeSchema",
934
+ "location": {
935
+ "filePath": "merge-lanes.main.runtime.ts",
936
+ "line": 481,
937
+ "character": 3
938
+ },
939
+ "type": "never[]"
940
+ },
941
+ "isOptional": true,
942
+ "defaultValue": "[]"
942
943
  },
943
- "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
944
- "name": "dependencies",
945
- "type": {
946
- "__schema": "InferenceTypeSchema",
944
+ {
945
+ "__schema": "VariableLikeSchema",
947
946
  "location": {
948
947
  "filePath": "merge-lanes.main.runtime.ts",
949
948
  "line": 482,
950
949
  "character": 3
951
950
  },
952
- "type": "Aspect[]"
953
- },
954
- "isOptional": true,
955
- "defaultValue": "[\n LanesAspect,\n CLIAspect,\n WorkspaceAspect,\n MergingAspect,\n LoggerAspect,\n RemoveAspect,\n ScopeAspect,\n ExportAspect,\n ImporterAspect,\n CheckoutAspect,\n GlobalConfigAspect,\n ]"
956
- },
957
- {
958
- "__schema": "VariableLikeSchema",
959
- "location": {
960
- "filePath": "merge-lanes.main.runtime.ts",
961
- "line": 495,
962
- "character": 3
951
+ "signature": "(property) MergeLanesMain.dependencies: Aspect[]",
952
+ "name": "dependencies",
953
+ "type": {
954
+ "__schema": "InferenceTypeSchema",
955
+ "location": {
956
+ "filePath": "merge-lanes.main.runtime.ts",
957
+ "line": 482,
958
+ "character": 3
959
+ },
960
+ "type": "Aspect[]"
961
+ },
962
+ "isOptional": true,
963
+ "defaultValue": "[\n LanesAspect,\n CLIAspect,\n WorkspaceAspect,\n MergingAspect,\n LoggerAspect,\n RemoveAspect,\n ScopeAspect,\n ExportAspect,\n ImporterAspect,\n CheckoutAspect,\n GlobalConfigAspect,\n ]"
963
964
  },
964
- "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
965
- "name": "runtime",
966
- "type": {
967
- "__schema": "InferenceTypeSchema",
965
+ {
966
+ "__schema": "VariableLikeSchema",
968
967
  "location": {
969
968
  "filePath": "merge-lanes.main.runtime.ts",
970
969
  "line": 495,
971
970
  "character": 3
972
971
  },
973
- "type": "RuntimeDefinition"
974
- },
975
- "isOptional": true,
976
- "defaultValue": "MainRuntime"
977
- },
978
- {
979
- "__schema": "FunctionLikeSchema",
980
- "location": {
981
- "filePath": "merge-lanes.main.runtime.ts",
982
- "line": 497,
983
- "character": 3
984
- },
985
- "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>",
986
- "name": "provider",
987
- "params": [
988
- {
989
- "__schema": "ParameterSchema",
972
+ "signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
973
+ "name": "runtime",
974
+ "type": {
975
+ "__schema": "InferenceTypeSchema",
990
976
  "location": {
991
977
  "filePath": "merge-lanes.main.runtime.ts",
992
- "line": 497,
993
- "character": 25
978
+ "line": 495,
979
+ "character": 3
994
980
  },
995
- "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
996
- "type": {
997
- "__schema": "TupleTypeSchema",
981
+ "type": "RuntimeDefinition"
982
+ },
983
+ "isOptional": true,
984
+ "defaultValue": "MainRuntime"
985
+ },
986
+ {
987
+ "__schema": "FunctionLikeSchema",
988
+ "location": {
989
+ "filePath": "merge-lanes.main.runtime.ts",
990
+ "line": 497,
991
+ "character": 3
992
+ },
993
+ "signature": "(method) MergeLanesMain.provider([lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig,]: [\n LanesMain,\n CLIMain,\n Workspace,\n MergingMain,\n LoggerMain,\n RemoveMain,\n ScopeMain,\n ExportMain,\n ImporterMain,\n CheckoutMain,\n GlobalConfigMain\n]): Promise<MergeLanesMain>",
994
+ "name": "provider",
995
+ "params": [
996
+ {
997
+ "__schema": "ParameterSchema",
998
998
  "location": {
999
999
  "filePath": "merge-lanes.main.runtime.ts",
1000
- "line": 509,
1001
- "character": 6
1000
+ "line": 497,
1001
+ "character": 25
1002
1002
  },
1003
- "elements": [
1004
- {
1005
- "__schema": "TypeRefSchema",
1006
- "location": {
1007
- "filePath": "merge-lanes.main.runtime.ts",
1008
- "line": 510,
1009
- "character": 5
1010
- },
1011
- "name": "LanesMain",
1012
- "componentId": {
1013
- "scope": "teambit.lanes",
1014
- "name": "lanes"
1015
- }
1003
+ "name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
1004
+ "type": {
1005
+ "__schema": "TupleTypeSchema",
1006
+ "location": {
1007
+ "filePath": "merge-lanes.main.runtime.ts",
1008
+ "line": 509,
1009
+ "character": 6
1016
1010
  },
1017
- {
1018
- "__schema": "TypeRefSchema",
1019
- "location": {
1020
- "filePath": "merge-lanes.main.runtime.ts",
1021
- "line": 511,
1022
- "character": 5
1011
+ "elements": [
1012
+ {
1013
+ "__schema": "TypeRefSchema",
1014
+ "location": {
1015
+ "filePath": "merge-lanes.main.runtime.ts",
1016
+ "line": 510,
1017
+ "character": 5
1018
+ },
1019
+ "name": "LanesMain",
1020
+ "componentId": {
1021
+ "scope": "teambit.lanes",
1022
+ "name": "lanes"
1023
+ }
1023
1024
  },
1024
- "name": "CLIMain",
1025
- "componentId": {
1026
- "scope": "teambit.harmony",
1027
- "name": "cli"
1028
- }
1029
- },
1030
- {
1031
- "__schema": "TypeRefSchema",
1032
- "location": {
1033
- "filePath": "merge-lanes.main.runtime.ts",
1034
- "line": 512,
1035
- "character": 5
1025
+ {
1026
+ "__schema": "TypeRefSchema",
1027
+ "location": {
1028
+ "filePath": "merge-lanes.main.runtime.ts",
1029
+ "line": 511,
1030
+ "character": 5
1031
+ },
1032
+ "name": "CLIMain",
1033
+ "componentId": {
1034
+ "scope": "teambit.harmony",
1035
+ "name": "cli"
1036
+ }
1036
1037
  },
1037
- "name": "Workspace",
1038
- "componentId": {
1039
- "scope": "teambit.workspace",
1040
- "name": "workspace"
1041
- }
1042
- },
1043
- {
1044
- "__schema": "TypeRefSchema",
1045
- "location": {
1046
- "filePath": "merge-lanes.main.runtime.ts",
1047
- "line": 513,
1048
- "character": 5
1038
+ {
1039
+ "__schema": "TypeRefSchema",
1040
+ "location": {
1041
+ "filePath": "merge-lanes.main.runtime.ts",
1042
+ "line": 512,
1043
+ "character": 5
1044
+ },
1045
+ "name": "Workspace",
1046
+ "componentId": {
1047
+ "scope": "teambit.workspace",
1048
+ "name": "workspace"
1049
+ }
1049
1050
  },
1050
- "name": "MergingMain",
1051
- "componentId": {
1052
- "scope": "teambit.component",
1053
- "name": "merging"
1054
- }
1055
- },
1056
- {
1057
- "__schema": "TypeRefSchema",
1058
- "location": {
1059
- "filePath": "merge-lanes.main.runtime.ts",
1060
- "line": 514,
1061
- "character": 5
1051
+ {
1052
+ "__schema": "TypeRefSchema",
1053
+ "location": {
1054
+ "filePath": "merge-lanes.main.runtime.ts",
1055
+ "line": 513,
1056
+ "character": 5
1057
+ },
1058
+ "name": "MergingMain",
1059
+ "componentId": {
1060
+ "scope": "teambit.component",
1061
+ "name": "merging"
1062
+ }
1062
1063
  },
1063
- "name": "LoggerMain",
1064
- "componentId": {
1065
- "scope": "teambit.harmony",
1066
- "name": "logger"
1067
- }
1068
- },
1069
- {
1070
- "__schema": "TypeRefSchema",
1071
- "location": {
1072
- "filePath": "merge-lanes.main.runtime.ts",
1073
- "line": 515,
1074
- "character": 5
1064
+ {
1065
+ "__schema": "TypeRefSchema",
1066
+ "location": {
1067
+ "filePath": "merge-lanes.main.runtime.ts",
1068
+ "line": 514,
1069
+ "character": 5
1070
+ },
1071
+ "name": "LoggerMain",
1072
+ "componentId": {
1073
+ "scope": "teambit.harmony",
1074
+ "name": "logger"
1075
+ }
1075
1076
  },
1076
- "name": "RemoveMain",
1077
- "componentId": {
1078
- "scope": "teambit.component",
1079
- "name": "remove"
1080
- }
1081
- },
1082
- {
1083
- "__schema": "TypeRefSchema",
1084
- "location": {
1085
- "filePath": "merge-lanes.main.runtime.ts",
1086
- "line": 516,
1087
- "character": 5
1077
+ {
1078
+ "__schema": "TypeRefSchema",
1079
+ "location": {
1080
+ "filePath": "merge-lanes.main.runtime.ts",
1081
+ "line": 515,
1082
+ "character": 5
1083
+ },
1084
+ "name": "RemoveMain",
1085
+ "componentId": {
1086
+ "scope": "teambit.component",
1087
+ "name": "remove"
1088
+ }
1088
1089
  },
1089
- "name": "ScopeMain",
1090
- "componentId": {
1091
- "scope": "teambit.scope",
1092
- "name": "scope"
1093
- }
1094
- },
1095
- {
1096
- "__schema": "TypeRefSchema",
1097
- "location": {
1098
- "filePath": "merge-lanes.main.runtime.ts",
1099
- "line": 517,
1100
- "character": 5
1090
+ {
1091
+ "__schema": "TypeRefSchema",
1092
+ "location": {
1093
+ "filePath": "merge-lanes.main.runtime.ts",
1094
+ "line": 516,
1095
+ "character": 5
1096
+ },
1097
+ "name": "ScopeMain",
1098
+ "componentId": {
1099
+ "scope": "teambit.scope",
1100
+ "name": "scope"
1101
+ }
1101
1102
  },
1102
- "name": "ExportMain",
1103
- "componentId": {
1104
- "scope": "teambit.scope",
1105
- "name": "export"
1106
- }
1107
- },
1108
- {
1109
- "__schema": "TypeRefSchema",
1110
- "location": {
1111
- "filePath": "merge-lanes.main.runtime.ts",
1112
- "line": 518,
1113
- "character": 5
1103
+ {
1104
+ "__schema": "TypeRefSchema",
1105
+ "location": {
1106
+ "filePath": "merge-lanes.main.runtime.ts",
1107
+ "line": 517,
1108
+ "character": 5
1109
+ },
1110
+ "name": "ExportMain",
1111
+ "componentId": {
1112
+ "scope": "teambit.scope",
1113
+ "name": "export"
1114
+ }
1114
1115
  },
1115
- "name": "ImporterMain",
1116
- "componentId": {
1117
- "scope": "teambit.scope",
1118
- "name": "importer"
1119
- }
1120
- },
1121
- {
1122
- "__schema": "TypeRefSchema",
1123
- "location": {
1124
- "filePath": "merge-lanes.main.runtime.ts",
1125
- "line": 519,
1126
- "character": 5
1116
+ {
1117
+ "__schema": "TypeRefSchema",
1118
+ "location": {
1119
+ "filePath": "merge-lanes.main.runtime.ts",
1120
+ "line": 518,
1121
+ "character": 5
1122
+ },
1123
+ "name": "ImporterMain",
1124
+ "componentId": {
1125
+ "scope": "teambit.scope",
1126
+ "name": "importer"
1127
+ }
1127
1128
  },
1128
- "name": "CheckoutMain",
1129
- "componentId": {
1130
- "scope": "teambit.component",
1131
- "name": "checkout"
1132
- }
1133
- },
1134
- {
1135
- "__schema": "TypeRefSchema",
1136
- "location": {
1137
- "filePath": "merge-lanes.main.runtime.ts",
1138
- "line": 520,
1139
- "character": 5
1129
+ {
1130
+ "__schema": "TypeRefSchema",
1131
+ "location": {
1132
+ "filePath": "merge-lanes.main.runtime.ts",
1133
+ "line": 519,
1134
+ "character": 5
1135
+ },
1136
+ "name": "CheckoutMain",
1137
+ "componentId": {
1138
+ "scope": "teambit.component",
1139
+ "name": "checkout"
1140
+ }
1140
1141
  },
1141
- "name": "GlobalConfigMain",
1142
- "componentId": {
1143
- "scope": "teambit.harmony",
1144
- "name": "global-config"
1142
+ {
1143
+ "__schema": "TypeRefSchema",
1144
+ "location": {
1145
+ "filePath": "merge-lanes.main.runtime.ts",
1146
+ "line": 520,
1147
+ "character": 5
1148
+ },
1149
+ "name": "GlobalConfigMain",
1150
+ "componentId": {
1151
+ "scope": "teambit.harmony",
1152
+ "name": "global-config"
1153
+ }
1145
1154
  }
1146
- }
1147
- ]
1155
+ ]
1156
+ },
1157
+ "isOptional": false,
1158
+ "isSpread": false
1159
+ }
1160
+ ],
1161
+ "returnType": {
1162
+ "__schema": "InferenceTypeSchema",
1163
+ "location": {
1164
+ "filePath": "merge-lanes.main.runtime.ts",
1165
+ "line": 497,
1166
+ "character": 3
1148
1167
  },
1149
- "isOptional": false,
1150
- "isSpread": false
1151
- }
1152
- ],
1153
- "returnType": {
1154
- "__schema": "InferenceTypeSchema",
1155
- "location": {
1156
- "filePath": "merge-lanes.main.runtime.ts",
1157
- "line": 497,
1158
- "character": 3
1168
+ "type": "Promise<MergeLanesMain>"
1159
1169
  },
1160
- "type": "Promise<MergeLanesMain>"
1161
- },
1162
- "modifiers": [
1163
- "static",
1164
- "async"
1165
- ]
1166
- }
1167
- ],
1168
- "extendsNodes": [],
1169
- "implementNodes": []
1170
+ "modifiers": [
1171
+ "static",
1172
+ "async"
1173
+ ]
1174
+ }
1175
+ ],
1176
+ "extendsNodes": [],
1177
+ "implementNodes": []
1178
+ }
1170
1179
  },
1171
1180
  {
1172
1181
  "__schema": "UnImplementedSchema",
@@ -1179,30 +1188,39 @@
1179
1188
  "type": "Identifier"
1180
1189
  },
1181
1190
  {
1182
- "__schema": "VariableLikeSchema",
1191
+ "__schema": "ExportSchema",
1183
1192
  "location": {
1184
- "filePath": "merge-lanes.aspect.ts",
1185
- "line": 3,
1186
- "character": 14
1193
+ "filePath": "index.ts",
1194
+ "line": 5,
1195
+ "character": 10
1187
1196
  },
1188
- "signature": "const MergeLanesAspect: Aspect",
1189
1197
  "name": "MergeLanesAspect",
1190
- "type": {
1191
- "__schema": "TypeRefSchema",
1198
+ "exportNode": {
1199
+ "__schema": "VariableLikeSchema",
1192
1200
  "location": {
1193
1201
  "filePath": "merge-lanes.aspect.ts",
1194
1202
  "line": 3,
1195
1203
  "character": 14
1196
1204
  },
1197
- "name": "Aspect",
1198
- "componentId": {
1199
- "scope": "teambit.harmony",
1200
- "name": "harmony",
1201
- "version": "0.4.6"
1202
- }
1203
- },
1204
- "isOptional": false,
1205
- "defaultValue": "Aspect.create({\n id: 'teambit.lanes/merge-lanes',\n})"
1205
+ "signature": "const MergeLanesAspect: Aspect",
1206
+ "name": "MergeLanesAspect",
1207
+ "type": {
1208
+ "__schema": "TypeRefSchema",
1209
+ "location": {
1210
+ "filePath": "merge-lanes.aspect.ts",
1211
+ "line": 3,
1212
+ "character": 14
1213
+ },
1214
+ "name": "Aspect",
1215
+ "componentId": {
1216
+ "scope": "teambit.harmony",
1217
+ "name": "harmony",
1218
+ "version": "0.4.6"
1219
+ }
1220
+ },
1221
+ "isOptional": false,
1222
+ "defaultValue": "Aspect.create({\n id: 'teambit.lanes/merge-lanes',\n})"
1223
+ }
1206
1224
  }
1207
1225
  ],
1208
1226
  "internals": []
@@ -3906,7 +3924,7 @@
3906
3924
  "componentId": {
3907
3925
  "scope": "teambit.lanes",
3908
3926
  "name": "merge-lanes",
3909
- "version": "1.0.257"
3927
+ "version": "1.0.259"
3910
3928
  },
3911
3929
  "taggedModuleExports": []
3912
3930
  }