@teambit/merging 0.0.308 → 0.0.310

package/dist/merging.main.runtime.js

@@ -722,8 +722,12 @@ other:   ${otherLaneHead.toString()}`);
     }
     const remoteId = id.changeVersion(remoteHead.toString());
     const idToLoad = !mergeResults || mergeStrategy === _mergeVersion().MergeOptions.theirs ? remoteId : id;
-    const componentWithDependencies = await consumer.loadComponentWithDependenciesFromModel(idToLoad);
-    const files = componentWithDependencies.component.files;
+    const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);
+    if (mergeResults && mergeStrategy === _mergeVersion().MergeOptions.theirs) {
+      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version
+      legacyComponent.version = id.version;
+    }
+    const files = legacyComponent.files;
     files.forEach(file => {
       // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!
       filesStatus[(0, _utils().pathNormalizeToLinux)(file.relative)] = _mergeVersion().FileStatus.updated;
@@ -734,20 +738,20 @@ other:   ${otherLaneHead.toString()}`);
         filesStatus: modifiedStatus,
         modifiedFiles
       } = (0, _checkoutVersion().applyModifiedVersion)(files, mergeResults, mergeStrategy);
-      componentWithDependencies.component.files = modifiedFiles;
+      legacyComponent.files = modifiedFiles;
       filesStatus = _objectSpread(_objectSpread({}, filesStatus), modifiedStatus);
     }
     const manyComponentsWriterOpts = {
       consumer,
-      componentsWithDependencies: [componentWithDependencies],
+      components: [legacyComponent],
       skipDependencyInstallation: true,
       writeConfig: false // @todo: should write if config exists before, needs to figure out how to do it.
     };
 
     await this.componentWriter.writeMany(manyComponentsWriterOpts);
     if (configMergeResult) {
-      if (!componentWithDependencies.component.writtenPath) {
-        throw new Error(`componentWithDependencies.component.writtenPath is missing for ${id.toString()}`);
+      if (!legacyComponent.writtenPath) {
+        throw new Error(`component.writtenPath is missing for ${id.toString()}`);
       }
       const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();
       if (successfullyMergedConfig) {

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

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","consumer","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","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","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","generateConfigMergeConflictFileForAll","compact","objects","add","persist","unmergedComponents","write","writeBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","components","configMergeFile","getConflictMergeFile","forEach","configMerge","conflict","generateMergeConflictFile","addConflict","compIdStr","hasConflict","getMergeStatus","currentLane","otherLane","options","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","commonSnapBeforeDiverge","changeVersion","flat","scopeImporter","importManyIfMissingWithoutDeps","BitIds","fromArray","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","push","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","head","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","removed","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","debug","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriterOpts","componentsWithDependencies","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","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  FailedComponents,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\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 { 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 { compact } from 'lodash';\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';\nimport { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\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  configMergeResult?: ConfigMergeResult;\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 type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] } | 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};\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    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain\n  ) {\n    this.consumer = this.workspace?.consumer;\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 = this.getComponentsToMerge(consumer, ids);\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    }\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, configMergeResult }) => {\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          configMergeResult,\n        });\n      }\n    );\n\n    const allConfigMerge = succeededComponents.map((c) => c.configMergeResult);\n    await this.generateConfigMergeConflictFileForAll(compact(allConfigMerge));\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 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 } = 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  private async generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\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    if (!currentLane && otherLane) {\n      await this.importer.importObjectsFromMainIfExist(otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id, currentLane, options)\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 getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) =>\n            this.getComponentMergeStatus(currentLane, otherLane || undefined, compStatus)\n          )\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 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    if (currentComponent.removed) {\n      return returnUnmerged(`component has been removed`, true);\n    }\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: 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    otherLane: Lane | undefined, // 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    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 = localLane?.toLaneId().toString() || 'main';\n    const otherLaneName = otherLane ? 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 ConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      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,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\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    configMergeResult?: ConfigMergeResult;\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 manyComponentsWriterOpts = {\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    if (configMergeResult) {\n      if (!componentWithDependencies.component.writtenPath) {\n        throw new Error(`componentWithDependencies.component.writtenPath is missing for ${id.toString()}`);\n      }\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 (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 = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter, importer);\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","componentWriter","importer","consumer","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","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","configMergeResult","modelComponent","scope","getModelComponent","updatedLaneId","isDefault","LaneId","from","name","applyVersion","remoteHead","getRef","version","allConfigMerge","generateConfigMergeConflictFileForAll","compact","objects","add","persist","unmergedComponents","write","writeBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","undefined","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","components","configMergeFile","getConflictMergeFile","forEach","configMerge","conflict","generateMergeConflictFile","addConflict","compIdStr","hasConflict","getMergeStatus","currentLane","otherLane","options","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","getComponentStatusBeforeMergeAttempt","toImport","compStatus","divergeData","commonSnapBeforeDiverge","changeVersion","flat","scopeImporter","importManyIfMissingWithoutDeps","BitIds","fromArray","lane","compStatusNotNeedMerge","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","push","returnUnmerged","msg","getModelComponentIfExist","unmerged","getEntry","toStringWithoutVersion","repo","otherLaneHead","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","loadVersion","isRemoved","getCurrentId","idOnLane","getComponent","head","getHeadAsTagIfExist","currentId","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","removed","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","debug","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","threeWayMerge","filesStatus","unmergedComponent","remote","handleResolveUnrelated","addComponent","unrelated","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","manyComponentsWriterOpts","writeConfig","writeMany","writtenPath","successfullyMergedConfig","getSuccessfullyMergedConfig","mergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","fullName","abortedComponents","snap","legacyBitIds","_legacy","resolvedComponents","localLaneObject","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","getComponents","r","BitId","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","GeneralError","unresolvedComponents","u","ComponentID","fromLegacy","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","createLogger","MergingAspect","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","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  FailedComponents,\n  FileStatus,\n  ApplyVersionResult,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\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 { 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 { compact } from 'lodash';\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';\nimport { ConfigMerger } from './config-merger';\nimport { ConfigMergeResult } from './config-merge-result';\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  configMergeResult?: ConfigMergeResult;\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 type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: { snappedComponents: ConsumerComponent[]; autoSnappedResults: AutoTagResult[] } | 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};\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    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain\n  ) {\n    this.consumer = this.workspace?.consumer;\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 = this.getComponentsToMerge(consumer, ids);\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    }\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, configMergeResult }) => {\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          configMergeResult,\n        });\n      }\n    );\n\n    const allConfigMerge = succeededComponents.map((c) => c.configMergeResult);\n    await this.generateConfigMergeConflictFileForAll(compact(allConfigMerge));\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 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 } = 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  private async generateConfigMergeConflictFileForAll(allConfigMerge: ConfigMergeResult[]) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\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    if (!currentLane && otherLane) {\n      await this.importer.importObjectsFromMainIfExist(otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id, currentLane, options)\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 getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) =>\n            this.getComponentMergeStatus(currentLane, otherLane || undefined, compStatus)\n          )\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 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    if (currentComponent.removed) {\n      return returnUnmerged(`component has been removed`, true);\n    }\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: 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    otherLane: Lane | undefined, // 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    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 = localLane?.toLaneId().toString() || 'main';\n    const otherLaneName = otherLane ? 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 ConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      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,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\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    configMergeResult?: ConfigMergeResult;\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 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    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      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    const manyComponentsWriterOpts = {\n      consumer,\n      components: [legacyComponent],\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    if (configMergeResult) {\n      if (!legacyComponent.writtenPath) {\n        throw new Error(`component.writtenPath is missing for ${id.toString()}`);\n      }\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 (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 = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(workspace, install, snapping, checkout, logger, compWriter, importer);\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.308",
+  "version": "0.0.310",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.308"
+    "version": "0.0.310"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -18,18 +18,18 @@
     "@teambit/harmony": "0.4.6",
     "@teambit/component-id": "0.0.427",
     "@teambit/component-version": "0.0.408",
-    "@teambit/dependency-resolver": "0.0.993",
-    "@teambit/envs": "0.0.993",
-    "@teambit/logger": "0.0.760",
+    "@teambit/dependency-resolver": "0.0.995",
+    "@teambit/envs": "0.0.995",
+    "@teambit/logger": "0.0.761",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/cli": "0.0.667",
-    "@teambit/checkout": "0.0.162",
-    "@teambit/component-writer": "0.0.29",
-    "@teambit/importer": "0.0.422",
-    "@teambit/install": "0.0.116",
-    "@teambit/lane-id": "0.0.184",
-    "@teambit/snapping": "0.0.308",
-    "@teambit/workspace": "0.0.993"
+    "@teambit/cli": "0.0.668",
+    "@teambit/checkout": "0.0.164",
+    "@teambit/component-writer": "0.0.31",
+    "@teambit/importer": "0.0.424",
+    "@teambit/install": "0.0.117",
+    "@teambit/lane-id": "0.0.185",
+    "@teambit/snapping": "0.0.310",
+    "@teambit/workspace": "0.0.995"
   },
   "devDependencies": {
     "chai": "4.3.0",
@@ -44,7 +44,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.448",
+    "@teambit/legacy": "1.0.449",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },