@teambit/merging 0.0.186 → 0.0.187

package/dist/merge-cmd.js

@@ -207,7 +207,7 @@ ${mergeSnapError.message}
 
   const getFailureOutput = () => {
     if (!failedComponents || !failedComponents.length) return '';
-    const title = '\nthe merge has been canceled on the following component(s)';
+    const title = '\nthe merge has been skipped on the following component(s)';
     const body = (0, _lodash().compact)(failedComponents.map(failedComponent => {
       if (!verbose && failedComponent.unchangedLegitimately) return null;
       const color = failedComponent.unchangedLegitimately ? 'white' : 'red';
@@ -215,7 +215,7 @@ ${mergeSnapError.message}
     })).join('\n');
 
     if (!body) {
-      return `${_chalk().default.bold(`\nthe merge has been canceled on ${failedComponents.length} component(s) legitimately`)}
+      return `${_chalk().default.bold(`\nthe merge has been skipped on ${failedComponents.length} component(s) legitimately`)}
 (use --verbose to list them next time)`;
     }
 

package/dist/merge-cmd.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergeCmd","constructor","merging","WILDCARD_HELP","report","values","ours","theirs","manual","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","leftUnresolvedConflicts","getSuccessOutput","length","bold","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","comps","component","componentOutput","toString","autoTag","filter","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","unchangedLegitimately","color","failureMessage","getSummary","merged","f","failedToMerge","autoSnapped","newLines","mergedStr","unchangedLegitimatelyStr","failedToMergeStr","autoSnappedStr"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG } from '@teambit/legacy/dist/constants';\nimport {\n  ApplyVersionResults,\n  conflictSummaryReport,\n  getMergeStrategy,\n  applyVersionReport,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { MergingMain } from './merging.main.runtime';\n\nexport class MergeCmd implements Command {\n  name = 'merge [values...]';\n  description = 'merge changes of different component versions';\n  group = 'development';\n  extendedDescription = `merge changes of different component versions\n  \\`bit merge <version> [ids...]\\` => merge changes of the given version into the checked out version\n  \\`bit merge [ids...]\\` => EXPERIMENTAL. merge changes of the remote head into local, optionally use '--abort' or '--resolve'\n  ${WILDCARD_HELP('merge 0.0.1')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'],\n    ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain) {}\n\n  async report(\n    [values = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      values,\n      mergeStrategy as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n}: ApplyVersionResults): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    // @ts-ignore version is set in case of merge command\n    const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n    // @ts-ignore components is set in case of merge command\n    return chalk.underline(title) + chalk.green(applyVersionReport(components));\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nthe merge process wasn't completed due to the conflicts above. fix them manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold(\n  'snapping the merged components had failed with the following error, please fix the issues and snap manually'\n)}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\n            result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n          );\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nthe merge has been canceled on the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.failureMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nthe merge has been canceled on ${failedComponents.length} component(s) legitimately`)}\n(use --verbose to list them next time)`;\n    }\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const failedToMerge = failedComponents?.filter((f) => !f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n\n    const newLines = '\\n\\n';\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const failedToMergeStr = `\\nTotal Failed: ${chalk.bold(failedToMerge.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n\n    return newLines + title + mergedStr + unchangedLegitimatelyStr + failedToMergeStr + autoSnappedStr;\n  };\n\n  return getSuccessOutput() + getFailureOutput() + getSnapsOutput() + getConflictSummary() + getSummary();\n}\n"],"mappings":"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"}
+{"version":3,"names":["MergeCmd","constructor","merging","WILDCARD_HELP","report","values","ours","theirs","manual","abort","resolve","build","noSnap","verbose","message","skipDependencyInstallation","isFeatureEnabled","BUILD_ON_CI","Boolean","mergeStrategy","getMergeStrategy","BitError","components","failedComponents","version","resolvedComponents","abortedComponents","mergeSnapResults","mergeSnapError","merge","title","componentsStr","map","c","id","toStringWithoutVersion","join","chalk","underline","green","mergeReport","leftUnresolvedConflicts","getSuccessOutput","length","bold","applyVersionReport","getConflictSummary","suggestion","conflictSummaryReport","yellow","getSnapsOutput","snappedComponents","autoSnappedResults","outputComponents","comps","component","componentOutput","toString","autoTag","filter","result","triggeredBy","searchWithoutScopeAndVersion","autoTagComp","a","AUTO_SNAPPED_MSG","getFailureOutput","body","compact","failedComponent","unchangedLegitimately","color","failureMessage","getSummary","merged","f","failedToMerge","autoSnapped","newLines","mergedStr","unchangedLegitimatelyStr","failedToMergeStr","autoSnappedStr"],"sources":["merge-cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { compact } from 'lodash';\nimport { WILDCARD_HELP, AUTO_SNAPPED_MSG } from '@teambit/legacy/dist/constants';\nimport {\n  ApplyVersionResults,\n  conflictSummaryReport,\n  getMergeStrategy,\n  applyVersionReport,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { isFeatureEnabled, BUILD_ON_CI } from '@teambit/legacy/dist/api/consumer/lib/feature-toggle';\nimport { BitError } from '@teambit/bit-error';\nimport { MergingMain } from './merging.main.runtime';\n\nexport class MergeCmd implements Command {\n  name = 'merge [values...]';\n  description = 'merge changes of different component versions';\n  group = 'development';\n  extendedDescription = `merge changes of different component versions\n  \\`bit merge <version> [ids...]\\` => merge changes of the given version into the checked out version\n  \\`bit merge [ids...]\\` => EXPERIMENTAL. merge changes of the remote head into local, optionally use '--abort' or '--resolve'\n  ${WILDCARD_HELP('merge 0.0.1')}`;\n  alias = '';\n  options = [\n    ['', 'ours', 'in case of a conflict, override the used version with the current modification'],\n    ['', 'theirs', 'in case of a conflict, override the current modification with the specified version'],\n    ['', 'manual', 'in case of a conflict, leave the files with a conflict state to resolve them manually later'],\n    ['', 'abort', 'EXPERIMENTAL. in case of an unresolved merge, revert to the state before the merge began'],\n    ['', 'resolve', 'EXPERIMENTAL. mark an unresolved merge as resolved and create a new snap with the changes'],\n    ['', 'no-snap', 'EXPERIMENTAL. do not auto snap in case the merge completed without conflicts'],\n    ['', 'build', 'in case of snap during the merge, run the build-pipeline (similar to bit snap --build)'],\n    ['', 'verbose', 'show details of components that were not merged legitimately'],\n    ['', 'skip-dependency-installation', 'do not install packages of the imported components'],\n    ['m', 'message <message>', 'EXPERIMENTAL. override the default message for the auto snap'],\n  ] as CommandOptions;\n  loader = true;\n\n  constructor(private merging: MergingMain) {}\n\n  async report(\n    [values = []]: [string[]],\n    {\n      ours = false,\n      theirs = false,\n      manual = false,\n      abort = false,\n      resolve = false,\n      build = false,\n      noSnap = false,\n      verbose = false,\n      message,\n      skipDependencyInstallation = false,\n    }: {\n      ours?: boolean;\n      theirs?: boolean;\n      manual?: boolean;\n      abort?: boolean;\n      resolve?: boolean;\n      build?: boolean;\n      noSnap?: boolean;\n      verbose?: boolean;\n      message: string;\n      skipDependencyInstallation?: boolean;\n    }\n  ) {\n    build = isFeatureEnabled(BUILD_ON_CI) ? Boolean(build) : true;\n    const mergeStrategy = getMergeStrategy(ours, theirs, manual);\n    if (abort && resolve) throw new BitError('unable to use \"abort\" and \"resolve\" flags together');\n    if (noSnap && message) throw new BitError('unable to use \"noSnap\" and \"message\" flags together');\n    const {\n      components,\n      failedComponents,\n      version,\n      resolvedComponents,\n      abortedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n    }: ApplyVersionResults = await this.merging.merge(\n      values,\n      mergeStrategy as any,\n      abort,\n      resolve,\n      noSnap,\n      message,\n      build,\n      skipDependencyInstallation\n    );\n    if (resolvedComponents) {\n      const title = 'successfully resolved component(s)\\n';\n      const componentsStr = resolvedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n    if (abortedComponents) {\n      const title = 'successfully aborted the merge of the following component(s)\\n';\n      const componentsStr = abortedComponents.map((c) => c.id.toStringWithoutVersion()).join('\\n');\n      return chalk.underline(title) + chalk.green(componentsStr);\n    }\n\n    return mergeReport({\n      components,\n      failedComponents,\n      version,\n      mergeSnapResults,\n      mergeSnapError,\n      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  version,\n  mergeSnapResults,\n  mergeSnapError,\n  leftUnresolvedConflicts,\n  verbose,\n}: ApplyVersionResults): string {\n  const getSuccessOutput = () => {\n    if (!components || !components.length) return '';\n    // @ts-ignore version is set in case of merge command\n    const title = `successfully merged components${version ? `from version ${chalk.bold(version)}` : ''}\\n`;\n    // @ts-ignore components is set in case of merge command\n    return chalk.underline(title) + chalk.green(applyVersionReport(components));\n  };\n\n  const getConflictSummary = () => {\n    if (!components || !components.length || !leftUnresolvedConflicts) return '';\n    const title = `\\nfiles with conflicts summary\\n`;\n    const suggestion = `\\n\\nthe merge process wasn't completed due to the conflicts above. fix them manually and then run \"bit install\".\nonce ready, snap/tag the components to complete the merge.`;\n    return chalk.underline(title) + conflictSummaryReport(components) + chalk.yellow(suggestion);\n  };\n\n  const getSnapsOutput = () => {\n    if (mergeSnapError) {\n      return `\n${chalk.bold(\n  'snapping the merged components had failed with the following error, please fix the issues and snap manually'\n)}\n${mergeSnapError.message}\n`;\n    }\n    if (!mergeSnapResults || !mergeSnapResults.snappedComponents) return '';\n    const { snappedComponents, autoSnappedResults } = mergeSnapResults;\n    const outputComponents = (comps) => {\n      return comps\n        .map((component) => {\n          let componentOutput = `     > ${component.id.toString()}`;\n          const autoTag = autoSnappedResults.filter((result) =>\n            result.triggeredBy.searchWithoutScopeAndVersion(component.id)\n          );\n          if (autoTag.length) {\n            const autoTagComp = autoTag.map((a) => a.component.id.toString());\n            componentOutput += `\\n       ${AUTO_SNAPPED_MSG}: ${autoTagComp.join(', ')}`;\n          }\n          return componentOutput;\n        })\n        .join('\\n');\n    };\n\n    return `\\n${chalk.underline(\n      'merge-snapped components'\n    )}\\n(${'components that snapped as a result of the merge'})\\n${outputComponents(snappedComponents)}\\n`;\n  };\n\n  const getFailureOutput = () => {\n    if (!failedComponents || !failedComponents.length) return '';\n    const title = '\\nthe merge has been skipped on the following component(s)';\n    const body = compact(\n      failedComponents.map((failedComponent) => {\n        if (!verbose && failedComponent.unchangedLegitimately) return null;\n        const color = failedComponent.unchangedLegitimately ? 'white' : 'red';\n        return `${chalk.bold(failedComponent.id.toString())} - ${chalk[color](failedComponent.failureMessage)}`;\n      })\n    ).join('\\n');\n    if (!body) {\n      return `${chalk.bold(`\\nthe merge has been skipped on ${failedComponents.length} component(s) legitimately`)}\n(use --verbose to list them next time)`;\n    }\n    return `\\n${chalk.underline(title)}\\n${body}\\n\\n`;\n  };\n\n  const getSummary = () => {\n    const merged = components?.length || 0;\n    const unchangedLegitimately = failedComponents?.filter((f) => f.unchangedLegitimately).length || 0;\n    const failedToMerge = failedComponents?.filter((f) => !f.unchangedLegitimately).length || 0;\n    const autoSnapped =\n      (mergeSnapResults?.snappedComponents.length || 0) + (mergeSnapResults?.autoSnappedResults.length || 0);\n\n    const newLines = '\\n\\n';\n    const title = chalk.bold.underline('Merge Summary');\n    const mergedStr = `\\nTotal Merged: ${chalk.bold(merged.toString())}`;\n    const unchangedLegitimatelyStr = `\\nTotal Unchanged: ${chalk.bold(unchangedLegitimately.toString())}`;\n    const failedToMergeStr = `\\nTotal Failed: ${chalk.bold(failedToMerge.toString())}`;\n    const autoSnappedStr = `\\nTotal Snapped: ${chalk.bold(autoSnapped.toString())}`;\n\n    return newLines + title + mergedStr + unchangedLegitimatelyStr + failedToMergeStr + autoSnappedStr;\n  };\n\n  return getSuccessOutput() + getFailureOutput() + getSnapsOutput() + getConflictSummary() + getSummary();\n}\n"],"mappings":"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"}

package/dist/merging.main.runtime.js

@@ -161,16 +161,6 @@ function _getDivergeData() {
   return data;
 }
 
-function _objects() {
-  const data = require("@teambit/legacy/dist/scope/objects");
-
-  _objects = function () {
-    return data;
-  };
-
-  return data;
-}
-
 function _chalk() {
   const data = _interopRequireDefault(require("chalk"));
 
@@ -507,8 +497,6 @@ class MergingMain {
   localLane, // currently checked out lane. if on main, then it's null.
   otherLaneName, // the lane name we want to merged to our lane. (can be also "main").
   options) {
-    var _modelComponent$laneH;
-
     const consumer = this.workspace.consumer;
     const componentStatus = {
       id
@@ -600,10 +588,11 @@ class MergingMain {
 
     if (isComponentModified) {
       return returnUnmerged(`component is modified, please snap/tag it first`);
-    }
+    } // @todo: is it needed?
+    // const laneHeadIsDifferentThanCheckedOut =
+    //   localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;
+    // const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;
 
-    const laneHeadIsDifferentThanCheckedOut = localLane && (existingBitMapId === null || existingBitMapId === void 0 ? void 0 : existingBitMapId.version) && ((_modelComponent$laneH = modelComponent.laneHeadLocal) === null || _modelComponent$laneH === void 0 ? void 0 : _modelComponent$laneH.toString()) !== (existingBitMapId === null || existingBitMapId === void 0 ? void 0 : existingBitMapId.version);
-    const localHead = laneHeadIsDifferentThanCheckedOut ? _objects().Ref.from(existingBitMapId.version) : null;
 
     if (!otherLaneHead) {
       throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);
@@ -613,7 +602,7 @@ class MergingMain {
       repo,
       modelComponent,
       remoteHead: otherLaneHead,
-      checkedOutLocalHead: localHead,
+      // checkedOutLocalHead: localHead,
       throws: false
     });
 
@@ -633,7 +622,7 @@ class MergingMain {
           return !(divergeDataFromMain.err instanceof _noCommonSnap().NoCommonSnap);
         };
 
-        const hasResolvedLocally = await hasResolvedFromMain(localHead);
+        const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane());
         const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);
 
         if (!hasResolvedLocally && !hasResolvedRemotely) {

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

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","writeBitMap","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","checkedOutLocalHead","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","debug","r","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { TagResults } from '@teambit/legacy/dist/api/consumer/lib/tag';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n  resolvedUnrelated?: ResolveUnrelatedData;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: 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 ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\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: BitId[],\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(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage 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      laneId: currentLaneId,\n      localLane: 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    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const 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.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n        });\n      }\n    );\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\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) {\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 } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnLane.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, remoteHead: otherLaneHead, throws: false });\n      return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      remoteHead: otherLaneHead,\n      checkedOutLocalHead: localHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n          const divergeDataFromMain = await getDivergeData({\n            repo,\n            modelComponent,\n            remoteHead: mainHead,\n            checkedOutLocalHead: hashToCompare,\n            throws: false,\n          });\n          if (!divergeDataFromMain.err) return true;\n          return !(divergeDataFromMain.err instanceof NoCommonSnap);\n        };\n        const hasResolvedLocally = await hasResolvedFromMain(localHead);\n        const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnLane,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent,\n      currentLabel: `${currentId.version} (${currentLaneName})`,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\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      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\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 componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n    });\n    await manyComponentsWriter.writeAll();\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      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: 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      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = 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.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          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`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 GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect, LoggerAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","ConsumerNotFound","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","filter","c","unmergedMessage","unmergedLegitimately","length","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","writeBitMap","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","components","getComponentMergeStatus","otherLaneName","options","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnLane","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","changeVersion","getHeadAsTagIfExist","currentId","divergeData","getDivergeData","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","Error","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedFromMain","hashToCompare","divergeDataFromMain","checkedOutLocalHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","versionToSaveInLane","resolvedRef","strategy","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","debug","r","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport ManyComponentsWriter from '@teambit/legacy/dist/consumer/component-ops/many-components-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { applyModifiedVersion } from '@teambit/legacy/dist/consumer/versions-ops/checkout-version';\nimport threeWayMerge, {\n  MergeResultsThreeWay,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { CheckoutAspect, CheckoutMain } from '@teambit/checkout';\nimport { ComponentID } from '@teambit/component-id';\nimport { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { TagResults } from '@teambit/legacy/dist/api/consumer/lib/tag';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\ntype ResolveUnrelatedData = { strategy: MergeStrategy; head: Ref };\n\nexport type ComponentMergeStatus = {\n  currentComponent?: ConsumerComponent | null;\n  componentFromModel?: Version;\n  id: BitId;\n  unmergedMessage?: string;\n  unmergedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n  resolvedUnrelated?: ResolveUnrelatedData;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger\n  ) {\n    this.consumer = this.workspace?.consumer;\n  }\n\n  /**\n   * merge components according to the \"values\" param.\n   * if the first param is a version, then merge the component ids to that version.\n   * otherwise, merge from the remote head to the local.\n   */\n  async merge(\n    values: 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 ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(values);\n    } else if (!BitId.isValidVersion(firstValue)) {\n      const bitIds = this.getComponentsToMerge(consumer, values);\n      // @todo: version could be the lane only or remote/lane\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    } else {\n      const version = firstValue;\n      const ids = R.tail(values);\n      const bitIds = this.getComponentsToMerge(consumer, ids);\n      mergeResults = await mergeVersion(consumer, version, bitIds, mergeStrategy);\n    }\n    await consumer.onDestroy();\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: BitId[],\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(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unmergedMessage && !c.unmergedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unmergedMessage 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      laneId: currentLaneId,\n      localLane: 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    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const 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.unmergedMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.unmergedMessage as string,\n        unchangedLegitimately: componentStatus.unmergedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unmergedMessage);\n    // do not use Promise.all for applyVersion. otherwise, it'll write all components in parallel,\n    // which can be an issue when some components are also dependencies of others\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated }) => {\n        const modelComponent = await consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n        });\n      }\n    );\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap();\n\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\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) {\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 } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n    }\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   * @param id\n   * @param localLane\n   * @param otherLaneName\n   * @param existingOnWorkspaceOnly\n   * @returns\n   */\n  async getComponentMergeStatus(\n    id: BitId, // the id.version is the version we want to merge to the current component\n    localLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLaneName: string, // the lane name we want to merged to our lane. (can be also \"main\").\n    options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ): Promise<ComponentMergeStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatus = { id };\n    const returnUnmerged = (msg: string, unmergedLegitimately = false) => {\n      componentStatus.unmergedMessage = msg;\n      componentStatus.unmergedLegitimately = unmergedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return returnUnmerged(\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n    if (unmerged) {\n      return returnUnmerged(\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (componentOnLane.isRemoved()) {\n      return returnUnmerged(`component has been removed`, true);\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (localLane) {\n        const idOnLane = localLane.getComponent(id);\n        if (!idOnLane) return null;\n        return idOnLane.id.changeVersion(idOnLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, remoteHead: otherLaneHead, throws: false });\n      return { currentComponent: null, componentFromModel: componentOnLane, id, mergeResults: null, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    const isModified = async () => {\n      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return false;\n      if (!existingBitMapId) return false;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      return options?.ignoreConfigChanges\n        ? consumer.isComponentSourceCodeModified(baseComponent, currentComponent)\n        : true;\n    };\n\n    const isComponentModified = await isModified();\n\n    if (isComponentModified) {\n      return returnUnmerged(`component is modified, please snap/tag it first`);\n    }\n    // @todo: is it needed?\n    // const laneHeadIsDifferentThanCheckedOut =\n    //   localLane && existingBitMapId?.version && modelComponent.laneHeadLocal?.toString() !== existingBitMapId?.version;\n    // const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(existingBitMapId.version) : null;\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      remoteHead: otherLaneHead,\n      // checkedOutLocalHead: localHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n          const divergeDataFromMain = await getDivergeData({\n            repo,\n            modelComponent,\n            remoteHead: mainHead,\n            checkedOutLocalHead: hashToCompare,\n            throws: false,\n          });\n          if (!divergeDataFromMain.err) return true;\n          return !(divergeDataFromMain.err instanceof NoCommonSnap);\n        };\n        const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n        const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n        if (!hasResolvedLocally && !hasResolvedRemotely) {\n          return returnUnmerged(\n            `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes, it was probably created in each lane separately`\n          );\n        }\n        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;\n        const resolvedRef = modelComponent.getRef(versionToSaveInLane as string);\n        if (!resolvedRef) throw new Error(`unable to get ref of \"${versionToSaveInLane}\" for \"${id.toString()}\"`);\n        if (options?.resolveUnrelated === 'theirs') {\n          // just override with the model data\n          return {\n            currentComponent,\n            componentFromModel: componentOnLane,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'theirs', head: resolvedRef },\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: { strategy: 'ours', head: resolvedRef },\n          };\n        }\n        throw new Error(\n          `unsupported strategy \"${options?.resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n        );\n      }\n      return returnUnmerged(\n        `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnUnmerged(`component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          currentComponent,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnUnmerged(`component ${currentComponent.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const currentLaneName = localLane?.toLaneId().toString() || 'main';\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent,\n      currentLabel: `${currentId.version} (${currentLaneName})`,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n  }): Promise<ApplyVersionResult> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      head: remoteHead,\n      remote: laneId.scope, // @todo: remove. it has been deprecated around 0.0.832\n      lane: laneId.name, // @todo: remove. it has been deprecated around 0.0.832\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = () => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated?.head) throw new Error('resolvedUnrelated must have head prop');\n      localLane.addComponent({ id, head: resolvedUnrelated.head });\n      const head = modelComponent.getRef(currentComponent.id.version as string);\n      if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);\n      unmergedComponent.laneId = localLane.toLaneId();\n      unmergedComponent.head = head;\n      unmergedComponent.unrelated = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\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      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { id, filesStatus };\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 componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);\n    const files = componentWithDependencies.component.files;\n    files.forEach((file) => {\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.updated;\n    });\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: false,\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n    });\n    await manyComponentsWriter.writeAll();\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      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\n      localLane.addComponent({ id, head: 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      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.fullName));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids.map((id) => id._legacy)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: BitId[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = 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.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          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] }> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = BitIds.fromArray(unmergedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(idsToTag: BitId[], tagMessage: string, build: boolean): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id.fullName);\n        if (!entry) {\n          throw new GeneralError(`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 GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromLegacy(new BitId(u.id)));\n  }\n\n  private getComponentsToMerge(consumer: Consumer, ids: string[]): BitId[] {\n    if (hasWildcard(ids)) {\n      const componentsList = new ComponentsList(consumer);\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [CLIAspect, WorkspaceAspect, SnappingAspect, CheckoutAspect, InstallAspect, LoggerAspect];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger);\n    cli.register(new MergeCmd(merging));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.186",
+  "version": "0.0.187",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.186"
+    "version": "0.0.187"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -18,13 +18,13 @@
     "@teambit/harmony": "0.3.3",
     "@teambit/bit-error": "0.0.400",
     "@teambit/cli": "0.0.582",
-    "@teambit/checkout": "0.0.40",
+    "@teambit/checkout": "0.0.41",
     "@teambit/component-id": "0.0.417",
     "@teambit/install": "0.0.19",
     "@teambit/lane-id": "0.0.100",
     "@teambit/logger": "0.0.675",
-    "@teambit/snapping": "0.0.186",
-    "@teambit/workspace": "0.0.871"
+    "@teambit/snapping": "0.0.187",
+    "@teambit/workspace": "0.0.872"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",