@teambit/checkout 1.0.330 → 1.0.331

package/artifacts/__bit_junit.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="3" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.component/checkout@1.0.330" tests="3" failures="0" errors="0" skipped="0">
-    <testcase classname="dist/checkout.spec.js" name="should bring the files back"/>
-    <testcase classname="dist/checkout.spec.js" name="the workspace should get the component as a valid component" time="0.053"/>
+  <testsuite name="teambit.component/checkout@1.0.331" tests="3" failures="0" errors="0" skipped="0">
+    <testcase classname="dist/checkout.spec.js" name="should bring the files back" time="0.001"/>
+    <testcase classname="dist/checkout.spec.js" name="the workspace should get the component as a valid component" time="0.063"/>
     <testcase classname="dist/checkout.spec.js" name="should checkout according to the number of generations specified" time="0.002"/>
   </testsuite>
 </testsuites>

package/artifacts/schema.json

@@ -56,11 +56,7 @@
                       "line": 64,
                       "character": 24
                     },
-                    "name": "Workspace",
-                    "componentId": {
-                      "scope": "teambit.workspace",
-                      "name": "workspace"
-                    }
+                    "name": "Workspace"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -80,11 +76,7 @@
                       "line": 65,
                       "character": 21
                     },
-                    "name": "Logger",
-                    "componentId": {
-                      "scope": "teambit.harmony",
-                      "name": "logger"
-                    }
+                    "name": "Logger"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -104,11 +96,7 @@
                       "line": 66,
                       "character": 30
                     },
-                    "name": "ComponentWriterMain",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "component-writer"
-                    }
+                    "name": "ComponentWriterMain"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -128,11 +116,7 @@
                       "line": 67,
                       "character": 23
                     },
-                    "name": "ImporterMain",
-                    "componentId": {
-                      "scope": "teambit.scope",
-                      "name": "importer"
-                    }
+                    "name": "ImporterMain"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -152,11 +136,7 @@
                       "line": 68,
                       "character": 21
                     },
-                    "name": "RemoveMain",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "remove"
-                    }
+                    "name": "RemoveMain"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -220,11 +200,7 @@
                       "line": 71,
                       "character": 57
                     },
-                    "name": "ApplyVersionResults",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "merging"
-                    }
+                    "name": "ApplyVersionResults"
                   }
                 ]
               },
@@ -305,12 +281,7 @@
                             "line": 206,
                             "character": 73
                           },
-                          "name": "ComponentID",
-                          "componentId": {
-                            "scope": "teambit.component",
-                            "name": "component-id",
-                            "version": "1.2.0"
-                          }
+                          "name": "ComponentID"
                         }
                       },
                       {
@@ -397,11 +368,7 @@
                       "line": 233,
                       "character": 94
                     },
-                    "name": "ApplyVersionResults",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "merging"
-                    }
+                    "name": "ApplyVersionResults"
                   }
                 ]
               },
@@ -505,11 +472,7 @@
                           "line": 525,
                           "character": 5
                         },
-                        "name": "CLIMain",
-                        "componentId": {
-                          "scope": "teambit.harmony",
-                          "name": "cli"
-                        }
+                        "name": "CLIMain"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -518,11 +481,7 @@
                           "line": 526,
                           "character": 5
                         },
-                        "name": "Workspace",
-                        "componentId": {
-                          "scope": "teambit.workspace",
-                          "name": "workspace"
-                        }
+                        "name": "Workspace"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -531,11 +490,7 @@
                           "line": 527,
                           "character": 5
                         },
-                        "name": "LoggerMain",
-                        "componentId": {
-                          "scope": "teambit.harmony",
-                          "name": "logger"
-                        }
+                        "name": "LoggerMain"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -544,11 +499,7 @@
                           "line": 528,
                           "character": 5
                         },
-                        "name": "ComponentWriterMain",
-                        "componentId": {
-                          "scope": "teambit.component",
-                          "name": "component-writer"
-                        }
+                        "name": "ComponentWriterMain"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -557,11 +508,7 @@
                           "line": 529,
                           "character": 5
                         },
-                        "name": "ImporterMain",
-                        "componentId": {
-                          "scope": "teambit.scope",
-                          "name": "importer"
-                        }
+                        "name": "ImporterMain"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -570,11 +517,7 @@
                           "line": 530,
                           "character": 5
                         },
-                        "name": "RemoveMain",
-                        "componentId": {
-                          "scope": "teambit.component",
-                          "name": "remove"
-                        }
+                        "name": "RemoveMain"
                       }
                     ]
                   },
@@ -669,12 +612,7 @@
                       "line": 30,
                       "character": 9
                     },
-                    "name": "ComponentID",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "component-id",
-                      "version": "1.2.0"
-                    }
+                    "name": "ComponentID"
                   }
                 },
                 "isOptional": true
@@ -795,11 +733,7 @@
                     "line": 36,
                     "character": 19
                   },
-                  "name": "MergeStrategy",
-                  "componentId": {
-                    "scope": "teambit.component",
-                    "name": "merging"
-                  }
+                  "name": "MergeStrategy"
                 },
                 "isOptional": true
               },
@@ -979,8 +913,7 @@
                     "line": 45,
                     "character": 10
                   },
-                  "name": "Lane",
-                  "packageName": "@teambit/legacy/dist/scope/models"
+                  "name": "Lane"
                 },
                 "isOptional": true
               },
@@ -1027,12 +960,7 @@
                       "line": 47,
                       "character": 18
                     },
-                    "name": "ComponentID",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "component-id",
-                      "version": "1.2.0"
-                    }
+                    "name": "ComponentID"
                   }
                 },
                 "isOptional": true
@@ -1237,8 +1165,7 @@
                     "line": 157,
                     "character": 19
                   },
-                  "name": "SourceFile",
-                  "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                  "name": "SourceFile"
                 }
               },
               "isOptional": false,
@@ -1259,11 +1186,7 @@
                   "line": 158,
                   "character": 17
                 },
-                "name": "MergeResultsThreeWay",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "merging"
-                }
+                "name": "MergeResultsThreeWay"
               },
               "isOptional": false,
               "isSpread": false
@@ -1291,11 +1214,7 @@
                       "line": 159,
                       "character": 18
                     },
-                    "name": "MergeStrategy",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "merging"
-                    }
+                    "name": "MergeStrategy"
                   },
                   {
                     "__schema": "LiteralTypeSchema",
@@ -1392,8 +1311,7 @@
                       "line": 160,
                       "character": 55
                     },
-                    "name": "SourceFile",
-                    "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                    "name": "SourceFile"
                   }
                 },
                 "isOptional": false
@@ -1449,8 +1367,7 @@
                   "line": 64,
                   "character": 13
                 },
-                "name": "Consumer",
-                "packageName": "@teambit/legacy/dist/consumer"
+                "name": "Consumer"
               },
               "isOptional": false,
               "isSpread": false
@@ -1470,12 +1387,7 @@
                   "line": 65,
                   "character": 7
                 },
-                "name": "ComponentID",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "component-id",
-                  "version": "1.2.0"
-                }
+                "name": "ComponentID"
               },
               "isOptional": false,
               "isSpread": false
@@ -1503,8 +1415,7 @@
                       "line": 66,
                       "character": 20
                     },
-                    "name": "ConsumerComponent",
-                    "packageName": "@teambit/legacy/dist/consumer/component"
+                    "name": "ConsumerComponent"
                   },
                   {
                     "__schema": "LiteralTypeSchema",
@@ -1552,11 +1463,7 @@
                       "line": 67,
                       "character": 17
                     },
-                    "name": "MergeResultsThreeWay",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "merging"
-                    }
+                    "name": "MergeResultsThreeWay"
                   },
                   {
                     "__schema": "LiteralTypeSchema",
@@ -1672,11 +1579,7 @@
                   "line": 125,
                   "character": 16
                 },
-                "name": "FilesStatus",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "merging"
-                }
+                "name": "FilesStatus"
               },
               "isOptional": false,
               "isSpread": false
@@ -1696,8 +1599,7 @@
                   "line": 126,
                   "character": 13
                 },
-                "name": "Consumer",
-                "packageName": "@teambit/legacy/dist/consumer"
+                "name": "Consumer"
               },
               "isOptional": false,
               "isSpread": false
@@ -1717,8 +1619,7 @@
                   "line": 127,
                   "character": 21
                 },
-                "name": "ConsumerComponent",
-                "packageName": "@teambit/legacy/dist/consumer/component"
+                "name": "ConsumerComponent"
               },
               "isOptional": true,
               "isSpread": false
@@ -1779,8 +1680,7 @@
                     "line": 109,
                     "character": 41
                   },
-                  "name": "SourceFile",
-                  "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                  "name": "SourceFile"
                 }
               },
               "isOptional": false,
@@ -1801,11 +1701,7 @@
                   "line": 109,
                   "character": 68
                 },
-                "name": "FilesStatus",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "merging"
-                }
+                "name": "FilesStatus"
               },
               "isOptional": false,
               "isSpread": false
@@ -1825,8 +1721,7 @@
                   "line": 109,
                   "character": 99
                 },
-                "name": "ConsumerComponent",
-                "packageName": "@teambit/legacy/dist/consumer/component"
+                "name": "ConsumerComponent"
               },
               "isOptional": true,
               "isSpread": false
@@ -1973,11 +1868,7 @@
                             "line": 32,
                             "character": 18
                           },
-                          "name": "MergeResultsThreeWay",
-                          "componentId": {
-                            "scope": "teambit.component",
-                            "name": "merging"
-                          }
+                          "name": "MergeResultsThreeWay"
                         },
                         {
                           "__schema": "LiteralTypeSchema",
@@ -2048,8 +1939,7 @@
                     "line": 23,
                     "character": 22
                   },
-                  "name": "ConsumerComponent",
-                  "packageName": "@teambit/legacy/dist/consumer/component"
+                  "name": "ConsumerComponent"
                 },
                 "isOptional": true
               },
@@ -2069,8 +1959,7 @@
                     "line": 24,
                     "character": 24
                   },
-                  "name": "Version",
-                  "packageName": "@teambit/legacy/dist/scope/models/version"
+                  "name": "Version"
                 },
                 "isOptional": true
               },
@@ -2228,8 +2117,7 @@
                     "line": 37,
                     "character": 15
                   },
-                  "name": "ConsumerComponent",
-                  "packageName": "@teambit/legacy/dist/consumer/component"
+                  "name": "ConsumerComponent"
                 },
                 "isOptional": true
               },
@@ -2249,8 +2137,7 @@
                     "line": 39,
                     "character": 23
                   },
-                  "name": "ConsumerComponent",
-                  "packageName": "@teambit/legacy/dist/consumer/component"
+                  "name": "ConsumerComponent"
                 },
                 "isOptional": true
               }
@@ -2291,11 +2178,7 @@
                   "line": 148,
                   "character": 20
                 },
-                "name": "ApplyVersionResults",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "merging"
-                }
+                "name": "ApplyVersionResults"
               },
               "isOptional": false,
               "isSpread": false
@@ -2427,12 +2310,7 @@
                       "line": 30,
                       "character": 9
                     },
-                    "name": "ComponentID",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "component-id",
-                      "version": "1.2.0"
-                    }
+                    "name": "ComponentID"
                   }
                 },
                 "isOptional": true
@@ -2553,11 +2431,7 @@
                     "line": 36,
                     "character": 19
                   },
-                  "name": "MergeStrategy",
-                  "componentId": {
-                    "scope": "teambit.component",
-                    "name": "merging"
-                  }
+                  "name": "MergeStrategy"
                 },
                 "isOptional": true
               },
@@ -2737,8 +2611,7 @@
                     "line": 45,
                     "character": 10
                   },
-                  "name": "Lane",
-                  "packageName": "@teambit/legacy/dist/scope/models"
+                  "name": "Lane"
                 },
                 "isOptional": true
               },
@@ -2785,12 +2658,7 @@
                       "line": 47,
                       "character": 18
                     },
-                    "name": "ComponentID",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "component-id",
-                      "version": "1.2.0"
-                    }
+                    "name": "ComponentID"
                   }
                 },
                 "isOptional": true
@@ -3034,11 +2902,7 @@
                       "line": 64,
                       "character": 24
                     },
-                    "name": "Workspace",
-                    "componentId": {
-                      "scope": "teambit.workspace",
-                      "name": "workspace"
-                    }
+                    "name": "Workspace"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -3058,11 +2922,7 @@
                       "line": 65,
                       "character": 21
                     },
-                    "name": "Logger",
-                    "componentId": {
-                      "scope": "teambit.harmony",
-                      "name": "logger"
-                    }
+                    "name": "Logger"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -3082,11 +2942,7 @@
                       "line": 66,
                       "character": 30
                     },
-                    "name": "ComponentWriterMain",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "component-writer"
-                    }
+                    "name": "ComponentWriterMain"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -3106,11 +2962,7 @@
                       "line": 67,
                       "character": 23
                     },
-                    "name": "ImporterMain",
-                    "componentId": {
-                      "scope": "teambit.scope",
-                      "name": "importer"
-                    }
+                    "name": "ImporterMain"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -3130,11 +2982,7 @@
                       "line": 68,
                       "character": 21
                     },
-                    "name": "RemoveMain",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "remove"
-                    }
+                    "name": "RemoveMain"
                   },
                   "isOptional": false,
                   "isSpread": false
@@ -3198,11 +3046,7 @@
                       "line": 71,
                       "character": 57
                     },
-                    "name": "ApplyVersionResults",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "merging"
-                    }
+                    "name": "ApplyVersionResults"
                   }
                 ]
               },
@@ -3283,12 +3127,7 @@
                             "line": 206,
                             "character": 73
                           },
-                          "name": "ComponentID",
-                          "componentId": {
-                            "scope": "teambit.component",
-                            "name": "component-id",
-                            "version": "1.2.0"
-                          }
+                          "name": "ComponentID"
                         }
                       },
                       {
@@ -3375,11 +3214,7 @@
                       "line": 233,
                       "character": 94
                     },
-                    "name": "ApplyVersionResults",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "merging"
-                    }
+                    "name": "ApplyVersionResults"
                   }
                 ]
               },
@@ -3483,11 +3318,7 @@
                           "line": 525,
                           "character": 5
                         },
-                        "name": "CLIMain",
-                        "componentId": {
-                          "scope": "teambit.harmony",
-                          "name": "cli"
-                        }
+                        "name": "CLIMain"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -3496,11 +3327,7 @@
                           "line": 526,
                           "character": 5
                         },
-                        "name": "Workspace",
-                        "componentId": {
-                          "scope": "teambit.workspace",
-                          "name": "workspace"
-                        }
+                        "name": "Workspace"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -3509,11 +3336,7 @@
                           "line": 527,
                           "character": 5
                         },
-                        "name": "LoggerMain",
-                        "componentId": {
-                          "scope": "teambit.harmony",
-                          "name": "logger"
-                        }
+                        "name": "LoggerMain"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -3522,11 +3345,7 @@
                           "line": 528,
                           "character": 5
                         },
-                        "name": "ComponentWriterMain",
-                        "componentId": {
-                          "scope": "teambit.component",
-                          "name": "component-writer"
-                        }
+                        "name": "ComponentWriterMain"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -3535,11 +3354,7 @@
                           "line": 529,
                           "character": 5
                         },
-                        "name": "ImporterMain",
-                        "componentId": {
-                          "scope": "teambit.scope",
-                          "name": "importer"
-                        }
+                        "name": "ImporterMain"
                       },
                       {
                         "__schema": "TypeRefSchema",
@@ -3548,11 +3363,7 @@
                           "line": 530,
                           "character": 5
                         },
-                        "name": "RemoveMain",
-                        "componentId": {
-                          "scope": "teambit.component",
-                          "name": "remove"
-                        }
+                        "name": "RemoveMain"
                       }
                     ]
                   },
@@ -3680,8 +3491,7 @@
                     "line": 23,
                     "character": 22
                   },
-                  "name": "ConsumerComponent",
-                  "packageName": "@teambit/legacy/dist/consumer/component"
+                  "name": "ConsumerComponent"
                 },
                 "isOptional": true
               },
@@ -3701,8 +3511,7 @@
                     "line": 24,
                     "character": 24
                   },
-                  "name": "Version",
-                  "packageName": "@teambit/legacy/dist/scope/models/version"
+                  "name": "Version"
                 },
                 "isOptional": true
               },
@@ -3852,11 +3661,7 @@
                             "line": 32,
                             "character": 18
                           },
-                          "name": "MergeResultsThreeWay",
-                          "componentId": {
-                            "scope": "teambit.component",
-                            "name": "merging"
-                          }
+                          "name": "MergeResultsThreeWay"
                         },
                         {
                           "__schema": "LiteralTypeSchema",
@@ -3942,8 +3747,7 @@
                     "line": 37,
                     "character": 15
                   },
-                  "name": "ConsumerComponent",
-                  "packageName": "@teambit/legacy/dist/consumer/component"
+                  "name": "ConsumerComponent"
                 },
                 "isOptional": true
               },
@@ -3963,8 +3767,7 @@
                     "line": 39,
                     "character": 23
                   },
-                  "name": "ConsumerComponent",
-                  "packageName": "@teambit/legacy/dist/consumer/component"
+                  "name": "ConsumerComponent"
                 },
                 "isOptional": true
               }
@@ -4007,8 +3810,7 @@
                   "line": 64,
                   "character": 13
                 },
-                "name": "Consumer",
-                "packageName": "@teambit/legacy/dist/consumer"
+                "name": "Consumer"
               },
               "isOptional": false,
               "isSpread": false
@@ -4028,12 +3830,7 @@
                   "line": 65,
                   "character": 7
                 },
-                "name": "ComponentID",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "component-id",
-                  "version": "1.2.0"
-                }
+                "name": "ComponentID"
               },
               "isOptional": false,
               "isSpread": false
@@ -4061,8 +3858,7 @@
                       "line": 66,
                       "character": 20
                     },
-                    "name": "ConsumerComponent",
-                    "packageName": "@teambit/legacy/dist/consumer/component"
+                    "name": "ConsumerComponent"
                   },
                   {
                     "__schema": "LiteralTypeSchema",
@@ -4110,11 +3906,7 @@
                       "line": 67,
                       "character": 17
                     },
-                    "name": "MergeResultsThreeWay",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "merging"
-                    }
+                    "name": "MergeResultsThreeWay"
                   },
                   {
                     "__schema": "LiteralTypeSchema",
@@ -4217,8 +4009,7 @@
                     "line": 109,
                     "character": 41
                   },
-                  "name": "SourceFile",
-                  "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                  "name": "SourceFile"
                 }
               },
               "isOptional": false,
@@ -4239,11 +4030,7 @@
                   "line": 109,
                   "character": 68
                 },
-                "name": "FilesStatus",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "merging"
-                }
+                "name": "FilesStatus"
               },
               "isOptional": false,
               "isSpread": false
@@ -4263,8 +4050,7 @@
                   "line": 109,
                   "character": 99
                 },
-                "name": "ConsumerComponent",
-                "packageName": "@teambit/legacy/dist/consumer/component"
+                "name": "ConsumerComponent"
               },
               "isOptional": true,
               "isSpread": false
@@ -4319,11 +4105,7 @@
                   "line": 125,
                   "character": 16
                 },
-                "name": "FilesStatus",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "merging"
-                }
+                "name": "FilesStatus"
               },
               "isOptional": false,
               "isSpread": false
@@ -4343,8 +4125,7 @@
                   "line": 126,
                   "character": 13
                 },
-                "name": "Consumer",
-                "packageName": "@teambit/legacy/dist/consumer"
+                "name": "Consumer"
               },
               "isOptional": false,
               "isSpread": false
@@ -4364,8 +4145,7 @@
                   "line": 127,
                   "character": 21
                 },
-                "name": "ConsumerComponent",
-                "packageName": "@teambit/legacy/dist/consumer/component"
+                "name": "ConsumerComponent"
               },
               "isOptional": true,
               "isSpread": false
@@ -4428,8 +4208,7 @@
                     "line": 157,
                     "character": 19
                   },
-                  "name": "SourceFile",
-                  "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                  "name": "SourceFile"
                 }
               },
               "isOptional": false,
@@ -4450,11 +4229,7 @@
                   "line": 158,
                   "character": 17
                 },
-                "name": "MergeResultsThreeWay",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "merging"
-                }
+                "name": "MergeResultsThreeWay"
               },
               "isOptional": false,
               "isSpread": false
@@ -4482,11 +4257,7 @@
                       "line": 159,
                       "character": 18
                     },
-                    "name": "MergeStrategy",
-                    "componentId": {
-                      "scope": "teambit.component",
-                      "name": "merging"
-                    }
+                    "name": "MergeStrategy"
                   },
                   {
                     "__schema": "LiteralTypeSchema",
@@ -4583,8 +4354,7 @@
                       "line": 160,
                       "character": 55
                     },
-                    "name": "SourceFile",
-                    "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                    "name": "SourceFile"
                   }
                 },
                 "isOptional": false
@@ -5044,11 +4814,7 @@
                             "line": 92,
                             "character": 26
                           },
-                          "name": "MergeStrategy",
-                          "componentId": {
-                            "scope": "teambit.component",
-                            "name": "merging"
-                          }
+                          "name": "MergeStrategy"
                         },
                         "isOptional": true
                       },
@@ -5252,11 +5018,7 @@
                           "line": 92,
                           "character": 26
                         },
-                        "name": "MergeStrategy",
-                        "componentId": {
-                          "scope": "teambit.component",
-                          "name": "merging"
-                        }
+                        "name": "MergeStrategy"
                       },
                       "isOptional": true
                     },
@@ -5421,7 +5183,7 @@
                   "_legacy": {
                     "scope": "teambit.component",
                     "name": "checkout",
-                    "version": "1.0.330"
+                    "version": "1.0.331"
                   },
                   "_scope": "teambit.component"
                 }
@@ -5454,11 +5216,7 @@
                   "line": 148,
                   "character": 20
                 },
-                "name": "ApplyVersionResults",
-                "componentId": {
-                  "scope": "teambit.component",
-                  "name": "merging"
-                }
+                "name": "ApplyVersionResults"
               },
               "isOptional": false,
               "isSpread": false
@@ -5524,7 +5282,7 @@
   "componentId": {
     "scope": "teambit.component",
     "name": "checkout",
-    "version": "1.0.330"
+    "version": "1.0.331"
   },
   "taggedModuleExports": []
 }

package/dist/checkout-version.js

@@ -15,9 +15,9 @@ function path() {
   };
   return data;
 }
-function _path2() {
-  const data = require("@teambit/legacy/dist/utils/path");
-  _path2 = function () {
+function _legacy() {
+  const data = require("@teambit/legacy.utils");
+  _legacy = function () {
     return data;
   };
   return data;
@@ -100,7 +100,7 @@ mergeResults, checkoutProps) {
     // otherwise it's impossible to have conflicts
     if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);
     componentFromFS.files.forEach(file => {
-      filesStatus[(0, _path2().pathNormalizeToLinux)(file.relative)] = _merging().FileStatus.unchanged;
+      filesStatus[(0, _legacy().pathNormalizeToLinux)(file.relative)] = _merging().FileStatus.unchanged;
     });
     consumer.bitMap.updateComponentId(id);
     return {
@@ -142,7 +142,7 @@ function updateFileStatus(files, filesStatus, componentFromFS) {
     const fileFromFs = componentFromFS?.files.find(f => f.relative === file.relative);
     const areFilesEqual = fileFromFs && Buffer.compare(fileFromFs.contents, file.contents) === 0;
     // @ts-ignore
-    filesStatus[(0, _path2().pathNormalizeToLinux)(file.relative)] = areFilesEqual ? _merging().FileStatus.unchanged : _merging().FileStatus.updated;
+    filesStatus[(0, _legacy().pathNormalizeToLinux)(file.relative)] = areFilesEqual ? _merging().FileStatus.unchanged : _merging().FileStatus.updated;
   });
 }
 
@@ -163,7 +163,7 @@ async function removeFilesIfNeeded(filesStatus, consumer, componentFromFS) {
   const filePathsFromFS = componentFromFS.files || [];
   const dataToPersist = new (_dataToPersist().default)();
   filePathsFromFS.forEach(file => {
-    const filename = (0, _path2().pathNormalizeToLinux)(file.relative);
+    const filename = (0, _legacy().pathNormalizeToLinux)(file.relative);
     if (!filesStatus[filename]) {
       // @ts-ignore todo: typescript has a good point here. it should be the string "removed", not chalk.green(removed).
       filesStatus[filename] = _merging().FileStatus.removed;

package/dist/checkout-version.js.map

@@ -1 +1 @@
-{"version":3,"names":["path","data","_interopRequireWildcard","require","_path2","_dataToPersist","_interopRequireDefault","_removePath","_bitError","_chalk","_merging","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","_toPropertyKey","value","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","applyVersion","consumer","id","componentFromFS","mergeResults","checkoutProps","isLane","Error","toString","mergeStrategy","forceOurs","filesStatus","hasConflicts","MergeOptions","ours","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","bitMap","updateComponentId","applyVersionResult","component","loadComponentFromModelImportIfNeeded","componentMap","BitError","updateFileStatus","undefined","removeFilesIfNeeded","modifiedStatus","modifiedFiles","applyModifiedVersion","fileFromFs","find","f","areFilesEqual","Buffer","compare","contents","updated","isExistOnFs","getComponentIdIfExist","ignoreVersion","filePathsFromFS","dataToPersist","DataToPersist","filename","removed","removePath","RemovePath","persistAllToFS","componentFiles","map","clone","manual","filePath","normalize","foundFile","componentFile","conflict","from","output","merged","isBinaryConflict","fsFile","binaryConflict","addFiles","m","added","deletedConflictFiles","removeFiles","remainDeletedFiles","remainDeleted","deletedConflict","overrideFiles","overridden","updatedFiles","content","throwForFailures","allComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","failedComponent","chalk","bold","red","join"],"sources":["checkout-version.ts"],"sourcesContent":["import * as path from 'path';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ComponentID } from '@teambit/component-id';\nimport Version from '@teambit/legacy/dist/scope/models/version';\nimport { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';\nimport { pathNormalizeToLinux, PathOsBased } from '@teambit/legacy/dist/utils/path';\nimport DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';\nimport RemovePath from '@teambit/legacy/dist/consumer/component/sources/remove-path';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\nimport {\n  ApplyVersionResult,\n  FilesStatus,\n  FileStatus,\n  MergeOptions,\n  MergeStrategy,\n  MergeResultsThreeWay,\n} from '@teambit/merging';\nimport { CheckoutProps } from './checkout.main.runtime';\n\nexport type ComponentStatusBase = {\n  currentComponent?: ConsumerComponent;\n  componentFromModel?: Version;\n  id: ComponentID;\n  shouldBeRemoved?: boolean; // in case the component is soft-removed, it should be removed from the workspace\n  unchangedMessage?: string; // this gets populated either upon skip or failure.\n  unchangedLegitimately?: boolean; // true for skipped legitimately (e.g. already up to date). false for failure.\n};\n\nexport type ComponentStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null | undefined;\n};\n\nexport type ApplyVersionWithComps = {\n  applyVersionResult: ApplyVersionResult;\n  component?: ConsumerComponent;\n  // in case the component needs to be written to the filesystem, this is the component to write.\n  legacyCompToWrite?: ConsumerComponent;\n};\n\n/**\n * This function optionally returns \"component\" object. If it returns, it means it needs to be written to the filesystem.\n * Otherwise, it means the component is already up to date and no need to write it.\n *\n * If no need to change anything (ours), then don't return the component object.\n * Otherwise, either return the component object as is (if no conflicts or \"theirs\"), or change the files in this\n * component object. Later, this component object is written to the filesystem.\n *\n * 1) when the files are modified with conflicts and the strategy is \"ours\", or forceOurs was used, leave the FS as is.\n *\n * 2) when the files are modified with conflicts and the strategy is \"theirs\", or forceTheirs was used, write the\n * component according to \"component\" object\n *\n * 3) when files are modified with no conflict or files are modified with conflicts and the\n * strategy is manual, load the component according to id.version and update component.files.\n * applyModifiedVersion() docs explains what files are updated/added.\n *\n * Side note:\n * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).\n * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles\n */\nexport async function applyVersion(\n  consumer: Consumer,\n  id: ComponentID,\n  componentFromFS: ConsumerComponent | null | undefined, // it can be null only when isLanes is true\n  mergeResults: MergeResultsThreeWay | null | undefined,\n  checkoutProps: CheckoutProps\n): Promise<ApplyVersionWithComps> {\n  if (!checkoutProps.isLane && !componentFromFS)\n    throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n  const { mergeStrategy, forceOurs } = checkoutProps;\n  let filesStatus = {};\n  if ((mergeResults?.hasConflicts && mergeStrategy === MergeOptions.ours) || forceOurs) {\n    // even when isLane is true, the mergeResults is possible only when the component is on the filesystem\n    // otherwise it's impossible to have conflicts\n    if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n    componentFromFS.files.forEach((file) => {\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n    });\n    consumer.bitMap.updateComponentId(id);\n    return { applyVersionResult: { id, filesStatus } };\n  }\n  const component = await consumer.loadComponentFromModelImportIfNeeded(id);\n  const componentMap = componentFromFS && componentFromFS.componentMap;\n  if (componentFromFS && !componentMap) throw new BitError('applyVersion: componentMap was not found');\n\n  const files = component.files;\n  updateFileStatus(files, filesStatus, componentFromFS || undefined);\n\n  await removeFilesIfNeeded(filesStatus, consumer, componentFromFS || undefined);\n\n  if (mergeResults) {\n    // update files according to the merge results\n    const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n    filesStatus = { ...filesStatus, ...modifiedStatus };\n    component.files = modifiedFiles;\n  }\n\n  // in case of forceTheirs, the mergeResults is undefined, the \"component\" object is according to \"theirs\", so it'll work\n  // expected. (later, it writes the component object).\n\n  return {\n    applyVersionResult: { id, filesStatus },\n    component,\n  };\n}\n\nexport function updateFileStatus(files: SourceFile[], filesStatus: FilesStatus, componentFromFS?: ConsumerComponent) {\n  files.forEach((file) => {\n    const fileFromFs = componentFromFS?.files.find((f) => f.relative === file.relative);\n    const areFilesEqual = fileFromFs && Buffer.compare(fileFromFs.contents, file.contents) === 0;\n    // @ts-ignore\n    filesStatus[pathNormalizeToLinux(file.relative)] = areFilesEqual ? FileStatus.unchanged : FileStatus.updated;\n  });\n}\n\n/**\n * when files exist on the filesystem but not on the checked out versions, they need to be deleted.\n * without this function, these files would be left on the filesystem. (we don't delete the comp-dir before writing).\n * this needs to be done *before* the component is written to the filesystem, otherwise, it won't work when a file\n * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').\n */\nexport async function removeFilesIfNeeded(\n  filesStatus: FilesStatus,\n  consumer: Consumer,\n  componentFromFS?: ConsumerComponent\n) {\n  if (!componentFromFS) return;\n  // @todo: if the component is not in the FS, it should be passed as undefined here.\n  // in the case this is coming from merge-lane, it's sometimes populated from the scope.\n  const isExistOnFs = consumer.bitMap.getComponentIdIfExist(componentFromFS.id, { ignoreVersion: true });\n  if (!isExistOnFs) return;\n  const filePathsFromFS = componentFromFS.files || [];\n  const dataToPersist = new DataToPersist();\n  filePathsFromFS.forEach((file) => {\n    const filename = pathNormalizeToLinux(file.relative);\n    if (!filesStatus[filename]) {\n      // @ts-ignore todo: typescript has a good point here. it should be the string \"removed\", not chalk.green(removed).\n      filesStatus[filename] = FileStatus.removed;\n    }\n    if (filesStatus[filename] === FileStatus.removed) {\n      dataToPersist.removePath(new RemovePath(file.path));\n    }\n  });\n  await dataToPersist.persistAllToFS();\n}\n\n/**\n * relevant only when\n * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.\n * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.\n *\n * this function only updates the files content, it doesn't write the files\n */\nexport function applyModifiedVersion(\n  componentFiles: SourceFile[],\n  mergeResults: MergeResultsThreeWay,\n  mergeStrategy: MergeStrategy | null | undefined\n): { filesStatus: Record<string, any>; modifiedFiles: SourceFile[] } {\n  let modifiedFiles = componentFiles.map((file) => file.clone());\n  const filesStatus = {};\n  if (mergeResults.hasConflicts && mergeStrategy !== MergeOptions.manual) {\n    return { filesStatus, modifiedFiles };\n  }\n  mergeResults.modifiedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new BitError(`file ${filePath} not found`);\n    if (file.conflict) {\n      foundFile.contents = Buffer.from(file.conflict);\n      filesStatus[file.filePath] = FileStatus.manual;\n    } else if (typeof file.output === 'string') {\n      foundFile.contents = Buffer.from(file.output);\n      filesStatus[file.filePath] = FileStatus.merged;\n    } else if (file.isBinaryConflict) {\n      // leave the file as is and notify the user later about it.\n      foundFile.contents = file.fsFile.contents;\n      filesStatus[file.filePath] = FileStatus.binaryConflict;\n    } else {\n      throw new BitError(`file ${filePath} does not have output nor conflict`);\n    }\n  });\n\n  mergeResults.addFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    if (!file.fsFile) return;\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.removeFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    filesStatus[file.filePath] = FileStatus.removed;\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n  });\n  mergeResults.remainDeletedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n    filesStatus[file.filePath] = FileStatus.remainDeleted;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    filesStatus[file.filePath] = FileStatus.deletedConflict;\n  });\n\n  mergeResults.overrideFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new BitError(`file ${filePath} not found`);\n    foundFile.contents = file.fsFile.contents;\n    filesStatus[file.filePath] = FileStatus.overridden;\n  });\n  mergeResults.updatedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new BitError(`file ${filePath} not found`);\n    foundFile.contents = file.content;\n    filesStatus[file.filePath] = FileStatus.updated;\n  });\n\n  return { filesStatus, modifiedFiles };\n}\n\nexport function throwForFailures(allComponentsStatus: ComponentStatusBase[]) {\n  const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n  if (failedComponents.length) {\n    const failureMsgs = failedComponents\n      .map(\n        (failedComponent) =>\n          `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n      )\n      .join('\\n');\n    throw new BitError(`unable to proceed due to the following failures:\\n${failureMsgs}`);\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["path","data","_interopRequireWildcard","require","_legacy","_dataToPersist","_interopRequireDefault","_removePath","_bitError","_chalk","_merging","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","_toPropertyKey","value","configurable","writable","_toPrimitive","Symbol","toPrimitive","TypeError","String","Number","applyVersion","consumer","id","componentFromFS","mergeResults","checkoutProps","isLane","Error","toString","mergeStrategy","forceOurs","filesStatus","hasConflicts","MergeOptions","ours","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","bitMap","updateComponentId","applyVersionResult","component","loadComponentFromModelImportIfNeeded","componentMap","BitError","updateFileStatus","undefined","removeFilesIfNeeded","modifiedStatus","modifiedFiles","applyModifiedVersion","fileFromFs","find","f","areFilesEqual","Buffer","compare","contents","updated","isExistOnFs","getComponentIdIfExist","ignoreVersion","filePathsFromFS","dataToPersist","DataToPersist","filename","removed","removePath","RemovePath","persistAllToFS","componentFiles","map","clone","manual","filePath","normalize","foundFile","componentFile","conflict","from","output","merged","isBinaryConflict","fsFile","binaryConflict","addFiles","m","added","deletedConflictFiles","removeFiles","remainDeletedFiles","remainDeleted","deletedConflict","overrideFiles","overridden","updatedFiles","content","throwForFailures","allComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","failedComponent","chalk","bold","red","join"],"sources":["checkout-version.ts"],"sourcesContent":["import * as path from 'path';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport { ComponentID } from '@teambit/component-id';\nimport Version from '@teambit/legacy/dist/scope/models/version';\nimport { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';\nimport { pathNormalizeToLinux, PathOsBased } from '@teambit/legacy.utils';\nimport DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';\nimport RemovePath from '@teambit/legacy/dist/consumer/component/sources/remove-path';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component';\nimport { BitError } from '@teambit/bit-error';\nimport chalk from 'chalk';\nimport {\n  ApplyVersionResult,\n  FilesStatus,\n  FileStatus,\n  MergeOptions,\n  MergeStrategy,\n  MergeResultsThreeWay,\n} from '@teambit/merging';\nimport { CheckoutProps } from './checkout.main.runtime';\n\nexport type ComponentStatusBase = {\n  currentComponent?: ConsumerComponent;\n  componentFromModel?: Version;\n  id: ComponentID;\n  shouldBeRemoved?: boolean; // in case the component is soft-removed, it should be removed from the workspace\n  unchangedMessage?: string; // this gets populated either upon skip or failure.\n  unchangedLegitimately?: boolean; // true for skipped legitimately (e.g. already up to date). false for failure.\n};\n\nexport type ComponentStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null | undefined;\n};\n\nexport type ApplyVersionWithComps = {\n  applyVersionResult: ApplyVersionResult;\n  component?: ConsumerComponent;\n  // in case the component needs to be written to the filesystem, this is the component to write.\n  legacyCompToWrite?: ConsumerComponent;\n};\n\n/**\n * This function optionally returns \"component\" object. If it returns, it means it needs to be written to the filesystem.\n * Otherwise, it means the component is already up to date and no need to write it.\n *\n * If no need to change anything (ours), then don't return the component object.\n * Otherwise, either return the component object as is (if no conflicts or \"theirs\"), or change the files in this\n * component object. Later, this component object is written to the filesystem.\n *\n * 1) when the files are modified with conflicts and the strategy is \"ours\", or forceOurs was used, leave the FS as is.\n *\n * 2) when the files are modified with conflicts and the strategy is \"theirs\", or forceTheirs was used, write the\n * component according to \"component\" object\n *\n * 3) when files are modified with no conflict or files are modified with conflicts and the\n * strategy is manual, load the component according to id.version and update component.files.\n * applyModifiedVersion() docs explains what files are updated/added.\n *\n * Side note:\n * Deleted file => if files are in used version but not in the modified one, no need to delete it. (similar to git).\n * Added file => if files are not in used version but in the modified one, they'll be under mergeResults.addFiles\n */\nexport async function applyVersion(\n  consumer: Consumer,\n  id: ComponentID,\n  componentFromFS: ConsumerComponent | null | undefined, // it can be null only when isLanes is true\n  mergeResults: MergeResultsThreeWay | null | undefined,\n  checkoutProps: CheckoutProps\n): Promise<ApplyVersionWithComps> {\n  if (!checkoutProps.isLane && !componentFromFS)\n    throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n  const { mergeStrategy, forceOurs } = checkoutProps;\n  let filesStatus = {};\n  if ((mergeResults?.hasConflicts && mergeStrategy === MergeOptions.ours) || forceOurs) {\n    // even when isLane is true, the mergeResults is possible only when the component is on the filesystem\n    // otherwise it's impossible to have conflicts\n    if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n    componentFromFS.files.forEach((file) => {\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n    });\n    consumer.bitMap.updateComponentId(id);\n    return { applyVersionResult: { id, filesStatus } };\n  }\n  const component = await consumer.loadComponentFromModelImportIfNeeded(id);\n  const componentMap = componentFromFS && componentFromFS.componentMap;\n  if (componentFromFS && !componentMap) throw new BitError('applyVersion: componentMap was not found');\n\n  const files = component.files;\n  updateFileStatus(files, filesStatus, componentFromFS || undefined);\n\n  await removeFilesIfNeeded(filesStatus, consumer, componentFromFS || undefined);\n\n  if (mergeResults) {\n    // update files according to the merge results\n    const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n    filesStatus = { ...filesStatus, ...modifiedStatus };\n    component.files = modifiedFiles;\n  }\n\n  // in case of forceTheirs, the mergeResults is undefined, the \"component\" object is according to \"theirs\", so it'll work\n  // expected. (later, it writes the component object).\n\n  return {\n    applyVersionResult: { id, filesStatus },\n    component,\n  };\n}\n\nexport function updateFileStatus(files: SourceFile[], filesStatus: FilesStatus, componentFromFS?: ConsumerComponent) {\n  files.forEach((file) => {\n    const fileFromFs = componentFromFS?.files.find((f) => f.relative === file.relative);\n    const areFilesEqual = fileFromFs && Buffer.compare(fileFromFs.contents, file.contents) === 0;\n    // @ts-ignore\n    filesStatus[pathNormalizeToLinux(file.relative)] = areFilesEqual ? FileStatus.unchanged : FileStatus.updated;\n  });\n}\n\n/**\n * when files exist on the filesystem but not on the checked out versions, they need to be deleted.\n * without this function, these files would be left on the filesystem. (we don't delete the comp-dir before writing).\n * this needs to be done *before* the component is written to the filesystem, otherwise, it won't work when a file\n * has a case change. e.g. from uppercase to lowercase. (see merge-lane.e2e 'renaming files from uppercase to lowercase').\n */\nexport async function removeFilesIfNeeded(\n  filesStatus: FilesStatus,\n  consumer: Consumer,\n  componentFromFS?: ConsumerComponent\n) {\n  if (!componentFromFS) return;\n  // @todo: if the component is not in the FS, it should be passed as undefined here.\n  // in the case this is coming from merge-lane, it's sometimes populated from the scope.\n  const isExistOnFs = consumer.bitMap.getComponentIdIfExist(componentFromFS.id, { ignoreVersion: true });\n  if (!isExistOnFs) return;\n  const filePathsFromFS = componentFromFS.files || [];\n  const dataToPersist = new DataToPersist();\n  filePathsFromFS.forEach((file) => {\n    const filename = pathNormalizeToLinux(file.relative);\n    if (!filesStatus[filename]) {\n      // @ts-ignore todo: typescript has a good point here. it should be the string \"removed\", not chalk.green(removed).\n      filesStatus[filename] = FileStatus.removed;\n    }\n    if (filesStatus[filename] === FileStatus.removed) {\n      dataToPersist.removePath(new RemovePath(file.path));\n    }\n  });\n  await dataToPersist.persistAllToFS();\n}\n\n/**\n * relevant only when\n * 1) there is no conflict => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.output.\n * 2) there is conflict and mergeStrategy is manual => add files from mergeResults: addFiles, overrideFiles and modifiedFiles.conflict.\n *\n * this function only updates the files content, it doesn't write the files\n */\nexport function applyModifiedVersion(\n  componentFiles: SourceFile[],\n  mergeResults: MergeResultsThreeWay,\n  mergeStrategy: MergeStrategy | null | undefined\n): { filesStatus: Record<string, any>; modifiedFiles: SourceFile[] } {\n  let modifiedFiles = componentFiles.map((file) => file.clone());\n  const filesStatus = {};\n  if (mergeResults.hasConflicts && mergeStrategy !== MergeOptions.manual) {\n    return { filesStatus, modifiedFiles };\n  }\n  mergeResults.modifiedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new BitError(`file ${filePath} not found`);\n    if (file.conflict) {\n      foundFile.contents = Buffer.from(file.conflict);\n      filesStatus[file.filePath] = FileStatus.manual;\n    } else if (typeof file.output === 'string') {\n      foundFile.contents = Buffer.from(file.output);\n      filesStatus[file.filePath] = FileStatus.merged;\n    } else if (file.isBinaryConflict) {\n      // leave the file as is and notify the user later about it.\n      foundFile.contents = file.fsFile.contents;\n      filesStatus[file.filePath] = FileStatus.binaryConflict;\n    } else {\n      throw new BitError(`file ${filePath} does not have output nor conflict`);\n    }\n  });\n\n  mergeResults.addFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    if (!file.fsFile) return;\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    if (modifiedFiles.find((m) => m.relative === filePath)) return;\n    modifiedFiles.push(file.fsFile);\n    filesStatus[file.filePath] = FileStatus.added;\n  });\n  mergeResults.removeFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    filesStatus[file.filePath] = FileStatus.removed;\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n  });\n  mergeResults.remainDeletedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    modifiedFiles = modifiedFiles.filter((f) => f.relative !== filePath);\n    filesStatus[file.filePath] = FileStatus.remainDeleted;\n  });\n  mergeResults.deletedConflictFiles.forEach((file) => {\n    filesStatus[file.filePath] = FileStatus.deletedConflict;\n  });\n\n  mergeResults.overrideFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new BitError(`file ${filePath} not found`);\n    foundFile.contents = file.fsFile.contents;\n    filesStatus[file.filePath] = FileStatus.overridden;\n  });\n  mergeResults.updatedFiles.forEach((file) => {\n    const filePath: PathOsBased = path.normalize(file.filePath);\n    const foundFile = modifiedFiles.find((componentFile) => componentFile.relative === filePath);\n    if (!foundFile) throw new BitError(`file ${filePath} not found`);\n    foundFile.contents = file.content;\n    filesStatus[file.filePath] = FileStatus.updated;\n  });\n\n  return { filesStatus, modifiedFiles };\n}\n\nexport function throwForFailures(allComponentsStatus: ComponentStatusBase[]) {\n  const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n  if (failedComponents.length) {\n    const failureMsgs = failedComponents\n      .map(\n        (failedComponent) =>\n          `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n      )\n      .join('\\n');\n    throw new BitError(`unable to proceed due to the following failures:\\n${failureMsgs}`);\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/checkout",
-  "version": "1.0.330",
+  "version": "1.0.331",
   "homepage": "https://bit.cloud/teambit/component/checkout",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "checkout",
-    "version": "1.0.330"
+    "version": "1.0.331"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -15,13 +15,14 @@
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-id": "1.2.0",
     "@teambit/harmony": "0.4.6",
-    "@teambit/cli": "0.0.907",
-    "@teambit/merging": "1.0.330",
-    "@teambit/component-writer": "1.0.330",
-    "@teambit/importer": "1.0.330",
-    "@teambit/logger": "0.0.1000",
-    "@teambit/remove": "1.0.330",
-    "@teambit/workspace": "1.0.330"
+    "@teambit/cli": "0.0.908",
+    "@teambit/merging": "1.0.331",
+    "@teambit/legacy.utils": "0.0.3",
+    "@teambit/component-writer": "1.0.331",
+    "@teambit/importer": "1.0.331",
+    "@teambit/logger": "0.0.1001",
+    "@teambit/remove": "1.0.331",
+    "@teambit/workspace": "1.0.331"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -32,11 +33,11 @@
     "chai": "4.3.0",
     "fs-extra": "10.0.0",
     "@types/mocha": "9.1.0",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.39",
-    "@teambit/component.testing.mock-components": "0.0.206",
-    "@teambit/harmony.testing.load-aspect": "0.0.201",
-    "@teambit/lister": "1.0.330",
-    "@teambit/snapping": "1.0.330",
+    "@teambit/harmony.envs.core-aspect-env": "0.0.42",
+    "@teambit/component.testing.mock-components": "0.0.207",
+    "@teambit/harmony.testing.load-aspect": "0.0.202",
+    "@teambit/lister": "1.0.331",
+    "@teambit/snapping": "1.0.331",
     "@teambit/workspace.testing.mock-workspace": "0.0.27"
   },
   "peerDependencies": {