@teambit/config-merger 0.0.157 → 0.0.158

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.
Files changed (7) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +252 -210
  3. package/dist/config-merger.main.runtime.d.ts +2 -1
  4. package/dist/config-merger.main.runtime.js +9 -1
  5. package/dist/config-merger.main.runtime.js.map +1 -1
  6. package/package.json +10 -10
  7. /package/dist/{preview-1717125850351.js → preview-1717212067364.js} +0 -0
package/artifacts/schema.json CHANGED
@@ -25,7 +25,7 @@
25
25
  "__schema": "ClassSchema",
26
26
  "location": {
27
27
  "filePath": "config-merger.main.runtime.ts",
28
- "line": 40,
28
+ "line": 41,
29
29
  "character": 1
30
30
  },
31
31
  "signature": "class ConfigMergerMain",
@@ -35,7 +35,7 @@
35
35
  "__schema": "ConstructorSchema",
36
36
  "location": {
37
37
  "filePath": "config-merger.main.runtime.ts",
38
- "line": 41,
38
+ "line": 42,
39
39
  "character": 3
40
40
  },
41
41
  "signature": "constructor ConfigMergerMain(workspace: Workspace, logger: Logger, config: ConfigMain, depsResolver: DependencyResolverMain): ConfigMergerMain",
@@ -45,7 +45,7 @@
45
45
  "__schema": "ParameterSchema",
46
46
  "location": {
47
47
  "filePath": "config-merger.main.runtime.ts",
48
- "line": 42,
48
+ "line": 43,
49
49
  "character": 5
50
50
  },
51
51
  "name": "workspace",
@@ -53,7 +53,7 @@
53
53
  "__schema": "TypeRefSchema",
54
54
  "location": {
55
55
  "filePath": "config-merger.main.runtime.ts",
56
- "line": 42,
56
+ "line": 43,
57
57
  "character": 24
58
58
  },
59
59
  "name": "Workspace",
@@ -69,7 +69,7 @@
69
69
  "__schema": "ParameterSchema",
70
70
  "location": {
71
71
  "filePath": "config-merger.main.runtime.ts",
72
- "line": 43,
72
+ "line": 44,
73
73
  "character": 5
74
74
  },
75
75
  "name": "logger",
@@ -77,7 +77,7 @@
77
77
  "__schema": "TypeRefSchema",
78
78
  "location": {
79
79
  "filePath": "config-merger.main.runtime.ts",
80
- "line": 43,
80
+ "line": 44,
81
81
  "character": 21
82
82
  },
83
83
  "name": "Logger",
@@ -93,7 +93,7 @@
93
93
  "__schema": "ParameterSchema",
94
94
  "location": {
95
95
  "filePath": "config-merger.main.runtime.ts",
96
- "line": 44,
96
+ "line": 45,
97
97
  "character": 5
98
98
  },
99
99
  "name": "config",
@@ -101,7 +101,7 @@
101
101
  "__schema": "TypeRefSchema",
102
102
  "location": {
103
103
  "filePath": "config-merger.main.runtime.ts",
104
- "line": 44,
104
+ "line": 45,
105
105
  "character": 21
106
106
  },
107
107
  "name": "ConfigMain",
@@ -117,7 +117,7 @@
117
117
  "__schema": "ParameterSchema",
118
118
  "location": {
119
119
  "filePath": "config-merger.main.runtime.ts",
120
- "line": 45,
120
+ "line": 46,
121
121
  "character": 5
122
122
  },
123
123
  "name": "depsResolver",
@@ -125,7 +125,7 @@
125
125
  "__schema": "TypeRefSchema",
126
126
  "location": {
127
127
  "filePath": "config-merger.main.runtime.ts",
128
- "line": 45,
128
+ "line": 46,
129
129
  "character": 27
130
130
  },
131
131
  "name": "DependencyResolverMain",
@@ -142,7 +142,7 @@
142
142
  "__schema": "ThisTypeSchema",
143
143
  "location": {
144
144
  "filePath": "config-merger.main.runtime.ts",
145
- "line": 40,
145
+ "line": 41,
146
146
  "character": 1
147
147
  },
148
148
  "name": "ConfigMergerMain"
@@ -153,7 +153,7 @@
153
153
  "__schema": "FunctionLikeSchema",
154
154
  "location": {
155
155
  "filePath": "config-merger.main.runtime.ts",
156
- "line": 48,
156
+ "line": 49,
157
157
  "character": 3
158
158
  },
159
159
  "signature": "(method) ConfigMergerMain.generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]): Promise<void>",
@@ -163,7 +163,7 @@
163
163
  "__schema": "ParameterSchema",
164
164
  "location": {
165
165
  "filePath": "config-merger.main.runtime.ts",
166
- "line": 48,
166
+ "line": 49,
167
167
  "character": 47
168
168
  },
169
169
  "name": "allConfigMerge",
@@ -171,14 +171,14 @@
171
171
  "__schema": "TypeArraySchema",
172
172
  "location": {
173
173
  "filePath": "config-merger.main.runtime.ts",
174
- "line": 48,
174
+ "line": 49,
175
175
  "character": 63
176
176
  },
177
177
  "type": {
178
178
  "__schema": "TypeRefSchema",
179
179
  "location": {
180
180
  "filePath": "config-merger.main.runtime.ts",
181
- "line": 48,
181
+ "line": 49,
182
182
  "character": 63
183
183
  },
184
184
  "name": "ConfigMergeResult"
@@ -192,7 +192,7 @@
192
192
  "__schema": "InferenceTypeSchema",
193
193
  "location": {
194
194
  "filePath": "config-merger.main.runtime.ts",
195
- "line": 48,
195
+ "line": 49,
196
196
  "character": 3
197
197
  },
198
198
  "type": "Promise<void>"
@@ -205,7 +205,7 @@
205
205
  "__schema": "FunctionLikeSchema",
206
206
  "location": {
207
207
  "filePath": "config-merger.main.runtime.ts",
208
- "line": 60,
208
+ "line": 61,
209
209
  "character": 3
210
210
  },
211
211
  "signature": "(method) ConfigMergerMain.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts: WorkspaceDepsConflicts): Promise<Error | undefined>",
@@ -215,7 +215,7 @@
215
215
  "__schema": "ParameterSchema",
216
216
  "location": {
217
217
  "filePath": "config-merger.main.runtime.ts",
218
- "line": 61,
218
+ "line": 62,
219
219
  "character": 5
220
220
  },
221
221
  "name": "workspaceDepsConflicts",
@@ -223,7 +223,7 @@
223
223
  "__schema": "TypeRefSchema",
224
224
  "location": {
225
225
  "filePath": "config-merger.main.runtime.ts",
226
- "line": 61,
226
+ "line": 62,
227
227
  "character": 29
228
228
  },
229
229
  "name": "WorkspaceDepsConflicts"
@@ -236,7 +236,7 @@
236
236
  "__schema": "TypeRefSchema",
237
237
  "location": {
238
238
  "filePath": "config-merger.main.runtime.ts",
239
- "line": 62,
239
+ "line": 63,
240
240
  "character": 6
241
241
  },
242
242
  "name": "Promise",
@@ -245,7 +245,7 @@
245
245
  "__schema": "TypeUnionSchema",
246
246
  "location": {
247
247
  "filePath": "config-merger.main.runtime.ts",
248
- "line": 62,
248
+ "line": 63,
249
249
  "character": 14
250
250
  },
251
251
  "types": [
@@ -253,7 +253,7 @@
253
253
  "__schema": "TypeRefSchema",
254
254
  "location": {
255
255
  "filePath": "config-merger.main.runtime.ts",
256
- "line": 62,
256
+ "line": 63,
257
257
  "character": 14
258
258
  },
259
259
  "name": "Error"
@@ -262,7 +262,7 @@
262
262
  "__schema": "KeywordTypeSchema",
263
263
  "location": {
264
264
  "filePath": "config-merger.main.runtime.ts",
265
- "line": 62,
265
+ "line": 63,
266
266
  "character": 22
267
267
  },
268
268
  "name": "undefined"
@@ -279,7 +279,7 @@
279
279
  "__schema": "FunctionLikeSchema",
280
280
  "location": {
281
281
  "filePath": "config-merger.main.runtime.ts",
282
- "line": 130,
282
+ "line": 131,
283
283
  "character": 3
284
284
  },
285
285
  "signature": "(method) ConfigMergerMain.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge: ConfigMergeResult[]): Promise<{\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined;\n}>",
@@ -289,7 +289,7 @@
289
289
  "__schema": "ParameterSchema",
290
290
  "location": {
291
291
  "filePath": "config-merger.main.runtime.ts",
292
- "line": 130,
292
+ "line": 131,
293
293
  "character": 46
294
294
  },
295
295
  "name": "allConfigMerge",
@@ -297,14 +297,14 @@
297
297
  "__schema": "TypeArraySchema",
298
298
  "location": {
299
299
  "filePath": "config-merger.main.runtime.ts",
300
- "line": 130,
300
+ "line": 131,
301
301
  "character": 62
302
302
  },
303
303
  "type": {
304
304
  "__schema": "TypeRefSchema",
305
305
  "location": {
306
306
  "filePath": "config-merger.main.runtime.ts",
307
- "line": 130,
307
+ "line": 131,
308
308
  "character": 62
309
309
  },
310
310
  "name": "ConfigMergeResult"
@@ -318,7 +318,7 @@
318
318
  "__schema": "TypeRefSchema",
319
319
  "location": {
320
320
  "filePath": "config-merger.main.runtime.ts",
321
- "line": 130,
321
+ "line": 131,
322
322
  "character": 84
323
323
  },
324
324
  "name": "Promise",
@@ -327,7 +327,7 @@
327
327
  "__schema": "TypeLiteralSchema",
328
328
  "location": {
329
329
  "filePath": "config-merger.main.runtime.ts",
330
- "line": 130,
330
+ "line": 131,
331
331
  "character": 92
332
332
  },
333
333
  "members": [
@@ -335,7 +335,7 @@
335
335
  "__schema": "VariableLikeSchema",
336
336
  "location": {
337
337
  "filePath": "config-merger.main.runtime.ts",
338
- "line": 131,
338
+ "line": 132,
339
339
  "character": 5
340
340
  },
341
341
  "signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
@@ -344,7 +344,7 @@
344
344
  "__schema": "TypeRefSchema",
345
345
  "location": {
346
346
  "filePath": "config-merger.main.runtime.ts",
347
- "line": 131,
347
+ "line": 132,
348
348
  "character": 28
349
349
  },
350
350
  "name": "WorkspaceDepsUpdates"
@@ -355,7 +355,7 @@
355
355
  "__schema": "VariableLikeSchema",
356
356
  "location": {
357
357
  "filePath": "config-merger.main.runtime.ts",
358
- "line": 132,
358
+ "line": 133,
359
359
  "character": 5
360
360
  },
361
361
  "signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
@@ -364,7 +364,7 @@
364
364
  "__schema": "TypeRefSchema",
365
365
  "location": {
366
366
  "filePath": "config-merger.main.runtime.ts",
367
- "line": 132,
367
+ "line": 133,
368
368
  "character": 30
369
369
  },
370
370
  "name": "WorkspaceDepsConflicts"
@@ -375,7 +375,7 @@
375
375
  "__schema": "VariableLikeSchema",
376
376
  "location": {
377
377
  "filePath": "config-merger.main.runtime.ts",
378
- "line": 133,
378
+ "line": 134,
379
379
  "character": 5
380
380
  },
381
381
  "signature": "(property) workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined",
@@ -384,7 +384,7 @@
384
384
  "__schema": "TypeRefSchema",
385
385
  "location": {
386
386
  "filePath": "config-merger.main.runtime.ts",
387
- "line": 133,
387
+ "line": 134,
388
388
  "character": 30
389
389
  },
390
390
  "name": "WorkspaceDepsUnchanged",
@@ -404,33 +404,33 @@
404
404
  "__schema": "FunctionLikeSchema",
405
405
  "location": {
406
406
  "filePath": "config-merger.main.runtime.ts",
407
- "line": 265,
407
+ "line": 266,
408
408
  "character": 3
409
409
  },
410
- "signature": "(method) ConfigMergerMain.updateDepsInWorkspaceConfig(components: ConsumerComponent[]): Promise<WorkspaceConfigUpdateResult | undefined>",
410
+ "signature": "(method) ConfigMergerMain.updateDepsInWorkspaceConfig(components: ConsumerComponent[], mergeStrategy?: MergeStrategy): Promise<WorkspaceConfigUpdateResult | undefined>",
411
411
  "name": "updateDepsInWorkspaceConfig",
412
412
  "params": [
413
413
  {
414
414
  "__schema": "ParameterSchema",
415
415
  "location": {
416
416
  "filePath": "config-merger.main.runtime.ts",
417
- "line": 265,
418
- "character": 37
417
+ "line": 267,
418
+ "character": 5
419
419
  },
420
420
  "name": "components",
421
421
  "type": {
422
422
  "__schema": "TypeArraySchema",
423
423
  "location": {
424
424
  "filePath": "config-merger.main.runtime.ts",
425
- "line": 265,
426
- "character": 49
425
+ "line": 267,
426
+ "character": 17
427
427
  },
428
428
  "type": {
429
429
  "__schema": "TypeRefSchema",
430
430
  "location": {
431
431
  "filePath": "config-merger.main.runtime.ts",
432
- "line": 265,
433
- "character": 49
432
+ "line": 267,
433
+ "character": 17
434
434
  },
435
435
  "name": "ConsumerComponent",
436
436
  "packageName": "@teambit/legacy/dist/consumer/component"
@@ -438,14 +438,35 @@
438
438
  },
439
439
  "isOptional": false,
440
440
  "isSpread": false
441
+ },
442
+ {
443
+ "__schema": "ParameterSchema",
444
+ "location": {
445
+ "filePath": "config-merger.main.runtime.ts",
446
+ "line": 268,
447
+ "character": 5
448
+ },
449
+ "name": "mergeStrategy",
450
+ "type": {
451
+ "__schema": "TypeRefSchema",
452
+ "location": {
453
+ "filePath": "config-merger.main.runtime.ts",
454
+ "line": 268,
455
+ "character": 21
456
+ },
457
+ "name": "MergeStrategy",
458
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
459
+ },
460
+ "isOptional": true,
461
+ "isSpread": false
441
462
  }
442
463
  ],
443
464
  "returnType": {
444
465
  "__schema": "TypeRefSchema",
445
466
  "location": {
446
467
  "filePath": "config-merger.main.runtime.ts",
447
- "line": 265,
448
- "character": 71
468
+ "line": 269,
469
+ "character": 6
449
470
  },
450
471
  "name": "Promise",
451
472
  "typeArgs": [
@@ -453,16 +474,16 @@
453
474
  "__schema": "TypeUnionSchema",
454
475
  "location": {
455
476
  "filePath": "config-merger.main.runtime.ts",
456
- "line": 265,
457
- "character": 79
477
+ "line": 269,
478
+ "character": 14
458
479
  },
459
480
  "types": [
460
481
  {
461
482
  "__schema": "TypeRefSchema",
462
483
  "location": {
463
484
  "filePath": "config-merger.main.runtime.ts",
464
- "line": 265,
465
- "character": 79
485
+ "line": 269,
486
+ "character": 14
466
487
  },
467
488
  "name": "WorkspaceConfigUpdateResult"
468
489
  },
@@ -470,8 +491,8 @@
470
491
  "__schema": "KeywordTypeSchema",
471
492
  "location": {
472
493
  "filePath": "config-merger.main.runtime.ts",
473
- "line": 265,
474
- "character": 109
494
+ "line": 269,
495
+ "character": 44
475
496
  },
476
497
  "name": "undefined"
477
498
  }
@@ -487,7 +508,7 @@
487
508
  "__schema": "VariableLikeSchema",
488
509
  "location": {
489
510
  "filePath": "config-merger.main.runtime.ts",
490
- "line": 483,
511
+ "line": 495,
491
512
  "character": 3
492
513
  },
493
514
  "signature": "(property) ConfigMergerMain.slots: never[]",
@@ -496,7 +517,7 @@
496
517
  "__schema": "InferenceTypeSchema",
497
518
  "location": {
498
519
  "filePath": "config-merger.main.runtime.ts",
499
- "line": 483,
520
+ "line": 495,
500
521
  "character": 3
501
522
  },
502
523
  "type": "never[]"
@@ -508,7 +529,7 @@
508
529
  "__schema": "VariableLikeSchema",
509
530
  "location": {
510
531
  "filePath": "config-merger.main.runtime.ts",
511
- "line": 484,
532
+ "line": 496,
512
533
  "character": 3
513
534
  },
514
535
  "signature": "(property) ConfigMergerMain.dependencies: Aspect[]",
@@ -517,7 +538,7 @@
517
538
  "__schema": "InferenceTypeSchema",
518
539
  "location": {
519
540
  "filePath": "config-merger.main.runtime.ts",
520
- "line": 484,
541
+ "line": 496,
521
542
  "character": 3
522
543
  },
523
544
  "type": "Aspect[]"
@@ -529,7 +550,7 @@
529
550
  "__schema": "VariableLikeSchema",
530
551
  "location": {
531
552
  "filePath": "config-merger.main.runtime.ts",
532
- "line": 485,
553
+ "line": 497,
533
554
  "character": 3
534
555
  },
535
556
  "signature": "(property) ConfigMergerMain.runtime: RuntimeDefinition",
@@ -538,7 +559,7 @@
538
559
  "__schema": "InferenceTypeSchema",
539
560
  "location": {
540
561
  "filePath": "config-merger.main.runtime.ts",
541
- "line": 485,
562
+ "line": 497,
542
563
  "character": 3
543
564
  },
544
565
  "type": "RuntimeDefinition"
@@ -550,7 +571,7 @@
550
571
  "__schema": "FunctionLikeSchema",
551
572
  "location": {
552
573
  "filePath": "config-merger.main.runtime.ts",
553
- "line": 486,
574
+ "line": 498,
554
575
  "character": 3
555
576
  },
556
577
  "signature": "(method) ConfigMergerMain.provider([workspace, config, loggerMain, depsResolver]: [\n Workspace,\n ConfigMain,\n LoggerMain,\n DependencyResolverMain\n]): Promise<ConfigMergerMain>",
@@ -560,7 +581,7 @@
560
581
  "__schema": "ParameterSchema",
561
582
  "location": {
562
583
  "filePath": "config-merger.main.runtime.ts",
563
- "line": 486,
584
+ "line": 498,
564
585
  "character": 25
565
586
  },
566
587
  "name": "[ workspace, config, loggerMain, depsResolver ]",
@@ -568,7 +589,7 @@
568
589
  "__schema": "TupleTypeSchema",
569
590
  "location": {
570
591
  "filePath": "config-merger.main.runtime.ts",
571
- "line": 486,
592
+ "line": 498,
572
593
  "character": 72
573
594
  },
574
595
  "elements": [
@@ -576,7 +597,7 @@
576
597
  "__schema": "TypeRefSchema",
577
598
  "location": {
578
599
  "filePath": "config-merger.main.runtime.ts",
579
- "line": 487,
600
+ "line": 499,
580
601
  "character": 5
581
602
  },
582
603
  "name": "Workspace",
@@ -589,7 +610,7 @@
589
610
  "__schema": "TypeRefSchema",
590
611
  "location": {
591
612
  "filePath": "config-merger.main.runtime.ts",
592
- "line": 488,
613
+ "line": 500,
593
614
  "character": 5
594
615
  },
595
616
  "name": "ConfigMain",
@@ -602,7 +623,7 @@
602
623
  "__schema": "TypeRefSchema",
603
624
  "location": {
604
625
  "filePath": "config-merger.main.runtime.ts",
605
- "line": 489,
626
+ "line": 501,
606
627
  "character": 5
607
628
  },
608
629
  "name": "LoggerMain",
@@ -615,7 +636,7 @@
615
636
  "__schema": "TypeRefSchema",
616
637
  "location": {
617
638
  "filePath": "config-merger.main.runtime.ts",
618
- "line": 490,
639
+ "line": 502,
619
640
  "character": 5
620
641
  },
621
642
  "name": "DependencyResolverMain",
@@ -634,7 +655,7 @@
634
655
  "__schema": "InferenceTypeSchema",
635
656
  "location": {
636
657
  "filePath": "config-merger.main.runtime.ts",
637
- "line": 486,
658
+ "line": 498,
638
659
  "character": 3
639
660
  },
640
661
  "type": "Promise<ConfigMergerMain>"
@@ -661,7 +682,7 @@
661
682
  "__schema": "TypeSchema",
662
683
  "location": {
663
684
  "filePath": "config-merger.main.runtime.ts",
664
- "line": 29,
685
+ "line": 30,
665
686
  "character": 1
666
687
  },
667
688
  "signature": "type WorkspaceDepsUpdates = {\n [pkgName: string]: [string, string];\n}",
@@ -670,7 +691,7 @@
670
691
  "__schema": "TypeLiteralSchema",
671
692
  "location": {
672
693
  "filePath": "config-merger.main.runtime.ts",
673
- "line": 29,
694
+ "line": 30,
674
695
  "character": 36
675
696
  },
676
697
  "members": [
@@ -678,14 +699,14 @@
678
699
  "__schema": "IndexSignatureSchema",
679
700
  "location": {
680
701
  "filePath": "config-merger.main.runtime.ts",
681
- "line": 29,
702
+ "line": 30,
682
703
  "character": 38
683
704
  },
684
705
  "keyType": {
685
706
  "__schema": "ParameterSchema",
686
707
  "location": {
687
708
  "filePath": "config-merger.main.runtime.ts",
688
- "line": 29,
709
+ "line": 30,
689
710
  "character": 39
690
711
  },
691
712
  "name": "pkgName",
@@ -693,7 +714,7 @@
693
714
  "__schema": "KeywordTypeSchema",
694
715
  "location": {
695
716
  "filePath": "config-merger.main.runtime.ts",
696
- "line": 29,
717
+ "line": 30,
697
718
  "character": 48
698
719
  },
699
720
  "name": "string"
@@ -705,7 +726,7 @@
705
726
  "__schema": "TupleTypeSchema",
706
727
  "location": {
707
728
  "filePath": "config-merger.main.runtime.ts",
708
- "line": 29,
729
+ "line": 30,
709
730
  "character": 57
710
731
  },
711
732
  "elements": [
@@ -713,7 +734,7 @@
713
734
  "__schema": "KeywordTypeSchema",
714
735
  "location": {
715
736
  "filePath": "config-merger.main.runtime.ts",
716
- "line": 29,
737
+ "line": 30,
717
738
  "character": 58
718
739
  },
719
740
  "name": "string"
@@ -722,7 +743,7 @@
722
743
  "__schema": "KeywordTypeSchema",
723
744
  "location": {
724
745
  "filePath": "config-merger.main.runtime.ts",
725
- "line": 29,
746
+ "line": 30,
726
747
  "character": 66
727
748
  },
728
749
  "name": "string"
@@ -746,7 +767,7 @@
746
767
  "__schema": "TypeSchema",
747
768
  "location": {
748
769
  "filePath": "config-merger.main.runtime.ts",
749
- "line": 30,
770
+ "line": 31,
750
771
  "character": 1
751
772
  },
752
773
  "signature": "type WorkspaceDepsConflicts = {\n dependencies: {\n name: string;\n version: string;\n }[];\n peerDependencies: {\n name: string;\n version: string;\n }[];\n}",
@@ -755,7 +776,7 @@
755
776
  "__schema": "TypeRefSchema",
756
777
  "location": {
757
778
  "filePath": "config-merger.main.runtime.ts",
758
- "line": 30,
779
+ "line": 31,
759
780
  "character": 38
760
781
  },
761
782
  "name": "Record",
@@ -764,7 +785,7 @@
764
785
  "__schema": "TypeRefSchema",
765
786
  "location": {
766
787
  "filePath": "config-merger.main.runtime.ts",
767
- "line": 30,
788
+ "line": 31,
768
789
  "character": 45
769
790
  },
770
791
  "name": "WorkspacePolicyConfigKeysNames",
@@ -777,7 +798,7 @@
777
798
  "__schema": "TypeRefSchema",
778
799
  "location": {
779
800
  "filePath": "config-merger.main.runtime.ts",
780
- "line": 30,
801
+ "line": 31,
781
802
  "character": 77
782
803
  },
783
804
  "name": "Array",
@@ -786,7 +807,7 @@
786
807
  "__schema": "TypeLiteralSchema",
787
808
  "location": {
788
809
  "filePath": "config-merger.main.runtime.ts",
789
- "line": 30,
810
+ "line": 31,
790
811
  "character": 83
791
812
  },
792
813
  "members": [
@@ -794,7 +815,7 @@
794
815
  "__schema": "VariableLikeSchema",
795
816
  "location": {
796
817
  "filePath": "config-merger.main.runtime.ts",
797
- "line": 30,
818
+ "line": 31,
798
819
  "character": 85
799
820
  },
800
821
  "signature": "(property) name: string",
@@ -803,7 +824,7 @@
803
824
  "__schema": "KeywordTypeSchema",
804
825
  "location": {
805
826
  "filePath": "config-merger.main.runtime.ts",
806
- "line": 30,
827
+ "line": 31,
807
828
  "character": 91
808
829
  },
809
830
  "name": "string"
@@ -814,7 +835,7 @@
814
835
  "__schema": "VariableLikeSchema",
815
836
  "location": {
816
837
  "filePath": "config-merger.main.runtime.ts",
817
- "line": 30,
838
+ "line": 31,
818
839
  "character": 99
819
840
  },
820
841
  "signature": "(property) version: string",
@@ -823,7 +844,7 @@
823
844
  "__schema": "KeywordTypeSchema",
824
845
  "location": {
825
846
  "filePath": "config-merger.main.runtime.ts",
826
- "line": 30,
847
+ "line": 31,
827
848
  "character": 108
828
849
  },
829
850
  "name": "string"
@@ -850,7 +871,7 @@
850
871
  "__schema": "TypeSchema",
851
872
  "location": {
852
873
  "filePath": "config-merger.main.runtime.ts",
853
- "line": 33,
874
+ "line": 34,
854
875
  "character": 1
855
876
  },
856
877
  "signature": "type WorkspaceConfigUpdateResult = {\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined;\n workspaceConfigConflictWriteError?: Error | undefined;\n logs?: string[] | undefined;\n}",
@@ -859,7 +880,7 @@
859
880
  "__schema": "TypeLiteralSchema",
860
881
  "location": {
861
882
  "filePath": "config-merger.main.runtime.ts",
862
- "line": 33,
883
+ "line": 34,
863
884
  "character": 43
864
885
  },
865
886
  "members": [
@@ -867,7 +888,7 @@
867
888
  "__schema": "VariableLikeSchema",
868
889
  "location": {
869
890
  "filePath": "config-merger.main.runtime.ts",
870
- "line": 34,
891
+ "line": 35,
871
892
  "character": 3
872
893
  },
873
894
  "signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
@@ -876,7 +897,7 @@
876
897
  "__schema": "TypeRefSchema",
877
898
  "location": {
878
899
  "filePath": "config-merger.main.runtime.ts",
879
- "line": 34,
900
+ "line": 35,
880
901
  "character": 26
881
902
  },
882
903
  "name": "WorkspaceDepsUpdates"
@@ -887,7 +908,7 @@
887
908
  "__schema": "VariableLikeSchema",
888
909
  "location": {
889
910
  "filePath": "config-merger.main.runtime.ts",
890
- "line": 35,
911
+ "line": 36,
891
912
  "character": 3
892
913
  },
893
914
  "signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
@@ -896,7 +917,7 @@
896
917
  "__schema": "TypeRefSchema",
897
918
  "location": {
898
919
  "filePath": "config-merger.main.runtime.ts",
899
- "line": 35,
920
+ "line": 36,
900
921
  "character": 28
901
922
  },
902
923
  "name": "WorkspaceDepsConflicts"
@@ -907,7 +928,7 @@
907
928
  "__schema": "VariableLikeSchema",
908
929
  "location": {
909
930
  "filePath": "config-merger.main.runtime.ts",
910
- "line": 36,
931
+ "line": 37,
911
932
  "character": 3
912
933
  },
913
934
  "signature": "(property) workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined",
@@ -916,7 +937,7 @@
916
937
  "__schema": "TypeRefSchema",
917
938
  "location": {
918
939
  "filePath": "config-merger.main.runtime.ts",
919
- "line": 36,
940
+ "line": 37,
920
941
  "character": 28
921
942
  },
922
943
  "name": "WorkspaceDepsUnchanged",
@@ -928,7 +949,7 @@
928
949
  "__schema": "VariableLikeSchema",
929
950
  "location": {
930
951
  "filePath": "config-merger.main.runtime.ts",
931
- "line": 37,
952
+ "line": 38,
932
953
  "character": 3
933
954
  },
934
955
  "signature": "(property) workspaceConfigConflictWriteError?: Error | undefined",
@@ -937,7 +958,7 @@
937
958
  "__schema": "TypeRefSchema",
938
959
  "location": {
939
960
  "filePath": "config-merger.main.runtime.ts",
940
- "line": 37,
961
+ "line": 38,
941
962
  "character": 39
942
963
  },
943
964
  "name": "Error"
@@ -948,7 +969,7 @@
948
969
  "__schema": "VariableLikeSchema",
949
970
  "location": {
950
971
  "filePath": "config-merger.main.runtime.ts",
951
- "line": 38,
972
+ "line": 39,
952
973
  "character": 3
953
974
  },
954
975
  "signature": "(property) logs?: string[] | undefined",
@@ -957,14 +978,14 @@
957
978
  "__schema": "TypeArraySchema",
958
979
  "location": {
959
980
  "filePath": "config-merger.main.runtime.ts",
960
- "line": 38,
981
+ "line": 39,
961
982
  "character": 10
962
983
  },
963
984
  "type": {
964
985
  "__schema": "KeywordTypeSchema",
965
986
  "location": {
966
987
  "filePath": "config-merger.main.runtime.ts",
967
- "line": 38,
988
+ "line": 39,
968
989
  "character": 10
969
990
  },
970
991
  "name": "string"
@@ -1631,7 +1652,7 @@
1631
1652
  "__schema": "TypeSchema",
1632
1653
  "location": {
1633
1654
  "filePath": "config-merger.main.runtime.ts",
1634
- "line": 25,
1655
+ "line": 26,
1635
1656
  "character": 1
1636
1657
  },
1637
1658
  "signature": "type PkgEntry = {\n name: string;\n version: string;\n force: boolean;\n}",
@@ -1640,7 +1661,7 @@
1640
1661
  "__schema": "TypeLiteralSchema",
1641
1662
  "location": {
1642
1663
  "filePath": "config-merger.main.runtime.ts",
1643
- "line": 25,
1664
+ "line": 26,
1644
1665
  "character": 24
1645
1666
  },
1646
1667
  "members": [
@@ -1648,7 +1669,7 @@
1648
1669
  "__schema": "VariableLikeSchema",
1649
1670
  "location": {
1650
1671
  "filePath": "config-merger.main.runtime.ts",
1651
- "line": 25,
1672
+ "line": 26,
1652
1673
  "character": 26
1653
1674
  },
1654
1675
  "signature": "(property) name: string",
@@ -1657,7 +1678,7 @@
1657
1678
  "__schema": "KeywordTypeSchema",
1658
1679
  "location": {
1659
1680
  "filePath": "config-merger.main.runtime.ts",
1660
- "line": 25,
1681
+ "line": 26,
1661
1682
  "character": 32
1662
1683
  },
1663
1684
  "name": "string"
@@ -1668,7 +1689,7 @@
1668
1689
  "__schema": "VariableLikeSchema",
1669
1690
  "location": {
1670
1691
  "filePath": "config-merger.main.runtime.ts",
1671
- "line": 25,
1692
+ "line": 26,
1672
1693
  "character": 40
1673
1694
  },
1674
1695
  "signature": "(property) version: string",
@@ -1677,7 +1698,7 @@
1677
1698
  "__schema": "KeywordTypeSchema",
1678
1699
  "location": {
1679
1700
  "filePath": "config-merger.main.runtime.ts",
1680
- "line": 25,
1701
+ "line": 26,
1681
1702
  "character": 49
1682
1703
  },
1683
1704
  "name": "string"
@@ -1688,7 +1709,7 @@
1688
1709
  "__schema": "VariableLikeSchema",
1689
1710
  "location": {
1690
1711
  "filePath": "config-merger.main.runtime.ts",
1691
- "line": 25,
1712
+ "line": 26,
1692
1713
  "character": 57
1693
1714
  },
1694
1715
  "signature": "(property) force: boolean",
@@ -1697,7 +1718,7 @@
1697
1718
  "__schema": "KeywordTypeSchema",
1698
1719
  "location": {
1699
1720
  "filePath": "config-merger.main.runtime.ts",
1700
- "line": 25,
1721
+ "line": 26,
1701
1722
  "character": 64
1702
1723
  },
1703
1724
  "name": "boolean"
@@ -1711,7 +1732,7 @@
1711
1732
  "__schema": "TypeSchema",
1712
1733
  "location": {
1713
1734
  "filePath": "config-merger.main.runtime.ts",
1714
- "line": 29,
1735
+ "line": 30,
1715
1736
  "character": 1
1716
1737
  },
1717
1738
  "signature": "type WorkspaceDepsUpdates = {\n [pkgName: string]: [string, string];\n}",
@@ -1720,7 +1741,7 @@
1720
1741
  "__schema": "TypeLiteralSchema",
1721
1742
  "location": {
1722
1743
  "filePath": "config-merger.main.runtime.ts",
1723
- "line": 29,
1744
+ "line": 30,
1724
1745
  "character": 36
1725
1746
  },
1726
1747
  "members": [
@@ -1728,14 +1749,14 @@
1728
1749
  "__schema": "IndexSignatureSchema",
1729
1750
  "location": {
1730
1751
  "filePath": "config-merger.main.runtime.ts",
1731
- "line": 29,
1752
+ "line": 30,
1732
1753
  "character": 38
1733
1754
  },
1734
1755
  "keyType": {
1735
1756
  "__schema": "ParameterSchema",
1736
1757
  "location": {
1737
1758
  "filePath": "config-merger.main.runtime.ts",
1738
- "line": 29,
1759
+ "line": 30,
1739
1760
  "character": 39
1740
1761
  },
1741
1762
  "name": "pkgName",
@@ -1743,7 +1764,7 @@
1743
1764
  "__schema": "KeywordTypeSchema",
1744
1765
  "location": {
1745
1766
  "filePath": "config-merger.main.runtime.ts",
1746
- "line": 29,
1767
+ "line": 30,
1747
1768
  "character": 48
1748
1769
  },
1749
1770
  "name": "string"
@@ -1755,7 +1776,7 @@
1755
1776
  "__schema": "TupleTypeSchema",
1756
1777
  "location": {
1757
1778
  "filePath": "config-merger.main.runtime.ts",
1758
- "line": 29,
1779
+ "line": 30,
1759
1780
  "character": 57
1760
1781
  },
1761
1782
  "elements": [
@@ -1763,7 +1784,7 @@
1763
1784
  "__schema": "KeywordTypeSchema",
1764
1785
  "location": {
1765
1786
  "filePath": "config-merger.main.runtime.ts",
1766
- "line": 29,
1787
+ "line": 30,
1767
1788
  "character": 58
1768
1789
  },
1769
1790
  "name": "string"
@@ -1772,7 +1793,7 @@
1772
1793
  "__schema": "KeywordTypeSchema",
1773
1794
  "location": {
1774
1795
  "filePath": "config-merger.main.runtime.ts",
1775
- "line": 29,
1796
+ "line": 30,
1776
1797
  "character": 66
1777
1798
  },
1778
1799
  "name": "string"
@@ -1787,7 +1808,7 @@
1787
1808
  "__schema": "TypeSchema",
1788
1809
  "location": {
1789
1810
  "filePath": "config-merger.main.runtime.ts",
1790
- "line": 30,
1811
+ "line": 31,
1791
1812
  "character": 1
1792
1813
  },
1793
1814
  "signature": "type WorkspaceDepsConflicts = {\n dependencies: {\n name: string;\n version: string;\n }[];\n peerDependencies: {\n name: string;\n version: string;\n }[];\n}",
@@ -1796,7 +1817,7 @@
1796
1817
  "__schema": "TypeRefSchema",
1797
1818
  "location": {
1798
1819
  "filePath": "config-merger.main.runtime.ts",
1799
- "line": 30,
1820
+ "line": 31,
1800
1821
  "character": 38
1801
1822
  },
1802
1823
  "name": "Record",
@@ -1805,7 +1826,7 @@
1805
1826
  "__schema": "TypeRefSchema",
1806
1827
  "location": {
1807
1828
  "filePath": "config-merger.main.runtime.ts",
1808
- "line": 30,
1829
+ "line": 31,
1809
1830
  "character": 45
1810
1831
  },
1811
1832
  "name": "WorkspacePolicyConfigKeysNames",
@@ -1818,7 +1839,7 @@
1818
1839
  "__schema": "TypeRefSchema",
1819
1840
  "location": {
1820
1841
  "filePath": "config-merger.main.runtime.ts",
1821
- "line": 30,
1842
+ "line": 31,
1822
1843
  "character": 77
1823
1844
  },
1824
1845
  "name": "Array",
@@ -1827,7 +1848,7 @@
1827
1848
  "__schema": "TypeLiteralSchema",
1828
1849
  "location": {
1829
1850
  "filePath": "config-merger.main.runtime.ts",
1830
- "line": 30,
1851
+ "line": 31,
1831
1852
  "character": 83
1832
1853
  },
1833
1854
  "members": [
@@ -1835,7 +1856,7 @@
1835
1856
  "__schema": "VariableLikeSchema",
1836
1857
  "location": {
1837
1858
  "filePath": "config-merger.main.runtime.ts",
1838
- "line": 30,
1859
+ "line": 31,
1839
1860
  "character": 85
1840
1861
  },
1841
1862
  "signature": "(property) name: string",
@@ -1844,7 +1865,7 @@
1844
1865
  "__schema": "KeywordTypeSchema",
1845
1866
  "location": {
1846
1867
  "filePath": "config-merger.main.runtime.ts",
1847
- "line": 30,
1868
+ "line": 31,
1848
1869
  "character": 91
1849
1870
  },
1850
1871
  "name": "string"
@@ -1855,7 +1876,7 @@
1855
1876
  "__schema": "VariableLikeSchema",
1856
1877
  "location": {
1857
1878
  "filePath": "config-merger.main.runtime.ts",
1858
- "line": 30,
1879
+ "line": 31,
1859
1880
  "character": 99
1860
1881
  },
1861
1882
  "signature": "(property) version: string",
@@ -1864,7 +1885,7 @@
1864
1885
  "__schema": "KeywordTypeSchema",
1865
1886
  "location": {
1866
1887
  "filePath": "config-merger.main.runtime.ts",
1867
- "line": 30,
1888
+ "line": 31,
1868
1889
  "character": 108
1869
1890
  },
1870
1891
  "name": "string"
@@ -1882,7 +1903,7 @@
1882
1903
  "__schema": "TypeSchema",
1883
1904
  "location": {
1884
1905
  "filePath": "config-merger.main.runtime.ts",
1885
- "line": 31,
1906
+ "line": 32,
1886
1907
  "character": 1
1887
1908
  },
1888
1909
  "signature": "type WorkspaceDepsUnchanged = {\n [pkgName: string]: string;\n}",
@@ -1891,7 +1912,7 @@
1891
1912
  "__schema": "TypeLiteralSchema",
1892
1913
  "location": {
1893
1914
  "filePath": "config-merger.main.runtime.ts",
1894
- "line": 31,
1915
+ "line": 32,
1895
1916
  "character": 38
1896
1917
  },
1897
1918
  "members": [
@@ -1899,14 +1920,14 @@
1899
1920
  "__schema": "IndexSignatureSchema",
1900
1921
  "location": {
1901
1922
  "filePath": "config-merger.main.runtime.ts",
1902
- "line": 31,
1923
+ "line": 32,
1903
1924
  "character": 40
1904
1925
  },
1905
1926
  "keyType": {
1906
1927
  "__schema": "ParameterSchema",
1907
1928
  "location": {
1908
1929
  "filePath": "config-merger.main.runtime.ts",
1909
- "line": 31,
1930
+ "line": 32,
1910
1931
  "character": 41
1911
1932
  },
1912
1933
  "name": "pkgName",
@@ -1914,7 +1935,7 @@
1914
1935
  "__schema": "KeywordTypeSchema",
1915
1936
  "location": {
1916
1937
  "filePath": "config-merger.main.runtime.ts",
1917
- "line": 31,
1938
+ "line": 32,
1918
1939
  "character": 50
1919
1940
  },
1920
1941
  "name": "string"
@@ -1926,7 +1947,7 @@
1926
1947
  "__schema": "KeywordTypeSchema",
1927
1948
  "location": {
1928
1949
  "filePath": "config-merger.main.runtime.ts",
1929
- "line": 31,
1950
+ "line": 32,
1930
1951
  "character": 59
1931
1952
  },
1932
1953
  "name": "string"
@@ -1939,7 +1960,7 @@
1939
1960
  "__schema": "TypeSchema",
1940
1961
  "location": {
1941
1962
  "filePath": "config-merger.main.runtime.ts",
1942
- "line": 33,
1963
+ "line": 34,
1943
1964
  "character": 1
1944
1965
  },
1945
1966
  "signature": "type WorkspaceConfigUpdateResult = {\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined;\n workspaceConfigConflictWriteError?: Error | undefined;\n logs?: string[] | undefined;\n}",
@@ -1948,7 +1969,7 @@
1948
1969
  "__schema": "TypeLiteralSchema",
1949
1970
  "location": {
1950
1971
  "filePath": "config-merger.main.runtime.ts",
1951
- "line": 33,
1972
+ "line": 34,
1952
1973
  "character": 43
1953
1974
  },
1954
1975
  "members": [
@@ -1956,7 +1977,7 @@
1956
1977
  "__schema": "VariableLikeSchema",
1957
1978
  "location": {
1958
1979
  "filePath": "config-merger.main.runtime.ts",
1959
- "line": 34,
1980
+ "line": 35,
1960
1981
  "character": 3
1961
1982
  },
1962
1983
  "signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
@@ -1965,7 +1986,7 @@
1965
1986
  "__schema": "TypeRefSchema",
1966
1987
  "location": {
1967
1988
  "filePath": "config-merger.main.runtime.ts",
1968
- "line": 34,
1989
+ "line": 35,
1969
1990
  "character": 26
1970
1991
  },
1971
1992
  "name": "WorkspaceDepsUpdates"
@@ -1976,7 +1997,7 @@
1976
1997
  "__schema": "VariableLikeSchema",
1977
1998
  "location": {
1978
1999
  "filePath": "config-merger.main.runtime.ts",
1979
- "line": 35,
2000
+ "line": 36,
1980
2001
  "character": 3
1981
2002
  },
1982
2003
  "signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
@@ -1985,7 +2006,7 @@
1985
2006
  "__schema": "TypeRefSchema",
1986
2007
  "location": {
1987
2008
  "filePath": "config-merger.main.runtime.ts",
1988
- "line": 35,
2009
+ "line": 36,
1989
2010
  "character": 28
1990
2011
  },
1991
2012
  "name": "WorkspaceDepsConflicts"
@@ -1996,7 +2017,7 @@
1996
2017
  "__schema": "VariableLikeSchema",
1997
2018
  "location": {
1998
2019
  "filePath": "config-merger.main.runtime.ts",
1999
- "line": 36,
2020
+ "line": 37,
2000
2021
  "character": 3
2001
2022
  },
2002
2023
  "signature": "(property) workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined",
@@ -2005,7 +2026,7 @@
2005
2026
  "__schema": "TypeRefSchema",
2006
2027
  "location": {
2007
2028
  "filePath": "config-merger.main.runtime.ts",
2008
- "line": 36,
2029
+ "line": 37,
2009
2030
  "character": 28
2010
2031
  },
2011
2032
  "name": "WorkspaceDepsUnchanged",
@@ -2017,7 +2038,7 @@
2017
2038
  "__schema": "VariableLikeSchema",
2018
2039
  "location": {
2019
2040
  "filePath": "config-merger.main.runtime.ts",
2020
- "line": 37,
2041
+ "line": 38,
2021
2042
  "character": 3
2022
2043
  },
2023
2044
  "signature": "(property) workspaceConfigConflictWriteError?: Error | undefined",
@@ -2026,7 +2047,7 @@
2026
2047
  "__schema": "TypeRefSchema",
2027
2048
  "location": {
2028
2049
  "filePath": "config-merger.main.runtime.ts",
2029
- "line": 37,
2050
+ "line": 38,
2030
2051
  "character": 39
2031
2052
  },
2032
2053
  "name": "Error"
@@ -2037,7 +2058,7 @@
2037
2058
  "__schema": "VariableLikeSchema",
2038
2059
  "location": {
2039
2060
  "filePath": "config-merger.main.runtime.ts",
2040
- "line": 38,
2061
+ "line": 39,
2041
2062
  "character": 3
2042
2063
  },
2043
2064
  "signature": "(property) logs?: string[] | undefined",
@@ -2046,14 +2067,14 @@
2046
2067
  "__schema": "TypeArraySchema",
2047
2068
  "location": {
2048
2069
  "filePath": "config-merger.main.runtime.ts",
2049
- "line": 38,
2070
+ "line": 39,
2050
2071
  "character": 10
2051
2072
  },
2052
2073
  "type": {
2053
2074
  "__schema": "KeywordTypeSchema",
2054
2075
  "location": {
2055
2076
  "filePath": "config-merger.main.runtime.ts",
2056
- "line": 38,
2077
+ "line": 39,
2057
2078
  "character": 10
2058
2079
  },
2059
2080
  "name": "string"
@@ -2068,7 +2089,7 @@
2068
2089
  "__schema": "ClassSchema",
2069
2090
  "location": {
2070
2091
  "filePath": "config-merger.main.runtime.ts",
2071
- "line": 40,
2092
+ "line": 41,
2072
2093
  "character": 1
2073
2094
  },
2074
2095
  "signature": "class ConfigMergerMain",
@@ -2078,7 +2099,7 @@
2078
2099
  "__schema": "ConstructorSchema",
2079
2100
  "location": {
2080
2101
  "filePath": "config-merger.main.runtime.ts",
2081
- "line": 41,
2102
+ "line": 42,
2082
2103
  "character": 3
2083
2104
  },
2084
2105
  "signature": "constructor ConfigMergerMain(workspace: Workspace, logger: Logger, config: ConfigMain, depsResolver: DependencyResolverMain): ConfigMergerMain",
@@ -2088,7 +2109,7 @@
2088
2109
  "__schema": "ParameterSchema",
2089
2110
  "location": {
2090
2111
  "filePath": "config-merger.main.runtime.ts",
2091
- "line": 42,
2112
+ "line": 43,
2092
2113
  "character": 5
2093
2114
  },
2094
2115
  "name": "workspace",
@@ -2096,7 +2117,7 @@
2096
2117
  "__schema": "TypeRefSchema",
2097
2118
  "location": {
2098
2119
  "filePath": "config-merger.main.runtime.ts",
2099
- "line": 42,
2120
+ "line": 43,
2100
2121
  "character": 24
2101
2122
  },
2102
2123
  "name": "Workspace",
@@ -2112,7 +2133,7 @@
2112
2133
  "__schema": "ParameterSchema",
2113
2134
  "location": {
2114
2135
  "filePath": "config-merger.main.runtime.ts",
2115
- "line": 43,
2136
+ "line": 44,
2116
2137
  "character": 5
2117
2138
  },
2118
2139
  "name": "logger",
@@ -2120,7 +2141,7 @@
2120
2141
  "__schema": "TypeRefSchema",
2121
2142
  "location": {
2122
2143
  "filePath": "config-merger.main.runtime.ts",
2123
- "line": 43,
2144
+ "line": 44,
2124
2145
  "character": 21
2125
2146
  },
2126
2147
  "name": "Logger",
@@ -2136,7 +2157,7 @@
2136
2157
  "__schema": "ParameterSchema",
2137
2158
  "location": {
2138
2159
  "filePath": "config-merger.main.runtime.ts",
2139
- "line": 44,
2160
+ "line": 45,
2140
2161
  "character": 5
2141
2162
  },
2142
2163
  "name": "config",
@@ -2144,7 +2165,7 @@
2144
2165
  "__schema": "TypeRefSchema",
2145
2166
  "location": {
2146
2167
  "filePath": "config-merger.main.runtime.ts",
2147
- "line": 44,
2168
+ "line": 45,
2148
2169
  "character": 21
2149
2170
  },
2150
2171
  "name": "ConfigMain",
@@ -2160,7 +2181,7 @@
2160
2181
  "__schema": "ParameterSchema",
2161
2182
  "location": {
2162
2183
  "filePath": "config-merger.main.runtime.ts",
2163
- "line": 45,
2184
+ "line": 46,
2164
2185
  "character": 5
2165
2186
  },
2166
2187
  "name": "depsResolver",
@@ -2168,7 +2189,7 @@
2168
2189
  "__schema": "TypeRefSchema",
2169
2190
  "location": {
2170
2191
  "filePath": "config-merger.main.runtime.ts",
2171
- "line": 45,
2192
+ "line": 46,
2172
2193
  "character": 27
2173
2194
  },
2174
2195
  "name": "DependencyResolverMain",
@@ -2185,7 +2206,7 @@
2185
2206
  "__schema": "ThisTypeSchema",
2186
2207
  "location": {
2187
2208
  "filePath": "config-merger.main.runtime.ts",
2188
- "line": 40,
2209
+ "line": 41,
2189
2210
  "character": 1
2190
2211
  },
2191
2212
  "name": "ConfigMergerMain"
@@ -2196,7 +2217,7 @@
2196
2217
  "__schema": "FunctionLikeSchema",
2197
2218
  "location": {
2198
2219
  "filePath": "config-merger.main.runtime.ts",
2199
- "line": 48,
2220
+ "line": 49,
2200
2221
  "character": 3
2201
2222
  },
2202
2223
  "signature": "(method) ConfigMergerMain.generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]): Promise<void>",
@@ -2206,7 +2227,7 @@
2206
2227
  "__schema": "ParameterSchema",
2207
2228
  "location": {
2208
2229
  "filePath": "config-merger.main.runtime.ts",
2209
- "line": 48,
2230
+ "line": 49,
2210
2231
  "character": 47
2211
2232
  },
2212
2233
  "name": "allConfigMerge",
@@ -2214,14 +2235,14 @@
2214
2235
  "__schema": "TypeArraySchema",
2215
2236
  "location": {
2216
2237
  "filePath": "config-merger.main.runtime.ts",
2217
- "line": 48,
2238
+ "line": 49,
2218
2239
  "character": 63
2219
2240
  },
2220
2241
  "type": {
2221
2242
  "__schema": "TypeRefSchema",
2222
2243
  "location": {
2223
2244
  "filePath": "config-merger.main.runtime.ts",
2224
- "line": 48,
2245
+ "line": 49,
2225
2246
  "character": 63
2226
2247
  },
2227
2248
  "name": "ConfigMergeResult"
@@ -2235,7 +2256,7 @@
2235
2256
  "__schema": "InferenceTypeSchema",
2236
2257
  "location": {
2237
2258
  "filePath": "config-merger.main.runtime.ts",
2238
- "line": 48,
2259
+ "line": 49,
2239
2260
  "character": 3
2240
2261
  },
2241
2262
  "type": "Promise<void>"
@@ -2248,7 +2269,7 @@
2248
2269
  "__schema": "FunctionLikeSchema",
2249
2270
  "location": {
2250
2271
  "filePath": "config-merger.main.runtime.ts",
2251
- "line": 60,
2272
+ "line": 61,
2252
2273
  "character": 3
2253
2274
  },
2254
2275
  "signature": "(method) ConfigMergerMain.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts: WorkspaceDepsConflicts): Promise<Error | undefined>",
@@ -2258,7 +2279,7 @@
2258
2279
  "__schema": "ParameterSchema",
2259
2280
  "location": {
2260
2281
  "filePath": "config-merger.main.runtime.ts",
2261
- "line": 61,
2282
+ "line": 62,
2262
2283
  "character": 5
2263
2284
  },
2264
2285
  "name": "workspaceDepsConflicts",
@@ -2266,7 +2287,7 @@
2266
2287
  "__schema": "TypeRefSchema",
2267
2288
  "location": {
2268
2289
  "filePath": "config-merger.main.runtime.ts",
2269
- "line": 61,
2290
+ "line": 62,
2270
2291
  "character": 29
2271
2292
  },
2272
2293
  "name": "WorkspaceDepsConflicts"
@@ -2279,7 +2300,7 @@
2279
2300
  "__schema": "TypeRefSchema",
2280
2301
  "location": {
2281
2302
  "filePath": "config-merger.main.runtime.ts",
2282
- "line": 62,
2303
+ "line": 63,
2283
2304
  "character": 6
2284
2305
  },
2285
2306
  "name": "Promise",
@@ -2288,7 +2309,7 @@
2288
2309
  "__schema": "TypeUnionSchema",
2289
2310
  "location": {
2290
2311
  "filePath": "config-merger.main.runtime.ts",
2291
- "line": 62,
2312
+ "line": 63,
2292
2313
  "character": 14
2293
2314
  },
2294
2315
  "types": [
@@ -2296,7 +2317,7 @@
2296
2317
  "__schema": "TypeRefSchema",
2297
2318
  "location": {
2298
2319
  "filePath": "config-merger.main.runtime.ts",
2299
- "line": 62,
2320
+ "line": 63,
2300
2321
  "character": 14
2301
2322
  },
2302
2323
  "name": "Error"
@@ -2305,7 +2326,7 @@
2305
2326
  "__schema": "KeywordTypeSchema",
2306
2327
  "location": {
2307
2328
  "filePath": "config-merger.main.runtime.ts",
2308
- "line": 62,
2329
+ "line": 63,
2309
2330
  "character": 22
2310
2331
  },
2311
2332
  "name": "undefined"
@@ -2322,7 +2343,7 @@
2322
2343
  "__schema": "FunctionLikeSchema",
2323
2344
  "location": {
2324
2345
  "filePath": "config-merger.main.runtime.ts",
2325
- "line": 130,
2346
+ "line": 131,
2326
2347
  "character": 3
2327
2348
  },
2328
2349
  "signature": "(method) ConfigMergerMain.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge: ConfigMergeResult[]): Promise<{\n workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined;\n workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined;\n workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined;\n}>",
@@ -2332,7 +2353,7 @@
2332
2353
  "__schema": "ParameterSchema",
2333
2354
  "location": {
2334
2355
  "filePath": "config-merger.main.runtime.ts",
2335
- "line": 130,
2356
+ "line": 131,
2336
2357
  "character": 46
2337
2358
  },
2338
2359
  "name": "allConfigMerge",
@@ -2340,14 +2361,14 @@
2340
2361
  "__schema": "TypeArraySchema",
2341
2362
  "location": {
2342
2363
  "filePath": "config-merger.main.runtime.ts",
2343
- "line": 130,
2364
+ "line": 131,
2344
2365
  "character": 62
2345
2366
  },
2346
2367
  "type": {
2347
2368
  "__schema": "TypeRefSchema",
2348
2369
  "location": {
2349
2370
  "filePath": "config-merger.main.runtime.ts",
2350
- "line": 130,
2371
+ "line": 131,
2351
2372
  "character": 62
2352
2373
  },
2353
2374
  "name": "ConfigMergeResult"
@@ -2361,7 +2382,7 @@
2361
2382
  "__schema": "TypeRefSchema",
2362
2383
  "location": {
2363
2384
  "filePath": "config-merger.main.runtime.ts",
2364
- "line": 130,
2385
+ "line": 131,
2365
2386
  "character": 84
2366
2387
  },
2367
2388
  "name": "Promise",
@@ -2370,7 +2391,7 @@
2370
2391
  "__schema": "TypeLiteralSchema",
2371
2392
  "location": {
2372
2393
  "filePath": "config-merger.main.runtime.ts",
2373
- "line": 130,
2394
+ "line": 131,
2374
2395
  "character": 92
2375
2396
  },
2376
2397
  "members": [
@@ -2378,7 +2399,7 @@
2378
2399
  "__schema": "VariableLikeSchema",
2379
2400
  "location": {
2380
2401
  "filePath": "config-merger.main.runtime.ts",
2381
- "line": 131,
2402
+ "line": 132,
2382
2403
  "character": 5
2383
2404
  },
2384
2405
  "signature": "(property) workspaceDepsUpdates?: WorkspaceDepsUpdates | undefined",
@@ -2387,7 +2408,7 @@
2387
2408
  "__schema": "TypeRefSchema",
2388
2409
  "location": {
2389
2410
  "filePath": "config-merger.main.runtime.ts",
2390
- "line": 131,
2411
+ "line": 132,
2391
2412
  "character": 28
2392
2413
  },
2393
2414
  "name": "WorkspaceDepsUpdates"
@@ -2398,7 +2419,7 @@
2398
2419
  "__schema": "VariableLikeSchema",
2399
2420
  "location": {
2400
2421
  "filePath": "config-merger.main.runtime.ts",
2401
- "line": 132,
2422
+ "line": 133,
2402
2423
  "character": 5
2403
2424
  },
2404
2425
  "signature": "(property) workspaceDepsConflicts?: WorkspaceDepsConflicts | undefined",
@@ -2407,7 +2428,7 @@
2407
2428
  "__schema": "TypeRefSchema",
2408
2429
  "location": {
2409
2430
  "filePath": "config-merger.main.runtime.ts",
2410
- "line": 132,
2431
+ "line": 133,
2411
2432
  "character": 30
2412
2433
  },
2413
2434
  "name": "WorkspaceDepsConflicts"
@@ -2418,7 +2439,7 @@
2418
2439
  "__schema": "VariableLikeSchema",
2419
2440
  "location": {
2420
2441
  "filePath": "config-merger.main.runtime.ts",
2421
- "line": 133,
2442
+ "line": 134,
2422
2443
  "character": 5
2423
2444
  },
2424
2445
  "signature": "(property) workspaceDepsUnchanged?: WorkspaceDepsUnchanged | undefined",
@@ -2427,7 +2448,7 @@
2427
2448
  "__schema": "TypeRefSchema",
2428
2449
  "location": {
2429
2450
  "filePath": "config-merger.main.runtime.ts",
2430
- "line": 133,
2451
+ "line": 134,
2431
2452
  "character": 30
2432
2453
  },
2433
2454
  "name": "WorkspaceDepsUnchanged",
@@ -2447,33 +2468,33 @@
2447
2468
  "__schema": "FunctionLikeSchema",
2448
2469
  "location": {
2449
2470
  "filePath": "config-merger.main.runtime.ts",
2450
- "line": 265,
2471
+ "line": 266,
2451
2472
  "character": 3
2452
2473
  },
2453
- "signature": "(method) ConfigMergerMain.updateDepsInWorkspaceConfig(components: ConsumerComponent[]): Promise<WorkspaceConfigUpdateResult | undefined>",
2474
+ "signature": "(method) ConfigMergerMain.updateDepsInWorkspaceConfig(components: ConsumerComponent[], mergeStrategy?: MergeStrategy): Promise<WorkspaceConfigUpdateResult | undefined>",
2454
2475
  "name": "updateDepsInWorkspaceConfig",
2455
2476
  "params": [
2456
2477
  {
2457
2478
  "__schema": "ParameterSchema",
2458
2479
  "location": {
2459
2480
  "filePath": "config-merger.main.runtime.ts",
2460
- "line": 265,
2461
- "character": 37
2481
+ "line": 267,
2482
+ "character": 5
2462
2483
  },
2463
2484
  "name": "components",
2464
2485
  "type": {
2465
2486
  "__schema": "TypeArraySchema",
2466
2487
  "location": {
2467
2488
  "filePath": "config-merger.main.runtime.ts",
2468
- "line": 265,
2469
- "character": 49
2489
+ "line": 267,
2490
+ "character": 17
2470
2491
  },
2471
2492
  "type": {
2472
2493
  "__schema": "TypeRefSchema",
2473
2494
  "location": {
2474
2495
  "filePath": "config-merger.main.runtime.ts",
2475
- "line": 265,
2476
- "character": 49
2496
+ "line": 267,
2497
+ "character": 17
2477
2498
  },
2478
2499
  "name": "ConsumerComponent",
2479
2500
  "packageName": "@teambit/legacy/dist/consumer/component"
@@ -2481,14 +2502,35 @@
2481
2502
  },
2482
2503
  "isOptional": false,
2483
2504
  "isSpread": false
2505
+ },
2506
+ {
2507
+ "__schema": "ParameterSchema",
2508
+ "location": {
2509
+ "filePath": "config-merger.main.runtime.ts",
2510
+ "line": 268,
2511
+ "character": 5
2512
+ },
2513
+ "name": "mergeStrategy",
2514
+ "type": {
2515
+ "__schema": "TypeRefSchema",
2516
+ "location": {
2517
+ "filePath": "config-merger.main.runtime.ts",
2518
+ "line": 268,
2519
+ "character": 21
2520
+ },
2521
+ "name": "MergeStrategy",
2522
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
2523
+ },
2524
+ "isOptional": true,
2525
+ "isSpread": false
2484
2526
  }
2485
2527
  ],
2486
2528
  "returnType": {
2487
2529
  "__schema": "TypeRefSchema",
2488
2530
  "location": {
2489
2531
  "filePath": "config-merger.main.runtime.ts",
2490
- "line": 265,
2491
- "character": 71
2532
+ "line": 269,
2533
+ "character": 6
2492
2534
  },
2493
2535
  "name": "Promise",
2494
2536
  "typeArgs": [
@@ -2496,16 +2538,16 @@
2496
2538
  "__schema": "TypeUnionSchema",
2497
2539
  "location": {
2498
2540
  "filePath": "config-merger.main.runtime.ts",
2499
- "line": 265,
2500
- "character": 79
2541
+ "line": 269,
2542
+ "character": 14
2501
2543
  },
2502
2544
  "types": [
2503
2545
  {
2504
2546
  "__schema": "TypeRefSchema",
2505
2547
  "location": {
2506
2548
  "filePath": "config-merger.main.runtime.ts",
2507
- "line": 265,
2508
- "character": 79
2549
+ "line": 269,
2550
+ "character": 14
2509
2551
  },
2510
2552
  "name": "WorkspaceConfigUpdateResult"
2511
2553
  },
@@ -2513,8 +2555,8 @@
2513
2555
  "__schema": "KeywordTypeSchema",
2514
2556
  "location": {
2515
2557
  "filePath": "config-merger.main.runtime.ts",
2516
- "line": 265,
2517
- "character": 109
2558
+ "line": 269,
2559
+ "character": 44
2518
2560
  },
2519
2561
  "name": "undefined"
2520
2562
  }
@@ -2530,7 +2572,7 @@
2530
2572
  "__schema": "VariableLikeSchema",
2531
2573
  "location": {
2532
2574
  "filePath": "config-merger.main.runtime.ts",
2533
- "line": 483,
2575
+ "line": 495,
2534
2576
  "character": 3
2535
2577
  },
2536
2578
  "signature": "(property) ConfigMergerMain.slots: never[]",
@@ -2539,7 +2581,7 @@
2539
2581
  "__schema": "InferenceTypeSchema",
2540
2582
  "location": {
2541
2583
  "filePath": "config-merger.main.runtime.ts",
2542
- "line": 483,
2584
+ "line": 495,
2543
2585
  "character": 3
2544
2586
  },
2545
2587
  "type": "never[]"
@@ -2551,7 +2593,7 @@
2551
2593
  "__schema": "VariableLikeSchema",
2552
2594
  "location": {
2553
2595
  "filePath": "config-merger.main.runtime.ts",
2554
- "line": 484,
2596
+ "line": 496,
2555
2597
  "character": 3
2556
2598
  },
2557
2599
  "signature": "(property) ConfigMergerMain.dependencies: Aspect[]",
@@ -2560,7 +2602,7 @@
2560
2602
  "__schema": "InferenceTypeSchema",
2561
2603
  "location": {
2562
2604
  "filePath": "config-merger.main.runtime.ts",
2563
- "line": 484,
2605
+ "line": 496,
2564
2606
  "character": 3
2565
2607
  },
2566
2608
  "type": "Aspect[]"
@@ -2572,7 +2614,7 @@
2572
2614
  "__schema": "VariableLikeSchema",
2573
2615
  "location": {
2574
2616
  "filePath": "config-merger.main.runtime.ts",
2575
- "line": 485,
2617
+ "line": 497,
2576
2618
  "character": 3
2577
2619
  },
2578
2620
  "signature": "(property) ConfigMergerMain.runtime: RuntimeDefinition",
@@ -2581,7 +2623,7 @@
2581
2623
  "__schema": "InferenceTypeSchema",
2582
2624
  "location": {
2583
2625
  "filePath": "config-merger.main.runtime.ts",
2584
- "line": 485,
2626
+ "line": 497,
2585
2627
  "character": 3
2586
2628
  },
2587
2629
  "type": "RuntimeDefinition"
@@ -2593,7 +2635,7 @@
2593
2635
  "__schema": "FunctionLikeSchema",
2594
2636
  "location": {
2595
2637
  "filePath": "config-merger.main.runtime.ts",
2596
- "line": 486,
2638
+ "line": 498,
2597
2639
  "character": 3
2598
2640
  },
2599
2641
  "signature": "(method) ConfigMergerMain.provider([workspace, config, loggerMain, depsResolver]: [\n Workspace,\n ConfigMain,\n LoggerMain,\n DependencyResolverMain\n]): Promise<ConfigMergerMain>",
@@ -2603,7 +2645,7 @@
2603
2645
  "__schema": "ParameterSchema",
2604
2646
  "location": {
2605
2647
  "filePath": "config-merger.main.runtime.ts",
2606
- "line": 486,
2648
+ "line": 498,
2607
2649
  "character": 25
2608
2650
  },
2609
2651
  "name": "[ workspace, config, loggerMain, depsResolver ]",
@@ -2611,7 +2653,7 @@
2611
2653
  "__schema": "TupleTypeSchema",
2612
2654
  "location": {
2613
2655
  "filePath": "config-merger.main.runtime.ts",
2614
- "line": 486,
2656
+ "line": 498,
2615
2657
  "character": 72
2616
2658
  },
2617
2659
  "elements": [
@@ -2619,7 +2661,7 @@
2619
2661
  "__schema": "TypeRefSchema",
2620
2662
  "location": {
2621
2663
  "filePath": "config-merger.main.runtime.ts",
2622
- "line": 487,
2664
+ "line": 499,
2623
2665
  "character": 5
2624
2666
  },
2625
2667
  "name": "Workspace",
@@ -2632,7 +2674,7 @@
2632
2674
  "__schema": "TypeRefSchema",
2633
2675
  "location": {
2634
2676
  "filePath": "config-merger.main.runtime.ts",
2635
- "line": 488,
2677
+ "line": 500,
2636
2678
  "character": 5
2637
2679
  },
2638
2680
  "name": "ConfigMain",
@@ -2645,7 +2687,7 @@
2645
2687
  "__schema": "TypeRefSchema",
2646
2688
  "location": {
2647
2689
  "filePath": "config-merger.main.runtime.ts",
2648
- "line": 489,
2690
+ "line": 501,
2649
2691
  "character": 5
2650
2692
  },
2651
2693
  "name": "LoggerMain",
@@ -2658,7 +2700,7 @@
2658
2700
  "__schema": "TypeRefSchema",
2659
2701
  "location": {
2660
2702
  "filePath": "config-merger.main.runtime.ts",
2661
- "line": 490,
2703
+ "line": 502,
2662
2704
  "character": 5
2663
2705
  },
2664
2706
  "name": "DependencyResolverMain",
@@ -2677,7 +2719,7 @@
2677
2719
  "__schema": "InferenceTypeSchema",
2678
2720
  "location": {
2679
2721
  "filePath": "config-merger.main.runtime.ts",
2680
- "line": 486,
2722
+ "line": 498,
2681
2723
  "character": 3
2682
2724
  },
2683
2725
  "type": "Promise<ConfigMergerMain>"
@@ -2695,7 +2737,7 @@
2695
2737
  "__schema": "UnImplementedSchema",
2696
2738
  "location": {
2697
2739
  "filePath": "config-merger.main.runtime.ts",
2698
- "line": 499,
2740
+ "line": 511,
2699
2741
  "character": 16
2700
2742
  },
2701
2743
  "name": "ConfigMergerMain",
@@ -2707,7 +2749,7 @@
2707
2749
  "__schema": "ModuleSchema",
2708
2750
  "location": {
2709
2751
  "filePath": "config-merger.main.runtime.ts",
2710
- "line": 27,
2752
+ "line": 28,
2711
2753
  "character": 1
2712
2754
  },
2713
2755
  "exports": [
@@ -2715,7 +2757,7 @@
2715
2757
  "__schema": "VariableLikeSchema",
2716
2758
  "location": {
2717
2759
  "filePath": "config-merger.main.runtime.ts",
2718
- "line": 27,
2760
+ "line": 28,
2719
2761
  "character": 7
2720
2762
  },
2721
2763
  "signature": "const WS_DEPS_FIELDS: string[]",
@@ -2724,7 +2766,7 @@
2724
2766
  "__schema": "InferenceTypeSchema",
2725
2767
  "location": {
2726
2768
  "filePath": "config-merger.main.runtime.ts",
2727
- "line": 27,
2769
+ "line": 28,
2728
2770
  "character": 7
2729
2771
  },
2730
2772
  "type": "string[]"
@@ -2739,7 +2781,7 @@
2739
2781
  "__schema": "UnImplementedSchema",
2740
2782
  "location": {
2741
2783
  "filePath": "config-merger.main.runtime.ts",
2742
- "line": 497,
2784
+ "line": 509,
2743
2785
  "character": 1
2744
2786
  },
2745
2787
  "name": "ConfigMergerAspect.addRuntime(ConfigMergerMain);",
@@ -4046,7 +4088,7 @@
4046
4088
  "componentId": {
4047
4089
  "scope": "teambit.workspace",
4048
4090
  "name": "config-merger",
4049
- "version": "0.0.157"
4091
+ "version": "0.0.158"
4050
4092
  },
4051
4093
  "taggedModuleExports": []
4052
4094
  }