@teambit/checkout 1.0.227 → 1.0.229

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.
@@ -1,7 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <testsuites tests="2" failures="0" errors="0" skipped="0">
3
- <testsuite name="teambit.component/checkout@1.0.227" tests="2" failures="0" errors="0" skipped="0">
4
- <testcase classname="dist/checkout.spec.js" name="should bring the files back" time="0.001"/>
5
- <testcase classname="dist/checkout.spec.js" name="the workspace should get the component as a valid component" time="0.047"/>
3
+ <testsuite name="teambit.component/checkout@1.0.229" tests="2" failures="0" errors="0" skipped="0">
4
+ <testcase classname="dist/checkout.spec.js" name="should bring the files back"/>
5
+ <testcase classname="dist/checkout.spec.js" name="the workspace should get the component as a valid component" time="0.059"/>
6
6
  </testsuite>
7
7
  </testsuites>
@@ -48,7 +48,11 @@
48
48
  "line": 62,
49
49
  "character": 24
50
50
  },
51
- "name": "Workspace"
51
+ "name": "Workspace",
52
+ "componentId": {
53
+ "scope": "teambit.workspace",
54
+ "name": "workspace"
55
+ }
52
56
  },
53
57
  "isOptional": false,
54
58
  "isSpread": false
@@ -68,7 +72,11 @@
68
72
  "line": 63,
69
73
  "character": 21
70
74
  },
71
- "name": "Logger"
75
+ "name": "Logger",
76
+ "componentId": {
77
+ "scope": "teambit.harmony",
78
+ "name": "logger"
79
+ }
72
80
  },
73
81
  "isOptional": false,
74
82
  "isSpread": false
@@ -88,7 +96,11 @@
88
96
  "line": 64,
89
97
  "character": 30
90
98
  },
91
- "name": "ComponentWriterMain"
99
+ "name": "ComponentWriterMain",
100
+ "componentId": {
101
+ "scope": "teambit.component",
102
+ "name": "component-writer"
103
+ }
92
104
  },
93
105
  "isOptional": false,
94
106
  "isSpread": false
@@ -108,7 +120,11 @@
108
120
  "line": 65,
109
121
  "character": 23
110
122
  },
111
- "name": "ImporterMain"
123
+ "name": "ImporterMain",
124
+ "componentId": {
125
+ "scope": "teambit.scope",
126
+ "name": "importer"
127
+ }
112
128
  },
113
129
  "isOptional": false,
114
130
  "isSpread": false
@@ -128,7 +144,11 @@
128
144
  "line": 66,
129
145
  "character": 21
130
146
  },
131
- "name": "RemoveMain"
147
+ "name": "RemoveMain",
148
+ "componentId": {
149
+ "scope": "teambit.component",
150
+ "name": "remove"
151
+ }
132
152
  },
133
153
  "isOptional": false,
134
154
  "isSpread": false
@@ -192,7 +212,11 @@
192
212
  "line": 69,
193
213
  "character": 57
194
214
  },
195
- "name": "ApplyVersionResults"
215
+ "name": "ApplyVersionResults",
216
+ "componentId": {
217
+ "scope": "teambit.component",
218
+ "name": "merging"
219
+ }
196
220
  }
197
221
  ]
198
222
  },
@@ -272,7 +296,12 @@
272
296
  "line": 203,
273
297
  "character": 73
274
298
  },
275
- "name": "ComponentID"
299
+ "name": "ComponentID",
300
+ "componentId": {
301
+ "scope": "teambit.component",
302
+ "name": "component-id",
303
+ "version": "1.2.0"
304
+ }
276
305
  }
277
306
  },
278
307
  {
@@ -359,7 +388,11 @@
359
388
  "line": 230,
360
389
  "character": 94
361
390
  },
362
- "name": "ApplyVersionResults"
391
+ "name": "ApplyVersionResults",
392
+ "componentId": {
393
+ "scope": "teambit.component",
394
+ "name": "merging"
395
+ }
363
396
  }
364
397
  ]
365
398
  },
@@ -463,7 +496,11 @@
463
496
  "line": 517,
464
497
  "character": 5
465
498
  },
466
- "name": "CLIMain"
499
+ "name": "CLIMain",
500
+ "componentId": {
501
+ "scope": "teambit.harmony",
502
+ "name": "cli"
503
+ }
467
504
  },
468
505
  {
469
506
  "__schema": "TypeRefSchema",
@@ -472,7 +509,11 @@
472
509
  "line": 518,
473
510
  "character": 5
474
511
  },
475
- "name": "Workspace"
512
+ "name": "Workspace",
513
+ "componentId": {
514
+ "scope": "teambit.workspace",
515
+ "name": "workspace"
516
+ }
476
517
  },
477
518
  {
478
519
  "__schema": "TypeRefSchema",
@@ -481,7 +522,11 @@
481
522
  "line": 519,
482
523
  "character": 5
483
524
  },
484
- "name": "LoggerMain"
525
+ "name": "LoggerMain",
526
+ "componentId": {
527
+ "scope": "teambit.harmony",
528
+ "name": "logger"
529
+ }
485
530
  },
486
531
  {
487
532
  "__schema": "TypeRefSchema",
@@ -490,7 +535,11 @@
490
535
  "line": 520,
491
536
  "character": 5
492
537
  },
493
- "name": "ComponentWriterMain"
538
+ "name": "ComponentWriterMain",
539
+ "componentId": {
540
+ "scope": "teambit.component",
541
+ "name": "component-writer"
542
+ }
494
543
  },
495
544
  {
496
545
  "__schema": "TypeRefSchema",
@@ -499,7 +548,11 @@
499
548
  "line": 521,
500
549
  "character": 5
501
550
  },
502
- "name": "ImporterMain"
551
+ "name": "ImporterMain",
552
+ "componentId": {
553
+ "scope": "teambit.scope",
554
+ "name": "importer"
555
+ }
503
556
  },
504
557
  {
505
558
  "__schema": "TypeRefSchema",
@@ -508,7 +561,11 @@
508
561
  "line": 522,
509
562
  "character": 5
510
563
  },
511
- "name": "RemoveMain"
564
+ "name": "RemoveMain",
565
+ "componentId": {
566
+ "scope": "teambit.component",
567
+ "name": "remove"
568
+ }
512
569
  }
513
570
  ]
514
571
  },
@@ -594,7 +651,12 @@
594
651
  "line": 29,
595
652
  "character": 9
596
653
  },
597
- "name": "ComponentID"
654
+ "name": "ComponentID",
655
+ "componentId": {
656
+ "scope": "teambit.component",
657
+ "name": "component-id",
658
+ "version": "1.2.0"
659
+ }
598
660
  }
599
661
  },
600
662
  "isOptional": true
@@ -703,7 +765,8 @@
703
765
  "line": 34,
704
766
  "character": 19
705
767
  },
706
- "name": "MergeStrategy"
768
+ "name": "MergeStrategy",
769
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
707
770
  },
708
771
  {
709
772
  "__schema": "LiteralTypeSchema",
@@ -894,7 +957,8 @@
894
957
  "line": 43,
895
958
  "character": 10
896
959
  },
897
- "name": "Lane"
960
+ "name": "Lane",
961
+ "packageName": "@teambit/legacy/dist/scope/models"
898
962
  },
899
963
  "isOptional": true
900
964
  },
@@ -941,7 +1005,12 @@
941
1005
  "line": 45,
942
1006
  "character": 18
943
1007
  },
944
- "name": "ComponentID"
1008
+ "name": "ComponentID",
1009
+ "componentId": {
1010
+ "scope": "teambit.component",
1011
+ "name": "component-id",
1012
+ "version": "1.2.0"
1013
+ }
945
1014
  }
946
1015
  },
947
1016
  "isOptional": true
@@ -1127,7 +1196,8 @@
1127
1196
  "line": 150,
1128
1197
  "character": 19
1129
1198
  },
1130
- "name": "SourceFile"
1199
+ "name": "SourceFile",
1200
+ "packageName": "@teambit/legacy/dist/consumer/component/sources"
1131
1201
  }
1132
1202
  },
1133
1203
  "isOptional": false,
@@ -1148,7 +1218,8 @@
1148
1218
  "line": 151,
1149
1219
  "character": 17
1150
1220
  },
1151
- "name": "MergeResultsThreeWay"
1221
+ "name": "MergeResultsThreeWay",
1222
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge"
1152
1223
  },
1153
1224
  "isOptional": false,
1154
1225
  "isSpread": false
@@ -1176,7 +1247,8 @@
1176
1247
  "line": 152,
1177
1248
  "character": 18
1178
1249
  },
1179
- "name": "MergeStrategy"
1250
+ "name": "MergeStrategy",
1251
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
1180
1252
  },
1181
1253
  {
1182
1254
  "__schema": "LiteralTypeSchema",
@@ -1273,7 +1345,8 @@
1273
1345
  "line": 153,
1274
1346
  "character": 55
1275
1347
  },
1276
- "name": "SourceFile"
1348
+ "name": "SourceFile",
1349
+ "packageName": "@teambit/legacy/dist/consumer/component/sources"
1277
1350
  }
1278
1351
  },
1279
1352
  "isOptional": false
@@ -1319,7 +1392,8 @@
1319
1392
  "line": 59,
1320
1393
  "character": 13
1321
1394
  },
1322
- "name": "Consumer"
1395
+ "name": "Consumer",
1396
+ "packageName": "@teambit/legacy/dist/consumer"
1323
1397
  },
1324
1398
  "isOptional": false,
1325
1399
  "isSpread": false
@@ -1339,7 +1413,12 @@
1339
1413
  "line": 60,
1340
1414
  "character": 7
1341
1415
  },
1342
- "name": "ComponentID"
1416
+ "name": "ComponentID",
1417
+ "componentId": {
1418
+ "scope": "teambit.component",
1419
+ "name": "component-id",
1420
+ "version": "1.2.0"
1421
+ }
1343
1422
  },
1344
1423
  "isOptional": false,
1345
1424
  "isSpread": false
@@ -1367,7 +1446,8 @@
1367
1446
  "line": 61,
1368
1447
  "character": 20
1369
1448
  },
1370
- "name": "ConsumerComponent"
1449
+ "name": "ConsumerComponent",
1450
+ "packageName": "@teambit/legacy/dist/consumer/component"
1371
1451
  },
1372
1452
  {
1373
1453
  "__schema": "LiteralTypeSchema",
@@ -1415,7 +1495,8 @@
1415
1495
  "line": 62,
1416
1496
  "character": 17
1417
1497
  },
1418
- "name": "MergeResultsThreeWay"
1498
+ "name": "MergeResultsThreeWay",
1499
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge"
1419
1500
  },
1420
1501
  {
1421
1502
  "__schema": "LiteralTypeSchema",
@@ -1521,7 +1602,11 @@
1521
1602
  "line": 120,
1522
1603
  "character": 16
1523
1604
  },
1524
- "name": "FilesStatus"
1605
+ "name": "FilesStatus",
1606
+ "componentId": {
1607
+ "scope": "teambit.component",
1608
+ "name": "merging"
1609
+ }
1525
1610
  },
1526
1611
  "isOptional": false,
1527
1612
  "isSpread": false
@@ -1541,7 +1626,8 @@
1541
1626
  "line": 121,
1542
1627
  "character": 13
1543
1628
  },
1544
- "name": "Consumer"
1629
+ "name": "Consumer",
1630
+ "packageName": "@teambit/legacy/dist/consumer"
1545
1631
  },
1546
1632
  "isOptional": false,
1547
1633
  "isSpread": false
@@ -1561,7 +1647,8 @@
1561
1647
  "line": 122,
1562
1648
  "character": 21
1563
1649
  },
1564
- "name": "ConsumerComponent"
1650
+ "name": "ConsumerComponent",
1651
+ "packageName": "@teambit/legacy/dist/consumer/component"
1565
1652
  },
1566
1653
  "isOptional": true,
1567
1654
  "isSpread": false
@@ -1613,7 +1700,8 @@
1613
1700
  "line": 104,
1614
1701
  "character": 41
1615
1702
  },
1616
- "name": "SourceFile"
1703
+ "name": "SourceFile",
1704
+ "packageName": "@teambit/legacy/dist/consumer/component/sources"
1617
1705
  }
1618
1706
  },
1619
1707
  "isOptional": false,
@@ -1634,7 +1722,11 @@
1634
1722
  "line": 104,
1635
1723
  "character": 68
1636
1724
  },
1637
- "name": "FilesStatus"
1725
+ "name": "FilesStatus",
1726
+ "componentId": {
1727
+ "scope": "teambit.component",
1728
+ "name": "merging"
1729
+ }
1638
1730
  },
1639
1731
  "isOptional": false,
1640
1732
  "isSpread": false
@@ -1654,7 +1746,8 @@
1654
1746
  "line": 104,
1655
1747
  "character": 99
1656
1748
  },
1657
- "name": "ConsumerComponent"
1749
+ "name": "ConsumerComponent",
1750
+ "packageName": "@teambit/legacy/dist/consumer/component"
1658
1751
  },
1659
1752
  "isOptional": true,
1660
1753
  "isSpread": false
@@ -1783,7 +1876,8 @@
1783
1876
  "line": 27,
1784
1877
  "character": 18
1785
1878
  },
1786
- "name": "MergeResultsThreeWay"
1879
+ "name": "MergeResultsThreeWay",
1880
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge"
1787
1881
  },
1788
1882
  {
1789
1883
  "__schema": "LiteralTypeSchema",
@@ -1845,7 +1939,8 @@
1845
1939
  "line": 18,
1846
1940
  "character": 22
1847
1941
  },
1848
- "name": "ConsumerComponent"
1942
+ "name": "ConsumerComponent",
1943
+ "packageName": "@teambit/legacy/dist/consumer/component"
1849
1944
  },
1850
1945
  "isOptional": true
1851
1946
  },
@@ -1865,7 +1960,8 @@
1865
1960
  "line": 19,
1866
1961
  "character": 24
1867
1962
  },
1868
- "name": "Version"
1963
+ "name": "Version",
1964
+ "packageName": "@teambit/legacy/dist/scope/models/version"
1869
1965
  },
1870
1966
  "isOptional": true
1871
1967
  },
@@ -2014,7 +2110,8 @@
2014
2110
  "line": 32,
2015
2111
  "character": 15
2016
2112
  },
2017
- "name": "ConsumerComponent"
2113
+ "name": "ConsumerComponent",
2114
+ "packageName": "@teambit/legacy/dist/consumer/component"
2018
2115
  },
2019
2116
  "isOptional": true
2020
2117
  },
@@ -2034,7 +2131,8 @@
2034
2131
  "line": 34,
2035
2132
  "character": 23
2036
2133
  },
2037
- "name": "ConsumerComponent"
2134
+ "name": "ConsumerComponent",
2135
+ "packageName": "@teambit/legacy/dist/consumer/component"
2038
2136
  },
2039
2137
  "isOptional": true
2040
2138
  }
@@ -2066,7 +2164,11 @@
2066
2164
  "line": 142,
2067
2165
  "character": 20
2068
2166
  },
2069
- "name": "ApplyVersionResults"
2167
+ "name": "ApplyVersionResults",
2168
+ "componentId": {
2169
+ "scope": "teambit.component",
2170
+ "name": "merging"
2171
+ }
2070
2172
  },
2071
2173
  "isOptional": false,
2072
2174
  "isSpread": false
@@ -2197,7 +2299,12 @@
2197
2299
  "line": 29,
2198
2300
  "character": 9
2199
2301
  },
2200
- "name": "ComponentID"
2302
+ "name": "ComponentID",
2303
+ "componentId": {
2304
+ "scope": "teambit.component",
2305
+ "name": "component-id",
2306
+ "version": "1.2.0"
2307
+ }
2201
2308
  }
2202
2309
  },
2203
2310
  "isOptional": true
@@ -2306,7 +2413,8 @@
2306
2413
  "line": 34,
2307
2414
  "character": 19
2308
2415
  },
2309
- "name": "MergeStrategy"
2416
+ "name": "MergeStrategy",
2417
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
2310
2418
  },
2311
2419
  {
2312
2420
  "__schema": "LiteralTypeSchema",
@@ -2497,7 +2605,8 @@
2497
2605
  "line": 43,
2498
2606
  "character": 10
2499
2607
  },
2500
- "name": "Lane"
2608
+ "name": "Lane",
2609
+ "packageName": "@teambit/legacy/dist/scope/models"
2501
2610
  },
2502
2611
  "isOptional": true
2503
2612
  },
@@ -2544,7 +2653,12 @@
2544
2653
  "line": 45,
2545
2654
  "character": 18
2546
2655
  },
2547
- "name": "ComponentID"
2656
+ "name": "ComponentID",
2657
+ "componentId": {
2658
+ "scope": "teambit.component",
2659
+ "name": "component-id",
2660
+ "version": "1.2.0"
2661
+ }
2548
2662
  }
2549
2663
  },
2550
2664
  "isOptional": true
@@ -2788,7 +2902,11 @@
2788
2902
  "line": 62,
2789
2903
  "character": 24
2790
2904
  },
2791
- "name": "Workspace"
2905
+ "name": "Workspace",
2906
+ "componentId": {
2907
+ "scope": "teambit.workspace",
2908
+ "name": "workspace"
2909
+ }
2792
2910
  },
2793
2911
  "isOptional": false,
2794
2912
  "isSpread": false
@@ -2808,7 +2926,11 @@
2808
2926
  "line": 63,
2809
2927
  "character": 21
2810
2928
  },
2811
- "name": "Logger"
2929
+ "name": "Logger",
2930
+ "componentId": {
2931
+ "scope": "teambit.harmony",
2932
+ "name": "logger"
2933
+ }
2812
2934
  },
2813
2935
  "isOptional": false,
2814
2936
  "isSpread": false
@@ -2828,7 +2950,11 @@
2828
2950
  "line": 64,
2829
2951
  "character": 30
2830
2952
  },
2831
- "name": "ComponentWriterMain"
2953
+ "name": "ComponentWriterMain",
2954
+ "componentId": {
2955
+ "scope": "teambit.component",
2956
+ "name": "component-writer"
2957
+ }
2832
2958
  },
2833
2959
  "isOptional": false,
2834
2960
  "isSpread": false
@@ -2848,7 +2974,11 @@
2848
2974
  "line": 65,
2849
2975
  "character": 23
2850
2976
  },
2851
- "name": "ImporterMain"
2977
+ "name": "ImporterMain",
2978
+ "componentId": {
2979
+ "scope": "teambit.scope",
2980
+ "name": "importer"
2981
+ }
2852
2982
  },
2853
2983
  "isOptional": false,
2854
2984
  "isSpread": false
@@ -2868,7 +2998,11 @@
2868
2998
  "line": 66,
2869
2999
  "character": 21
2870
3000
  },
2871
- "name": "RemoveMain"
3001
+ "name": "RemoveMain",
3002
+ "componentId": {
3003
+ "scope": "teambit.component",
3004
+ "name": "remove"
3005
+ }
2872
3006
  },
2873
3007
  "isOptional": false,
2874
3008
  "isSpread": false
@@ -2932,7 +3066,11 @@
2932
3066
  "line": 69,
2933
3067
  "character": 57
2934
3068
  },
2935
- "name": "ApplyVersionResults"
3069
+ "name": "ApplyVersionResults",
3070
+ "componentId": {
3071
+ "scope": "teambit.component",
3072
+ "name": "merging"
3073
+ }
2936
3074
  }
2937
3075
  ]
2938
3076
  },
@@ -3012,7 +3150,12 @@
3012
3150
  "line": 203,
3013
3151
  "character": 73
3014
3152
  },
3015
- "name": "ComponentID"
3153
+ "name": "ComponentID",
3154
+ "componentId": {
3155
+ "scope": "teambit.component",
3156
+ "name": "component-id",
3157
+ "version": "1.2.0"
3158
+ }
3016
3159
  }
3017
3160
  },
3018
3161
  {
@@ -3099,7 +3242,11 @@
3099
3242
  "line": 230,
3100
3243
  "character": 94
3101
3244
  },
3102
- "name": "ApplyVersionResults"
3245
+ "name": "ApplyVersionResults",
3246
+ "componentId": {
3247
+ "scope": "teambit.component",
3248
+ "name": "merging"
3249
+ }
3103
3250
  }
3104
3251
  ]
3105
3252
  },
@@ -3203,7 +3350,11 @@
3203
3350
  "line": 517,
3204
3351
  "character": 5
3205
3352
  },
3206
- "name": "CLIMain"
3353
+ "name": "CLIMain",
3354
+ "componentId": {
3355
+ "scope": "teambit.harmony",
3356
+ "name": "cli"
3357
+ }
3207
3358
  },
3208
3359
  {
3209
3360
  "__schema": "TypeRefSchema",
@@ -3212,7 +3363,11 @@
3212
3363
  "line": 518,
3213
3364
  "character": 5
3214
3365
  },
3215
- "name": "Workspace"
3366
+ "name": "Workspace",
3367
+ "componentId": {
3368
+ "scope": "teambit.workspace",
3369
+ "name": "workspace"
3370
+ }
3216
3371
  },
3217
3372
  {
3218
3373
  "__schema": "TypeRefSchema",
@@ -3221,7 +3376,11 @@
3221
3376
  "line": 519,
3222
3377
  "character": 5
3223
3378
  },
3224
- "name": "LoggerMain"
3379
+ "name": "LoggerMain",
3380
+ "componentId": {
3381
+ "scope": "teambit.harmony",
3382
+ "name": "logger"
3383
+ }
3225
3384
  },
3226
3385
  {
3227
3386
  "__schema": "TypeRefSchema",
@@ -3230,7 +3389,11 @@
3230
3389
  "line": 520,
3231
3390
  "character": 5
3232
3391
  },
3233
- "name": "ComponentWriterMain"
3392
+ "name": "ComponentWriterMain",
3393
+ "componentId": {
3394
+ "scope": "teambit.component",
3395
+ "name": "component-writer"
3396
+ }
3234
3397
  },
3235
3398
  {
3236
3399
  "__schema": "TypeRefSchema",
@@ -3239,7 +3402,11 @@
3239
3402
  "line": 521,
3240
3403
  "character": 5
3241
3404
  },
3242
- "name": "ImporterMain"
3405
+ "name": "ImporterMain",
3406
+ "componentId": {
3407
+ "scope": "teambit.scope",
3408
+ "name": "importer"
3409
+ }
3243
3410
  },
3244
3411
  {
3245
3412
  "__schema": "TypeRefSchema",
@@ -3248,7 +3415,11 @@
3248
3415
  "line": 522,
3249
3416
  "character": 5
3250
3417
  },
3251
- "name": "RemoveMain"
3418
+ "name": "RemoveMain",
3419
+ "componentId": {
3420
+ "scope": "teambit.component",
3421
+ "name": "remove"
3422
+ }
3252
3423
  }
3253
3424
  ]
3254
3425
  },
@@ -3376,7 +3547,8 @@
3376
3547
  "line": 18,
3377
3548
  "character": 22
3378
3549
  },
3379
- "name": "ConsumerComponent"
3550
+ "name": "ConsumerComponent",
3551
+ "packageName": "@teambit/legacy/dist/consumer/component"
3380
3552
  },
3381
3553
  "isOptional": true
3382
3554
  },
@@ -3396,7 +3568,8 @@
3396
3568
  "line": 19,
3397
3569
  "character": 24
3398
3570
  },
3399
- "name": "Version"
3571
+ "name": "Version",
3572
+ "packageName": "@teambit/legacy/dist/scope/models/version"
3400
3573
  },
3401
3574
  "isOptional": true
3402
3575
  },
@@ -3546,7 +3719,8 @@
3546
3719
  "line": 27,
3547
3720
  "character": 18
3548
3721
  },
3549
- "name": "MergeResultsThreeWay"
3722
+ "name": "MergeResultsThreeWay",
3723
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge"
3550
3724
  },
3551
3725
  {
3552
3726
  "__schema": "LiteralTypeSchema",
@@ -3632,7 +3806,8 @@
3632
3806
  "line": 32,
3633
3807
  "character": 15
3634
3808
  },
3635
- "name": "ConsumerComponent"
3809
+ "name": "ConsumerComponent",
3810
+ "packageName": "@teambit/legacy/dist/consumer/component"
3636
3811
  },
3637
3812
  "isOptional": true
3638
3813
  },
@@ -3652,7 +3827,8 @@
3652
3827
  "line": 34,
3653
3828
  "character": 23
3654
3829
  },
3655
- "name": "ConsumerComponent"
3830
+ "name": "ConsumerComponent",
3831
+ "packageName": "@teambit/legacy/dist/consumer/component"
3656
3832
  },
3657
3833
  "isOptional": true
3658
3834
  }
@@ -3694,7 +3870,8 @@
3694
3870
  "line": 59,
3695
3871
  "character": 13
3696
3872
  },
3697
- "name": "Consumer"
3873
+ "name": "Consumer",
3874
+ "packageName": "@teambit/legacy/dist/consumer"
3698
3875
  },
3699
3876
  "isOptional": false,
3700
3877
  "isSpread": false
@@ -3714,7 +3891,12 @@
3714
3891
  "line": 60,
3715
3892
  "character": 7
3716
3893
  },
3717
- "name": "ComponentID"
3894
+ "name": "ComponentID",
3895
+ "componentId": {
3896
+ "scope": "teambit.component",
3897
+ "name": "component-id",
3898
+ "version": "1.2.0"
3899
+ }
3718
3900
  },
3719
3901
  "isOptional": false,
3720
3902
  "isSpread": false
@@ -3742,7 +3924,8 @@
3742
3924
  "line": 61,
3743
3925
  "character": 20
3744
3926
  },
3745
- "name": "ConsumerComponent"
3927
+ "name": "ConsumerComponent",
3928
+ "packageName": "@teambit/legacy/dist/consumer/component"
3746
3929
  },
3747
3930
  {
3748
3931
  "__schema": "LiteralTypeSchema",
@@ -3790,7 +3973,8 @@
3790
3973
  "line": 62,
3791
3974
  "character": 17
3792
3975
  },
3793
- "name": "MergeResultsThreeWay"
3976
+ "name": "MergeResultsThreeWay",
3977
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge"
3794
3978
  },
3795
3979
  {
3796
3980
  "__schema": "LiteralTypeSchema",
@@ -3893,7 +4077,8 @@
3893
4077
  "line": 104,
3894
4078
  "character": 41
3895
4079
  },
3896
- "name": "SourceFile"
4080
+ "name": "SourceFile",
4081
+ "packageName": "@teambit/legacy/dist/consumer/component/sources"
3897
4082
  }
3898
4083
  },
3899
4084
  "isOptional": false,
@@ -3914,7 +4099,11 @@
3914
4099
  "line": 104,
3915
4100
  "character": 68
3916
4101
  },
3917
- "name": "FilesStatus"
4102
+ "name": "FilesStatus",
4103
+ "componentId": {
4104
+ "scope": "teambit.component",
4105
+ "name": "merging"
4106
+ }
3918
4107
  },
3919
4108
  "isOptional": false,
3920
4109
  "isSpread": false
@@ -3934,7 +4123,8 @@
3934
4123
  "line": 104,
3935
4124
  "character": 99
3936
4125
  },
3937
- "name": "ConsumerComponent"
4126
+ "name": "ConsumerComponent",
4127
+ "packageName": "@teambit/legacy/dist/consumer/component"
3938
4128
  },
3939
4129
  "isOptional": true,
3940
4130
  "isSpread": false
@@ -3988,7 +4178,11 @@
3988
4178
  "line": 120,
3989
4179
  "character": 16
3990
4180
  },
3991
- "name": "FilesStatus"
4181
+ "name": "FilesStatus",
4182
+ "componentId": {
4183
+ "scope": "teambit.component",
4184
+ "name": "merging"
4185
+ }
3992
4186
  },
3993
4187
  "isOptional": false,
3994
4188
  "isSpread": false
@@ -4008,7 +4202,8 @@
4008
4202
  "line": 121,
4009
4203
  "character": 13
4010
4204
  },
4011
- "name": "Consumer"
4205
+ "name": "Consumer",
4206
+ "packageName": "@teambit/legacy/dist/consumer"
4012
4207
  },
4013
4208
  "isOptional": false,
4014
4209
  "isSpread": false
@@ -4028,7 +4223,8 @@
4028
4223
  "line": 122,
4029
4224
  "character": 21
4030
4225
  },
4031
- "name": "ConsumerComponent"
4226
+ "name": "ConsumerComponent",
4227
+ "packageName": "@teambit/legacy/dist/consumer/component"
4032
4228
  },
4033
4229
  "isOptional": true,
4034
4230
  "isSpread": false
@@ -4090,7 +4286,8 @@
4090
4286
  "line": 150,
4091
4287
  "character": 19
4092
4288
  },
4093
- "name": "SourceFile"
4289
+ "name": "SourceFile",
4290
+ "packageName": "@teambit/legacy/dist/consumer/component/sources"
4094
4291
  }
4095
4292
  },
4096
4293
  "isOptional": false,
@@ -4111,7 +4308,8 @@
4111
4308
  "line": 151,
4112
4309
  "character": 17
4113
4310
  },
4114
- "name": "MergeResultsThreeWay"
4311
+ "name": "MergeResultsThreeWay",
4312
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge"
4115
4313
  },
4116
4314
  "isOptional": false,
4117
4315
  "isSpread": false
@@ -4139,7 +4337,8 @@
4139
4337
  "line": 152,
4140
4338
  "character": 18
4141
4339
  },
4142
- "name": "MergeStrategy"
4340
+ "name": "MergeStrategy",
4341
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
4143
4342
  },
4144
4343
  {
4145
4344
  "__schema": "LiteralTypeSchema",
@@ -4236,7 +4435,8 @@
4236
4435
  "line": 153,
4237
4436
  "character": 55
4238
4437
  },
4239
- "name": "SourceFile"
4438
+ "name": "SourceFile",
4439
+ "packageName": "@teambit/legacy/dist/consumer/component/sources"
4240
4440
  }
4241
4441
  },
4242
4442
  "isOptional": false
@@ -4696,7 +4896,8 @@
4696
4896
  "line": 91,
4697
4897
  "character": 26
4698
4898
  },
4699
- "name": "MergeStrategy"
4899
+ "name": "MergeStrategy",
4900
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
4700
4901
  },
4701
4902
  "isOptional": true
4702
4903
  },
@@ -4900,7 +5101,8 @@
4900
5101
  "line": 91,
4901
5102
  "character": 26
4902
5103
  },
4903
- "name": "MergeStrategy"
5104
+ "name": "MergeStrategy",
5105
+ "packageName": "@teambit/legacy/dist/consumer/versions-ops/merge-version"
4904
5106
  },
4905
5107
  "isOptional": true
4906
5108
  },
@@ -5065,7 +5267,7 @@
5065
5267
  "_legacy": {
5066
5268
  "scope": "teambit.component",
5067
5269
  "name": "checkout",
5068
- "version": "1.0.227"
5270
+ "version": "1.0.229"
5069
5271
  },
5070
5272
  "_scope": "teambit.component"
5071
5273
  }
@@ -5098,7 +5300,11 @@
5098
5300
  "line": 142,
5099
5301
  "character": 20
5100
5302
  },
5101
- "name": "ApplyVersionResults"
5303
+ "name": "ApplyVersionResults",
5304
+ "componentId": {
5305
+ "scope": "teambit.component",
5306
+ "name": "merging"
5307
+ }
5102
5308
  },
5103
5309
  "isOptional": false,
5104
5310
  "isSpread": false
@@ -5164,7 +5370,7 @@
5164
5370
  "componentId": {
5165
5371
  "scope": "teambit.component",
5166
5372
  "name": "checkout",
5167
- "version": "1.0.227"
5373
+ "version": "1.0.229"
5168
5374
  },
5169
5375
  "taggedModuleExports": []
5170
5376
  }
@@ -0,0 +1,33 @@
1
+ import { Command, CommandOptions } from '@teambit/cli';
2
+ import { ApplyVersionResults } from '@teambit/merging';
3
+ import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
4
+ import { CheckoutMain, CheckoutProps } from './checkout.main.runtime';
5
+ export declare class CheckoutCmd implements Command {
6
+ private checkout;
7
+ name: string;
8
+ arguments: {
9
+ name: string;
10
+ description: string;
11
+ }[];
12
+ description: string;
13
+ helpUrl: string;
14
+ group: string;
15
+ extendedDescription: string;
16
+ alias: string;
17
+ options: CommandOptions;
18
+ loader: boolean;
19
+ constructor(checkout: CheckoutMain);
20
+ report([to, componentPattern]: [string, string], { interactiveMerge, forceOurs, forceTheirs, autoMergeResolve, manual, all, workspaceOnly, verbose, skipDependencyInstallation, revert, }: {
21
+ interactiveMerge?: boolean;
22
+ forceOurs?: boolean;
23
+ forceTheirs?: boolean;
24
+ autoMergeResolve?: MergeStrategy;
25
+ manual?: boolean;
26
+ all?: boolean;
27
+ workspaceOnly?: boolean;
28
+ verbose?: boolean;
29
+ skipDependencyInstallation?: boolean;
30
+ revert?: boolean;
31
+ }): Promise<string>;
32
+ }
33
+ export declare function checkoutOutput(checkoutResults: ApplyVersionResults, checkoutProps: CheckoutProps, alternativeTitle?: string): string;
@@ -0,0 +1,68 @@
1
+ import { Consumer } from '@teambit/legacy/dist/consumer';
2
+ import { ComponentID } from '@teambit/component-id';
3
+ import Version from '@teambit/legacy/dist/scope/models/version';
4
+ import { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';
5
+ import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
6
+ import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
7
+ import ConsumerComponent from '@teambit/legacy/dist/consumer/component';
8
+ import { ApplyVersionResult, FilesStatus } from '@teambit/merging';
9
+ import { CheckoutProps } from './checkout.main.runtime';
10
+ export type ComponentStatusBase = {
11
+ currentComponent?: ConsumerComponent;
12
+ componentFromModel?: Version;
13
+ id: ComponentID;
14
+ shouldBeRemoved?: boolean;
15
+ unchangedMessage?: string;
16
+ unchangedLegitimately?: boolean;
17
+ };
18
+ export type ComponentStatus = ComponentStatusBase & {
19
+ mergeResults?: MergeResultsThreeWay | null | undefined;
20
+ };
21
+ export type ApplyVersionWithComps = {
22
+ applyVersionResult: ApplyVersionResult;
23
+ component?: ConsumerComponent;
24
+ legacyCompToWrite?: ConsumerComponent;
25
+ };
26
+ /**
27
+ * This function optionally returns "component" object. If it returns, it means it needs to be written to the filesystem.
28
+ * Otherwise, it means the component is already up to date and no need to write it.
29
+ *
30
+ * If no need to change anything (ours), then don't return the component object.
31
+ * Otherwise, either return the component object as is (if no conflicts or "theirs"), or change the files in this
32
+ * component object. Later, this component object is written to the filesystem.
33
+ *
34
+ * 1) when the files are modified with conflicts and the strategy is "ours", or forceOurs was used, leave the FS as is.
35
+ *
36
+ * 2) when the files are modified with conflicts and the strategy is "theirs", or forceTheirs was used, write the
37
+ * component according to "component" object
38
+ *
39
+ * 3) when files are modified with no conflict or files are modified with conflicts and the
40
+ * strategy is manual, load the component according to id.version and update component.files.
41
+ * applyModifiedVersion() docs explains what files are updated/added.
42
+ *
43
+ * Side note:
44
+ * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).
45
+ * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles
46
+ */
47
+ export declare function applyVersion(consumer: Consumer, id: ComponentID, componentFromFS: ConsumerComponent | null | undefined, // it can be null only when isLanes is true
48
+ mergeResults: MergeResultsThreeWay | null | undefined, checkoutProps: CheckoutProps): Promise<ApplyVersionWithComps>;
49
+ export declare function updateFileStatus(files: SourceFile[], filesStatus: FilesStatus, componentFromFS?: ConsumerComponent): void;
50
+ /**
51
+ * when files exist on the filesystem but not on the checked out versions, they need to be deleted.
52
+ * without this function, these files would be left on the filesystem. (we don't delete the comp-dir before writing).
53
+ * this needs to be done *before* the component is written to the filesystem, otherwise, it won't work when a file
54
+ * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').
55
+ */
56
+ export declare function removeFilesIfNeeded(filesStatus: FilesStatus, consumer: Consumer, componentFromFS?: ConsumerComponent): Promise<void>;
57
+ /**
58
+ * relevant only when
59
+ * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.
60
+ * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.
61
+ *
62
+ * this function only updates the files content, it doesn't write the files
63
+ */
64
+ export declare function applyModifiedVersion(componentFiles: SourceFile[], mergeResults: MergeResultsThreeWay, mergeStrategy: MergeStrategy | null | undefined): {
65
+ filesStatus: Record<string, any>;
66
+ modifiedFiles: SourceFile[];
67
+ };
68
+ export declare function throwForFailures(allComponentsStatus: ComponentStatusBase[]): void;
@@ -0,0 +1,2 @@
1
+ import { Aspect } from '@teambit/harmony';
2
+ export declare const CheckoutAspect: Aspect;
@@ -0,0 +1,75 @@
1
+ import { CLIMain } from '@teambit/cli';
2
+ import { Logger, LoggerMain } from '@teambit/logger';
3
+ import { Workspace } from '@teambit/workspace';
4
+ import { RemoveMain } from '@teambit/remove';
5
+ import { ApplyVersionResults } from '@teambit/merging';
6
+ import { ImporterMain } from '@teambit/importer';
7
+ import { ComponentWriterMain } from '@teambit/component-writer';
8
+ import { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';
9
+ import { ComponentID } from '@teambit/component-id';
10
+ import { ModelComponent, Lane } from '@teambit/legacy/dist/scope/models';
11
+ import { ComponentStatusBase } from './checkout-version';
12
+ export type CheckoutProps = {
13
+ version?: string;
14
+ ids?: ComponentID[];
15
+ head?: boolean;
16
+ latest?: boolean;
17
+ main?: boolean;
18
+ promptMergeOptions?: boolean;
19
+ mergeStrategy?: MergeStrategy | null;
20
+ forceOurs?: boolean;
21
+ forceTheirs?: boolean;
22
+ verbose?: boolean;
23
+ skipNpmInstall?: boolean;
24
+ reset?: boolean;
25
+ revert?: boolean;
26
+ all?: boolean;
27
+ isLane?: boolean;
28
+ lane?: Lane;
29
+ workspaceOnly?: boolean;
30
+ versionPerId?: ComponentID[];
31
+ skipUpdatingBitmap?: boolean;
32
+ loadStash?: boolean;
33
+ restoreMissingComponents?: boolean;
34
+ allowAddingComponentsFromScope?: boolean;
35
+ includeLocallyDeleted?: boolean;
36
+ };
37
+ export type ComponentStatusBeforeMergeAttempt = ComponentStatusBase & {
38
+ propsForMerge?: {
39
+ currentlyUsedVersion: string;
40
+ componentModel: ModelComponent;
41
+ };
42
+ };
43
+ export declare class CheckoutMain {
44
+ private workspace;
45
+ private logger;
46
+ private componentWriter;
47
+ private importer;
48
+ private remove;
49
+ constructor(workspace: Workspace, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, remove: RemoveMain);
50
+ checkout(checkoutProps: CheckoutProps): Promise<ApplyVersionResults>;
51
+ /**
52
+ * if .bitmap entry exists but the rootDir is missing from the filesystem, find the component in the scope and restore it.
53
+ * returns the restored component ids.
54
+ */
55
+ restoreMissingComponents(checkoutProps: CheckoutProps): Promise<ComponentID[] | undefined>;
56
+ checkoutByCLIValues(componentPattern: string, checkoutProps: CheckoutProps): Promise<ApplyVersionResults>;
57
+ private syncNewComponents;
58
+ private makeLaneComponentsAvailableOnMain;
59
+ private parseValues;
60
+ private getNewComponentsFromLane;
61
+ private getComponentStatusBeforeMergeAttempt;
62
+ private getMergeStatus;
63
+ static slots: never[];
64
+ static dependencies: import("@teambit/harmony").Aspect[];
65
+ static runtime: import("@teambit/harmony").RuntimeDefinition;
66
+ static provider([cli, workspace, loggerMain, compWriter, importer, remove]: [
67
+ CLIMain,
68
+ Workspace,
69
+ LoggerMain,
70
+ ComponentWriterMain,
71
+ ImporterMain,
72
+ RemoveMain
73
+ ]): Promise<CheckoutMain>;
74
+ }
75
+ export default CheckoutMain;
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,7 @@
1
+ import { CheckoutAspect } from './checkout.aspect';
2
+ export type { CheckoutMain, CheckoutProps } from './checkout.main.runtime';
3
+ export default CheckoutAspect;
4
+ export { CheckoutAspect };
5
+ export { applyModifiedVersion, applyVersion, removeFilesIfNeeded, updateFileStatus, throwForFailures, } from './checkout-version';
6
+ export type { ComponentStatus, ComponentStatusBase, ApplyVersionWithComps } from './checkout-version';
7
+ export { checkoutOutput } from './checkout-cmd';
@@ -0,0 +1,20 @@
1
+ import { Command, CommandOptions } from '@teambit/cli';
2
+ import { CheckoutMain } from './checkout.main.runtime';
3
+ export declare class RevertCmd implements Command {
4
+ private checkout;
5
+ name: string;
6
+ arguments: {
7
+ name: string;
8
+ description: string;
9
+ }[];
10
+ description: string;
11
+ group: string;
12
+ alias: string;
13
+ options: CommandOptions;
14
+ loader: boolean;
15
+ constructor(checkout: CheckoutMain);
16
+ report([componentPattern, to]: [string, string], { verbose, skipDependencyInstallation, }: {
17
+ verbose?: boolean;
18
+ skipDependencyInstallation?: boolean;
19
+ }): Promise<string>;
20
+ }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/checkout",
3
- "version": "1.0.227",
3
+ "version": "1.0.229",
4
4
  "homepage": "https://bit.cloud/teambit/component/checkout",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.component",
8
8
  "name": "checkout",
9
- "version": "1.0.227"
9
+ "version": "1.0.229"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -15,13 +15,13 @@
15
15
  "@teambit/bit-error": "0.0.404",
16
16
  "@teambit/component-id": "1.2.0",
17
17
  "@teambit/harmony": "0.4.6",
18
- "@teambit/cli": "0.0.860",
19
- "@teambit/merging": "1.0.227",
20
- "@teambit/component-writer": "1.0.227",
21
- "@teambit/importer": "1.0.227",
22
- "@teambit/logger": "0.0.953",
23
- "@teambit/remove": "1.0.227",
24
- "@teambit/workspace": "1.0.227"
18
+ "@teambit/cli": "0.0.862",
19
+ "@teambit/merging": "1.0.229",
20
+ "@teambit/component-writer": "1.0.229",
21
+ "@teambit/importer": "1.0.229",
22
+ "@teambit/logger": "0.0.955",
23
+ "@teambit/remove": "1.0.229",
24
+ "@teambit/workspace": "1.0.229"
25
25
  },
26
26
  "devDependencies": {
27
27
  "@types/lodash": "4.14.165",
@@ -32,10 +32,10 @@
32
32
  "chai": "4.3.0",
33
33
  "fs-extra": "10.0.0",
34
34
  "@types/mocha": "9.1.0",
35
- "@teambit/harmony.envs.core-aspect-env": "0.0.30",
35
+ "@teambit/harmony.envs.core-aspect-env": "0.0.33",
36
36
  "@teambit/component.testing.mock-components": "0.0.195",
37
37
  "@teambit/harmony.testing.load-aspect": "0.0.190",
38
- "@teambit/snapping": "1.0.227",
38
+ "@teambit/snapping": "1.0.229",
39
39
  "@teambit/workspace.testing.mock-workspace": "0.0.27"
40
40
  },
41
41
  "peerDependencies": {
package/tsconfig.json CHANGED
@@ -20,8 +20,7 @@
20
20
  "emitDeclarationOnly": true,
21
21
  "strict": true,
22
22
  "strictPropertyInitialization": false,
23
- "noImplicitAny": false,
24
- "composite": true
23
+ "noImplicitAny": false
25
24
  },
26
25
  "exclude": [
27
26
  "artifacts",
@@ -36,31 +35,5 @@
36
35
  "include": [
37
36
  "**/*",
38
37
  "**/*.json"
39
- ],
40
- "references": [
41
- {
42
- "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_cli@0.0.860"
43
- },
44
- {
45
- "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_merging@1.0.227"
46
- },
47
- {
48
- "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_component-writer@1.0.227"
49
- },
50
- {
51
- "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.scope_importer@1.0.227"
52
- },
53
- {
54
- "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.harmony_logger@0.0.953"
55
- },
56
- {
57
- "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_remove@1.0.227"
58
- },
59
- {
60
- "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.workspace_workspace@1.0.227"
61
- },
62
- {
63
- "path": "/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.component_snapping@1.0.227"
64
- }
65
38
  ]
66
39
  }