@teambit/merging 0.0.247 → 0.0.249

package/dist/merging.main.runtime.js

@@ -441,8 +441,8 @@ class MergingMain {
     const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, {
       ignoreVersion: true
     });
-    const componentOnLane = await modelComponent.loadVersion(version, consumer.scope.objects);
-    if (componentOnLane.isRemoved()) {
+    const componentOnOther = await modelComponent.loadVersion(version, consumer.scope.objects);
+    if (componentOnOther.isRemoved()) {
       return returnUnmerged(`component has been removed`, true);
     }
     const getCurrentId = () => {
@@ -469,7 +469,7 @@ class MergingMain {
       });
       return {
         currentComponent: null,
-        componentFromModel: componentOnLane,
+        componentFromModel: componentOnOther,
         id,
         divergeData
       };
@@ -500,6 +500,11 @@ class MergingMain {
       throws: false
     });
     if (divergeData.err) {
+      if (currentComponent.removed) {
+        // if current component is removed and there is no divergeData errors, it's ok to merge, because on the other
+        // lane it might be re-imported and might be needed.
+        return returnUnmerged(`component has been removed`, true);
+      }
       const mainHead = modelComponent.head;
       if (divergeData.err instanceof _noCommonSnap().NoCommonSnap && options !== null && options !== void 0 && options.resolveUnrelated && mainHead) {
         const hasResolvedFromMain = async hashToCompare => {
@@ -525,7 +530,7 @@ class MergingMain {
           // just override with the model data
           return {
             currentComponent,
-            componentFromModel: componentOnLane,
+            componentFromModel: componentOnOther,
             id,
             divergeData,
             resolvedUnrelated: {
@@ -558,7 +563,7 @@ class MergingMain {
         // just override with the model data
         return {
           currentComponent,
-          componentFromModel: componentOnLane,
+          componentFromModel: componentOnOther,
           id,
           divergeData
         };

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

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

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.247",
+  "version": "0.0.249",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.247"
+    "version": "0.0.249"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,14 +17,14 @@
     "@babel/runtime": "7.20.0",
     "@teambit/harmony": "0.4.6",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.624",
-    "@teambit/checkout": "0.0.101",
+    "@teambit/cli": "0.0.626",
+    "@teambit/checkout": "0.0.103",
     "@teambit/component-id": "0.0.425",
-    "@teambit/install": "0.0.70",
-    "@teambit/lane-id": "0.0.142",
-    "@teambit/logger": "0.0.717",
-    "@teambit/snapping": "0.0.247",
-    "@teambit/workspace": "0.0.932"
+    "@teambit/install": "0.0.72",
+    "@teambit/lane-id": "0.0.144",
+    "@teambit/logger": "0.0.719",
+    "@teambit/snapping": "0.0.249",
+    "@teambit/workspace": "0.0.934"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
@@ -36,7 +36,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.405",
+    "@teambit/legacy": "1.0.407",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },