@teambit/merging 0.0.74 → 0.0.75

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { MergingAspect } from './merging.aspect';
 export { mergeReport } from './merge-cmd';
-export type { MergingMain } from './merging.main.runtime';
+export type { MergingMain, ComponentStatus } from './merging.main.runtime';
 export default MergingAspect;
 export { MergingAspect };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport { mergeReport } from './merge-cmd';\nexport type { MergingMain } from './merging.main.runtime';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;eAEeA,wB"}
+{"version":3,"names":["MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport { mergeReport } from './merge-cmd';\nexport type { MergingMain, ComponentStatus } from './merging.main.runtime';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;eAEeA,wB"}

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

@@ -9,6 +9,7 @@ import { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag
 import { Lane, Version } from '@teambit/legacy/dist/scope/models';
 import Component from '@teambit/legacy/dist/consumer/component/consumer-component';
 import { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';
+import { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';
 export declare type ComponentStatus = {
     componentFromFS?: Component | null;
     componentFromModel?: Version;
@@ -16,6 +17,7 @@ export declare type ComponentStatus = {
     failureMessage?: string;
     unchangedLegitimately?: boolean;
     mergeResults?: MergeResultsThreeWay | null;
+    divergeData?: DivergeData;
 };
 export declare class MergingMain {
     private workspace;

package/dist/merging.main.runtime.js

@@ -513,7 +513,8 @@ class MergingMain {
           componentFromFS: component,
           componentFromModel: componentOnLane,
           id,
-          mergeResults: null
+          mergeResults: null,
+          divergeData
         };
       } // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal
 
@@ -537,7 +538,8 @@ class MergingMain {
     return {
       componentFromFS: component,
       id,
-      mergeResults
+      mergeResults,
+      divergeData
     };
   }
 

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

@@ -1 +1 @@
-{"version":3,"names":["MergingMain","constructor","workspace","snapping","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","ConsumerNotFound","isLegacy","LanesIsDisabled","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","mergeSnaps","remoteName","isDefault","scope","laneId","localLane","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","failedComponents","filter","componentStatus","failureMessage","map","id","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","componentFromFS","modelComponent","getModelComponent","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","existingOnWorkspaceOnly","returnFailure","msg","getModelComponentIfExist","GeneralError","toString","unmerged","getEntry","name","resolved","toStringWithoutVersion","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","existOnCurrentLane","isIdAvailableOnCurrentLane","componentOnLane","loadVersion","componentFromModel","currentlyUsedVersion","hasHead","loadComponent","componentModificationStatus","getComponentStatusById","modified","repo","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","from","otherLaneHead","Error","divergeData","getDivergeData","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","baseComponent","otherComponent","threeWayMerge","otherLabel","currentComponent","currentLabel","filesStatus","unmergedComponent","remote","lane","MergeOptions","ours","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","addEntry","remoteId","changeVersion","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","componentMap","origin","COMPONENT_ORIGINS","AUTHORED","dependencies","devDependencies","shouldWritePackageJson","rootDir","packageJsonPath","path","join","getPath","fs","pathExists","shouldInstallNpmPackages","writePackageJson","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","originallySharedDir","shouldDependenciesSaveAsComponents","shouldDependenciesSavedAsComponents","dependenciesSavedAsComponents","saveDependenciesAsComponents","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writeAll","manual","unmergedPaths","f","conflict","filePath","addComponent","setHead","markVersionAsLocal","getIdsForUnresolved","results","checkoutVersion","reset","removeComponent","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","resolveUnmerged","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","LaneId","remoteLanes","laneIdStr","BitError","clear","err","getResolvedComponents","logger","debug","length","r","idsStr","getParsedId","entry","unresolvedComponents","getComponents","u","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport { LanesIsDisabled } from '@teambit/legacy/dist/consumer/lanes/exceptions/lanes-is-disabled';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport fs from 'fs-extra';\nimport mapSeries from 'p-map-series';\nimport path from 'path';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { COMPONENT_ORIGINS } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { 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 Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport checkoutVersion, { 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 { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\nexport type ComponentStatus = {\n  componentFromFS?: Component | null;\n  componentFromModel?: Version;\n  id: BitId;\n  failureMessage?: string;\n  unchangedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(private workspace: Workspace, private snapping: SnappingMain) {\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  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    if (consumer.isLegacy && (noSnap || message || abort || resolve)) {\n      throw new LanesIsDisabled();\n    }\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(consumer, values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(consumer, 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(consumer, bitIds, mergeStrategy, noSnap, message, build);\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  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      remoteName: currentLaneId.isDefault() ? null : currentLaneId.scope,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    remoteName,\n    laneId,\n    localLane,\n    noSnap,\n    snapMessage,\n    build,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentStatus[];\n    remoteName: string | null;\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    snapMessage: string;\n    build: boolean;\n  }) {\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.failureMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.failureMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.failureMessage);\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(succeededComponents, async ({ componentFromFS, id, mergeResults }) => {\n      const modelComponent = await consumer.scope.getModelComponent(id);\n      return this.applyVersion({\n        consumer,\n        componentFromFS,\n        id,\n        mergeResults,\n        mergeStrategy,\n        remoteHead: modelComponent.getRef(id.version as string) as Ref,\n        remoteName: remoteName || componentFromFS?.scope || null,\n        laneId,\n        localLane,\n      });\n    });\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, it localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    const mergeSnapResults = noSnap ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n    return { components: componentsResults, failedComponents, mergeSnapResults };\n  }\n\n  async getComponentMergeStatus(\n    id: BitId,\n    localLane: Lane | null,\n    otherLaneName: string,\n    existingOnWorkspaceOnly = false\n  ): Promise<ComponentStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentStatus = { id };\n    const returnFailure = (msg: string, unchangedLegitimately = false) => {\n      componentStatus.failureMessage = msg;\n      componentStatus.unchangedLegitimately = unchangedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      throw new GeneralError(\n        `component ${id.toString()} is on the lane 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 && unmerged.resolved === false) {\n      return returnFailure(\n        `component ${id.toStringWithoutVersion()} has conflicts that need to be resolved first, please use bit merge --resolve/--abort`\n      );\n    }\n    const version = id.version as string;\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const existOnCurrentLane = existingBitMapId && consumer.bitMap.isIdAvailableOnCurrentLane(existingBitMapId);\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (!existingBitMapId && existingOnWorkspaceOnly) {\n      return returnFailure(`component ${id.toStringWithoutVersion()} is not in the workspace`);\n    }\n    if (!existingBitMapId || !existOnCurrentLane) {\n      return { componentFromFS: null, componentFromModel: componentOnLane, id, mergeResults: null };\n    }\n    const currentlyUsedVersion = existingBitMapId.version;\n    if (currentlyUsedVersion === version) {\n      // @todo: maybe this check is not needed as we check for diverge later on\n      if (localLane || modelComponent.hasHead()) {\n        return returnFailure(`component ${id.toStringWithoutVersion()} is already merged`, true);\n      }\n    }\n    const component = await consumer.loadComponent(existingBitMapId);\n    const componentModificationStatus = await consumer.getComponentStatusById(component.id);\n    if (componentModificationStatus.modified) {\n      throw new GeneralError(\n        `unable to merge ${id.toStringWithoutVersion()}, the component is modified, please snap/tag it first`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && currentlyUsedVersion && modelComponent.laneHeadLocal?.toString() !== currentlyUsedVersion;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(currentlyUsedVersion) : null;\n\n    const otherLaneHead = modelComponent.getRef(version);\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, localHead);\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnFailure(`component ${component.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          componentFromFS: component,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnFailure(`component ${component.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent: component,\n      currentLabel: `${currentlyUsedVersion} (local)`,\n      baseComponent,\n    });\n    return { componentFromFS: component, id, mergeResults };\n  }\n\n  private async applyVersion({\n    consumer,\n    componentFromFS,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    remoteName,\n    laneId,\n    localLane,\n  }: {\n    consumer: Consumer;\n    componentFromFS: Component | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    remoteName: string | null;\n    laneId: LaneId;\n    localLane: Lane | null;\n  }): Promise<ApplyVersionResult> {\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      // @ts-ignore\n      head: remoteHead,\n      // @ts-ignore\n      remote: remoteName,\n      lane: laneId.name,\n      resolved: false, // could be changed later\n    };\n    id = componentFromFS ? componentFromFS.id : id;\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n      componentFromFS.files.forEach((file) => {\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n      unmergedComponent.resolved = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n\n      return { id, filesStatus };\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 componentMap = componentFromFS && componentFromFS.componentMap;\n    if (componentFromFS && !componentMap) throw new GeneralError('applyVersion: componentMap was not found');\n    if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED && !id.scope) {\n      componentWithDependencies.dependencies = [];\n      componentWithDependencies.devDependencies = [];\n    }\n    const shouldWritePackageJson = async (): Promise<boolean> => {\n      if (!componentMap) return true;\n      const rootDir = componentMap && componentMap.rootDir;\n      if (!rootDir) return false;\n      const packageJsonPath = path.join(consumer.getPath(), rootDir, 'package.json');\n      return fs.pathExists(packageJsonPath);\n    };\n    const shouldInstallNpmPackages = (): boolean => {\n      if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED) return false;\n      return true;\n    };\n    const writePackageJson = await shouldWritePackageJson();\n\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(\n        files,\n        mergeResults,\n        mergeStrategy,\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        componentWithDependencies.component.originallySharedDir\n      );\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n    const shouldDependenciesSaveAsComponents = await consumer.shouldDependenciesSavedAsComponents([id]);\n    componentWithDependencies.component.dependenciesSavedAsComponents =\n      shouldDependenciesSaveAsComponents[0].saveDependenciesAsComponents;\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: shouldInstallNpmPackages(),\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson,\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.resolved = false;\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      } else {\n        unmergedComponent.resolved = true;\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      const modelComponent = await consumer.scope.getModelComponent(id);\n      if (!consumer.isLegacy) {\n        modelComponent.setHead(remoteHead);\n        // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n        modelComponent.markVersionAsLocal(remoteHead.toString());\n      }\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(consumer: Consumer, values: string[]): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnresolved(consumer, values);\n    // @ts-ignore not clear yet what to do with other flags\n    const results = await checkoutVersion(consumer, { ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.name));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(\n    consumer: Consumer,\n    values: string[],\n    snapMessage: string,\n    build: boolean\n  ): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnresolved(consumer, values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids),\n      resolveUnmerged: true,\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<ComponentStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = await Promise.all(\n        bitIds.map(async (bitId) => {\n          const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n          const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n          const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n          const laneIdStr = remoteLaneId.toString();\n          if (!remoteHead)\n            throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: Component[]; autoSnappedResults: AutoTagResult[] }> {\n    const resolvedComponents = consumer.scope.objects.unmergedComponents.getResolvedComponents();\n    logger.debug(`merge-snaps, snapResolvedComponents, total ${resolvedComponents.length.toString()} components`);\n    if (!resolvedComponents.length) return null;\n    const ids = BitIds.fromArray(resolvedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private getIdsForUnresolved(consumer: Consumer, idsStr?: string[]): BitId[] {\n    if (idsStr && idsStr.length) {\n      const bitIds = idsStr.map((id) => consumer.getParsedId(id));\n      bitIds.forEach((id) => {\n        const entry = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return bitIds;\n    }\n    const unresolvedComponents = 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) => 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];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping]: [CLIMain, Workspace, SnappingMain]) {\n    const merging = new MergingMain(workspace, snapping);\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","snapping","consumer","merge","values","mergeStrategy","abort","resolve","noSnap","message","build","ConsumerNotFound","isLegacy","LanesIsDisabled","mergeResults","firstValue","R","head","resolveMerge","abortMerge","BitId","isValidVersion","bitIds","getComponentsToMerge","mergeComponentsFromRemote","version","ids","tail","mergeVersion","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","mergeSnaps","remoteName","isDefault","scope","laneId","localLane","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","failedComponents","filter","componentStatus","failureMessage","map","id","unchangedLegitimately","succeededComponents","componentsResults","mapSeries","componentFromFS","modelComponent","getModelComponent","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","existingOnWorkspaceOnly","returnFailure","msg","getModelComponentIfExist","GeneralError","toString","unmerged","getEntry","name","resolved","toStringWithoutVersion","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","existOnCurrentLane","isIdAvailableOnCurrentLane","componentOnLane","loadVersion","componentFromModel","currentlyUsedVersion","hasHead","loadComponent","componentModificationStatus","getComponentStatusById","modified","repo","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","from","otherLaneHead","Error","divergeData","getDivergeData","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","baseComponent","otherComponent","threeWayMerge","otherLabel","currentComponent","currentLabel","filesStatus","unmergedComponent","remote","lane","MergeOptions","ours","files","forEach","file","pathNormalizeToLinux","relative","FileStatus","unchanged","addEntry","remoteId","changeVersion","idToLoad","theirs","componentWithDependencies","loadComponentWithDependenciesFromModel","componentMap","origin","COMPONENT_ORIGINS","AUTHORED","dependencies","devDependencies","shouldWritePackageJson","rootDir","packageJsonPath","path","join","getPath","fs","pathExists","shouldInstallNpmPackages","writePackageJson","updated","modifiedStatus","modifiedFiles","applyModifiedVersion","originallySharedDir","shouldDependenciesSaveAsComponents","shouldDependenciesSavedAsComponents","dependenciesSavedAsComponents","saveDependenciesAsComponents","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writeAll","manual","unmergedPaths","f","conflict","filePath","addComponent","setHead","markVersionAsLocal","getIdsForUnresolved","results","checkoutVersion","reset","removeComponent","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","resolveUnmerged","resolvedComponents","localLaneObject","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteScopeName","remoteLaneId","LaneId","remoteLanes","laneIdStr","BitError","clear","err","getResolvedComponents","logger","debug","length","r","idsStr","getParsedId","entry","unresolvedComponents","getComponents","u","hasWildcard","componentsList","ComponentsList","listComponentsByIdsWithWildcard","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","MainRuntime","MergingAspect","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport WorkspaceAspect, { Workspace } from '@teambit/workspace';\nimport R from 'ramda';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport { LanesIsDisabled } from '@teambit/legacy/dist/consumer/lanes/exceptions/lanes-is-disabled';\nimport {\n  ApplyVersionResults,\n  MergeStrategy,\n  mergeVersion,\n  ApplyVersionResult,\n  FailedComponents,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport { ConsumerNotFound } from '@teambit/legacy/dist/consumer/exceptions';\nimport SnappingAspect, { SnappingMain } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport fs from 'fs-extra';\nimport mapSeries from 'p-map-series';\nimport path from 'path';\nimport { BitId, BitIds } from '@teambit/legacy/dist/bit-id';\nimport { COMPONENT_ORIGINS } from '@teambit/legacy/dist/constants';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport logger from '@teambit/legacy/dist/logger/logger';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { 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 Component from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport checkoutVersion, { 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 { DivergeData } from '@teambit/legacy/dist/scope/component-ops/diverge-data';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\n\nexport type ComponentStatus = {\n  componentFromFS?: Component | null;\n  componentFromModel?: Version;\n  id: BitId;\n  failureMessage?: string;\n  unchangedLegitimately?: boolean; // failed to merge but for a legitimate reason, such as, up-to-date\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: DivergeData;\n};\n\nexport class MergingMain {\n  private consumer: Consumer;\n  constructor(private workspace: Workspace, private snapping: SnappingMain) {\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  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new ConsumerNotFound();\n    const consumer: Consumer = this.workspace.consumer;\n    if (consumer.isLegacy && (noSnap || message || abort || resolve)) {\n      throw new LanesIsDisabled();\n    }\n    let mergeResults;\n    const firstValue = R.head(values);\n    if (resolve) {\n      mergeResults = await this.resolveMerge(consumer, values, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(consumer, 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(consumer, bitIds, mergeStrategy, noSnap, message, build);\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  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      remoteName: currentLaneId.isDefault() ? null : currentLaneId.scope,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    remoteName,\n    laneId,\n    localLane,\n    noSnap,\n    snapMessage,\n    build,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentStatus[];\n    remoteName: string | null;\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    snapMessage: string;\n    build: boolean;\n  }) {\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.failureMessage)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        failureMessage: componentStatus.failureMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.failureMessage);\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(succeededComponents, async ({ componentFromFS, id, mergeResults }) => {\n      const modelComponent = await consumer.scope.getModelComponent(id);\n      return this.applyVersion({\n        consumer,\n        componentFromFS,\n        id,\n        mergeResults,\n        mergeStrategy,\n        remoteHead: modelComponent.getRef(id.version as string) as Ref,\n        remoteName: remoteName || componentFromFS?.scope || null,\n        laneId,\n        localLane,\n      });\n    });\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, it localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    const mergeSnapResults = noSnap ? null : await this.snapResolvedComponents(consumer, snapMessage, build);\n\n    return { components: componentsResults, failedComponents, mergeSnapResults };\n  }\n\n  async getComponentMergeStatus(\n    id: BitId,\n    localLane: Lane | null,\n    otherLaneName: string,\n    existingOnWorkspaceOnly = false\n  ): Promise<ComponentStatus> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentStatus = { id };\n    const returnFailure = (msg: string, unchangedLegitimately = false) => {\n      componentStatus.failureMessage = msg;\n      componentStatus.unchangedLegitimately = unchangedLegitimately;\n      return componentStatus;\n    };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      throw new GeneralError(\n        `component ${id.toString()} is on the lane 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 && unmerged.resolved === false) {\n      return returnFailure(\n        `component ${id.toStringWithoutVersion()} has conflicts that need to be resolved first, please use bit merge --resolve/--abort`\n      );\n    }\n    const version = id.version as string;\n    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, { ignoreVersion: true });\n    const existOnCurrentLane = existingBitMapId && consumer.bitMap.isIdAvailableOnCurrentLane(existingBitMapId);\n    const componentOnLane: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    if (!existingBitMapId && existingOnWorkspaceOnly) {\n      return returnFailure(`component ${id.toStringWithoutVersion()} is not in the workspace`);\n    }\n    if (!existingBitMapId || !existOnCurrentLane) {\n      return { componentFromFS: null, componentFromModel: componentOnLane, id, mergeResults: null };\n    }\n    const currentlyUsedVersion = existingBitMapId.version;\n    if (currentlyUsedVersion === version) {\n      // @todo: maybe this check is not needed as we check for diverge later on\n      if (localLane || modelComponent.hasHead()) {\n        return returnFailure(`component ${id.toStringWithoutVersion()} is already merged`, true);\n      }\n    }\n    const component = await consumer.loadComponent(existingBitMapId);\n    const componentModificationStatus = await consumer.getComponentStatusById(component.id);\n    if (componentModificationStatus.modified) {\n      throw new GeneralError(\n        `unable to merge ${id.toStringWithoutVersion()}, the component is modified, please snap/tag it first`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const laneHeadIsDifferentThanCheckedOut =\n      localLane && currentlyUsedVersion && modelComponent.laneHeadLocal?.toString() !== currentlyUsedVersion;\n    const localHead = laneHeadIsDifferentThanCheckedOut ? Ref.from(currentlyUsedVersion) : null;\n\n    const otherLaneHead = modelComponent.getRef(version);\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData(repo, modelComponent, otherLaneHead, localHead);\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isLocalAhead()) {\n        // do nothing!\n        return returnFailure(`component ${component.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isRemoteAhead()) {\n        // just override with the model data\n        return {\n          componentFromFS: component,\n          componentFromModel: componentOnLane,\n          id,\n          mergeResults: null,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return returnFailure(`component ${component.id.toString()} is already merged`, true);\n    }\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n    const mergeResults = await threeWayMerge({\n      consumer,\n      otherComponent,\n      // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n      otherLabel: `${otherLaneHead.toString()} (${otherLaneName})`,\n      currentComponent: component,\n      currentLabel: `${currentlyUsedVersion} (local)`,\n      baseComponent,\n    });\n    return { componentFromFS: component, id, mergeResults, divergeData };\n  }\n\n  private async applyVersion({\n    consumer,\n    componentFromFS,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    remoteName,\n    laneId,\n    localLane,\n  }: {\n    consumer: Consumer;\n    componentFromFS: Component | null | undefined;\n    id: BitId;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    remoteName: string | null;\n    laneId: LaneId;\n    localLane: Lane | null;\n  }): Promise<ApplyVersionResult> {\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.name, scope: id.scope },\n      // @ts-ignore\n      head: remoteHead,\n      // @ts-ignore\n      remote: remoteName,\n      lane: laneId.name,\n      resolved: false, // could be changed later\n    };\n    id = componentFromFS ? componentFromFS.id : id;\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      if (!componentFromFS) throw new Error(`applyVersion expect to get componentFromFS for ${id.toString()}`);\n      componentFromFS.files.forEach((file) => {\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n      unmergedComponent.resolved = true;\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n\n      return { id, filesStatus };\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 componentMap = componentFromFS && componentFromFS.componentMap;\n    if (componentFromFS && !componentMap) throw new GeneralError('applyVersion: componentMap was not found');\n    if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED && !id.scope) {\n      componentWithDependencies.dependencies = [];\n      componentWithDependencies.devDependencies = [];\n    }\n    const shouldWritePackageJson = async (): Promise<boolean> => {\n      if (!componentMap) return true;\n      const rootDir = componentMap && componentMap.rootDir;\n      if (!rootDir) return false;\n      const packageJsonPath = path.join(consumer.getPath(), rootDir, 'package.json');\n      return fs.pathExists(packageJsonPath);\n    };\n    const shouldInstallNpmPackages = (): boolean => {\n      if (componentMap && componentMap.origin === COMPONENT_ORIGINS.AUTHORED) return false;\n      return true;\n    };\n    const writePackageJson = await shouldWritePackageJson();\n\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(\n        files,\n        mergeResults,\n        mergeStrategy,\n        // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n        componentWithDependencies.component.originallySharedDir\n      );\n      componentWithDependencies.component.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n    const shouldDependenciesSaveAsComponents = await consumer.shouldDependenciesSavedAsComponents([id]);\n    componentWithDependencies.component.dependenciesSavedAsComponents =\n      shouldDependenciesSaveAsComponents[0].saveDependenciesAsComponents;\n\n    const manyComponentsWriter = new ManyComponentsWriter({\n      consumer,\n      componentsWithDependencies: [componentWithDependencies],\n      installNpmPackages: shouldInstallNpmPackages(),\n      override: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      verbose: false, // @todo: do we need a flag here?\n      writeDists: true, // @todo: do we need a flag here?\n      writePackageJson,\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.resolved = false;\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      } else {\n        unmergedComponent.resolved = true;\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      const modelComponent = await consumer.scope.getModelComponent(id);\n      if (!consumer.isLegacy) {\n        modelComponent.setHead(remoteHead);\n        // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n        modelComponent.markVersionAsLocal(remoteHead.toString());\n      }\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return { id, filesStatus };\n  }\n\n  private async abortMerge(consumer: Consumer, values: string[]): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnresolved(consumer, values);\n    // @ts-ignore not clear yet what to do with other flags\n    const results = await checkoutVersion(consumer, { ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id.name));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(\n    consumer: Consumer,\n    values: string[],\n    snapMessage: string,\n    build: boolean\n  ): Promise<ApplyVersionResults> {\n    const ids = this.getIdsForUnresolved(consumer, values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: BitIds.fromArray(ids),\n      resolveUnmerged: true,\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<ComponentStatus[]> {\n    const tmp = new Tmp(this.consumer.scope);\n    try {\n      const componentsStatus = await Promise.all(\n        bitIds.map(async (bitId) => {\n          const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n          const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n          const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n          const laneIdStr = remoteLaneId.toString();\n          if (!remoteHead)\n            throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n          return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);\n        })\n      );\n      await tmp.clear();\n      return componentsStatus;\n    } catch (err: any) {\n      await tmp.clear();\n      throw err;\n    }\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<null | { snappedComponents: Component[]; autoSnappedResults: AutoTagResult[] }> {\n    const resolvedComponents = consumer.scope.objects.unmergedComponents.getResolvedComponents();\n    logger.debug(`merge-snaps, snapResolvedComponents, total ${resolvedComponents.length.toString()} components`);\n    if (!resolvedComponents.length) return null;\n    const ids = BitIds.fromArray(resolvedComponents.map((r) => new BitId(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private getIdsForUnresolved(consumer: Consumer, idsStr?: string[]): BitId[] {\n    if (idsStr && idsStr.length) {\n      const bitIds = idsStr.map((id) => consumer.getParsedId(id));\n      bitIds.forEach((id) => {\n        const entry = consumer.scope.objects.unmergedComponents.getEntry(id.name);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return bitIds;\n    }\n    const unresolvedComponents = 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) => 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];\n  static runtime = MainRuntime;\n  static async provider([cli, workspace, snapping]: [CLIMain, Workspace, SnappingMain]) {\n    const merging = new MergingMain(workspace, snapping);\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.74",
+  "version": "0.0.75",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.74"
+    "version": "0.0.75"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -17,10 +17,10 @@
     "core-js": "^3.0.0",
     "@teambit/harmony": "0.3.3",
     "@teambit/bit-error": "0.0.394",
-    "@teambit/cli": "0.0.501",
-    "@teambit/lane-id": "0.0.20",
-    "@teambit/snapping": "0.0.74",
-    "@teambit/workspace": "0.0.759"
+    "@teambit/cli": "0.0.502",
+    "@teambit/lane-id": "0.0.21",
+    "@teambit/snapping": "0.0.75",
+    "@teambit/workspace": "0.0.760"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -32,7 +32,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.281",
+    "@teambit/legacy": "1.0.282",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
@@ -60,7 +60,7 @@
         "react": "-"
       },
       "peerDependencies": {
-        "@teambit/legacy": "1.0.281",
+        "@teambit/legacy": "1.0.282",
         "react-dom": "^16.8.0 || ^17.0.0",
         "react": "^16.8.0 || ^17.0.0"
       }