@teambit/merging 1.0.332 → 1.0.333

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.332" tests="0" failures="0" errors="0" skipped="0"/>
+  <testsuite name="teambit.component/merging@1.0.333" tests="0" failures="0" errors="0" skipped="0"/>
 </testsuites>

package/artifacts/schema.json

@@ -1355,7 +1355,11 @@
                               "character": 5
                             },
                             "name": "SourceFile",
-                            "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "sources",
+                              "version": "0.0.2"
+                            }
                           },
                           "isOptional": false
                         }
@@ -1604,7 +1608,11 @@
                               "character": 5
                             },
                             "name": "SourceFile",
-                            "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "sources",
+                              "version": "0.0.2"
+                            }
                           },
                           "isOptional": false
                         },
@@ -1834,7 +1842,11 @@
                               "character": 5
                             },
                             "name": "SourceFile",
-                            "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "sources",
+                              "version": "0.0.2"
+                            }
                           },
                           "isOptional": false
                         }
@@ -1907,7 +1919,11 @@
                               "character": 5
                             },
                             "name": "SourceFile",
-                            "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "sources",
+                              "version": "0.0.2"
+                            }
                           },
                           "isOptional": false
                         }
@@ -5798,7 +5814,7 @@
                   "_legacy": {
                     "scope": "teambit.component",
                     "name": "merging",
-                    "version": "1.0.332"
+                    "version": "1.0.333"
                   },
                   "_scope": "teambit.component"
                 }
@@ -6615,7 +6631,11 @@
                               "character": 5
                             },
                             "name": "SourceFile",
-                            "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "sources",
+                              "version": "0.0.2"
+                            }
                           },
                           "isOptional": false
                         }
@@ -6864,7 +6884,11 @@
                               "character": 5
                             },
                             "name": "SourceFile",
-                            "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "sources",
+                              "version": "0.0.2"
+                            }
                           },
                           "isOptional": false
                         },
@@ -7094,7 +7118,11 @@
                               "character": 5
                             },
                             "name": "SourceFile",
-                            "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "sources",
+                              "version": "0.0.2"
+                            }
                           },
                           "isOptional": false
                         }
@@ -7167,7 +7195,11 @@
                               "character": 5
                             },
                             "name": "SourceFile",
-                            "packageName": "@teambit/legacy/dist/consumer/component/sources"
+                            "componentId": {
+                              "scope": "teambit.component",
+                              "name": "sources",
+                              "version": "0.0.2"
+                            }
                           },
                           "isOptional": false
                         }
@@ -11026,7 +11058,7 @@
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.332"
+    "version": "1.0.333"
   },
   "taggedModuleExports": []
 }

package/dist/merge-version/three-way-merge.d.ts

@@ -2,7 +2,7 @@ import { Version } from '@teambit/legacy/dist/scope/models';
 import { SourceFileModel } from '@teambit/legacy/dist/scope/models/version';
 import { PathLinux } from '@teambit/toolbox.path.path';
 import Component from '@teambit/legacy/dist/consumer/component';
-import { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';
+import { SourceFile } from '@teambit/component.sources';
 import { Scope } from '@teambit/legacy/dist/scope';
 export type MergeResultsThreeWay = {
     addFiles: Array<{

package/dist/merge-version/three-way-merge.js

@@ -46,9 +46,9 @@ function _mergeFiles() {
   };
   return data;
 }
-function _sources() {
-  const data = require("@teambit/legacy/dist/consumer/component/sources");
-  _sources = function () {
+function _component() {
+  const data = require("@teambit/component.sources");
+  _component = function () {
     return data;
   };
   return data;
@@ -194,14 +194,14 @@ async function threeWayMerge({
     filePath: file.relativePath
   }));
   await Promise.all(addedOnOther.map(async file => {
-    const fsFile = await _sources().SourceFile.loadFromSourceFileModel(file, scope.objects);
+    const fsFile = await _component().SourceFile.loadFromSourceFileModel(file, scope.objects);
     results.addFiles.push({
       filePath: file.relativePath,
       fsFile
     });
   }));
   await Promise.all(deletedAndModified.map(async file => {
-    const fsFile = await _sources().SourceFile.loadFromSourceFileModel(file, scope.objects);
+    const fsFile = await _component().SourceFile.loadFromSourceFileModel(file, scope.objects);
     results.deletedConflictFiles.push({
       filePath: file.relativePath,
       fsFile

package/dist/merge-version/three-way-merge.js.map

@@ -1 +1 @@
-{"version":3,"names":["_bitError","data","require","_repositories","_toolboxCrypto","_toolboxPath","eol","_interopRequireWildcard","_mergeFiles","_sources","_lodash","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","threeWayMerge","scope","otherComponent","otherLabel","currentComponent","currentLabel","baseComponent","baseFiles","files","otherFiles","currentFiles","cloneFilesWithSharedDir","forEach","fsFile","contents","lf","results","addFiles","removeFiles","remainDeletedFiles","deletedConflictFiles","modifiedFiles","unModifiedFiles","overrideFiles","updatedFiles","hasConflicts","getFileResult","baseFile","otherFile","filePath","pathNormalizeToLinux","relative","fsFileHash","sha1","push","baseFileHash","file","hash","otherFileHash","content","load","objects","label","output","conflict","Promise","all","map","relativePath","find","fsFilesPaths","baseFilesPaths","isOtherSameAsBase","Error","deletedFromFs","filter","includes","deletedAndModified","addedOnOther","SourceFile","loadFromSourceFileModel","isEmpty","conflictResults","getMergeResults","conflictResult","modifiedFile","BitError","isBinaryConflict","tmp","Tmp","conflictResultsP","fsFilePathP","save","writeFile","toString","baseFilePathP","otherFilePathP","fsFilePath","baseFilePath","otherFilePath","mergeFilesParams","currentFile","path","mergeFiles"],"sources":["three-way-merge.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { Source, Version } from '@teambit/legacy/dist/scope/models';\nimport { SourceFileModel } from '@teambit/legacy/dist/scope/models/version';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { sha1 } from '@teambit/toolbox.crypto.sha1';\nimport { PathLinux, pathNormalizeToLinux, PathOsBased } from '@teambit/toolbox.path.path';\nimport * as eol from '@teambit/toolbox.string.eol';\nimport { mergeFiles, MergeFileParams, MergeFileResult } from '../merge-files';\nimport Component from '@teambit/legacy/dist/consumer/component';\nimport { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';\nimport { Scope } from '@teambit/legacy/dist/scope';\nimport { isEmpty } from 'lodash';\n\nexport type MergeResultsThreeWay = {\n  addFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n  }>;\n  removeFiles: Array<{\n    filePath: PathLinux;\n  }>;\n  remainDeletedFiles: Array<{\n    filePath: PathLinux;\n  }>;\n  deletedConflictFiles: Array<{\n    filePath: PathLinux;\n    fsFile?: SourceFile;\n  }>;\n  modifiedFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n    baseFile?: SourceFileModel;\n    otherFile: SourceFileModel;\n    output: string | null | undefined;\n    conflict: string | null | undefined;\n    isBinaryConflict?: boolean;\n  }>;\n  unModifiedFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n  }>;\n  overrideFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n  }>;\n  updatedFiles: Array<{\n    filePath: PathLinux;\n    otherFile: SourceFileModel;\n    content: Buffer;\n  }>;\n  hasConflicts: boolean;\n};\n\n/**\n * to do the actual merge we use git, specifically `merge-file` command, so we try to use the same\n * terminology as git. From the command help:\n * `git merge-file <current-file> <base-file> <other-file>\n * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into\n * <current-file>. The result ordinarily goes into <current-file>.`\n *\n * see checkout-version.getBaseVersion() for a case when a component is modified and then the base-file is not the\n * common file before other-file and current-file.\n * otherwise, Git terminology pretty much reflects what we do here. current-file is the one that is currently written\n * to the filesystem. other-file is the one the user wants to checkout to. base-file is the original file where both:\n * base-file and other-file were originated from.\n */\nexport async function threeWayMerge({\n  scope,\n  otherComponent,\n  otherLabel,\n  currentComponent,\n  currentLabel,\n  baseComponent,\n}: {\n  scope: Scope;\n  otherComponent: Version;\n  otherLabel: string;\n  currentComponent: Component;\n  currentLabel: string;\n  baseComponent: Version;\n}): Promise<MergeResultsThreeWay> {\n  // baseFiles and currentFiles come from the model, therefore their paths include the\n  // sharedOriginallyDir. fsFiles come from the Fs, therefore their paths don't include the\n  // sharedOriginallyDir.\n  // option 1) strip sharedOriginallyDir from baseFiles and currentFiles. the problem is that the\n  // sharedDir can be different if the dependencies were changes for example, as a result, it won't\n  // be possible to compare between the files as the paths are different.\n  // in the previous it was implemented this way and caused a bug, which now has an e2e-test to\n  // block it. see https://github.com/teambit/bit/pull/2070 PR.\n  // option 2) add sharedOriginallyDir to the fsFiles. we must go with this option.\n  // one thing we have to change is the end-of-line, it should be set as LF, same way we do before\n  // saving the file as an object.\n  const baseFiles: SourceFileModel[] = baseComponent.files;\n  const otherFiles: SourceFileModel[] = otherComponent.files;\n  const currentFiles: SourceFile[] = currentComponent.cloneFilesWithSharedDir();\n  currentFiles.forEach((fsFile) => {\n    fsFile.contents = eol.lf(fsFile.contents) as Buffer;\n  });\n  const results: MergeResultsThreeWay = {\n    addFiles: [],\n    removeFiles: [],\n    remainDeletedFiles: [],\n    deletedConflictFiles: [],\n    modifiedFiles: [],\n    unModifiedFiles: [],\n    overrideFiles: [],\n    updatedFiles: [],\n    hasConflicts: false,\n  };\n  const getFileResult = async (fsFile: SourceFile, baseFile?: SourceFileModel, otherFile?: SourceFileModel) => {\n    const filePath: PathLinux = pathNormalizeToLinux(fsFile.relative);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const fsFileHash = sha1(fsFile.contents);\n    if (!otherFile) {\n      // if !otherFile && !baseFile, the file was created after the last tag, no need to do any\n      // calculation, the file should be added\n      if (!baseFile) {\n        results.addFiles.push({ filePath, fsFile });\n        return;\n      }\n      const baseFileHash = baseFile.file.hash;\n      if (fsFileHash === baseFileHash) {\n        results.removeFiles.push({ filePath });\n        return;\n      }\n      results.deletedConflictFiles.push({ filePath });\n      return;\n    }\n    const otherFileHash = otherFile.file.hash;\n    if (fsFileHash === otherFileHash) {\n      // if fs === other, no need to take any action (regardless the base)\n      results.unModifiedFiles.push({ filePath, fsFile });\n      return;\n    }\n    if (baseFile && fsFileHash === baseFile.file.hash) {\n      // the file has no local modification.\n      // the file currently in the fs, is not the same as the file we want to write (other).\n      // but no need to check whether it has conflicts because we always want to write the other.\n      const content = (await otherFile.file.load(scope.objects)) as Source;\n      results.updatedFiles.push({ filePath, otherFile, content: content.contents });\n      return;\n    }\n    // it was changed in both, there is a chance for conflict. (regardless the base)\n    fsFile.label = currentLabel;\n    // @ts-ignore it's a hack to pass the data, version is not a valid attribute.\n    otherFile.label = otherLabel;\n    results.modifiedFiles.push({ filePath, fsFile, baseFile, otherFile, output: null, conflict: null });\n  };\n\n  await Promise.all(\n    currentFiles.map(async (fsFile) => {\n      const relativePath = pathNormalizeToLinux(fsFile.relative);\n      const baseFile = baseFiles.find((file) => file.relativePath === relativePath);\n      const otherFile = otherFiles.find((file) => file.relativePath === relativePath);\n      await getFileResult(fsFile, baseFile, otherFile);\n    })\n  );\n  const fsFilesPaths = currentFiles.map((fsFile) => pathNormalizeToLinux(fsFile.relative));\n  const baseFilesPaths = baseFiles.map((baseFile) => baseFile.relativePath);\n  const isOtherSameAsBase = (otherFile: SourceFileModel) => {\n    const baseFile = baseFiles.find((file) => file.relativePath === otherFile.relativePath);\n    if (!baseFile) throw new Error('isOtherSameAsBase expect the base to be there');\n    return baseFile.file.hash === otherFile.file.hash;\n  };\n  const deletedFromFs = otherFiles.filter(\n    (otherFile) =>\n      !fsFilesPaths.includes(otherFile.relativePath) &&\n      baseFilesPaths.includes(otherFile.relativePath) &&\n      isOtherSameAsBase(otherFile)\n  );\n  const deletedAndModified = otherFiles.filter(\n    (otherFile) =>\n      !fsFilesPaths.includes(otherFile.relativePath) &&\n      baseFilesPaths.includes(otherFile.relativePath) &&\n      !isOtherSameAsBase(otherFile)\n  );\n  const addedOnOther = otherFiles.filter(\n    (otherFile) => !fsFilesPaths.includes(otherFile.relativePath) && !baseFilesPaths.includes(otherFile.relativePath)\n  );\n  deletedFromFs.forEach((file) => results.remainDeletedFiles.push({ filePath: file.relativePath }));\n  deletedAndModified.forEach((file) => results.deletedConflictFiles.push({ filePath: file.relativePath }));\n\n  await Promise.all(\n    addedOnOther.map(async (file) => {\n      const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n      results.addFiles.push({ filePath: file.relativePath, fsFile });\n    })\n  );\n  await Promise.all(\n    deletedAndModified.map(async (file) => {\n      const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n      results.deletedConflictFiles.push({ filePath: file.relativePath, fsFile });\n    })\n  );\n  if (isEmpty(results.modifiedFiles)) return results;\n\n  const conflictResults = await getMergeResults(scope, results.modifiedFiles);\n  conflictResults.forEach((conflictResult: MergeFileResult) => {\n    const modifiedFile = results.modifiedFiles.find((file) => file.filePath === conflictResult.filePath);\n    if (!modifiedFile) throw new BitError(`unable to find ${conflictResult.filePath} in modified files array`);\n    modifiedFile.output = conflictResult.output;\n    modifiedFile.conflict = conflictResult.conflict;\n    modifiedFile.isBinaryConflict = conflictResult.isBinaryConflict;\n    if (conflictResult.conflict || conflictResult.isBinaryConflict) results.hasConflicts = true;\n  });\n\n  return results;\n}\n\nasync function getMergeResults(\n  scope: Scope,\n  modifiedFiles: MergeResultsThreeWay['modifiedFiles']\n): Promise<MergeFileResult[]> {\n  const tmp = new Tmp(scope);\n  const conflictResultsP = modifiedFiles.map(async (modifiedFile) => {\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const fsFilePathP = tmp.save(modifiedFile.fsFile.contents);\n    const writeFile = async (file: SourceFileModel): Promise<PathOsBased> => {\n      const content = await file.file.load(scope.objects);\n      // @ts-ignore\n      return tmp.save(content.contents.toString());\n    };\n    const baseFilePathP = modifiedFile.baseFile ? writeFile(modifiedFile.baseFile) : tmp.save('');\n    const otherFilePathP = writeFile(modifiedFile.otherFile);\n    const [fsFilePath, baseFilePath, otherFilePath] = await Promise.all([fsFilePathP, baseFilePathP, otherFilePathP]);\n    const mergeFilesParams: MergeFileParams = {\n      filePath: modifiedFile.filePath,\n      currentFile: {\n        label: modifiedFile.fsFile.label,\n        path: fsFilePath,\n      },\n      baseFile: {\n        path: baseFilePath,\n      },\n      otherFile: {\n        // @ts-ignore\n        label: modifiedFile.otherFile.label,\n        path: otherFilePath,\n      },\n    };\n    return mergeFiles(mergeFilesParams);\n  });\n  return Promise.all(conflictResultsP);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_bitError","data","require","_repositories","_toolboxCrypto","_toolboxPath","eol","_interopRequireWildcard","_mergeFiles","_component","_lodash","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","threeWayMerge","scope","otherComponent","otherLabel","currentComponent","currentLabel","baseComponent","baseFiles","files","otherFiles","currentFiles","cloneFilesWithSharedDir","forEach","fsFile","contents","lf","results","addFiles","removeFiles","remainDeletedFiles","deletedConflictFiles","modifiedFiles","unModifiedFiles","overrideFiles","updatedFiles","hasConflicts","getFileResult","baseFile","otherFile","filePath","pathNormalizeToLinux","relative","fsFileHash","sha1","push","baseFileHash","file","hash","otherFileHash","content","load","objects","label","output","conflict","Promise","all","map","relativePath","find","fsFilesPaths","baseFilesPaths","isOtherSameAsBase","Error","deletedFromFs","filter","includes","deletedAndModified","addedOnOther","SourceFile","loadFromSourceFileModel","isEmpty","conflictResults","getMergeResults","conflictResult","modifiedFile","BitError","isBinaryConflict","tmp","Tmp","conflictResultsP","fsFilePathP","save","writeFile","toString","baseFilePathP","otherFilePathP","fsFilePath","baseFilePath","otherFilePath","mergeFilesParams","currentFile","path","mergeFiles"],"sources":["three-way-merge.ts"],"sourcesContent":["import { BitError } from '@teambit/bit-error';\nimport { Source, Version } from '@teambit/legacy/dist/scope/models';\nimport { SourceFileModel } from '@teambit/legacy/dist/scope/models/version';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { sha1 } from '@teambit/toolbox.crypto.sha1';\nimport { PathLinux, pathNormalizeToLinux, PathOsBased } from '@teambit/toolbox.path.path';\nimport * as eol from '@teambit/toolbox.string.eol';\nimport { mergeFiles, MergeFileParams, MergeFileResult } from '../merge-files';\nimport Component from '@teambit/legacy/dist/consumer/component';\nimport { SourceFile } from '@teambit/component.sources';\nimport { Scope } from '@teambit/legacy/dist/scope';\nimport { isEmpty } from 'lodash';\n\nexport type MergeResultsThreeWay = {\n  addFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n  }>;\n  removeFiles: Array<{\n    filePath: PathLinux;\n  }>;\n  remainDeletedFiles: Array<{\n    filePath: PathLinux;\n  }>;\n  deletedConflictFiles: Array<{\n    filePath: PathLinux;\n    fsFile?: SourceFile;\n  }>;\n  modifiedFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n    baseFile?: SourceFileModel;\n    otherFile: SourceFileModel;\n    output: string | null | undefined;\n    conflict: string | null | undefined;\n    isBinaryConflict?: boolean;\n  }>;\n  unModifiedFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n  }>;\n  overrideFiles: Array<{\n    filePath: PathLinux;\n    fsFile: SourceFile;\n  }>;\n  updatedFiles: Array<{\n    filePath: PathLinux;\n    otherFile: SourceFileModel;\n    content: Buffer;\n  }>;\n  hasConflicts: boolean;\n};\n\n/**\n * to do the actual merge we use git, specifically `merge-file` command, so we try to use the same\n * terminology as git. From the command help:\n * `git merge-file <current-file> <base-file> <other-file>\n * git merge-file incorporates all changes that lead from the <base-file> to <other-file> into\n * <current-file>. The result ordinarily goes into <current-file>.`\n *\n * see checkout-version.getBaseVersion() for a case when a component is modified and then the base-file is not the\n * common file before other-file and current-file.\n * otherwise, Git terminology pretty much reflects what we do here. current-file is the one that is currently written\n * to the filesystem. other-file is the one the user wants to checkout to. base-file is the original file where both:\n * base-file and other-file were originated from.\n */\nexport async function threeWayMerge({\n  scope,\n  otherComponent,\n  otherLabel,\n  currentComponent,\n  currentLabel,\n  baseComponent,\n}: {\n  scope: Scope;\n  otherComponent: Version;\n  otherLabel: string;\n  currentComponent: Component;\n  currentLabel: string;\n  baseComponent: Version;\n}): Promise<MergeResultsThreeWay> {\n  // baseFiles and currentFiles come from the model, therefore their paths include the\n  // sharedOriginallyDir. fsFiles come from the Fs, therefore their paths don't include the\n  // sharedOriginallyDir.\n  // option 1) strip sharedOriginallyDir from baseFiles and currentFiles. the problem is that the\n  // sharedDir can be different if the dependencies were changes for example, as a result, it won't\n  // be possible to compare between the files as the paths are different.\n  // in the previous it was implemented this way and caused a bug, which now has an e2e-test to\n  // block it. see https://github.com/teambit/bit/pull/2070 PR.\n  // option 2) add sharedOriginallyDir to the fsFiles. we must go with this option.\n  // one thing we have to change is the end-of-line, it should be set as LF, same way we do before\n  // saving the file as an object.\n  const baseFiles: SourceFileModel[] = baseComponent.files;\n  const otherFiles: SourceFileModel[] = otherComponent.files;\n  const currentFiles: SourceFile[] = currentComponent.cloneFilesWithSharedDir();\n  currentFiles.forEach((fsFile) => {\n    fsFile.contents = eol.lf(fsFile.contents) as Buffer;\n  });\n  const results: MergeResultsThreeWay = {\n    addFiles: [],\n    removeFiles: [],\n    remainDeletedFiles: [],\n    deletedConflictFiles: [],\n    modifiedFiles: [],\n    unModifiedFiles: [],\n    overrideFiles: [],\n    updatedFiles: [],\n    hasConflicts: false,\n  };\n  const getFileResult = async (fsFile: SourceFile, baseFile?: SourceFileModel, otherFile?: SourceFileModel) => {\n    const filePath: PathLinux = pathNormalizeToLinux(fsFile.relative);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const fsFileHash = sha1(fsFile.contents);\n    if (!otherFile) {\n      // if !otherFile && !baseFile, the file was created after the last tag, no need to do any\n      // calculation, the file should be added\n      if (!baseFile) {\n        results.addFiles.push({ filePath, fsFile });\n        return;\n      }\n      const baseFileHash = baseFile.file.hash;\n      if (fsFileHash === baseFileHash) {\n        results.removeFiles.push({ filePath });\n        return;\n      }\n      results.deletedConflictFiles.push({ filePath });\n      return;\n    }\n    const otherFileHash = otherFile.file.hash;\n    if (fsFileHash === otherFileHash) {\n      // if fs === other, no need to take any action (regardless the base)\n      results.unModifiedFiles.push({ filePath, fsFile });\n      return;\n    }\n    if (baseFile && fsFileHash === baseFile.file.hash) {\n      // the file has no local modification.\n      // the file currently in the fs, is not the same as the file we want to write (other).\n      // but no need to check whether it has conflicts because we always want to write the other.\n      const content = (await otherFile.file.load(scope.objects)) as Source;\n      results.updatedFiles.push({ filePath, otherFile, content: content.contents });\n      return;\n    }\n    // it was changed in both, there is a chance for conflict. (regardless the base)\n    fsFile.label = currentLabel;\n    // @ts-ignore it's a hack to pass the data, version is not a valid attribute.\n    otherFile.label = otherLabel;\n    results.modifiedFiles.push({ filePath, fsFile, baseFile, otherFile, output: null, conflict: null });\n  };\n\n  await Promise.all(\n    currentFiles.map(async (fsFile) => {\n      const relativePath = pathNormalizeToLinux(fsFile.relative);\n      const baseFile = baseFiles.find((file) => file.relativePath === relativePath);\n      const otherFile = otherFiles.find((file) => file.relativePath === relativePath);\n      await getFileResult(fsFile, baseFile, otherFile);\n    })\n  );\n  const fsFilesPaths = currentFiles.map((fsFile) => pathNormalizeToLinux(fsFile.relative));\n  const baseFilesPaths = baseFiles.map((baseFile) => baseFile.relativePath);\n  const isOtherSameAsBase = (otherFile: SourceFileModel) => {\n    const baseFile = baseFiles.find((file) => file.relativePath === otherFile.relativePath);\n    if (!baseFile) throw new Error('isOtherSameAsBase expect the base to be there');\n    return baseFile.file.hash === otherFile.file.hash;\n  };\n  const deletedFromFs = otherFiles.filter(\n    (otherFile) =>\n      !fsFilesPaths.includes(otherFile.relativePath) &&\n      baseFilesPaths.includes(otherFile.relativePath) &&\n      isOtherSameAsBase(otherFile)\n  );\n  const deletedAndModified = otherFiles.filter(\n    (otherFile) =>\n      !fsFilesPaths.includes(otherFile.relativePath) &&\n      baseFilesPaths.includes(otherFile.relativePath) &&\n      !isOtherSameAsBase(otherFile)\n  );\n  const addedOnOther = otherFiles.filter(\n    (otherFile) => !fsFilesPaths.includes(otherFile.relativePath) && !baseFilesPaths.includes(otherFile.relativePath)\n  );\n  deletedFromFs.forEach((file) => results.remainDeletedFiles.push({ filePath: file.relativePath }));\n  deletedAndModified.forEach((file) => results.deletedConflictFiles.push({ filePath: file.relativePath }));\n\n  await Promise.all(\n    addedOnOther.map(async (file) => {\n      const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n      results.addFiles.push({ filePath: file.relativePath, fsFile });\n    })\n  );\n  await Promise.all(\n    deletedAndModified.map(async (file) => {\n      const fsFile = await SourceFile.loadFromSourceFileModel(file, scope.objects);\n      results.deletedConflictFiles.push({ filePath: file.relativePath, fsFile });\n    })\n  );\n  if (isEmpty(results.modifiedFiles)) return results;\n\n  const conflictResults = await getMergeResults(scope, results.modifiedFiles);\n  conflictResults.forEach((conflictResult: MergeFileResult) => {\n    const modifiedFile = results.modifiedFiles.find((file) => file.filePath === conflictResult.filePath);\n    if (!modifiedFile) throw new BitError(`unable to find ${conflictResult.filePath} in modified files array`);\n    modifiedFile.output = conflictResult.output;\n    modifiedFile.conflict = conflictResult.conflict;\n    modifiedFile.isBinaryConflict = conflictResult.isBinaryConflict;\n    if (conflictResult.conflict || conflictResult.isBinaryConflict) results.hasConflicts = true;\n  });\n\n  return results;\n}\n\nasync function getMergeResults(\n  scope: Scope,\n  modifiedFiles: MergeResultsThreeWay['modifiedFiles']\n): Promise<MergeFileResult[]> {\n  const tmp = new Tmp(scope);\n  const conflictResultsP = modifiedFiles.map(async (modifiedFile) => {\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const fsFilePathP = tmp.save(modifiedFile.fsFile.contents);\n    const writeFile = async (file: SourceFileModel): Promise<PathOsBased> => {\n      const content = await file.file.load(scope.objects);\n      // @ts-ignore\n      return tmp.save(content.contents.toString());\n    };\n    const baseFilePathP = modifiedFile.baseFile ? writeFile(modifiedFile.baseFile) : tmp.save('');\n    const otherFilePathP = writeFile(modifiedFile.otherFile);\n    const [fsFilePath, baseFilePath, otherFilePath] = await Promise.all([fsFilePathP, baseFilePathP, otherFilePathP]);\n    const mergeFilesParams: MergeFileParams = {\n      filePath: modifiedFile.filePath,\n      currentFile: {\n        label: modifiedFile.fsFile.label,\n        path: fsFilePath,\n      },\n      baseFile: {\n        path: baseFilePath,\n      },\n      otherFile: {\n        // @ts-ignore\n        label: modifiedFile.otherFile.label,\n        path: otherFilePath,\n      },\n    };\n    return mergeFiles(mergeFilesParams);\n  });\n  return Promise.all(conflictResultsP);\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/merging.main.runtime.js

@@ -18,9 +18,9 @@ function _workspace() {
   };
   return data;
 }
-function _componentsList() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/component/components-list"));
-  _componentsList = function () {
+function _legacy() {
+  const data = require("@teambit/legacy.component-list");
+  _legacy = function () {
     return data;
   };
   return data;
@@ -666,7 +666,7 @@ class MergingMain {
     if (pattern) {
       return this.workspace.idsByPattern(pattern);
     }
-    const componentsList = new (_componentsList().default)(consumer);
+    const componentsList = new (_legacy().ComponentsList)(consumer);
     const mergePending = await componentsList.listMergePendingComponents();
     return mergePending.map(c => c.id);
   }

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

@@ -1 +1 @@
-{"version":3,"names":["_cli","data","require","_workspace","_componentsList","_interopRequireDefault","_snapping","_pMapSeries","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_mergeVersion","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","merge","pattern","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","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","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","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","legacyCompToWrite","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","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","ids","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","componentIds","idsByPattern","entry","getEntry","unresolvedComponents","u","componentsList","ComponentsList","mergePending","listMergePendingComponents","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","ConfigMergerAspect","DependencyResolverAspect","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 { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\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, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\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 {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\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 { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\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';\nimport {\n  MergeStrategy,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeResultsThreeWay,\n  MergeOptions,\n} from './merge-version';\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    private depResolver: DependencyResolverMain\n  ) {}\n\n  async merge(\n    pattern: 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(pattern, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(pattern);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, pattern);\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;\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 currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\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, workspaceDepsUnchanged } = this.workspace\n      ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n      : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: 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) {\n      await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n      await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n    }\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        workspaceDepsUnchanged,\n        workspaceConfigConflictWriteError,\n      },\n      leftUnresolvedConflicts,\n    };\n  }\n\n  async removeFromWsJsonPolicyIfExists(\n    componentsResults: ApplyVersionWithComps[],\n    currentLane?: Lane,\n    currentLaneIdsBeforeMerge?: ComponentIdList\n  ) {\n    const newlyIntroducedIds = currentLane\n      ?.toComponentIds()\n      .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n    const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds || []);\n    const components = compact(\n      componentsResults\n        .map((c) => c.legacyCompToWrite)\n        .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n    );\n    const packages = components.map((c) => componentIdToPackageName(c));\n    const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n    if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\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, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane // 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,\n      otherLane\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    otherLaneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    currentLane?: Lane\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;\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(pattern: string): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(pattern);\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(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(pattern);\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 | undefined,\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(pattern?: string): Promise<ComponentID[]> {\n    if (pattern) {\n      const componentIds = await this.workspace.idsByPattern(pattern);\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, pattern?: string): Promise<ComponentID[]> {\n    if (pattern) {\n      return this.workspace.idsByPattern(pattern);\n    }\n    const componentsList = new ComponentsList(consumer);\n    const mergePending = await componentsList.listMergePendingComponents();\n    return mergePending.map((c) => c.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    DependencyResolverAspect,\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    depResolver,\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    DependencyResolverMain\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      depResolver\n    );\n    cli.register(new MergeCmd(merging, globalConfig));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":";;;;;;AAAA,SAAAA,KAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,IAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAE,WAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,UAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAG,gBAAA;EAAA,MAAAH,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAE,eAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,UAAA;EAAA,MAAAL,IAAA,GAAAC,OAAA;EAAAI,SAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,YAAA;EAAA,MAAAN,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAK,WAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAO,aAAA;EAAA,MAAAP,IAAA,GAAAC,OAAA;EAAAM,YAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,UAAA;EAAA,MAAAR,IAAA,GAAAC,OAAA;EAAAO,SAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAS,QAAA;EAAA,MAAAT,IAAA,GAAAC,OAAA;EAAAQ,OAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAKA,SAAAU,OAAA;EAAA,MAAAV,IAAA,GAAAI,sBAAA,CAAAH,OAAA;EAAAS,MAAA,YAAAA,CAAA;IAAA,OAAAV,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAW,QAAA;EAAA,MAAAX,IAAA,GAAAC,OAAA;EAAAU,OAAA,YAAAA,CAAA;IAAA,OAAAX,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAY,QAAA;EAAA,MAAAZ,IAAA,GAAAC,OAAA;EAAAW,OAAA,YAAAA,CAAA;IAAA,OAAAZ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAa,aAAA;EAAA,MAAAb,IAAA,GAAAC,OAAA;EAAAY,YAAA,YAAAA,CAAA;IAAA,OAAAb,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAc,YAAA;EAAA,MAAAd,IAAA,GAAAC,OAAA;EAAAa,WAAA,YAAAA,CAAA;IAAA,OAAAd,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAe,iBAAA;EAAA,MAAAf,IAAA,GAAAC,OAAA;EAAAc,gBAAA,YAAAA,CAAA;IAAA,OAAAf,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAgB,UAAA;EAAA,MAAAhB,IAAA,GAAAC,OAAA;EAAAe,SAAA,YAAAA,CAAA;IAAA,OAAAhB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAiB,QAAA;EAAA,MAAAjB,IAAA,GAAAC,OAAA;EAAAgB,OAAA,YAAAA,CAAA;IAAA,OAAAjB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAkB,cAAA;EAAA,MAAAlB,IAAA,GAAAC,OAAA;EAAAiB,aAAA,YAAAA,CAAA;IAAA,OAAAlB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAmB,QAAA;EAAA,MAAAnB,IAAA,GAAAC,OAAA;EAAAkB,OAAA,YAAAA,CAAA;IAAA,OAAAnB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAoB,UAAA;EAAA,MAAApB,IAAA,GAAAC,OAAA;EAAAmB,SAAA,YAAAA,CAAA;IAAA,OAAApB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASA,SAAAqB,cAAA;EAAA,MAAArB,IAAA,GAAAC,OAAA;EAAAoB,aAAA,YAAAA,CAAA;IAAA,OAAArB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAOA,SAAAsB,oBAAA;EAAA,MAAAtB,IAAA,GAAAC,OAAA;EAAAqB,mBAAA,YAAAA,CAAA;IAAA,OAAAtB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAuB,SAAA;EAAA,MAAAvB,IAAA,GAAAC,OAAA;EAAAsB,QAAA,YAAAA,CAAA;IAAA,OAAAvB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAwB,OAAA;EAAA,MAAAxB,IAAA,GAAAC,OAAA;EAAAuB,MAAA,YAAAA,CAAA;IAAA,OAAAxB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAyB,UAAA;EAAA,MAAAzB,IAAA,GAAAC,OAAA;EAAAwB,SAAA,YAAAA,CAAA;IAAA,OAAAzB,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA0B,SAAA;EAAA,MAAA1B,IAAA,GAAAC,OAAA;EAAAyB,QAAA,YAAAA,CAAA;IAAA,OAAA1B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA2B,qBAAA;EAAA,MAAA3B,IAAA,GAAAC,OAAA;EAAA0B,oBAAA,YAAAA,CAAA;IAAA,OAAA3B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAA4B,cAAA;EAAA,MAAA5B,IAAA,GAAAC,OAAA;EAAA2B,aAAA,YAAAA,CAAA;IAAA,OAAA5B,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAMyB,SAAAI,uBAAAyB,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,QAAAH,CAAA,EAAAI,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAP,CAAA,OAAAM,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAR,CAAA,GAAAI,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAX,CAAA,EAAAI,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAf,CAAA,aAAAI,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAD,OAAA,CAAAG,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAArB,CAAA,EAAAM,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAF,OAAA,CAAAG,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAJ,CAAA;AAAA,SAAAmB,gBAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAmB,cAAA,CAAAnB,CAAA,MAAAJ,CAAA,GAAAM,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,IAAAoB,KAAA,EAAAnB,CAAA,EAAAO,UAAA,MAAAa,YAAA,MAAAC,QAAA,UAAA1B,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAuB,eAAAlB,CAAA,QAAAsB,CAAA,GAAAC,YAAA,CAAAvB,CAAA,uCAAAsB,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAvB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAwB,MAAA,CAAAC,WAAA,kBAAA9B,CAAA,QAAA2B,CAAA,GAAA3B,CAAA,CAAA+B,IAAA,CAAA1B,CAAA,EAAAD,CAAA,uCAAAuB,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAA5B,CAAA,GAAA6B,MAAA,GAAAC,MAAA,EAAA7B,CAAA;AA4BzB;;AA+BO,MAAM8B,WAAW,CAAC;EACvBC,WAAWA,CACDC,SAAoB,EACpBC,KAAgB,EAChBC,OAAoB,EACpBC,QAAsB,EACtBC,QAAsB,EACtBC,MAAc,EACdC,eAAoC,EACpCC,QAAsB,EACtBC,MAAkB,EAClBC,MAAkB,EAClBC,YAA8B,EAC9BC,WAAmC,EAC3C;IAAA,KAZQX,SAAoB,GAApBA,SAAoB;IAAA,KACpBC,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,OAAoB,GAApBA,OAAoB;IAAA,KACpBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAc,GAAdA,MAAc;IAAA,KACdC,eAAoC,GAApCA,eAAoC;IAAA,KACpCC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,MAAkB,GAAlBA,MAAkB;IAAA,KAClBC,YAA8B,GAA9BA,YAA8B;IAAA,KAC9BC,WAAmC,GAAnCA,WAAmC;EAC1C;EAEH,MAAMC,KAAKA,CACTC,OAAe,EACfC,aAA4B,EAC5BC,KAAc,EACdC,OAAgB,EAChBC,MAAe,EACfC,OAAe,EACfC,KAAc,EACdC,0BAAmC,EACL;IAC9B,IAAI,CAAC,IAAI,CAACpB,SAAS,EAAE,MAAM,KAAIqB,kCAAqB,EAAC,CAAC;IACtD,MAAMC,QAAkB,GAAG,IAAI,CAACtB,SAAS,CAACsB,QAAQ;IAClD,IAAIC,YAAY;IAChB,IAAIP,OAAO,EAAE;MACXO,YAAY,GAAG,MAAM,IAAI,CAACC,YAAY,CAACX,OAAO,EAAEK,OAAO,EAAEC,KAAK,CAAC;IACjE,CAAC,MAAM,IAAIJ,KAAK,EAAE;MAChBQ,YAAY,GAAG,MAAM,IAAI,CAACE,UAAU,CAACZ,OAAO,CAAC;IAC/C,CAAC,MAAM;MACL,MAAMa,MAAM,GAAG,MAAM,IAAI,CAACC,oBAAoB,CAACL,QAAQ,EAAET,OAAO,CAAC;MACjEU,YAAY,GAAG,MAAM,IAAI,CAACK,yBAAyB,CACjDN,QAAQ,EACRI,MAAM,EACNZ,aAAa,EACbG,MAAM,EACNC,OAAO,EACPC,KAAK,EACLC,0BACF,CAAC;IACH;IACA,MAAME,QAAQ,CAACO,SAAS,CAAC,OAAO,CAAC;IACjC,OAAON,YAAY;EACrB;;EAEA;AACF;AACA;AACA;EACE,MAAMK,yBAAyBA,CAC7BN,QAAkB,EAClBI,MAAqB,EACrBZ,aAA4B,EAC5BG,MAAe,EACfa,WAAmB,EACnBX,KAAc,EACdC,0BAAmC,EACL;IAC9B,MAAMW,aAAa,GAAGT,QAAQ,CAACU,gBAAgB,CAAC,CAAC;IACjD,MAAMC,iBAAiB,GAAG,MAAMX,QAAQ,CAACY,oBAAoB,CAAC,CAAC;IAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAI,CAACC,sBAAsB,CAC3DV,MAAM,EACNK,aAAa,EACbE,iBAAiB,EACjBnB,aACF,CAAC;IACD,MAAMuB,gBAAgB,GAAGF,mBAAmB,CAAC9D,MAAM,CAAEiE,CAAC,IAAKA,CAAC,CAACC,gBAAgB,IAAI,CAACD,CAAC,CAACE,qBAAqB,CAAC;IAC1G,IAAIH,gBAAgB,CAACzD,MAAM,EAAE;MAC3B,MAAM6D,WAAW,GAAGJ,gBAAgB,CACjCK,GAAG,CACDC,eAAe,IACd,GAAGC,gBAAK,CAACC,IAAI,CAACF,eAAe,CAACG,EAAE,CAACC,QAAQ,CAAC,CAAC,CAAC,MAAMH,gBAAK,CAACI,GAAG,CAACL,eAAe,CAACJ,gBAA0B,CAAC,EAC3G,CAAC,CACAU,IAAI,CAAC,IAAI,CAAC;MACb,MAAM,KAAIC,oBAAQ,EAAC,mDAAmDT,WAAW,EAAE,CAAC;IACtF;IAEA,OAAO,IAAI,CAACU,UAAU,CAAC;MACrBrC,aAAa;MACbqB,mBAAmB;MACnBiB,WAAW,EAAErB,aAAa;MAC1BsB,WAAW,EAAEpB,iBAAiB;MAC9BhB,MAAM;MACNa,WAAW;MACXX,KAAK;MACLC;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACE,MAAM+B,UAAUA,CAAC;IACfrC,aAAa;IACbqB,mBAAmB;IACnBiB,WAAW;IACXC,WAAW;IACXpC,MAAM;IACNqC,GAAG;IACHxB,WAAW;IACXX,KAAK;IACLC;EAWF,CAAC,EAAgC;IAC/B,MAAME,QAAQ,GAAG,IAAI,CAACtB,SAAS,EAAEsB,QAAQ;IACzC,MAAMiC,WAAW,GAAG,IAAI,CAACtD,KAAK,CAACsD,WAAW;IAC1C,MAAMC,qBAAqB,GAAGrB,mBAAmB,CAACsB,IAAI,CACnDC,SAAS,IAAKA,SAAS,CAACnC,YAAY,IAAImC,SAAS,CAACnC,YAAY,CAACoC,YAClE,CAAC;IACD,IAAIH,qBAAqB,IAAI,CAAC1C,aAAa,EAAE;MAC3CA,aAAa,GAAG,MAAM,IAAA8C,2CAA2B,EAAC,CAAC;IACrD;IACA,MAAMvB,gBAAoC,GAAGF,mBAAmB,CAC7D9D,MAAM,CAAEwF,eAAe,IAAKA,eAAe,CAACtB,gBAAgB,CAAC,CAC7DlE,MAAM,CAAEwF,eAAe,IAAK,CAACA,eAAe,CAACC,eAAe,CAAC,CAC7DpB,GAAG,CAAEmB,eAAe,KAAM;MACzBf,EAAE,EAAEe,eAAe,CAACf,EAAE;MACtBP,gBAAgB,EAAEsB,eAAe,CAACtB,gBAA0B;MAC5DC,qBAAqB,EAAEqB,eAAe,CAACrB;IACzC,CAAC,CAAC,CAAC;IAEL,MAAMuB,oBAAoB,GAAG5B,mBAAmB,CAC7C9D,MAAM,CAAEwF,eAAe,IAAKA,eAAe,CAACC,eAAe,CAAC,CAC5DpB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAACkB,aAAa,CAACC,SAAS,CAAC,CAAC;IAE5C,MAAMC,mBAAmB,GAAG/B,mBAAmB,CAAC9D,MAAM,CAAEwF,eAAe,IAAK,CAACA,eAAe,CAACtB,gBAAgB,CAAC;IAE9G,MAAM4B,yBAAyB,GAAGd,WAAW,EAAEe,cAAc,CAAC,CAAC;IAE/D,MAAMC,iBAAiB,GAAG,MAAM,IAAI,CAACC,oBAAoB,CACvDJ,mBAAmB,EACnBd,WAAW,EACXtC,aAAa,EACbuC,WACF,CAAC;IAED,MAAMkB,cAAc,GAAG,IAAAC,iBAAO,EAACN,mBAAmB,CAACxB,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACmC,iBAAiB,CAAC,CAAC;IAEnF,MAAM;MAAEC,oBAAoB;MAAEC,sBAAsB;MAAEC;IAAuB,CAAC,GAAG,IAAI,CAAC5E,SAAS,GAC3F,MAAM,IAAI,CAACU,YAAY,CAACmE,oCAAoC,CAACN,cAAc,CAAC,GAC5E;MAAEG,oBAAoB,EAAET,SAAS;MAAEU,sBAAsB,EAAEV,SAAS;MAAEW,sBAAsB,EAAEX;IAAU,CAAC;IAE7G,IAAIa,iCAAoD;IACxD,IAAIH,sBAAsB,EAAE;MAC1BG,iCAAiC,GAAG,MAAM,IAAI,CAACpE,YAAY,CAACqE,0CAA0C,CACpGJ,sBACF,CAAC;IACH;IACA,IAAI,IAAI,CAAC3E,SAAS,EAAE,MAAM,IAAI,CAACU,YAAY,CAACsE,qCAAqC,CAACT,cAAc,CAAC;IAEjG,IAAIlB,WAAW,EAAEE,WAAW,CAAC0B,OAAO,CAACC,GAAG,CAAC7B,WAAW,CAAC;IAErD,MAAME,WAAW,CAAC0B,OAAO,CAACE,OAAO,CAAC,CAAC,CAAC,CAAC;;IAErC,MAAM5B,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IAEpD,IAAI,IAAI,CAACrF,SAAS,EAAE;MAClB,MAAMsB,QAAQ,CAACgE,WAAW,CAAC,SAASlC,WAAW,CAACL,QAAQ,CAAC,CAAC,EAAE,CAAC;MAC7D,MAAM,IAAI,CAACwC,8BAA8B,CAAClB,iBAAiB,EAAEhB,WAAW,EAAEc,yBAAyB,CAAC;IACtG;IAEA,IAAIJ,oBAAoB,CAACnF,MAAM,IAAI,IAAI,CAACoB,SAAS,EAAE;MACjD,MAAMwF,kBAAkB,GAAGC,8BAAe,CAACC,SAAS,CAAC3B,oBAAoB,CAAC;MAC1E,MAAM,IAAA4B,+BAAqB,EAACrE,QAAQ,EAAEkE,kBAAkB,CAAC;MACzD,MAAMlE,QAAQ,CAACsE,eAAe,CAACJ,kBAAkB,CAAC;IACpD;IAEA,MAAMK,iCAAiC,GAAG1D,mBAAmB,CAAC2D,IAAI,CAAExD,CAAC,IAAKA,CAAC,CAACmC,iBAAiB,EAAEd,YAAY,CAAC,CAAC,CAAC;IAC9G,MAAMoC,uBAAuB,GAAGvC,qBAAqB,IAAI1C,aAAa,KAAK,QAAQ;IACnF,IAAI,CAACM,0BAA0B,IAAI,CAAC2E,uBAAuB,IAAI,CAACF,iCAAiC,EAAE;MACjG,IAAI;QACF,MAAM,IAAI,CAAC3F,OAAO,CAACA,OAAO,CAAC+D,SAAS,EAAE;UACpC+B,MAAM,EAAE,IAAI;UACZC,cAAc,EAAE,KAAK;UACrBC,MAAM,EAAE;QACV,CAAC,CAAC;MACJ,CAAC,CAAC,OAAOC,GAAQ,EAAE;QACjB,IAAI,CAAC9F,MAAM,CAAC+F,KAAK,CAAC,4BAA4B,EAAED,GAAG,CAAC;QACpD,IAAI,CAAC9F,MAAM,CAACgG,cAAc,CACxB,uEAAuEF,GAAG,CAACjF,OAAO,EACpF,CAAC;MACH;IACF;IAEA,MAAMoF,mBAAmB,GAAG,MAAAA,CAAA,KAAuC;MACjE;MACA;MACA,IAAIrF,MAAM,IAAI8E,uBAAuB,IAAIF,iCAAiC,EAAE;QAC1E,OAAO,IAAI;MACb;MACA,IAAIvC,GAAG,EAAE;QACP,MAAMiD,QAAQ,GAAGpE,mBAAmB,CAACO,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;QACrD,MAAM0D,OAAO,GAAG,MAAM,IAAI,CAACC,mBAAmB,CAACF,QAAQ,EAAEzE,WAAW,EAAEX,KAAK,CAAC;QAC5E,IAAI,CAACqF,OAAO,EAAE,OAAO,IAAI;QACzB,MAAM;UAAEE,gBAAgB;UAAEC,iBAAiB;UAAEC;QAAkB,CAAC,GAAGJ,OAAO;QAC1E,OAAO;UAAEK,iBAAiB,EAAEH,gBAAgB;UAAEI,kBAAkB,EAAEH,iBAAiB;UAAEC;QAAkB,CAAC;MAC1G;MACA,OAAO,IAAI,CAACG,sBAAsB,CAACjF,WAAW,EAAEX,KAAK,EAAEkC,WAAW,EAAE2D,QAAQ,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,IAAIC,gBAAkC,GAAG,IAAI;IAC7C,IAAIC,cAAiC;IACrC,MAAMC,cAAc,GAAG,IAAI,CAACnH,SAAS,GAAG,IAAI,CAACA,SAAS,CAACoH,MAAM,CAACC,YAAY,CAAC,CAAC,GAAG,IAAI;IACnF,IAAI;MACFJ,gBAAgB,GAAG,MAAMX,mBAAmB,CAAC,CAAC;IAChD,CAAC,CAAC,OAAOH,GAAQ,EAAE;MACjB,IAAI,CAAC9F,MAAM,CAAC+F,KAAK,CAAC,sCAAsC,EAAED,GAAG,CAAC;MAC9De,cAAc,GAAGf,GAAG;MACpB,IAAIgB,cAAc,EAAE,IAAI,CAACnH,SAAS,CAACoH,MAAM,CAACE,mBAAmB,CAACH,cAAc,CAAC;IAC/E;IAEA,OAAO;MACLI,UAAU,EAAElD,iBAAiB,CAAC3B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACkF,kBAAkB,CAAC;MAC9DnF,gBAAgB;MAChBuE,iBAAiB,EAAE,CAAC,GAAG7C,oBAAoB,EAAE,IAAIkD,gBAAgB,EAAEL,iBAAiB,IAAI,EAAE,CAAC,CAAC;MAC5FK,gBAAgB;MAChBC,cAAc;MACdO,2BAA2B,EAAE;QAC3B/C,oBAAoB;QACpBC,sBAAsB;QACtBC,sBAAsB;QACtBE;MACF,CAAC;MACDiB;IACF,CAAC;EACH;EAEA,MAAMR,8BAA8BA,CAClClB,iBAA0C,EAC1ChB,WAAkB,EAClBc,yBAA2C,EAC3C;IACA,MAAMuD,kBAAkB,GAAGrE,WAAW,EAClCe,cAAc,CAAC,CAAC,CACjB/F,MAAM,CAAEyE,EAAE,IAAK,CAACqB,yBAAyB,EAAEwD,iBAAiB,CAAC7E,EAAE,CAAC,CAAC;IACpE,MAAM8E,2BAA2B,GAAGnC,8BAAe,CAACC,SAAS,CAACgC,kBAAkB,IAAI,EAAE,CAAC;IACvF,MAAMH,UAAU,GAAG,IAAA/C,iBAAO,EACxBH,iBAAiB,CACd3B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACuF,iBAAiB,CAAC,CAC/BxJ,MAAM,CAAEiE,CAAC,IAAKA,CAAC,IAAIsF,2BAA2B,CAACD,iBAAiB,CAACrF,CAAC,CAACQ,EAAE,CAAC,CAC3E,CAAC;IACD,MAAMgF,QAAQ,GAAGP,UAAU,CAAC7E,GAAG,CAAEJ,CAAC,IAAK,IAAAyF,sCAAwB,EAACzF,CAAC,CAAC,CAAC;IACnE,MAAM0F,SAAS,GAAG,IAAI,CAACrH,WAAW,CAACsH,oBAAoB,CAACH,QAAQ,CAAC;IACjE,IAAIE,SAAS,EAAE,MAAM,IAAI,CAACrH,WAAW,CAACuH,aAAa,CAAC,yBAAyB,CAAC;EAChF;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,MAAMC,cAAcA,CAClBzG,MAAqB;EAAE;EACvB0G,OAAmC,EACnC/E,WAAkB;EAAE;EACpBgF,SAAgB,EACiB;IACjC,MAAMC,mBAAmB,GAAG,KAAIC,0CAAmB,EACjD,IAAI,CAACtI,KAAK,EACV,IAAI,CAACI,MAAM,EACX,IAAI,CAACE,QAAQ,EACb6H,OAAO,EACP,IAAI,CAACpI,SAAS,EACdqD,WAAW,EACXgF,SACF,CAAC;IACD,OAAOC,mBAAmB,CAACE,SAAS,CAAC9G,MAAM,CAAC;EAC9C;EAEA,MAAc4C,oBAAoBA,CAChCJ,mBAA2C,EAC3Cd,WAAmB,EACnBtC,aAA4B,EAC5BuC,WAAkB,EACgB;IAClC,MAAMgB,iBAAiB,GAAG,MAAM,IAAAoE,qBAAS,EACvCvE,mBAAmB,EACnB,OAAO;MAAEwE,gBAAgB;MAAE5F,EAAE;MAAEvB,YAAY;MAAEoH,iBAAiB;MAAElE;IAAkB,CAAC,KAAK;MACtF,MAAMmE,cAAc,GAAG,MAAM,IAAI,CAAC3I,KAAK,CAACsD,WAAW,CAACsF,iBAAiB,CAAC/F,EAAE,CAAC;MACzE,MAAMgG,aAAa,GAAG1F,WAAW,CAAC2F,SAAS,CAAC,CAAC,GAAGC,gBAAM,CAACC,IAAI,CAAC7F,WAAW,CAAC8F,IAAI,EAAEpG,EAAE,CAAC7C,KAAe,CAAC,GAAGmD,WAAW;MAC/G,OAAO,IAAI,CAAC+F,YAAY,CAAC;QACvBT,gBAAgB;QAChB5F,EAAE;QACFvB,YAAY;QACZT,aAAa;QACbsI,UAAU,EAAER,cAAc,CAACS,MAAM,CAACvG,EAAE,CAACwG,OAAiB,CAAQ;QAC9DlG,WAAW,EAAE0F,aAAa;QAC1BzF,WAAW;QACXsF,iBAAiB;QACjBlE;MACF,CAAC,CAAC;IACJ,CACF,CAAC;IAED,IAAI,IAAI,CAACzE,SAAS,EAAE;MAClB,MAAMuJ,YAAY,GAAG,IAAA/E,iBAAO,EAACH,iBAAiB,CAAC3B,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACuF,iBAAiB,CAAC,CAAC;MAC/E,MAAM2B,wBAAwB,GAAG;QAC/BlI,QAAQ,EAAE,IAAI,CAACtB,SAAS,CAACsB,QAAQ;QACjCiG,UAAU,EAAEgC,YAAY;QACxBnI,0BAA0B,EAAE,IAAI;QAChCqI,WAAW,EAAE,KAAK;QAAE;QACpBC,qBAAqB,EAAE;MACzB,CAAC;MACD,MAAM,IAAI,CAACpJ,eAAe,CAACqJ,SAAS,CAACH,wBAAwB,CAAC;IAChE;IAEA,OAAOnF,iBAAiB;EAC1B;EAEA,MAAc8E,YAAYA,CAAC;IACzBT,gBAAgB;IAChB5F,EAAE;IACFvB,YAAY;IACZT,aAAa;IACbsI,UAAU;IACVhG,WAAW;IACXC,WAAW;IACXsF,iBAAiB;IACjBlE;EAWF,CAAC,EAAkC;IACjC,MAAMlB,WAAW,GAAG,IAAI,CAACtD,KAAK,CAACsD,WAAW;IAC1C,IAAIqG,WAAW,GAAG,CAAC,CAAC;IACpB,MAAMC,iBAAoC,GAAG;MAC3C/G,EAAE,EAAE;QAAEoG,IAAI,EAAEpG,EAAE,CAACgH,QAAQ;QAAE7J,KAAK,EAAE6C,EAAE,CAAC7C;MAAM,CAAC;MAC1C8J,IAAI,EAAEX,UAAU;MAChBY,MAAM,EAAE5G;IACV,CAAC;IACDN,EAAE,GAAG4F,gBAAgB,GAAGA,gBAAgB,CAAC5F,EAAE,GAAGA,EAAE;IAChD,MAAM8F,cAAc,GAAG,MAAMrF,WAAW,CAACsF,iBAAiB,CAAC/F,EAAE,CAAC;IAE9D,MAAMmH,gBAAgB,GAAIF,IAAS,IAAK;MACtC,IAAI,CAAC1G,WAAW,EAAE,MAAM,IAAI6G,KAAK,CAAC,qDAAqD,CAAC;MACxF,IAAI9G,WAAW,CAAC2F,SAAS,CAAC,CAAC,EAAE;QAC3B,MAAMoB,YAAY,GAAG9G,WAAW,CAACkE,UAAU,CAAC9D,IAAI,CAAEnB,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAACsH,qBAAqB,CAACtH,EAAE,CAAC,CAAC;QACvF,IAAI,CAACqH,YAAY,EAAE;MACrB;MACA9G,WAAW,CAACgH,YAAY,CAAC;QAAEvH,EAAE;QAAEiH;MAAK,CAAC,CAAC;IACxC,CAAC;IAED,MAAMO,sBAAsB,GAAIzC,iBAAqC,IAAK;MACxE,IAAI,CAACa,gBAAgB,EAAE,MAAM,IAAIwB,KAAK,CAAC,yDAAyD,CAAC;MACjG;MACA;MACA,IAAI,CAAC7G,WAAW,EAAE,MAAM,IAAI6G,KAAK,CAAC,oDAAoD,CAAC;MACvF,IAAI,CAACvB,iBAAiB,EAAE,MAAM,IAAIuB,KAAK,CAAC,qCAAqC,CAAC;MAC9ED,gBAAgB,CAACtB,iBAAiB,CAAC4B,iBAAiB,CAAC;MACrDV,iBAAiB,CAACW,SAAS,GAAG;QAC5BC,aAAa,EAAE9B,iBAAiB,CAAC8B,aAAa;QAC9CF,iBAAiB,EAAE5B,iBAAiB,CAAC4B,iBAAiB;QACtDG,eAAe,EAAE/B,iBAAiB,CAAC+B;MACrC,CAAC;MACDnH,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACuF,QAAQ,CAACd,iBAAiB,CAAC;MAClE,OAAO;QAAErC,kBAAkB,EAAE;UAAE1E,EAAE;UAAE8G;QAAY,CAAC;QAAElG,SAAS,EAAEgF,gBAAgB;QAAEb;MAAkB,CAAC;IACpG,CAAC;IAED,MAAM+C,uBAAuB,GAAGA,CAAA,KAAM;MACpC,IAAI,CAAClC,gBAAgB,EAAE,MAAM,IAAIwB,KAAK,CAAC,mDAAmDpH,EAAE,CAACC,QAAQ,CAAC,CAAC,EAAE,CAAC;MAC1G2F,gBAAgB,CAACmC,KAAK,CAAChM,OAAO,CAAEiM,IAAI,IAAK;QACvClB,WAAW,CAAC,IAAAmB,mCAAoB,EAACD,IAAI,CAACE,QAAQ,CAAC,CAAC,GAAGC,0BAAU,CAACC,SAAS;MACzE,CAAC,CAAC;IACJ,CAAC;IACD,IAAI3J,YAAY,IAAIA,YAAY,CAACoC,YAAY,IAAI7C,aAAa,KAAKqK,4BAAY,CAACC,IAAI,EAAE;MACpFR,uBAAuB,CAAC,CAAC;MACzBrH,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACuF,QAAQ,CAACd,iBAAiB,CAAC;MAClE,OAAO;QAAErC,kBAAkB,EAAE;UAAE1E,EAAE;UAAE8G;QAAY,CAAC;QAAElG,SAAS,EAAEgF,gBAAgB,IAAIzE;MAAU,CAAC;IAC9F;IACA,IAAI0E,iBAAiB,EAAE0C,QAAQ,KAAK,MAAM,EAAE;MAC1CT,uBAAuB,CAAC,CAAC;MACzB,OAAON,sBAAsB,CAAC,CAAC;IACjC;IACA,MAAMgB,QAAQ,GAAGxI,EAAE,CAACkB,aAAa,CAACoF,UAAU,CAACrG,QAAQ,CAAC,CAAC,CAAC;IACxD,MAAMwI,QAAQ,GAAG,CAAChK,YAAY,IAAIT,aAAa,KAAKqK,4BAAY,CAACK,MAAM,GAAGF,QAAQ,GAAGxI,EAAE;IACvF,MAAM2I,eAAe,GAAG,IAAI,CAACzL,SAAS,GAClC,MAAM,IAAI,CAACA,SAAS,CAACsB,QAAQ,CAACoK,oCAAoC,CAACH,QAAQ,CAAC,GAC5E,MAAMhI,WAAW,CAACoI,oBAAoB,CAACJ,QAAQ,CAAC,CAAC,CAAC;IACtD,IAAIhK,YAAY,IAAIT,aAAa,KAAKqK,4BAAY,CAACK,MAAM,EAAE;MACzD;MACAC,eAAe,CAACnC,OAAO,GAAGxG,EAAE,CAACwG,OAAO;IACtC;IACA,MAAMuB,KAAK,GAAGY,eAAe,CAACZ,KAAK;IACnC,IAAAe,4BAAgB,EAACf,KAAK,EAAEjB,WAAW,EAAElB,gBAAgB,IAAIzE,SAAS,CAAC;IAEnE,IAAI1C,YAAY,EAAE;MAChB;MACA,MAAM;QAAEqI,WAAW,EAAEiC,cAAc;QAAEC;MAAc,CAAC,GAAG,IAAAC,gCAAoB,EAAClB,KAAK,EAAEtJ,YAAY,EAAET,aAAa,CAAC;MAC/G2K,eAAe,CAACZ,KAAK,GAAGiB,aAAa;MACrClC,WAAW,GAAAlL,aAAA,CAAAA,aAAA,KAAQkL,WAAW,GAAKiC,cAAc,CAAE;IACrD;IAEA,IAAI,IAAI,CAAC7L,SAAS,EAAE,MAAM,IAAAgM,+BAAmB,EAACpC,WAAW,EAAE,IAAI,CAAC5J,SAAS,CAACsB,QAAQ,EAAEoH,gBAAgB,IAAIzE,SAAS,CAAC;IAElH,IAAIQ,iBAAiB,EAAE;MACrB,MAAMwH,wBAAwB,GAAGxH,iBAAiB,CAACyH,2BAA2B,CAAC,CAAC;MAChF,IAAID,wBAAwB,EAAE;QAC5BpC,iBAAiB,CAACsC,YAAY,GAAGF,wBAAwB;QACzD;QACA;MACF;IACF;;IAEA;IACA;IACA,IAAI1K,YAAY,EAAE;MAChB,IAAIA,YAAY,CAACoC,YAAY,IAAI7C,aAAa,KAAKqK,4BAAY,CAACiB,MAAM,EAAE;QACtEvC,iBAAiB,CAACwC,aAAa,GAAG9K,YAAY,CAACuK,aAAa,CAACzN,MAAM,CAAEiO,CAAC,IAAKA,CAAC,CAACC,QAAQ,CAAC,CAAC7J,GAAG,CAAE4J,CAAC,IAAKA,CAAC,CAACE,QAAQ,CAAC;MAC/G;MACAjJ,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACuF,QAAQ,CAACd,iBAAiB,CAAC;IACpE,CAAC,MAAM,IAAIxG,WAAW,EAAE;MACtB,IAAIsF,iBAAiB,EAAE;QACrB;QACA,OAAO2B,sBAAsB,CAACmB,eAAe,CAAC;MAChD;MACAxB,gBAAgB,CAACb,UAAU,CAAC;IAC9B,CAAC,MAAM;MACL;MACAR,cAAc,CAAC6D,OAAO,CAACrD,UAAU,CAAC;MAClC;MACAR,cAAc,CAAC8D,kBAAkB,CAACtD,UAAU,CAACrG,QAAQ,CAAC,CAAC,CAAC;MACxDQ,WAAW,CAAC0B,OAAO,CAACC,GAAG,CAAC0D,cAAc,CAAC;IACzC;IAEA,OAAO;MACLpB,kBAAkB,EAAE;QAAE1E,EAAE,EAAEyI,QAAQ;QAAE3B;MAAY,CAAC;MACjDlG,SAAS,EAAEgF,gBAAgB,IAAIzE,SAAS;MACxC4D,iBAAiB,EAAE4D;IACrB,CAAC;EACH;EAEA,MAAchK,UAAUA,CAACZ,OAAe,EAAgC;IACtE,MAAMS,QAAQ,GAAG,IAAI,CAACtB,SAAS,CAACsB,QAAQ;IACxC,MAAMqL,GAAG,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAAC/L,OAAO,CAAC;IACjD,MAAM2F,OAAO,GAAG,MAAM,IAAI,CAACpG,QAAQ,CAACA,QAAQ,CAAC;MAAEuM,GAAG;MAAEE,KAAK,EAAE;IAAK,CAAC,CAAC;IAClEF,GAAG,CAAC9N,OAAO,CAAEiE,EAAE,IAAKxB,QAAQ,CAACrB,KAAK,CAACgF,OAAO,CAACG,kBAAkB,CAAC0H,eAAe,CAAChK,EAAE,CAAC,CAAC;IAClF,MAAMxB,QAAQ,CAACrB,KAAK,CAACgF,OAAO,CAACG,kBAAkB,CAACC,KAAK,CAAC,CAAC;IACvD,OAAO;MAAE0H,iBAAiB,EAAEvG,OAAO,CAACe;IAAW,CAAC;EAClD;EAEA,MAAc/F,YAAYA,CAACX,OAAe,EAAEiB,WAAmB,EAAEX,KAAc,EAAgC;IAC7G,MAAMwL,GAAG,GAAG,MAAM,IAAI,CAACC,iBAAiB,CAAC/L,OAAO,CAAC;IACjD;IACA,MAAM;MAAEgG;IAAkB,CAAC,GAAG,MAAM,IAAI,CAAC1G,QAAQ,CAAC6M,IAAI,CAAC;MACrDC,YAAY,EAAExH,8BAAe,CAACC,SAAS,CAACiH,GAAG,CAACjK,GAAG,CAAEI,EAAE,IAAKA,EAAE,CAAC,CAAC;MAC5D3B,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;IACF,OAAO;MAAEoL,kBAAkB,EAAErG;IAAkB,CAAC;EAClD;EAEA,MAAczE,sBAAsBA,CAClCV,MAAqB,EACrBsI,MAAc,EACdmD,eAAiC,EACjCrM,aAA4B,EACK;IACjC,MAAM6L,GAAG,GAAG,MAAMS,OAAO,CAACC,GAAG,CAC3B3L,MAAM,CAACgB,GAAG,CAAC,MAAO4K,KAAK,IAAK;MAC1B,MAAMC,eAAe,GAAGvD,MAAM,CAACjB,SAAS,CAAC,CAAC,GAAGuE,KAAK,CAACrN,KAAK,GAAG+J,MAAM,CAAC/J,KAAK;MACvE,MAAMuN,YAAY,GAAGxE,gBAAM,CAACC,IAAI,CAACe,MAAM,CAACd,IAAI,EAAEqE,eAAyB,CAAC;MACxE,MAAMnE,UAAU,GAAG,MAAM,IAAI,CAACpJ,SAAS,CAACsB,QAAQ,CAACrB,KAAK,CAACgF,OAAO,CAACwI,WAAW,CAACpE,MAAM,CAACmE,YAAY,EAAEF,KAAK,CAAC;MACtG,MAAMI,SAAS,GAAGF,YAAY,CAACzK,QAAQ,CAAC,CAAC;MACzC,IAAI,CAACqG,UAAU,EAAE;QACf,MAAM,KAAIlG,oBAAQ,EAAC,oCAAoCoK,KAAK,CAACK,sBAAsB,CAAC,CAAC,SAASD,SAAS,GAAG,CAAC;MAC7G;MACA,OAAOJ,KAAK,CAACtJ,aAAa,CAACoF,UAAU,CAACrG,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CACH,CAAC;IAED,OAAO,IAAI,CAACoF,cAAc,CAACwE,GAAG,EAAE;MAAEiB,YAAY,EAAE,KAAK;MAAE9M;IAAc,CAAC,EAAEqM,eAAe,EAAEA,eAAe,CAAC;EAC3G;EAEA,MAAcpG,sBAAsBA,CAClCjF,WAAoB,EACpBX,KAAe,EACf6I,MAAe,EACY;IAC3B,MAAM5E,kBAAkB,GAAG,IAAI,CAACnF,KAAK,CAACsD,WAAW,CAAC0B,OAAO,CAACG,kBAAkB,CAACyI,aAAa,CAAC,CAAC;IAC5F,IAAI,CAACxN,MAAM,CAACyN,KAAK,CAAC,8CAA8C1I,kBAAkB,CAACxG,MAAM,CAACmE,QAAQ,CAAC,CAAC,aAAa,CAAC;IAClH,IAAI,CAACqC,kBAAkB,CAACxG,MAAM,EAAE,OAAO,IAAI;IAC3C,MAAM+N,GAAG,GAAGlH,8BAAe,CAACC,SAAS,CAACN,kBAAkB,CAAC1C,GAAG,CAAE3E,CAAC,IAAKgQ,0BAAW,CAACC,UAAU,CAACjQ,CAAC,CAAC+E,EAAE,CAAC,CAAC,CAAC;IAClG,IAAI,CAAC,IAAI,CAAC9C,SAAS,EAAE;MACnB,MAAMwG,OAAO,GAAG,MAAM,IAAI,CAACrG,QAAQ,CAAC8N,aAAa,CAC/CtB,GAAG,CAACjK,GAAG,CAAEI,EAAE,KAAM;QAAEoL,WAAW,EAAEpL,EAAE,CAACC,QAAQ,CAAC;MAAE,CAAC,CAAC,CAAC,EACjD;QACE7B,OAAO,EAAEY,WAAW;QACpBX,KAAK;QACLgN,IAAI,EAAEnE,MAAM,EAAEjH,QAAQ,CAAC;MACzB,CACF,CAAC;MACD,OAAArE,aAAA,CAAAA,aAAA,KAAY8H,OAAO;QAAEM,kBAAkB,EAAE;MAAE;IAC7C;IACA,OAAO,IAAI,CAAC3G,QAAQ,CAAC6M,IAAI,CAAC;MACxBC,YAAY,EAAEN,GAAG;MACjBxL,KAAK;MACLD,OAAO,EAAEY;IACX,CAAC,CAAC;EACJ;EAEA,MAAc2E,mBAAmBA,CAC/BF,QAAuB,EACvB6H,UAAmB,EACnBjN,KAAe,EACa;IAC5B,MAAMwL,GAAG,GAAGpG,QAAQ,CAAC7D,GAAG,CAAEI,EAAE,IAAK;MAC/B,OAAOA,EAAE,CAAC6K,sBAAsB,CAAC,CAAC;IACpC,CAAC,CAAC;IACF,IAAI,CAACtN,MAAM,CAACyN,KAAK,CAAC,6CAA6CvH,QAAQ,CAAC3H,MAAM,CAACmE,QAAQ,CAAC,CAAC,aAAa,CAAC;IACvG,OAAO,IAAI,CAAC5C,QAAQ,CAACmD,GAAG,CAAC;MACvBqJ,GAAG;MACHxL,KAAK;MACLD,OAAO,EAAEkN,UAAU;MACnBC,UAAU,EAAE;IACd,CAAC,CAAC;EACJ;EAEA,MAAczB,iBAAiBA,CAAC/L,OAAgB,EAA0B;IACxE,IAAIA,OAAO,EAAE;MACX,MAAMyN,YAAY,GAAG,MAAM,IAAI,CAACtO,SAAS,CAACuO,YAAY,CAAC1N,OAAO,CAAC;MAC/DyN,YAAY,CAACzP,OAAO,CAAEiE,EAAE,IAAK;QAC3B,MAAM0L,KAAK,GAAG,IAAI,CAACxO,SAAS,CAACsB,QAAQ,CAACrB,KAAK,CAACgF,OAAO,CAACG,kBAAkB,CAACqJ,QAAQ,CAAC3L,EAAE,CAAC;QACnF,IAAI,CAAC0L,KAAK,EAAE;UACV,MAAM,KAAItL,oBAAQ,EAAC,2BAA2BJ,EAAE,CAACC,QAAQ,CAAC,CAAC,kCAAkC,CAAC;QAChG;MACF,CAAC,CAAC;MACF,OAAOuL,YAAY;IACrB;IACA,MAAMI,oBAAoB,GAAG,IAAI,CAAC1O,SAAS,CAACsB,QAAQ,CAACrB,KAAK,CAACgF,OAAO,CAACG,kBAAkB,CAACyI,aAAa,CAAC,CAAC;IACrG,IAAI,CAACa,oBAAoB,CAAC9P,MAAM,EAAE,MAAM,KAAIsE,oBAAQ,EAAC,oDAAoD,CAAC;IAC1G,OAAOwL,oBAAoB,CAAChM,GAAG,CAAEiM,CAAC,IAAKZ,0BAAW,CAACC,UAAU,CAACW,CAAC,CAAC7L,EAAE,CAAC,CAAC;EACtE;EAEA,MAAcnB,oBAAoBA,CAACL,QAAkB,EAAET,OAAgB,EAA0B;IAC/F,IAAIA,OAAO,EAAE;MACX,OAAO,IAAI,CAACb,SAAS,CAACuO,YAAY,CAAC1N,OAAO,CAAC;IAC7C;IACA,MAAM+N,cAAc,GAAG,KAAIC,yBAAc,EAACvN,QAAQ,CAAC;IACnD,MAAMwN,YAAY,GAAG,MAAMF,cAAc,CAACG,0BAA0B,CAAC,CAAC;IACtE,OAAOD,YAAY,CAACpM,GAAG,CAAEJ,CAAC,IAAKA,CAAC,CAACQ,EAAE,CAAC;EACtC;EAoBA,aAAakM,QAAQA,CAAC,CACpBC,GAAG,EACHjP,SAAS,EACTC,KAAK,EACLE,QAAQ,EACRC,QAAQ,EACRF,OAAO,EACPgP,UAAU,EACVC,UAAU,EACV5O,QAAQ,EACRC,MAAM,EACNC,MAAM,EACN2O,YAAY,EACZ1O,YAAY,EACZC,WAAW,CAgBZ,EAAE;IACD,MAAMN,MAAM,GAAG6O,UAAU,CAACG,YAAY,CAACC,wBAAa,CAACxM,EAAE,CAAC;IACxD,MAAMyM,OAAO,GAAG,IAAIzP,WAAW,CAC7BE,SAAS,EACTC,KAAK,EACLC,OAAO,EACPC,QAAQ,EACRC,QAAQ,EACRC,MAAM,EACN8O,UAAU,EACV5O,QAAQ,EACRC,MAAM,EACNC,MAAM,EACNC,YAAY,EACZC,WACF,CAAC;IACDsO,GAAG,CAACO,QAAQ,CAAC,KAAIC,oBAAQ,EAACF,OAAO,EAAEH,YAAY,CAAC,CAAC;IACjD,OAAOG,OAAO;EAChB;AACF;AAACG,OAAA,CAAA5P,WAAA,GAAAA,WAAA;AAAAhB,eAAA,CArnBYgB,WAAW,WAkjBP,EAAE;AAAAhB,eAAA,CAljBNgB,WAAW,kBAmjBA,CACpB6P,gBAAS,EACTC,4BAAe,EACfC,oBAAW,EACXC,0BAAc,EACdC,0BAAc,EACdC,wBAAa,EACbC,sBAAY,EACZC,wCAAqB,EACrBC,0BAAc,EACdC,sBAAY,EACZC,sBAAY,EACZC,kCAAkB,EAClBC,kCAAkB,EAClBC,8CAAwB,CACzB;AAAA1R,eAAA,CAlkBUgB,WAAW,aAmkBL2Q,kBAAW;AAoD9BnB,wBAAa,CAACoB,UAAU,CAAC5Q,WAAW,CAAC","ignoreList":[]}
+{"version":3,"names":["_cli","data","require","_workspace","_legacy","_snapping","_pMapSeries","_interopRequireDefault","_componentId","_bitError","_laneId","_chalk","_config","_remove","_toolboxPath","_pkgModules","_componentWriter","_importer","_logger","_globalConfig","_lodash","_checkout","_configMerger","_dependencyResolver","_install","_scope","_mergeCmd","_merging","_mergeStatusProvider","_mergeVersion","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","MergingMain","constructor","workspace","scope","install","snapping","checkout","logger","componentWriter","importer","config","remove","configMerger","depResolver","merge","pattern","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","currentLaneIdsBeforeMerge","toComponentIds","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","workspaceDepsUnchanged","updateWorkspaceJsoncWithDepsIfNeeded","workspaceConfigConflictWriteError","writeWorkspaceJsoncWithConflictsGracefully","generateConfigMergeConflictFileForAll","objects","add","persist","unmergedComponents","write","writeBitMap","removeFromWsJsonPolicyIfExists","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","newlyIntroducedIds","hasWithoutVersion","newlyIntroducedComponentIds","legacyCompToWrite","packages","componentIdToPackageName","isRemoved","removeFromRootPolicy","persistConfig","getMergeStatus","options","otherLane","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","compsToWrite","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","ids","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","componentIds","idsByPattern","entry","getEntry","unresolvedComponents","u","componentsList","ComponentsList","mergePending","listMergePendingComponents","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","ScopeAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","ConfigMergerAspect","DependencyResolverAspect","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.component-list';\nimport { SnappingAspect, SnappingMain, TagResults } from '@teambit/snapping';\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, deleteComponentsFiles } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/toolbox.path.path';\nimport { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';\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 {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\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 { DependencyResolverAspect, DependencyResolverMain } from '@teambit/dependency-resolver';\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';\nimport {\n  MergeStrategy,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeResultsThreeWay,\n  MergeOptions,\n} from './merge-version';\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    private depResolver: DependencyResolverMain\n  ) {}\n\n  async merge(\n    pattern: 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(pattern, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(pattern);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, pattern);\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;\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 currentLaneIdsBeforeMerge = currentLane?.toComponentIds();\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, workspaceDepsUnchanged } = this.workspace\n      ? await this.configMerger.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge)\n      : { workspaceDepsUpdates: undefined, workspaceDepsConflicts: undefined, workspaceDepsUnchanged: 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) {\n      await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n      await this.removeFromWsJsonPolicyIfExists(componentsResults, currentLane, currentLaneIdsBeforeMerge);\n    }\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        workspaceDepsUnchanged,\n        workspaceConfigConflictWriteError,\n      },\n      leftUnresolvedConflicts,\n    };\n  }\n\n  async removeFromWsJsonPolicyIfExists(\n    componentsResults: ApplyVersionWithComps[],\n    currentLane?: Lane,\n    currentLaneIdsBeforeMerge?: ComponentIdList\n  ) {\n    const newlyIntroducedIds = currentLane\n      ?.toComponentIds()\n      .filter((id) => !currentLaneIdsBeforeMerge?.hasWithoutVersion(id));\n    const newlyIntroducedComponentIds = ComponentIdList.fromArray(newlyIntroducedIds || []);\n    const components = compact(\n      componentsResults\n        .map((c) => c.legacyCompToWrite)\n        .filter((c) => c && newlyIntroducedComponentIds.hasWithoutVersion(c.id))\n    );\n    const packages = components.map((c) => componentIdToPackageName(c));\n    const isRemoved = this.depResolver.removeFromRootPolicy(packages);\n    if (isRemoved) await this.depResolver.persistConfig('merge (remove packages)');\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, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane // 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,\n      otherLane\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    otherLaneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    currentLane?: Lane\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;\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(pattern: string): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(pattern);\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(pattern: string, snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(pattern);\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 | undefined,\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(pattern?: string): Promise<ComponentID[]> {\n    if (pattern) {\n      const componentIds = await this.workspace.idsByPattern(pattern);\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, pattern?: string): Promise<ComponentID[]> {\n    if (pattern) {\n      return this.workspace.idsByPattern(pattern);\n    }\n    const componentsList = new ComponentsList(consumer);\n    const mergePending = await componentsList.listMergePendingComponents();\n    return mergePending.map((c) => c.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    DependencyResolverAspect,\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    depResolver,\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    DependencyResolverMain\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      depResolver\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/merge-version/three-way-merge.ts

@@ -7,7 +7,7 @@ import { PathLinux, pathNormalizeToLinux, PathOsBased } from '@teambit/toolbox.p
 import * as eol from '@teambit/toolbox.string.eol';
 import { mergeFiles, MergeFileParams, MergeFileResult } from '../merge-files';
 import Component from '@teambit/legacy/dist/consumer/component';
-import { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';
+import { SourceFile } from '@teambit/component.sources';
 import { Scope } from '@teambit/legacy/dist/scope';
 import { isEmpty } from 'lodash';
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.332",
+  "version": "1.0.333",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.332"
+    "version": "1.0.333"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,25 +17,27 @@
     "@teambit/component-id": "1.2.0",
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
-    "@teambit/cli": "0.0.909",
-    "@teambit/config-merger": "0.0.199",
-    "@teambit/global-config": "0.0.912",
+    "@teambit/cli": "0.0.910",
+    "@teambit/config-merger": "0.0.200",
+    "@teambit/global-config": "0.0.913",
     "@teambit/git.modules.git-executable": "0.0.1",
     "@teambit/legacy.utils": "0.0.3",
-    "@teambit/importer": "1.0.332",
-    "@teambit/logger": "0.0.1002",
-    "@teambit/scope": "1.0.332",
-    "@teambit/workspace": "1.0.332",
-    "@teambit/checkout": "1.0.332",
-    "@teambit/component-writer": "1.0.332",
-    "@teambit/config": "0.0.1083",
-    "@teambit/dependency-resolver": "1.0.332",
-    "@teambit/install": "1.0.332",
+    "@teambit/importer": "1.0.333",
+    "@teambit/logger": "0.0.1003",
+    "@teambit/scope": "1.0.333",
+    "@teambit/workspace": "1.0.333",
+    "@teambit/checkout": "1.0.333",
+    "@teambit/component-writer": "1.0.333",
+    "@teambit/config": "0.0.1084",
+    "@teambit/dependency-resolver": "1.0.333",
+    "@teambit/install": "1.0.333",
+    "@teambit/legacy.component-list": "0.0.3",
     "@teambit/pkg.modules.component-package-name": "0.0.2",
-    "@teambit/remove": "1.0.332",
-    "@teambit/snapping": "1.0.332",
+    "@teambit/remove": "1.0.333",
+    "@teambit/snapping": "1.0.333",
     "@teambit/toolbox.path.path": "0.0.2",
     "@teambit/legacy.cli.prompts": "0.0.1",
+    "@teambit/component.sources": "0.0.2",
     "@teambit/toolbox.crypto.sha1": "0.0.1",
     "@teambit/toolbox.string.eol": "0.0.1"
   },