@teambit/merging 1.0.224 → 1.0.226

package/artifacts/__bit_junit.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="0" failures="0" errors="0" skipped="0">
-  <testsuite name="teambit.component/merging@1.0.224" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.component/merging@1.0.226" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

package/artifacts/schema.json

@@ -1930,14 +1930,14 @@
             "__schema": "FunctionLikeSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 348,
+              "line": 350,
               "character": 3
             },
             "doc": {
               "__schema": "DocSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 342,
+                "line": 344,
                 "character": 3
               },
               "raw": "/**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */",
@@ -1950,7 +1950,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 349,
+                  "line": 351,
                   "character": 5
                 },
                 "name": "bitIds",
@@ -1958,14 +1958,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 349,
+                    "line": 351,
                     "character": 13
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 349,
+                      "line": 351,
                       "character": 13
                     },
                     "name": "ComponentID",
@@ -1983,7 +1983,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 350,
+                  "line": 352,
                   "character": 5
                 },
                 "name": "options",
@@ -1991,7 +1991,7 @@
                   "__schema": "TypeRefSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 350,
+                    "line": 352,
                     "character": 14
                   },
                   "name": "MergeStatusProviderOptions",
@@ -2004,7 +2004,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 351,
+                  "line": 353,
                   "character": 5
                 },
                 "name": "currentLane",
@@ -2012,7 +2012,7 @@
                   "__schema": "TypeUnionSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 351,
+                    "line": 353,
                     "character": 18
                   },
                   "types": [
@@ -2020,7 +2020,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 351,
+                        "line": 353,
                         "character": 18
                       },
                       "name": "Lane",
@@ -2030,7 +2030,7 @@
                       "__schema": "LiteralTypeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 351,
+                        "line": 353,
                         "character": 25
                       },
                       "name": "null"
@@ -2044,7 +2044,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 352,
+                  "line": 354,
                   "character": 5
                 },
                 "name": "otherLane",
@@ -2052,7 +2052,7 @@
                   "__schema": "TypeUnionSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 352,
+                    "line": 354,
                     "character": 17
                   },
                   "types": [
@@ -2060,7 +2060,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 352,
+                        "line": 354,
                         "character": 17
                       },
                       "name": "Lane",
@@ -2070,7 +2070,7 @@
                       "__schema": "LiteralTypeSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 352,
+                        "line": 354,
                         "character": 24
                       },
                       "name": "null"
@@ -2085,7 +2085,7 @@
               "__schema": "TypeRefSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 353,
+                "line": 355,
                 "character": 6
               },
               "name": "Promise",
@@ -2094,14 +2094,14 @@
                   "__schema": "TypeArraySchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 353,
+                    "line": 355,
                     "character": 14
                   },
                   "type": {
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 353,
+                      "line": 355,
                       "character": 14
                     },
                     "name": "ComponentMergeStatus"
@@ -2117,7 +2117,7 @@
             "__schema": "VariableLikeSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 650,
+              "line": 651,
               "character": 3
             },
             "signature": "(property) MergingMain.slots: never[]",
@@ -2126,7 +2126,7 @@
               "__schema": "InferenceTypeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 650,
+                "line": 651,
                 "character": 3
               },
               "type": "never[]"
@@ -2138,7 +2138,7 @@
             "__schema": "VariableLikeSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 651,
+              "line": 652,
               "character": 3
             },
             "signature": "(property) MergingMain.dependencies: Aspect[]",
@@ -2147,7 +2147,7 @@
               "__schema": "InferenceTypeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 651,
+                "line": 652,
                 "character": 3
               },
               "type": "Aspect[]"
@@ -2159,7 +2159,7 @@
             "__schema": "VariableLikeSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 666,
+              "line": 667,
               "character": 3
             },
             "signature": "(property) MergingMain.runtime: RuntimeDefinition",
@@ -2168,7 +2168,7 @@
               "__schema": "InferenceTypeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 666,
+                "line": 667,
                 "character": 3
               },
               "type": "RuntimeDefinition"
@@ -2180,7 +2180,7 @@
             "__schema": "FunctionLikeSchema",
             "location": {
               "filePath": "merging.main.runtime.ts",
-              "line": 667,
+              "line": 668,
               "character": 3
             },
             "signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [\n    CLIMain,\n    Workspace,\n    ScopeMain,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain,\n    ConfigMergerMain\n]): Promise<MergingMain>",
@@ -2190,7 +2190,7 @@
                 "__schema": "ParameterSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 667,
+                  "line": 668,
                   "character": 25
                 },
                 "name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
@@ -2198,7 +2198,7 @@
                   "__schema": "TupleTypeSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 681,
+                    "line": 682,
                     "character": 6
                   },
                   "elements": [
@@ -2206,7 +2206,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 682,
+                        "line": 683,
                         "character": 5
                       },
                       "name": "CLIMain",
@@ -2219,7 +2219,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 683,
+                        "line": 684,
                         "character": 5
                       },
                       "name": "Workspace",
@@ -2232,7 +2232,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 684,
+                        "line": 685,
                         "character": 5
                       },
                       "name": "ScopeMain",
@@ -2245,7 +2245,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 685,
+                        "line": 686,
                         "character": 5
                       },
                       "name": "SnappingMain",
@@ -2258,7 +2258,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 686,
+                        "line": 687,
                         "character": 5
                       },
                       "name": "CheckoutMain",
@@ -2271,7 +2271,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 687,
+                        "line": 688,
                         "character": 5
                       },
                       "name": "InstallMain",
@@ -2284,7 +2284,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 688,
+                        "line": 689,
                         "character": 5
                       },
                       "name": "LoggerMain",
@@ -2297,7 +2297,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 689,
+                        "line": 690,
                         "character": 5
                       },
                       "name": "ComponentWriterMain",
@@ -2310,7 +2310,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 690,
+                        "line": 691,
                         "character": 5
                       },
                       "name": "ImporterMain",
@@ -2323,7 +2323,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 691,
+                        "line": 692,
                         "character": 5
                       },
                       "name": "ConfigMain",
@@ -2336,7 +2336,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 692,
+                        "line": 693,
                         "character": 5
                       },
                       "name": "RemoveMain",
@@ -2349,7 +2349,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 693,
+                        "line": 694,
                         "character": 5
                       },
                       "name": "GlobalConfigMain",
@@ -2362,7 +2362,7 @@
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 694,
+                        "line": 695,
                         "character": 5
                       },
                       "name": "ConfigMergerMain",
@@ -2381,7 +2381,7 @@
               "__schema": "InferenceTypeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 667,
+                "line": 668,
                 "character": 3
               },
               "type": "Promise<MergingMain>"
@@ -4029,7 +4029,7 @@
                   "_legacy": {
                     "scope": "teambit.component",
                     "name": "merging",
-                    "version": "1.0.224"
+                    "version": "1.0.226"
                   },
                   "_scope": "teambit.component"
                 }
@@ -7106,14 +7106,14 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 348,
+                "line": 350,
                 "character": 3
               },
               "doc": {
                 "__schema": "DocSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 342,
+                  "line": 344,
                   "character": 3
                 },
                 "raw": "/**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */",
@@ -7126,7 +7126,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 349,
+                    "line": 351,
                     "character": 5
                   },
                   "name": "bitIds",
@@ -7134,14 +7134,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 349,
+                      "line": 351,
                       "character": 13
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 349,
+                        "line": 351,
                         "character": 13
                       },
                       "name": "ComponentID",
@@ -7159,7 +7159,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 350,
+                    "line": 352,
                     "character": 5
                   },
                   "name": "options",
@@ -7167,7 +7167,7 @@
                     "__schema": "TypeRefSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 350,
+                      "line": 352,
                       "character": 14
                     },
                     "name": "MergeStatusProviderOptions",
@@ -7180,7 +7180,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 351,
+                    "line": 353,
                     "character": 5
                   },
                   "name": "currentLane",
@@ -7188,7 +7188,7 @@
                     "__schema": "TypeUnionSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 351,
+                      "line": 353,
                       "character": 18
                     },
                     "types": [
@@ -7196,7 +7196,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 351,
+                          "line": 353,
                           "character": 18
                         },
                         "name": "Lane",
@@ -7206,7 +7206,7 @@
                         "__schema": "LiteralTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 351,
+                          "line": 353,
                           "character": 25
                         },
                         "name": "null"
@@ -7220,7 +7220,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 352,
+                    "line": 354,
                     "character": 5
                   },
                   "name": "otherLane",
@@ -7228,7 +7228,7 @@
                     "__schema": "TypeUnionSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 352,
+                      "line": 354,
                       "character": 17
                     },
                     "types": [
@@ -7236,7 +7236,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 352,
+                          "line": 354,
                           "character": 17
                         },
                         "name": "Lane",
@@ -7246,7 +7246,7 @@
                         "__schema": "LiteralTypeSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 352,
+                          "line": 354,
                           "character": 24
                         },
                         "name": "null"
@@ -7261,7 +7261,7 @@
                 "__schema": "TypeRefSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 353,
+                  "line": 355,
                   "character": 6
                 },
                 "name": "Promise",
@@ -7270,14 +7270,14 @@
                     "__schema": "TypeArraySchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 353,
+                      "line": 355,
                       "character": 14
                     },
                     "type": {
                       "__schema": "TypeRefSchema",
                       "location": {
                         "filePath": "merging.main.runtime.ts",
-                        "line": 353,
+                        "line": 355,
                         "character": 14
                       },
                       "name": "ComponentMergeStatus"
@@ -7293,7 +7293,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 650,
+                "line": 651,
                 "character": 3
               },
               "signature": "(property) MergingMain.slots: never[]",
@@ -7302,7 +7302,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 650,
+                  "line": 651,
                   "character": 3
                 },
                 "type": "never[]"
@@ -7314,7 +7314,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 651,
+                "line": 652,
                 "character": 3
               },
               "signature": "(property) MergingMain.dependencies: Aspect[]",
@@ -7323,7 +7323,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 651,
+                  "line": 652,
                   "character": 3
                 },
                 "type": "Aspect[]"
@@ -7335,7 +7335,7 @@
               "__schema": "VariableLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 666,
+                "line": 667,
                 "character": 3
               },
               "signature": "(property) MergingMain.runtime: RuntimeDefinition",
@@ -7344,7 +7344,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 666,
+                  "line": 667,
                   "character": 3
                 },
                 "type": "RuntimeDefinition"
@@ -7356,7 +7356,7 @@
               "__schema": "FunctionLikeSchema",
               "location": {
                 "filePath": "merging.main.runtime.ts",
-                "line": 667,
+                "line": 668,
                 "character": 3
               },
               "signature": "(method) MergingMain.provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [\n    CLIMain,\n    Workspace,\n    ScopeMain,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain,\n    ConfigMergerMain\n]): Promise<MergingMain>",
@@ -7366,7 +7366,7 @@
                   "__schema": "ParameterSchema",
                   "location": {
                     "filePath": "merging.main.runtime.ts",
-                    "line": 667,
+                    "line": 668,
                     "character": 25
                   },
                   "name": "[ cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger ]",
@@ -7374,7 +7374,7 @@
                     "__schema": "TupleTypeSchema",
                     "location": {
                       "filePath": "merging.main.runtime.ts",
-                      "line": 681,
+                      "line": 682,
                       "character": 6
                     },
                     "elements": [
@@ -7382,7 +7382,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 682,
+                          "line": 683,
                           "character": 5
                         },
                         "name": "CLIMain",
@@ -7395,7 +7395,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 683,
+                          "line": 684,
                           "character": 5
                         },
                         "name": "Workspace",
@@ -7408,7 +7408,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 684,
+                          "line": 685,
                           "character": 5
                         },
                         "name": "ScopeMain",
@@ -7421,7 +7421,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 685,
+                          "line": 686,
                           "character": 5
                         },
                         "name": "SnappingMain",
@@ -7434,7 +7434,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 686,
+                          "line": 687,
                           "character": 5
                         },
                         "name": "CheckoutMain",
@@ -7447,7 +7447,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 687,
+                          "line": 688,
                           "character": 5
                         },
                         "name": "InstallMain",
@@ -7460,7 +7460,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 688,
+                          "line": 689,
                           "character": 5
                         },
                         "name": "LoggerMain",
@@ -7473,7 +7473,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 689,
+                          "line": 690,
                           "character": 5
                         },
                         "name": "ComponentWriterMain",
@@ -7486,7 +7486,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 690,
+                          "line": 691,
                           "character": 5
                         },
                         "name": "ImporterMain",
@@ -7499,7 +7499,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 691,
+                          "line": 692,
                           "character": 5
                         },
                         "name": "ConfigMain",
@@ -7512,7 +7512,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 692,
+                          "line": 693,
                           "character": 5
                         },
                         "name": "RemoveMain",
@@ -7525,7 +7525,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 693,
+                          "line": 694,
                           "character": 5
                         },
                         "name": "GlobalConfigMain",
@@ -7538,7 +7538,7 @@
                         "__schema": "TypeRefSchema",
                         "location": {
                           "filePath": "merging.main.runtime.ts",
-                          "line": 694,
+                          "line": 695,
                           "character": 5
                         },
                         "name": "ConfigMergerMain",
@@ -7557,7 +7557,7 @@
                 "__schema": "InferenceTypeSchema",
                 "location": {
                   "filePath": "merging.main.runtime.ts",
-                  "line": 667,
+                  "line": 668,
                   "character": 3
                 },
                 "type": "Promise<MergingMain>"
@@ -7685,7 +7685,7 @@
           "__schema": "UnImplementedSchema",
           "location": {
             "filePath": "merging.main.runtime.ts",
-            "line": 715,
+            "line": 716,
             "character": 1
           },
           "name": "MergingAspect.addRuntime(MergingMain);",
@@ -7734,7 +7734,7 @@
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.224"
+    "version": "1.0.226"
   },
   "taggedModuleExports": []
 }

package/dist/merging.main.runtime.js

@@ -318,7 +318,7 @@ class MergingMain {
         });
       } catch (err) {
         this.logger.error(`failed installing packages`, err);
-        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);
+        this.logger.consoleFailure(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);
       }
     }
     const getSnapOrTagResults = async () => {
@@ -546,7 +546,7 @@ class MergingMain {
     }
     return {
       applyVersionResult: {
-        id,
+        id: idToLoad,
         filesStatus
       },
       component: currentComponent || undefined,

package/dist/merging.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"names":["_cli","data","require","_workspace","_componentsList","_interopRequireDefault","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_deleteComponentFiles","_configMerger","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","tag","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","snapFromScope","componentId","lane","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","unresolvedComponents","u","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","ConfigMergerAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { compact } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport {\n  ConfigMergerAspect,\n  ConfigMergerMain,\n  ConfigMergeResult,\n  WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: ComponentID;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n  snappedComponents: ConsumerComponent[];\n  autoSnappedResults: AutoTagResult[];\n  removedComponents?: ComponentIdList;\n  exportedIds?: ComponentID[];\n} | null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: ComponentID[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: MergeSnapResults;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private scope: ScopeMain,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain,\n    private configMerger: ConfigMergerMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy('merge');\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: ComponentID[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(\n      bitIds,\n      currentLaneId,\n      currentLaneObject,\n      mergeStrategy\n    );\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 merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      otherLaneId: currentLaneId,\n      currentLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    otherLaneId,\n    currentLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace?.consumer;\n    const legacyScope = this.scope.legacyScope;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unchangedMessage)\n      .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        unchangedMessage: componentStatus.unchangedMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n\n    const componentIdsToRemove = allComponentsStatus\n      .filter((componentStatus) => componentStatus.shouldBeRemoved)\n      .map((c) => c.id.changeVersion(undefined));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n    const componentsResults = await this.applyVersionMultiple(\n      succeededComponents,\n      otherLaneId,\n      mergeStrategy,\n      currentLane\n    );\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = this.workspace\n      ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n      : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined };\n\n    let workspaceConfigConflictWriteError: Error | undefined;\n    if (workspaceDepsConflicts) {\n      workspaceConfigConflictWriteError = await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(\n        workspaceDepsConflicts\n      );\n    }\n    if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n    if (currentLane) legacyScope.objects.add(currentLane);\n\n    await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n    await legacyScope.objects.unmergedComponents.write();\n\n    if (this.workspace) await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n\n    if (componentIdsToRemove.length && this.workspace) {\n      const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(snapMessage, build, currentLane?.toLaneId());\n    };\n    let mergeSnapResults: MergeSnapResults = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      this.logger.error('failed running snap. mergeSnapError:', err);\n      mergeSnapError = err;\n      if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      workspaceConfigUpdateResult: {\n        workspaceDepsUpdates,\n        workspaceDepsConflicts,\n        workspaceConfigConflictWriteError,\n      },\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n    options: MergeStatusProviderOptions,\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null // the lane we want to merged to our lane. (null if it's \"main\").\n  ): Promise<ComponentMergeStatus[]> {\n    const mergeStatusProvider = new MergeStatusProvider(\n      this.scope,\n      this.logger,\n      this.importer,\n      options,\n      this.workspace,\n      currentLane || undefined,\n      otherLane || undefined\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    otherLaneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    currentLane: Lane | null\n  ): Promise<ApplyVersionWithComps[]> {\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n        const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          otherLaneId: updatedLaneId,\n          currentLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    if (this.workspace) {\n      const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n      const manyComponentsWriterOpts = {\n        consumer: this.workspace.consumer,\n        components: compsToWrite,\n        skipDependencyInstallation: true,\n        writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n        reasonForBitmapChange: 'merge',\n      };\n      await this.componentWriter.writeMany(manyComponentsWriterOpts);\n    }\n\n    return componentsResults;\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    otherLaneId,\n    currentLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: ComponentID;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const legacyScope = this.scope.legacyScope;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      id: { name: id.fullName, scope: id.scope },\n      head: remoteHead,\n      laneId: otherLaneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await legacyScope.getModelComponent(id);\n\n    const addToCurrentLane = (head: Ref) => {\n      if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n      if (otherLaneId.isDefault()) {\n        const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n        if (!isPartOfLane) return;\n      }\n      currentLane.addComponent({ id, head });\n    };\n\n    const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n      addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n      unmergedComponent.unrelated = {\n        unrelatedHead: resolvedUnrelated.unrelatedHead,\n        headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n        unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n      };\n      legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = this.workspace\n      ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n      : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent || undefined);\n\n    if (configMergeResult) {\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (currentLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated(legacyComponent);\n      }\n      addToCurrentLane(remoteHead);\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      legacyScope.objects.add(modelComponent);\n    }\n\n    return {\n      applyVersionResult: { id, filesStatus },\n      component: currentComponent || undefined,\n      legacyCompToWrite: legacyComponent,\n    };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: ComponentID[],\n    laneId: LaneId,\n    localLaneObject: Lane | null,\n    mergeStrategy: MergeStrategy\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    snapMessage: string,\n    build: boolean,\n    laneId?: LaneId\n  ): Promise<MergeSnapResults> {\n    const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n    if (!this.workspace) {\n      const results = await this.snapping.snapFromScope(\n        ids.map((id) => ({ componentId: id.toString() })),\n        {\n          message: snapMessage,\n          build,\n          lane: laneId?.toString(),\n        }\n      );\n      return { ...results, autoSnappedResults: [] };\n    }\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(\n    idsToTag: ComponentID[],\n    tagMessage: string,\n    build: boolean\n  ): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n        if (!entry) {\n          throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    ScopeAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n    GlobalConfigAspect,\n    ConfigMergerAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    scope,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n    globalConfig,\n    configMerger,\n  ]: [\n    CLIMain,\n    Workspace,\n    ScopeMain,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain,\n    ConfigMergerMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      scope,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove,\n      configMerger\n    );\n    cli.register(new MergeCmd(merging, globalConfig));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_cli","data","require","_workspace","_componentsList","_interopRequireDefault","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_deleteComponentFiles","_configMerger","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","tag","legacyScope","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleFailure","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","toLaneId","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","workspaceConfigUpdateResult","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","Error","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","getConsumerComponent","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","debug","ComponentID","fromObject","snapFromScope","componentId","lane","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","unresolvedComponents","u","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","ConfigMergerAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { WorkspaceAspect, OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport { RemoveAspect, RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterAspect, ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { GlobalConfigAspect, GlobalConfigMain } from '@teambit/global-config';\nimport { compact } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport {\n  ConfigMergerAspect,\n  ConfigMergerMain,\n  ConfigMergeResult,\n  WorkspaceConfigUpdateResult,\n} from '@teambit/config-merger';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { ScopeAspect, ScopeMain } from '@teambit/scope';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: ComponentID;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type MergeSnapResults = {\n  snappedComponents: ConsumerComponent[];\n  autoSnappedResults: AutoTagResult[];\n  removedComponents?: ComponentIdList;\n  exportedIds?: ComponentID[];\n} | null;\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: ComponentID[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: MergeSnapResults;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceConfigUpdateResult?: WorkspaceConfigUpdateResult;\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private scope: ScopeMain,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain,\n    private configMerger: ConfigMergerMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy('merge');\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: ComponentID[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(\n      bitIds,\n      currentLaneId,\n      currentLaneObject,\n      mergeStrategy\n    );\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 merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      otherLaneId: currentLaneId,\n      currentLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    otherLaneId,\n    currentLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace?.consumer;\n    const legacyScope = this.scope.legacyScope;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unchangedMessage)\n      .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        unchangedMessage: componentStatus.unchangedMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n\n    const componentIdsToRemove = allComponentsStatus\n      .filter((componentStatus) => componentStatus.shouldBeRemoved)\n      .map((c) => c.id.changeVersion(undefined));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n    const componentsResults = await this.applyVersionMultiple(\n      succeededComponents,\n      otherLaneId,\n      mergeStrategy,\n      currentLane\n    );\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = this.workspace\n      ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n      : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined };\n\n    let workspaceConfigConflictWriteError: Error | undefined;\n    if (workspaceDepsConflicts) {\n      workspaceConfigConflictWriteError = await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(\n        workspaceDepsConflicts\n      );\n    }\n    if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge);\n\n    if (currentLane) legacyScope.objects.add(currentLane);\n\n    await legacyScope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n    await legacyScope.objects.unmergedComponents.write();\n\n    if (this.workspace) await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n\n    if (componentIdsToRemove.length && this.workspace) {\n      const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleFailure(\n          `failed installing packages, see the log for full stacktrace. error: ${err.message}`\n        );\n      }\n    }\n\n    const getSnapOrTagResults = async (): Promise<MergeSnapResults> => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(snapMessage, build, currentLane?.toLaneId());\n    };\n    let mergeSnapResults: MergeSnapResults = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace ? this.workspace.bitMap.takeSnapshot() : null;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      this.logger.error('failed running snap. mergeSnapError:', err);\n      mergeSnapError = err;\n      if (bitMapSnapshot) this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      workspaceConfigUpdateResult: {\n        workspaceDepsUpdates,\n        workspaceDepsConflicts,\n        workspaceConfigConflictWriteError,\n      },\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n    options: MergeStatusProviderOptions,\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null // the lane we want to merged to our lane. (null if it's \"main\").\n  ): Promise<ComponentMergeStatus[]> {\n    const mergeStatusProvider = new MergeStatusProvider(\n      this.scope,\n      this.logger,\n      this.importer,\n      options,\n      this.workspace,\n      currentLane || undefined,\n      otherLane || undefined\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    otherLaneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    currentLane: Lane | null\n  ): Promise<ApplyVersionWithComps[]> {\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await this.scope.legacyScope.getModelComponent(id);\n        const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          otherLaneId: updatedLaneId,\n          currentLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    if (this.workspace) {\n      const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n      const manyComponentsWriterOpts = {\n        consumer: this.workspace.consumer,\n        components: compsToWrite,\n        skipDependencyInstallation: true,\n        writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n        reasonForBitmapChange: 'merge',\n      };\n      await this.componentWriter.writeMany(manyComponentsWriterOpts);\n    }\n\n    return componentsResults;\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    otherLaneId,\n    currentLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: ComponentID;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const legacyScope = this.scope.legacyScope;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      id: { name: id.fullName, scope: id.scope },\n      head: remoteHead,\n      laneId: otherLaneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n    const modelComponent = await legacyScope.getModelComponent(id);\n\n    const addToCurrentLane = (head: Ref) => {\n      if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n      if (otherLaneId.isDefault()) {\n        const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n        if (!isPartOfLane) return;\n      }\n      currentLane.addComponent({ id, head });\n    };\n\n    const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n      addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n      unmergedComponent.unrelated = {\n        unrelatedHead: resolvedUnrelated.unrelatedHead,\n        headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n        unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n      };\n      legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = this.workspace\n      ? await this.workspace.consumer.loadComponentFromModelImportIfNeeded(idToLoad)\n      : await legacyScope.getConsumerComponent(idToLoad); // when loading from the scope, we import all needed components first, so it should be fine. otherwise, change the code to import it here\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    if (this.workspace) await removeFilesIfNeeded(filesStatus, this.workspace.consumer, currentComponent || undefined);\n\n    if (configMergeResult) {\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      legacyScope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (currentLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated(legacyComponent);\n      }\n      addToCurrentLane(remoteHead);\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      legacyScope.objects.add(modelComponent);\n    }\n\n    return {\n      applyVersionResult: { id: idToLoad, filesStatus },\n      component: currentComponent || undefined,\n      legacyCompToWrite: legacyComponent,\n    };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: ComponentID[],\n    laneId: LaneId,\n    localLaneObject: Lane | null,\n    mergeStrategy: MergeStrategy\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, { shouldSquash: false, mergeStrategy }, localLaneObject, localLaneObject);\n  }\n\n  private async snapResolvedComponents(\n    snapMessage: string,\n    build: boolean,\n    laneId?: LaneId\n  ): Promise<MergeSnapResults> {\n    const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n    if (!this.workspace) {\n      const results = await this.snapping.snapFromScope(\n        ids.map((id) => ({ componentId: id.toString() })),\n        {\n          message: snapMessage,\n          build,\n          lane: laneId?.toString(),\n        }\n      );\n      return { ...results, autoSnappedResults: [] };\n    }\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(\n    idsToTag: ComponentID[],\n    tagMessage: string,\n    build: boolean\n  ): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n        if (!entry) {\n          throw new BitError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new BitError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    ScopeAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n    GlobalConfigAspect,\n    ConfigMergerAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    scope,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n    globalConfig,\n    configMerger,\n  ]: [\n    CLIMain,\n    Workspace,\n    ScopeMain,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain,\n    ConfigMergerMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      scope,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove,\n      configMerger\n    );\n    cli.register(new MergeCmd(merging, globalConfig));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.224",
+  "version": "1.0.226",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.224"
+    "version": "1.0.226"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,18 +17,18 @@
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
     "@teambit/cli": "0.0.859",
-    "@teambit/config-merger": "0.0.91",
+    "@teambit/config-merger": "0.0.93",
     "@teambit/global-config": "0.0.862",
-    "@teambit/importer": "1.0.224",
+    "@teambit/importer": "1.0.226",
     "@teambit/logger": "0.0.952",
-    "@teambit/scope": "1.0.224",
-    "@teambit/workspace": "1.0.224",
-    "@teambit/checkout": "1.0.224",
-    "@teambit/component-writer": "1.0.224",
-    "@teambit/config": "0.0.975",
-    "@teambit/install": "1.0.224",
-    "@teambit/remove": "1.0.224",
-    "@teambit/snapping": "1.0.224"
+    "@teambit/scope": "1.0.226",
+    "@teambit/workspace": "1.0.226",
+    "@teambit/checkout": "1.0.226",
+    "@teambit/component-writer": "1.0.226",
+    "@teambit/config": "0.0.977",
+    "@teambit/install": "1.0.226",
+    "@teambit/remove": "1.0.226",
+    "@teambit/snapping": "1.0.226"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",