@teambit/checkout 1.0.225 → 1.0.227

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