@teambit/merging 0.0.160 → 0.0.163

package/dist/merge-cmd.js

@@ -205,7 +205,7 @@ once ready, snap/tag the components to complete the merge.`;
     })).join('\n');
 
     if (!body) {
-      return `${_chalk().default.bold(`the merge has been canceled on ${failedComponents.length} component(s) legitimately`)}
+      return `${_chalk().default.bold(`\nthe merge has been canceled 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","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"],"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    }: 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      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  version,\n  mergeSnapResults,\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 (!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(`the 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  return getSuccessOutput() + getFailureOutput() + getSnapsOutput() + getConflictSummary();\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","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"],"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    }: 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      verbose,\n    });\n  }\n}\n\nexport function mergeReport({\n  components,\n  failedComponents,\n  version,\n  mergeSnapResults,\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 (!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  return getSuccessOutput() + getFailureOutput() + getSnapsOutput() + getConflictSummary();\n}\n"],"mappings":"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"}

package/dist/merging.main.runtime.d.ts

@@ -6,10 +6,16 @@ import { SnappingMain } from '@teambit/snapping';
 import { BitId } from '@teambit/legacy/dist/bit-id';
 import { LaneId } from '@teambit/lane-id';
 import { Lane, Version } from '@teambit/legacy/dist/scope/models';
+import { Ref } from '@teambit/legacy/dist/scope/objects';
 import ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';
 import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
 import { CheckoutMain } from '@teambit/checkout';
 import { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';
+import { InstallMain } from '@teambit/install';
+declare type ResolveUnrelatedData = {
+    strategy: MergeStrategy;
+    head: Ref;
+};
 export declare type ComponentMergeStatus = {
     currentComponent?: ConsumerComponent | null;
     componentFromModel?: Version;
@@ -18,14 +24,15 @@ export declare type ComponentMergeStatus = {
     unmergedLegitimately?: boolean;
     mergeResults?: MergeResultsThreeWay | null;
     divergeData?: DivergeData;
-    resolvedUnrelated?: MergeStrategy;
+    resolvedUnrelated?: ResolveUnrelatedData;
 };
 export declare class MergingMain {
     private workspace;
+    private install;
     private snapping;
     private checkout;
     private consumer;
-    constructor(workspace: Workspace, snapping: SnappingMain, checkout: CheckoutMain);
+    constructor(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain);
     /**
      * merge components according to the "values" param.
      * if the first param is a version, then merge the component ids to that version.
@@ -78,5 +85,12 @@ export declare class MergingMain {
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([cli, workspace, snapping, checkout]: [CLIMain, Workspace, SnappingMain, CheckoutMain]): Promise<MergingMain>;
+    static provider([cli, workspace, snapping, checkout, install]: [
+        CLIMain,
+        Workspace,
+        SnappingMain,
+        CheckoutMain,
+        InstallMain
+    ]): Promise<MergingMain>;
 }
+export {};

package/dist/merging.main.runtime.js

@@ -271,6 +271,16 @@ function _componentId() {
   return data;
 }
 
+function _install() {
+  const data = require("@teambit/install");
+
+  _install = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _mergeCmd() {
   const data = require("./merge-cmd");
 
@@ -296,10 +306,11 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 class MergingMain {
-  constructor(workspace, snapping, checkout) {
+  constructor(workspace, install, snapping, checkout) {
     var _this$workspace;
 
     this.workspace = workspace;
+    this.install = install;
     this.snapping = snapping;
     this.checkout = checkout;
     (0, _defineProperty2().default)(this, "consumer", void 0);
@@ -419,7 +430,7 @@ class MergingMain {
     const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';
 
     if (!skipDependencyInstallation && !leftUnresolvedConflicts) {
-      await this.workspace.install(undefined, {
+      await this.install.install(undefined, {
         dedupe: true,
         updateExisting: false,
         import: false
@@ -557,7 +568,20 @@ class MergingMain {
     const divergeData = await (0, _getDivergeData().getDivergeData)(repo, modelComponent, otherLaneHead, localHead, false);
 
     if (divergeData.err) {
-      if (divergeData.err instanceof _noCommonSnap().NoCommonSnap && options !== null && options !== void 0 && options.resolveUnrelated) {
+      const mainHead = modelComponent.head;
+
+      if (divergeData.err instanceof _noCommonSnap().NoCommonSnap && options !== null && options !== void 0 && options.resolveUnrelated && mainHead) {
+        const hasResolvedLocally = divergeData.snapsOnLocalOnly.find(snap => mainHead.isEqual(snap));
+        const hasResolvedRemotely = divergeData.snapsOnRemoteOnly.find(snap => mainHead.isEqual(snap));
+
+        if (!hasResolvedLocally && !hasResolvedRemotely) {
+          return returnUnmerged(`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`);
+        }
+
+        const versionToSaveInLane = hasResolvedLocally ? currentComponent.id.version : id.version;
+        const resolvedRef = modelComponent.getRef(versionToSaveInLane);
+        if (!resolvedRef) throw new Error(`unable to get ref of "${versionToSaveInLane}" for "${id.toString()}"`);
+
         if ((options === null || options === void 0 ? void 0 : options.resolveUnrelated) === 'theirs') {
           // just override with the model data
           return {
@@ -566,7 +590,10 @@ class MergingMain {
             id,
             mergeResults: null,
             divergeData,
-            resolvedUnrelated: 'theirs'
+            resolvedUnrelated: {
+              strategy: 'theirs',
+              head: resolvedRef
+            }
           };
         }
 
@@ -576,7 +603,10 @@ class MergingMain {
             id,
             mergeResults: null,
             divergeData,
-            resolvedUnrelated: 'ours'
+            resolvedUnrelated: {
+              strategy: 'ours',
+              head: resolvedRef
+            }
           };
         }
 
@@ -659,6 +689,11 @@ class MergingMain {
     const handleResolveUnrelated = () => {
       if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');
       if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');
+      if (!(resolvedUnrelated !== null && resolvedUnrelated !== void 0 && resolvedUnrelated.head)) throw new Error('resolvedUnrelated must have head prop');
+      localLane.addComponent({
+        id,
+        head: resolvedUnrelated.head
+      });
       const head = modelComponent.getRef(currentComponent.id.version);
       if (!head) throw new Error(`unable to get the head for resolved-unrelated ${id.toString()}`);
       unmergedComponent.laneId = localLane.toLaneId();
@@ -687,12 +722,8 @@ class MergingMain {
       };
     }
 
-    if (resolvedUnrelated && resolvedUnrelated === 'ours') {
+    if ((resolvedUnrelated === null || resolvedUnrelated === void 0 ? void 0 : resolvedUnrelated.strategy) === 'ours') {
       markAllFilesAsUnchanged();
-      localLane === null || localLane === void 0 ? void 0 : localLane.addComponent({
-        id,
-        head: remoteHead
-      });
       return handleResolveUnrelated();
     }
 
@@ -738,15 +769,15 @@ class MergingMain {
 
       consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);
     } else if (localLane) {
-      localLane.addComponent({
-        id,
-        head: remoteHead
-      });
-
       if (resolvedUnrelated) {
         // must be "theirs"
         return handleResolveUnrelated();
       }
+
+      localLane.addComponent({
+        id,
+        head: remoteHead
+      });
     } else {
       // this is main
       modelComponent.setHead(remoteHead); // mark it as local, otherwise, when importing this component from a remote, it'll override it.
@@ -855,8 +886,8 @@ class MergingMain {
     return ids.map(id => consumer.getParsedId(id));
   }
 
-  static async provider([cli, workspace, snapping, checkout]) {
-    const merging = new MergingMain(workspace, snapping, checkout);
+  static async provider([cli, workspace, snapping, checkout, install]) {
+    const merging = new MergingMain(workspace, install, snapping, checkout);
     cli.register(new (_mergeCmd().MergeCmd)(merging));
     return merging;
   }
@@ -865,7 +896,7 @@ class MergingMain {
 
 exports.MergingMain = MergingMain;
 (0, _defineProperty2().default)(MergingMain, "slots", []);
-(0, _defineProperty2().default)(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect]);
+(0, _defineProperty2().default)(MergingMain, "dependencies", [_cli().CLIAspect, _workspace().default, _snapping().default, _checkout().CheckoutAspect, _install().InstallAspect]);
 (0, _defineProperty2().default)(MergingMain, "runtime", _cli().MainRuntime);
 
 _merging().MergingAspect.addRuntime(MergingMain);

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

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","snapping","checkout","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","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","install","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","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","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","err","NoCommonSnap","resolveUnrelated","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","otherComponent","currentLaneName","toLaneId","threeWayMerge","otherLabel","currentLabel","filesStatus","unmergedComponent","remote","lane","handleResolveUnrelated","unrelated","addEntry","markAllFilesAsUnchanged","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","addComponent","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writePackageJson","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","results","reset","removeComponent","fullName","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","logger","debug","r","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","MainRuntime","MergingAspect","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 logger from '@teambit/legacy/dist/logger/logger';\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 { 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 { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\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?: MergeStrategy;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(private workspace: Workspace, private snapping: SnappingMain, private checkout: CheckoutMain) {\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    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: 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    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      await this.workspace.install(undefined, {\n        dedupe: true,\n        updateExisting: false,\n        import: false,\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    // 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    const mergeSnapResults =\n      noSnap || leftUnresolvedConflicts ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\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, otherLaneHead, null, 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(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated) {\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: 'theirs',\n          };\n        }\n        if (options?.resolveUnrelated === 'ours') {\n          return {\n            currentComponent,\n            id,\n            mergeResults: null,\n            divergeData,\n            resolvedUnrelated: 'ours',\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?: MergeStrategy;\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      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 && resolvedUnrelated === 'ours') {\n      markAllFilesAsUnchanged();\n      localLane?.addComponent({ id, head: remoteHead });\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      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson: false,\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      localLane.addComponent({ id, head: remoteHead });\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated();\n      }\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    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 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];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout]: [CLIMain, Workspace, SnappingMain, CheckoutMain]) {\n    const merging = new MergingMain(workspace, snapping, checkout);\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","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","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","failureMessage","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","currentComponent","resolvedUnrelated","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","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","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isModified","componentModificationStatus","getComponentStatusById","modified","baseComponent","ignoreConfigChanges","isComponentSourceCodeModified","isComponentModified","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","Error","err","mainHead","NoCommonSnap","resolveUnrelated","hasResolvedLocally","snapsOnLocalOnly","snap","isEqual","hasResolvedRemotely","snapsOnRemoteOnly","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","writeDists","writePackageJson","writeAll","manual","unmergedPaths","f","conflict","filePath","setHead","markVersionAsLocal","getIdsForUnmerged","results","reset","removeComponent","fullName","abortedComponents","snappedComponents","legacyBitIds","BitIds","fromArray","_legacy","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","clear","getComponents","logger","debug","r","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","MainRuntime","MergingAspect","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 logger from '@teambit/legacy/dist/logger/logger';\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 { 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 { 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  ) {\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    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: 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    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts) {\n      await this.install.install(undefined, {\n        dedupe: true,\n        updateExisting: false,\n        import: false,\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    // 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    const mergeSnapResults =\n      noSnap || leftUnresolvedConflicts ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n    return {\n      components: componentsResults,\n      failedComponents,\n      mergeSnapResults,\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, otherLaneHead, null, 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(repo, modelComponent, otherLaneHead, localHead, false);\n    if (divergeData.err) {\n      const mainHead = modelComponent.head;\n      if (divergeData.err instanceof NoCommonSnap && options?.resolveUnrelated && mainHead) {\n        const hasResolvedLocally = divergeData.snapsOnLocalOnly.find((snap) => mainHead.isEqual(snap));\n        const hasResolvedRemotely = divergeData.snapsOnRemoteOnly.find((snap) => mainHead.isEqual(snap));\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      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson: false,\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    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 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];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain\n  ]) {\n    const merging = new MergingMain(workspace, install, snapping, checkout);\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.160",
+  "version": "0.0.163",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.160"
+    "version": "0.0.163"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -16,13 +16,14 @@
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
     "@teambit/bit-error": "0.0.400",
-    "@teambit/cli": "0.0.564",
+    "@teambit/cli": "0.0.566",
     "@teambit/harmony": "0.3.3",
-    "@teambit/checkout": "0.0.14",
+    "@teambit/checkout": "0.0.17",
     "@teambit/component-id": "0.0.417",
-    "@teambit/lane-id": "0.0.83",
-    "@teambit/snapping": "0.0.160",
-    "@teambit/workspace": "0.0.845"
+    "@teambit/install": "0.0.3",
+    "@teambit/lane-id": "0.0.85",
+    "@teambit/snapping": "0.0.163",
+    "@teambit/workspace": "0.0.848"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -34,7 +35,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.345",
+    "@teambit/legacy": "1.0.347",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },