@teambit/merging 1.0.549 → 1.0.551

package/dist/merge-status-provider.d.ts

@@ -13,6 +13,13 @@ export type MergeStatusProviderOptions = {
     shouldSquash?: boolean;
     handleTargetAheadAsDiverged?: boolean;
     detachHead?: boolean;
+    shouldMergeAspectsData?: boolean;
+};
+type ConflictedDataAspects = {
+    [extId: string]: string;
+};
+export type DataMergeResult = {
+    conflictedAspects?: ConflictedDataAspects;
 };
 export declare const compIsAlreadyMergedMsg = "component is already merged";
 export declare class MergeStatusProvider {
@@ -27,7 +34,9 @@ export declare class MergeStatusProvider {
     otherLane?: Lane | undefined);
     getStatus(bitIds: ComponentID[]): Promise<ComponentMergeStatus[]>;
     private getComponentMergeStatus;
+    private mergeExtensionsData;
     private returnUnmerged;
     private getComponentStatusBeforeMergeAttempt;
     private handleNoCommonSnap;
 }
+export {};

package/dist/merge-status-provider.js

@@ -60,12 +60,28 @@ function _mergeVersion() {
   };
   return data;
 }
+function _dependencyResolver() {
+  const data = require("@teambit/dependency-resolver");
+  _dependencyResolver = function () {
+    return data;
+  };
+  return data;
+}
+function _builder() {
+  const data = require("@teambit/builder");
+  _builder = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+// extId => reason
+
 const compIsAlreadyMergedMsg = exports.compIsAlreadyMergedMsg = 'component is already merged';
 class MergeStatusProvider {
   constructor(scope, logger, importer, options, workspace, currentLane,
@@ -155,6 +171,7 @@ other:   ${otherLaneHead.toString()}`);
     const workspaceIds = this.workspace?.listIds() || this.currentLane?.toComponentIds() || [];
     const configMerger = new (_configMerger().ComponentConfigMerger)(id.toStringWithoutVersion(), workspaceIds, this.otherLane, currentComponent.extensions, baseComponent.extensions, otherComponent.extensions, currentLabel, otherLabel, this.logger, this.options.mergeStrategy);
     const configMergeResult = configMerger.merge();
+    const dataMergeResult = this.mergeExtensionsData(currentComponent.extensions, baseComponent.extensions, otherComponent.extensions);
     const mergeResults = await (0, _mergeVersion().threeWayMerge)({
       scope: this.scope.legacyScope,
       otherComponent,
@@ -168,7 +185,59 @@ other:   ${otherLaneHead.toString()}`);
       id,
       mergeResults,
       divergeData,
-      configMergeResult
+      configMergeResult,
+      dataMergeResult
+    };
+  }
+  mergeExtensionsData(currentExtensions, baseExtensions, otherExtensions) {
+    if (!this.options.shouldMergeAspectsData) {
+      return {};
+    }
+    const conflictedAspects = {}; // extId => reason
+    // these aspects handled separately
+    const aspectsToSkip = [_dependencyResolver().DependencyResolverAspect.id, _builder().BuilderAspect.id];
+    currentExtensions.forEach(currentExtension => {
+      if (aspectsToSkip.includes(currentExtension.stringId)) {
+        return;
+      }
+      const baseExtension = baseExtensions.findExtension(currentExtension.idWithoutVersion, true);
+      const otherExtension = otherExtensions.findExtension(currentExtension.idWithoutVersion, true);
+      if (!otherExtension) {
+        conflictedAspects[currentExtension.stringId] = 'missing in other';
+        return;
+      }
+      // check whether the version is different.
+      if (currentExtension.extensionId?.version !== otherExtension.extensionId?.version) {
+        if (baseExtension?.extensionId?.version === otherExtension.extensionId?.version) {
+          // ext version has changed in current. we're good.
+          return;
+        }
+        conflictedAspects[currentExtension.stringId] = `version changed. base: ${baseExtension?.extensionId?.version}, other: ${otherExtension.extensionId?.version}`;
+        return;
+      }
+      if ((0, _lodash().isEqual)(currentExtension.data, otherExtension.data)) return;
+      if (!baseExtension) {
+        conflictedAspects[currentExtension.stringId] = 'no base-version. conflicted in data';
+        return;
+      }
+      if ((0, _lodash().isEqual)(baseExtension.data, otherExtension.data)) {
+        return; // changed in current. leave it.
+      }
+      if ((0, _lodash().isEqual)(baseExtension.data, currentExtension.data)) {
+        // changed in other. copy it.
+        currentExtension.data = otherExtension.data;
+        return;
+      }
+      // changed in both. conflict.
+      conflictedAspects[currentExtension.stringId] = 'conflicted in data since base-version';
+    });
+    otherExtensions.forEach(otherExtension => {
+      if (!currentExtensions.findExtension(otherExtension.idWithoutVersion, true)) {
+        conflictedAspects[otherExtension.stringId] = 'missing in current';
+      }
+    });
+    return {
+      conflictedAspects
     };
   }
   returnUnmerged(id, msg, unmergedLegitimately = false) {

package/dist/merge-status-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_component","_legacy","_lodash","_configMerger","_mergeVersion","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","compIsAlreadyMergedMsg","exports","MergeStatusProvider","constructor","scope","logger","importer","options","workspace","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","legacyScope","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","toComponentIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","consumer","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","head","shouldBeRemoved","getCurrentId","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","componentMap","getComponentIfExist","isLocallyRemoved","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","undefined","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","sourceHead","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","detachHead","commonSnapId","commonSnapComp","isDiverged","isSourceAhead","handleTargetAheadAsDiverged","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData, SnapsDistance } from '@teambit/component.snap-distance';\nimport { Lane, ModelComponent, Version, Ref } from '@teambit/objects';\nimport { NoCommonSnap, Tmp } from '@teambit/legacy.scope';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ScopeMain } from '@teambit/scope';\nimport { threeWayMerge, MergeStrategy } from './merge-version';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  mergeStrategy: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n  handleTargetAheadAsDiverged?: boolean;\n  detachHead?: boolean;\n};\n\nexport const compIsAlreadyMergedMsg = 'component is already merged';\nexport class MergeStatusProvider {\n  constructor(\n    private scope: ScopeMain,\n    private logger: Logger,\n    private importer: ImporterMain,\n    private options: MergeStatusProviderOptions,\n    private workspace?: Workspace,\n    private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n    private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n  ) {}\n\n  async getStatus(\n    bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      (!this.currentLane || // on main. we need all history in order to push each component to its remote\n        this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.scope.legacyScope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentMergeStatus(\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const repo = this.scope.legacyScope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as unknown as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n    const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = this.workspace?.listIds() || this.currentLane?.toComponentIds() || [];\n    const configMerger = new ComponentConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      this.otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger,\n      this.options.mergeStrategy\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      scope: this.scope.legacyScope,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return {\n      currentComponent,\n      id,\n      mergeResults,\n      divergeData,\n      configMergeResult,\n    };\n  }\n\n  private returnUnmerged(\n    id: ComponentID,\n    msg: string,\n    unmergedLegitimately = false\n  ): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unchangedMessage = msg;\n    componentStatus.unchangedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  // eslint-disable-next-line complexity\n  private async getComponentStatusBeforeMergeAttempt(\n    id: ComponentID // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace?.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return this.returnUnmerged(\n        id,\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 = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);\n    if (unmerged) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n      );\n    }\n    const repo = this.scope.legacyScope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);\n    const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n    if (componentOnOther.isRemoved()) {\n      // if exist in current lane, we want the current lane to get the soft-remove update.\n      // or if it was removed with --update-main, we want to merge it so then main will get the update.\n      // (unless this component does not exist on main, in which case, we don't want to merge it).\n      const shouldMerge = idOnCurrentLane || (componentOnOther.shouldRemoveFromMain() && modelComponent.head);\n      if (shouldMerge) {\n        // remove the component from the workspace if exist.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n        // on lane, if it's not part of the current lane, don't merge it.\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (this.currentLane) {\n        if (!idOnCurrentLane) return null;\n        return idOnCurrentLane.id.changeVersion(idOnCurrentLane.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, targetHead: otherLaneHead, throws: false });\n      return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n    }\n    const componentMap = consumer?.bitMap.getComponentIfExist(currentId, { ignoreVersion: true });\n    const isLocallyRemoved = componentMap?.isRemoved();\n    if (isLocallyRemoved) {\n      return this.returnUnmerged(\n        id,\n        `component is locally deleted, please snap and export first or undo by bit recover`\n      );\n    }\n    const getCurrentComponent = () => {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n      if (existingBitMapId) return consumer!.loadComponent(existingBitMapId);\n      return this.scope.legacyScope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.isRemoved()) {\n      // we have a few options:\n      // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n      // this lane. (even when main is ahead, we don't want to merge it).\n      // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // option #2 and #3 above\n        : true; // it's main. option #1 above.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      if (!consumer || !this.workspace) return undefined;\n      const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return undefined;\n      if (!existingBitMapId) return undefined;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n      if (isSourceCodeModified) return 'code';\n      return 'config';\n    };\n\n    const modifiedType = await isModified();\n    if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n      return this.returnUnmerged(\n        id,\n        `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n      );\n    }\n    if (modifiedType === 'code') {\n      return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n    }\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      sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version as string), // not sure if needs to check for this.workspace\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (this.options.detachHead && divergeData.commonSnapBeforeDiverge) {\n      // just override with the model data\n      const commonSnapId = id.changeVersion(divergeData.commonSnapBeforeDiverge.toString());\n      const commonSnapComp = await this.scope.legacyScope.getConsumerComponent(commonSnapId);\n      return {\n        ...componentStatus,\n        currentComponent: commonSnapComp,\n        componentFromModel: componentOnOther,\n        divergeData,\n      };\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // component is ahead nothing to merge.\n        return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n      }\n      if (!divergeData.isTargetAhead()) {\n        // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n        return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n      }\n      // target is ahead.\n      if (!this.options.handleTargetAheadAsDiverged || !divergeData.commonSnapBeforeDiverge) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // target is ahead and we want to treat it as diverged, continue.\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n\n    return { ...componentStatus, currentComponent, mergeProps, divergeData };\n  }\n\n  private async handleNoCommonSnap(\n    modelComponent: ModelComponent,\n    id: ComponentID,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const repo = this.scope.legacyScope.objects;\n    const mainHead = modelComponent.head;\n\n    const returnAccordingToOurs = (\n      headToSaveInLane: Ref,\n      unrelatedHead: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      return {\n        currentComponent,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'ours',\n          headOnCurrentLane: headToSaveInLane,\n          unrelatedHead,\n          unrelatedLaneId,\n        },\n      };\n    };\n    const returnAccordingToTheirs = (\n      resolvedRef: Ref,\n      unrelatedHeadRef: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      // just override with the model data\n      return {\n        currentComponent,\n        componentFromModel: componentOnOther,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'theirs',\n          headOnCurrentLane: resolvedRef,\n          unrelatedHead: unrelatedHeadRef,\n          unrelatedLaneId,\n        },\n      };\n    };\n\n    const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n    if (!currentVersionRef)\n      throw new Error(\n        `handleNoCommonSnap, unable to get ref of current version \"${\n          currentComponent.id.version\n        }\" for \"${id.toString()}\"`\n      );\n    const otherVersionRef = modelComponent.getRef(id.version as string);\n    if (!otherVersionRef)\n      throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n    if (mainHead) {\n      const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n        const divergeDataFromMain = await getDivergeData({\n          repo,\n          modelComponent,\n          sourceHead: hashToCompare,\n          targetHead: mainHead,\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 this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n        );\n      }\n      const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n      const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n      if (resolveUnrelated === 'ours') {\n        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      if (resolveUnrelated === 'theirs') {\n        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      throw new Error(\n        `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n      );\n    }\n\n    const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n    const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n    if (resolveUnrelated === 'ours') {\n      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n    }\n    if (resolveUnrelated === 'theirs') {\n      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n    }\n    throw new Error(\n      `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n    );\n  }\n}\n"],"mappings":";;;;;;AACA,SAAAA,YAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,WAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,aAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,YAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,QAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,OAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,WAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,UAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAM,QAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,OAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAO,QAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,OAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAQ,cAAA;EAAA,MAAAR,IAAA,GAAAE,OAAA;EAAAM,aAAA,YAAAA,CAAA;IAAA,OAAAR,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAS,cAAA;EAAA,MAAAT,IAAA,GAAAE,OAAA;EAAAO,aAAA,YAAAA,CAAA;IAAA,OAAAT,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA+D,SAAAC,uBAAAS,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,QAAAH,CAAA,EAAAI,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAP,CAAA,OAAAM,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAR,CAAA,GAAAI,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAX,CAAA,EAAAI,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAf,CAAA,aAAAI,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAD,OAAA,CAAAG,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,IAAAe,eAAA,CAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAArB,CAAA,EAAAM,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAF,OAAA,CAAAG,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAJ,CAAA;AAAA,SAAAmB,gBAAAnB,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAmB,cAAA,CAAAnB,CAAA,MAAAJ,CAAA,GAAAM,MAAA,CAAAgB,cAAA,CAAAtB,CAAA,EAAAI,CAAA,IAAAoB,KAAA,EAAAnB,CAAA,EAAAO,UAAA,MAAAa,YAAA,MAAAC,QAAA,UAAA1B,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAuB,eAAAlB,CAAA,QAAAsB,CAAA,GAAAC,YAAA,CAAAvB,CAAA,uCAAAsB,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAvB,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAwB,MAAA,CAAAC,WAAA,kBAAA9B,CAAA,QAAA2B,CAAA,GAAA3B,CAAA,CAAA+B,IAAA,CAAA1B,CAAA,EAAAD,CAAA,uCAAAuB,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAA5B,CAAA,GAAA6B,MAAA,GAAAC,MAAA,EAAA7B,CAAA;AAYxD,MAAM8B,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAG,6BAA6B;AAC5D,MAAME,mBAAmB,CAAC;EAC/BC,WAAWA,CACDC,KAAgB,EAChBC,MAAc,EACdC,QAAsB,EACtBC,OAAmC,EACnCC,SAAqB,EACrBC,WAAkB;EAAE;EACpBC,SAAgB,CAAC;EAAA,EACzB;IAAA,KAPQN,KAAgB,GAAhBA,KAAgB;IAAA,KAChBC,MAAc,GAAdA,MAAc;IAAA,KACdC,QAAsB,GAAtBA,QAAsB;IAAA,KACtBC,OAAmC,GAAnCA,OAAmC;IAAA,KACnCC,SAAqB,GAArBA,SAAqB;IAAA,KACrBC,WAAkB,GAAlBA,WAAkB;IAAA,KAClBC,SAAgB,GAAhBA,SAAgB;EACvB;EAEH,MAAMC,SAASA,CACbC,MAAqB,EACY;IACjC,IAAI,CAAC,IAAI,CAACH,WAAW,IAAI,IAAI,CAACC,SAAS,EAAE;MACvC,MAAM,IAAI,CAACJ,QAAQ,CAACO,4BAA4B,CAAC,IAAI,CAACH,SAAS,CAACI,QAAQ,CAAC,CAAC,CAACC,eAAe,CAAC,CAAC,CAAC;IAC/F;IACA,MAAMC,iCAAiC,GAAG,MAAM,IAAAC,qBAAS,EAACL,MAAM,EAAGM,EAAE,IACnE,IAAI,CAACC,oCAAoC,CAACD,EAAE,CAC9C,CAAC;IACD;IACA;IACA,MAAME,8BAA8B,GAClC,CAAC,IAAI,CAACb,OAAO,EAAEc,YAAY;IAAI;IAC9B,CAAC,IAAI,CAACZ,WAAW;IAAI;IACpB,IAAI,CAACA,WAAW,CAACL,KAAK,KAAK,IAAI,CAACM,SAAS,EAAEN,KAAK,CAAC,CAAC,CAAC;IACvD,MAAMkB,QAAQ,GAAGN,iCAAiC,CAC/CO,GAAG,CAAEC,UAAU,IAAK;MACnB,IAAI,CAACA,UAAU,CAACC,WAAW,EAAE,OAAO,EAAE;MACtC,MAAMC,gBAAgB,GAAG,CAACF,UAAU,CAACC,WAAW,CAACE,uBAAuB,CAAC;MACzE,IAAIP,8BAA8B,EAAE;QAClCM,gBAAgB,CAAChD,IAAI,CAAC,GAAG8C,UAAU,CAACC,WAAW,CAACG,iBAAiB,CAAC;MACpE;MACA,OAAO,IAAAC,iBAAO,EAACH,gBAAgB,CAAC,CAACH,GAAG,CAAEO,CAAC,IAAKN,UAAU,CAACN,EAAE,CAACa,aAAa,CAACD,CAAC,CAACE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxF,CAAC,CAAC,CACDC,IAAI,CAAC,CAAC;IACT,MAAMC,MAAM,GAAGd,8BAA8B,GACzC,+DAA+D,IAAI,CAACV,SAAS,EAAEQ,EAAE,CAAC,CAAC,IAAI,MAAM,EAAE,GAC/F,uCAAuC,IAAI,CAACT,WAAW,EAAES,EAAE,CAAC,CAAC,IAAI,MAAM,QAAQ,IAAI,CAACR,SAAS,EAAEQ,EAAE,CAAC,CAAC,IAAI,MAAM,EAAE;IACnH,MAAM,IAAI,CAACd,KAAK,CAAC+B,WAAW,CAACC,aAAa,CAACC,iBAAiB,CAACC,8BAAe,CAACC,SAAS,CAACjB,QAAQ,CAAC,EAAE;MAChGkB,IAAI,EAAE,IAAI,CAAC9B,SAAS;MACpB+B,KAAK,EAAE,IAAI;MACXC,qBAAqB,EAAE,KAAK;MAC5BR;IACF,CAAC,CAAC;IAEF,MAAMS,sBAAsB,GAAG3B,iCAAiC,CAACzC,MAAM,CACpEqE,CAAC,IAAK,CAACA,CAAC,CAACC,UACZ,CAA2B;IAC3B,MAAMC,mBAAmB,GAAG9B,iCAAiC,CAACzC,MAAM,CAAEqE,CAAC,IAAKA,CAAC,CAACC,UAAU,CAAC;IAEzF,MAAME,4BAA4B,GAAG,MAAAA,CAAA,KAA6C;MAChF,MAAMC,GAAG,GAAG,KAAIC,aAAG,EAAC,IAAI,CAAC7C,KAAK,CAAC+B,WAAW,CAAC;MAC3C,IAAI;QACF,MAAMe,gBAAgB,GAAG,MAAMC,OAAO,CAACC,GAAG,CACxCN,mBAAmB,CAACvB,GAAG,CAAEC,UAAU,IAAK,IAAI,CAAC6B,uBAAuB,CAAC7B,UAAU,CAAC,CAClF,CAAC;QACD,MAAMwB,GAAG,CAACM,KAAK,CAAC,CAAC;QACjB,OAAOJ,gBAAgB;MACzB,CAAC,CAAC,OAAOK,GAAQ,EAAE;QACjB,MAAMP,GAAG,CAACM,KAAK,CAAC,CAAC;QACjB,MAAMC,GAAG;MACX;IACF,CAAC;IACD,MAAMC,OAAO,GAAG,MAAMT,4BAA4B,CAAC,CAAC;IAEpDS,OAAO,CAAC9E,IAAI,CAAC,GAAGiE,sBAAsB,CAAC;IACvC,OAAOa,OAAO;EAChB;EAEA,MAAcH,uBAAuBA,CACnCI,sCAA8E,EAC9E;IACA,MAAM;MAAEvC,EAAE;MAAEO,WAAW;MAAEiC,gBAAgB;MAAEb;IAAW,CAAC,GAAGY,sCAAsC;IAChG,IAAI,CAACZ,UAAU,EAAE,MAAM,IAAIc,KAAK,CAAC,qDAAqDzC,EAAE,CAACc,QAAQ,CAAC,CAAC,EAAE,CAAC;IACtG,MAAM;MAAE4B,aAAa;MAAEC,SAAS;MAAEC;IAAe,CAAC,GAAGjB,UAAU;IAC/D,MAAMkB,IAAI,GAAG,IAAI,CAAC3D,KAAK,CAAC+B,WAAW,CAAC6B,OAAO;IAC3C,IAAI,CAACvC,WAAW,EAAE,MAAM,IAAIkC,KAAK,CAAC,sDAAsDzC,EAAE,CAACc,QAAQ,CAAC,CAAC,EAAE,CAAC;IACxG,IAAI,CAAC0B,gBAAgB,EAAE,MAAM,IAAIC,KAAK,CAAC,2DAA2DzC,EAAE,CAACc,QAAQ,CAAC,CAAC,EAAE,CAAC;IAElH,MAAMiC,QAAQ,GAAGxC,WAAW,CAACE,uBAAyC,CAAC,CAAC;IACxE,IAAI,CAACtB,MAAM,CAAC6D,KAAK,CAAC;AACtB,WAAWhD,EAAE,CAACiD,sBAAsB,CAAC,CAAC;AACtC,WAAWF,QAAQ,CAACjC,QAAQ,CAAC,CAAC;AAC9B,WAAW6B,SAAS,CAACO,OAAO;AAC5B,WAAWR,aAAa,CAAC5B,QAAQ,CAAC,CAAC,EAAE,CAAC;IAClC,MAAMqC,aAAsB,GAAG,MAAMP,cAAc,CAACQ,WAAW,CAACL,QAAQ,CAACjC,QAAQ,CAAC,CAAC,EAAE+B,IAAI,CAAC;IAC1F,MAAMQ,cAAuB,GAAG,MAAMT,cAAc,CAACQ,WAAW,CAACV,aAAa,CAAC5B,QAAQ,CAAC,CAAC,EAAE+B,IAAI,CAAC;IAEhG,MAAMS,eAAe,GAAG,IAAI,CAAC/D,WAAW,EAAEgE,QAAQ,CAAC,CAAC,CAACzC,QAAQ,CAAC,CAAC,IAAI,MAAM;IACzE,MAAM0C,aAAa,GAAG,IAAI,CAAChE,SAAS,GAAG,IAAI,CAACA,SAAS,CAAC+D,QAAQ,CAAC,CAAC,CAACzC,QAAQ,CAAC,CAAC,GAAG2C,sBAAY;IAC1F,MAAMC,YAAY,GAAG,GAAGf,SAAS,CAACO,OAAO,KAAKI,eAAe,KAAKE,aAAa,GAAG,SAAS,GAAGF,eAAe,GAAG;IAChH,MAAMK,UAAU,GAAG,GAAGjB,aAAa,CAAC5B,QAAQ,CAAC,CAAC,KAC5C0C,aAAa,KAAKF,eAAe,GAAG,UAAU,GAAGE,aAAa,GAC7D;IACH,MAAMI,YAAY,GAAG,IAAI,CAACtE,SAAS,EAAEuE,OAAO,CAAC,CAAC,IAAI,IAAI,CAACtE,WAAW,EAAEuE,cAAc,CAAC,CAAC,IAAI,EAAE;IAC1F,MAAMC,YAAY,GAAG,KAAIC,qCAAqB,EAC5ChE,EAAE,CAACiD,sBAAsB,CAAC,CAAC,EAC3BW,YAAY,EACZ,IAAI,CAACpE,SAAS,EACdgD,gBAAgB,CAACyB,UAAU,EAC3Bd,aAAa,CAACc,UAAU,EACxBZ,cAAc,CAACY,UAAU,EACzBP,YAAY,EACZC,UAAU,EACV,IAAI,CAACxE,MAAM,EACX,IAAI,CAACE,OAAO,CAAC6E,aACf,CAAC;IACD,MAAMC,iBAAiB,GAAGJ,YAAY,CAACK,KAAK,CAAC,CAAC;IAE9C,MAAMC,YAAY,GAAG,MAAM,IAAAC,6BAAa,EAAC;MACvCpF,KAAK,EAAE,IAAI,CAACA,KAAK,CAAC+B,WAAW;MAC7BoC,cAAc;MACdM,UAAU;MACVnB,gBAAgB;MAChBkB,YAAY;MACZP;IACF,CAAC,CAAC;IACF,OAAO;MACLX,gBAAgB;MAChBxC,EAAE;MACFqE,YAAY;MACZ9D,WAAW;MACX4D;IACF,CAAC;EACH;EAEQI,cAAcA,CACpBvE,EAAe,EACfwE,GAAW,EACXC,oBAAoB,GAAG,KAAK,EACY;IACxC,MAAMC,eAAuD,GAAG;MAAE1E;IAAG,CAAC;IACtE0E,eAAe,CAACC,gBAAgB,GAAGH,GAAG;IACtCE,eAAe,CAACE,qBAAqB,GAAGH,oBAAoB;IAC5D,OAAOC,eAAe;EACxB;;EAEA;EACA,MAAczE,oCAAoCA,CAChDD,EAAe,EACkC;IACjD,MAAM6E,QAAQ,GAAG,IAAI,CAACvF,SAAS,EAAEuF,QAAQ;IACzC,MAAMH,eAAuD,GAAG;MAAE1E;IAAG,CAAC;IACtE,MAAM4C,cAAc,GAAG,MAAM,IAAI,CAAC1D,KAAK,CAAC+B,WAAW,CAAC6D,wBAAwB,CAAC9E,EAAE,CAAC;IAChF,IAAI,CAAC4C,cAAc,EAAE;MACnB,OAAO,IAAI,CAAC2B,cAAc,CACxBvE,EAAE,EACF,aAAaA,EAAE,CAACc,QAAQ,CAAC,CAAC,gFAC5B,CAAC;IACH;IACA,MAAMiE,QAAQ,GAAG,IAAI,CAAC7F,KAAK,CAAC+B,WAAW,CAAC6B,OAAO,CAACkC,kBAAkB,CAACC,QAAQ,CAACjF,EAAE,CAAC;IAC/E,IAAI+E,QAAQ,EAAE;MACZ,OAAO,IAAI,CAACR,cAAc,CACxBvE,EAAE,EACF,aAAaA,EAAE,CAACiD,sBAAsB,CAAC,CAAC,iIAC1C,CAAC;IACH;IACA,MAAMJ,IAAI,GAAG,IAAI,CAAC3D,KAAK,CAAC+B,WAAW,CAAC6B,OAAO;IAC3C,MAAMI,OAAO,GAAGlD,EAAE,CAACkD,OAAiB;IACpC,MAAMR,aAAa,GAAGE,cAAc,CAACsC,MAAM,CAAChC,OAAO,CAAC;IACpD,MAAMiC,gBAAgB,GAAGN,QAAQ,EAAEO,MAAM,CAACC,qBAAqB,CAACrF,EAAE,EAAE;MAAEsF,aAAa,EAAE;IAAK,CAAC,CAAC;IAC5F,MAAMC,gBAAyB,GAAG,MAAM3C,cAAc,CAACQ,WAAW,CAACF,OAAO,EAAE,IAAI,CAAChE,KAAK,CAAC+B,WAAW,CAAC6B,OAAO,CAAC;IAC3G,MAAM0C,eAAe,GAAG,IAAI,CAACjG,WAAW,EAAEkG,YAAY,CAACzF,EAAE,CAAC;IAE1D,IAAIuF,gBAAgB,CAACG,SAAS,CAAC,CAAC,EAAE;MAChC;MACA;MACA;MACA,MAAMC,WAAW,GAAGH,eAAe,IAAKD,gBAAgB,CAACK,oBAAoB,CAAC,CAAC,IAAIhD,cAAc,CAACiD,IAAK;MACvG,IAAIF,WAAW,EAAE;QACf;QACAjB,eAAe,CAACoB,eAAe,GAAG,IAAI;MACxC,CAAC,MAAM;QACL;QACA;QACA,OAAO,IAAI,CAACvB,cAAc,CAACvE,EAAE,EAAE,4BAA4B,EAAE,IAAI,CAAC;MACpE;IACF;IACA,MAAM+F,YAAY,GAAGA,CAAA,KAAM;MACzB,IAAIZ,gBAAgB,EAAE,OAAOA,gBAAgB;MAC7C,IAAI,IAAI,CAAC5F,WAAW,EAAE;QACpB,IAAI,CAACiG,eAAe,EAAE,OAAO,IAAI;QACjC,OAAOA,eAAe,CAACxF,EAAE,CAACa,aAAa,CAAC2E,eAAe,CAACK,IAAI,CAAC/E,QAAQ,CAAC,CAAC,CAAC;MAC1E;MACA;MACA,MAAM+E,IAAI,GAAGjD,cAAc,CAACoD,mBAAmB,CAAC,CAAC;MACjD,IAAIH,IAAI,EAAE;QACR,OAAO7F,EAAE,CAACa,aAAa,CAACgF,IAAI,CAAC;MAC/B;MACA,OAAO,IAAI;IACb,CAAC;IACD,MAAMlD,SAAS,GAAGoD,YAAY,CAAC,CAAC;IAChC,IAAI,CAACpD,SAAS,EAAE;MACd,MAAMpC,WAAW,GAAG,MAAM,IAAA0F,2BAAc,EAAC;QAAEpD,IAAI;QAAED,cAAc;QAAEsD,UAAU,EAAExD,aAAa;QAAEyD,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,OAAAzI,aAAA,CAAAA,aAAA,KAAYgH,eAAe;QAAE0B,kBAAkB,EAAEb,gBAAgB;QAAEhF;MAAW;IAChF;IACA,MAAM8F,YAAY,GAAGxB,QAAQ,EAAEO,MAAM,CAACkB,mBAAmB,CAAC3D,SAAS,EAAE;MAAE2C,aAAa,EAAE;IAAK,CAAC,CAAC;IAC7F,MAAMiB,gBAAgB,GAAGF,YAAY,EAAEX,SAAS,CAAC,CAAC;IAClD,IAAIa,gBAAgB,EAAE;MACpB,OAAO,IAAI,CAAChC,cAAc,CACxBvE,EAAE,EACF,mFACF,CAAC;IACH;IACA,MAAMwG,mBAAmB,GAAGA,CAAA,KAAM;MAChC;MACA,IAAIrB,gBAAgB,EAAE,OAAON,QAAQ,CAAE4B,aAAa,CAACtB,gBAAgB,CAAC;MACtE,OAAO,IAAI,CAACjG,KAAK,CAAC+B,WAAW,CAACyF,oBAAoB,CAAC/D,SAAS,CAAC;IAC/D,CAAC;IACD,MAAMH,gBAAgB,GAAG,MAAMgE,mBAAmB,CAAC,CAAC;IACpD,IAAIhE,gBAAgB,CAACkD,SAAS,CAAC,CAAC,EAAE;MAChC;MACA;MACA;MACA;MACA;MACA;MACA;MACA,MAAMnF,WAAW,GAAG,MAAM,IAAA0F,2BAAc,EAAC;QAAEpD,IAAI;QAAED,cAAc;QAAEsD,UAAU,EAAExD,aAAa;QAAEyD,MAAM,EAAE;MAAM,CAAC,CAAC;MAC5G,MAAMQ,gBAAgB,GAAG,CAACpG,WAAW,CAAC8B,GAAG,IAAI,CAAC9B,WAAW,CAACqG,aAAa,CAAC,CAAC;MACzE,MAAMC,YAAY,GAAG,IAAI,CAACrH,SAAS,GAC/BmH,gBAAgB,CAAC;MAAA,EACjB,IAAI,CAAC,CAAC;MACV,IAAIE,YAAY,EAAE;QAChB,OAAO,IAAI,CAACtC,cAAc,CAACvE,EAAE,EAAE,4BAA4B,EAAE,IAAI,CAAC;MACpE;IACF;IAEA,MAAM8G,UAAU,GAAG,MAAAA,CAAA,KAAoD;MACrE,IAAI,CAACjC,QAAQ,IAAI,CAAC,IAAI,CAACvF,SAAS,EAAE,OAAOyH,SAAS;MAClD,MAAMC,2BAA2B,GAAG,MAAM,IAAI,CAAC1H,SAAS,CAAC2H,sBAAsB,CAACzE,gBAAgB,CAACxC,EAAE,CAAC;MACpG,IAAI,CAACgH,2BAA2B,CAACE,QAAQ,EAAE,OAAOH,SAAS;MAC3D,IAAI,CAAC5B,gBAAgB,EAAE,OAAO4B,SAAS;MACvC,MAAM5D,aAAa,GAAG,MAAMP,cAAc,CAACQ,WAAW,CACpD+B,gBAAgB,CAACjC,OAAO,EACxB2B,QAAQ,CAAC3F,KAAK,CAAC4D,OACjB,CAAC;MACD,MAAMqE,oBAAoB,GAAG,MAAMtC,QAAQ,CAACuC,6BAA6B,CAACjE,aAAa,EAAEX,gBAAgB,CAAC;MAC1G,IAAI2E,oBAAoB,EAAE,OAAO,MAAM;MACvC,OAAO,QAAQ;IACjB,CAAC;IAED,MAAME,YAAY,GAAG,MAAMP,UAAU,CAAC,CAAC;IACvC,IAAIO,YAAY,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAChI,OAAO,EAAEiI,mBAAmB,EAAE;MACnE,OAAO,IAAI,CAAC/C,cAAc,CACxBvE,EAAE,EACF,mHACF,CAAC;IACH;IACA,IAAIqH,YAAY,KAAK,MAAM,EAAE;MAC3B,OAAO,IAAI,CAAC9C,cAAc,CAACvE,EAAE,EAAE,iDAAiD,CAAC;IACnF;IAEA,IAAI,CAAC0C,aAAa,EAAE;MAClB,MAAM,IAAID,KAAK,CAAC,kDAAkDS,OAAO,OAAOlD,EAAE,CAACc,QAAQ,CAAC,CAAC,EAAE,CAAC;IAClG;IACA,MAAMP,WAAW,GAAG,MAAM,IAAA0F,2BAAc,EAAC;MACvCpD,IAAI;MACJD,cAAc;MACd2E,UAAU,EAAE,IAAI,CAACjI,SAAS,GAAGyH,SAAS,GAAGnE,cAAc,CAACsC,MAAM,CAACvC,SAAS,CAACO,OAAiB,CAAC;MAAE;MAC7FgD,UAAU,EAAExD,aAAa;MACzByD,MAAM,EAAE;IACV,CAAC,CAAC;IACF,IAAI5F,WAAW,CAAC8B,GAAG,EAAE;MACnB,IAAI,EAAE9B,WAAW,CAAC8B,GAAG,YAAYmF,sBAAY,CAAC,IAAI,CAAC,IAAI,CAACnI,OAAO,EAAEoI,gBAAgB,EAAE;QACjF,OAAO,IAAI,CAAClD,cAAc,CAACvE,EAAE,EAAE,sCAAsCO,WAAW,CAAC8B,GAAG,CAACqF,OAAO,EAAE,CAAC;MACjG;MACA,OAAO,IAAI,CAACC,kBAAkB,CAC5B/E,cAAc,EACd5C,EAAE,EACF0C,aAAa,EACbF,gBAAgB,EAChB+C,gBAAgB,EAChBhF,WACF,CAAC;IACH;IACA,IAAI,IAAI,CAAClB,OAAO,CAACuI,UAAU,IAAIrH,WAAW,CAACE,uBAAuB,EAAE;MAClE;MACA,MAAMoH,YAAY,GAAG7H,EAAE,CAACa,aAAa,CAACN,WAAW,CAACE,uBAAuB,CAACK,QAAQ,CAAC,CAAC,CAAC;MACrF,MAAMgH,cAAc,GAAG,MAAM,IAAI,CAAC5I,KAAK,CAAC+B,WAAW,CAACyF,oBAAoB,CAACmB,YAAY,CAAC;MACtF,OAAAnK,aAAA,CAAAA,aAAA,KACKgH,eAAe;QAClBlC,gBAAgB,EAAEsF,cAAc;QAChC1B,kBAAkB,EAAEb,gBAAgB;QACpChF;MAAW;IAEf;IACA,IAAI,CAACA,WAAW,CAACwH,UAAU,CAAC,CAAC,EAAE;MAC7B,IAAIxH,WAAW,CAACyH,aAAa,CAAC,CAAC,EAAE;QAC/B;QACA,OAAO,IAAI,CAACzD,cAAc,CAACvE,EAAE,EAAElB,sBAAsB,EAAE,IAAI,CAAC;MAC9D;MACA,IAAI,CAACyB,WAAW,CAACqG,aAAa,CAAC,CAAC,EAAE;QAChC;QACA,OAAO,IAAI,CAACrC,cAAc,CAACvE,EAAE,EAAElB,sBAAsB,EAAE,IAAI,CAAC;MAC9D;MACA;MACA,IAAI,CAAC,IAAI,CAACO,OAAO,CAAC4I,2BAA2B,IAAI,CAAC1H,WAAW,CAACE,uBAAuB,EAAE;QACrF;QACA,OAAA/C,aAAA,CAAAA,aAAA,KACKgH,eAAe;UAClBlC,gBAAgB;UAChB4D,kBAAkB,EAAEb,gBAAgB;UACpChF;QAAW;MAEf;MACA;IACF;;IAEA;IACA,MAAMoB,UAAU,GAAG;MACjBe,aAAa;MACbC,SAAS;MACTC;IACF,CAAC;IAED,OAAAlF,aAAA,CAAAA,aAAA,KAAYgH,eAAe;MAAElC,gBAAgB;MAAEb,UAAU;MAAEpB;IAAW;EACxE;EAEA,MAAcoH,kBAAkBA,CAC9B/E,cAA8B,EAC9B5C,EAAe,EACf0C,aAAkB,EAClBF,gBAAmC,EACnC+C,gBAA0B,EAC1BhF,WAA2B,EACsB;IACjD,IAAI;MAAEkH;IAAiB,CAAC,GAAG,IAAI,CAACpI,OAAO,IAAI,CAAC,CAAC;IAC7C,IAAImD,gBAAgB,CAACkD,SAAS,CAAC,CAAC,EAAE;MAChC+B,gBAAgB,GAAG,QAAQ;IAC7B;IACA,IAAI,CAACA,gBAAgB,EAAE,MAAM,IAAIhF,KAAK,CAAC,uDAAuD,CAAC;IAC/F,MAAMI,IAAI,GAAG,IAAI,CAAC3D,KAAK,CAAC+B,WAAW,CAAC6B,OAAO;IAC3C,MAAMoF,QAAQ,GAAGtF,cAAc,CAACiD,IAAI;IAEpC,MAAMsC,qBAAqB,GAAGA,CAC5BC,gBAAqB,EACrBC,aAAkB,EAClBC,eAAuB,KACoB;MAC3C,OAAO;QACL9F,gBAAgB;QAChBxC,EAAE;QACFO,WAAW;QACXgI,iBAAiB,EAAE;UACjBC,QAAQ,EAAE,MAAM;UAChBC,iBAAiB,EAAEL,gBAAgB;UACnCC,aAAa;UACbC;QACF;MACF,CAAC;IACH,CAAC;IACD,MAAMI,uBAAuB,GAAGA,CAC9BC,WAAgB,EAChBC,gBAAqB,EACrBN,eAAuB,KACoB;MAC3C;MACA,OAAO;QACL9F,gBAAgB;QAChB4D,kBAAkB,EAAEb,gBAAgB;QACpCvF,EAAE;QACFO,WAAW;QACXgI,iBAAiB,EAAE;UACjBC,QAAQ,EAAE,QAAQ;UAClBC,iBAAiB,EAAEE,WAAW;UAC9BN,aAAa,EAAEO,gBAAgB;UAC/BN;QACF;MACF,CAAC;IACH,CAAC;IAED,MAAMO,iBAAiB,GAAGjG,cAAc,CAACsC,MAAM,CAAC1C,gBAAgB,CAACxC,EAAE,CAACkD,OAAiB,CAAC;IACtF,IAAI,CAAC2F,iBAAiB,EACpB,MAAM,IAAIpG,KAAK,CACb,6DACED,gBAAgB,CAACxC,EAAE,CAACkD,OAAO,UACnBlD,EAAE,CAACc,QAAQ,CAAC,CAAC,GACzB,CAAC;IACH,MAAMgI,eAAe,GAAGlG,cAAc,CAACsC,MAAM,CAAClF,EAAE,CAACkD,OAAiB,CAAC;IACnE,IAAI,CAAC4F,eAAe,EAClB,MAAM,IAAIrG,KAAK,CAAC,2DAA2DzC,EAAE,CAACkD,OAAO,UAAUlD,EAAE,CAACc,QAAQ,CAAC,CAAC,GAAG,CAAC;IAElH,IAAIoH,QAAQ,EAAE;MACZ,MAAMa,mBAAmB,GAAG,MAAOC,aAAyB,IAAK;QAC/D,MAAMC,mBAAmB,GAAG,MAAM,IAAAhD,2BAAc,EAAC;UAC/CpD,IAAI;UACJD,cAAc;UACd2E,UAAU,EAAEyB,aAAa;UACzB9C,UAAU,EAAEgC,QAAQ;UACpB/B,MAAM,EAAE;QACV,CAAC,CAAC;QACF,IAAI,CAAC8C,mBAAmB,CAAC5G,GAAG,EAAE,OAAO,IAAI;QACzC,OAAO,EAAE4G,mBAAmB,CAAC5G,GAAG,YAAYmF,sBAAY,CAAC;MAC3D,CAAC;MACD,MAAM0B,kBAAkB,GAAG,MAAMH,mBAAmB,CAACnG,cAAc,CAACuG,uBAAuB,CAAC,CAAQ,CAAC;MACrG,MAAMC,mBAAmB,GAAG,MAAML,mBAAmB,CAACrG,aAAa,CAAC;MACpE,IAAI,CAACwG,kBAAkB,IAAI,CAACE,mBAAmB,EAAE;QAC/C,OAAO,IAAI,CAAC7E,cAAc,CACxBvE,EAAE,EACF,sBAAsBwC,gBAAgB,CAACxC,EAAE,CAACc,QAAQ,CAAC,CAAC,2BAA2BoH,QAAQ,CAACpH,QAAQ,CAAC,CAAC;AAC5G,0HACQ,CAAC;MACH;MACA,MAAMuI,eAAe,GAAGH,kBAAkB,GAAGL,iBAAiB,GAAGC,eAAe;MAChF,MAAMF,gBAAgB,GAAGM,kBAAkB,GAAGJ,eAAe,GAAGD,iBAAiB;MACjF,IAAIpB,gBAAgB,KAAK,MAAM,EAAE;QAC/B,OAAOU,qBAAqB,CAACkB,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAACrJ,WAAW,EAAEgE,QAAQ,CAAC,CAAW,CAAC;MACzG;MACA,IAAIkE,gBAAgB,KAAK,QAAQ,EAAE;QACjC,OAAOiB,uBAAuB,CAACW,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAACrJ,WAAW,EAAEgE,QAAQ,CAAC,CAAW,CAAC;MAC3G;MACA,MAAM,IAAId,KAAK,CACb,yBAAyBgF,gBAAgB,kEAC3C,CAAC;IACH;IAEA,MAAM4B,eAAe,GAAG5B,gBAAgB,KAAK,MAAM,GAAGoB,iBAAiB,GAAGC,eAAe;IACzF,MAAMF,gBAAgB,GAAGnB,gBAAgB,KAAK,MAAM,GAAGqB,eAAe,GAAGD,iBAAiB;IAC1F,IAAIpB,gBAAgB,KAAK,MAAM,EAAE;MAC/B,OAAOU,qBAAqB,CAACkB,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAACpJ,SAAS,EAAE+D,QAAQ,CAAC,CAAW,CAAC;IACvG;IACA,IAAIkE,gBAAgB,KAAK,QAAQ,EAAE;MACjC,OAAOiB,uBAAuB,CAACW,eAAe,EAAET,gBAAgB,EAAE,IAAI,CAACrJ,WAAW,EAAEgE,QAAQ,CAAC,CAAW,CAAC;IAC3G;IACA,MAAM,IAAId,KAAK,CACb,yBAAyBgF,gBAAgB,kEAC3C,CAAC;EACH;AACF;AAAC1I,OAAA,CAAAC,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_component","_legacy","_lodash","_configMerger","_mergeVersion","_dependencyResolver","_builder","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","compIsAlreadyMergedMsg","exports","MergeStatusProvider","constructor","scope","logger","importer","options","workspace","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","legacyScope","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","toComponentIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","dataMergeResult","mergeExtensionsData","mergeResults","threeWayMerge","currentExtensions","baseExtensions","otherExtensions","shouldMergeAspectsData","conflictedAspects","aspectsToSkip","DependencyResolverAspect","BuilderAspect","currentExtension","includes","stringId","baseExtension","findExtension","idWithoutVersion","otherExtension","extensionId","isEqual","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","consumer","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","head","shouldBeRemoved","getCurrentId","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","componentMap","getComponentIfExist","isLocallyRemoved","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","undefined","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","sourceHead","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","detachHead","commonSnapId","commonSnapComp","isDiverged","isSourceAhead","handleTargetAheadAsDiverged","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData, SnapsDistance } from '@teambit/component.snap-distance';\nimport { Lane, ModelComponent, Version, Ref } from '@teambit/objects';\nimport { NoCommonSnap, Tmp } from '@teambit/legacy.scope';\nimport { ConsumerComponent } from '@teambit/legacy.consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact, isEqual } from 'lodash';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ScopeMain } from '@teambit/scope';\nimport { threeWayMerge, MergeStrategy } from './merge-version';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\nimport { ExtensionDataList } from '@teambit/legacy.extension-data';\nimport { DependencyResolverAspect } from '@teambit/dependency-resolver';\nimport { BuilderAspect } from '@teambit/builder';\n\nexport type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  mergeStrategy: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n  handleTargetAheadAsDiverged?: boolean;\n  detachHead?: boolean;\n  shouldMergeAspectsData?: boolean;\n};\n\ntype ConflictedDataAspects = { [extId: string]: string }; // extId => reason\n\nexport type DataMergeResult = {\n  conflictedAspects?: ConflictedDataAspects;\n}\n\nexport const compIsAlreadyMergedMsg = 'component is already merged';\nexport class MergeStatusProvider {\n  constructor(\n    private scope: ScopeMain,\n    private logger: Logger,\n    private importer: ImporterMain,\n    private options: MergeStatusProviderOptions,\n    private workspace?: Workspace,\n    private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n    private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n  ) {}\n\n  async getStatus(\n    bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      (!this.currentLane || // on main. we need all history in order to push each component to its remote\n        this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.scope.legacyScope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentMergeStatus(\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const repo = this.scope.legacyScope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as unknown as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n    const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = this.workspace?.listIds() || this.currentLane?.toComponentIds() || [];\n    const configMerger = new ComponentConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      this.otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger,\n      this.options.mergeStrategy\n    );\n    const configMergeResult = configMerger.merge();\n\n    const dataMergeResult = this.mergeExtensionsData(\n      currentComponent.extensions, baseComponent.extensions, otherComponent.extensions);\n\n    const mergeResults = await threeWayMerge({\n      scope: this.scope.legacyScope,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return {\n      currentComponent,\n      id,\n      mergeResults,\n      divergeData,\n      configMergeResult,\n      dataMergeResult\n    };\n  }\n\n  private mergeExtensionsData(\n    currentExtensions: ExtensionDataList,\n    baseExtensions: ExtensionDataList,\n    otherExtensions: ExtensionDataList,\n  ): DataMergeResult {\n    if (!this.options.shouldMergeAspectsData) {\n      return {};\n    }\n    const conflictedAspects: { [extId: string]: string } = {}; // extId => reason\n    // these aspects handled separately\n    const aspectsToSkip = [\n      DependencyResolverAspect.id,\n      BuilderAspect.id,\n    ];\n    currentExtensions.forEach((currentExtension) => {\n      if (aspectsToSkip.includes(currentExtension.stringId)) {\n        return;\n      }\n      const baseExtension = baseExtensions.findExtension(currentExtension.idWithoutVersion , true);\n      const otherExtension = otherExtensions.findExtension(currentExtension.idWithoutVersion, true);\n      if (!otherExtension) {\n        conflictedAspects[currentExtension.stringId] = 'missing in other';\n        return;\n      }\n      // check whether the version is different.\n      if (currentExtension.extensionId?.version !== otherExtension.extensionId?.version) {\n        if (baseExtension?.extensionId?.version === otherExtension.extensionId?.version) {\n          // ext version has changed in current. we're good.\n          return;\n        }\n        conflictedAspects[currentExtension.stringId] = `version changed. base: ${baseExtension?.extensionId?.version}, other: ${otherExtension.extensionId?.version}`;\n        return;\n      }\n      if (isEqual(currentExtension.data, otherExtension.data)) return;\n      if (!baseExtension) {\n        conflictedAspects[currentExtension.stringId] = 'no base-version. conflicted in data';\n        return;\n      }\n      if (isEqual(baseExtension.data, otherExtension.data)) {\n        return; // changed in current. leave it.\n      }\n      if (isEqual(baseExtension.data, currentExtension.data)) {\n        // changed in other. copy it.\n        currentExtension.data = otherExtension.data;\n        return;\n      }\n      // changed in both. conflict.\n      conflictedAspects[currentExtension.stringId] = 'conflicted in data since base-version';\n    });\n    otherExtensions.forEach((otherExtension) => {\n      if (!currentExtensions.findExtension(otherExtension.idWithoutVersion, true)) {\n        conflictedAspects[otherExtension.stringId] = 'missing in current';\n      }\n    });\n\n    return { conflictedAspects };\n  }\n\n  private returnUnmerged(\n    id: ComponentID,\n    msg: string,\n    unmergedLegitimately = false\n  ): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unchangedMessage = msg;\n    componentStatus.unchangedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  // eslint-disable-next-line complexity\n  private async getComponentStatusBeforeMergeAttempt(\n    id: ComponentID // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace?.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return this.returnUnmerged(\n        id,\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 = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);\n    if (unmerged) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n      );\n    }\n    const repo = this.scope.legacyScope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);\n    const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n    if (componentOnOther.isRemoved()) {\n      // if exist in current lane, we want the current lane to get the soft-remove update.\n      // or if it was removed with --update-main, we want to merge it so then main will get the update.\n      // (unless this component does not exist on main, in which case, we don't want to merge it).\n      const shouldMerge = idOnCurrentLane || (componentOnOther.shouldRemoveFromMain() && modelComponent.head);\n      if (shouldMerge) {\n        // remove the component from the workspace if exist.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n        // on lane, if it's not part of the current lane, don't merge it.\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (this.currentLane) {\n        if (!idOnCurrentLane) return null;\n        return idOnCurrentLane.id.changeVersion(idOnCurrentLane.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, targetHead: otherLaneHead, throws: false });\n      return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n    }\n    const componentMap = consumer?.bitMap.getComponentIfExist(currentId, { ignoreVersion: true });\n    const isLocallyRemoved = componentMap?.isRemoved();\n    if (isLocallyRemoved) {\n      return this.returnUnmerged(\n        id,\n        `component is locally deleted, please snap and export first or undo by bit recover`\n      );\n    }\n    const getCurrentComponent = () => {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n      if (existingBitMapId) return consumer!.loadComponent(existingBitMapId);\n      return this.scope.legacyScope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.isRemoved()) {\n      // we have a few options:\n      // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n      // this lane. (even when main is ahead, we don't want to merge it).\n      // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // option #2 and #3 above\n        : true; // it's main. option #1 above.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      if (!consumer || !this.workspace) return undefined;\n      const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return undefined;\n      if (!existingBitMapId) return undefined;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n      if (isSourceCodeModified) return 'code';\n      return 'config';\n    };\n\n    const modifiedType = await isModified();\n    if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n      return this.returnUnmerged(\n        id,\n        `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n      );\n    }\n    if (modifiedType === 'code') {\n      return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n    }\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      sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version as string), // not sure if needs to check for this.workspace\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (this.options.detachHead && divergeData.commonSnapBeforeDiverge) {\n      // just override with the model data\n      const commonSnapId = id.changeVersion(divergeData.commonSnapBeforeDiverge.toString());\n      const commonSnapComp = await this.scope.legacyScope.getConsumerComponent(commonSnapId);\n      return {\n        ...componentStatus,\n        currentComponent: commonSnapComp,\n        componentFromModel: componentOnOther,\n        divergeData,\n      };\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // component is ahead nothing to merge.\n        return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n      }\n      if (!divergeData.isTargetAhead()) {\n        // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n        return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n      }\n      // target is ahead.\n      if (!this.options.handleTargetAheadAsDiverged || !divergeData.commonSnapBeforeDiverge) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // target is ahead and we want to treat it as diverged, continue.\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n\n    return { ...componentStatus, currentComponent, mergeProps, divergeData };\n  }\n\n  private async handleNoCommonSnap(\n    modelComponent: ModelComponent,\n    id: ComponentID,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const repo = this.scope.legacyScope.objects;\n    const mainHead = modelComponent.head;\n\n    const returnAccordingToOurs = (\n      headToSaveInLane: Ref,\n      unrelatedHead: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      return {\n        currentComponent,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'ours',\n          headOnCurrentLane: headToSaveInLane,\n          unrelatedHead,\n          unrelatedLaneId,\n        },\n      };\n    };\n    const returnAccordingToTheirs = (\n      resolvedRef: Ref,\n      unrelatedHeadRef: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      // just override with the model data\n      return {\n        currentComponent,\n        componentFromModel: componentOnOther,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'theirs',\n          headOnCurrentLane: resolvedRef,\n          unrelatedHead: unrelatedHeadRef,\n          unrelatedLaneId,\n        },\n      };\n    };\n\n    const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n    if (!currentVersionRef)\n      throw new Error(\n        `handleNoCommonSnap, unable to get ref of current version \"${\n          currentComponent.id.version\n        }\" for \"${id.toString()}\"`\n      );\n    const otherVersionRef = modelComponent.getRef(id.version as string);\n    if (!otherVersionRef)\n      throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n    if (mainHead) {\n      const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n        const divergeDataFromMain = await getDivergeData({\n          repo,\n          modelComponent,\n          sourceHead: hashToCompare,\n          targetHead: mainHead,\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 this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n        );\n      }\n      const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n      const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n      if (resolveUnrelated === 'ours') {\n        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      if (resolveUnrelated === 'theirs') {\n        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      throw new Error(\n        `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n      );\n    }\n\n    const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n    const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n    if (resolveUnrelated === 'ours') {\n      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n    }\n    if (resolveUnrelated === 'theirs') {\n      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n    }\n    throw new Error(\n      `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -18,7 +18,7 @@ import { SnapsDistance } from '@teambit/component.snap-distance';
 import { DependencyResolverMain } from '@teambit/dependency-resolver';
 import { InstallMain } from '@teambit/install';
 import { ScopeMain } from '@teambit/scope';
-import { MergeStatusProviderOptions } from './merge-status-provider';
+import { DataMergeResult, MergeStatusProviderOptions } from './merge-status-provider';
 import { MergeStrategy, FileStatus, MergeResultsThreeWay } from './merge-version';
 import { ConfigStoreMain } from '@teambit/config-store';
 type ResolveUnrelatedData = {
@@ -36,6 +36,7 @@ export type ComponentMergeStatus = ComponentStatusBase & {
     divergeData?: SnapsDistance;
     resolvedUnrelated?: ResolveUnrelatedData;
     configMergeResult?: ConfigMergeResult;
+    dataMergeResult?: DataMergeResult;
 };
 export type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {
     divergeData?: SnapsDistance;

package/dist/merging.main.runtime.js

@@ -352,7 +352,7 @@ class MergingMain {
           removedComponents
         };
       }
-      return this.snapResolvedComponents(snapMessage, build, currentLane?.toLaneId(), updatedComponents);
+      return this.snapResolvedComponents(allComponentsStatus, snapMessage, build, currentLane?.toLaneId(), updatedComponents);
     };
     let mergeSnapResults = null;
     let mergeSnapError;
@@ -621,12 +621,22 @@ class MergingMain {
       mergeStrategy
     }, localLaneObject, localLaneObject);
   }
-  async snapResolvedComponents(snapMessage, build, laneId, updatedComponents) {
+  async snapResolvedComponents(allComponentsStatus, snapMessage, build, laneId, updatedComponents) {
     const unmergedComponents = this.scope.legacyScope.objects.unmergedComponents.getComponents();
     this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);
     if (!unmergedComponents.length) return null;
     const ids = _componentId().ComponentIdList.fromArray(unmergedComponents.map(r => _componentId().ComponentID.fromObject(r.id)));
     if (!this.workspace) {
+      const getLoadAspectOnlyForIds = () => {
+        if (!allComponentsStatus.length || !allComponentsStatus[0].dataMergeResult) return undefined;
+        const dataConflictedIds = allComponentsStatus.filter(c => {
+          const conflictedAspects = c.dataMergeResult?.conflictedAspects || {};
+          const aspectIds = Object.keys(conflictedAspects);
+          aspectIds.forEach(aspectId => this.logger.debug(`conflicted-data for "${c.id.toString()}". aspectId: ${aspectId}. reason: ${conflictedAspects[aspectId]}`));
+          return aspectIds.length;
+        }).map(c => c.id);
+        return _componentId().ComponentIdList.fromArray(dataConflictedIds);
+      };
       const results = await this.snapping.snapFromScope(ids.map(id => ({
         componentId: id.toString(),
         aspects: this.scope.legacyScope.objects.unmergedComponents.getEntry(id)?.mergedConfig
@@ -634,7 +644,8 @@ class MergingMain {
         message: snapMessage,
         build,
         lane: laneId?.toString(),
-        updatedLegacyComponents: updatedComponents
+        updatedLegacyComponents: updatedComponents,
+        loadAspectOnlyForIds: getLoadAspectOnlyForIds()
       });
       return _objectSpread(_objectSpread({}, results), {}, {
         autoSnappedResults: []

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

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

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.549",
+  "version": "1.0.551",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.549"
+    "version": "1.0.551"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,34 +17,36 @@
     "@teambit/component-id": "1.2.2",
     "@teambit/lane-id": "0.0.312",
     "@teambit/harmony": "0.4.6",
-    "@teambit/cli": "0.0.1126",
-    "@teambit/config-merger": "0.0.416",
-    "@teambit/config-store": "0.0.6",
+    "@teambit/cli": "0.0.1128",
+    "@teambit/config-merger": "0.0.418",
+    "@teambit/config-store": "0.0.8",
     "@teambit/legacy.constants": "0.0.11",
     "@teambit/git.modules.git-executable": "0.0.12",
     "@teambit/legacy.logger": "0.0.14",
     "@teambit/legacy.utils": "0.0.17",
-    "@teambit/component.snap-distance": "0.0.35",
-    "@teambit/importer": "1.0.549",
-    "@teambit/legacy.consumer-component": "0.0.35",
-    "@teambit/legacy.scope": "0.0.34",
-    "@teambit/logger": "0.0.1219",
-    "@teambit/objects": "0.0.56",
-    "@teambit/scope": "1.0.549",
-    "@teambit/workspace": "1.0.549",
-    "@teambit/checkout": "1.0.549",
-    "@teambit/component-writer": "1.0.549",
-    "@teambit/config": "0.0.1300",
-    "@teambit/dependency-resolver": "1.0.549",
-    "@teambit/install": "1.0.549",
-    "@teambit/legacy.component-list": "0.0.88",
-    "@teambit/legacy.consumer": "0.0.34",
-    "@teambit/pkg.modules.component-package-name": "0.0.41",
-    "@teambit/remove": "1.0.549",
-    "@teambit/snapping": "1.0.549",
+    "@teambit/builder": "1.0.551",
+    "@teambit/component.snap-distance": "0.0.36",
+    "@teambit/dependency-resolver": "1.0.551",
+    "@teambit/importer": "1.0.551",
+    "@teambit/legacy.consumer-component": "0.0.36",
+    "@teambit/legacy.extension-data": "0.0.37",
+    "@teambit/legacy.scope": "0.0.35",
+    "@teambit/logger": "0.0.1221",
+    "@teambit/objects": "0.0.58",
+    "@teambit/scope": "1.0.551",
+    "@teambit/workspace": "1.0.551",
+    "@teambit/checkout": "1.0.551",
+    "@teambit/component-writer": "1.0.551",
+    "@teambit/config": "0.0.1302",
+    "@teambit/install": "1.0.551",
+    "@teambit/legacy.component-list": "0.0.89",
+    "@teambit/legacy.consumer": "0.0.35",
+    "@teambit/pkg.modules.component-package-name": "0.0.42",
+    "@teambit/remove": "1.0.551",
+    "@teambit/snapping": "1.0.551",
     "@teambit/toolbox.path.path": "0.0.8",
     "@teambit/legacy.cli.prompts": "0.0.16",
-    "@teambit/component.sources": "0.0.86",
+    "@teambit/component.sources": "0.0.87",
     "@teambit/toolbox.crypto.sha1": "0.0.7",
     "@teambit/toolbox.string.eol": "0.0.5"
   },