@teambit/merge-lanes 1.0.256 → 1.0.258
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/schema.json
CHANGED
|
@@ -14,1159 +14,1059 @@
|
|
|
14
14
|
},
|
|
15
15
|
"exports": [
|
|
16
16
|
{
|
|
17
|
-
"__schema": "
|
|
17
|
+
"__schema": "ExportSchema",
|
|
18
18
|
"location": {
|
|
19
|
-
"filePath": "
|
|
20
|
-
"line":
|
|
21
|
-
"character":
|
|
19
|
+
"filePath": "index.ts",
|
|
20
|
+
"line": 3,
|
|
21
|
+
"character": 15
|
|
22
22
|
},
|
|
23
|
-
"signature": "class MergeLanesMain",
|
|
24
23
|
"name": "MergeLanesMain",
|
|
25
|
-
"
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
"
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
"
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
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":
|
|
49
|
+
"character": 5
|
|
50
50
|
},
|
|
51
|
-
"
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
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
|
-
|
|
67
|
-
|
|
68
|
-
"
|
|
69
|
-
|
|
70
|
-
|
|
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"
|
|
71
68
|
},
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
"
|
|
84
|
-
"
|
|
69
|
+
{
|
|
70
|
+
"__schema": "KeywordTypeSchema",
|
|
71
|
+
"location": {
|
|
72
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
73
|
+
"line": 76,
|
|
74
|
+
"character": 36
|
|
75
|
+
},
|
|
76
|
+
"name": "undefined"
|
|
77
|
+
}
|
|
78
|
+
]
|
|
79
|
+
},
|
|
80
|
+
"isOptional": false,
|
|
81
|
+
"isSpread": false
|
|
85
82
|
},
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
"__schema": "TypeRefSchema",
|
|
83
|
+
{
|
|
84
|
+
"__schema": "ParameterSchema",
|
|
89
85
|
"location": {
|
|
90
86
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
91
87
|
"line": 77,
|
|
92
|
-
"character":
|
|
88
|
+
"character": 5
|
|
93
89
|
},
|
|
94
|
-
"name": "
|
|
95
|
-
"
|
|
96
|
-
"
|
|
97
|
-
"
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
107
|
-
"line": 78,
|
|
108
|
-
"character": 5
|
|
90
|
+
"name": "merging",
|
|
91
|
+
"type": {
|
|
92
|
+
"__schema": "TypeRefSchema",
|
|
93
|
+
"location": {
|
|
94
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
95
|
+
"line": 77,
|
|
96
|
+
"character": 22
|
|
97
|
+
},
|
|
98
|
+
"name": "MergingMain"
|
|
99
|
+
},
|
|
100
|
+
"isOptional": false,
|
|
101
|
+
"isSpread": false
|
|
109
102
|
},
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
"__schema": "TypeRefSchema",
|
|
103
|
+
{
|
|
104
|
+
"__schema": "ParameterSchema",
|
|
113
105
|
"location": {
|
|
114
106
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
115
107
|
"line": 78,
|
|
116
|
-
"character":
|
|
108
|
+
"character": 5
|
|
117
109
|
},
|
|
118
|
-
"name": "
|
|
119
|
-
"
|
|
120
|
-
"
|
|
121
|
-
"
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
131
|
-
"line": 79,
|
|
132
|
-
"character": 5
|
|
110
|
+
"name": "lanes",
|
|
111
|
+
"type": {
|
|
112
|
+
"__schema": "TypeRefSchema",
|
|
113
|
+
"location": {
|
|
114
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
115
|
+
"line": 78,
|
|
116
|
+
"character": 21
|
|
117
|
+
},
|
|
118
|
+
"name": "LanesMain"
|
|
119
|
+
},
|
|
120
|
+
"isOptional": false,
|
|
121
|
+
"isSpread": false
|
|
133
122
|
},
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
"__schema": "TypeRefSchema",
|
|
123
|
+
{
|
|
124
|
+
"__schema": "ParameterSchema",
|
|
137
125
|
"location": {
|
|
138
126
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
139
127
|
"line": 79,
|
|
140
|
-
"character":
|
|
128
|
+
"character": 5
|
|
141
129
|
},
|
|
142
|
-
"name": "
|
|
143
|
-
"
|
|
144
|
-
"
|
|
145
|
-
"
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
155
|
-
"line": 80,
|
|
156
|
-
"character": 5
|
|
130
|
+
"name": "logger",
|
|
131
|
+
"type": {
|
|
132
|
+
"__schema": "TypeRefSchema",
|
|
133
|
+
"location": {
|
|
134
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
135
|
+
"line": 79,
|
|
136
|
+
"character": 22
|
|
137
|
+
},
|
|
138
|
+
"name": "Logger"
|
|
139
|
+
},
|
|
140
|
+
"isOptional": false,
|
|
141
|
+
"isSpread": false
|
|
157
142
|
},
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
"__schema": "TypeRefSchema",
|
|
143
|
+
{
|
|
144
|
+
"__schema": "ParameterSchema",
|
|
161
145
|
"location": {
|
|
162
146
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
163
147
|
"line": 80,
|
|
164
|
-
"character":
|
|
148
|
+
"character": 5
|
|
165
149
|
},
|
|
166
|
-
"name": "
|
|
167
|
-
"
|
|
168
|
-
"
|
|
169
|
-
"
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
179
|
-
"line": 81,
|
|
180
|
-
"character": 5
|
|
150
|
+
"name": "remove",
|
|
151
|
+
"type": {
|
|
152
|
+
"__schema": "TypeRefSchema",
|
|
153
|
+
"location": {
|
|
154
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
155
|
+
"line": 80,
|
|
156
|
+
"character": 21
|
|
157
|
+
},
|
|
158
|
+
"name": "RemoveMain"
|
|
159
|
+
},
|
|
160
|
+
"isOptional": false,
|
|
161
|
+
"isSpread": false
|
|
181
162
|
},
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
"__schema": "TypeRefSchema",
|
|
163
|
+
{
|
|
164
|
+
"__schema": "ParameterSchema",
|
|
185
165
|
"location": {
|
|
186
166
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
187
167
|
"line": 81,
|
|
188
|
-
"character":
|
|
168
|
+
"character": 5
|
|
189
169
|
},
|
|
190
|
-
"name": "
|
|
191
|
-
"
|
|
192
|
-
"
|
|
193
|
-
"
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
203
|
-
"line": 82,
|
|
204
|
-
"character": 5
|
|
170
|
+
"name": "scope",
|
|
171
|
+
"type": {
|
|
172
|
+
"__schema": "TypeRefSchema",
|
|
173
|
+
"location": {
|
|
174
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
175
|
+
"line": 81,
|
|
176
|
+
"character": 20
|
|
177
|
+
},
|
|
178
|
+
"name": "ScopeMain"
|
|
179
|
+
},
|
|
180
|
+
"isOptional": false,
|
|
181
|
+
"isSpread": false
|
|
205
182
|
},
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
"__schema": "TypeRefSchema",
|
|
183
|
+
{
|
|
184
|
+
"__schema": "ParameterSchema",
|
|
209
185
|
"location": {
|
|
210
186
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
211
187
|
"line": 82,
|
|
212
|
-
"character":
|
|
188
|
+
"character": 5
|
|
213
189
|
},
|
|
214
|
-
"name": "
|
|
215
|
-
"
|
|
216
|
-
"
|
|
217
|
-
"
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
227
|
-
"line": 83,
|
|
228
|
-
"character": 5
|
|
190
|
+
"name": "exporter",
|
|
191
|
+
"type": {
|
|
192
|
+
"__schema": "TypeRefSchema",
|
|
193
|
+
"location": {
|
|
194
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
195
|
+
"line": 82,
|
|
196
|
+
"character": 23
|
|
197
|
+
},
|
|
198
|
+
"name": "ExportMain"
|
|
199
|
+
},
|
|
200
|
+
"isOptional": false,
|
|
201
|
+
"isSpread": false
|
|
229
202
|
},
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
"__schema": "TypeRefSchema",
|
|
203
|
+
{
|
|
204
|
+
"__schema": "ParameterSchema",
|
|
233
205
|
"location": {
|
|
234
206
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
235
207
|
"line": 83,
|
|
236
|
-
"character":
|
|
208
|
+
"character": 5
|
|
237
209
|
},
|
|
238
|
-
"name": "
|
|
239
|
-
"
|
|
240
|
-
"
|
|
241
|
-
"
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
251
|
-
"line": 84,
|
|
252
|
-
"character": 5
|
|
210
|
+
"name": "importer",
|
|
211
|
+
"type": {
|
|
212
|
+
"__schema": "TypeRefSchema",
|
|
213
|
+
"location": {
|
|
214
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
215
|
+
"line": 83,
|
|
216
|
+
"character": 23
|
|
217
|
+
},
|
|
218
|
+
"name": "ImporterMain"
|
|
219
|
+
},
|
|
220
|
+
"isOptional": false,
|
|
221
|
+
"isSpread": false
|
|
253
222
|
},
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
"__schema": "TypeRefSchema",
|
|
223
|
+
{
|
|
224
|
+
"__schema": "ParameterSchema",
|
|
257
225
|
"location": {
|
|
258
226
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
259
227
|
"line": 84,
|
|
260
|
-
"character":
|
|
228
|
+
"character": 5
|
|
261
229
|
},
|
|
262
|
-
"name": "
|
|
263
|
-
"
|
|
264
|
-
"
|
|
265
|
-
"
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
"
|
|
278
|
-
|
|
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": {
|
|
230
|
+
"name": "checkout",
|
|
231
|
+
"type": {
|
|
232
|
+
"__schema": "TypeRefSchema",
|
|
233
|
+
"location": {
|
|
234
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
235
|
+
"line": 84,
|
|
236
|
+
"character": 23
|
|
237
|
+
},
|
|
238
|
+
"name": "CheckoutMain"
|
|
239
|
+
},
|
|
240
|
+
"isOptional": false,
|
|
241
|
+
"isSpread": false
|
|
242
|
+
}
|
|
243
|
+
],
|
|
244
|
+
"returnType": {
|
|
245
|
+
"__schema": "ThisTypeSchema",
|
|
246
|
+
"location": {
|
|
296
247
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
297
|
-
"line":
|
|
298
|
-
"character":
|
|
248
|
+
"line": 74,
|
|
249
|
+
"character": 1
|
|
299
250
|
},
|
|
300
|
-
"name": "
|
|
301
|
-
|
|
302
|
-
|
|
251
|
+
"name": "MergeLanesMain"
|
|
252
|
+
},
|
|
253
|
+
"modifiers": []
|
|
254
|
+
},
|
|
255
|
+
{
|
|
256
|
+
"__schema": "FunctionLikeSchema",
|
|
257
|
+
"location": {
|
|
258
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
259
|
+
"line": 87,
|
|
260
|
+
"character": 3
|
|
261
|
+
},
|
|
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}>",
|
|
263
|
+
"name": "mergeLaneByCLI",
|
|
264
|
+
"params": [
|
|
265
|
+
{
|
|
266
|
+
"__schema": "ParameterSchema",
|
|
303
267
|
"location": {
|
|
304
268
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
305
269
|
"line": 87,
|
|
306
|
-
"character":
|
|
270
|
+
"character": 24
|
|
307
271
|
},
|
|
308
|
-
"name": "
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
"
|
|
272
|
+
"name": "laneName",
|
|
273
|
+
"type": {
|
|
274
|
+
"__schema": "KeywordTypeSchema",
|
|
275
|
+
"location": {
|
|
276
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
277
|
+
"line": 87,
|
|
278
|
+
"character": 34
|
|
279
|
+
},
|
|
280
|
+
"name": "string"
|
|
281
|
+
},
|
|
282
|
+
"isOptional": false,
|
|
283
|
+
"isSpread": false
|
|
319
284
|
},
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
"__schema": "TypeRefSchema",
|
|
285
|
+
{
|
|
286
|
+
"__schema": "ParameterSchema",
|
|
323
287
|
"location": {
|
|
324
288
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
325
289
|
"line": 87,
|
|
326
|
-
"character":
|
|
290
|
+
"character": 42
|
|
291
|
+
},
|
|
292
|
+
"name": "options",
|
|
293
|
+
"type": {
|
|
294
|
+
"__schema": "TypeRefSchema",
|
|
295
|
+
"location": {
|
|
296
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
297
|
+
"line": 87,
|
|
298
|
+
"character": 51
|
|
299
|
+
},
|
|
300
|
+
"name": "MergeLaneOptions"
|
|
327
301
|
},
|
|
328
|
-
"
|
|
329
|
-
"
|
|
302
|
+
"isOptional": false,
|
|
303
|
+
"isSpread": false
|
|
304
|
+
}
|
|
305
|
+
],
|
|
306
|
+
"returnType": {
|
|
307
|
+
"__schema": "InferenceTypeSchema",
|
|
308
|
+
"location": {
|
|
309
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
310
|
+
"line": 87,
|
|
311
|
+
"character": 3
|
|
330
312
|
},
|
|
331
|
-
"
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
313
|
+
"type": "Promise<{\n mergeResults: ApplyVersionResults;\n deleteResults: any;\n configMergeResults: ConfigMergeResult[];\n mergedSuccessfullyIds: ComponentID[];\n conflicts: ConflictPerId[];\n}>"
|
|
314
|
+
},
|
|
315
|
+
"modifiers": [
|
|
316
|
+
"async"
|
|
317
|
+
]
|
|
318
|
+
},
|
|
319
|
+
{
|
|
320
|
+
"__schema": "FunctionLikeSchema",
|
|
337
321
|
"location": {
|
|
338
322
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
339
|
-
"line":
|
|
323
|
+
"line": 97,
|
|
340
324
|
"character": 3
|
|
341
325
|
},
|
|
342
|
-
"
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
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",
|
|
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}>",
|
|
327
|
+
"name": "mergeLane",
|
|
328
|
+
"params": [
|
|
329
|
+
{
|
|
330
|
+
"__schema": "ParameterSchema",
|
|
368
331
|
"location": {
|
|
369
332
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
370
333
|
"line": 98,
|
|
371
|
-
"character":
|
|
334
|
+
"character": 5
|
|
372
335
|
},
|
|
373
|
-
"name": "
|
|
374
|
-
"
|
|
375
|
-
"
|
|
376
|
-
"
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
"location": {
|
|
386
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
387
|
-
"line": 99,
|
|
388
|
-
"character": 5
|
|
336
|
+
"name": "otherLaneId",
|
|
337
|
+
"type": {
|
|
338
|
+
"__schema": "TypeRefSchema",
|
|
339
|
+
"location": {
|
|
340
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
341
|
+
"line": 98,
|
|
342
|
+
"character": 18
|
|
343
|
+
},
|
|
344
|
+
"name": "LaneId"
|
|
345
|
+
},
|
|
346
|
+
"isOptional": false,
|
|
347
|
+
"isSpread": false
|
|
389
348
|
},
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
"__schema": "TypeRefSchema",
|
|
349
|
+
{
|
|
350
|
+
"__schema": "ParameterSchema",
|
|
393
351
|
"location": {
|
|
394
352
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
395
353
|
"line": 99,
|
|
396
|
-
"character":
|
|
354
|
+
"character": 5
|
|
397
355
|
},
|
|
398
|
-
"name": "
|
|
399
|
-
"
|
|
400
|
-
"
|
|
401
|
-
"
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
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
|
|
356
|
+
"name": "currentLaneId",
|
|
357
|
+
"type": {
|
|
358
|
+
"__schema": "TypeRefSchema",
|
|
359
|
+
"location": {
|
|
360
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
361
|
+
"line": 99,
|
|
362
|
+
"character": 20
|
|
363
|
+
},
|
|
364
|
+
"name": "LaneId"
|
|
422
365
|
},
|
|
423
|
-
"
|
|
424
|
-
"
|
|
366
|
+
"isOptional": false,
|
|
367
|
+
"isSpread": false
|
|
425
368
|
},
|
|
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
369
|
{
|
|
440
|
-
"__schema": "
|
|
370
|
+
"__schema": "ParameterSchema",
|
|
441
371
|
"location": {
|
|
442
372
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
443
|
-
"line":
|
|
444
|
-
"character":
|
|
373
|
+
"line": 100,
|
|
374
|
+
"character": 5
|
|
445
375
|
},
|
|
446
|
-
"
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
},
|
|
454
|
-
"signature": "(property) mergeResults: ApplyVersionResults",
|
|
455
|
-
"name": "mergeResults",
|
|
456
|
-
"type": {
|
|
457
|
-
"__schema": "TypeRefSchema",
|
|
458
|
-
"location": {
|
|
459
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
460
|
-
"line": 102,
|
|
461
|
-
"character": 5
|
|
462
|
-
},
|
|
463
|
-
"name": "ApplyVersionResults",
|
|
464
|
-
"componentId": {
|
|
465
|
-
"scope": "teambit.component",
|
|
466
|
-
"name": "merging"
|
|
467
|
-
}
|
|
468
|
-
},
|
|
469
|
-
"isOptional": false
|
|
376
|
+
"name": "options",
|
|
377
|
+
"type": {
|
|
378
|
+
"__schema": "TypeRefSchema",
|
|
379
|
+
"location": {
|
|
380
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
381
|
+
"line": 100,
|
|
382
|
+
"character": 14
|
|
470
383
|
},
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
"
|
|
384
|
+
"name": "MergeLaneOptions"
|
|
385
|
+
},
|
|
386
|
+
"isOptional": false,
|
|
387
|
+
"isSpread": false
|
|
388
|
+
}
|
|
389
|
+
],
|
|
390
|
+
"returnType": {
|
|
391
|
+
"__schema": "TypeRefSchema",
|
|
392
|
+
"location": {
|
|
393
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
394
|
+
"line": 101,
|
|
395
|
+
"character": 6
|
|
396
|
+
},
|
|
397
|
+
"name": "Promise",
|
|
398
|
+
"typeArgs": [
|
|
399
|
+
{
|
|
400
|
+
"__schema": "TypeLiteralSchema",
|
|
401
|
+
"location": {
|
|
402
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
403
|
+
"line": 101,
|
|
404
|
+
"character": 14
|
|
490
405
|
},
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
495
|
-
"line": 104,
|
|
496
|
-
"character": 5
|
|
497
|
-
},
|
|
498
|
-
"signature": "(property) configMergeResults: ConfigMergeResult[]",
|
|
499
|
-
"name": "configMergeResults",
|
|
500
|
-
"type": {
|
|
501
|
-
"__schema": "TypeArraySchema",
|
|
406
|
+
"members": [
|
|
407
|
+
{
|
|
408
|
+
"__schema": "VariableLikeSchema",
|
|
502
409
|
"location": {
|
|
503
410
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
504
|
-
"line":
|
|
505
|
-
"character":
|
|
411
|
+
"line": 102,
|
|
412
|
+
"character": 5
|
|
506
413
|
},
|
|
414
|
+
"signature": "(property) mergeResults: ApplyVersionResults",
|
|
415
|
+
"name": "mergeResults",
|
|
507
416
|
"type": {
|
|
508
417
|
"__schema": "TypeRefSchema",
|
|
509
418
|
"location": {
|
|
510
419
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
511
|
-
"line":
|
|
512
|
-
"character":
|
|
420
|
+
"line": 102,
|
|
421
|
+
"character": 5
|
|
513
422
|
},
|
|
514
|
-
"name": "
|
|
423
|
+
"name": "ApplyVersionResults",
|
|
515
424
|
"componentId": {
|
|
516
|
-
"scope": "teambit.
|
|
517
|
-
"name": "
|
|
425
|
+
"scope": "teambit.component",
|
|
426
|
+
"name": "merging"
|
|
518
427
|
}
|
|
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
|
|
428
|
+
},
|
|
429
|
+
"isOptional": false
|
|
529
430
|
},
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
"type": {
|
|
533
|
-
"__schema": "TypeArraySchema",
|
|
431
|
+
{
|
|
432
|
+
"__schema": "VariableLikeSchema",
|
|
534
433
|
"location": {
|
|
535
434
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
536
|
-
"line":
|
|
537
|
-
"character":
|
|
435
|
+
"line": 103,
|
|
436
|
+
"character": 5
|
|
538
437
|
},
|
|
438
|
+
"signature": "(property) deleteResults: any",
|
|
439
|
+
"name": "deleteResults",
|
|
539
440
|
"type": {
|
|
540
|
-
"__schema": "
|
|
441
|
+
"__schema": "KeywordTypeSchema",
|
|
541
442
|
"location": {
|
|
542
443
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
543
|
-
"line":
|
|
544
|
-
"character":
|
|
444
|
+
"line": 103,
|
|
445
|
+
"character": 20
|
|
545
446
|
},
|
|
546
|
-
"name": "
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
"name": "component-id",
|
|
550
|
-
"version": "1.2.0"
|
|
551
|
-
}
|
|
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
|
|
447
|
+
"name": "any"
|
|
448
|
+
},
|
|
449
|
+
"isOptional": false
|
|
562
450
|
},
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
451
|
+
{
|
|
452
|
+
"__schema": "VariableLikeSchema",
|
|
453
|
+
"location": {
|
|
454
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
455
|
+
"line": 104,
|
|
456
|
+
"character": 5
|
|
457
|
+
},
|
|
458
|
+
"signature": "(property) configMergeResults: ConfigMergeResult[]",
|
|
459
|
+
"name": "configMergeResults",
|
|
460
|
+
"type": {
|
|
461
|
+
"__schema": "TypeArraySchema",
|
|
462
|
+
"location": {
|
|
463
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
464
|
+
"line": 104,
|
|
465
|
+
"character": 25
|
|
466
|
+
},
|
|
467
|
+
"type": {
|
|
468
|
+
"__schema": "TypeRefSchema",
|
|
469
|
+
"location": {
|
|
470
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
471
|
+
"line": 104,
|
|
472
|
+
"character": 25
|
|
473
|
+
},
|
|
474
|
+
"name": "ConfigMergeResult"
|
|
475
|
+
}
|
|
476
|
+
},
|
|
477
|
+
"isOptional": false
|
|
478
|
+
},
|
|
479
|
+
{
|
|
480
|
+
"__schema": "VariableLikeSchema",
|
|
481
|
+
"location": {
|
|
482
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
483
|
+
"line": 105,
|
|
484
|
+
"character": 5
|
|
485
|
+
},
|
|
486
|
+
"signature": "(property) mergedSuccessfullyIds: ComponentID[]",
|
|
487
|
+
"name": "mergedSuccessfullyIds",
|
|
488
|
+
"type": {
|
|
489
|
+
"__schema": "TypeArraySchema",
|
|
490
|
+
"location": {
|
|
491
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
492
|
+
"line": 105,
|
|
493
|
+
"character": 28
|
|
494
|
+
},
|
|
495
|
+
"type": {
|
|
496
|
+
"__schema": "TypeRefSchema",
|
|
497
|
+
"location": {
|
|
498
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
499
|
+
"line": 105,
|
|
500
|
+
"character": 28
|
|
501
|
+
},
|
|
502
|
+
"name": "ComponentID"
|
|
503
|
+
}
|
|
504
|
+
},
|
|
505
|
+
"isOptional": false
|
|
506
|
+
},
|
|
507
|
+
{
|
|
508
|
+
"__schema": "VariableLikeSchema",
|
|
567
509
|
"location": {
|
|
568
510
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
569
511
|
"line": 106,
|
|
570
|
-
"character":
|
|
512
|
+
"character": 5
|
|
571
513
|
},
|
|
514
|
+
"signature": "(property) conflicts: ConflictPerId[]",
|
|
515
|
+
"name": "conflicts",
|
|
572
516
|
"type": {
|
|
573
|
-
"__schema": "
|
|
517
|
+
"__schema": "TypeArraySchema",
|
|
574
518
|
"location": {
|
|
575
519
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
576
520
|
"line": 106,
|
|
577
521
|
"character": 16
|
|
578
522
|
},
|
|
579
|
-
"
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
523
|
+
"type": {
|
|
524
|
+
"__schema": "TypeRefSchema",
|
|
525
|
+
"location": {
|
|
526
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
527
|
+
"line": 106,
|
|
528
|
+
"character": 16
|
|
529
|
+
},
|
|
530
|
+
"name": "ConflictPerId"
|
|
531
|
+
}
|
|
532
|
+
},
|
|
533
|
+
"isOptional": false
|
|
534
|
+
}
|
|
535
|
+
]
|
|
536
|
+
}
|
|
537
|
+
]
|
|
538
|
+
},
|
|
539
|
+
"modifiers": [
|
|
540
|
+
"async"
|
|
587
541
|
]
|
|
588
542
|
},
|
|
589
|
-
|
|
590
|
-
"
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
"
|
|
597
|
-
"
|
|
598
|
-
"
|
|
599
|
-
|
|
600
|
-
|
|
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",
|
|
543
|
+
{
|
|
544
|
+
"__schema": "FunctionLikeSchema",
|
|
545
|
+
"location": {
|
|
546
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
547
|
+
"line": 319,
|
|
548
|
+
"character": 3
|
|
549
|
+
},
|
|
550
|
+
"signature": "(method) MergeLanesMain.mergeMove(newLaneName: string, options: {\n scope?: string;\n}): Promise<CreateLaneResult>",
|
|
551
|
+
"name": "mergeMove",
|
|
552
|
+
"params": [
|
|
553
|
+
{
|
|
554
|
+
"__schema": "ParameterSchema",
|
|
613
555
|
"location": {
|
|
614
556
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
615
557
|
"line": 319,
|
|
616
|
-
"character":
|
|
558
|
+
"character": 19
|
|
617
559
|
},
|
|
618
|
-
"name": "
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
"
|
|
560
|
+
"name": "newLaneName",
|
|
561
|
+
"type": {
|
|
562
|
+
"__schema": "KeywordTypeSchema",
|
|
563
|
+
"location": {
|
|
564
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
565
|
+
"line": 319,
|
|
566
|
+
"character": 32
|
|
567
|
+
},
|
|
568
|
+
"name": "string"
|
|
569
|
+
},
|
|
570
|
+
"isOptional": false,
|
|
571
|
+
"isSpread": false
|
|
629
572
|
},
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
"__schema": "TypeLiteralSchema",
|
|
573
|
+
{
|
|
574
|
+
"__schema": "ParameterSchema",
|
|
633
575
|
"location": {
|
|
634
576
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
635
577
|
"line": 319,
|
|
636
|
-
"character":
|
|
637
|
-
},
|
|
638
|
-
"
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
"__schema": "KeywordTypeSchema",
|
|
578
|
+
"character": 40
|
|
579
|
+
},
|
|
580
|
+
"name": "options",
|
|
581
|
+
"type": {
|
|
582
|
+
"__schema": "TypeLiteralSchema",
|
|
583
|
+
"location": {
|
|
584
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
585
|
+
"line": 319,
|
|
586
|
+
"character": 49
|
|
587
|
+
},
|
|
588
|
+
"members": [
|
|
589
|
+
{
|
|
590
|
+
"__schema": "VariableLikeSchema",
|
|
650
591
|
"location": {
|
|
651
592
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
652
593
|
"line": 319,
|
|
653
|
-
"character":
|
|
594
|
+
"character": 51
|
|
654
595
|
},
|
|
655
|
-
"
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
596
|
+
"signature": "(property) scope?: string | undefined",
|
|
597
|
+
"name": "scope",
|
|
598
|
+
"type": {
|
|
599
|
+
"__schema": "KeywordTypeSchema",
|
|
600
|
+
"location": {
|
|
601
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
602
|
+
"line": 319,
|
|
603
|
+
"character": 59
|
|
604
|
+
},
|
|
605
|
+
"name": "string"
|
|
606
|
+
},
|
|
607
|
+
"isOptional": true
|
|
608
|
+
}
|
|
609
|
+
]
|
|
610
|
+
},
|
|
611
|
+
"isOptional": false,
|
|
612
|
+
"isSpread": false
|
|
613
|
+
}
|
|
614
|
+
],
|
|
615
|
+
"returnType": {
|
|
616
|
+
"__schema": "InferenceTypeSchema",
|
|
617
|
+
"location": {
|
|
618
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
619
|
+
"line": 319,
|
|
620
|
+
"character": 3
|
|
660
621
|
},
|
|
661
|
-
"
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
622
|
+
"type": "Promise<CreateLaneResult>"
|
|
623
|
+
},
|
|
624
|
+
"modifiers": [
|
|
625
|
+
"async"
|
|
626
|
+
]
|
|
627
|
+
},
|
|
628
|
+
{
|
|
629
|
+
"__schema": "FunctionLikeSchema",
|
|
667
630
|
"location": {
|
|
668
631
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
669
|
-
"line":
|
|
632
|
+
"line": 327,
|
|
670
633
|
"character": 3
|
|
671
634
|
},
|
|
672
|
-
"
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
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",
|
|
635
|
+
"signature": "(method) MergeLanesMain.abortLaneMerge(checkoutProps: CheckoutProps, mergeAbortOpts: MergeAbortOpts): Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>",
|
|
636
|
+
"name": "abortLaneMerge",
|
|
637
|
+
"params": [
|
|
638
|
+
{
|
|
639
|
+
"__schema": "ParameterSchema",
|
|
698
640
|
"location": {
|
|
699
641
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
700
642
|
"line": 327,
|
|
701
|
-
"character":
|
|
643
|
+
"character": 24
|
|
702
644
|
},
|
|
703
|
-
"name": "
|
|
704
|
-
"
|
|
705
|
-
"
|
|
706
|
-
"
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
716
|
-
"line": 327,
|
|
717
|
-
"character": 54
|
|
645
|
+
"name": "checkoutProps",
|
|
646
|
+
"type": {
|
|
647
|
+
"__schema": "TypeRefSchema",
|
|
648
|
+
"location": {
|
|
649
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
650
|
+
"line": 327,
|
|
651
|
+
"character": 39
|
|
652
|
+
},
|
|
653
|
+
"name": "CheckoutProps"
|
|
654
|
+
},
|
|
655
|
+
"isOptional": false,
|
|
656
|
+
"isSpread": false
|
|
718
657
|
},
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
"__schema": "TypeRefSchema",
|
|
658
|
+
{
|
|
659
|
+
"__schema": "ParameterSchema",
|
|
722
660
|
"location": {
|
|
723
661
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
724
662
|
"line": 327,
|
|
725
|
-
"character":
|
|
663
|
+
"character": 54
|
|
664
|
+
},
|
|
665
|
+
"name": "mergeAbortOpts",
|
|
666
|
+
"type": {
|
|
667
|
+
"__schema": "TypeRefSchema",
|
|
668
|
+
"location": {
|
|
669
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
670
|
+
"line": 327,
|
|
671
|
+
"character": 70
|
|
672
|
+
},
|
|
673
|
+
"name": "MergeAbortOpts"
|
|
726
674
|
},
|
|
727
|
-
"
|
|
728
|
-
"
|
|
675
|
+
"isOptional": false,
|
|
676
|
+
"isSpread": false
|
|
677
|
+
}
|
|
678
|
+
],
|
|
679
|
+
"returnType": {
|
|
680
|
+
"__schema": "InferenceTypeSchema",
|
|
681
|
+
"location": {
|
|
682
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
683
|
+
"line": 327,
|
|
684
|
+
"character": 3
|
|
729
685
|
},
|
|
730
|
-
"
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
|
|
686
|
+
"type": "Promise<{\n checkoutResults: ApplyVersionResults | undefined;\n restoredItems: string[];\n checkoutError: Error | undefined;\n}>"
|
|
687
|
+
},
|
|
688
|
+
"modifiers": [
|
|
689
|
+
"async"
|
|
690
|
+
]
|
|
691
|
+
},
|
|
692
|
+
{
|
|
693
|
+
"__schema": "FunctionLikeSchema",
|
|
736
694
|
"location": {
|
|
737
695
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
738
|
-
"line":
|
|
696
|
+
"line": 383,
|
|
739
697
|
"character": 3
|
|
740
698
|
},
|
|
741
|
-
"
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
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",
|
|
699
|
+
"signature": "(method) MergeLanesMain.mergeFromScope(fromLane: string, toLane: string, options: Partial<MergeLaneOptions> & {\n push?: boolean;\n reMerge?: boolean;\n}): Promise<MergeFromScopeResult>",
|
|
700
|
+
"name": "mergeFromScope",
|
|
701
|
+
"params": [
|
|
702
|
+
{
|
|
703
|
+
"__schema": "ParameterSchema",
|
|
767
704
|
"location": {
|
|
768
705
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
769
706
|
"line": 384,
|
|
770
|
-
"character":
|
|
707
|
+
"character": 5
|
|
771
708
|
},
|
|
772
|
-
"name": "
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
"
|
|
709
|
+
"name": "fromLane",
|
|
710
|
+
"type": {
|
|
711
|
+
"__schema": "KeywordTypeSchema",
|
|
712
|
+
"location": {
|
|
713
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
714
|
+
"line": 384,
|
|
715
|
+
"character": 15
|
|
716
|
+
},
|
|
717
|
+
"name": "string"
|
|
718
|
+
},
|
|
719
|
+
"isOptional": false,
|
|
720
|
+
"isSpread": false
|
|
783
721
|
},
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
"__schema": "KeywordTypeSchema",
|
|
722
|
+
{
|
|
723
|
+
"__schema": "ParameterSchema",
|
|
787
724
|
"location": {
|
|
788
725
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
789
726
|
"line": 385,
|
|
790
|
-
"character":
|
|
727
|
+
"character": 5
|
|
791
728
|
},
|
|
792
|
-
"name": "
|
|
793
|
-
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
"
|
|
729
|
+
"name": "toLane",
|
|
730
|
+
"type": {
|
|
731
|
+
"__schema": "KeywordTypeSchema",
|
|
732
|
+
"location": {
|
|
733
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
734
|
+
"line": 385,
|
|
735
|
+
"character": 13
|
|
736
|
+
},
|
|
737
|
+
"name": "string"
|
|
738
|
+
},
|
|
739
|
+
"isOptional": false,
|
|
740
|
+
"isSpread": false
|
|
803
741
|
},
|
|
804
|
-
|
|
805
|
-
|
|
806
|
-
"__schema": "TypeIntersectionSchema",
|
|
742
|
+
{
|
|
743
|
+
"__schema": "ParameterSchema",
|
|
807
744
|
"location": {
|
|
808
745
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
809
746
|
"line": 386,
|
|
810
|
-
"character":
|
|
747
|
+
"character": 5
|
|
811
748
|
},
|
|
812
|
-
"
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
|
|
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
|
-
]
|
|
749
|
+
"name": "options",
|
|
750
|
+
"type": {
|
|
751
|
+
"__schema": "TypeIntersectionSchema",
|
|
752
|
+
"location": {
|
|
753
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
754
|
+
"line": 386,
|
|
755
|
+
"character": 14
|
|
833
756
|
},
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
|
|
837
|
-
"
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
|
|
842
|
-
|
|
843
|
-
|
|
844
|
-
|
|
845
|
-
"
|
|
846
|
-
"line": 386,
|
|
847
|
-
"character": 44
|
|
848
|
-
},
|
|
849
|
-
"signature": "(property) push?: boolean | undefined",
|
|
850
|
-
"name": "push",
|
|
851
|
-
"type": {
|
|
852
|
-
"__schema": "KeywordTypeSchema",
|
|
757
|
+
"types": [
|
|
758
|
+
{
|
|
759
|
+
"__schema": "TypeRefSchema",
|
|
760
|
+
"location": {
|
|
761
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
762
|
+
"line": 386,
|
|
763
|
+
"character": 14
|
|
764
|
+
},
|
|
765
|
+
"name": "Partial",
|
|
766
|
+
"typeArgs": [
|
|
767
|
+
{
|
|
768
|
+
"__schema": "TypeRefSchema",
|
|
853
769
|
"location": {
|
|
854
770
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
855
771
|
"line": 386,
|
|
856
|
-
"character":
|
|
772
|
+
"character": 22
|
|
857
773
|
},
|
|
858
|
-
"name": "
|
|
859
|
-
}
|
|
860
|
-
|
|
774
|
+
"name": "MergeLaneOptions"
|
|
775
|
+
}
|
|
776
|
+
]
|
|
777
|
+
},
|
|
778
|
+
{
|
|
779
|
+
"__schema": "TypeLiteralSchema",
|
|
780
|
+
"location": {
|
|
781
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
782
|
+
"line": 386,
|
|
783
|
+
"character": 42
|
|
861
784
|
},
|
|
862
|
-
|
|
863
|
-
|
|
864
|
-
|
|
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",
|
|
785
|
+
"members": [
|
|
786
|
+
{
|
|
787
|
+
"__schema": "VariableLikeSchema",
|
|
873
788
|
"location": {
|
|
874
789
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
875
790
|
"line": 386,
|
|
876
|
-
"character":
|
|
791
|
+
"character": 44
|
|
877
792
|
},
|
|
878
|
-
"
|
|
793
|
+
"signature": "(property) push?: boolean | undefined",
|
|
794
|
+
"name": "push",
|
|
795
|
+
"type": {
|
|
796
|
+
"__schema": "KeywordTypeSchema",
|
|
797
|
+
"location": {
|
|
798
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
799
|
+
"line": 386,
|
|
800
|
+
"character": 51
|
|
801
|
+
},
|
|
802
|
+
"name": "boolean"
|
|
803
|
+
},
|
|
804
|
+
"isOptional": true
|
|
879
805
|
},
|
|
880
|
-
|
|
881
|
-
|
|
882
|
-
|
|
883
|
-
|
|
884
|
-
|
|
885
|
-
|
|
886
|
-
|
|
887
|
-
|
|
888
|
-
|
|
889
|
-
|
|
890
|
-
|
|
891
|
-
|
|
892
|
-
|
|
893
|
-
|
|
894
|
-
|
|
895
|
-
|
|
896
|
-
|
|
897
|
-
|
|
898
|
-
|
|
899
|
-
|
|
900
|
-
|
|
901
|
-
|
|
902
|
-
|
|
903
|
-
"line": 387,
|
|
904
|
-
"character": 14
|
|
806
|
+
{
|
|
807
|
+
"__schema": "VariableLikeSchema",
|
|
808
|
+
"location": {
|
|
809
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
810
|
+
"line": 386,
|
|
811
|
+
"character": 60
|
|
812
|
+
},
|
|
813
|
+
"signature": "(property) reMerge?: boolean | undefined",
|
|
814
|
+
"name": "reMerge",
|
|
815
|
+
"type": {
|
|
816
|
+
"__schema": "KeywordTypeSchema",
|
|
817
|
+
"location": {
|
|
818
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
819
|
+
"line": 386,
|
|
820
|
+
"character": 70
|
|
821
|
+
},
|
|
822
|
+
"name": "boolean"
|
|
823
|
+
},
|
|
824
|
+
"isOptional": true
|
|
825
|
+
}
|
|
826
|
+
]
|
|
827
|
+
}
|
|
828
|
+
]
|
|
905
829
|
},
|
|
906
|
-
"
|
|
907
|
-
"
|
|
830
|
+
"isOptional": false,
|
|
831
|
+
"isSpread": false
|
|
908
832
|
}
|
|
833
|
+
],
|
|
834
|
+
"returnType": {
|
|
835
|
+
"__schema": "TypeRefSchema",
|
|
836
|
+
"location": {
|
|
837
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
838
|
+
"line": 387,
|
|
839
|
+
"character": 6
|
|
840
|
+
},
|
|
841
|
+
"name": "Promise",
|
|
842
|
+
"typeArgs": [
|
|
843
|
+
{
|
|
844
|
+
"__schema": "TypeRefSchema",
|
|
845
|
+
"location": {
|
|
846
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
847
|
+
"line": 387,
|
|
848
|
+
"character": 14
|
|
849
|
+
},
|
|
850
|
+
"name": "MergeFromScopeResult"
|
|
851
|
+
}
|
|
852
|
+
]
|
|
853
|
+
},
|
|
854
|
+
"modifiers": [
|
|
855
|
+
"async"
|
|
909
856
|
]
|
|
910
857
|
},
|
|
911
|
-
|
|
912
|
-
"
|
|
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",
|
|
858
|
+
{
|
|
859
|
+
"__schema": "VariableLikeSchema",
|
|
926
860
|
"location": {
|
|
927
861
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
928
862
|
"line": 481,
|
|
929
863
|
"character": 3
|
|
930
864
|
},
|
|
931
|
-
"
|
|
932
|
-
|
|
933
|
-
|
|
934
|
-
|
|
935
|
-
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
|
|
939
|
-
|
|
940
|
-
|
|
941
|
-
|
|
865
|
+
"signature": "(property) MergeLanesMain.slots: never[]",
|
|
866
|
+
"name": "slots",
|
|
867
|
+
"type": {
|
|
868
|
+
"__schema": "InferenceTypeSchema",
|
|
869
|
+
"location": {
|
|
870
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
871
|
+
"line": 481,
|
|
872
|
+
"character": 3
|
|
873
|
+
},
|
|
874
|
+
"type": "never[]"
|
|
875
|
+
},
|
|
876
|
+
"isOptional": true,
|
|
877
|
+
"defaultValue": "[]"
|
|
942
878
|
},
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
"type": {
|
|
946
|
-
"__schema": "InferenceTypeSchema",
|
|
879
|
+
{
|
|
880
|
+
"__schema": "VariableLikeSchema",
|
|
947
881
|
"location": {
|
|
948
882
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
949
883
|
"line": 482,
|
|
950
884
|
"character": 3
|
|
951
885
|
},
|
|
952
|
-
"
|
|
953
|
-
|
|
954
|
-
|
|
955
|
-
|
|
956
|
-
|
|
957
|
-
|
|
958
|
-
|
|
959
|
-
|
|
960
|
-
|
|
961
|
-
|
|
962
|
-
|
|
886
|
+
"signature": "(property) MergeLanesMain.dependencies: Aspect[]",
|
|
887
|
+
"name": "dependencies",
|
|
888
|
+
"type": {
|
|
889
|
+
"__schema": "InferenceTypeSchema",
|
|
890
|
+
"location": {
|
|
891
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
892
|
+
"line": 482,
|
|
893
|
+
"character": 3
|
|
894
|
+
},
|
|
895
|
+
"type": "Aspect[]"
|
|
896
|
+
},
|
|
897
|
+
"isOptional": true,
|
|
898
|
+
"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
899
|
},
|
|
964
|
-
|
|
965
|
-
|
|
966
|
-
"type": {
|
|
967
|
-
"__schema": "InferenceTypeSchema",
|
|
900
|
+
{
|
|
901
|
+
"__schema": "VariableLikeSchema",
|
|
968
902
|
"location": {
|
|
969
903
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
970
904
|
"line": 495,
|
|
971
905
|
"character": 3
|
|
972
906
|
},
|
|
973
|
-
"
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
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",
|
|
907
|
+
"signature": "(property) MergeLanesMain.runtime: RuntimeDefinition",
|
|
908
|
+
"name": "runtime",
|
|
909
|
+
"type": {
|
|
910
|
+
"__schema": "InferenceTypeSchema",
|
|
990
911
|
"location": {
|
|
991
912
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
992
|
-
"line":
|
|
993
|
-
"character":
|
|
913
|
+
"line": 495,
|
|
914
|
+
"character": 3
|
|
994
915
|
},
|
|
995
|
-
"
|
|
996
|
-
|
|
997
|
-
|
|
916
|
+
"type": "RuntimeDefinition"
|
|
917
|
+
},
|
|
918
|
+
"isOptional": true,
|
|
919
|
+
"defaultValue": "MainRuntime"
|
|
920
|
+
},
|
|
921
|
+
{
|
|
922
|
+
"__schema": "FunctionLikeSchema",
|
|
923
|
+
"location": {
|
|
924
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
925
|
+
"line": 497,
|
|
926
|
+
"character": 3
|
|
927
|
+
},
|
|
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>",
|
|
929
|
+
"name": "provider",
|
|
930
|
+
"params": [
|
|
931
|
+
{
|
|
932
|
+
"__schema": "ParameterSchema",
|
|
998
933
|
"location": {
|
|
999
934
|
"filePath": "merge-lanes.main.runtime.ts",
|
|
1000
|
-
"line":
|
|
1001
|
-
"character":
|
|
935
|
+
"line": 497,
|
|
936
|
+
"character": 25
|
|
1002
937
|
},
|
|
1003
|
-
"
|
|
1004
|
-
|
|
1005
|
-
|
|
1006
|
-
|
|
1007
|
-
|
|
1008
|
-
|
|
1009
|
-
|
|
1010
|
-
},
|
|
1011
|
-
"name": "LanesMain",
|
|
1012
|
-
"componentId": {
|
|
1013
|
-
"scope": "teambit.lanes",
|
|
1014
|
-
"name": "lanes"
|
|
1015
|
-
}
|
|
938
|
+
"name": "[ lanes, cli, workspace, merging, loggerMain, remove, scope, exporter, importer, checkout, globalConfig ]",
|
|
939
|
+
"type": {
|
|
940
|
+
"__schema": "TupleTypeSchema",
|
|
941
|
+
"location": {
|
|
942
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
943
|
+
"line": 509,
|
|
944
|
+
"character": 6
|
|
1016
945
|
},
|
|
1017
|
-
|
|
1018
|
-
|
|
1019
|
-
|
|
1020
|
-
"
|
|
1021
|
-
|
|
1022
|
-
|
|
946
|
+
"elements": [
|
|
947
|
+
{
|
|
948
|
+
"__schema": "TypeRefSchema",
|
|
949
|
+
"location": {
|
|
950
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
951
|
+
"line": 510,
|
|
952
|
+
"character": 5
|
|
953
|
+
},
|
|
954
|
+
"name": "LanesMain"
|
|
1023
955
|
},
|
|
1024
|
-
|
|
1025
|
-
|
|
1026
|
-
"
|
|
1027
|
-
|
|
1028
|
-
|
|
1029
|
-
|
|
1030
|
-
|
|
1031
|
-
|
|
1032
|
-
"location": {
|
|
1033
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
1034
|
-
"line": 512,
|
|
1035
|
-
"character": 5
|
|
956
|
+
{
|
|
957
|
+
"__schema": "TypeRefSchema",
|
|
958
|
+
"location": {
|
|
959
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
960
|
+
"line": 511,
|
|
961
|
+
"character": 5
|
|
962
|
+
},
|
|
963
|
+
"name": "CLIMain"
|
|
1036
964
|
},
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
"
|
|
1040
|
-
|
|
1041
|
-
|
|
1042
|
-
|
|
1043
|
-
|
|
1044
|
-
|
|
1045
|
-
"location": {
|
|
1046
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
1047
|
-
"line": 513,
|
|
1048
|
-
"character": 5
|
|
965
|
+
{
|
|
966
|
+
"__schema": "TypeRefSchema",
|
|
967
|
+
"location": {
|
|
968
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
969
|
+
"line": 512,
|
|
970
|
+
"character": 5
|
|
971
|
+
},
|
|
972
|
+
"name": "Workspace"
|
|
1049
973
|
},
|
|
1050
|
-
|
|
1051
|
-
|
|
1052
|
-
"
|
|
1053
|
-
|
|
1054
|
-
|
|
1055
|
-
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
"location": {
|
|
1059
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
1060
|
-
"line": 514,
|
|
1061
|
-
"character": 5
|
|
974
|
+
{
|
|
975
|
+
"__schema": "TypeRefSchema",
|
|
976
|
+
"location": {
|
|
977
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
978
|
+
"line": 513,
|
|
979
|
+
"character": 5
|
|
980
|
+
},
|
|
981
|
+
"name": "MergingMain"
|
|
1062
982
|
},
|
|
1063
|
-
|
|
1064
|
-
|
|
1065
|
-
"
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
|
|
1069
|
-
|
|
1070
|
-
|
|
1071
|
-
"location": {
|
|
1072
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
1073
|
-
"line": 515,
|
|
1074
|
-
"character": 5
|
|
983
|
+
{
|
|
984
|
+
"__schema": "TypeRefSchema",
|
|
985
|
+
"location": {
|
|
986
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
987
|
+
"line": 514,
|
|
988
|
+
"character": 5
|
|
989
|
+
},
|
|
990
|
+
"name": "LoggerMain"
|
|
1075
991
|
},
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
"
|
|
1079
|
-
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
|
|
1084
|
-
"location": {
|
|
1085
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
1086
|
-
"line": 516,
|
|
1087
|
-
"character": 5
|
|
992
|
+
{
|
|
993
|
+
"__schema": "TypeRefSchema",
|
|
994
|
+
"location": {
|
|
995
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
996
|
+
"line": 515,
|
|
997
|
+
"character": 5
|
|
998
|
+
},
|
|
999
|
+
"name": "RemoveMain"
|
|
1088
1000
|
},
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
"
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
"location": {
|
|
1098
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
1099
|
-
"line": 517,
|
|
1100
|
-
"character": 5
|
|
1001
|
+
{
|
|
1002
|
+
"__schema": "TypeRefSchema",
|
|
1003
|
+
"location": {
|
|
1004
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
1005
|
+
"line": 516,
|
|
1006
|
+
"character": 5
|
|
1007
|
+
},
|
|
1008
|
+
"name": "ScopeMain"
|
|
1101
1009
|
},
|
|
1102
|
-
|
|
1103
|
-
|
|
1104
|
-
"
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
|
|
1110
|
-
"location": {
|
|
1111
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
1112
|
-
"line": 518,
|
|
1113
|
-
"character": 5
|
|
1010
|
+
{
|
|
1011
|
+
"__schema": "TypeRefSchema",
|
|
1012
|
+
"location": {
|
|
1013
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
1014
|
+
"line": 517,
|
|
1015
|
+
"character": 5
|
|
1016
|
+
},
|
|
1017
|
+
"name": "ExportMain"
|
|
1114
1018
|
},
|
|
1115
|
-
|
|
1116
|
-
|
|
1117
|
-
"
|
|
1118
|
-
|
|
1119
|
-
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
"location": {
|
|
1124
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
1125
|
-
"line": 519,
|
|
1126
|
-
"character": 5
|
|
1019
|
+
{
|
|
1020
|
+
"__schema": "TypeRefSchema",
|
|
1021
|
+
"location": {
|
|
1022
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
1023
|
+
"line": 518,
|
|
1024
|
+
"character": 5
|
|
1025
|
+
},
|
|
1026
|
+
"name": "ImporterMain"
|
|
1127
1027
|
},
|
|
1128
|
-
|
|
1129
|
-
|
|
1130
|
-
"
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1134
|
-
|
|
1135
|
-
|
|
1136
|
-
"location": {
|
|
1137
|
-
"filePath": "merge-lanes.main.runtime.ts",
|
|
1138
|
-
"line": 520,
|
|
1139
|
-
"character": 5
|
|
1028
|
+
{
|
|
1029
|
+
"__schema": "TypeRefSchema",
|
|
1030
|
+
"location": {
|
|
1031
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
1032
|
+
"line": 519,
|
|
1033
|
+
"character": 5
|
|
1034
|
+
},
|
|
1035
|
+
"name": "CheckoutMain"
|
|
1140
1036
|
},
|
|
1141
|
-
|
|
1142
|
-
|
|
1143
|
-
"
|
|
1144
|
-
|
|
1037
|
+
{
|
|
1038
|
+
"__schema": "TypeRefSchema",
|
|
1039
|
+
"location": {
|
|
1040
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
1041
|
+
"line": 520,
|
|
1042
|
+
"character": 5
|
|
1043
|
+
},
|
|
1044
|
+
"name": "GlobalConfigMain"
|
|
1145
1045
|
}
|
|
1146
|
-
|
|
1147
|
-
|
|
1046
|
+
]
|
|
1047
|
+
},
|
|
1048
|
+
"isOptional": false,
|
|
1049
|
+
"isSpread": false
|
|
1050
|
+
}
|
|
1051
|
+
],
|
|
1052
|
+
"returnType": {
|
|
1053
|
+
"__schema": "InferenceTypeSchema",
|
|
1054
|
+
"location": {
|
|
1055
|
+
"filePath": "merge-lanes.main.runtime.ts",
|
|
1056
|
+
"line": 497,
|
|
1057
|
+
"character": 3
|
|
1148
1058
|
},
|
|
1149
|
-
"
|
|
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
|
|
1059
|
+
"type": "Promise<MergeLanesMain>"
|
|
1159
1060
|
},
|
|
1160
|
-
"
|
|
1161
|
-
|
|
1162
|
-
|
|
1163
|
-
|
|
1164
|
-
|
|
1165
|
-
|
|
1166
|
-
|
|
1167
|
-
|
|
1168
|
-
|
|
1169
|
-
"implementNodes": []
|
|
1061
|
+
"modifiers": [
|
|
1062
|
+
"static",
|
|
1063
|
+
"async"
|
|
1064
|
+
]
|
|
1065
|
+
}
|
|
1066
|
+
],
|
|
1067
|
+
"extendsNodes": [],
|
|
1068
|
+
"implementNodes": []
|
|
1069
|
+
}
|
|
1170
1070
|
},
|
|
1171
1071
|
{
|
|
1172
1072
|
"__schema": "UnImplementedSchema",
|
|
@@ -1179,30 +1079,39 @@
|
|
|
1179
1079
|
"type": "Identifier"
|
|
1180
1080
|
},
|
|
1181
1081
|
{
|
|
1182
|
-
"__schema": "
|
|
1082
|
+
"__schema": "ExportSchema",
|
|
1183
1083
|
"location": {
|
|
1184
|
-
"filePath": "
|
|
1185
|
-
"line":
|
|
1186
|
-
"character":
|
|
1084
|
+
"filePath": "index.ts",
|
|
1085
|
+
"line": 5,
|
|
1086
|
+
"character": 10
|
|
1187
1087
|
},
|
|
1188
|
-
"signature": "const MergeLanesAspect: Aspect",
|
|
1189
1088
|
"name": "MergeLanesAspect",
|
|
1190
|
-
"
|
|
1191
|
-
"__schema": "
|
|
1089
|
+
"exportNode": {
|
|
1090
|
+
"__schema": "VariableLikeSchema",
|
|
1192
1091
|
"location": {
|
|
1193
1092
|
"filePath": "merge-lanes.aspect.ts",
|
|
1194
1093
|
"line": 3,
|
|
1195
1094
|
"character": 14
|
|
1196
1095
|
},
|
|
1197
|
-
"
|
|
1198
|
-
"
|
|
1199
|
-
|
|
1200
|
-
"
|
|
1201
|
-
"
|
|
1202
|
-
|
|
1203
|
-
|
|
1204
|
-
|
|
1205
|
-
|
|
1096
|
+
"signature": "const MergeLanesAspect: Aspect",
|
|
1097
|
+
"name": "MergeLanesAspect",
|
|
1098
|
+
"type": {
|
|
1099
|
+
"__schema": "TypeRefSchema",
|
|
1100
|
+
"location": {
|
|
1101
|
+
"filePath": "merge-lanes.aspect.ts",
|
|
1102
|
+
"line": 3,
|
|
1103
|
+
"character": 14
|
|
1104
|
+
},
|
|
1105
|
+
"name": "Aspect",
|
|
1106
|
+
"componentId": {
|
|
1107
|
+
"scope": "teambit.harmony",
|
|
1108
|
+
"name": "harmony",
|
|
1109
|
+
"version": "0.4.6"
|
|
1110
|
+
}
|
|
1111
|
+
},
|
|
1112
|
+
"isOptional": false,
|
|
1113
|
+
"defaultValue": "Aspect.create({\n id: 'teambit.lanes/merge-lanes',\n})"
|
|
1114
|
+
}
|
|
1206
1115
|
}
|
|
1207
1116
|
],
|
|
1208
1117
|
"internals": []
|
|
@@ -1249,8 +1158,7 @@
|
|
|
1249
1158
|
"line": 41,
|
|
1250
1159
|
"character": 18
|
|
1251
1160
|
},
|
|
1252
|
-
"name": "MergeStrategy"
|
|
1253
|
-
"packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
|
|
1161
|
+
"name": "MergeStrategy"
|
|
1254
1162
|
},
|
|
1255
1163
|
"isOptional": false
|
|
1256
1164
|
},
|
|
@@ -1530,8 +1438,7 @@
|
|
|
1530
1438
|
"line": 55,
|
|
1531
1439
|
"character": 22
|
|
1532
1440
|
},
|
|
1533
|
-
"name": "MergeStrategy"
|
|
1534
|
-
"packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
|
|
1441
|
+
"name": "MergeStrategy"
|
|
1535
1442
|
},
|
|
1536
1443
|
"isOptional": true
|
|
1537
1444
|
},
|
|
@@ -1791,12 +1698,7 @@
|
|
|
1791
1698
|
"line": 65,
|
|
1792
1699
|
"character": 14
|
|
1793
1700
|
},
|
|
1794
|
-
"name": "ComponentID"
|
|
1795
|
-
"componentId": {
|
|
1796
|
-
"scope": "teambit.component",
|
|
1797
|
-
"name": "component-id",
|
|
1798
|
-
"version": "1.2.0"
|
|
1799
|
-
}
|
|
1701
|
+
"name": "ComponentID"
|
|
1800
1702
|
}
|
|
1801
1703
|
},
|
|
1802
1704
|
"isOptional": false
|
|
@@ -1824,12 +1726,7 @@
|
|
|
1824
1726
|
"line": 66,
|
|
1825
1727
|
"character": 16
|
|
1826
1728
|
},
|
|
1827
|
-
"name": "ComponentID"
|
|
1828
|
-
"componentId": {
|
|
1829
|
-
"scope": "teambit.component",
|
|
1830
|
-
"name": "component-id",
|
|
1831
|
-
"version": "1.2.0"
|
|
1832
|
-
}
|
|
1729
|
+
"name": "ComponentID"
|
|
1833
1730
|
}
|
|
1834
1731
|
},
|
|
1835
1732
|
"isOptional": false
|
|
@@ -1931,8 +1828,7 @@
|
|
|
1931
1828
|
"line": 68,
|
|
1932
1829
|
"character": 15
|
|
1933
1830
|
},
|
|
1934
|
-
"name": "ConflictPerId"
|
|
1935
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
|
1831
|
+
"name": "ConflictPerId"
|
|
1936
1832
|
}
|
|
1937
1833
|
},
|
|
1938
1834
|
"isOptional": true
|
|
@@ -1960,12 +1856,7 @@
|
|
|
1960
1856
|
"line": 69,
|
|
1961
1857
|
"character": 16
|
|
1962
1858
|
},
|
|
1963
|
-
"name": "ComponentID"
|
|
1964
|
-
"componentId": {
|
|
1965
|
-
"scope": "teambit.component",
|
|
1966
|
-
"name": "component-id",
|
|
1967
|
-
"version": "1.2.0"
|
|
1968
|
-
}
|
|
1859
|
+
"name": "ComponentID"
|
|
1969
1860
|
}
|
|
1970
1861
|
},
|
|
1971
1862
|
"isOptional": true
|
|
@@ -1993,12 +1884,7 @@
|
|
|
1993
1884
|
"line": 70,
|
|
1994
1885
|
"character": 21
|
|
1995
1886
|
},
|
|
1996
|
-
"name": "ComponentID"
|
|
1997
|
-
"componentId": {
|
|
1998
|
-
"scope": "teambit.component",
|
|
1999
|
-
"name": "component-id",
|
|
2000
|
-
"version": "1.2.0"
|
|
2001
|
-
}
|
|
1887
|
+
"name": "ComponentID"
|
|
2002
1888
|
}
|
|
2003
1889
|
},
|
|
2004
1890
|
"isOptional": false
|
|
@@ -2069,11 +1955,7 @@
|
|
|
2069
1955
|
"line": 76,
|
|
2070
1956
|
"character": 24
|
|
2071
1957
|
},
|
|
2072
|
-
"name": "Workspace"
|
|
2073
|
-
"componentId": {
|
|
2074
|
-
"scope": "teambit.workspace",
|
|
2075
|
-
"name": "workspace"
|
|
2076
|
-
}
|
|
1958
|
+
"name": "Workspace"
|
|
2077
1959
|
},
|
|
2078
1960
|
{
|
|
2079
1961
|
"__schema": "KeywordTypeSchema",
|
|
@@ -2104,11 +1986,7 @@
|
|
|
2104
1986
|
"line": 77,
|
|
2105
1987
|
"character": 22
|
|
2106
1988
|
},
|
|
2107
|
-
"name": "MergingMain"
|
|
2108
|
-
"componentId": {
|
|
2109
|
-
"scope": "teambit.component",
|
|
2110
|
-
"name": "merging"
|
|
2111
|
-
}
|
|
1989
|
+
"name": "MergingMain"
|
|
2112
1990
|
},
|
|
2113
1991
|
"isOptional": false,
|
|
2114
1992
|
"isSpread": false
|
|
@@ -2128,11 +2006,7 @@
|
|
|
2128
2006
|
"line": 78,
|
|
2129
2007
|
"character": 21
|
|
2130
2008
|
},
|
|
2131
|
-
"name": "LanesMain"
|
|
2132
|
-
"componentId": {
|
|
2133
|
-
"scope": "teambit.lanes",
|
|
2134
|
-
"name": "lanes"
|
|
2135
|
-
}
|
|
2009
|
+
"name": "LanesMain"
|
|
2136
2010
|
},
|
|
2137
2011
|
"isOptional": false,
|
|
2138
2012
|
"isSpread": false
|
|
@@ -2152,11 +2026,7 @@
|
|
|
2152
2026
|
"line": 79,
|
|
2153
2027
|
"character": 22
|
|
2154
2028
|
},
|
|
2155
|
-
"name": "Logger"
|
|
2156
|
-
"componentId": {
|
|
2157
|
-
"scope": "teambit.harmony",
|
|
2158
|
-
"name": "logger"
|
|
2159
|
-
}
|
|
2029
|
+
"name": "Logger"
|
|
2160
2030
|
},
|
|
2161
2031
|
"isOptional": false,
|
|
2162
2032
|
"isSpread": false
|
|
@@ -2176,11 +2046,7 @@
|
|
|
2176
2046
|
"line": 80,
|
|
2177
2047
|
"character": 21
|
|
2178
2048
|
},
|
|
2179
|
-
"name": "RemoveMain"
|
|
2180
|
-
"componentId": {
|
|
2181
|
-
"scope": "teambit.component",
|
|
2182
|
-
"name": "remove"
|
|
2183
|
-
}
|
|
2049
|
+
"name": "RemoveMain"
|
|
2184
2050
|
},
|
|
2185
2051
|
"isOptional": false,
|
|
2186
2052
|
"isSpread": false
|
|
@@ -2200,11 +2066,7 @@
|
|
|
2200
2066
|
"line": 81,
|
|
2201
2067
|
"character": 20
|
|
2202
2068
|
},
|
|
2203
|
-
"name": "ScopeMain"
|
|
2204
|
-
"componentId": {
|
|
2205
|
-
"scope": "teambit.scope",
|
|
2206
|
-
"name": "scope"
|
|
2207
|
-
}
|
|
2069
|
+
"name": "ScopeMain"
|
|
2208
2070
|
},
|
|
2209
2071
|
"isOptional": false,
|
|
2210
2072
|
"isSpread": false
|
|
@@ -2224,11 +2086,7 @@
|
|
|
2224
2086
|
"line": 82,
|
|
2225
2087
|
"character": 23
|
|
2226
2088
|
},
|
|
2227
|
-
"name": "ExportMain"
|
|
2228
|
-
"componentId": {
|
|
2229
|
-
"scope": "teambit.scope",
|
|
2230
|
-
"name": "export"
|
|
2231
|
-
}
|
|
2089
|
+
"name": "ExportMain"
|
|
2232
2090
|
},
|
|
2233
2091
|
"isOptional": false,
|
|
2234
2092
|
"isSpread": false
|
|
@@ -2248,11 +2106,7 @@
|
|
|
2248
2106
|
"line": 83,
|
|
2249
2107
|
"character": 23
|
|
2250
2108
|
},
|
|
2251
|
-
"name": "ImporterMain"
|
|
2252
|
-
"componentId": {
|
|
2253
|
-
"scope": "teambit.scope",
|
|
2254
|
-
"name": "importer"
|
|
2255
|
-
}
|
|
2109
|
+
"name": "ImporterMain"
|
|
2256
2110
|
},
|
|
2257
2111
|
"isOptional": false,
|
|
2258
2112
|
"isSpread": false
|
|
@@ -2272,11 +2126,7 @@
|
|
|
2272
2126
|
"line": 84,
|
|
2273
2127
|
"character": 23
|
|
2274
2128
|
},
|
|
2275
|
-
"name": "CheckoutMain"
|
|
2276
|
-
"componentId": {
|
|
2277
|
-
"scope": "teambit.component",
|
|
2278
|
-
"name": "checkout"
|
|
2279
|
-
}
|
|
2129
|
+
"name": "CheckoutMain"
|
|
2280
2130
|
},
|
|
2281
2131
|
"isOptional": false,
|
|
2282
2132
|
"isSpread": false
|
|
@@ -2338,8 +2188,7 @@
|
|
|
2338
2188
|
"line": 87,
|
|
2339
2189
|
"character": 51
|
|
2340
2190
|
},
|
|
2341
|
-
"name": "MergeLaneOptions"
|
|
2342
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
|
2191
|
+
"name": "MergeLaneOptions"
|
|
2343
2192
|
},
|
|
2344
2193
|
"isOptional": false,
|
|
2345
2194
|
"isSpread": false
|
|
@@ -2383,12 +2232,7 @@
|
|
|
2383
2232
|
"line": 98,
|
|
2384
2233
|
"character": 18
|
|
2385
2234
|
},
|
|
2386
|
-
"name": "LaneId"
|
|
2387
|
-
"componentId": {
|
|
2388
|
-
"scope": "teambit.lanes",
|
|
2389
|
-
"name": "lane-id",
|
|
2390
|
-
"version": "0.0.311"
|
|
2391
|
-
}
|
|
2235
|
+
"name": "LaneId"
|
|
2392
2236
|
},
|
|
2393
2237
|
"isOptional": false,
|
|
2394
2238
|
"isSpread": false
|
|
@@ -2408,12 +2252,7 @@
|
|
|
2408
2252
|
"line": 99,
|
|
2409
2253
|
"character": 20
|
|
2410
2254
|
},
|
|
2411
|
-
"name": "LaneId"
|
|
2412
|
-
"componentId": {
|
|
2413
|
-
"scope": "teambit.lanes",
|
|
2414
|
-
"name": "lane-id",
|
|
2415
|
-
"version": "0.0.311"
|
|
2416
|
-
}
|
|
2255
|
+
"name": "LaneId"
|
|
2417
2256
|
},
|
|
2418
2257
|
"isOptional": false,
|
|
2419
2258
|
"isSpread": false
|
|
@@ -2433,8 +2272,7 @@
|
|
|
2433
2272
|
"line": 100,
|
|
2434
2273
|
"character": 14
|
|
2435
2274
|
},
|
|
2436
|
-
"name": "MergeLaneOptions"
|
|
2437
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
|
2275
|
+
"name": "MergeLaneOptions"
|
|
2438
2276
|
},
|
|
2439
2277
|
"isOptional": false,
|
|
2440
2278
|
"isSpread": false
|
|
@@ -2524,11 +2362,7 @@
|
|
|
2524
2362
|
"line": 104,
|
|
2525
2363
|
"character": 25
|
|
2526
2364
|
},
|
|
2527
|
-
"name": "ConfigMergeResult"
|
|
2528
|
-
"componentId": {
|
|
2529
|
-
"scope": "teambit.workspace",
|
|
2530
|
-
"name": "config-merger"
|
|
2531
|
-
}
|
|
2365
|
+
"name": "ConfigMergeResult"
|
|
2532
2366
|
}
|
|
2533
2367
|
},
|
|
2534
2368
|
"isOptional": false
|
|
@@ -2556,12 +2390,7 @@
|
|
|
2556
2390
|
"line": 105,
|
|
2557
2391
|
"character": 28
|
|
2558
2392
|
},
|
|
2559
|
-
"name": "ComponentID"
|
|
2560
|
-
"componentId": {
|
|
2561
|
-
"scope": "teambit.component",
|
|
2562
|
-
"name": "component-id",
|
|
2563
|
-
"version": "1.2.0"
|
|
2564
|
-
}
|
|
2393
|
+
"name": "ComponentID"
|
|
2565
2394
|
}
|
|
2566
2395
|
},
|
|
2567
2396
|
"isOptional": false
|
|
@@ -2589,8 +2418,7 @@
|
|
|
2589
2418
|
"line": 106,
|
|
2590
2419
|
"character": 16
|
|
2591
2420
|
},
|
|
2592
|
-
"name": "ConflictPerId"
|
|
2593
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
|
2421
|
+
"name": "ConflictPerId"
|
|
2594
2422
|
}
|
|
2595
2423
|
},
|
|
2596
2424
|
"isOptional": false
|
|
@@ -2713,11 +2541,7 @@
|
|
|
2713
2541
|
"line": 327,
|
|
2714
2542
|
"character": 39
|
|
2715
2543
|
},
|
|
2716
|
-
"name": "CheckoutProps"
|
|
2717
|
-
"componentId": {
|
|
2718
|
-
"scope": "teambit.component",
|
|
2719
|
-
"name": "checkout"
|
|
2720
|
-
}
|
|
2544
|
+
"name": "CheckoutProps"
|
|
2721
2545
|
},
|
|
2722
2546
|
"isOptional": false,
|
|
2723
2547
|
"isSpread": false
|
|
@@ -2737,8 +2561,7 @@
|
|
|
2737
2561
|
"line": 327,
|
|
2738
2562
|
"character": 70
|
|
2739
2563
|
},
|
|
2740
|
-
"name": "MergeAbortOpts"
|
|
2741
|
-
"internalFilePath": "merge-abort.cmd.ts"
|
|
2564
|
+
"name": "MergeAbortOpts"
|
|
2742
2565
|
},
|
|
2743
2566
|
"isOptional": false,
|
|
2744
2567
|
"isSpread": false
|
|
@@ -2839,8 +2662,7 @@
|
|
|
2839
2662
|
"line": 386,
|
|
2840
2663
|
"character": 22
|
|
2841
2664
|
},
|
|
2842
|
-
"name": "MergeLaneOptions"
|
|
2843
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
|
2665
|
+
"name": "MergeLaneOptions"
|
|
2844
2666
|
}
|
|
2845
2667
|
]
|
|
2846
2668
|
},
|
|
@@ -2916,8 +2738,7 @@
|
|
|
2916
2738
|
"line": 387,
|
|
2917
2739
|
"character": 14
|
|
2918
2740
|
},
|
|
2919
|
-
"name": "MergeFromScopeResult"
|
|
2920
|
-
"internalFilePath": "merge-lanes.main.runtime.ts"
|
|
2741
|
+
"name": "MergeFromScopeResult"
|
|
2921
2742
|
}
|
|
2922
2743
|
]
|
|
2923
2744
|
},
|
|
@@ -3021,11 +2842,7 @@
|
|
|
3021
2842
|
"line": 510,
|
|
3022
2843
|
"character": 5
|
|
3023
2844
|
},
|
|
3024
|
-
"name": "LanesMain"
|
|
3025
|
-
"componentId": {
|
|
3026
|
-
"scope": "teambit.lanes",
|
|
3027
|
-
"name": "lanes"
|
|
3028
|
-
}
|
|
2845
|
+
"name": "LanesMain"
|
|
3029
2846
|
},
|
|
3030
2847
|
{
|
|
3031
2848
|
"__schema": "TypeRefSchema",
|
|
@@ -3034,11 +2851,7 @@
|
|
|
3034
2851
|
"line": 511,
|
|
3035
2852
|
"character": 5
|
|
3036
2853
|
},
|
|
3037
|
-
"name": "CLIMain"
|
|
3038
|
-
"componentId": {
|
|
3039
|
-
"scope": "teambit.harmony",
|
|
3040
|
-
"name": "cli"
|
|
3041
|
-
}
|
|
2854
|
+
"name": "CLIMain"
|
|
3042
2855
|
},
|
|
3043
2856
|
{
|
|
3044
2857
|
"__schema": "TypeRefSchema",
|
|
@@ -3047,11 +2860,7 @@
|
|
|
3047
2860
|
"line": 512,
|
|
3048
2861
|
"character": 5
|
|
3049
2862
|
},
|
|
3050
|
-
"name": "Workspace"
|
|
3051
|
-
"componentId": {
|
|
3052
|
-
"scope": "teambit.workspace",
|
|
3053
|
-
"name": "workspace"
|
|
3054
|
-
}
|
|
2863
|
+
"name": "Workspace"
|
|
3055
2864
|
},
|
|
3056
2865
|
{
|
|
3057
2866
|
"__schema": "TypeRefSchema",
|
|
@@ -3060,11 +2869,7 @@
|
|
|
3060
2869
|
"line": 513,
|
|
3061
2870
|
"character": 5
|
|
3062
2871
|
},
|
|
3063
|
-
"name": "MergingMain"
|
|
3064
|
-
"componentId": {
|
|
3065
|
-
"scope": "teambit.component",
|
|
3066
|
-
"name": "merging"
|
|
3067
|
-
}
|
|
2872
|
+
"name": "MergingMain"
|
|
3068
2873
|
},
|
|
3069
2874
|
{
|
|
3070
2875
|
"__schema": "TypeRefSchema",
|
|
@@ -3073,11 +2878,7 @@
|
|
|
3073
2878
|
"line": 514,
|
|
3074
2879
|
"character": 5
|
|
3075
2880
|
},
|
|
3076
|
-
"name": "LoggerMain"
|
|
3077
|
-
"componentId": {
|
|
3078
|
-
"scope": "teambit.harmony",
|
|
3079
|
-
"name": "logger"
|
|
3080
|
-
}
|
|
2881
|
+
"name": "LoggerMain"
|
|
3081
2882
|
},
|
|
3082
2883
|
{
|
|
3083
2884
|
"__schema": "TypeRefSchema",
|
|
@@ -3086,11 +2887,7 @@
|
|
|
3086
2887
|
"line": 515,
|
|
3087
2888
|
"character": 5
|
|
3088
2889
|
},
|
|
3089
|
-
"name": "RemoveMain"
|
|
3090
|
-
"componentId": {
|
|
3091
|
-
"scope": "teambit.component",
|
|
3092
|
-
"name": "remove"
|
|
3093
|
-
}
|
|
2890
|
+
"name": "RemoveMain"
|
|
3094
2891
|
},
|
|
3095
2892
|
{
|
|
3096
2893
|
"__schema": "TypeRefSchema",
|
|
@@ -3099,11 +2896,7 @@
|
|
|
3099
2896
|
"line": 516,
|
|
3100
2897
|
"character": 5
|
|
3101
2898
|
},
|
|
3102
|
-
"name": "ScopeMain"
|
|
3103
|
-
"componentId": {
|
|
3104
|
-
"scope": "teambit.scope",
|
|
3105
|
-
"name": "scope"
|
|
3106
|
-
}
|
|
2899
|
+
"name": "ScopeMain"
|
|
3107
2900
|
},
|
|
3108
2901
|
{
|
|
3109
2902
|
"__schema": "TypeRefSchema",
|
|
@@ -3112,11 +2905,7 @@
|
|
|
3112
2905
|
"line": 517,
|
|
3113
2906
|
"character": 5
|
|
3114
2907
|
},
|
|
3115
|
-
"name": "ExportMain"
|
|
3116
|
-
"componentId": {
|
|
3117
|
-
"scope": "teambit.scope",
|
|
3118
|
-
"name": "export"
|
|
3119
|
-
}
|
|
2908
|
+
"name": "ExportMain"
|
|
3120
2909
|
},
|
|
3121
2910
|
{
|
|
3122
2911
|
"__schema": "TypeRefSchema",
|
|
@@ -3125,11 +2914,7 @@
|
|
|
3125
2914
|
"line": 518,
|
|
3126
2915
|
"character": 5
|
|
3127
2916
|
},
|
|
3128
|
-
"name": "ImporterMain"
|
|
3129
|
-
"componentId": {
|
|
3130
|
-
"scope": "teambit.scope",
|
|
3131
|
-
"name": "importer"
|
|
3132
|
-
}
|
|
2917
|
+
"name": "ImporterMain"
|
|
3133
2918
|
},
|
|
3134
2919
|
{
|
|
3135
2920
|
"__schema": "TypeRefSchema",
|
|
@@ -3138,11 +2923,7 @@
|
|
|
3138
2923
|
"line": 519,
|
|
3139
2924
|
"character": 5
|
|
3140
2925
|
},
|
|
3141
|
-
"name": "CheckoutMain"
|
|
3142
|
-
"componentId": {
|
|
3143
|
-
"scope": "teambit.component",
|
|
3144
|
-
"name": "checkout"
|
|
3145
|
-
}
|
|
2926
|
+
"name": "CheckoutMain"
|
|
3146
2927
|
},
|
|
3147
2928
|
{
|
|
3148
2929
|
"__schema": "TypeRefSchema",
|
|
@@ -3151,11 +2932,7 @@
|
|
|
3151
2932
|
"line": 520,
|
|
3152
2933
|
"character": 5
|
|
3153
2934
|
},
|
|
3154
|
-
"name": "GlobalConfigMain"
|
|
3155
|
-
"componentId": {
|
|
3156
|
-
"scope": "teambit.harmony",
|
|
3157
|
-
"name": "global-config"
|
|
3158
|
-
}
|
|
2935
|
+
"name": "GlobalConfigMain"
|
|
3159
2936
|
}
|
|
3160
2937
|
]
|
|
3161
2938
|
},
|
|
@@ -3225,11 +3002,7 @@
|
|
|
3225
3002
|
"line": 544,
|
|
3226
3003
|
"character": 24
|
|
3227
3004
|
},
|
|
3228
|
-
"name": "ComponentMergeStatus"
|
|
3229
|
-
"componentId": {
|
|
3230
|
-
"scope": "teambit.component",
|
|
3231
|
-
"name": "merging"
|
|
3232
|
-
}
|
|
3005
|
+
"name": "ComponentMergeStatus"
|
|
3233
3006
|
}
|
|
3234
3007
|
},
|
|
3235
3008
|
"isOptional": false,
|
|
@@ -3257,12 +3030,7 @@
|
|
|
3257
3030
|
"line": 545,
|
|
3258
3031
|
"character": 18
|
|
3259
3032
|
},
|
|
3260
|
-
"name": "ComponentID"
|
|
3261
|
-
"componentId": {
|
|
3262
|
-
"scope": "teambit.component",
|
|
3263
|
-
"name": "component-id",
|
|
3264
|
-
"version": "1.2.0"
|
|
3265
|
-
}
|
|
3033
|
+
"name": "ComponentID"
|
|
3266
3034
|
}
|
|
3267
3035
|
},
|
|
3268
3036
|
"isOptional": false,
|
|
@@ -3290,12 +3058,7 @@
|
|
|
3290
3058
|
"line": 546,
|
|
3291
3059
|
"character": 14
|
|
3292
3060
|
},
|
|
3293
|
-
"name": "ComponentID"
|
|
3294
|
-
"componentId": {
|
|
3295
|
-
"scope": "teambit.component",
|
|
3296
|
-
"name": "component-id",
|
|
3297
|
-
"version": "1.2.0"
|
|
3298
|
-
}
|
|
3061
|
+
"name": "ComponentID"
|
|
3299
3062
|
}
|
|
3300
3063
|
},
|
|
3301
3064
|
"isOptional": false,
|
|
@@ -3357,8 +3120,7 @@
|
|
|
3357
3120
|
"line": 549,
|
|
3358
3121
|
"character": 15
|
|
3359
3122
|
},
|
|
3360
|
-
"name": "Lane"
|
|
3361
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3123
|
+
"name": "Lane"
|
|
3362
3124
|
},
|
|
3363
3125
|
"isOptional": true,
|
|
3364
3126
|
"isSpread": false
|
|
@@ -3407,11 +3169,7 @@
|
|
|
3407
3169
|
"line": 551,
|
|
3408
3170
|
"character": 12
|
|
3409
3171
|
},
|
|
3410
|
-
"name": "ComponentMergeStatus"
|
|
3411
|
-
"componentId": {
|
|
3412
|
-
"scope": "teambit.component",
|
|
3413
|
-
"name": "merging"
|
|
3414
|
-
}
|
|
3172
|
+
"name": "ComponentMergeStatus"
|
|
3415
3173
|
}
|
|
3416
3174
|
}
|
|
3417
3175
|
]
|
|
@@ -3445,12 +3203,7 @@
|
|
|
3445
3203
|
"line": 660,
|
|
3446
3204
|
"character": 45
|
|
3447
3205
|
},
|
|
3448
|
-
"name": "LaneId"
|
|
3449
|
-
"componentId": {
|
|
3450
|
-
"scope": "teambit.lanes",
|
|
3451
|
-
"name": "lane-id",
|
|
3452
|
-
"version": "0.0.311"
|
|
3453
|
-
}
|
|
3206
|
+
"name": "LaneId"
|
|
3454
3207
|
},
|
|
3455
3208
|
"isOptional": false,
|
|
3456
3209
|
"isSpread": false
|
|
@@ -3501,11 +3254,7 @@
|
|
|
3501
3254
|
"line": 670,
|
|
3502
3255
|
"character": 24
|
|
3503
3256
|
},
|
|
3504
|
-
"name": "ComponentMergeStatus"
|
|
3505
|
-
"componentId": {
|
|
3506
|
-
"scope": "teambit.component",
|
|
3507
|
-
"name": "merging"
|
|
3508
|
-
}
|
|
3257
|
+
"name": "ComponentMergeStatus"
|
|
3509
3258
|
}
|
|
3510
3259
|
},
|
|
3511
3260
|
"isOptional": false,
|
|
@@ -3526,12 +3275,7 @@
|
|
|
3526
3275
|
"line": 671,
|
|
3527
3276
|
"character": 18
|
|
3528
3277
|
},
|
|
3529
|
-
"name": "LaneId"
|
|
3530
|
-
"componentId": {
|
|
3531
|
-
"scope": "teambit.lanes",
|
|
3532
|
-
"name": "lane-id",
|
|
3533
|
-
"version": "0.0.311"
|
|
3534
|
-
}
|
|
3278
|
+
"name": "LaneId"
|
|
3535
3279
|
},
|
|
3536
3280
|
"isOptional": false,
|
|
3537
3281
|
"isSpread": false
|
|
@@ -3551,12 +3295,7 @@
|
|
|
3551
3295
|
"line": 672,
|
|
3552
3296
|
"character": 16
|
|
3553
3297
|
},
|
|
3554
|
-
"name": "LaneId"
|
|
3555
|
-
"componentId": {
|
|
3556
|
-
"scope": "teambit.lanes",
|
|
3557
|
-
"name": "lane-id",
|
|
3558
|
-
"version": "0.0.311"
|
|
3559
|
-
}
|
|
3298
|
+
"name": "LaneId"
|
|
3560
3299
|
},
|
|
3561
3300
|
"isOptional": false,
|
|
3562
3301
|
"isSpread": false
|
|
@@ -3670,12 +3409,7 @@
|
|
|
3670
3409
|
"line": 710,
|
|
3671
3410
|
"character": 16
|
|
3672
3411
|
},
|
|
3673
|
-
"name": "LaneId"
|
|
3674
|
-
"componentId": {
|
|
3675
|
-
"scope": "teambit.lanes",
|
|
3676
|
-
"name": "lane-id",
|
|
3677
|
-
"version": "0.0.311"
|
|
3678
|
-
}
|
|
3412
|
+
"name": "LaneId"
|
|
3679
3413
|
},
|
|
3680
3414
|
"isOptional": false,
|
|
3681
3415
|
"isSpread": false
|
|
@@ -3695,12 +3429,7 @@
|
|
|
3695
3429
|
"line": 711,
|
|
3696
3430
|
"character": 7
|
|
3697
3431
|
},
|
|
3698
|
-
"name": "ComponentID"
|
|
3699
|
-
"componentId": {
|
|
3700
|
-
"scope": "teambit.component",
|
|
3701
|
-
"name": "component-id",
|
|
3702
|
-
"version": "1.2.0"
|
|
3703
|
-
}
|
|
3432
|
+
"name": "ComponentID"
|
|
3704
3433
|
},
|
|
3705
3434
|
"isOptional": false,
|
|
3706
3435
|
"isSpread": false
|
|
@@ -3720,8 +3449,7 @@
|
|
|
3720
3449
|
"line": 712,
|
|
3721
3450
|
"character": 16
|
|
3722
3451
|
},
|
|
3723
|
-
"name": "SnapsDistance"
|
|
3724
|
-
"packageName": "@teambit/legacy/dist/scope/component-ops/snaps-distance"
|
|
3452
|
+
"name": "SnapsDistance"
|
|
3725
3453
|
},
|
|
3726
3454
|
"isOptional": false,
|
|
3727
3455
|
"isSpread": false
|
|
@@ -3741,8 +3469,7 @@
|
|
|
3741
3469
|
"line": 713,
|
|
3742
3470
|
"character": 8
|
|
3743
3471
|
},
|
|
3744
|
-
"name": "Log"
|
|
3745
|
-
"packageName": "@teambit/legacy/dist/scope/models/version"
|
|
3472
|
+
"name": "Log"
|
|
3746
3473
|
},
|
|
3747
3474
|
"isOptional": false,
|
|
3748
3475
|
"isSpread": false
|
|
@@ -3782,8 +3509,7 @@
|
|
|
3782
3509
|
"line": 715,
|
|
3783
3510
|
"character": 24
|
|
3784
3511
|
},
|
|
3785
|
-
"name": "Version"
|
|
3786
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3512
|
+
"name": "Version"
|
|
3787
3513
|
},
|
|
3788
3514
|
"isOptional": true,
|
|
3789
3515
|
"isSpread": false
|
|
@@ -3833,8 +3559,7 @@
|
|
|
3833
3559
|
"line": 717,
|
|
3834
3560
|
"character": 12
|
|
3835
3561
|
},
|
|
3836
|
-
"name": "Version"
|
|
3837
|
-
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3562
|
+
"name": "Version"
|
|
3838
3563
|
},
|
|
3839
3564
|
{
|
|
3840
3565
|
"__schema": "KeywordTypeSchema",
|
|
@@ -3906,7 +3631,7 @@
|
|
|
3906
3631
|
"componentId": {
|
|
3907
3632
|
"scope": "teambit.lanes",
|
|
3908
3633
|
"name": "merge-lanes",
|
|
3909
|
-
"version": "1.0.
|
|
3634
|
+
"version": "1.0.258"
|
|
3910
3635
|
},
|
|
3911
3636
|
"taggedModuleExports": []
|
|
3912
3637
|
}
|