@teambit/config-merger 0.0.125 → 0.0.127
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
|
@@ -22,13 +22,610 @@
|
|
|
22
22
|
},
|
|
23
23
|
"name": "ConfigMergerMain",
|
|
24
24
|
"exportNode": {
|
|
25
|
-
"__schema": "
|
|
25
|
+
"__schema": "ClassSchema",
|
|
26
26
|
"location": {
|
|
27
|
-
"filePath": "
|
|
28
|
-
"line":
|
|
29
|
-
"character":
|
|
27
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
28
|
+
"line": 37,
|
|
29
|
+
"character": 1
|
|
30
30
|
},
|
|
31
|
-
"
|
|
31
|
+
"signature": "class ConfigMergerMain",
|
|
32
|
+
"name": "ConfigMergerMain",
|
|
33
|
+
"members": [
|
|
34
|
+
{
|
|
35
|
+
"__schema": "ConstructorSchema",
|
|
36
|
+
"location": {
|
|
37
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
38
|
+
"line": 38,
|
|
39
|
+
"character": 3
|
|
40
|
+
},
|
|
41
|
+
"signature": "constructor ConfigMergerMain(workspace: Workspace, logger: Logger, config: ConfigMain, depsResolver: DependencyResolverMain): ConfigMergerMain",
|
|
42
|
+
"name": "constructor",
|
|
43
|
+
"params": [
|
|
44
|
+
{
|
|
45
|
+
"__schema": "ParameterSchema",
|
|
46
|
+
"location": {
|
|
47
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
48
|
+
"line": 39,
|
|
49
|
+
"character": 5
|
|
50
|
+
},
|
|
51
|
+
"name": "workspace",
|
|
52
|
+
"type": {
|
|
53
|
+
"__schema": "TypeRefSchema",
|
|
54
|
+
"location": {
|
|
55
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
56
|
+
"line": 39,
|
|
57
|
+
"character": 24
|
|
58
|
+
},
|
|
59
|
+
"name": "Workspace",
|
|
60
|
+
"componentId": {
|
|
61
|
+
"scope": "teambit.workspace",
|
|
62
|
+
"name": "workspace"
|
|
63
|
+
}
|
|
64
|
+
},
|
|
65
|
+
"isOptional": false,
|
|
66
|
+
"isSpread": false
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
"__schema": "ParameterSchema",
|
|
70
|
+
"location": {
|
|
71
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
72
|
+
"line": 40,
|
|
73
|
+
"character": 5
|
|
74
|
+
},
|
|
75
|
+
"name": "logger",
|
|
76
|
+
"type": {
|
|
77
|
+
"__schema": "TypeRefSchema",
|
|
78
|
+
"location": {
|
|
79
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
80
|
+
"line": 40,
|
|
81
|
+
"character": 21
|
|
82
|
+
},
|
|
83
|
+
"name": "Logger",
|
|
84
|
+
"componentId": {
|
|
85
|
+
"scope": "teambit.harmony",
|
|
86
|
+
"name": "logger"
|
|
87
|
+
}
|
|
88
|
+
},
|
|
89
|
+
"isOptional": false,
|
|
90
|
+
"isSpread": false
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
"__schema": "ParameterSchema",
|
|
94
|
+
"location": {
|
|
95
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
96
|
+
"line": 41,
|
|
97
|
+
"character": 5
|
|
98
|
+
},
|
|
99
|
+
"name": "config",
|
|
100
|
+
"type": {
|
|
101
|
+
"__schema": "TypeRefSchema",
|
|
102
|
+
"location": {
|
|
103
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
104
|
+
"line": 41,
|
|
105
|
+
"character": 21
|
|
106
|
+
},
|
|
107
|
+
"name": "ConfigMain",
|
|
108
|
+
"componentId": {
|
|
109
|
+
"scope": "teambit.harmony",
|
|
110
|
+
"name": "config"
|
|
111
|
+
}
|
|
112
|
+
},
|
|
113
|
+
"isOptional": false,
|
|
114
|
+
"isSpread": false
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
"__schema": "ParameterSchema",
|
|
118
|
+
"location": {
|
|
119
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
120
|
+
"line": 42,
|
|
121
|
+
"character": 5
|
|
122
|
+
},
|
|
123
|
+
"name": "depsResolver",
|
|
124
|
+
"type": {
|
|
125
|
+
"__schema": "TypeRefSchema",
|
|
126
|
+
"location": {
|
|
127
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
128
|
+
"line": 42,
|
|
129
|
+
"character": 27
|
|
130
|
+
},
|
|
131
|
+
"name": "DependencyResolverMain",
|
|
132
|
+
"componentId": {
|
|
133
|
+
"scope": "teambit.dependencies",
|
|
134
|
+
"name": "dependency-resolver"
|
|
135
|
+
}
|
|
136
|
+
},
|
|
137
|
+
"isOptional": false,
|
|
138
|
+
"isSpread": false
|
|
139
|
+
}
|
|
140
|
+
],
|
|
141
|
+
"returnType": {
|
|
142
|
+
"__schema": "ThisTypeSchema",
|
|
143
|
+
"location": {
|
|
144
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
145
|
+
"line": 37,
|
|
146
|
+
"character": 1
|
|
147
|
+
},
|
|
148
|
+
"name": "ConfigMergerMain"
|
|
149
|
+
},
|
|
150
|
+
"modifiers": []
|
|
151
|
+
},
|
|
152
|
+
{
|
|
153
|
+
"__schema": "FunctionLikeSchema",
|
|
154
|
+
"location": {
|
|
155
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
156
|
+
"line": 45,
|
|
157
|
+
"character": 3
|
|
158
|
+
},
|
|
159
|
+
"signature": "(method) ConfigMergerMain.generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]): Promise<void>",
|
|
160
|
+
"name": "generateConfigMergeConflictFileForAll",
|
|
161
|
+
"params": [
|
|
162
|
+
{
|
|
163
|
+
"__schema": "ParameterSchema",
|
|
164
|
+
"location": {
|
|
165
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
166
|
+
"line": 45,
|
|
167
|
+
"character": 47
|
|
168
|
+
},
|
|
169
|
+
"name": "allConfigMerge",
|
|
170
|
+
"type": {
|
|
171
|
+
"__schema": "TypeArraySchema",
|
|
172
|
+
"location": {
|
|
173
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
174
|
+
"line": 45,
|
|
175
|
+
"character": 63
|
|
176
|
+
},
|
|
177
|
+
"type": {
|
|
178
|
+
"__schema": "TypeRefSchema",
|
|
179
|
+
"location": {
|
|
180
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
181
|
+
"line": 45,
|
|
182
|
+
"character": 63
|
|
183
|
+
},
|
|
184
|
+
"name": "ConfigMergeResult"
|
|
185
|
+
}
|
|
186
|
+
},
|
|
187
|
+
"isOptional": false,
|
|
188
|
+
"isSpread": false
|
|
189
|
+
}
|
|
190
|
+
],
|
|
191
|
+
"returnType": {
|
|
192
|
+
"__schema": "InferenceTypeSchema",
|
|
193
|
+
"location": {
|
|
194
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
195
|
+
"line": 45,
|
|
196
|
+
"character": 3
|
|
197
|
+
},
|
|
198
|
+
"type": "Promise<void>"
|
|
199
|
+
},
|
|
200
|
+
"modifiers": [
|
|
201
|
+
"async"
|
|
202
|
+
]
|
|
203
|
+
},
|
|
204
|
+
{
|
|
205
|
+
"__schema": "FunctionLikeSchema",
|
|
206
|
+
"location": {
|
|
207
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
208
|
+
"line": 57,
|
|
209
|
+
"character": 3
|
|
210
|
+
},
|
|
211
|
+
"signature": "(method) ConfigMergerMain.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts: WorkspaceDepsConflicts): Promise<Error | undefined>",
|
|
212
|
+
"name": "writeWorkspaceJsoncWithConflictsGracefully",
|
|
213
|
+
"params": [
|
|
214
|
+
{
|
|
215
|
+
"__schema": "ParameterSchema",
|
|
216
|
+
"location": {
|
|
217
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
218
|
+
"line": 58,
|
|
219
|
+
"character": 5
|
|
220
|
+
},
|
|
221
|
+
"name": "workspaceDepsConflicts",
|
|
222
|
+
"type": {
|
|
223
|
+
"__schema": "TypeRefSchema",
|
|
224
|
+
"location": {
|
|
225
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
226
|
+
"line": 58,
|
|
227
|
+
"character": 29
|
|
228
|
+
},
|
|
229
|
+
"name": "WorkspaceDepsConflicts"
|
|
230
|
+
},
|
|
231
|
+
"isOptional": false,
|
|
232
|
+
"isSpread": false
|
|
233
|
+
}
|
|
234
|
+
],
|
|
235
|
+
"returnType": {
|
|
236
|
+
"__schema": "TypeRefSchema",
|
|
237
|
+
"location": {
|
|
238
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
239
|
+
"line": 59,
|
|
240
|
+
"character": 6
|
|
241
|
+
},
|
|
242
|
+
"name": "Promise",
|
|
243
|
+
"typeArgs": [
|
|
244
|
+
{
|
|
245
|
+
"__schema": "TypeUnionSchema",
|
|
246
|
+
"location": {
|
|
247
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
248
|
+
"line": 59,
|
|
249
|
+
"character": 14
|
|
250
|
+
},
|
|
251
|
+
"types": [
|
|
252
|
+
{
|
|
253
|
+
"__schema": "TypeRefSchema",
|
|
254
|
+
"location": {
|
|
255
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
256
|
+
"line": 59,
|
|
257
|
+
"character": 14
|
|
258
|
+
},
|
|
259
|
+
"name": "Error"
|
|
260
|
+
},
|
|
261
|
+
{
|
|
262
|
+
"__schema": "KeywordTypeSchema",
|
|
263
|
+
"location": {
|
|
264
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
265
|
+
"line": 59,
|
|
266
|
+
"character": 22
|
|
267
|
+
},
|
|
268
|
+
"name": "undefined"
|
|
269
|
+
}
|
|
270
|
+
]
|
|
271
|
+
}
|
|
272
|
+
]
|
|
273
|
+
},
|
|
274
|
+
"modifiers": [
|
|
275
|
+
"async"
|
|
276
|
+
]
|
|
277
|
+
},
|
|
278
|
+
{
|
|
279
|
+
"__schema": "FunctionLikeSchema",
|
|
280
|
+
"location": {
|
|
281
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
282
|
+
"line": 127,
|
|
283
|
+
"character": 3
|
|
284
|
+
},
|
|
285
|
+
"signature": "(method) ConfigMergerMain.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge: ConfigMergeResult[]): Promise<{\n workspaceDepsUpdates?: WorkspaceDepsUpdates;\n workspaceDepsConflicts?: WorkspaceDepsConflicts;\n}>",
|
|
286
|
+
"name": "updateWorkspaceJsoncWithDepsIfNeeded",
|
|
287
|
+
"params": [
|
|
288
|
+
{
|
|
289
|
+
"__schema": "ParameterSchema",
|
|
290
|
+
"location": {
|
|
291
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
292
|
+
"line": 128,
|
|
293
|
+
"character": 5
|
|
294
|
+
},
|
|
295
|
+
"name": "allConfigMerge",
|
|
296
|
+
"type": {
|
|
297
|
+
"__schema": "TypeArraySchema",
|
|
298
|
+
"location": {
|
|
299
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
300
|
+
"line": 128,
|
|
301
|
+
"character": 21
|
|
302
|
+
},
|
|
303
|
+
"type": {
|
|
304
|
+
"__schema": "TypeRefSchema",
|
|
305
|
+
"location": {
|
|
306
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
307
|
+
"line": 128,
|
|
308
|
+
"character": 21
|
|
309
|
+
},
|
|
310
|
+
"name": "ConfigMergeResult"
|
|
311
|
+
}
|
|
312
|
+
},
|
|
313
|
+
"isOptional": false,
|
|
314
|
+
"isSpread": false
|
|
315
|
+
}
|
|
316
|
+
],
|
|
317
|
+
"returnType": {
|
|
318
|
+
"__schema": "TypeRefSchema",
|
|
319
|
+
"location": {
|
|
320
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
321
|
+
"line": 129,
|
|
322
|
+
"character": 6
|
|
323
|
+
},
|
|
324
|
+
"name": "Promise",
|
|
325
|
+
"typeArgs": [
|
|
326
|
+
{
|
|
327
|
+
"__schema": "TypeLiteralSchema",
|
|
328
|
+
"location": {
|
|
329
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
330
|
+
"line": 129,
|
|
331
|
+
"character": 14
|
|
332
|
+
},
|
|
333
|
+
"members": [
|
|
334
|
+
{
|
|
335
|
+
"__schema": "VariableLikeSchema",
|
|
336
|
+
"location": {
|
|
337
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
338
|
+
"line": 129,
|
|
339
|
+
"character": 16
|
|
340
|
+
},
|
|
341
|
+
"signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
|
|
342
|
+
"name": "workspaceDepsUpdates",
|
|
343
|
+
"type": {
|
|
344
|
+
"__schema": "TypeRefSchema",
|
|
345
|
+
"location": {
|
|
346
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
347
|
+
"line": 129,
|
|
348
|
+
"character": 39
|
|
349
|
+
},
|
|
350
|
+
"name": "WorkspaceDepsUpdates"
|
|
351
|
+
},
|
|
352
|
+
"isOptional": true
|
|
353
|
+
},
|
|
354
|
+
{
|
|
355
|
+
"__schema": "VariableLikeSchema",
|
|
356
|
+
"location": {
|
|
357
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
358
|
+
"line": 129,
|
|
359
|
+
"character": 61
|
|
360
|
+
},
|
|
361
|
+
"signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
|
|
362
|
+
"name": "workspaceDepsConflicts",
|
|
363
|
+
"type": {
|
|
364
|
+
"__schema": "TypeRefSchema",
|
|
365
|
+
"location": {
|
|
366
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
367
|
+
"line": 129,
|
|
368
|
+
"character": 86
|
|
369
|
+
},
|
|
370
|
+
"name": "WorkspaceDepsConflicts"
|
|
371
|
+
},
|
|
372
|
+
"isOptional": true
|
|
373
|
+
}
|
|
374
|
+
]
|
|
375
|
+
}
|
|
376
|
+
]
|
|
377
|
+
},
|
|
378
|
+
"modifiers": [
|
|
379
|
+
"async"
|
|
380
|
+
]
|
|
381
|
+
},
|
|
382
|
+
{
|
|
383
|
+
"__schema": "FunctionLikeSchema",
|
|
384
|
+
"location": {
|
|
385
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
386
|
+
"line": 276,
|
|
387
|
+
"character": 3
|
|
388
|
+
},
|
|
389
|
+
"signature": "(method) ConfigMergerMain.updateDepsInWorkspaceConfig(components: ConsumerComponent[]): Promise<WorkspaceConfigUpdateResult | undefined>",
|
|
390
|
+
"name": "updateDepsInWorkspaceConfig",
|
|
391
|
+
"params": [
|
|
392
|
+
{
|
|
393
|
+
"__schema": "ParameterSchema",
|
|
394
|
+
"location": {
|
|
395
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
396
|
+
"line": 276,
|
|
397
|
+
"character": 37
|
|
398
|
+
},
|
|
399
|
+
"name": "components",
|
|
400
|
+
"type": {
|
|
401
|
+
"__schema": "TypeArraySchema",
|
|
402
|
+
"location": {
|
|
403
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
404
|
+
"line": 276,
|
|
405
|
+
"character": 49
|
|
406
|
+
},
|
|
407
|
+
"type": {
|
|
408
|
+
"__schema": "TypeRefSchema",
|
|
409
|
+
"location": {
|
|
410
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
411
|
+
"line": 276,
|
|
412
|
+
"character": 49
|
|
413
|
+
},
|
|
414
|
+
"name": "ConsumerComponent",
|
|
415
|
+
"packageName": "@teambit/legacy/dist/consumer/component"
|
|
416
|
+
}
|
|
417
|
+
},
|
|
418
|
+
"isOptional": false,
|
|
419
|
+
"isSpread": false
|
|
420
|
+
}
|
|
421
|
+
],
|
|
422
|
+
"returnType": {
|
|
423
|
+
"__schema": "TypeRefSchema",
|
|
424
|
+
"location": {
|
|
425
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
426
|
+
"line": 276,
|
|
427
|
+
"character": 71
|
|
428
|
+
},
|
|
429
|
+
"name": "Promise",
|
|
430
|
+
"typeArgs": [
|
|
431
|
+
{
|
|
432
|
+
"__schema": "TypeUnionSchema",
|
|
433
|
+
"location": {
|
|
434
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
435
|
+
"line": 276,
|
|
436
|
+
"character": 79
|
|
437
|
+
},
|
|
438
|
+
"types": [
|
|
439
|
+
{
|
|
440
|
+
"__schema": "TypeRefSchema",
|
|
441
|
+
"location": {
|
|
442
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
443
|
+
"line": 276,
|
|
444
|
+
"character": 79
|
|
445
|
+
},
|
|
446
|
+
"name": "WorkspaceConfigUpdateResult"
|
|
447
|
+
},
|
|
448
|
+
{
|
|
449
|
+
"__schema": "KeywordTypeSchema",
|
|
450
|
+
"location": {
|
|
451
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
452
|
+
"line": 276,
|
|
453
|
+
"character": 109
|
|
454
|
+
},
|
|
455
|
+
"name": "undefined"
|
|
456
|
+
}
|
|
457
|
+
]
|
|
458
|
+
}
|
|
459
|
+
]
|
|
460
|
+
},
|
|
461
|
+
"modifiers": [
|
|
462
|
+
"async"
|
|
463
|
+
]
|
|
464
|
+
},
|
|
465
|
+
{
|
|
466
|
+
"__schema": "VariableLikeSchema",
|
|
467
|
+
"location": {
|
|
468
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
469
|
+
"line": 490,
|
|
470
|
+
"character": 3
|
|
471
|
+
},
|
|
472
|
+
"signature": "(property) ConfigMergerMain.slots: never[]",
|
|
473
|
+
"name": "slots",
|
|
474
|
+
"type": {
|
|
475
|
+
"__schema": "InferenceTypeSchema",
|
|
476
|
+
"location": {
|
|
477
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
478
|
+
"line": 490,
|
|
479
|
+
"character": 3
|
|
480
|
+
},
|
|
481
|
+
"type": "never[]"
|
|
482
|
+
},
|
|
483
|
+
"isOptional": true,
|
|
484
|
+
"defaultValue": "[]"
|
|
485
|
+
},
|
|
486
|
+
{
|
|
487
|
+
"__schema": "VariableLikeSchema",
|
|
488
|
+
"location": {
|
|
489
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
490
|
+
"line": 491,
|
|
491
|
+
"character": 3
|
|
492
|
+
},
|
|
493
|
+
"signature": "(property) ConfigMergerMain.dependencies: Aspect[]",
|
|
494
|
+
"name": "dependencies",
|
|
495
|
+
"type": {
|
|
496
|
+
"__schema": "InferenceTypeSchema",
|
|
497
|
+
"location": {
|
|
498
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
499
|
+
"line": 491,
|
|
500
|
+
"character": 3
|
|
501
|
+
},
|
|
502
|
+
"type": "Aspect[]"
|
|
503
|
+
},
|
|
504
|
+
"isOptional": true,
|
|
505
|
+
"defaultValue": "[WorkspaceAspect, ConfigAspect, LoggerAspect, DependencyResolverAspect]"
|
|
506
|
+
},
|
|
507
|
+
{
|
|
508
|
+
"__schema": "VariableLikeSchema",
|
|
509
|
+
"location": {
|
|
510
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
511
|
+
"line": 492,
|
|
512
|
+
"character": 3
|
|
513
|
+
},
|
|
514
|
+
"signature": "(property) ConfigMergerMain.runtime: RuntimeDefinition",
|
|
515
|
+
"name": "runtime",
|
|
516
|
+
"type": {
|
|
517
|
+
"__schema": "InferenceTypeSchema",
|
|
518
|
+
"location": {
|
|
519
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
520
|
+
"line": 492,
|
|
521
|
+
"character": 3
|
|
522
|
+
},
|
|
523
|
+
"type": "RuntimeDefinition"
|
|
524
|
+
},
|
|
525
|
+
"isOptional": true,
|
|
526
|
+
"defaultValue": "MainRuntime"
|
|
527
|
+
},
|
|
528
|
+
{
|
|
529
|
+
"__schema": "FunctionLikeSchema",
|
|
530
|
+
"location": {
|
|
531
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
532
|
+
"line": 493,
|
|
533
|
+
"character": 3
|
|
534
|
+
},
|
|
535
|
+
"signature": "(method) ConfigMergerMain.provider([workspace, config, loggerMain, depsResolver]: [\n Workspace,\n ConfigMain,\n LoggerMain,\n DependencyResolverMain\n]): Promise<ConfigMergerMain>",
|
|
536
|
+
"name": "provider",
|
|
537
|
+
"params": [
|
|
538
|
+
{
|
|
539
|
+
"__schema": "ParameterSchema",
|
|
540
|
+
"location": {
|
|
541
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
542
|
+
"line": 493,
|
|
543
|
+
"character": 25
|
|
544
|
+
},
|
|
545
|
+
"name": "[ workspace, config, loggerMain, depsResolver ]",
|
|
546
|
+
"type": {
|
|
547
|
+
"__schema": "TupleTypeSchema",
|
|
548
|
+
"location": {
|
|
549
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
550
|
+
"line": 493,
|
|
551
|
+
"character": 72
|
|
552
|
+
},
|
|
553
|
+
"elements": [
|
|
554
|
+
{
|
|
555
|
+
"__schema": "TypeRefSchema",
|
|
556
|
+
"location": {
|
|
557
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
558
|
+
"line": 494,
|
|
559
|
+
"character": 5
|
|
560
|
+
},
|
|
561
|
+
"name": "Workspace",
|
|
562
|
+
"componentId": {
|
|
563
|
+
"scope": "teambit.workspace",
|
|
564
|
+
"name": "workspace"
|
|
565
|
+
}
|
|
566
|
+
},
|
|
567
|
+
{
|
|
568
|
+
"__schema": "TypeRefSchema",
|
|
569
|
+
"location": {
|
|
570
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
571
|
+
"line": 495,
|
|
572
|
+
"character": 5
|
|
573
|
+
},
|
|
574
|
+
"name": "ConfigMain",
|
|
575
|
+
"componentId": {
|
|
576
|
+
"scope": "teambit.harmony",
|
|
577
|
+
"name": "config"
|
|
578
|
+
}
|
|
579
|
+
},
|
|
580
|
+
{
|
|
581
|
+
"__schema": "TypeRefSchema",
|
|
582
|
+
"location": {
|
|
583
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
584
|
+
"line": 496,
|
|
585
|
+
"character": 5
|
|
586
|
+
},
|
|
587
|
+
"name": "LoggerMain",
|
|
588
|
+
"componentId": {
|
|
589
|
+
"scope": "teambit.harmony",
|
|
590
|
+
"name": "logger"
|
|
591
|
+
}
|
|
592
|
+
},
|
|
593
|
+
{
|
|
594
|
+
"__schema": "TypeRefSchema",
|
|
595
|
+
"location": {
|
|
596
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
597
|
+
"line": 497,
|
|
598
|
+
"character": 5
|
|
599
|
+
},
|
|
600
|
+
"name": "DependencyResolverMain",
|
|
601
|
+
"componentId": {
|
|
602
|
+
"scope": "teambit.dependencies",
|
|
603
|
+
"name": "dependency-resolver"
|
|
604
|
+
}
|
|
605
|
+
}
|
|
606
|
+
]
|
|
607
|
+
},
|
|
608
|
+
"isOptional": false,
|
|
609
|
+
"isSpread": false
|
|
610
|
+
}
|
|
611
|
+
],
|
|
612
|
+
"returnType": {
|
|
613
|
+
"__schema": "InferenceTypeSchema",
|
|
614
|
+
"location": {
|
|
615
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
616
|
+
"line": 493,
|
|
617
|
+
"character": 3
|
|
618
|
+
},
|
|
619
|
+
"type": "Promise<ConfigMergerMain>"
|
|
620
|
+
},
|
|
621
|
+
"modifiers": [
|
|
622
|
+
"static",
|
|
623
|
+
"async"
|
|
624
|
+
]
|
|
625
|
+
}
|
|
626
|
+
],
|
|
627
|
+
"extendsNodes": [],
|
|
628
|
+
"implementNodes": []
|
|
32
629
|
}
|
|
33
630
|
},
|
|
34
631
|
{
|
|
@@ -40,13 +637,80 @@
|
|
|
40
637
|
},
|
|
41
638
|
"name": "WorkspaceDepsUpdates",
|
|
42
639
|
"exportNode": {
|
|
43
|
-
"__schema": "
|
|
640
|
+
"__schema": "TypeSchema",
|
|
44
641
|
"location": {
|
|
45
|
-
"filePath": "
|
|
46
|
-
"line":
|
|
47
|
-
"character":
|
|
642
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
643
|
+
"line": 28,
|
|
644
|
+
"character": 1
|
|
48
645
|
},
|
|
49
|
-
"
|
|
646
|
+
"signature": "type WorkspaceDepsUpdates = {\n [pkgName: string]: [string, string];\n}",
|
|
647
|
+
"name": "WorkspaceDepsUpdates",
|
|
648
|
+
"type": {
|
|
649
|
+
"__schema": "TypeLiteralSchema",
|
|
650
|
+
"location": {
|
|
651
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
652
|
+
"line": 28,
|
|
653
|
+
"character": 36
|
|
654
|
+
},
|
|
655
|
+
"members": [
|
|
656
|
+
{
|
|
657
|
+
"__schema": "IndexSignatureSchema",
|
|
658
|
+
"location": {
|
|
659
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
660
|
+
"line": 28,
|
|
661
|
+
"character": 38
|
|
662
|
+
},
|
|
663
|
+
"keyType": {
|
|
664
|
+
"__schema": "ParameterSchema",
|
|
665
|
+
"location": {
|
|
666
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
667
|
+
"line": 28,
|
|
668
|
+
"character": 39
|
|
669
|
+
},
|
|
670
|
+
"name": "pkgName",
|
|
671
|
+
"type": {
|
|
672
|
+
"__schema": "KeywordTypeSchema",
|
|
673
|
+
"location": {
|
|
674
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
675
|
+
"line": 28,
|
|
676
|
+
"character": 48
|
|
677
|
+
},
|
|
678
|
+
"name": "string"
|
|
679
|
+
},
|
|
680
|
+
"isOptional": false,
|
|
681
|
+
"isSpread": false
|
|
682
|
+
},
|
|
683
|
+
"valueType": {
|
|
684
|
+
"__schema": "TupleTypeSchema",
|
|
685
|
+
"location": {
|
|
686
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
687
|
+
"line": 28,
|
|
688
|
+
"character": 57
|
|
689
|
+
},
|
|
690
|
+
"elements": [
|
|
691
|
+
{
|
|
692
|
+
"__schema": "KeywordTypeSchema",
|
|
693
|
+
"location": {
|
|
694
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
695
|
+
"line": 28,
|
|
696
|
+
"character": 58
|
|
697
|
+
},
|
|
698
|
+
"name": "string"
|
|
699
|
+
},
|
|
700
|
+
{
|
|
701
|
+
"__schema": "KeywordTypeSchema",
|
|
702
|
+
"location": {
|
|
703
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
704
|
+
"line": 28,
|
|
705
|
+
"character": 66
|
|
706
|
+
},
|
|
707
|
+
"name": "string"
|
|
708
|
+
}
|
|
709
|
+
]
|
|
710
|
+
}
|
|
711
|
+
}
|
|
712
|
+
]
|
|
713
|
+
}
|
|
50
714
|
}
|
|
51
715
|
},
|
|
52
716
|
{
|
|
@@ -58,13 +722,99 @@
|
|
|
58
722
|
},
|
|
59
723
|
"name": "WorkspaceDepsConflicts",
|
|
60
724
|
"exportNode": {
|
|
61
|
-
"__schema": "
|
|
725
|
+
"__schema": "TypeSchema",
|
|
62
726
|
"location": {
|
|
63
|
-
"filePath": "
|
|
64
|
-
"line":
|
|
65
|
-
"character":
|
|
727
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
728
|
+
"line": 29,
|
|
729
|
+
"character": 1
|
|
66
730
|
},
|
|
67
|
-
"
|
|
731
|
+
"signature": "type WorkspaceDepsConflicts = {\n dependencies: {\n name: string;\n version: string;\n }[];\n peerDependencies: {\n name: string;\n version: string;\n }[];\n}",
|
|
732
|
+
"name": "WorkspaceDepsConflicts",
|
|
733
|
+
"type": {
|
|
734
|
+
"__schema": "TypeRefSchema",
|
|
735
|
+
"location": {
|
|
736
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
737
|
+
"line": 29,
|
|
738
|
+
"character": 38
|
|
739
|
+
},
|
|
740
|
+
"name": "Record",
|
|
741
|
+
"typeArgs": [
|
|
742
|
+
{
|
|
743
|
+
"__schema": "TypeRefSchema",
|
|
744
|
+
"location": {
|
|
745
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
746
|
+
"line": 29,
|
|
747
|
+
"character": 45
|
|
748
|
+
},
|
|
749
|
+
"name": "WorkspacePolicyConfigKeysNames",
|
|
750
|
+
"componentId": {
|
|
751
|
+
"scope": "teambit.dependencies",
|
|
752
|
+
"name": "dependency-resolver"
|
|
753
|
+
}
|
|
754
|
+
},
|
|
755
|
+
{
|
|
756
|
+
"__schema": "TypeRefSchema",
|
|
757
|
+
"location": {
|
|
758
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
759
|
+
"line": 29,
|
|
760
|
+
"character": 77
|
|
761
|
+
},
|
|
762
|
+
"name": "Array",
|
|
763
|
+
"typeArgs": [
|
|
764
|
+
{
|
|
765
|
+
"__schema": "TypeLiteralSchema",
|
|
766
|
+
"location": {
|
|
767
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
768
|
+
"line": 29,
|
|
769
|
+
"character": 83
|
|
770
|
+
},
|
|
771
|
+
"members": [
|
|
772
|
+
{
|
|
773
|
+
"__schema": "VariableLikeSchema",
|
|
774
|
+
"location": {
|
|
775
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
776
|
+
"line": 29,
|
|
777
|
+
"character": 85
|
|
778
|
+
},
|
|
779
|
+
"signature": "(property) name: string",
|
|
780
|
+
"name": "name",
|
|
781
|
+
"type": {
|
|
782
|
+
"__schema": "KeywordTypeSchema",
|
|
783
|
+
"location": {
|
|
784
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
785
|
+
"line": 29,
|
|
786
|
+
"character": 91
|
|
787
|
+
},
|
|
788
|
+
"name": "string"
|
|
789
|
+
},
|
|
790
|
+
"isOptional": false
|
|
791
|
+
},
|
|
792
|
+
{
|
|
793
|
+
"__schema": "VariableLikeSchema",
|
|
794
|
+
"location": {
|
|
795
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
796
|
+
"line": 29,
|
|
797
|
+
"character": 99
|
|
798
|
+
},
|
|
799
|
+
"signature": "(property) version: string",
|
|
800
|
+
"name": "version",
|
|
801
|
+
"type": {
|
|
802
|
+
"__schema": "KeywordTypeSchema",
|
|
803
|
+
"location": {
|
|
804
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
805
|
+
"line": 29,
|
|
806
|
+
"character": 108
|
|
807
|
+
},
|
|
808
|
+
"name": "string"
|
|
809
|
+
},
|
|
810
|
+
"isOptional": false
|
|
811
|
+
}
|
|
812
|
+
]
|
|
813
|
+
}
|
|
814
|
+
]
|
|
815
|
+
}
|
|
816
|
+
]
|
|
817
|
+
}
|
|
68
818
|
}
|
|
69
819
|
},
|
|
70
820
|
{
|
|
@@ -76,13 +826,112 @@
|
|
|
76
826
|
},
|
|
77
827
|
"name": "WorkspaceConfigUpdateResult",
|
|
78
828
|
"exportNode": {
|
|
79
|
-
"__schema": "
|
|
829
|
+
"__schema": "TypeSchema",
|
|
80
830
|
"location": {
|
|
81
|
-
"filePath": "
|
|
82
|
-
"line":
|
|
83
|
-
"character":
|
|
831
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
832
|
+
"line": 31,
|
|
833
|
+
"character": 1
|
|
84
834
|
},
|
|
85
|
-
"
|
|
835
|
+
"signature": "type WorkspaceConfigUpdateResult = {\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceConfigConflictWriteError?: Error | undefined;\n logs?: string[] | undefined;\n}",
|
|
836
|
+
"name": "WorkspaceConfigUpdateResult",
|
|
837
|
+
"type": {
|
|
838
|
+
"__schema": "TypeLiteralSchema",
|
|
839
|
+
"location": {
|
|
840
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
841
|
+
"line": 31,
|
|
842
|
+
"character": 43
|
|
843
|
+
},
|
|
844
|
+
"members": [
|
|
845
|
+
{
|
|
846
|
+
"__schema": "VariableLikeSchema",
|
|
847
|
+
"location": {
|
|
848
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
849
|
+
"line": 32,
|
|
850
|
+
"character": 3
|
|
851
|
+
},
|
|
852
|
+
"signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
|
|
853
|
+
"name": "workspaceDepsUpdates",
|
|
854
|
+
"type": {
|
|
855
|
+
"__schema": "TypeRefSchema",
|
|
856
|
+
"location": {
|
|
857
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
858
|
+
"line": 32,
|
|
859
|
+
"character": 26
|
|
860
|
+
},
|
|
861
|
+
"name": "WorkspaceDepsUpdates"
|
|
862
|
+
},
|
|
863
|
+
"isOptional": true
|
|
864
|
+
},
|
|
865
|
+
{
|
|
866
|
+
"__schema": "VariableLikeSchema",
|
|
867
|
+
"location": {
|
|
868
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
869
|
+
"line": 33,
|
|
870
|
+
"character": 3
|
|
871
|
+
},
|
|
872
|
+
"signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
|
|
873
|
+
"name": "workspaceDepsConflicts",
|
|
874
|
+
"type": {
|
|
875
|
+
"__schema": "TypeRefSchema",
|
|
876
|
+
"location": {
|
|
877
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
878
|
+
"line": 33,
|
|
879
|
+
"character": 28
|
|
880
|
+
},
|
|
881
|
+
"name": "WorkspaceDepsConflicts"
|
|
882
|
+
},
|
|
883
|
+
"isOptional": true
|
|
884
|
+
},
|
|
885
|
+
{
|
|
886
|
+
"__schema": "VariableLikeSchema",
|
|
887
|
+
"location": {
|
|
888
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
889
|
+
"line": 34,
|
|
890
|
+
"character": 3
|
|
891
|
+
},
|
|
892
|
+
"signature": "(property) workspaceConfigConflictWriteError?: Error | undefined",
|
|
893
|
+
"name": "workspaceConfigConflictWriteError",
|
|
894
|
+
"type": {
|
|
895
|
+
"__schema": "TypeRefSchema",
|
|
896
|
+
"location": {
|
|
897
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
898
|
+
"line": 34,
|
|
899
|
+
"character": 39
|
|
900
|
+
},
|
|
901
|
+
"name": "Error"
|
|
902
|
+
},
|
|
903
|
+
"isOptional": true
|
|
904
|
+
},
|
|
905
|
+
{
|
|
906
|
+
"__schema": "VariableLikeSchema",
|
|
907
|
+
"location": {
|
|
908
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
909
|
+
"line": 35,
|
|
910
|
+
"character": 3
|
|
911
|
+
},
|
|
912
|
+
"signature": "(property) logs?: string[] | undefined",
|
|
913
|
+
"name": "logs",
|
|
914
|
+
"type": {
|
|
915
|
+
"__schema": "TypeArraySchema",
|
|
916
|
+
"location": {
|
|
917
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
918
|
+
"line": 35,
|
|
919
|
+
"character": 10
|
|
920
|
+
},
|
|
921
|
+
"type": {
|
|
922
|
+
"__schema": "KeywordTypeSchema",
|
|
923
|
+
"location": {
|
|
924
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
925
|
+
"line": 35,
|
|
926
|
+
"character": 10
|
|
927
|
+
},
|
|
928
|
+
"name": "string"
|
|
929
|
+
}
|
|
930
|
+
},
|
|
931
|
+
"isOptional": true
|
|
932
|
+
}
|
|
933
|
+
]
|
|
934
|
+
}
|
|
86
935
|
}
|
|
87
936
|
},
|
|
88
937
|
{
|
|
@@ -94,13 +943,272 @@
|
|
|
94
943
|
},
|
|
95
944
|
"name": "ConfigMergeResult",
|
|
96
945
|
"exportNode": {
|
|
97
|
-
"__schema": "
|
|
946
|
+
"__schema": "ClassSchema",
|
|
98
947
|
"location": {
|
|
99
|
-
"filePath": "
|
|
100
|
-
"line":
|
|
101
|
-
"character":
|
|
948
|
+
"filePath": "config-merge-result.ts",
|
|
949
|
+
"line": 8,
|
|
950
|
+
"character": 1
|
|
102
951
|
},
|
|
103
|
-
"
|
|
952
|
+
"signature": "class ConfigMergeResult",
|
|
953
|
+
"name": "ConfigMergeResult",
|
|
954
|
+
"members": [
|
|
955
|
+
{
|
|
956
|
+
"__schema": "ConstructorSchema",
|
|
957
|
+
"location": {
|
|
958
|
+
"filePath": "config-merge-result.ts",
|
|
959
|
+
"line": 9,
|
|
960
|
+
"character": 3
|
|
961
|
+
},
|
|
962
|
+
"signature": "constructor ConfigMergeResult(compIdStr: string, currentLabel: string, otherLabel: string, results: MergeStrategyResult[]): ConfigMergeResult",
|
|
963
|
+
"name": "constructor",
|
|
964
|
+
"params": [
|
|
965
|
+
{
|
|
966
|
+
"__schema": "ParameterSchema",
|
|
967
|
+
"location": {
|
|
968
|
+
"filePath": "config-merge-result.ts",
|
|
969
|
+
"line": 10,
|
|
970
|
+
"character": 5
|
|
971
|
+
},
|
|
972
|
+
"name": "compIdStr",
|
|
973
|
+
"type": {
|
|
974
|
+
"__schema": "KeywordTypeSchema",
|
|
975
|
+
"location": {
|
|
976
|
+
"filePath": "config-merge-result.ts",
|
|
977
|
+
"line": 10,
|
|
978
|
+
"character": 25
|
|
979
|
+
},
|
|
980
|
+
"name": "string"
|
|
981
|
+
},
|
|
982
|
+
"isOptional": false,
|
|
983
|
+
"isSpread": false
|
|
984
|
+
},
|
|
985
|
+
{
|
|
986
|
+
"__schema": "ParameterSchema",
|
|
987
|
+
"location": {
|
|
988
|
+
"filePath": "config-merge-result.ts",
|
|
989
|
+
"line": 11,
|
|
990
|
+
"character": 5
|
|
991
|
+
},
|
|
992
|
+
"name": "currentLabel",
|
|
993
|
+
"type": {
|
|
994
|
+
"__schema": "KeywordTypeSchema",
|
|
995
|
+
"location": {
|
|
996
|
+
"filePath": "config-merge-result.ts",
|
|
997
|
+
"line": 11,
|
|
998
|
+
"character": 27
|
|
999
|
+
},
|
|
1000
|
+
"name": "string"
|
|
1001
|
+
},
|
|
1002
|
+
"isOptional": false,
|
|
1003
|
+
"isSpread": false
|
|
1004
|
+
},
|
|
1005
|
+
{
|
|
1006
|
+
"__schema": "ParameterSchema",
|
|
1007
|
+
"location": {
|
|
1008
|
+
"filePath": "config-merge-result.ts",
|
|
1009
|
+
"line": 12,
|
|
1010
|
+
"character": 5
|
|
1011
|
+
},
|
|
1012
|
+
"name": "otherLabel",
|
|
1013
|
+
"type": {
|
|
1014
|
+
"__schema": "KeywordTypeSchema",
|
|
1015
|
+
"location": {
|
|
1016
|
+
"filePath": "config-merge-result.ts",
|
|
1017
|
+
"line": 12,
|
|
1018
|
+
"character": 25
|
|
1019
|
+
},
|
|
1020
|
+
"name": "string"
|
|
1021
|
+
},
|
|
1022
|
+
"isOptional": false,
|
|
1023
|
+
"isSpread": false
|
|
1024
|
+
},
|
|
1025
|
+
{
|
|
1026
|
+
"__schema": "ParameterSchema",
|
|
1027
|
+
"location": {
|
|
1028
|
+
"filePath": "config-merge-result.ts",
|
|
1029
|
+
"line": 13,
|
|
1030
|
+
"character": 5
|
|
1031
|
+
},
|
|
1032
|
+
"name": "results",
|
|
1033
|
+
"type": {
|
|
1034
|
+
"__schema": "TypeArraySchema",
|
|
1035
|
+
"location": {
|
|
1036
|
+
"filePath": "config-merge-result.ts",
|
|
1037
|
+
"line": 13,
|
|
1038
|
+
"character": 22
|
|
1039
|
+
},
|
|
1040
|
+
"type": {
|
|
1041
|
+
"__schema": "TypeRefSchema",
|
|
1042
|
+
"location": {
|
|
1043
|
+
"filePath": "config-merge-result.ts",
|
|
1044
|
+
"line": 13,
|
|
1045
|
+
"character": 22
|
|
1046
|
+
},
|
|
1047
|
+
"name": "MergeStrategyResult",
|
|
1048
|
+
"internalFilePath": "component-config-merger.ts"
|
|
1049
|
+
}
|
|
1050
|
+
},
|
|
1051
|
+
"isOptional": false,
|
|
1052
|
+
"isSpread": false
|
|
1053
|
+
}
|
|
1054
|
+
],
|
|
1055
|
+
"returnType": {
|
|
1056
|
+
"__schema": "ThisTypeSchema",
|
|
1057
|
+
"location": {
|
|
1058
|
+
"filePath": "config-merge-result.ts",
|
|
1059
|
+
"line": 8,
|
|
1060
|
+
"character": 1
|
|
1061
|
+
},
|
|
1062
|
+
"name": "ConfigMergeResult"
|
|
1063
|
+
},
|
|
1064
|
+
"modifiers": []
|
|
1065
|
+
},
|
|
1066
|
+
{
|
|
1067
|
+
"__schema": "FunctionLikeSchema",
|
|
1068
|
+
"location": {
|
|
1069
|
+
"filePath": "config-merge-result.ts",
|
|
1070
|
+
"line": 15,
|
|
1071
|
+
"character": 3
|
|
1072
|
+
},
|
|
1073
|
+
"signature": "(method) ConfigMergeResult.hasConflicts(): boolean",
|
|
1074
|
+
"name": "hasConflicts",
|
|
1075
|
+
"params": [],
|
|
1076
|
+
"returnType": {
|
|
1077
|
+
"__schema": "KeywordTypeSchema",
|
|
1078
|
+
"location": {
|
|
1079
|
+
"filePath": "config-merge-result.ts",
|
|
1080
|
+
"line": 15,
|
|
1081
|
+
"character": 19
|
|
1082
|
+
},
|
|
1083
|
+
"name": "boolean"
|
|
1084
|
+
},
|
|
1085
|
+
"modifiers": []
|
|
1086
|
+
},
|
|
1087
|
+
{
|
|
1088
|
+
"__schema": "FunctionLikeSchema",
|
|
1089
|
+
"location": {
|
|
1090
|
+
"filePath": "config-merge-result.ts",
|
|
1091
|
+
"line": 18,
|
|
1092
|
+
"character": 3
|
|
1093
|
+
},
|
|
1094
|
+
"signature": "(method) ConfigMergeResult.generateMergeConflictFile(): string | null",
|
|
1095
|
+
"name": "generateMergeConflictFile",
|
|
1096
|
+
"params": [],
|
|
1097
|
+
"returnType": {
|
|
1098
|
+
"__schema": "TypeUnionSchema",
|
|
1099
|
+
"location": {
|
|
1100
|
+
"filePath": "config-merge-result.ts",
|
|
1101
|
+
"line": 18,
|
|
1102
|
+
"character": 32
|
|
1103
|
+
},
|
|
1104
|
+
"types": [
|
|
1105
|
+
{
|
|
1106
|
+
"__schema": "KeywordTypeSchema",
|
|
1107
|
+
"location": {
|
|
1108
|
+
"filePath": "config-merge-result.ts",
|
|
1109
|
+
"line": 18,
|
|
1110
|
+
"character": 32
|
|
1111
|
+
},
|
|
1112
|
+
"name": "string"
|
|
1113
|
+
},
|
|
1114
|
+
{
|
|
1115
|
+
"__schema": "LiteralTypeSchema",
|
|
1116
|
+
"location": {
|
|
1117
|
+
"filePath": "config-merge-result.ts",
|
|
1118
|
+
"line": 18,
|
|
1119
|
+
"character": 41
|
|
1120
|
+
},
|
|
1121
|
+
"name": "null"
|
|
1122
|
+
}
|
|
1123
|
+
]
|
|
1124
|
+
},
|
|
1125
|
+
"modifiers": []
|
|
1126
|
+
},
|
|
1127
|
+
{
|
|
1128
|
+
"__schema": "FunctionLikeSchema",
|
|
1129
|
+
"location": {
|
|
1130
|
+
"filePath": "config-merge-result.ts",
|
|
1131
|
+
"line": 28,
|
|
1132
|
+
"character": 3
|
|
1133
|
+
},
|
|
1134
|
+
"signature": "(method) ConfigMergeResult.getSuccessfullyMergedConfig(): Record<string, any>",
|
|
1135
|
+
"name": "getSuccessfullyMergedConfig",
|
|
1136
|
+
"params": [],
|
|
1137
|
+
"returnType": {
|
|
1138
|
+
"__schema": "TypeRefSchema",
|
|
1139
|
+
"location": {
|
|
1140
|
+
"filePath": "config-merge-result.ts",
|
|
1141
|
+
"line": 28,
|
|
1142
|
+
"character": 34
|
|
1143
|
+
},
|
|
1144
|
+
"name": "Record",
|
|
1145
|
+
"typeArgs": [
|
|
1146
|
+
{
|
|
1147
|
+
"__schema": "KeywordTypeSchema",
|
|
1148
|
+
"location": {
|
|
1149
|
+
"filePath": "config-merge-result.ts",
|
|
1150
|
+
"line": 28,
|
|
1151
|
+
"character": 41
|
|
1152
|
+
},
|
|
1153
|
+
"name": "string"
|
|
1154
|
+
},
|
|
1155
|
+
{
|
|
1156
|
+
"__schema": "KeywordTypeSchema",
|
|
1157
|
+
"location": {
|
|
1158
|
+
"filePath": "config-merge-result.ts",
|
|
1159
|
+
"line": 28,
|
|
1160
|
+
"character": 49
|
|
1161
|
+
},
|
|
1162
|
+
"name": "any"
|
|
1163
|
+
}
|
|
1164
|
+
]
|
|
1165
|
+
},
|
|
1166
|
+
"modifiers": []
|
|
1167
|
+
},
|
|
1168
|
+
{
|
|
1169
|
+
"__schema": "FunctionLikeSchema",
|
|
1170
|
+
"location": {
|
|
1171
|
+
"filePath": "config-merge-result.ts",
|
|
1172
|
+
"line": 36,
|
|
1173
|
+
"character": 3
|
|
1174
|
+
},
|
|
1175
|
+
"signature": "(method) ConfigMergeResult.getDepsResolverResult(): MergeStrategyResult | undefined",
|
|
1176
|
+
"name": "getDepsResolverResult",
|
|
1177
|
+
"params": [],
|
|
1178
|
+
"returnType": {
|
|
1179
|
+
"__schema": "TypeUnionSchema",
|
|
1180
|
+
"location": {
|
|
1181
|
+
"filePath": "config-merge-result.ts",
|
|
1182
|
+
"line": 36,
|
|
1183
|
+
"character": 28
|
|
1184
|
+
},
|
|
1185
|
+
"types": [
|
|
1186
|
+
{
|
|
1187
|
+
"__schema": "TypeRefSchema",
|
|
1188
|
+
"location": {
|
|
1189
|
+
"filePath": "config-merge-result.ts",
|
|
1190
|
+
"line": 36,
|
|
1191
|
+
"character": 28
|
|
1192
|
+
},
|
|
1193
|
+
"name": "MergeStrategyResult",
|
|
1194
|
+
"internalFilePath": "component-config-merger.ts"
|
|
1195
|
+
},
|
|
1196
|
+
{
|
|
1197
|
+
"__schema": "KeywordTypeSchema",
|
|
1198
|
+
"location": {
|
|
1199
|
+
"filePath": "config-merge-result.ts",
|
|
1200
|
+
"line": 36,
|
|
1201
|
+
"character": 50
|
|
1202
|
+
},
|
|
1203
|
+
"name": "undefined"
|
|
1204
|
+
}
|
|
1205
|
+
]
|
|
1206
|
+
},
|
|
1207
|
+
"modifiers": []
|
|
1208
|
+
}
|
|
1209
|
+
],
|
|
1210
|
+
"extendsNodes": [],
|
|
1211
|
+
"implementNodes": []
|
|
104
1212
|
}
|
|
105
1213
|
},
|
|
106
1214
|
{
|
|
@@ -112,13 +1220,312 @@
|
|
|
112
1220
|
},
|
|
113
1221
|
"name": "ComponentConfigMerger",
|
|
114
1222
|
"exportNode": {
|
|
115
|
-
"__schema": "
|
|
1223
|
+
"__schema": "ClassSchema",
|
|
116
1224
|
"location": {
|
|
117
|
-
"filePath": "
|
|
118
|
-
"line":
|
|
119
|
-
"character":
|
|
1225
|
+
"filePath": "component-config-merger.ts",
|
|
1226
|
+
"line": 68,
|
|
1227
|
+
"character": 1
|
|
1228
|
+
},
|
|
1229
|
+
"doc": {
|
|
1230
|
+
"__schema": "DocSchema",
|
|
1231
|
+
"location": {
|
|
1232
|
+
"filePath": "component-config-merger.ts",
|
|
1233
|
+
"line": 45,
|
|
1234
|
+
"character": 1
|
|
1235
|
+
},
|
|
1236
|
+
"raw": "/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */",
|
|
1237
|
+
"comment": "perform 3-way merge of component configuration (aspects).\nnormally this is needed when merging one lane into another. the component may have different aspects config in each lane.\nthe baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\nthe currentAspects are the aspects of the component in the current lane.\nthe otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n\nthe basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\nwe have two special cases:\n\n1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\ninto account not only the config, but also the data. this is needed because some dependencies are automatically\nadded by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\nfrom both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\nthe config has always force: true.\n\n2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\nin the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\nteambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\nwe ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\nversion. later, when the component is loaded, we split the id and the version and put them in the correct places.\nsee workspace.componentExtension / adjustEnvsOnConfigMerge for more details."
|
|
120
1238
|
},
|
|
121
|
-
"
|
|
1239
|
+
"signature": "class ComponentConfigMerger",
|
|
1240
|
+
"name": "ComponentConfigMerger",
|
|
1241
|
+
"members": [
|
|
1242
|
+
{
|
|
1243
|
+
"__schema": "ConstructorSchema",
|
|
1244
|
+
"location": {
|
|
1245
|
+
"filePath": "component-config-merger.ts",
|
|
1246
|
+
"line": 74,
|
|
1247
|
+
"character": 3
|
|
1248
|
+
},
|
|
1249
|
+
"signature": "constructor ComponentConfigMerger(compIdStr: string, workspaceIds: ComponentID[], otherLane: Lane | undefined, currentAspects: ExtensionDataList, baseAspects: ExtensionDataList, otherAspects: ExtensionDataList, currentLabel: string, otherLabel: string, logger: Logger, mergeStrategy: MergeStrategy): ComponentConfigMerger",
|
|
1250
|
+
"name": "constructor",
|
|
1251
|
+
"params": [
|
|
1252
|
+
{
|
|
1253
|
+
"__schema": "ParameterSchema",
|
|
1254
|
+
"location": {
|
|
1255
|
+
"filePath": "component-config-merger.ts",
|
|
1256
|
+
"line": 75,
|
|
1257
|
+
"character": 5
|
|
1258
|
+
},
|
|
1259
|
+
"name": "compIdStr",
|
|
1260
|
+
"type": {
|
|
1261
|
+
"__schema": "KeywordTypeSchema",
|
|
1262
|
+
"location": {
|
|
1263
|
+
"filePath": "component-config-merger.ts",
|
|
1264
|
+
"line": 75,
|
|
1265
|
+
"character": 24
|
|
1266
|
+
},
|
|
1267
|
+
"name": "string"
|
|
1268
|
+
},
|
|
1269
|
+
"isOptional": false,
|
|
1270
|
+
"isSpread": false
|
|
1271
|
+
},
|
|
1272
|
+
{
|
|
1273
|
+
"__schema": "ParameterSchema",
|
|
1274
|
+
"location": {
|
|
1275
|
+
"filePath": "component-config-merger.ts",
|
|
1276
|
+
"line": 76,
|
|
1277
|
+
"character": 5
|
|
1278
|
+
},
|
|
1279
|
+
"name": "workspaceIds",
|
|
1280
|
+
"type": {
|
|
1281
|
+
"__schema": "TypeArraySchema",
|
|
1282
|
+
"location": {
|
|
1283
|
+
"filePath": "component-config-merger.ts",
|
|
1284
|
+
"line": 76,
|
|
1285
|
+
"character": 27
|
|
1286
|
+
},
|
|
1287
|
+
"type": {
|
|
1288
|
+
"__schema": "TypeRefSchema",
|
|
1289
|
+
"location": {
|
|
1290
|
+
"filePath": "component-config-merger.ts",
|
|
1291
|
+
"line": 76,
|
|
1292
|
+
"character": 27
|
|
1293
|
+
},
|
|
1294
|
+
"name": "ComponentID",
|
|
1295
|
+
"componentId": {
|
|
1296
|
+
"scope": "teambit.component",
|
|
1297
|
+
"name": "component-id",
|
|
1298
|
+
"version": "1.2.0"
|
|
1299
|
+
}
|
|
1300
|
+
}
|
|
1301
|
+
},
|
|
1302
|
+
"isOptional": false,
|
|
1303
|
+
"isSpread": false
|
|
1304
|
+
},
|
|
1305
|
+
{
|
|
1306
|
+
"__schema": "ParameterSchema",
|
|
1307
|
+
"location": {
|
|
1308
|
+
"filePath": "component-config-merger.ts",
|
|
1309
|
+
"line": 77,
|
|
1310
|
+
"character": 5
|
|
1311
|
+
},
|
|
1312
|
+
"name": "otherLane",
|
|
1313
|
+
"type": {
|
|
1314
|
+
"__schema": "TypeUnionSchema",
|
|
1315
|
+
"location": {
|
|
1316
|
+
"filePath": "component-config-merger.ts",
|
|
1317
|
+
"line": 77,
|
|
1318
|
+
"character": 16
|
|
1319
|
+
},
|
|
1320
|
+
"types": [
|
|
1321
|
+
{
|
|
1322
|
+
"__schema": "TypeRefSchema",
|
|
1323
|
+
"location": {
|
|
1324
|
+
"filePath": "component-config-merger.ts",
|
|
1325
|
+
"line": 77,
|
|
1326
|
+
"character": 16
|
|
1327
|
+
},
|
|
1328
|
+
"name": "Lane",
|
|
1329
|
+
"packageName": "@teambit/legacy/dist/scope/models"
|
|
1330
|
+
},
|
|
1331
|
+
{
|
|
1332
|
+
"__schema": "KeywordTypeSchema",
|
|
1333
|
+
"location": {
|
|
1334
|
+
"filePath": "component-config-merger.ts",
|
|
1335
|
+
"line": 77,
|
|
1336
|
+
"character": 23
|
|
1337
|
+
},
|
|
1338
|
+
"name": "undefined"
|
|
1339
|
+
}
|
|
1340
|
+
]
|
|
1341
|
+
},
|
|
1342
|
+
"isOptional": false,
|
|
1343
|
+
"isSpread": false
|
|
1344
|
+
},
|
|
1345
|
+
{
|
|
1346
|
+
"__schema": "ParameterSchema",
|
|
1347
|
+
"location": {
|
|
1348
|
+
"filePath": "component-config-merger.ts",
|
|
1349
|
+
"line": 78,
|
|
1350
|
+
"character": 5
|
|
1351
|
+
},
|
|
1352
|
+
"name": "currentAspects",
|
|
1353
|
+
"type": {
|
|
1354
|
+
"__schema": "TypeRefSchema",
|
|
1355
|
+
"location": {
|
|
1356
|
+
"filePath": "component-config-merger.ts",
|
|
1357
|
+
"line": 78,
|
|
1358
|
+
"character": 29
|
|
1359
|
+
},
|
|
1360
|
+
"name": "ExtensionDataList",
|
|
1361
|
+
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
1362
|
+
},
|
|
1363
|
+
"isOptional": false,
|
|
1364
|
+
"isSpread": false
|
|
1365
|
+
},
|
|
1366
|
+
{
|
|
1367
|
+
"__schema": "ParameterSchema",
|
|
1368
|
+
"location": {
|
|
1369
|
+
"filePath": "component-config-merger.ts",
|
|
1370
|
+
"line": 79,
|
|
1371
|
+
"character": 5
|
|
1372
|
+
},
|
|
1373
|
+
"name": "baseAspects",
|
|
1374
|
+
"type": {
|
|
1375
|
+
"__schema": "TypeRefSchema",
|
|
1376
|
+
"location": {
|
|
1377
|
+
"filePath": "component-config-merger.ts",
|
|
1378
|
+
"line": 79,
|
|
1379
|
+
"character": 26
|
|
1380
|
+
},
|
|
1381
|
+
"name": "ExtensionDataList",
|
|
1382
|
+
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
1383
|
+
},
|
|
1384
|
+
"isOptional": false,
|
|
1385
|
+
"isSpread": false
|
|
1386
|
+
},
|
|
1387
|
+
{
|
|
1388
|
+
"__schema": "ParameterSchema",
|
|
1389
|
+
"location": {
|
|
1390
|
+
"filePath": "component-config-merger.ts",
|
|
1391
|
+
"line": 80,
|
|
1392
|
+
"character": 5
|
|
1393
|
+
},
|
|
1394
|
+
"name": "otherAspects",
|
|
1395
|
+
"type": {
|
|
1396
|
+
"__schema": "TypeRefSchema",
|
|
1397
|
+
"location": {
|
|
1398
|
+
"filePath": "component-config-merger.ts",
|
|
1399
|
+
"line": 80,
|
|
1400
|
+
"character": 27
|
|
1401
|
+
},
|
|
1402
|
+
"name": "ExtensionDataList",
|
|
1403
|
+
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
1404
|
+
},
|
|
1405
|
+
"isOptional": false,
|
|
1406
|
+
"isSpread": false
|
|
1407
|
+
},
|
|
1408
|
+
{
|
|
1409
|
+
"__schema": "ParameterSchema",
|
|
1410
|
+
"location": {
|
|
1411
|
+
"filePath": "component-config-merger.ts",
|
|
1412
|
+
"line": 81,
|
|
1413
|
+
"character": 5
|
|
1414
|
+
},
|
|
1415
|
+
"name": "currentLabel",
|
|
1416
|
+
"type": {
|
|
1417
|
+
"__schema": "KeywordTypeSchema",
|
|
1418
|
+
"location": {
|
|
1419
|
+
"filePath": "component-config-merger.ts",
|
|
1420
|
+
"line": 81,
|
|
1421
|
+
"character": 27
|
|
1422
|
+
},
|
|
1423
|
+
"name": "string"
|
|
1424
|
+
},
|
|
1425
|
+
"isOptional": false,
|
|
1426
|
+
"isSpread": false
|
|
1427
|
+
},
|
|
1428
|
+
{
|
|
1429
|
+
"__schema": "ParameterSchema",
|
|
1430
|
+
"location": {
|
|
1431
|
+
"filePath": "component-config-merger.ts",
|
|
1432
|
+
"line": 82,
|
|
1433
|
+
"character": 5
|
|
1434
|
+
},
|
|
1435
|
+
"name": "otherLabel",
|
|
1436
|
+
"type": {
|
|
1437
|
+
"__schema": "KeywordTypeSchema",
|
|
1438
|
+
"location": {
|
|
1439
|
+
"filePath": "component-config-merger.ts",
|
|
1440
|
+
"line": 82,
|
|
1441
|
+
"character": 25
|
|
1442
|
+
},
|
|
1443
|
+
"name": "string"
|
|
1444
|
+
},
|
|
1445
|
+
"isOptional": false,
|
|
1446
|
+
"isSpread": false
|
|
1447
|
+
},
|
|
1448
|
+
{
|
|
1449
|
+
"__schema": "ParameterSchema",
|
|
1450
|
+
"location": {
|
|
1451
|
+
"filePath": "component-config-merger.ts",
|
|
1452
|
+
"line": 83,
|
|
1453
|
+
"character": 5
|
|
1454
|
+
},
|
|
1455
|
+
"name": "logger",
|
|
1456
|
+
"type": {
|
|
1457
|
+
"__schema": "TypeRefSchema",
|
|
1458
|
+
"location": {
|
|
1459
|
+
"filePath": "component-config-merger.ts",
|
|
1460
|
+
"line": 83,
|
|
1461
|
+
"character": 21
|
|
1462
|
+
},
|
|
1463
|
+
"name": "Logger",
|
|
1464
|
+
"componentId": {
|
|
1465
|
+
"scope": "teambit.harmony",
|
|
1466
|
+
"name": "logger"
|
|
1467
|
+
}
|
|
1468
|
+
},
|
|
1469
|
+
"isOptional": false,
|
|
1470
|
+
"isSpread": false
|
|
1471
|
+
},
|
|
1472
|
+
{
|
|
1473
|
+
"__schema": "ParameterSchema",
|
|
1474
|
+
"location": {
|
|
1475
|
+
"filePath": "component-config-merger.ts",
|
|
1476
|
+
"line": 84,
|
|
1477
|
+
"character": 5
|
|
1478
|
+
},
|
|
1479
|
+
"name": "mergeStrategy",
|
|
1480
|
+
"type": {
|
|
1481
|
+
"__schema": "TypeRefSchema",
|
|
1482
|
+
"location": {
|
|
1483
|
+
"filePath": "component-config-merger.ts",
|
|
1484
|
+
"line": 84,
|
|
1485
|
+
"character": 28
|
|
1486
|
+
},
|
|
1487
|
+
"name": "MergeStrategy",
|
|
1488
|
+
"packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
|
|
1489
|
+
},
|
|
1490
|
+
"isOptional": false,
|
|
1491
|
+
"isSpread": false
|
|
1492
|
+
}
|
|
1493
|
+
],
|
|
1494
|
+
"returnType": {
|
|
1495
|
+
"__schema": "ThisTypeSchema",
|
|
1496
|
+
"location": {
|
|
1497
|
+
"filePath": "component-config-merger.ts",
|
|
1498
|
+
"line": 68,
|
|
1499
|
+
"character": 1
|
|
1500
|
+
},
|
|
1501
|
+
"name": "ComponentConfigMerger"
|
|
1502
|
+
},
|
|
1503
|
+
"modifiers": []
|
|
1504
|
+
},
|
|
1505
|
+
{
|
|
1506
|
+
"__schema": "FunctionLikeSchema",
|
|
1507
|
+
"location": {
|
|
1508
|
+
"filePath": "component-config-merger.ts",
|
|
1509
|
+
"line": 89,
|
|
1510
|
+
"character": 3
|
|
1511
|
+
},
|
|
1512
|
+
"signature": "(method) ComponentConfigMerger.merge(): ConfigMergeResult",
|
|
1513
|
+
"name": "merge",
|
|
1514
|
+
"params": [],
|
|
1515
|
+
"returnType": {
|
|
1516
|
+
"__schema": "TypeRefSchema",
|
|
1517
|
+
"location": {
|
|
1518
|
+
"filePath": "component-config-merger.ts",
|
|
1519
|
+
"line": 89,
|
|
1520
|
+
"character": 3
|
|
1521
|
+
},
|
|
1522
|
+
"name": "ConfigMergeResult"
|
|
1523
|
+
},
|
|
1524
|
+
"modifiers": []
|
|
1525
|
+
}
|
|
1526
|
+
],
|
|
1527
|
+
"extendsNodes": [],
|
|
1528
|
+
"implementNodes": []
|
|
122
1529
|
}
|
|
123
1530
|
},
|
|
124
1531
|
{
|
|
@@ -140,23 +1547,2365 @@
|
|
|
140
1547
|
},
|
|
141
1548
|
"name": "ConfigMergerAspect",
|
|
142
1549
|
"exportNode": {
|
|
143
|
-
"__schema": "
|
|
1550
|
+
"__schema": "VariableLikeSchema",
|
|
144
1551
|
"location": {
|
|
145
|
-
"filePath": "
|
|
146
|
-
"line":
|
|
147
|
-
"character":
|
|
1552
|
+
"filePath": "config-merger.aspect.ts",
|
|
1553
|
+
"line": 3,
|
|
1554
|
+
"character": 14
|
|
148
1555
|
},
|
|
149
|
-
"
|
|
1556
|
+
"signature": "const ConfigMergerAspect: Aspect",
|
|
1557
|
+
"name": "ConfigMergerAspect",
|
|
1558
|
+
"type": {
|
|
1559
|
+
"__schema": "TypeRefSchema",
|
|
1560
|
+
"location": {
|
|
1561
|
+
"filePath": "config-merger.aspect.ts",
|
|
1562
|
+
"line": 3,
|
|
1563
|
+
"character": 14
|
|
1564
|
+
},
|
|
1565
|
+
"name": "Aspect",
|
|
1566
|
+
"componentId": {
|
|
1567
|
+
"scope": "teambit.harmony",
|
|
1568
|
+
"name": "harmony",
|
|
1569
|
+
"version": "0.4.6"
|
|
1570
|
+
}
|
|
1571
|
+
},
|
|
1572
|
+
"isOptional": false,
|
|
1573
|
+
"defaultValue": "Aspect.create({\n id: 'teambit.workspace/config-merger',\n})"
|
|
150
1574
|
}
|
|
151
1575
|
}
|
|
152
1576
|
],
|
|
153
1577
|
"internals": []
|
|
154
1578
|
},
|
|
155
|
-
"internals": [
|
|
1579
|
+
"internals": [
|
|
1580
|
+
{
|
|
1581
|
+
"__schema": "ModuleSchema",
|
|
1582
|
+
"location": {
|
|
1583
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1584
|
+
"line": 1,
|
|
1585
|
+
"character": 1
|
|
1586
|
+
},
|
|
1587
|
+
"exports": [
|
|
1588
|
+
{
|
|
1589
|
+
"__schema": "TypeSchema",
|
|
1590
|
+
"location": {
|
|
1591
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1592
|
+
"line": 28,
|
|
1593
|
+
"character": 1
|
|
1594
|
+
},
|
|
1595
|
+
"signature": "type WorkspaceDepsUpdates = {\n [pkgName: string]: [string, string];\n}",
|
|
1596
|
+
"name": "WorkspaceDepsUpdates",
|
|
1597
|
+
"type": {
|
|
1598
|
+
"__schema": "TypeLiteralSchema",
|
|
1599
|
+
"location": {
|
|
1600
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1601
|
+
"line": 28,
|
|
1602
|
+
"character": 36
|
|
1603
|
+
},
|
|
1604
|
+
"members": [
|
|
1605
|
+
{
|
|
1606
|
+
"__schema": "IndexSignatureSchema",
|
|
1607
|
+
"location": {
|
|
1608
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1609
|
+
"line": 28,
|
|
1610
|
+
"character": 38
|
|
1611
|
+
},
|
|
1612
|
+
"keyType": {
|
|
1613
|
+
"__schema": "ParameterSchema",
|
|
1614
|
+
"location": {
|
|
1615
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1616
|
+
"line": 28,
|
|
1617
|
+
"character": 39
|
|
1618
|
+
},
|
|
1619
|
+
"name": "pkgName",
|
|
1620
|
+
"type": {
|
|
1621
|
+
"__schema": "KeywordTypeSchema",
|
|
1622
|
+
"location": {
|
|
1623
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1624
|
+
"line": 28,
|
|
1625
|
+
"character": 48
|
|
1626
|
+
},
|
|
1627
|
+
"name": "string"
|
|
1628
|
+
},
|
|
1629
|
+
"isOptional": false,
|
|
1630
|
+
"isSpread": false
|
|
1631
|
+
},
|
|
1632
|
+
"valueType": {
|
|
1633
|
+
"__schema": "TupleTypeSchema",
|
|
1634
|
+
"location": {
|
|
1635
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1636
|
+
"line": 28,
|
|
1637
|
+
"character": 57
|
|
1638
|
+
},
|
|
1639
|
+
"elements": [
|
|
1640
|
+
{
|
|
1641
|
+
"__schema": "KeywordTypeSchema",
|
|
1642
|
+
"location": {
|
|
1643
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1644
|
+
"line": 28,
|
|
1645
|
+
"character": 58
|
|
1646
|
+
},
|
|
1647
|
+
"name": "string"
|
|
1648
|
+
},
|
|
1649
|
+
{
|
|
1650
|
+
"__schema": "KeywordTypeSchema",
|
|
1651
|
+
"location": {
|
|
1652
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1653
|
+
"line": 28,
|
|
1654
|
+
"character": 66
|
|
1655
|
+
},
|
|
1656
|
+
"name": "string"
|
|
1657
|
+
}
|
|
1658
|
+
]
|
|
1659
|
+
}
|
|
1660
|
+
}
|
|
1661
|
+
]
|
|
1662
|
+
}
|
|
1663
|
+
},
|
|
1664
|
+
{
|
|
1665
|
+
"__schema": "TypeSchema",
|
|
1666
|
+
"location": {
|
|
1667
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1668
|
+
"line": 29,
|
|
1669
|
+
"character": 1
|
|
1670
|
+
},
|
|
1671
|
+
"signature": "type WorkspaceDepsConflicts = {\n dependencies: {\n name: string;\n version: string;\n }[];\n peerDependencies: {\n name: string;\n version: string;\n }[];\n}",
|
|
1672
|
+
"name": "WorkspaceDepsConflicts",
|
|
1673
|
+
"type": {
|
|
1674
|
+
"__schema": "TypeRefSchema",
|
|
1675
|
+
"location": {
|
|
1676
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1677
|
+
"line": 29,
|
|
1678
|
+
"character": 38
|
|
1679
|
+
},
|
|
1680
|
+
"name": "Record",
|
|
1681
|
+
"typeArgs": [
|
|
1682
|
+
{
|
|
1683
|
+
"__schema": "TypeRefSchema",
|
|
1684
|
+
"location": {
|
|
1685
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1686
|
+
"line": 29,
|
|
1687
|
+
"character": 45
|
|
1688
|
+
},
|
|
1689
|
+
"name": "WorkspacePolicyConfigKeysNames",
|
|
1690
|
+
"componentId": {
|
|
1691
|
+
"scope": "teambit.dependencies",
|
|
1692
|
+
"name": "dependency-resolver"
|
|
1693
|
+
}
|
|
1694
|
+
},
|
|
1695
|
+
{
|
|
1696
|
+
"__schema": "TypeRefSchema",
|
|
1697
|
+
"location": {
|
|
1698
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1699
|
+
"line": 29,
|
|
1700
|
+
"character": 77
|
|
1701
|
+
},
|
|
1702
|
+
"name": "Array",
|
|
1703
|
+
"typeArgs": [
|
|
1704
|
+
{
|
|
1705
|
+
"__schema": "TypeLiteralSchema",
|
|
1706
|
+
"location": {
|
|
1707
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1708
|
+
"line": 29,
|
|
1709
|
+
"character": 83
|
|
1710
|
+
},
|
|
1711
|
+
"members": [
|
|
1712
|
+
{
|
|
1713
|
+
"__schema": "VariableLikeSchema",
|
|
1714
|
+
"location": {
|
|
1715
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1716
|
+
"line": 29,
|
|
1717
|
+
"character": 85
|
|
1718
|
+
},
|
|
1719
|
+
"signature": "(property) name: string",
|
|
1720
|
+
"name": "name",
|
|
1721
|
+
"type": {
|
|
1722
|
+
"__schema": "KeywordTypeSchema",
|
|
1723
|
+
"location": {
|
|
1724
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1725
|
+
"line": 29,
|
|
1726
|
+
"character": 91
|
|
1727
|
+
},
|
|
1728
|
+
"name": "string"
|
|
1729
|
+
},
|
|
1730
|
+
"isOptional": false
|
|
1731
|
+
},
|
|
1732
|
+
{
|
|
1733
|
+
"__schema": "VariableLikeSchema",
|
|
1734
|
+
"location": {
|
|
1735
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1736
|
+
"line": 29,
|
|
1737
|
+
"character": 99
|
|
1738
|
+
},
|
|
1739
|
+
"signature": "(property) version: string",
|
|
1740
|
+
"name": "version",
|
|
1741
|
+
"type": {
|
|
1742
|
+
"__schema": "KeywordTypeSchema",
|
|
1743
|
+
"location": {
|
|
1744
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1745
|
+
"line": 29,
|
|
1746
|
+
"character": 108
|
|
1747
|
+
},
|
|
1748
|
+
"name": "string"
|
|
1749
|
+
},
|
|
1750
|
+
"isOptional": false
|
|
1751
|
+
}
|
|
1752
|
+
]
|
|
1753
|
+
}
|
|
1754
|
+
]
|
|
1755
|
+
}
|
|
1756
|
+
]
|
|
1757
|
+
}
|
|
1758
|
+
},
|
|
1759
|
+
{
|
|
1760
|
+
"__schema": "TypeSchema",
|
|
1761
|
+
"location": {
|
|
1762
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1763
|
+
"line": 31,
|
|
1764
|
+
"character": 1
|
|
1765
|
+
},
|
|
1766
|
+
"signature": "type WorkspaceConfigUpdateResult = {\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceConfigConflictWriteError?: Error | undefined;\n logs?: string[] | undefined;\n}",
|
|
1767
|
+
"name": "WorkspaceConfigUpdateResult",
|
|
1768
|
+
"type": {
|
|
1769
|
+
"__schema": "TypeLiteralSchema",
|
|
1770
|
+
"location": {
|
|
1771
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1772
|
+
"line": 31,
|
|
1773
|
+
"character": 43
|
|
1774
|
+
},
|
|
1775
|
+
"members": [
|
|
1776
|
+
{
|
|
1777
|
+
"__schema": "VariableLikeSchema",
|
|
1778
|
+
"location": {
|
|
1779
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1780
|
+
"line": 32,
|
|
1781
|
+
"character": 3
|
|
1782
|
+
},
|
|
1783
|
+
"signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
|
|
1784
|
+
"name": "workspaceDepsUpdates",
|
|
1785
|
+
"type": {
|
|
1786
|
+
"__schema": "TypeRefSchema",
|
|
1787
|
+
"location": {
|
|
1788
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1789
|
+
"line": 32,
|
|
1790
|
+
"character": 26
|
|
1791
|
+
},
|
|
1792
|
+
"name": "WorkspaceDepsUpdates"
|
|
1793
|
+
},
|
|
1794
|
+
"isOptional": true
|
|
1795
|
+
},
|
|
1796
|
+
{
|
|
1797
|
+
"__schema": "VariableLikeSchema",
|
|
1798
|
+
"location": {
|
|
1799
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1800
|
+
"line": 33,
|
|
1801
|
+
"character": 3
|
|
1802
|
+
},
|
|
1803
|
+
"signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
|
|
1804
|
+
"name": "workspaceDepsConflicts",
|
|
1805
|
+
"type": {
|
|
1806
|
+
"__schema": "TypeRefSchema",
|
|
1807
|
+
"location": {
|
|
1808
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1809
|
+
"line": 33,
|
|
1810
|
+
"character": 28
|
|
1811
|
+
},
|
|
1812
|
+
"name": "WorkspaceDepsConflicts"
|
|
1813
|
+
},
|
|
1814
|
+
"isOptional": true
|
|
1815
|
+
},
|
|
1816
|
+
{
|
|
1817
|
+
"__schema": "VariableLikeSchema",
|
|
1818
|
+
"location": {
|
|
1819
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1820
|
+
"line": 34,
|
|
1821
|
+
"character": 3
|
|
1822
|
+
},
|
|
1823
|
+
"signature": "(property) workspaceConfigConflictWriteError?: Error | undefined",
|
|
1824
|
+
"name": "workspaceConfigConflictWriteError",
|
|
1825
|
+
"type": {
|
|
1826
|
+
"__schema": "TypeRefSchema",
|
|
1827
|
+
"location": {
|
|
1828
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1829
|
+
"line": 34,
|
|
1830
|
+
"character": 39
|
|
1831
|
+
},
|
|
1832
|
+
"name": "Error"
|
|
1833
|
+
},
|
|
1834
|
+
"isOptional": true
|
|
1835
|
+
},
|
|
1836
|
+
{
|
|
1837
|
+
"__schema": "VariableLikeSchema",
|
|
1838
|
+
"location": {
|
|
1839
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1840
|
+
"line": 35,
|
|
1841
|
+
"character": 3
|
|
1842
|
+
},
|
|
1843
|
+
"signature": "(property) logs?: string[] | undefined",
|
|
1844
|
+
"name": "logs",
|
|
1845
|
+
"type": {
|
|
1846
|
+
"__schema": "TypeArraySchema",
|
|
1847
|
+
"location": {
|
|
1848
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1849
|
+
"line": 35,
|
|
1850
|
+
"character": 10
|
|
1851
|
+
},
|
|
1852
|
+
"type": {
|
|
1853
|
+
"__schema": "KeywordTypeSchema",
|
|
1854
|
+
"location": {
|
|
1855
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1856
|
+
"line": 35,
|
|
1857
|
+
"character": 10
|
|
1858
|
+
},
|
|
1859
|
+
"name": "string"
|
|
1860
|
+
}
|
|
1861
|
+
},
|
|
1862
|
+
"isOptional": true
|
|
1863
|
+
}
|
|
1864
|
+
]
|
|
1865
|
+
}
|
|
1866
|
+
},
|
|
1867
|
+
{
|
|
1868
|
+
"__schema": "ClassSchema",
|
|
1869
|
+
"location": {
|
|
1870
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1871
|
+
"line": 37,
|
|
1872
|
+
"character": 1
|
|
1873
|
+
},
|
|
1874
|
+
"signature": "class ConfigMergerMain",
|
|
1875
|
+
"name": "ConfigMergerMain",
|
|
1876
|
+
"members": [
|
|
1877
|
+
{
|
|
1878
|
+
"__schema": "ConstructorSchema",
|
|
1879
|
+
"location": {
|
|
1880
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1881
|
+
"line": 38,
|
|
1882
|
+
"character": 3
|
|
1883
|
+
},
|
|
1884
|
+
"signature": "constructor ConfigMergerMain(workspace: Workspace, logger: Logger, config: ConfigMain, depsResolver: DependencyResolverMain): ConfigMergerMain",
|
|
1885
|
+
"name": "constructor",
|
|
1886
|
+
"params": [
|
|
1887
|
+
{
|
|
1888
|
+
"__schema": "ParameterSchema",
|
|
1889
|
+
"location": {
|
|
1890
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1891
|
+
"line": 39,
|
|
1892
|
+
"character": 5
|
|
1893
|
+
},
|
|
1894
|
+
"name": "workspace",
|
|
1895
|
+
"type": {
|
|
1896
|
+
"__schema": "TypeRefSchema",
|
|
1897
|
+
"location": {
|
|
1898
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1899
|
+
"line": 39,
|
|
1900
|
+
"character": 24
|
|
1901
|
+
},
|
|
1902
|
+
"name": "Workspace",
|
|
1903
|
+
"componentId": {
|
|
1904
|
+
"scope": "teambit.workspace",
|
|
1905
|
+
"name": "workspace"
|
|
1906
|
+
}
|
|
1907
|
+
},
|
|
1908
|
+
"isOptional": false,
|
|
1909
|
+
"isSpread": false
|
|
1910
|
+
},
|
|
1911
|
+
{
|
|
1912
|
+
"__schema": "ParameterSchema",
|
|
1913
|
+
"location": {
|
|
1914
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1915
|
+
"line": 40,
|
|
1916
|
+
"character": 5
|
|
1917
|
+
},
|
|
1918
|
+
"name": "logger",
|
|
1919
|
+
"type": {
|
|
1920
|
+
"__schema": "TypeRefSchema",
|
|
1921
|
+
"location": {
|
|
1922
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1923
|
+
"line": 40,
|
|
1924
|
+
"character": 21
|
|
1925
|
+
},
|
|
1926
|
+
"name": "Logger",
|
|
1927
|
+
"componentId": {
|
|
1928
|
+
"scope": "teambit.harmony",
|
|
1929
|
+
"name": "logger"
|
|
1930
|
+
}
|
|
1931
|
+
},
|
|
1932
|
+
"isOptional": false,
|
|
1933
|
+
"isSpread": false
|
|
1934
|
+
},
|
|
1935
|
+
{
|
|
1936
|
+
"__schema": "ParameterSchema",
|
|
1937
|
+
"location": {
|
|
1938
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1939
|
+
"line": 41,
|
|
1940
|
+
"character": 5
|
|
1941
|
+
},
|
|
1942
|
+
"name": "config",
|
|
1943
|
+
"type": {
|
|
1944
|
+
"__schema": "TypeRefSchema",
|
|
1945
|
+
"location": {
|
|
1946
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1947
|
+
"line": 41,
|
|
1948
|
+
"character": 21
|
|
1949
|
+
},
|
|
1950
|
+
"name": "ConfigMain",
|
|
1951
|
+
"componentId": {
|
|
1952
|
+
"scope": "teambit.harmony",
|
|
1953
|
+
"name": "config"
|
|
1954
|
+
}
|
|
1955
|
+
},
|
|
1956
|
+
"isOptional": false,
|
|
1957
|
+
"isSpread": false
|
|
1958
|
+
},
|
|
1959
|
+
{
|
|
1960
|
+
"__schema": "ParameterSchema",
|
|
1961
|
+
"location": {
|
|
1962
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1963
|
+
"line": 42,
|
|
1964
|
+
"character": 5
|
|
1965
|
+
},
|
|
1966
|
+
"name": "depsResolver",
|
|
1967
|
+
"type": {
|
|
1968
|
+
"__schema": "TypeRefSchema",
|
|
1969
|
+
"location": {
|
|
1970
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1971
|
+
"line": 42,
|
|
1972
|
+
"character": 27
|
|
1973
|
+
},
|
|
1974
|
+
"name": "DependencyResolverMain",
|
|
1975
|
+
"componentId": {
|
|
1976
|
+
"scope": "teambit.dependencies",
|
|
1977
|
+
"name": "dependency-resolver"
|
|
1978
|
+
}
|
|
1979
|
+
},
|
|
1980
|
+
"isOptional": false,
|
|
1981
|
+
"isSpread": false
|
|
1982
|
+
}
|
|
1983
|
+
],
|
|
1984
|
+
"returnType": {
|
|
1985
|
+
"__schema": "ThisTypeSchema",
|
|
1986
|
+
"location": {
|
|
1987
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1988
|
+
"line": 37,
|
|
1989
|
+
"character": 1
|
|
1990
|
+
},
|
|
1991
|
+
"name": "ConfigMergerMain"
|
|
1992
|
+
},
|
|
1993
|
+
"modifiers": []
|
|
1994
|
+
},
|
|
1995
|
+
{
|
|
1996
|
+
"__schema": "FunctionLikeSchema",
|
|
1997
|
+
"location": {
|
|
1998
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
1999
|
+
"line": 45,
|
|
2000
|
+
"character": 3
|
|
2001
|
+
},
|
|
2002
|
+
"signature": "(method) ConfigMergerMain.generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]): Promise<void>",
|
|
2003
|
+
"name": "generateConfigMergeConflictFileForAll",
|
|
2004
|
+
"params": [
|
|
2005
|
+
{
|
|
2006
|
+
"__schema": "ParameterSchema",
|
|
2007
|
+
"location": {
|
|
2008
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2009
|
+
"line": 45,
|
|
2010
|
+
"character": 47
|
|
2011
|
+
},
|
|
2012
|
+
"name": "allConfigMerge",
|
|
2013
|
+
"type": {
|
|
2014
|
+
"__schema": "TypeArraySchema",
|
|
2015
|
+
"location": {
|
|
2016
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2017
|
+
"line": 45,
|
|
2018
|
+
"character": 63
|
|
2019
|
+
},
|
|
2020
|
+
"type": {
|
|
2021
|
+
"__schema": "TypeRefSchema",
|
|
2022
|
+
"location": {
|
|
2023
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2024
|
+
"line": 45,
|
|
2025
|
+
"character": 63
|
|
2026
|
+
},
|
|
2027
|
+
"name": "ConfigMergeResult"
|
|
2028
|
+
}
|
|
2029
|
+
},
|
|
2030
|
+
"isOptional": false,
|
|
2031
|
+
"isSpread": false
|
|
2032
|
+
}
|
|
2033
|
+
],
|
|
2034
|
+
"returnType": {
|
|
2035
|
+
"__schema": "InferenceTypeSchema",
|
|
2036
|
+
"location": {
|
|
2037
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2038
|
+
"line": 45,
|
|
2039
|
+
"character": 3
|
|
2040
|
+
},
|
|
2041
|
+
"type": "Promise<void>"
|
|
2042
|
+
},
|
|
2043
|
+
"modifiers": [
|
|
2044
|
+
"async"
|
|
2045
|
+
]
|
|
2046
|
+
},
|
|
2047
|
+
{
|
|
2048
|
+
"__schema": "FunctionLikeSchema",
|
|
2049
|
+
"location": {
|
|
2050
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2051
|
+
"line": 57,
|
|
2052
|
+
"character": 3
|
|
2053
|
+
},
|
|
2054
|
+
"signature": "(method) ConfigMergerMain.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts: WorkspaceDepsConflicts): Promise<Error | undefined>",
|
|
2055
|
+
"name": "writeWorkspaceJsoncWithConflictsGracefully",
|
|
2056
|
+
"params": [
|
|
2057
|
+
{
|
|
2058
|
+
"__schema": "ParameterSchema",
|
|
2059
|
+
"location": {
|
|
2060
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2061
|
+
"line": 58,
|
|
2062
|
+
"character": 5
|
|
2063
|
+
},
|
|
2064
|
+
"name": "workspaceDepsConflicts",
|
|
2065
|
+
"type": {
|
|
2066
|
+
"__schema": "TypeRefSchema",
|
|
2067
|
+
"location": {
|
|
2068
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2069
|
+
"line": 58,
|
|
2070
|
+
"character": 29
|
|
2071
|
+
},
|
|
2072
|
+
"name": "WorkspaceDepsConflicts"
|
|
2073
|
+
},
|
|
2074
|
+
"isOptional": false,
|
|
2075
|
+
"isSpread": false
|
|
2076
|
+
}
|
|
2077
|
+
],
|
|
2078
|
+
"returnType": {
|
|
2079
|
+
"__schema": "TypeRefSchema",
|
|
2080
|
+
"location": {
|
|
2081
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2082
|
+
"line": 59,
|
|
2083
|
+
"character": 6
|
|
2084
|
+
},
|
|
2085
|
+
"name": "Promise",
|
|
2086
|
+
"typeArgs": [
|
|
2087
|
+
{
|
|
2088
|
+
"__schema": "TypeUnionSchema",
|
|
2089
|
+
"location": {
|
|
2090
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2091
|
+
"line": 59,
|
|
2092
|
+
"character": 14
|
|
2093
|
+
},
|
|
2094
|
+
"types": [
|
|
2095
|
+
{
|
|
2096
|
+
"__schema": "TypeRefSchema",
|
|
2097
|
+
"location": {
|
|
2098
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2099
|
+
"line": 59,
|
|
2100
|
+
"character": 14
|
|
2101
|
+
},
|
|
2102
|
+
"name": "Error"
|
|
2103
|
+
},
|
|
2104
|
+
{
|
|
2105
|
+
"__schema": "KeywordTypeSchema",
|
|
2106
|
+
"location": {
|
|
2107
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2108
|
+
"line": 59,
|
|
2109
|
+
"character": 22
|
|
2110
|
+
},
|
|
2111
|
+
"name": "undefined"
|
|
2112
|
+
}
|
|
2113
|
+
]
|
|
2114
|
+
}
|
|
2115
|
+
]
|
|
2116
|
+
},
|
|
2117
|
+
"modifiers": [
|
|
2118
|
+
"async"
|
|
2119
|
+
]
|
|
2120
|
+
},
|
|
2121
|
+
{
|
|
2122
|
+
"__schema": "FunctionLikeSchema",
|
|
2123
|
+
"location": {
|
|
2124
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2125
|
+
"line": 127,
|
|
2126
|
+
"character": 3
|
|
2127
|
+
},
|
|
2128
|
+
"signature": "(method) ConfigMergerMain.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge: ConfigMergeResult[]): Promise<{\n workspaceDepsUpdates?: WorkspaceDepsUpdates;\n workspaceDepsConflicts?: WorkspaceDepsConflicts;\n}>",
|
|
2129
|
+
"name": "updateWorkspaceJsoncWithDepsIfNeeded",
|
|
2130
|
+
"params": [
|
|
2131
|
+
{
|
|
2132
|
+
"__schema": "ParameterSchema",
|
|
2133
|
+
"location": {
|
|
2134
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2135
|
+
"line": 128,
|
|
2136
|
+
"character": 5
|
|
2137
|
+
},
|
|
2138
|
+
"name": "allConfigMerge",
|
|
2139
|
+
"type": {
|
|
2140
|
+
"__schema": "TypeArraySchema",
|
|
2141
|
+
"location": {
|
|
2142
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2143
|
+
"line": 128,
|
|
2144
|
+
"character": 21
|
|
2145
|
+
},
|
|
2146
|
+
"type": {
|
|
2147
|
+
"__schema": "TypeRefSchema",
|
|
2148
|
+
"location": {
|
|
2149
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2150
|
+
"line": 128,
|
|
2151
|
+
"character": 21
|
|
2152
|
+
},
|
|
2153
|
+
"name": "ConfigMergeResult"
|
|
2154
|
+
}
|
|
2155
|
+
},
|
|
2156
|
+
"isOptional": false,
|
|
2157
|
+
"isSpread": false
|
|
2158
|
+
}
|
|
2159
|
+
],
|
|
2160
|
+
"returnType": {
|
|
2161
|
+
"__schema": "TypeRefSchema",
|
|
2162
|
+
"location": {
|
|
2163
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2164
|
+
"line": 129,
|
|
2165
|
+
"character": 6
|
|
2166
|
+
},
|
|
2167
|
+
"name": "Promise",
|
|
2168
|
+
"typeArgs": [
|
|
2169
|
+
{
|
|
2170
|
+
"__schema": "TypeLiteralSchema",
|
|
2171
|
+
"location": {
|
|
2172
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2173
|
+
"line": 129,
|
|
2174
|
+
"character": 14
|
|
2175
|
+
},
|
|
2176
|
+
"members": [
|
|
2177
|
+
{
|
|
2178
|
+
"__schema": "VariableLikeSchema",
|
|
2179
|
+
"location": {
|
|
2180
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2181
|
+
"line": 129,
|
|
2182
|
+
"character": 16
|
|
2183
|
+
},
|
|
2184
|
+
"signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
|
|
2185
|
+
"name": "workspaceDepsUpdates",
|
|
2186
|
+
"type": {
|
|
2187
|
+
"__schema": "TypeRefSchema",
|
|
2188
|
+
"location": {
|
|
2189
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2190
|
+
"line": 129,
|
|
2191
|
+
"character": 39
|
|
2192
|
+
},
|
|
2193
|
+
"name": "WorkspaceDepsUpdates"
|
|
2194
|
+
},
|
|
2195
|
+
"isOptional": true
|
|
2196
|
+
},
|
|
2197
|
+
{
|
|
2198
|
+
"__schema": "VariableLikeSchema",
|
|
2199
|
+
"location": {
|
|
2200
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2201
|
+
"line": 129,
|
|
2202
|
+
"character": 61
|
|
2203
|
+
},
|
|
2204
|
+
"signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
|
|
2205
|
+
"name": "workspaceDepsConflicts",
|
|
2206
|
+
"type": {
|
|
2207
|
+
"__schema": "TypeRefSchema",
|
|
2208
|
+
"location": {
|
|
2209
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2210
|
+
"line": 129,
|
|
2211
|
+
"character": 86
|
|
2212
|
+
},
|
|
2213
|
+
"name": "WorkspaceDepsConflicts"
|
|
2214
|
+
},
|
|
2215
|
+
"isOptional": true
|
|
2216
|
+
}
|
|
2217
|
+
]
|
|
2218
|
+
}
|
|
2219
|
+
]
|
|
2220
|
+
},
|
|
2221
|
+
"modifiers": [
|
|
2222
|
+
"async"
|
|
2223
|
+
]
|
|
2224
|
+
},
|
|
2225
|
+
{
|
|
2226
|
+
"__schema": "FunctionLikeSchema",
|
|
2227
|
+
"location": {
|
|
2228
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2229
|
+
"line": 276,
|
|
2230
|
+
"character": 3
|
|
2231
|
+
},
|
|
2232
|
+
"signature": "(method) ConfigMergerMain.updateDepsInWorkspaceConfig(components: ConsumerComponent[]): Promise<WorkspaceConfigUpdateResult | undefined>",
|
|
2233
|
+
"name": "updateDepsInWorkspaceConfig",
|
|
2234
|
+
"params": [
|
|
2235
|
+
{
|
|
2236
|
+
"__schema": "ParameterSchema",
|
|
2237
|
+
"location": {
|
|
2238
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2239
|
+
"line": 276,
|
|
2240
|
+
"character": 37
|
|
2241
|
+
},
|
|
2242
|
+
"name": "components",
|
|
2243
|
+
"type": {
|
|
2244
|
+
"__schema": "TypeArraySchema",
|
|
2245
|
+
"location": {
|
|
2246
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2247
|
+
"line": 276,
|
|
2248
|
+
"character": 49
|
|
2249
|
+
},
|
|
2250
|
+
"type": {
|
|
2251
|
+
"__schema": "TypeRefSchema",
|
|
2252
|
+
"location": {
|
|
2253
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2254
|
+
"line": 276,
|
|
2255
|
+
"character": 49
|
|
2256
|
+
},
|
|
2257
|
+
"name": "ConsumerComponent",
|
|
2258
|
+
"packageName": "@teambit/legacy/dist/consumer/component"
|
|
2259
|
+
}
|
|
2260
|
+
},
|
|
2261
|
+
"isOptional": false,
|
|
2262
|
+
"isSpread": false
|
|
2263
|
+
}
|
|
2264
|
+
],
|
|
2265
|
+
"returnType": {
|
|
2266
|
+
"__schema": "TypeRefSchema",
|
|
2267
|
+
"location": {
|
|
2268
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2269
|
+
"line": 276,
|
|
2270
|
+
"character": 71
|
|
2271
|
+
},
|
|
2272
|
+
"name": "Promise",
|
|
2273
|
+
"typeArgs": [
|
|
2274
|
+
{
|
|
2275
|
+
"__schema": "TypeUnionSchema",
|
|
2276
|
+
"location": {
|
|
2277
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2278
|
+
"line": 276,
|
|
2279
|
+
"character": 79
|
|
2280
|
+
},
|
|
2281
|
+
"types": [
|
|
2282
|
+
{
|
|
2283
|
+
"__schema": "TypeRefSchema",
|
|
2284
|
+
"location": {
|
|
2285
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2286
|
+
"line": 276,
|
|
2287
|
+
"character": 79
|
|
2288
|
+
},
|
|
2289
|
+
"name": "WorkspaceConfigUpdateResult"
|
|
2290
|
+
},
|
|
2291
|
+
{
|
|
2292
|
+
"__schema": "KeywordTypeSchema",
|
|
2293
|
+
"location": {
|
|
2294
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2295
|
+
"line": 276,
|
|
2296
|
+
"character": 109
|
|
2297
|
+
},
|
|
2298
|
+
"name": "undefined"
|
|
2299
|
+
}
|
|
2300
|
+
]
|
|
2301
|
+
}
|
|
2302
|
+
]
|
|
2303
|
+
},
|
|
2304
|
+
"modifiers": [
|
|
2305
|
+
"async"
|
|
2306
|
+
]
|
|
2307
|
+
},
|
|
2308
|
+
{
|
|
2309
|
+
"__schema": "VariableLikeSchema",
|
|
2310
|
+
"location": {
|
|
2311
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2312
|
+
"line": 490,
|
|
2313
|
+
"character": 3
|
|
2314
|
+
},
|
|
2315
|
+
"signature": "(property) ConfigMergerMain.slots: never[]",
|
|
2316
|
+
"name": "slots",
|
|
2317
|
+
"type": {
|
|
2318
|
+
"__schema": "InferenceTypeSchema",
|
|
2319
|
+
"location": {
|
|
2320
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2321
|
+
"line": 490,
|
|
2322
|
+
"character": 3
|
|
2323
|
+
},
|
|
2324
|
+
"type": "never[]"
|
|
2325
|
+
},
|
|
2326
|
+
"isOptional": true,
|
|
2327
|
+
"defaultValue": "[]"
|
|
2328
|
+
},
|
|
2329
|
+
{
|
|
2330
|
+
"__schema": "VariableLikeSchema",
|
|
2331
|
+
"location": {
|
|
2332
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2333
|
+
"line": 491,
|
|
2334
|
+
"character": 3
|
|
2335
|
+
},
|
|
2336
|
+
"signature": "(property) ConfigMergerMain.dependencies: Aspect[]",
|
|
2337
|
+
"name": "dependencies",
|
|
2338
|
+
"type": {
|
|
2339
|
+
"__schema": "InferenceTypeSchema",
|
|
2340
|
+
"location": {
|
|
2341
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2342
|
+
"line": 491,
|
|
2343
|
+
"character": 3
|
|
2344
|
+
},
|
|
2345
|
+
"type": "Aspect[]"
|
|
2346
|
+
},
|
|
2347
|
+
"isOptional": true,
|
|
2348
|
+
"defaultValue": "[WorkspaceAspect, ConfigAspect, LoggerAspect, DependencyResolverAspect]"
|
|
2349
|
+
},
|
|
2350
|
+
{
|
|
2351
|
+
"__schema": "VariableLikeSchema",
|
|
2352
|
+
"location": {
|
|
2353
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2354
|
+
"line": 492,
|
|
2355
|
+
"character": 3
|
|
2356
|
+
},
|
|
2357
|
+
"signature": "(property) ConfigMergerMain.runtime: RuntimeDefinition",
|
|
2358
|
+
"name": "runtime",
|
|
2359
|
+
"type": {
|
|
2360
|
+
"__schema": "InferenceTypeSchema",
|
|
2361
|
+
"location": {
|
|
2362
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2363
|
+
"line": 492,
|
|
2364
|
+
"character": 3
|
|
2365
|
+
},
|
|
2366
|
+
"type": "RuntimeDefinition"
|
|
2367
|
+
},
|
|
2368
|
+
"isOptional": true,
|
|
2369
|
+
"defaultValue": "MainRuntime"
|
|
2370
|
+
},
|
|
2371
|
+
{
|
|
2372
|
+
"__schema": "FunctionLikeSchema",
|
|
2373
|
+
"location": {
|
|
2374
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2375
|
+
"line": 493,
|
|
2376
|
+
"character": 3
|
|
2377
|
+
},
|
|
2378
|
+
"signature": "(method) ConfigMergerMain.provider([workspace, config, loggerMain, depsResolver]: [\n Workspace,\n ConfigMain,\n LoggerMain,\n DependencyResolverMain\n]): Promise<ConfigMergerMain>",
|
|
2379
|
+
"name": "provider",
|
|
2380
|
+
"params": [
|
|
2381
|
+
{
|
|
2382
|
+
"__schema": "ParameterSchema",
|
|
2383
|
+
"location": {
|
|
2384
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2385
|
+
"line": 493,
|
|
2386
|
+
"character": 25
|
|
2387
|
+
},
|
|
2388
|
+
"name": "[ workspace, config, loggerMain, depsResolver ]",
|
|
2389
|
+
"type": {
|
|
2390
|
+
"__schema": "TupleTypeSchema",
|
|
2391
|
+
"location": {
|
|
2392
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2393
|
+
"line": 493,
|
|
2394
|
+
"character": 72
|
|
2395
|
+
},
|
|
2396
|
+
"elements": [
|
|
2397
|
+
{
|
|
2398
|
+
"__schema": "TypeRefSchema",
|
|
2399
|
+
"location": {
|
|
2400
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2401
|
+
"line": 494,
|
|
2402
|
+
"character": 5
|
|
2403
|
+
},
|
|
2404
|
+
"name": "Workspace",
|
|
2405
|
+
"componentId": {
|
|
2406
|
+
"scope": "teambit.workspace",
|
|
2407
|
+
"name": "workspace"
|
|
2408
|
+
}
|
|
2409
|
+
},
|
|
2410
|
+
{
|
|
2411
|
+
"__schema": "TypeRefSchema",
|
|
2412
|
+
"location": {
|
|
2413
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2414
|
+
"line": 495,
|
|
2415
|
+
"character": 5
|
|
2416
|
+
},
|
|
2417
|
+
"name": "ConfigMain",
|
|
2418
|
+
"componentId": {
|
|
2419
|
+
"scope": "teambit.harmony",
|
|
2420
|
+
"name": "config"
|
|
2421
|
+
}
|
|
2422
|
+
},
|
|
2423
|
+
{
|
|
2424
|
+
"__schema": "TypeRefSchema",
|
|
2425
|
+
"location": {
|
|
2426
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2427
|
+
"line": 496,
|
|
2428
|
+
"character": 5
|
|
2429
|
+
},
|
|
2430
|
+
"name": "LoggerMain",
|
|
2431
|
+
"componentId": {
|
|
2432
|
+
"scope": "teambit.harmony",
|
|
2433
|
+
"name": "logger"
|
|
2434
|
+
}
|
|
2435
|
+
},
|
|
2436
|
+
{
|
|
2437
|
+
"__schema": "TypeRefSchema",
|
|
2438
|
+
"location": {
|
|
2439
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2440
|
+
"line": 497,
|
|
2441
|
+
"character": 5
|
|
2442
|
+
},
|
|
2443
|
+
"name": "DependencyResolverMain",
|
|
2444
|
+
"componentId": {
|
|
2445
|
+
"scope": "teambit.dependencies",
|
|
2446
|
+
"name": "dependency-resolver"
|
|
2447
|
+
}
|
|
2448
|
+
}
|
|
2449
|
+
]
|
|
2450
|
+
},
|
|
2451
|
+
"isOptional": false,
|
|
2452
|
+
"isSpread": false
|
|
2453
|
+
}
|
|
2454
|
+
],
|
|
2455
|
+
"returnType": {
|
|
2456
|
+
"__schema": "InferenceTypeSchema",
|
|
2457
|
+
"location": {
|
|
2458
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2459
|
+
"line": 493,
|
|
2460
|
+
"character": 3
|
|
2461
|
+
},
|
|
2462
|
+
"type": "Promise<ConfigMergerMain>"
|
|
2463
|
+
},
|
|
2464
|
+
"modifiers": [
|
|
2465
|
+
"static",
|
|
2466
|
+
"async"
|
|
2467
|
+
]
|
|
2468
|
+
}
|
|
2469
|
+
],
|
|
2470
|
+
"extendsNodes": [],
|
|
2471
|
+
"implementNodes": []
|
|
2472
|
+
},
|
|
2473
|
+
{
|
|
2474
|
+
"__schema": "UnImplementedSchema",
|
|
2475
|
+
"location": {
|
|
2476
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2477
|
+
"line": 506,
|
|
2478
|
+
"character": 16
|
|
2479
|
+
},
|
|
2480
|
+
"name": "ConfigMergerMain",
|
|
2481
|
+
"type": "Identifier"
|
|
2482
|
+
}
|
|
2483
|
+
],
|
|
2484
|
+
"internals": [
|
|
2485
|
+
{
|
|
2486
|
+
"__schema": "TypeSchema",
|
|
2487
|
+
"location": {
|
|
2488
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2489
|
+
"line": 24,
|
|
2490
|
+
"character": 1
|
|
2491
|
+
},
|
|
2492
|
+
"signature": "type PkgEntry = {\n name: string;\n version: string;\n force: boolean;\n}",
|
|
2493
|
+
"name": "PkgEntry",
|
|
2494
|
+
"type": {
|
|
2495
|
+
"__schema": "TypeLiteralSchema",
|
|
2496
|
+
"location": {
|
|
2497
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2498
|
+
"line": 24,
|
|
2499
|
+
"character": 17
|
|
2500
|
+
},
|
|
2501
|
+
"members": [
|
|
2502
|
+
{
|
|
2503
|
+
"__schema": "VariableLikeSchema",
|
|
2504
|
+
"location": {
|
|
2505
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2506
|
+
"line": 24,
|
|
2507
|
+
"character": 19
|
|
2508
|
+
},
|
|
2509
|
+
"signature": "(property) name: string",
|
|
2510
|
+
"name": "name",
|
|
2511
|
+
"type": {
|
|
2512
|
+
"__schema": "KeywordTypeSchema",
|
|
2513
|
+
"location": {
|
|
2514
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2515
|
+
"line": 24,
|
|
2516
|
+
"character": 25
|
|
2517
|
+
},
|
|
2518
|
+
"name": "string"
|
|
2519
|
+
},
|
|
2520
|
+
"isOptional": false
|
|
2521
|
+
},
|
|
2522
|
+
{
|
|
2523
|
+
"__schema": "VariableLikeSchema",
|
|
2524
|
+
"location": {
|
|
2525
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2526
|
+
"line": 24,
|
|
2527
|
+
"character": 33
|
|
2528
|
+
},
|
|
2529
|
+
"signature": "(property) version: string",
|
|
2530
|
+
"name": "version",
|
|
2531
|
+
"type": {
|
|
2532
|
+
"__schema": "KeywordTypeSchema",
|
|
2533
|
+
"location": {
|
|
2534
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2535
|
+
"line": 24,
|
|
2536
|
+
"character": 42
|
|
2537
|
+
},
|
|
2538
|
+
"name": "string"
|
|
2539
|
+
},
|
|
2540
|
+
"isOptional": false
|
|
2541
|
+
},
|
|
2542
|
+
{
|
|
2543
|
+
"__schema": "VariableLikeSchema",
|
|
2544
|
+
"location": {
|
|
2545
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2546
|
+
"line": 24,
|
|
2547
|
+
"character": 50
|
|
2548
|
+
},
|
|
2549
|
+
"signature": "(property) force: boolean",
|
|
2550
|
+
"name": "force",
|
|
2551
|
+
"type": {
|
|
2552
|
+
"__schema": "KeywordTypeSchema",
|
|
2553
|
+
"location": {
|
|
2554
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2555
|
+
"line": 24,
|
|
2556
|
+
"character": 57
|
|
2557
|
+
},
|
|
2558
|
+
"name": "boolean"
|
|
2559
|
+
},
|
|
2560
|
+
"isOptional": false
|
|
2561
|
+
}
|
|
2562
|
+
]
|
|
2563
|
+
}
|
|
2564
|
+
},
|
|
2565
|
+
{
|
|
2566
|
+
"__schema": "ModuleSchema",
|
|
2567
|
+
"location": {
|
|
2568
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2569
|
+
"line": 26,
|
|
2570
|
+
"character": 1
|
|
2571
|
+
},
|
|
2572
|
+
"exports": [
|
|
2573
|
+
{
|
|
2574
|
+
"__schema": "VariableLikeSchema",
|
|
2575
|
+
"location": {
|
|
2576
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2577
|
+
"line": 26,
|
|
2578
|
+
"character": 7
|
|
2579
|
+
},
|
|
2580
|
+
"signature": "const WS_DEPS_FIELDS: string[]",
|
|
2581
|
+
"name": "WS_DEPS_FIELDS",
|
|
2582
|
+
"type": {
|
|
2583
|
+
"__schema": "InferenceTypeSchema",
|
|
2584
|
+
"location": {
|
|
2585
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2586
|
+
"line": 26,
|
|
2587
|
+
"character": 7
|
|
2588
|
+
},
|
|
2589
|
+
"type": "string[]"
|
|
2590
|
+
},
|
|
2591
|
+
"isOptional": false,
|
|
2592
|
+
"defaultValue": "['dependencies', 'peerDependencies']"
|
|
2593
|
+
}
|
|
2594
|
+
],
|
|
2595
|
+
"internals": []
|
|
2596
|
+
},
|
|
2597
|
+
{
|
|
2598
|
+
"__schema": "UnImplementedSchema",
|
|
2599
|
+
"location": {
|
|
2600
|
+
"filePath": "config-merger.main.runtime.ts",
|
|
2601
|
+
"line": 504,
|
|
2602
|
+
"character": 1
|
|
2603
|
+
},
|
|
2604
|
+
"name": "ConfigMergerAspect.addRuntime(ConfigMergerMain);",
|
|
2605
|
+
"type": "ExpressionStatement"
|
|
2606
|
+
}
|
|
2607
|
+
]
|
|
2608
|
+
},
|
|
2609
|
+
{
|
|
2610
|
+
"__schema": "ModuleSchema",
|
|
2611
|
+
"location": {
|
|
2612
|
+
"filePath": "config-merge-result.ts",
|
|
2613
|
+
"line": 1,
|
|
2614
|
+
"character": 1
|
|
2615
|
+
},
|
|
2616
|
+
"exports": [
|
|
2617
|
+
{
|
|
2618
|
+
"__schema": "ClassSchema",
|
|
2619
|
+
"location": {
|
|
2620
|
+
"filePath": "config-merge-result.ts",
|
|
2621
|
+
"line": 8,
|
|
2622
|
+
"character": 1
|
|
2623
|
+
},
|
|
2624
|
+
"signature": "class ConfigMergeResult",
|
|
2625
|
+
"name": "ConfigMergeResult",
|
|
2626
|
+
"members": [
|
|
2627
|
+
{
|
|
2628
|
+
"__schema": "ConstructorSchema",
|
|
2629
|
+
"location": {
|
|
2630
|
+
"filePath": "config-merge-result.ts",
|
|
2631
|
+
"line": 9,
|
|
2632
|
+
"character": 3
|
|
2633
|
+
},
|
|
2634
|
+
"signature": "constructor ConfigMergeResult(compIdStr: string, currentLabel: string, otherLabel: string, results: MergeStrategyResult[]): ConfigMergeResult",
|
|
2635
|
+
"name": "constructor",
|
|
2636
|
+
"params": [
|
|
2637
|
+
{
|
|
2638
|
+
"__schema": "ParameterSchema",
|
|
2639
|
+
"location": {
|
|
2640
|
+
"filePath": "config-merge-result.ts",
|
|
2641
|
+
"line": 10,
|
|
2642
|
+
"character": 5
|
|
2643
|
+
},
|
|
2644
|
+
"name": "compIdStr",
|
|
2645
|
+
"type": {
|
|
2646
|
+
"__schema": "KeywordTypeSchema",
|
|
2647
|
+
"location": {
|
|
2648
|
+
"filePath": "config-merge-result.ts",
|
|
2649
|
+
"line": 10,
|
|
2650
|
+
"character": 25
|
|
2651
|
+
},
|
|
2652
|
+
"name": "string"
|
|
2653
|
+
},
|
|
2654
|
+
"isOptional": false,
|
|
2655
|
+
"isSpread": false
|
|
2656
|
+
},
|
|
2657
|
+
{
|
|
2658
|
+
"__schema": "ParameterSchema",
|
|
2659
|
+
"location": {
|
|
2660
|
+
"filePath": "config-merge-result.ts",
|
|
2661
|
+
"line": 11,
|
|
2662
|
+
"character": 5
|
|
2663
|
+
},
|
|
2664
|
+
"name": "currentLabel",
|
|
2665
|
+
"type": {
|
|
2666
|
+
"__schema": "KeywordTypeSchema",
|
|
2667
|
+
"location": {
|
|
2668
|
+
"filePath": "config-merge-result.ts",
|
|
2669
|
+
"line": 11,
|
|
2670
|
+
"character": 27
|
|
2671
|
+
},
|
|
2672
|
+
"name": "string"
|
|
2673
|
+
},
|
|
2674
|
+
"isOptional": false,
|
|
2675
|
+
"isSpread": false
|
|
2676
|
+
},
|
|
2677
|
+
{
|
|
2678
|
+
"__schema": "ParameterSchema",
|
|
2679
|
+
"location": {
|
|
2680
|
+
"filePath": "config-merge-result.ts",
|
|
2681
|
+
"line": 12,
|
|
2682
|
+
"character": 5
|
|
2683
|
+
},
|
|
2684
|
+
"name": "otherLabel",
|
|
2685
|
+
"type": {
|
|
2686
|
+
"__schema": "KeywordTypeSchema",
|
|
2687
|
+
"location": {
|
|
2688
|
+
"filePath": "config-merge-result.ts",
|
|
2689
|
+
"line": 12,
|
|
2690
|
+
"character": 25
|
|
2691
|
+
},
|
|
2692
|
+
"name": "string"
|
|
2693
|
+
},
|
|
2694
|
+
"isOptional": false,
|
|
2695
|
+
"isSpread": false
|
|
2696
|
+
},
|
|
2697
|
+
{
|
|
2698
|
+
"__schema": "ParameterSchema",
|
|
2699
|
+
"location": {
|
|
2700
|
+
"filePath": "config-merge-result.ts",
|
|
2701
|
+
"line": 13,
|
|
2702
|
+
"character": 5
|
|
2703
|
+
},
|
|
2704
|
+
"name": "results",
|
|
2705
|
+
"type": {
|
|
2706
|
+
"__schema": "TypeArraySchema",
|
|
2707
|
+
"location": {
|
|
2708
|
+
"filePath": "config-merge-result.ts",
|
|
2709
|
+
"line": 13,
|
|
2710
|
+
"character": 22
|
|
2711
|
+
},
|
|
2712
|
+
"type": {
|
|
2713
|
+
"__schema": "TypeRefSchema",
|
|
2714
|
+
"location": {
|
|
2715
|
+
"filePath": "config-merge-result.ts",
|
|
2716
|
+
"line": 13,
|
|
2717
|
+
"character": 22
|
|
2718
|
+
},
|
|
2719
|
+
"name": "MergeStrategyResult",
|
|
2720
|
+
"internalFilePath": "component-config-merger.ts"
|
|
2721
|
+
}
|
|
2722
|
+
},
|
|
2723
|
+
"isOptional": false,
|
|
2724
|
+
"isSpread": false
|
|
2725
|
+
}
|
|
2726
|
+
],
|
|
2727
|
+
"returnType": {
|
|
2728
|
+
"__schema": "ThisTypeSchema",
|
|
2729
|
+
"location": {
|
|
2730
|
+
"filePath": "config-merge-result.ts",
|
|
2731
|
+
"line": 8,
|
|
2732
|
+
"character": 1
|
|
2733
|
+
},
|
|
2734
|
+
"name": "ConfigMergeResult"
|
|
2735
|
+
},
|
|
2736
|
+
"modifiers": []
|
|
2737
|
+
},
|
|
2738
|
+
{
|
|
2739
|
+
"__schema": "FunctionLikeSchema",
|
|
2740
|
+
"location": {
|
|
2741
|
+
"filePath": "config-merge-result.ts",
|
|
2742
|
+
"line": 15,
|
|
2743
|
+
"character": 3
|
|
2744
|
+
},
|
|
2745
|
+
"signature": "(method) ConfigMergeResult.hasConflicts(): boolean",
|
|
2746
|
+
"name": "hasConflicts",
|
|
2747
|
+
"params": [],
|
|
2748
|
+
"returnType": {
|
|
2749
|
+
"__schema": "KeywordTypeSchema",
|
|
2750
|
+
"location": {
|
|
2751
|
+
"filePath": "config-merge-result.ts",
|
|
2752
|
+
"line": 15,
|
|
2753
|
+
"character": 19
|
|
2754
|
+
},
|
|
2755
|
+
"name": "boolean"
|
|
2756
|
+
},
|
|
2757
|
+
"modifiers": []
|
|
2758
|
+
},
|
|
2759
|
+
{
|
|
2760
|
+
"__schema": "FunctionLikeSchema",
|
|
2761
|
+
"location": {
|
|
2762
|
+
"filePath": "config-merge-result.ts",
|
|
2763
|
+
"line": 18,
|
|
2764
|
+
"character": 3
|
|
2765
|
+
},
|
|
2766
|
+
"signature": "(method) ConfigMergeResult.generateMergeConflictFile(): string | null",
|
|
2767
|
+
"name": "generateMergeConflictFile",
|
|
2768
|
+
"params": [],
|
|
2769
|
+
"returnType": {
|
|
2770
|
+
"__schema": "TypeUnionSchema",
|
|
2771
|
+
"location": {
|
|
2772
|
+
"filePath": "config-merge-result.ts",
|
|
2773
|
+
"line": 18,
|
|
2774
|
+
"character": 32
|
|
2775
|
+
},
|
|
2776
|
+
"types": [
|
|
2777
|
+
{
|
|
2778
|
+
"__schema": "KeywordTypeSchema",
|
|
2779
|
+
"location": {
|
|
2780
|
+
"filePath": "config-merge-result.ts",
|
|
2781
|
+
"line": 18,
|
|
2782
|
+
"character": 32
|
|
2783
|
+
},
|
|
2784
|
+
"name": "string"
|
|
2785
|
+
},
|
|
2786
|
+
{
|
|
2787
|
+
"__schema": "LiteralTypeSchema",
|
|
2788
|
+
"location": {
|
|
2789
|
+
"filePath": "config-merge-result.ts",
|
|
2790
|
+
"line": 18,
|
|
2791
|
+
"character": 41
|
|
2792
|
+
},
|
|
2793
|
+
"name": "null"
|
|
2794
|
+
}
|
|
2795
|
+
]
|
|
2796
|
+
},
|
|
2797
|
+
"modifiers": []
|
|
2798
|
+
},
|
|
2799
|
+
{
|
|
2800
|
+
"__schema": "FunctionLikeSchema",
|
|
2801
|
+
"location": {
|
|
2802
|
+
"filePath": "config-merge-result.ts",
|
|
2803
|
+
"line": 28,
|
|
2804
|
+
"character": 3
|
|
2805
|
+
},
|
|
2806
|
+
"signature": "(method) ConfigMergeResult.getSuccessfullyMergedConfig(): Record<string, any>",
|
|
2807
|
+
"name": "getSuccessfullyMergedConfig",
|
|
2808
|
+
"params": [],
|
|
2809
|
+
"returnType": {
|
|
2810
|
+
"__schema": "TypeRefSchema",
|
|
2811
|
+
"location": {
|
|
2812
|
+
"filePath": "config-merge-result.ts",
|
|
2813
|
+
"line": 28,
|
|
2814
|
+
"character": 34
|
|
2815
|
+
},
|
|
2816
|
+
"name": "Record",
|
|
2817
|
+
"typeArgs": [
|
|
2818
|
+
{
|
|
2819
|
+
"__schema": "KeywordTypeSchema",
|
|
2820
|
+
"location": {
|
|
2821
|
+
"filePath": "config-merge-result.ts",
|
|
2822
|
+
"line": 28,
|
|
2823
|
+
"character": 41
|
|
2824
|
+
},
|
|
2825
|
+
"name": "string"
|
|
2826
|
+
},
|
|
2827
|
+
{
|
|
2828
|
+
"__schema": "KeywordTypeSchema",
|
|
2829
|
+
"location": {
|
|
2830
|
+
"filePath": "config-merge-result.ts",
|
|
2831
|
+
"line": 28,
|
|
2832
|
+
"character": 49
|
|
2833
|
+
},
|
|
2834
|
+
"name": "any"
|
|
2835
|
+
}
|
|
2836
|
+
]
|
|
2837
|
+
},
|
|
2838
|
+
"modifiers": []
|
|
2839
|
+
},
|
|
2840
|
+
{
|
|
2841
|
+
"__schema": "FunctionLikeSchema",
|
|
2842
|
+
"location": {
|
|
2843
|
+
"filePath": "config-merge-result.ts",
|
|
2844
|
+
"line": 36,
|
|
2845
|
+
"character": 3
|
|
2846
|
+
},
|
|
2847
|
+
"signature": "(method) ConfigMergeResult.getDepsResolverResult(): MergeStrategyResult | undefined",
|
|
2848
|
+
"name": "getDepsResolverResult",
|
|
2849
|
+
"params": [],
|
|
2850
|
+
"returnType": {
|
|
2851
|
+
"__schema": "TypeUnionSchema",
|
|
2852
|
+
"location": {
|
|
2853
|
+
"filePath": "config-merge-result.ts",
|
|
2854
|
+
"line": 36,
|
|
2855
|
+
"character": 28
|
|
2856
|
+
},
|
|
2857
|
+
"types": [
|
|
2858
|
+
{
|
|
2859
|
+
"__schema": "TypeRefSchema",
|
|
2860
|
+
"location": {
|
|
2861
|
+
"filePath": "config-merge-result.ts",
|
|
2862
|
+
"line": 36,
|
|
2863
|
+
"character": 28
|
|
2864
|
+
},
|
|
2865
|
+
"name": "MergeStrategyResult",
|
|
2866
|
+
"internalFilePath": "component-config-merger.ts"
|
|
2867
|
+
},
|
|
2868
|
+
{
|
|
2869
|
+
"__schema": "KeywordTypeSchema",
|
|
2870
|
+
"location": {
|
|
2871
|
+
"filePath": "config-merge-result.ts",
|
|
2872
|
+
"line": 36,
|
|
2873
|
+
"character": 50
|
|
2874
|
+
},
|
|
2875
|
+
"name": "undefined"
|
|
2876
|
+
}
|
|
2877
|
+
]
|
|
2878
|
+
},
|
|
2879
|
+
"modifiers": []
|
|
2880
|
+
}
|
|
2881
|
+
],
|
|
2882
|
+
"extendsNodes": [],
|
|
2883
|
+
"implementNodes": []
|
|
2884
|
+
},
|
|
2885
|
+
{
|
|
2886
|
+
"__schema": "FunctionLikeSchema",
|
|
2887
|
+
"location": {
|
|
2888
|
+
"filePath": "config-merge-result.ts",
|
|
2889
|
+
"line": 128,
|
|
2890
|
+
"character": 1
|
|
2891
|
+
},
|
|
2892
|
+
"signature": "function parseVersionLineWithConflict(line: string): {\n currentVal: string;\n otherVal: string;\n}",
|
|
2893
|
+
"name": "parseVersionLineWithConflict",
|
|
2894
|
+
"params": [
|
|
2895
|
+
{
|
|
2896
|
+
"__schema": "ParameterSchema",
|
|
2897
|
+
"location": {
|
|
2898
|
+
"filePath": "config-merge-result.ts",
|
|
2899
|
+
"line": 128,
|
|
2900
|
+
"character": 46
|
|
2901
|
+
},
|
|
2902
|
+
"name": "line",
|
|
2903
|
+
"type": {
|
|
2904
|
+
"__schema": "KeywordTypeSchema",
|
|
2905
|
+
"location": {
|
|
2906
|
+
"filePath": "config-merge-result.ts",
|
|
2907
|
+
"line": 128,
|
|
2908
|
+
"character": 52
|
|
2909
|
+
},
|
|
2910
|
+
"name": "string"
|
|
2911
|
+
},
|
|
2912
|
+
"isOptional": false,
|
|
2913
|
+
"isSpread": false
|
|
2914
|
+
}
|
|
2915
|
+
],
|
|
2916
|
+
"returnType": {
|
|
2917
|
+
"__schema": "InferenceTypeSchema",
|
|
2918
|
+
"location": {
|
|
2919
|
+
"filePath": "config-merge-result.ts",
|
|
2920
|
+
"line": 128,
|
|
2921
|
+
"character": 1
|
|
2922
|
+
},
|
|
2923
|
+
"type": "{\n currentVal: string;\n otherVal: string;\n}"
|
|
2924
|
+
},
|
|
2925
|
+
"modifiers": [
|
|
2926
|
+
"export"
|
|
2927
|
+
]
|
|
2928
|
+
}
|
|
2929
|
+
],
|
|
2930
|
+
"internals": [
|
|
2931
|
+
{
|
|
2932
|
+
"__schema": "ModuleSchema",
|
|
2933
|
+
"location": {
|
|
2934
|
+
"filePath": "config-merge-result.ts",
|
|
2935
|
+
"line": 5,
|
|
2936
|
+
"character": 1
|
|
2937
|
+
},
|
|
2938
|
+
"exports": [
|
|
2939
|
+
{
|
|
2940
|
+
"__schema": "VariableLikeSchema",
|
|
2941
|
+
"location": {
|
|
2942
|
+
"filePath": "config-merge-result.ts",
|
|
2943
|
+
"line": 5,
|
|
2944
|
+
"character": 7
|
|
2945
|
+
},
|
|
2946
|
+
"signature": "const DEP_RESOLVER_VERSION_INDENTATION: 8",
|
|
2947
|
+
"name": "DEP_RESOLVER_VERSION_INDENTATION",
|
|
2948
|
+
"type": {
|
|
2949
|
+
"__schema": "InferenceTypeSchema",
|
|
2950
|
+
"location": {
|
|
2951
|
+
"filePath": "config-merge-result.ts",
|
|
2952
|
+
"line": 5,
|
|
2953
|
+
"character": 7
|
|
2954
|
+
},
|
|
2955
|
+
"type": "8"
|
|
2956
|
+
},
|
|
2957
|
+
"isOptional": false,
|
|
2958
|
+
"defaultValue": "8"
|
|
2959
|
+
}
|
|
2960
|
+
],
|
|
2961
|
+
"internals": []
|
|
2962
|
+
},
|
|
2963
|
+
{
|
|
2964
|
+
"__schema": "ModuleSchema",
|
|
2965
|
+
"location": {
|
|
2966
|
+
"filePath": "config-merge-result.ts",
|
|
2967
|
+
"line": 6,
|
|
2968
|
+
"character": 1
|
|
2969
|
+
},
|
|
2970
|
+
"exports": [
|
|
2971
|
+
{
|
|
2972
|
+
"__schema": "VariableLikeSchema",
|
|
2973
|
+
"location": {
|
|
2974
|
+
"filePath": "config-merge-result.ts",
|
|
2975
|
+
"line": 6,
|
|
2976
|
+
"character": 7
|
|
2977
|
+
},
|
|
2978
|
+
"signature": "const CONFLICT_MARKER_INDENTATION: 7",
|
|
2979
|
+
"name": "CONFLICT_MARKER_INDENTATION",
|
|
2980
|
+
"type": {
|
|
2981
|
+
"__schema": "InferenceTypeSchema",
|
|
2982
|
+
"location": {
|
|
2983
|
+
"filePath": "config-merge-result.ts",
|
|
2984
|
+
"line": 6,
|
|
2985
|
+
"character": 7
|
|
2986
|
+
},
|
|
2987
|
+
"type": "7"
|
|
2988
|
+
},
|
|
2989
|
+
"isOptional": false,
|
|
2990
|
+
"defaultValue": "7"
|
|
2991
|
+
}
|
|
2992
|
+
],
|
|
2993
|
+
"internals": []
|
|
2994
|
+
}
|
|
2995
|
+
]
|
|
2996
|
+
},
|
|
2997
|
+
{
|
|
2998
|
+
"__schema": "ModuleSchema",
|
|
2999
|
+
"location": {
|
|
3000
|
+
"filePath": "component-config-merger.ts",
|
|
3001
|
+
"line": 1,
|
|
3002
|
+
"character": 1
|
|
3003
|
+
},
|
|
3004
|
+
"exports": [
|
|
3005
|
+
{
|
|
3006
|
+
"__schema": "TypeSchema",
|
|
3007
|
+
"location": {
|
|
3008
|
+
"filePath": "component-config-merger.ts",
|
|
3009
|
+
"line": 19,
|
|
3010
|
+
"character": 1
|
|
3011
|
+
},
|
|
3012
|
+
"signature": "type GenericConfigOrRemoved = \"-\" | Record<string, any>",
|
|
3013
|
+
"name": "GenericConfigOrRemoved",
|
|
3014
|
+
"type": {
|
|
3015
|
+
"__schema": "TypeUnionSchema",
|
|
3016
|
+
"location": {
|
|
3017
|
+
"filePath": "component-config-merger.ts",
|
|
3018
|
+
"line": 19,
|
|
3019
|
+
"character": 38
|
|
3020
|
+
},
|
|
3021
|
+
"types": [
|
|
3022
|
+
{
|
|
3023
|
+
"__schema": "TypeRefSchema",
|
|
3024
|
+
"location": {
|
|
3025
|
+
"filePath": "component-config-merger.ts",
|
|
3026
|
+
"line": 19,
|
|
3027
|
+
"character": 38
|
|
3028
|
+
},
|
|
3029
|
+
"name": "Record",
|
|
3030
|
+
"typeArgs": [
|
|
3031
|
+
{
|
|
3032
|
+
"__schema": "KeywordTypeSchema",
|
|
3033
|
+
"location": {
|
|
3034
|
+
"filePath": "component-config-merger.ts",
|
|
3035
|
+
"line": 19,
|
|
3036
|
+
"character": 45
|
|
3037
|
+
},
|
|
3038
|
+
"name": "string"
|
|
3039
|
+
},
|
|
3040
|
+
{
|
|
3041
|
+
"__schema": "KeywordTypeSchema",
|
|
3042
|
+
"location": {
|
|
3043
|
+
"filePath": "component-config-merger.ts",
|
|
3044
|
+
"line": 19,
|
|
3045
|
+
"character": 53
|
|
3046
|
+
},
|
|
3047
|
+
"name": "any"
|
|
3048
|
+
}
|
|
3049
|
+
]
|
|
3050
|
+
},
|
|
3051
|
+
{
|
|
3052
|
+
"__schema": "LiteralTypeSchema",
|
|
3053
|
+
"location": {
|
|
3054
|
+
"filePath": "component-config-merger.ts",
|
|
3055
|
+
"line": 19,
|
|
3056
|
+
"character": 60
|
|
3057
|
+
},
|
|
3058
|
+
"name": "'-'"
|
|
3059
|
+
}
|
|
3060
|
+
]
|
|
3061
|
+
}
|
|
3062
|
+
},
|
|
3063
|
+
{
|
|
3064
|
+
"__schema": "VariableLikeSchema",
|
|
3065
|
+
"location": {
|
|
3066
|
+
"filePath": "component-config-merger.ts",
|
|
3067
|
+
"line": 25,
|
|
3068
|
+
"character": 14
|
|
3069
|
+
},
|
|
3070
|
+
"signature": "const conflictIndicator: \"CONFLICT::\"",
|
|
3071
|
+
"name": "conflictIndicator",
|
|
3072
|
+
"type": {
|
|
3073
|
+
"__schema": "InferenceTypeSchema",
|
|
3074
|
+
"location": {
|
|
3075
|
+
"filePath": "component-config-merger.ts",
|
|
3076
|
+
"line": 25,
|
|
3077
|
+
"character": 14
|
|
3078
|
+
},
|
|
3079
|
+
"type": "\"CONFLICT::\""
|
|
3080
|
+
},
|
|
3081
|
+
"isOptional": false,
|
|
3082
|
+
"defaultValue": "'CONFLICT::'"
|
|
3083
|
+
},
|
|
3084
|
+
{
|
|
3085
|
+
"__schema": "TypeSchema",
|
|
3086
|
+
"location": {
|
|
3087
|
+
"filePath": "component-config-merger.ts",
|
|
3088
|
+
"line": 27,
|
|
3089
|
+
"character": 1
|
|
3090
|
+
},
|
|
3091
|
+
"signature": "type MergeStrategyResult = {\n id: string;\n mergedConfig?: GenericConfigOrRemoved | undefined;\n conflict?: Record<string, any> | undefined;\n}",
|
|
3092
|
+
"name": "MergeStrategyResult",
|
|
3093
|
+
"type": {
|
|
3094
|
+
"__schema": "TypeLiteralSchema",
|
|
3095
|
+
"location": {
|
|
3096
|
+
"filePath": "component-config-merger.ts",
|
|
3097
|
+
"line": 27,
|
|
3098
|
+
"character": 35
|
|
3099
|
+
},
|
|
3100
|
+
"members": [
|
|
3101
|
+
{
|
|
3102
|
+
"__schema": "VariableLikeSchema",
|
|
3103
|
+
"location": {
|
|
3104
|
+
"filePath": "component-config-merger.ts",
|
|
3105
|
+
"line": 28,
|
|
3106
|
+
"character": 3
|
|
3107
|
+
},
|
|
3108
|
+
"signature": "(property) id: string",
|
|
3109
|
+
"name": "id",
|
|
3110
|
+
"type": {
|
|
3111
|
+
"__schema": "KeywordTypeSchema",
|
|
3112
|
+
"location": {
|
|
3113
|
+
"filePath": "component-config-merger.ts",
|
|
3114
|
+
"line": 28,
|
|
3115
|
+
"character": 7
|
|
3116
|
+
},
|
|
3117
|
+
"name": "string"
|
|
3118
|
+
},
|
|
3119
|
+
"isOptional": false
|
|
3120
|
+
},
|
|
3121
|
+
{
|
|
3122
|
+
"__schema": "VariableLikeSchema",
|
|
3123
|
+
"location": {
|
|
3124
|
+
"filePath": "component-config-merger.ts",
|
|
3125
|
+
"line": 29,
|
|
3126
|
+
"character": 3
|
|
3127
|
+
},
|
|
3128
|
+
"signature": "(property) mergedConfig?: GenericConfigOrRemoved | undefined",
|
|
3129
|
+
"name": "mergedConfig",
|
|
3130
|
+
"type": {
|
|
3131
|
+
"__schema": "TypeRefSchema",
|
|
3132
|
+
"location": {
|
|
3133
|
+
"filePath": "component-config-merger.ts",
|
|
3134
|
+
"line": 29,
|
|
3135
|
+
"character": 18
|
|
3136
|
+
},
|
|
3137
|
+
"name": "GenericConfigOrRemoved",
|
|
3138
|
+
"internalFilePath": "component-config-merger.ts"
|
|
3139
|
+
},
|
|
3140
|
+
"isOptional": true
|
|
3141
|
+
},
|
|
3142
|
+
{
|
|
3143
|
+
"__schema": "VariableLikeSchema",
|
|
3144
|
+
"location": {
|
|
3145
|
+
"filePath": "component-config-merger.ts",
|
|
3146
|
+
"line": 30,
|
|
3147
|
+
"character": 3
|
|
3148
|
+
},
|
|
3149
|
+
"signature": "(property) conflict?: Record<string, any> | undefined",
|
|
3150
|
+
"name": "conflict",
|
|
3151
|
+
"type": {
|
|
3152
|
+
"__schema": "TypeRefSchema",
|
|
3153
|
+
"location": {
|
|
3154
|
+
"filePath": "component-config-merger.ts",
|
|
3155
|
+
"line": 30,
|
|
3156
|
+
"character": 14
|
|
3157
|
+
},
|
|
3158
|
+
"name": "Record",
|
|
3159
|
+
"typeArgs": [
|
|
3160
|
+
{
|
|
3161
|
+
"__schema": "KeywordTypeSchema",
|
|
3162
|
+
"location": {
|
|
3163
|
+
"filePath": "component-config-merger.ts",
|
|
3164
|
+
"line": 30,
|
|
3165
|
+
"character": 21
|
|
3166
|
+
},
|
|
3167
|
+
"name": "string"
|
|
3168
|
+
},
|
|
3169
|
+
{
|
|
3170
|
+
"__schema": "KeywordTypeSchema",
|
|
3171
|
+
"location": {
|
|
3172
|
+
"filePath": "component-config-merger.ts",
|
|
3173
|
+
"line": 30,
|
|
3174
|
+
"character": 29
|
|
3175
|
+
},
|
|
3176
|
+
"name": "any"
|
|
3177
|
+
}
|
|
3178
|
+
]
|
|
3179
|
+
},
|
|
3180
|
+
"isOptional": true
|
|
3181
|
+
}
|
|
3182
|
+
]
|
|
3183
|
+
}
|
|
3184
|
+
},
|
|
3185
|
+
{
|
|
3186
|
+
"__schema": "ClassSchema",
|
|
3187
|
+
"location": {
|
|
3188
|
+
"filePath": "component-config-merger.ts",
|
|
3189
|
+
"line": 68,
|
|
3190
|
+
"character": 1
|
|
3191
|
+
},
|
|
3192
|
+
"doc": {
|
|
3193
|
+
"__schema": "DocSchema",
|
|
3194
|
+
"location": {
|
|
3195
|
+
"filePath": "component-config-merger.ts",
|
|
3196
|
+
"line": 45,
|
|
3197
|
+
"character": 1
|
|
3198
|
+
},
|
|
3199
|
+
"raw": "/**\n * perform 3-way merge of component configuration (aspects).\n * normally this is needed when merging one lane into another. the component may have different aspects config in each lane.\n * the baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\n * the currentAspects are the aspects of the component in the current lane.\n * the otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n *\n * the basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\n * we have two special cases:\n *\n * 1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\n * into account not only the config, but also the data. this is needed because some dependencies are automatically\n * added by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\n * from both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\n * the config has always force: true.\n *\n * 2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\n * in the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\n * teambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\n * we ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\n * version. later, when the component is loaded, we split the id and the version and put them in the correct places.\n * see workspace.componentExtension / adjustEnvsOnConfigMerge for more details.\n */",
|
|
3200
|
+
"comment": "perform 3-way merge of component configuration (aspects).\nnormally this is needed when merging one lane into another. the component may have different aspects config in each lane.\nthe baseAspects are the aspects of the component in the diversion point (the common ancestor of the two lanes).\nthe currentAspects are the aspects of the component in the current lane.\nthe otherAspects are the aspects of the component in the other lane. this is the lane we merge into the current lane.\n\nthe basic merging strategy is a simple comparison between the aspect-configs, if they're different, we have a conflict.\nwe have two special cases:\n\n1. dependency-resolver: we do a deeper check for the policy, we compare each dependency separately. also, we take\ninto account not only the config, but also the data. this is needed because some dependencies are automatically\nadded by Bit (from the import statements in the code) and they're not in the config. the final config has the deps\nfrom both sources, the config and the data. The way we know to differentiate between them is by the \"force\" prop.\nthe config has always force: true.\n\n2. envs: if we don't treat it specially, the user will need to make the change not only in the envs aspect, but also\nin the deps-resolver (because the env is added as a devDependency) and also in the aspect itself (because\nteambit.envs/env has only the id and not the version). to make it simpler, we ignore the envs in the deps-resolver\nwe ignore the individual aspect that is the env itself. we only show teambit.envs/env and we put the env id and\nversion. later, when the component is loaded, we split the id and the version and put them in the correct places.\nsee workspace.componentExtension / adjustEnvsOnConfigMerge for more details."
|
|
3201
|
+
},
|
|
3202
|
+
"signature": "class ComponentConfigMerger",
|
|
3203
|
+
"name": "ComponentConfigMerger",
|
|
3204
|
+
"members": [
|
|
3205
|
+
{
|
|
3206
|
+
"__schema": "ConstructorSchema",
|
|
3207
|
+
"location": {
|
|
3208
|
+
"filePath": "component-config-merger.ts",
|
|
3209
|
+
"line": 74,
|
|
3210
|
+
"character": 3
|
|
3211
|
+
},
|
|
3212
|
+
"signature": "constructor ComponentConfigMerger(compIdStr: string, workspaceIds: ComponentID[], otherLane: Lane | undefined, currentAspects: ExtensionDataList, baseAspects: ExtensionDataList, otherAspects: ExtensionDataList, currentLabel: string, otherLabel: string, logger: Logger, mergeStrategy: MergeStrategy): ComponentConfigMerger",
|
|
3213
|
+
"name": "constructor",
|
|
3214
|
+
"params": [
|
|
3215
|
+
{
|
|
3216
|
+
"__schema": "ParameterSchema",
|
|
3217
|
+
"location": {
|
|
3218
|
+
"filePath": "component-config-merger.ts",
|
|
3219
|
+
"line": 75,
|
|
3220
|
+
"character": 5
|
|
3221
|
+
},
|
|
3222
|
+
"name": "compIdStr",
|
|
3223
|
+
"type": {
|
|
3224
|
+
"__schema": "KeywordTypeSchema",
|
|
3225
|
+
"location": {
|
|
3226
|
+
"filePath": "component-config-merger.ts",
|
|
3227
|
+
"line": 75,
|
|
3228
|
+
"character": 24
|
|
3229
|
+
},
|
|
3230
|
+
"name": "string"
|
|
3231
|
+
},
|
|
3232
|
+
"isOptional": false,
|
|
3233
|
+
"isSpread": false
|
|
3234
|
+
},
|
|
3235
|
+
{
|
|
3236
|
+
"__schema": "ParameterSchema",
|
|
3237
|
+
"location": {
|
|
3238
|
+
"filePath": "component-config-merger.ts",
|
|
3239
|
+
"line": 76,
|
|
3240
|
+
"character": 5
|
|
3241
|
+
},
|
|
3242
|
+
"name": "workspaceIds",
|
|
3243
|
+
"type": {
|
|
3244
|
+
"__schema": "TypeArraySchema",
|
|
3245
|
+
"location": {
|
|
3246
|
+
"filePath": "component-config-merger.ts",
|
|
3247
|
+
"line": 76,
|
|
3248
|
+
"character": 27
|
|
3249
|
+
},
|
|
3250
|
+
"type": {
|
|
3251
|
+
"__schema": "TypeRefSchema",
|
|
3252
|
+
"location": {
|
|
3253
|
+
"filePath": "component-config-merger.ts",
|
|
3254
|
+
"line": 76,
|
|
3255
|
+
"character": 27
|
|
3256
|
+
},
|
|
3257
|
+
"name": "ComponentID",
|
|
3258
|
+
"componentId": {
|
|
3259
|
+
"scope": "teambit.component",
|
|
3260
|
+
"name": "component-id",
|
|
3261
|
+
"version": "1.2.0"
|
|
3262
|
+
}
|
|
3263
|
+
}
|
|
3264
|
+
},
|
|
3265
|
+
"isOptional": false,
|
|
3266
|
+
"isSpread": false
|
|
3267
|
+
},
|
|
3268
|
+
{
|
|
3269
|
+
"__schema": "ParameterSchema",
|
|
3270
|
+
"location": {
|
|
3271
|
+
"filePath": "component-config-merger.ts",
|
|
3272
|
+
"line": 77,
|
|
3273
|
+
"character": 5
|
|
3274
|
+
},
|
|
3275
|
+
"name": "otherLane",
|
|
3276
|
+
"type": {
|
|
3277
|
+
"__schema": "TypeUnionSchema",
|
|
3278
|
+
"location": {
|
|
3279
|
+
"filePath": "component-config-merger.ts",
|
|
3280
|
+
"line": 77,
|
|
3281
|
+
"character": 16
|
|
3282
|
+
},
|
|
3283
|
+
"types": [
|
|
3284
|
+
{
|
|
3285
|
+
"__schema": "TypeRefSchema",
|
|
3286
|
+
"location": {
|
|
3287
|
+
"filePath": "component-config-merger.ts",
|
|
3288
|
+
"line": 77,
|
|
3289
|
+
"character": 16
|
|
3290
|
+
},
|
|
3291
|
+
"name": "Lane",
|
|
3292
|
+
"packageName": "@teambit/legacy/dist/scope/models"
|
|
3293
|
+
},
|
|
3294
|
+
{
|
|
3295
|
+
"__schema": "KeywordTypeSchema",
|
|
3296
|
+
"location": {
|
|
3297
|
+
"filePath": "component-config-merger.ts",
|
|
3298
|
+
"line": 77,
|
|
3299
|
+
"character": 23
|
|
3300
|
+
},
|
|
3301
|
+
"name": "undefined"
|
|
3302
|
+
}
|
|
3303
|
+
]
|
|
3304
|
+
},
|
|
3305
|
+
"isOptional": false,
|
|
3306
|
+
"isSpread": false
|
|
3307
|
+
},
|
|
3308
|
+
{
|
|
3309
|
+
"__schema": "ParameterSchema",
|
|
3310
|
+
"location": {
|
|
3311
|
+
"filePath": "component-config-merger.ts",
|
|
3312
|
+
"line": 78,
|
|
3313
|
+
"character": 5
|
|
3314
|
+
},
|
|
3315
|
+
"name": "currentAspects",
|
|
3316
|
+
"type": {
|
|
3317
|
+
"__schema": "TypeRefSchema",
|
|
3318
|
+
"location": {
|
|
3319
|
+
"filePath": "component-config-merger.ts",
|
|
3320
|
+
"line": 78,
|
|
3321
|
+
"character": 29
|
|
3322
|
+
},
|
|
3323
|
+
"name": "ExtensionDataList",
|
|
3324
|
+
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3325
|
+
},
|
|
3326
|
+
"isOptional": false,
|
|
3327
|
+
"isSpread": false
|
|
3328
|
+
},
|
|
3329
|
+
{
|
|
3330
|
+
"__schema": "ParameterSchema",
|
|
3331
|
+
"location": {
|
|
3332
|
+
"filePath": "component-config-merger.ts",
|
|
3333
|
+
"line": 79,
|
|
3334
|
+
"character": 5
|
|
3335
|
+
},
|
|
3336
|
+
"name": "baseAspects",
|
|
3337
|
+
"type": {
|
|
3338
|
+
"__schema": "TypeRefSchema",
|
|
3339
|
+
"location": {
|
|
3340
|
+
"filePath": "component-config-merger.ts",
|
|
3341
|
+
"line": 79,
|
|
3342
|
+
"character": 26
|
|
3343
|
+
},
|
|
3344
|
+
"name": "ExtensionDataList",
|
|
3345
|
+
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3346
|
+
},
|
|
3347
|
+
"isOptional": false,
|
|
3348
|
+
"isSpread": false
|
|
3349
|
+
},
|
|
3350
|
+
{
|
|
3351
|
+
"__schema": "ParameterSchema",
|
|
3352
|
+
"location": {
|
|
3353
|
+
"filePath": "component-config-merger.ts",
|
|
3354
|
+
"line": 80,
|
|
3355
|
+
"character": 5
|
|
3356
|
+
},
|
|
3357
|
+
"name": "otherAspects",
|
|
3358
|
+
"type": {
|
|
3359
|
+
"__schema": "TypeRefSchema",
|
|
3360
|
+
"location": {
|
|
3361
|
+
"filePath": "component-config-merger.ts",
|
|
3362
|
+
"line": 80,
|
|
3363
|
+
"character": 27
|
|
3364
|
+
},
|
|
3365
|
+
"name": "ExtensionDataList",
|
|
3366
|
+
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3367
|
+
},
|
|
3368
|
+
"isOptional": false,
|
|
3369
|
+
"isSpread": false
|
|
3370
|
+
},
|
|
3371
|
+
{
|
|
3372
|
+
"__schema": "ParameterSchema",
|
|
3373
|
+
"location": {
|
|
3374
|
+
"filePath": "component-config-merger.ts",
|
|
3375
|
+
"line": 81,
|
|
3376
|
+
"character": 5
|
|
3377
|
+
},
|
|
3378
|
+
"name": "currentLabel",
|
|
3379
|
+
"type": {
|
|
3380
|
+
"__schema": "KeywordTypeSchema",
|
|
3381
|
+
"location": {
|
|
3382
|
+
"filePath": "component-config-merger.ts",
|
|
3383
|
+
"line": 81,
|
|
3384
|
+
"character": 27
|
|
3385
|
+
},
|
|
3386
|
+
"name": "string"
|
|
3387
|
+
},
|
|
3388
|
+
"isOptional": false,
|
|
3389
|
+
"isSpread": false
|
|
3390
|
+
},
|
|
3391
|
+
{
|
|
3392
|
+
"__schema": "ParameterSchema",
|
|
3393
|
+
"location": {
|
|
3394
|
+
"filePath": "component-config-merger.ts",
|
|
3395
|
+
"line": 82,
|
|
3396
|
+
"character": 5
|
|
3397
|
+
},
|
|
3398
|
+
"name": "otherLabel",
|
|
3399
|
+
"type": {
|
|
3400
|
+
"__schema": "KeywordTypeSchema",
|
|
3401
|
+
"location": {
|
|
3402
|
+
"filePath": "component-config-merger.ts",
|
|
3403
|
+
"line": 82,
|
|
3404
|
+
"character": 25
|
|
3405
|
+
},
|
|
3406
|
+
"name": "string"
|
|
3407
|
+
},
|
|
3408
|
+
"isOptional": false,
|
|
3409
|
+
"isSpread": false
|
|
3410
|
+
},
|
|
3411
|
+
{
|
|
3412
|
+
"__schema": "ParameterSchema",
|
|
3413
|
+
"location": {
|
|
3414
|
+
"filePath": "component-config-merger.ts",
|
|
3415
|
+
"line": 83,
|
|
3416
|
+
"character": 5
|
|
3417
|
+
},
|
|
3418
|
+
"name": "logger",
|
|
3419
|
+
"type": {
|
|
3420
|
+
"__schema": "TypeRefSchema",
|
|
3421
|
+
"location": {
|
|
3422
|
+
"filePath": "component-config-merger.ts",
|
|
3423
|
+
"line": 83,
|
|
3424
|
+
"character": 21
|
|
3425
|
+
},
|
|
3426
|
+
"name": "Logger",
|
|
3427
|
+
"componentId": {
|
|
3428
|
+
"scope": "teambit.harmony",
|
|
3429
|
+
"name": "logger"
|
|
3430
|
+
}
|
|
3431
|
+
},
|
|
3432
|
+
"isOptional": false,
|
|
3433
|
+
"isSpread": false
|
|
3434
|
+
},
|
|
3435
|
+
{
|
|
3436
|
+
"__schema": "ParameterSchema",
|
|
3437
|
+
"location": {
|
|
3438
|
+
"filePath": "component-config-merger.ts",
|
|
3439
|
+
"line": 84,
|
|
3440
|
+
"character": 5
|
|
3441
|
+
},
|
|
3442
|
+
"name": "mergeStrategy",
|
|
3443
|
+
"type": {
|
|
3444
|
+
"__schema": "TypeRefSchema",
|
|
3445
|
+
"location": {
|
|
3446
|
+
"filePath": "component-config-merger.ts",
|
|
3447
|
+
"line": 84,
|
|
3448
|
+
"character": 28
|
|
3449
|
+
},
|
|
3450
|
+
"name": "MergeStrategy",
|
|
3451
|
+
"packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
|
|
3452
|
+
},
|
|
3453
|
+
"isOptional": false,
|
|
3454
|
+
"isSpread": false
|
|
3455
|
+
}
|
|
3456
|
+
],
|
|
3457
|
+
"returnType": {
|
|
3458
|
+
"__schema": "ThisTypeSchema",
|
|
3459
|
+
"location": {
|
|
3460
|
+
"filePath": "component-config-merger.ts",
|
|
3461
|
+
"line": 68,
|
|
3462
|
+
"character": 1
|
|
3463
|
+
},
|
|
3464
|
+
"name": "ComponentConfigMerger"
|
|
3465
|
+
},
|
|
3466
|
+
"modifiers": []
|
|
3467
|
+
},
|
|
3468
|
+
{
|
|
3469
|
+
"__schema": "FunctionLikeSchema",
|
|
3470
|
+
"location": {
|
|
3471
|
+
"filePath": "component-config-merger.ts",
|
|
3472
|
+
"line": 89,
|
|
3473
|
+
"character": 3
|
|
3474
|
+
},
|
|
3475
|
+
"signature": "(method) ComponentConfigMerger.merge(): ConfigMergeResult",
|
|
3476
|
+
"name": "merge",
|
|
3477
|
+
"params": [],
|
|
3478
|
+
"returnType": {
|
|
3479
|
+
"__schema": "TypeRefSchema",
|
|
3480
|
+
"location": {
|
|
3481
|
+
"filePath": "component-config-merger.ts",
|
|
3482
|
+
"line": 89,
|
|
3483
|
+
"character": 3
|
|
3484
|
+
},
|
|
3485
|
+
"name": "ConfigMergeResult"
|
|
3486
|
+
},
|
|
3487
|
+
"modifiers": []
|
|
3488
|
+
}
|
|
3489
|
+
],
|
|
3490
|
+
"extendsNodes": [],
|
|
3491
|
+
"implementNodes": []
|
|
3492
|
+
}
|
|
3493
|
+
],
|
|
3494
|
+
"internals": [
|
|
3495
|
+
{
|
|
3496
|
+
"__schema": "TypeSchema",
|
|
3497
|
+
"location": {
|
|
3498
|
+
"filePath": "component-config-merger.ts",
|
|
3499
|
+
"line": 21,
|
|
3500
|
+
"character": 1
|
|
3501
|
+
},
|
|
3502
|
+
"signature": "type EnvData = {\n id: string;\n version?: string | undefined;\n config?: GenericConfigOrRemoved | undefined;\n}",
|
|
3503
|
+
"name": "EnvData",
|
|
3504
|
+
"type": {
|
|
3505
|
+
"__schema": "TypeLiteralSchema",
|
|
3506
|
+
"location": {
|
|
3507
|
+
"filePath": "component-config-merger.ts",
|
|
3508
|
+
"line": 21,
|
|
3509
|
+
"character": 16
|
|
3510
|
+
},
|
|
3511
|
+
"members": [
|
|
3512
|
+
{
|
|
3513
|
+
"__schema": "VariableLikeSchema",
|
|
3514
|
+
"location": {
|
|
3515
|
+
"filePath": "component-config-merger.ts",
|
|
3516
|
+
"line": 21,
|
|
3517
|
+
"character": 18
|
|
3518
|
+
},
|
|
3519
|
+
"signature": "(property) id: string",
|
|
3520
|
+
"name": "id",
|
|
3521
|
+
"type": {
|
|
3522
|
+
"__schema": "KeywordTypeSchema",
|
|
3523
|
+
"location": {
|
|
3524
|
+
"filePath": "component-config-merger.ts",
|
|
3525
|
+
"line": 21,
|
|
3526
|
+
"character": 22
|
|
3527
|
+
},
|
|
3528
|
+
"name": "string"
|
|
3529
|
+
},
|
|
3530
|
+
"isOptional": false
|
|
3531
|
+
},
|
|
3532
|
+
{
|
|
3533
|
+
"__schema": "VariableLikeSchema",
|
|
3534
|
+
"location": {
|
|
3535
|
+
"filePath": "component-config-merger.ts",
|
|
3536
|
+
"line": 21,
|
|
3537
|
+
"character": 30
|
|
3538
|
+
},
|
|
3539
|
+
"signature": "(property) version?: string | undefined",
|
|
3540
|
+
"name": "version",
|
|
3541
|
+
"type": {
|
|
3542
|
+
"__schema": "KeywordTypeSchema",
|
|
3543
|
+
"location": {
|
|
3544
|
+
"filePath": "component-config-merger.ts",
|
|
3545
|
+
"line": 21,
|
|
3546
|
+
"character": 40
|
|
3547
|
+
},
|
|
3548
|
+
"name": "string"
|
|
3549
|
+
},
|
|
3550
|
+
"isOptional": true
|
|
3551
|
+
},
|
|
3552
|
+
{
|
|
3553
|
+
"__schema": "VariableLikeSchema",
|
|
3554
|
+
"location": {
|
|
3555
|
+
"filePath": "component-config-merger.ts",
|
|
3556
|
+
"line": 21,
|
|
3557
|
+
"character": 48
|
|
3558
|
+
},
|
|
3559
|
+
"signature": "(property) config?: GenericConfigOrRemoved | undefined",
|
|
3560
|
+
"name": "config",
|
|
3561
|
+
"type": {
|
|
3562
|
+
"__schema": "TypeRefSchema",
|
|
3563
|
+
"location": {
|
|
3564
|
+
"filePath": "component-config-merger.ts",
|
|
3565
|
+
"line": 21,
|
|
3566
|
+
"character": 57
|
|
3567
|
+
},
|
|
3568
|
+
"name": "GenericConfigOrRemoved",
|
|
3569
|
+
"internalFilePath": "component-config-merger.ts"
|
|
3570
|
+
},
|
|
3571
|
+
"isOptional": true
|
|
3572
|
+
}
|
|
3573
|
+
]
|
|
3574
|
+
}
|
|
3575
|
+
},
|
|
3576
|
+
{
|
|
3577
|
+
"__schema": "TypeSchema",
|
|
3578
|
+
"location": {
|
|
3579
|
+
"filePath": "component-config-merger.ts",
|
|
3580
|
+
"line": 23,
|
|
3581
|
+
"character": 1
|
|
3582
|
+
},
|
|
3583
|
+
"signature": "type SerializedDependencyWithPolicy = SerializedDependency & {\n policy?: string | undefined;\n packageName?: string | undefined;\n}",
|
|
3584
|
+
"name": "SerializedDependencyWithPolicy",
|
|
3585
|
+
"type": {
|
|
3586
|
+
"__schema": "TypeIntersectionSchema",
|
|
3587
|
+
"location": {
|
|
3588
|
+
"filePath": "component-config-merger.ts",
|
|
3589
|
+
"line": 23,
|
|
3590
|
+
"character": 39
|
|
3591
|
+
},
|
|
3592
|
+
"types": [
|
|
3593
|
+
{
|
|
3594
|
+
"__schema": "TypeRefSchema",
|
|
3595
|
+
"location": {
|
|
3596
|
+
"filePath": "component-config-merger.ts",
|
|
3597
|
+
"line": 23,
|
|
3598
|
+
"character": 39
|
|
3599
|
+
},
|
|
3600
|
+
"name": "SerializedDependency",
|
|
3601
|
+
"componentId": {
|
|
3602
|
+
"scope": "teambit.dependencies",
|
|
3603
|
+
"name": "dependency-resolver"
|
|
3604
|
+
}
|
|
3605
|
+
},
|
|
3606
|
+
{
|
|
3607
|
+
"__schema": "TypeLiteralSchema",
|
|
3608
|
+
"location": {
|
|
3609
|
+
"filePath": "component-config-merger.ts",
|
|
3610
|
+
"line": 23,
|
|
3611
|
+
"character": 62
|
|
3612
|
+
},
|
|
3613
|
+
"members": [
|
|
3614
|
+
{
|
|
3615
|
+
"__schema": "VariableLikeSchema",
|
|
3616
|
+
"location": {
|
|
3617
|
+
"filePath": "component-config-merger.ts",
|
|
3618
|
+
"line": 23,
|
|
3619
|
+
"character": 64
|
|
3620
|
+
},
|
|
3621
|
+
"signature": "(property) policy?: string | undefined",
|
|
3622
|
+
"name": "policy",
|
|
3623
|
+
"type": {
|
|
3624
|
+
"__schema": "KeywordTypeSchema",
|
|
3625
|
+
"location": {
|
|
3626
|
+
"filePath": "component-config-merger.ts",
|
|
3627
|
+
"line": 23,
|
|
3628
|
+
"character": 73
|
|
3629
|
+
},
|
|
3630
|
+
"name": "string"
|
|
3631
|
+
},
|
|
3632
|
+
"isOptional": true
|
|
3633
|
+
},
|
|
3634
|
+
{
|
|
3635
|
+
"__schema": "VariableLikeSchema",
|
|
3636
|
+
"location": {
|
|
3637
|
+
"filePath": "component-config-merger.ts",
|
|
3638
|
+
"line": 23,
|
|
3639
|
+
"character": 81
|
|
3640
|
+
},
|
|
3641
|
+
"signature": "(property) packageName?: string | undefined",
|
|
3642
|
+
"name": "packageName",
|
|
3643
|
+
"type": {
|
|
3644
|
+
"__schema": "KeywordTypeSchema",
|
|
3645
|
+
"location": {
|
|
3646
|
+
"filePath": "component-config-merger.ts",
|
|
3647
|
+
"line": 23,
|
|
3648
|
+
"character": 95
|
|
3649
|
+
},
|
|
3650
|
+
"name": "string"
|
|
3651
|
+
},
|
|
3652
|
+
"isOptional": true
|
|
3653
|
+
}
|
|
3654
|
+
]
|
|
3655
|
+
}
|
|
3656
|
+
]
|
|
3657
|
+
}
|
|
3658
|
+
},
|
|
3659
|
+
{
|
|
3660
|
+
"__schema": "TypeSchema",
|
|
3661
|
+
"location": {
|
|
3662
|
+
"filePath": "component-config-merger.ts",
|
|
3663
|
+
"line": 32,
|
|
3664
|
+
"character": 1
|
|
3665
|
+
},
|
|
3666
|
+
"signature": "type MergeStrategyParamsWithRemoved = {\n id: string;\n currentConfig: GenericConfigOrRemoved;\n otherConfig: GenericConfigOrRemoved;\n baseConfig?: GenericConfigOrRemoved | undefined;\n}",
|
|
3667
|
+
"name": "MergeStrategyParamsWithRemoved",
|
|
3668
|
+
"type": {
|
|
3669
|
+
"__schema": "TypeLiteralSchema",
|
|
3670
|
+
"location": {
|
|
3671
|
+
"filePath": "component-config-merger.ts",
|
|
3672
|
+
"line": 32,
|
|
3673
|
+
"character": 39
|
|
3674
|
+
},
|
|
3675
|
+
"members": [
|
|
3676
|
+
{
|
|
3677
|
+
"__schema": "VariableLikeSchema",
|
|
3678
|
+
"location": {
|
|
3679
|
+
"filePath": "component-config-merger.ts",
|
|
3680
|
+
"line": 33,
|
|
3681
|
+
"character": 3
|
|
3682
|
+
},
|
|
3683
|
+
"signature": "(property) id: string",
|
|
3684
|
+
"name": "id",
|
|
3685
|
+
"type": {
|
|
3686
|
+
"__schema": "KeywordTypeSchema",
|
|
3687
|
+
"location": {
|
|
3688
|
+
"filePath": "component-config-merger.ts",
|
|
3689
|
+
"line": 33,
|
|
3690
|
+
"character": 7
|
|
3691
|
+
},
|
|
3692
|
+
"name": "string"
|
|
3693
|
+
},
|
|
3694
|
+
"isOptional": false
|
|
3695
|
+
},
|
|
3696
|
+
{
|
|
3697
|
+
"__schema": "VariableLikeSchema",
|
|
3698
|
+
"location": {
|
|
3699
|
+
"filePath": "component-config-merger.ts",
|
|
3700
|
+
"line": 34,
|
|
3701
|
+
"character": 3
|
|
3702
|
+
},
|
|
3703
|
+
"signature": "(property) currentConfig: GenericConfigOrRemoved",
|
|
3704
|
+
"name": "currentConfig",
|
|
3705
|
+
"type": {
|
|
3706
|
+
"__schema": "TypeRefSchema",
|
|
3707
|
+
"location": {
|
|
3708
|
+
"filePath": "component-config-merger.ts",
|
|
3709
|
+
"line": 34,
|
|
3710
|
+
"character": 3
|
|
3711
|
+
},
|
|
3712
|
+
"name": "GenericConfigOrRemoved",
|
|
3713
|
+
"internalFilePath": "component-config-merger.ts"
|
|
3714
|
+
},
|
|
3715
|
+
"isOptional": false
|
|
3716
|
+
},
|
|
3717
|
+
{
|
|
3718
|
+
"__schema": "VariableLikeSchema",
|
|
3719
|
+
"location": {
|
|
3720
|
+
"filePath": "component-config-merger.ts",
|
|
3721
|
+
"line": 35,
|
|
3722
|
+
"character": 3
|
|
3723
|
+
},
|
|
3724
|
+
"signature": "(property) otherConfig: GenericConfigOrRemoved",
|
|
3725
|
+
"name": "otherConfig",
|
|
3726
|
+
"type": {
|
|
3727
|
+
"__schema": "TypeRefSchema",
|
|
3728
|
+
"location": {
|
|
3729
|
+
"filePath": "component-config-merger.ts",
|
|
3730
|
+
"line": 35,
|
|
3731
|
+
"character": 3
|
|
3732
|
+
},
|
|
3733
|
+
"name": "GenericConfigOrRemoved",
|
|
3734
|
+
"internalFilePath": "component-config-merger.ts"
|
|
3735
|
+
},
|
|
3736
|
+
"isOptional": false
|
|
3737
|
+
},
|
|
3738
|
+
{
|
|
3739
|
+
"__schema": "VariableLikeSchema",
|
|
3740
|
+
"location": {
|
|
3741
|
+
"filePath": "component-config-merger.ts",
|
|
3742
|
+
"line": 36,
|
|
3743
|
+
"character": 3
|
|
3744
|
+
},
|
|
3745
|
+
"signature": "(property) baseConfig?: GenericConfigOrRemoved | undefined",
|
|
3746
|
+
"name": "baseConfig",
|
|
3747
|
+
"type": {
|
|
3748
|
+
"__schema": "TypeRefSchema",
|
|
3749
|
+
"location": {
|
|
3750
|
+
"filePath": "component-config-merger.ts",
|
|
3751
|
+
"line": 36,
|
|
3752
|
+
"character": 16
|
|
3753
|
+
},
|
|
3754
|
+
"name": "GenericConfigOrRemoved",
|
|
3755
|
+
"internalFilePath": "component-config-merger.ts"
|
|
3756
|
+
},
|
|
3757
|
+
"isOptional": true
|
|
3758
|
+
}
|
|
3759
|
+
]
|
|
3760
|
+
}
|
|
3761
|
+
},
|
|
3762
|
+
{
|
|
3763
|
+
"__schema": "TypeSchema",
|
|
3764
|
+
"location": {
|
|
3765
|
+
"filePath": "component-config-merger.ts",
|
|
3766
|
+
"line": 38,
|
|
3767
|
+
"character": 1
|
|
3768
|
+
},
|
|
3769
|
+
"signature": "type MergeStrategyParams = {\n id: string;\n currentExt: ExtensionDataEntry;\n otherExt: ExtensionDataEntry;\n baseExt?: ExtensionDataEntry | undefined;\n}",
|
|
3770
|
+
"name": "MergeStrategyParams",
|
|
3771
|
+
"type": {
|
|
3772
|
+
"__schema": "TypeLiteralSchema",
|
|
3773
|
+
"location": {
|
|
3774
|
+
"filePath": "component-config-merger.ts",
|
|
3775
|
+
"line": 38,
|
|
3776
|
+
"character": 28
|
|
3777
|
+
},
|
|
3778
|
+
"members": [
|
|
3779
|
+
{
|
|
3780
|
+
"__schema": "VariableLikeSchema",
|
|
3781
|
+
"location": {
|
|
3782
|
+
"filePath": "component-config-merger.ts",
|
|
3783
|
+
"line": 39,
|
|
3784
|
+
"character": 3
|
|
3785
|
+
},
|
|
3786
|
+
"signature": "(property) id: string",
|
|
3787
|
+
"name": "id",
|
|
3788
|
+
"type": {
|
|
3789
|
+
"__schema": "KeywordTypeSchema",
|
|
3790
|
+
"location": {
|
|
3791
|
+
"filePath": "component-config-merger.ts",
|
|
3792
|
+
"line": 39,
|
|
3793
|
+
"character": 7
|
|
3794
|
+
},
|
|
3795
|
+
"name": "string"
|
|
3796
|
+
},
|
|
3797
|
+
"isOptional": false
|
|
3798
|
+
},
|
|
3799
|
+
{
|
|
3800
|
+
"__schema": "VariableLikeSchema",
|
|
3801
|
+
"location": {
|
|
3802
|
+
"filePath": "component-config-merger.ts",
|
|
3803
|
+
"line": 40,
|
|
3804
|
+
"character": 3
|
|
3805
|
+
},
|
|
3806
|
+
"signature": "(property) currentExt: ExtensionDataEntry",
|
|
3807
|
+
"name": "currentExt",
|
|
3808
|
+
"type": {
|
|
3809
|
+
"__schema": "TypeRefSchema",
|
|
3810
|
+
"location": {
|
|
3811
|
+
"filePath": "component-config-merger.ts",
|
|
3812
|
+
"line": 40,
|
|
3813
|
+
"character": 3
|
|
3814
|
+
},
|
|
3815
|
+
"name": "ExtensionDataEntry",
|
|
3816
|
+
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3817
|
+
},
|
|
3818
|
+
"isOptional": false
|
|
3819
|
+
},
|
|
3820
|
+
{
|
|
3821
|
+
"__schema": "VariableLikeSchema",
|
|
3822
|
+
"location": {
|
|
3823
|
+
"filePath": "component-config-merger.ts",
|
|
3824
|
+
"line": 41,
|
|
3825
|
+
"character": 3
|
|
3826
|
+
},
|
|
3827
|
+
"signature": "(property) otherExt: ExtensionDataEntry",
|
|
3828
|
+
"name": "otherExt",
|
|
3829
|
+
"type": {
|
|
3830
|
+
"__schema": "TypeRefSchema",
|
|
3831
|
+
"location": {
|
|
3832
|
+
"filePath": "component-config-merger.ts",
|
|
3833
|
+
"line": 41,
|
|
3834
|
+
"character": 3
|
|
3835
|
+
},
|
|
3836
|
+
"name": "ExtensionDataEntry",
|
|
3837
|
+
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3838
|
+
},
|
|
3839
|
+
"isOptional": false
|
|
3840
|
+
},
|
|
3841
|
+
{
|
|
3842
|
+
"__schema": "VariableLikeSchema",
|
|
3843
|
+
"location": {
|
|
3844
|
+
"filePath": "component-config-merger.ts",
|
|
3845
|
+
"line": 42,
|
|
3846
|
+
"character": 3
|
|
3847
|
+
},
|
|
3848
|
+
"signature": "(property) baseExt?: ExtensionDataEntry | undefined",
|
|
3849
|
+
"name": "baseExt",
|
|
3850
|
+
"type": {
|
|
3851
|
+
"__schema": "TypeRefSchema",
|
|
3852
|
+
"location": {
|
|
3853
|
+
"filePath": "component-config-merger.ts",
|
|
3854
|
+
"line": 42,
|
|
3855
|
+
"character": 13
|
|
3856
|
+
},
|
|
3857
|
+
"name": "ExtensionDataEntry",
|
|
3858
|
+
"packageName": "@teambit/legacy/dist/consumer/config/extension-data"
|
|
3859
|
+
},
|
|
3860
|
+
"isOptional": true
|
|
3861
|
+
}
|
|
3862
|
+
]
|
|
3863
|
+
}
|
|
3864
|
+
}
|
|
3865
|
+
]
|
|
3866
|
+
},
|
|
3867
|
+
{
|
|
3868
|
+
"__schema": "ModuleSchema",
|
|
3869
|
+
"location": {
|
|
3870
|
+
"filePath": "config-merger.aspect.ts",
|
|
3871
|
+
"line": 1,
|
|
3872
|
+
"character": 1
|
|
3873
|
+
},
|
|
3874
|
+
"exports": [
|
|
3875
|
+
{
|
|
3876
|
+
"__schema": "VariableLikeSchema",
|
|
3877
|
+
"location": {
|
|
3878
|
+
"filePath": "config-merger.aspect.ts",
|
|
3879
|
+
"line": 3,
|
|
3880
|
+
"character": 14
|
|
3881
|
+
},
|
|
3882
|
+
"signature": "const ConfigMergerAspect: Aspect",
|
|
3883
|
+
"name": "ConfigMergerAspect",
|
|
3884
|
+
"type": {
|
|
3885
|
+
"__schema": "TypeRefSchema",
|
|
3886
|
+
"location": {
|
|
3887
|
+
"filePath": "config-merger.aspect.ts",
|
|
3888
|
+
"line": 3,
|
|
3889
|
+
"character": 14
|
|
3890
|
+
},
|
|
3891
|
+
"name": "Aspect",
|
|
3892
|
+
"componentId": {
|
|
3893
|
+
"scope": "teambit.harmony",
|
|
3894
|
+
"name": "harmony",
|
|
3895
|
+
"version": "0.4.6"
|
|
3896
|
+
}
|
|
3897
|
+
},
|
|
3898
|
+
"isOptional": false,
|
|
3899
|
+
"defaultValue": "Aspect.create({\n id: 'teambit.workspace/config-merger',\n})"
|
|
3900
|
+
}
|
|
3901
|
+
],
|
|
3902
|
+
"internals": []
|
|
3903
|
+
}
|
|
3904
|
+
],
|
|
156
3905
|
"componentId": {
|
|
157
3906
|
"scope": "teambit.workspace",
|
|
158
3907
|
"name": "config-merger",
|
|
159
|
-
"version": "0.0.
|
|
3908
|
+
"version": "0.0.127"
|
|
160
3909
|
},
|
|
161
3910
|
"taggedModuleExports": []
|
|
162
3911
|
}
|