@teambit/merging 0.0.41 → 0.0.42

package/dist/merging.main.runtime.js

@@ -161,6 +161,16 @@ function _constants() {
   return data;
 }
 
+function _bitError() {
+  const data = require("@teambit/bit-error");
+
+  _bitError = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _generalError() {
   const data = _interopRequireDefault(require("@teambit/legacy/dist/error/general-error"));
 
@@ -344,21 +354,15 @@ class MergingMain {
 
 
   async mergeComponentsFromRemote(consumer, bitIds, mergeStrategy, noSnap, snapMessage, build) {
-    const localLaneId = consumer.getCurrentLaneId();
-    const localLaneObject = await consumer.getCurrentLaneObject();
-    const remoteTrackedLane = consumer.scope.lanes.getRemoteTrackedDataByLocalLane(localLaneId.name);
-
-    if (!localLaneId.isDefault() && !remoteTrackedLane) {
-      throw new Error(`unable to find a remote tracked to the local lane "${localLaneId.name}"`);
-    }
-
-    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, localLaneId, localLaneObject, remoteTrackedLane);
+    const currentLaneId = consumer.getCurrentLaneId();
+    const currentLaneObject = await consumer.getCurrentLaneObject();
+    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);
     return this.mergeSnaps({
       mergeStrategy,
       allComponentsStatus,
-      remoteName: remoteTrackedLane ? remoteTrackedLane.remoteScope : null,
-      laneId: localLaneId,
-      localLane: localLaneObject,
+      remoteName: currentLaneId.isDefault() ? null : currentLaneId.scope,
+      laneId: currentLaneId,
+      localLane: currentLaneObject,
       noSnap,
       snapMessage,
       build
@@ -704,20 +708,19 @@ class MergingMain {
     };
   }
 
-  async getAllComponentsStatus(bitIds, localLaneId, localLaneObject, remoteTrackedLane) {
+  async getAllComponentsStatus(bitIds, laneId, localLaneObject) {
     const tmp = new (_repositories().Tmp)(this.consumer.scope);
 
     try {
       const componentsStatus = await Promise.all(bitIds.map(async bitId => {
-        const remoteLaneName = remoteTrackedLane ? remoteTrackedLane.remoteLane : localLaneId.name;
-        const remoteScopeName = remoteTrackedLane ? remoteTrackedLane.remoteScope : bitId.scope;
+        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;
 
-        const remoteLaneId = _laneId().RemoteLaneId.from(remoteLaneName, remoteScopeName);
+        const remoteLaneId = _laneId().LaneId.from(laneId.name, remoteScopeName);
 
         const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);
-        const remoteLaneIdStr = remoteLaneId.toString();
-        if (!remoteHead) throw new (_generalError().default)(`unable to find a remote head of "${bitId.toStringWithoutVersion()}" in "${remoteLaneIdStr}"`);
-        return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, remoteLaneIdStr);
+        const laneIdStr = remoteLaneId.toString();
+        if (!remoteHead) throw new (_bitError().BitError)(`unable to find a remote head of "${bitId.toStringWithoutVersion()}" in "${laneIdStr}"`);
+        return this.getComponentMergeStatus(bitId.changeVersion(remoteHead.toString()), localLaneObject, laneIdStr);
       }));
       await tmp.clear();
       return componentsStatus;

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

@@ -1 +1 @@
-{"version":3,"sources":["merging.main.runtime.ts"],"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","onDestroy","snapMessage","localLaneId","getCurrentLaneId","localLaneObject","getCurrentLaneObject","remoteTrackedLane","scope","lanes","getRemoteTrackedDataByLocalLane","name","isDefault","Error","allComponentsStatus","getAllComponentsStatus","mergeSnaps","remoteName","remoteScope","laneId","localLane","componentWithConflict","find","component","hasConflicts","failedComponents","filter","componentStatus","failureMessage","map","id","unchangedLegitimately","succeededComponents","componentsResults","componentFromFS","modelComponent","getModelComponent","applyVersion","remoteHead","getRef","objects","add","persist","unmergedComponents","write","mergeSnapResults","snapResolvedComponents","components","getComponentMergeStatus","otherLaneName","existingOnWorkspaceOnly","returnFailure","msg","getModelComponentIfExist","GeneralError","toString","unmerged","getEntry","resolved","toStringWithoutVersion","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","existOnCurrentLane","isIdAvailableOnCurrentLane","componentOnLane","loadVersion","componentFromModel","currentlyUsedVersion","hasHead","loadComponent","componentModificationStatus","getComponentStatusById","modified","repo","laneHeadIsDifferentThanCheckedOut","laneHeadLocal","localHead","Ref","from","otherLaneHead","divergeData","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","baseComponent","otherComponent","otherLabel","currentComponent","currentLabel","filesStatus","unmergedComponent","remote","lane","MergeOptions","ours","files","forEach","file","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","originallySharedDir","shouldDependenciesSaveAsComponents","shouldDependenciesSavedAsComponents","dependenciesSavedAsComponents","saveDependenciesAsComponents","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writeAll","manual","unmergedPaths","f","conflict","filePath","addComponent","setHead","markVersionAsLocal","getIdsForUnresolved","results","reset","removeComponent","abortedComponents","snappedComponents","snap","legacyBitIds","BitIds","fromArray","resolveUnmerged","resolvedComponents","tmp","Tmp","componentsStatus","Promise","all","bitId","remoteLaneName","remoteLane","remoteScopeName","remoteLaneId","RemoteLaneId","remoteLanes","remoteLaneIdStr","clear","err","getResolvedComponents","logger","debug","length","r","idsStr","getParsedId","entry","unresolvedComponents","getComponents","u","componentsList","ComponentsList","listComponentsByIdsWithWildcard","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","MainRuntime","MergingAspect","addRuntime"],"mappings":"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","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 GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId, RemoteLaneId, LocalLaneId } 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 { TrackLane } from '@teambit/legacy/dist/scope/scope-json';\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 localLaneId = consumer.getCurrentLaneId();\n    const localLaneObject = await consumer.getCurrentLaneObject();\n    const remoteTrackedLane = consumer.scope.lanes.getRemoteTrackedDataByLocalLane(localLaneId.name);\n    if (!localLaneId.isDefault() && !remoteTrackedLane) {\n      throw new Error(`unable to find a remote tracked to the local lane \"${localLaneId.name}\"`);\n    }\n    const allComponentsStatus = await this.getAllComponentsStatus(\n      bitIds,\n      localLaneId,\n      localLaneObject,\n      remoteTrackedLane\n    );\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      remoteName: remoteTrackedLane ? remoteTrackedLane.remoteScope : null,\n      laneId: localLaneId,\n      localLane: localLaneObject,\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    localLaneId: LocalLaneId,\n    localLaneObject: Lane | null,\n    remoteTrackedLane?: TrackLane\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 remoteLaneName = remoteTrackedLane ? remoteTrackedLane.remoteLane : localLaneId.name;\n          const remoteScopeName = remoteTrackedLane ? remoteTrackedLane.remoteScope : bitId.scope;\n          const remoteLaneId = RemoteLaneId.from(remoteLaneName, remoteScopeName as string);\n          const remoteHead = await this.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n          const remoteLaneIdStr = remoteLaneId.toString();\n          if (!remoteHead)\n            throw new GeneralError(\n              `unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${remoteLaneIdStr}\"`\n            );\n          return this.getComponentMergeStatus(\n            bitId.changeVersion(remoteHead.toString()),\n            localLaneObject,\n            remoteLaneIdStr\n          );\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"]}
+{"version":3,"sources":["merging.main.runtime.ts"],"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","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","mergeSnaps","remoteName","isDefault","scope","laneId","localLane","componentWithConflict","find","component","hasConflicts","failedComponents","filter","componentStatus","failureMessage","map","id","unchangedLegitimately","succeededComponents","componentsResults","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","isDiverged","isLocalAhead","isRemoteAhead","baseSnap","commonSnapBeforeDiverge","baseComponent","otherComponent","otherLabel","currentComponent","currentLabel","filesStatus","unmergedComponent","remote","lane","MergeOptions","ours","files","forEach","file","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","originallySharedDir","shouldDependenciesSaveAsComponents","shouldDependenciesSavedAsComponents","dependenciesSavedAsComponents","saveDependenciesAsComponents","manyComponentsWriter","ManyComponentsWriter","componentsWithDependencies","installNpmPackages","override","writeConfig","verbose","writeDists","writeAll","manual","unmergedPaths","f","conflict","filePath","addComponent","setHead","markVersionAsLocal","getIdsForUnresolved","results","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","componentsList","ComponentsList","listComponentsByIdsWithWildcard","provider","cli","merging","register","MergeCmd","CLIAspect","WorkspaceAspect","SnappingAspect","MainRuntime","MergingAspect","addRuntime"],"mappings":"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","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"]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "homepage": "https://bit.dev/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "0.0.41"
+    "version": "0.0.42"
   },
   "dependencies": {
     "chalk": "4.1.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.485",
-    "@teambit/lane-id": "0.0.4",
-    "@teambit/snapping": "0.0.41",
-    "@teambit/workspace": "0.0.726"
+    "@teambit/cli": "0.0.486",
+    "@teambit/lane-id": "0.0.5",
+    "@teambit/snapping": "0.0.42",
+    "@teambit/workspace": "0.0.727"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",
@@ -32,7 +32,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.264",
+    "@teambit/legacy": "1.0.265",
     "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.264",
+        "@teambit/legacy": "1.0.265",
         "react-dom": "^16.8.0 || ^17.0.0",
         "react": "^16.8.0 || ^17.0.0"
       }