@teambit/merging 1.0.140 → 1.0.141

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

@@ -7,6 +7,7 @@ import { Logger } from '@teambit/logger';
 import { ComponentMergeStatus } from './merging.main.runtime';
 export type MergeStatusProviderOptions = {
     resolveUnrelated?: MergeStrategy;
+    mergeStrategy: MergeStrategy;
     ignoreConfigChanges?: boolean;
     shouldSquash?: boolean;
 };
@@ -14,12 +15,11 @@ export declare class MergeStatusProvider {
     private workspace;
     private logger;
     private importer;
+    private options;
     private currentLane?;
     private otherLane?;
-    private options?;
-    constructor(workspace: Workspace, logger: Logger, importer: ImporterMain, currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.
-    otherLane?: Lane, // the lane we want to merged to our lane. (undefined if it's "main").
-    options?: MergeStatusProviderOptions);
+    constructor(workspace: Workspace, logger: Logger, importer: ImporterMain, options: MergeStatusProviderOptions, currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.
+    otherLane?: Lane);
     getStatus(bitIds: ComponentID[]): Promise<ComponentMergeStatus[]>;
     private getComponentMergeStatus;
     private returnUnmerged;

package/dist/merge-status-provider.js

@@ -74,17 +74,16 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(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); }
 class MergeStatusProvider {
-  constructor(workspace, logger, importer, currentLane,
+  constructor(workspace, logger, importer, options, currentLane,
   // currently checked out lane. if on main, then it's undefined.
-  otherLane,
-  // the lane we want to merged to our lane. (undefined if it's "main").
-  options) {
+  otherLane // the lane we want to merged to our lane. (undefined if it's "main").
+  ) {
     this.workspace = workspace;
     this.logger = logger;
     this.importer = importer;
+    this.options = options;
     this.currentLane = currentLane;
     this.otherLane = otherLane;
-    this.options = options;
   }
   async getStatus(bitIds) {
     if (!this.currentLane && this.otherLane) {
@@ -159,7 +158,7 @@ other:   ${otherLaneHead.toString()}`);
     const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;
     const otherLabel = `${otherLaneHead.toString()} (${otherLaneName === currentLaneName ? 'incoming' : otherLaneName})`;
     const workspaceIds = await this.workspace.listIds();
-    const configMerger = new (_configMerger().ComponentConfigMerger)(id.toStringWithoutVersion(), workspaceIds, this.otherLane, currentComponent.extensions, baseComponent.extensions, otherComponent.extensions, currentLabel, otherLabel, this.logger);
+    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 mergeResults = await (0, _threeWayMerge().default)({
       consumer: this.workspace.consumer,

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

@@ -1 +1 @@
-{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeStatusProvider","constructor","workspace","logger","importer","currentLane","otherLane","options","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","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","configMerger","ComponentConfigMerger","extensions","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","componentModificationStatus","getComponentStatusById","modified","undefined","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane","exports"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n};\n\nexport class MergeStatusProvider {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private importer: ImporterMain,\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    private options?: MergeStatusProviderOptions\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.workspace.consumer.scope.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.workspace.consumer.scope);\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.workspace.consumer.scope.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 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 = await this.workspace.listIds();\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    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer: this.workspace.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\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  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 consumer.scope.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 = consumer.scope.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 = consumer.scope.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, consumer.scope.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      const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\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 getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.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      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      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n        );\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);\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 consumer = this.workspace.consumer;\n    const repo = consumer.scope.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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"}
+{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeStatusProvider","constructor","workspace","logger","importer","options","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","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","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","componentModificationStatus","getComponentStatusById","modified","undefined","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane","exports"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  mergeStrategy: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n};\n\nexport class MergeStatusProvider {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private importer: ImporterMain,\n    private options: MergeStatusProviderOptions,\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.workspace.consumer.scope.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.workspace.consumer.scope);\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.workspace.consumer.scope.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 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 = await this.workspace.listIds();\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      consumer: this.workspace.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\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  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 consumer.scope.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 = consumer.scope.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 = consumer.scope.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, consumer.scope.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      const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\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 getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.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      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      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n        );\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);\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 consumer = this.workspace.consumer;\n    const repo = consumer.scope.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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"}

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

@@ -115,9 +115,8 @@ export declare class MergingMain {
      * 2. "bit lane merge", when merging from one lane to another.
      */
     getMergeStatus(bitIds: ComponentID[], // the id.version is the version we want to merge to the current component
-    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.
-    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's "main").
-    options?: MergeStatusProviderOptions): Promise<ComponentMergeStatus[]>;
+    options: MergeStatusProviderOptions, currentLane: Lane | null, // currently checked out lane. if on main, then it's null.
+    otherLane?: Lane | null): Promise<ComponentMergeStatus[]>;
     private applyVersionMultiple;
     private applyVersion;
     private abortMerge;

package/dist/merging.main.runtime.js

@@ -239,7 +239,7 @@ class MergingMain {
   async mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, snapMessage, build, skipDependencyInstallation) {
     const currentLaneId = consumer.getCurrentLaneId();
     const currentLaneObject = await consumer.getCurrentLaneObject();
-    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);
+    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject, mergeStrategy);
     const failedComponents = allComponentsStatus.filter(c => c.unchangedMessage && !c.unchangedLegitimately);
     if (failedComponents.length) {
       const failureMsgs = failedComponents.map(failedComponent => `${_chalk().default.bold(failedComponent.id.toString())} - ${_chalk().default.red(failedComponent.unchangedMessage)}`).join('\n');
@@ -373,12 +373,10 @@ class MergingMain {
    */
   async getMergeStatus(bitIds,
   // the id.version is the version we want to merge to the current component
-  currentLane,
+  options, currentLane,
   // currently checked out lane. if on main, then it's null.
-  otherLane,
-  // the lane we want to merged to our lane. (null if it's "main").
-  options) {
-    const mergeStatusProvider = new (_mergeStatusProvider().MergeStatusProvider)(this.workspace, this.logger, this.importer, currentLane || undefined, otherLane || undefined, options);
+  otherLane) {
+    const mergeStatusProvider = new (_mergeStatusProvider().MergeStatusProvider)(this.workspace, this.logger, this.importer, options, currentLane || undefined, otherLane || undefined);
     return mergeStatusProvider.getStatus(bitIds);
   }
   async applyVersionMultiple(succeededComponents, otherLaneId, mergeStrategy, currentLane) {
@@ -576,7 +574,7 @@ class MergingMain {
       resolvedComponents: snappedComponents
     };
   }
-  async getAllComponentsStatus(bitIds, laneId, localLaneObject) {
+  async getAllComponentsStatus(bitIds, laneId, localLaneObject, mergeStrategy) {
     const ids = await Promise.all(bitIds.map(async bitId => {
       const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;
       const remoteLaneId = _laneId().LaneId.from(laneId.name, remoteScopeName);
@@ -587,9 +585,10 @@ class MergingMain {
       }
       return bitId.changeVersion(remoteHead.toString());
     }));
-    return this.getMergeStatus(ids, localLaneObject, localLaneObject, {
-      shouldSquash: false
-    });
+    return this.getMergeStatus(ids, {
+      shouldSquash: false,
+      mergeStrategy
+    }, localLaneObject, localLaneObject);
   }
   async snapResolvedComponents(consumer, snapMessage, build) {
     const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();

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

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

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.140",
+  "version": "1.0.141",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.140"
+    "version": "1.0.141"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,17 +17,17 @@
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
     "@teambit/cli": "0.0.848",
-    "@teambit/config-merger": "0.0.7",
+    "@teambit/config-merger": "0.0.8",
     "@teambit/global-config": "0.0.851",
-    "@teambit/importer": "1.0.140",
+    "@teambit/importer": "1.0.141",
     "@teambit/logger": "0.0.941",
-    "@teambit/workspace": "1.0.140",
-    "@teambit/checkout": "1.0.140",
-    "@teambit/component-writer": "1.0.140",
-    "@teambit/config": "0.0.891",
-    "@teambit/install": "1.0.140",
-    "@teambit/remove": "1.0.140",
-    "@teambit/snapping": "1.0.140"
+    "@teambit/workspace": "1.0.141",
+    "@teambit/checkout": "1.0.141",
+    "@teambit/component-writer": "1.0.141",
+    "@teambit/config": "0.0.892",
+    "@teambit/install": "1.0.141",
+    "@teambit/remove": "1.0.141",
+    "@teambit/snapping": "1.0.141"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",