@teambit/merging 1.0.112 → 1.0.114

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

@@ -104,11 +104,11 @@ export declare class MergingMain {
     /**
      * merge multiple components according to the "allComponentsStatus".
      */
-    mergeSnaps({ mergeStrategy, allComponentsStatus, laneId, localLane, noSnap, tag, snapMessage, build, skipDependencyInstallation, }: {
+    mergeSnaps({ mergeStrategy, allComponentsStatus, otherLaneId, currentLane, noSnap, tag, snapMessage, build, skipDependencyInstallation, }: {
         mergeStrategy: MergeStrategy;
         allComponentsStatus: ComponentMergeStatus[];
-        laneId: LaneId;
-        localLane: Lane | null;
+        otherLaneId: LaneId;
+        currentLane: Lane | null;
         noSnap: boolean;
         tag?: boolean;
         snapMessage: string;

package/dist/merging.main.runtime.js

@@ -271,8 +271,8 @@ class MergingMain {
     return this.mergeSnaps({
       mergeStrategy,
       allComponentsStatus,
-      laneId: currentLaneId,
-      localLane: currentLaneObject,
+      otherLaneId: currentLaneId,
+      currentLane: currentLaneObject,
       noSnap,
       snapMessage,
       build,
@@ -286,8 +286,8 @@ class MergingMain {
   async mergeSnaps({
     mergeStrategy,
     allComponentsStatus,
-    laneId,
-    localLane,
+    otherLaneId,
+    currentLane,
     noSnap,
     tag,
     snapMessage,
@@ -306,18 +306,18 @@ class MergingMain {
     }));
     const componentIdsToRemove = allComponentsStatus.filter(componentStatus => componentStatus.shouldBeRemoved).map(c => c.id.changeVersion(undefined));
     const succeededComponents = allComponentsStatus.filter(componentStatus => !componentStatus.unchangedMessage);
-    const componentsResults = await this.applyVersionMultiple(succeededComponents, laneId, mergeStrategy, localLane);
+    const componentsResults = await this.applyVersionMultiple(succeededComponents, otherLaneId, mergeStrategy, currentLane);
     const allConfigMerge = (0, _lodash().compact)(succeededComponents.map(c => c.configMergeResult));
     const {
       workspaceDepsUpdates,
       workspaceDepsConflicts
     } = await this.updateWorkspaceJsoncWithDepsIfNeeded(allConfigMerge);
     await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);
-    if (localLane) consumer.scope.objects.add(localLane);
-    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads
+    if (currentLane) consumer.scope.objects.add(currentLane);
+    await consumer.scope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads
 
     await consumer.scope.objects.unmergedComponents.write();
-    await consumer.writeBitMap(`merge ${laneId.toString()}`);
+    await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);
     if (componentIdsToRemove.length) {
       const compBitIdsToRemove = _componentId().ComponentIdList.fromArray(componentIdsToRemove);
       await (0, _deleteComponentFiles().default)(consumer, compBitIdsToRemove);
@@ -548,7 +548,7 @@ class MergingMain {
     const mergeStatusProvider = new (_mergeStatusProvider().MergeStatusProvider)(this.workspace, this.logger, this.importer, currentLane || undefined, otherLane || undefined, options);
     return mergeStatusProvider.getStatus(bitIds);
   }
-  async applyVersionMultiple(succeededComponents, laneId, mergeStrategy, localLane) {
+  async applyVersionMultiple(succeededComponents, otherLaneId, mergeStrategy, currentLane) {
     const componentsResults = await (0, _pMapSeries().default)(succeededComponents, async ({
       currentComponent,
       id,
@@ -557,15 +557,15 @@ class MergingMain {
       configMergeResult
     }) => {
       const modelComponent = await this.workspace.consumer.scope.getModelComponent(id);
-      const updatedLaneId = laneId.isDefault() ? _laneId().LaneId.from(laneId.name, id.scope) : laneId;
+      const updatedLaneId = otherLaneId.isDefault() ? _laneId().LaneId.from(otherLaneId.name, id.scope) : otherLaneId;
       return this.applyVersion({
         currentComponent,
         id,
         mergeResults,
         mergeStrategy,
         remoteHead: modelComponent.getRef(id.version),
-        laneId: updatedLaneId,
-        localLane,
+        otherLaneId: updatedLaneId,
+        currentLane,
         resolvedUnrelated,
         configMergeResult
       });
@@ -588,34 +588,41 @@ class MergingMain {
     mergeResults,
     mergeStrategy,
     remoteHead,
-    laneId,
-    localLane,
+    otherLaneId,
+    currentLane,
     resolvedUnrelated,
     configMergeResult
   }) {
     const consumer = this.workspace.consumer;
     let filesStatus = {};
     const unmergedComponent = {
-      // @ts-ignore
       id: {
         name: id.fullName,
         scope: id.scope
       },
       head: remoteHead,
-      laneId
+      laneId: otherLaneId
     };
     id = currentComponent ? currentComponent.id : id;
     const modelComponent = await consumer.scope.getModelComponent(id);
+    const addToCurrentLane = head => {
+      if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');
+      if (otherLaneId.isDefault()) {
+        const isPartOfLane = currentLane.components.find(c => c.id.isEqualWithoutVersion(id));
+        if (!isPartOfLane) return;
+      }
+      currentLane.addComponent({
+        id,
+        head
+      });
+    };
     const handleResolveUnrelated = legacyCompToWrite => {
       if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');
       // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane
       // first and then merge with --resolve-unrelated
-      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');
+      if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');
       if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');
-      localLane.addComponent({
-        id,
-        head: resolvedUnrelated.headOnCurrentLane
-      });
+      addToCurrentLane(resolvedUnrelated.headOnCurrentLane);
       unmergedComponent.unrelated = {
         unrelatedHead: resolvedUnrelated.unrelatedHead,
         headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,
@@ -687,15 +694,12 @@ class MergingMain {
         unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter(f => f.conflict).map(f => f.filePath);
       }
       consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);
-    } else if (localLane) {
+    } else if (currentLane) {
       if (resolvedUnrelated) {
         // must be "theirs"
         return handleResolveUnrelated(legacyComponent);
       }
-      localLane.addComponent({
-        id,
-        head: remoteHead
-      });
+      addToCurrentLane(remoteHead);
     } else {
       // this is main
       modelComponent.setHead(remoteHead);

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

@@ -1 +1 @@
-{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","laneId","localLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","name","includes","version","conflictDeps","conflictDepsSources","mergedConfigConflict","notConflictedPackages","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","dep","reasonForChange","getMergeStatus","currentLane","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","applyVersion","remoteHead","getRef","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","handleResolveUnrelated","addComponent","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: ComponentID;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: ComponentID[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: {\n    snappedComponents: ConsumerComponent[];\n    autoSnappedResults: AutoTagResult[];\n    removedComponents?: ComponentIdList;\n  } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy('merge');\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: ComponentID[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      laneId: currentLaneId,\n      localLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    laneId,\n    localLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    laneId: LaneId;\n    localLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unchangedMessage)\n      .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        unchangedMessage: componentStatus.unchangedMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n\n    const componentIdsToRemove = allComponentsStatus\n      .filter((componentStatus) => componentStatus.shouldBeRemoved)\n      .map((c) => c.id.changeVersion(undefined));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n    const componentsResults = await this.applyVersionMultiple(succeededComponents, laneId, mergeStrategy, localLane);\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n      allConfigMerge\n    );\n\n    await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\n\n    if (localLane) consumer.scope.objects.add(localLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if localLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap(`merge ${laneId.toString()}`);\n\n    if (componentIdsToRemove.length) {\n      const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(\n    allConfigMerge: ConfigMergeResult[],\n    workspaceDepsConflicts?: WorkspaceDepsConflicts\n  ) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    if (workspaceDepsConflicts) {\n      const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n        {\n          id: DependencyResolverAspect.id,\n          conflict: workspaceDepsConflicts,\n        },\n      ]);\n      allConfigMerge.unshift(workspaceConflict);\n    }\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write({ reasonForChange: 'merge (update dependencies)' });\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: MergeStatusProviderOptions\n  ): Promise<ComponentMergeStatus[]> {\n    const mergeStatusProvider = new MergeStatusProvider(\n      this.workspace,\n      this.logger,\n      this.importer,\n      currentLane || undefined,\n      otherLane || undefined,\n      options\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    laneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    localLane: Lane | null\n  ): Promise<ApplyVersionWithComps[]> {\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await this.workspace.consumer.scope.getModelComponent(id);\n        const updatedLaneId = laneId.isDefault() ? LaneId.from(laneId.name, id.scope as string) : laneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          laneId: updatedLaneId,\n          localLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n    const manyComponentsWriterOpts = {\n      consumer: this.workspace.consumer,\n      components: compsToWrite,\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      reasonForBitmapChange: 'merge',\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    return componentsResults;\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    laneId,\n    localLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: ComponentID;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    laneId: LaneId;\n    localLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      // @ts-ignore\n      id: { name: id.fullName, scope: id.scope },\n      head: remoteHead,\n      laneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n    const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!localLane) throw new Error('localLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n      localLane.addComponent({ id, head: resolvedUnrelated.headOnCurrentLane });\n      unmergedComponent.unrelated = {\n        unrelatedHead: resolvedUnrelated.unrelatedHead,\n        headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n        unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n      };\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n    if (configMergeResult) {\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (localLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated(legacyComponent);\n      }\n      localLane.addComponent({ id, head: remoteHead });\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return {\n      applyVersionResult: { id, filesStatus },\n      component: currentComponent || undefined,\n      legacyCompToWrite: legacyComponent,\n    };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: ComponentID[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject, { shouldSquash: false });\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<SnapResults | null> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(\n    idsToTag: ComponentID[],\n    tagMessage: string,\n    build: boolean\n  ): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n    globalConfig,\n  ]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove\n    );\n    cli.register(new MergeCmd(merging, globalConfig));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}
+{"version":3,"names":["_cli","data","require","_semver","_interopRequireDefault","_workspace","_interopRequireWildcard","_componentsList","_mergeVersion","_snapping","_hasWildcard","_pMapSeries","_componentId","_bitError","_generalError","_laneId","_chalk","_config","_remove","_utils","_componentWriter","_importer","_logger","_globalConfig","_lodash","_dependencyResolver","_checkout","_constants","_deleteComponentFiles","_install","_mergeCmd","_merging","_configMergeResult","_mergeStatusProvider","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","key","value","_toPropertyKey","configurable","writable","_toPrimitive","String","Symbol","toPrimitive","TypeError","Number","MergingMain","constructor","workspace","install","snapping","checkout","logger","componentWriter","importer","config","remove","merge","ids","mergeStrategy","abort","resolve","noSnap","message","build","skipDependencyInstallation","OutsideWorkspaceError","consumer","mergeResults","resolveMerge","abortMerge","bitIds","getComponentsToMerge","mergeComponentsFromRemote","onDestroy","snapMessage","currentLaneId","getCurrentLaneId","currentLaneObject","getCurrentLaneObject","allComponentsStatus","getAllComponentsStatus","failedComponents","c","unchangedMessage","unchangedLegitimately","failureMsgs","map","failedComponent","chalk","bold","id","toString","red","join","BitError","mergeSnaps","otherLaneId","currentLane","tag","componentWithConflict","find","component","hasConflicts","getMergeStrategyInteractive","componentStatus","shouldBeRemoved","componentIdsToRemove","changeVersion","undefined","succeededComponents","componentsResults","applyVersionMultiple","allConfigMerge","compact","configMergeResult","workspaceDepsUpdates","workspaceDepsConflicts","updateWorkspaceJsoncWithDepsIfNeeded","generateConfigMergeConflictFileForAll","scope","objects","add","persist","unmergedComponents","write","writeBitMap","compBitIdsToRemove","ComponentIdList","fromArray","deleteComponentsFiles","cleanFromBitMap","componentsHasConfigMergeConflicts","some","leftUnresolvedConflicts","dedupe","updateExisting","import","err","error","consoleError","getSnapOrTagResults","idsToTag","results","tagAllLaneComponent","taggedComponents","autoTaggedResults","removedComponents","snappedComponents","autoSnappedResults","snapResolvedComponents","mergeSnapResults","mergeSnapError","bitMapSnapshot","bitMap","takeSnapshot","restoreFromSnapshot","components","applyVersionResult","configMergeFile","getConflictMergeFile","workspaceConflict","ConfigMergeResult","DependencyResolverAspect","conflict","unshift","configMerge","generateMergeConflictFile","addConflict","compIdStr","hasConflict","allResults","getDepsResolverResult","nonConflictDeps","nonConflictSources","mergedConfig","mergedConfigPolicy","policy","DEPENDENCIES_FIELDS","depField","pkg","force","name","includes","version","conflictDeps","conflictDepsSources","mergedConfigConflict","notConflictedPackages","conflictedPackages","workspaceConfig","Error","depResolver","extensions","findCoreExtension","workspaceJsonUpdates","pkgName","currentVer","newVer","debug","WS_DEPS_FIELDS","workspaceJsonConflicts","dependencies","peerDependencies","conflictPackagesToRemoveFromConfigMerge","conflictRaw","currentVal","otherVal","split","currentVerInWsJson","semver","satisfies","replace","isEmpty","result","dep","reasonForChange","getMergeStatus","otherLane","options","mergeStatusProvider","MergeStatusProvider","getStatus","mapSeries","currentComponent","resolvedUnrelated","modelComponent","getModelComponent","updatedLaneId","isDefault","LaneId","from","applyVersion","remoteHead","getRef","compsToWrite","legacyCompToWrite","manyComponentsWriterOpts","writeConfig","reasonForBitmapChange","writeMany","filesStatus","unmergedComponent","fullName","head","laneId","addToCurrentLane","isPartOfLane","isEqualWithoutVersion","addComponent","handleResolveUnrelated","headOnCurrentLane","unrelated","unrelatedHead","unrelatedLaneId","addEntry","markAllFilesAsUnchanged","files","file","pathNormalizeToLinux","relative","FileStatus","unchanged","MergeOptions","ours","strategy","remoteId","idToLoad","theirs","legacyComponent","loadComponentFromModelImportIfNeeded","updateFileStatus","modifiedStatus","modifiedFiles","applyModifiedVersion","removeFilesIfNeeded","successfullyMergedConfig","getSuccessfullyMergedConfig","manual","unmergedPaths","f","filePath","setHead","markVersionAsLocal","values","getIdsForUnmerged","reset","removeComponent","abortedComponents","snap","legacyBitIds","resolvedComponents","localLaneObject","Promise","all","bitId","remoteScopeName","remoteLaneId","remoteLanes","laneIdStr","toStringWithoutVersion","shouldSquash","getComponents","ComponentID","fromObject","tagMessage","unmodified","idsStr","componentIds","resolveMultipleComponentIds","entry","getEntry","GeneralError","unresolvedComponents","componentsList","ComponentsList","mergePending","listMergePendingComponents","hasWildcard","listComponentsByIdsWithWildcard","getParsedId","provider","cli","loggerMain","compWriter","globalConfig","createLogger","MergingAspect","merging","register","MergeCmd","exports","CLIAspect","WorkspaceAspect","SnappingAspect","CheckoutAspect","InstallAspect","LoggerAspect","ComponentWriterAspect","ImporterAspect","ConfigAspect","RemoveAspect","GlobalConfigAspect","MainRuntime","addRuntime"],"sources":["merging.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport semver from 'semver';\nimport WorkspaceAspect, { OutsideWorkspaceError, Workspace } from '@teambit/workspace';\nimport { Consumer } from '@teambit/legacy/dist/consumer';\nimport ComponentsList from '@teambit/legacy/dist/consumer/component/components-list';\nimport {\n  MergeStrategy,\n  FileStatus,\n  getMergeStrategyInteractive,\n  MergeOptions,\n} from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport SnappingAspect, { SnapResults, SnappingMain, TagResults } from '@teambit/snapping';\nimport hasWildcard from '@teambit/legacy/dist/utils/string/has-wildcard';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { BitError } from '@teambit/bit-error';\nimport GeneralError from '@teambit/legacy/dist/error/general-error';\nimport { LaneId } from '@teambit/lane-id';\nimport { AutoTagResult } from '@teambit/legacy/dist/scope/component-ops/auto-tag';\nimport { UnmergedComponent } from '@teambit/legacy/dist/scope/lanes/unmerged-components';\nimport { Lane, ModelComponent } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport chalk from 'chalk';\nimport { ConfigAspect, ConfigMain } from '@teambit/config';\nimport RemoveAspect, { RemoveMain } from '@teambit/remove';\nimport { pathNormalizeToLinux } from '@teambit/legacy/dist/utils';\nimport { ComponentWriterAspect, ComponentWriterMain } from '@teambit/component-writer';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport ImporterAspect, { ImporterMain } from '@teambit/importer';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport GlobalConfigAspect, { GlobalConfigMain } from '@teambit/global-config';\nimport { compact, isEmpty } from 'lodash';\nimport { MergeResultsThreeWay } from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { DependencyResolverAspect, WorkspacePolicyConfigKeysNames } from '@teambit/dependency-resolver';\nimport {\n  ApplyVersionWithComps,\n  CheckoutAspect,\n  CheckoutMain,\n  ComponentStatusBase,\n  applyModifiedVersion,\n  removeFilesIfNeeded,\n  updateFileStatus,\n} from '@teambit/checkout';\nimport { DEPENDENCIES_FIELDS } from '@teambit/legacy/dist/constants';\nimport deleteComponentsFiles from '@teambit/legacy/dist/consumer/component-ops/delete-component-files';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { InstallMain, InstallAspect } from '@teambit/install';\nimport { MergeCmd } from './merge-cmd';\nimport { MergingAspect } from './merging.aspect';\nimport { ConfigMergeResult } from './config-merge-result';\nimport { MergeStatusProvider, MergeStatusProviderOptions } from './merge-status-provider';\n\ntype ResolveUnrelatedData = {\n  strategy: MergeStrategy;\n  headOnCurrentLane: Ref;\n  unrelatedHead: Ref;\n  unrelatedLaneId: LaneId;\n};\ntype PkgEntry = { name: string; version: string; force: boolean };\n\nexport type WorkspaceDepsUpdates = { [pkgName: string]: [string, string] }; // from => to\nexport type WorkspaceDepsConflicts = Record<WorkspacePolicyConfigKeysNames, Array<{ name: string; version: string }>>; // the pkg value is in a format of CONFLICT::OURS::THEIRS\n\nexport type ComponentMergeStatus = ComponentStatusBase & {\n  mergeResults?: MergeResultsThreeWay | null;\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  configMergeResult?: ConfigMergeResult;\n};\n\nexport type ComponentMergeStatusBeforeMergeAttempt = ComponentStatusBase & {\n  divergeData?: SnapsDistance;\n  resolvedUnrelated?: ResolveUnrelatedData;\n  mergeProps?: {\n    otherLaneHead: Ref;\n    currentId: ComponentID;\n    modelComponent: ModelComponent;\n  };\n};\n\nexport type FailedComponents = { id: ComponentID; unchangedMessage: string; unchangedLegitimately?: boolean };\n\n// fileName is PathLinux. TS doesn't let anything else in the keys other than string and number\nexport type FilesStatus = { [fileName: string]: keyof typeof FileStatus };\n\nexport type ApplyVersionResult = { id: ComponentID; filesStatus: FilesStatus };\n\nexport type ApplyVersionResults = {\n  components?: ApplyVersionResult[];\n  version?: string;\n  failedComponents?: FailedComponents[];\n  removedComponents?: ComponentID[];\n  addedComponents?: ComponentID[]; // relevant when restoreMissingComponents is true (e.g. bit lane merge-abort)\n  resolvedComponents?: ConsumerComponent[]; // relevant for bit merge --resolve\n  abortedComponents?: ApplyVersionResult[]; // relevant for bit merge --abort\n  mergeSnapResults?: {\n    snappedComponents: ConsumerComponent[];\n    autoSnappedResults: AutoTagResult[];\n    removedComponents?: ComponentIdList;\n  } | null;\n  mergeSnapError?: Error;\n  leftUnresolvedConflicts?: boolean;\n  verbose?: boolean;\n  newFromLane?: string[];\n  newFromLaneAdded?: boolean;\n  installationError?: Error; // in case the package manager failed, it won't throw, instead, it'll return error here\n  compilationError?: Error; // in case the compiler failed, it won't throw, instead, it'll return error here\n  workspaceDepsUpdates?: WorkspaceDepsUpdates; // in case workspace.jsonc has been updated with dependencies versions\n};\n\nexport class MergingMain {\n  constructor(\n    private workspace: Workspace,\n    private install: InstallMain,\n    private snapping: SnappingMain,\n    private checkout: CheckoutMain,\n    private logger: Logger,\n    private componentWriter: ComponentWriterMain,\n    private importer: ImporterMain,\n    private config: ConfigMain,\n    private remove: RemoveMain\n  ) {}\n\n  async merge(\n    ids: string[],\n    mergeStrategy: MergeStrategy,\n    abort: boolean,\n    resolve: boolean,\n    noSnap: boolean,\n    message: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    if (!this.workspace) throw new OutsideWorkspaceError();\n    const consumer: Consumer = this.workspace.consumer;\n    let mergeResults;\n    if (resolve) {\n      mergeResults = await this.resolveMerge(ids, message, build);\n    } else if (abort) {\n      mergeResults = await this.abortMerge(ids);\n    } else {\n      const bitIds = await this.getComponentsToMerge(consumer, ids);\n      mergeResults = await this.mergeComponentsFromRemote(\n        consumer,\n        bitIds,\n        mergeStrategy,\n        noSnap,\n        message,\n        build,\n        skipDependencyInstallation\n      );\n    }\n    await consumer.onDestroy('merge');\n    return mergeResults;\n  }\n\n  /**\n   * when user is on main, it merges the remote main components into local.\n   * when user is on a lane, it merges the remote lane components into the local lane.\n   */\n  async mergeComponentsFromRemote(\n    consumer: Consumer,\n    bitIds: ComponentID[],\n    mergeStrategy: MergeStrategy,\n    noSnap: boolean,\n    snapMessage: string,\n    build: boolean,\n    skipDependencyInstallation: boolean\n  ): Promise<ApplyVersionResults> {\n    const currentLaneId = consumer.getCurrentLaneId();\n    const currentLaneObject = await consumer.getCurrentLaneObject();\n    const allComponentsStatus = await this.getAllComponentsStatus(bitIds, currentLaneId, currentLaneObject);\n    const failedComponents = allComponentsStatus.filter((c) => c.unchangedMessage && !c.unchangedLegitimately);\n    if (failedComponents.length) {\n      const failureMsgs = failedComponents\n        .map(\n          (failedComponent) =>\n            `${chalk.bold(failedComponent.id.toString())} - ${chalk.red(failedComponent.unchangedMessage as string)}`\n        )\n        .join('\\n');\n      throw new BitError(`unable to merge due to the following failures:\\n${failureMsgs}`);\n    }\n\n    return this.mergeSnaps({\n      mergeStrategy,\n      allComponentsStatus,\n      otherLaneId: currentLaneId,\n      currentLane: currentLaneObject,\n      noSnap,\n      snapMessage,\n      build,\n      skipDependencyInstallation,\n    });\n  }\n\n  /**\n   * merge multiple components according to the \"allComponentsStatus\".\n   */\n  async mergeSnaps({\n    mergeStrategy,\n    allComponentsStatus,\n    otherLaneId,\n    currentLane,\n    noSnap,\n    tag,\n    snapMessage,\n    build,\n    skipDependencyInstallation,\n  }: {\n    mergeStrategy: MergeStrategy;\n    allComponentsStatus: ComponentMergeStatus[];\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    noSnap: boolean;\n    tag?: boolean;\n    snapMessage: string;\n    build: boolean;\n    skipDependencyInstallation?: boolean;\n  }): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const componentWithConflict = allComponentsStatus.find(\n      (component) => component.mergeResults && component.mergeResults.hasConflicts\n    );\n    if (componentWithConflict && !mergeStrategy) {\n      mergeStrategy = await getMergeStrategyInteractive();\n    }\n    const failedComponents: FailedComponents[] = allComponentsStatus\n      .filter((componentStatus) => componentStatus.unchangedMessage)\n      .filter((componentStatus) => !componentStatus.shouldBeRemoved)\n      .map((componentStatus) => ({\n        id: componentStatus.id,\n        unchangedMessage: componentStatus.unchangedMessage as string,\n        unchangedLegitimately: componentStatus.unchangedLegitimately,\n      }));\n\n    const componentIdsToRemove = allComponentsStatus\n      .filter((componentStatus) => componentStatus.shouldBeRemoved)\n      .map((c) => c.id.changeVersion(undefined));\n\n    const succeededComponents = allComponentsStatus.filter((componentStatus) => !componentStatus.unchangedMessage);\n\n    const componentsResults = await this.applyVersionMultiple(\n      succeededComponents,\n      otherLaneId,\n      mergeStrategy,\n      currentLane\n    );\n\n    const allConfigMerge = compact(succeededComponents.map((c) => c.configMergeResult));\n\n    const { workspaceDepsUpdates, workspaceDepsConflicts } = await this.updateWorkspaceJsoncWithDepsIfNeeded(\n      allConfigMerge\n    );\n\n    await this.generateConfigMergeConflictFileForAll(allConfigMerge, workspaceDepsConflicts);\n\n    if (currentLane) consumer.scope.objects.add(currentLane);\n\n    await consumer.scope.objects.persist(); // persist anyway, if currentLane is null it should save all main heads\n\n    await consumer.scope.objects.unmergedComponents.write();\n\n    await consumer.writeBitMap(`merge ${otherLaneId.toString()}`);\n\n    if (componentIdsToRemove.length) {\n      const compBitIdsToRemove = ComponentIdList.fromArray(componentIdsToRemove);\n      await deleteComponentsFiles(consumer, compBitIdsToRemove);\n      await consumer.cleanFromBitMap(compBitIdsToRemove);\n    }\n\n    const componentsHasConfigMergeConflicts = allComponentsStatus.some((c) => c.configMergeResult?.hasConflicts());\n    const leftUnresolvedConflicts = componentWithConflict && mergeStrategy === 'manual';\n    if (!skipDependencyInstallation && !leftUnresolvedConflicts && !componentsHasConfigMergeConflicts) {\n      try {\n        await this.install.install(undefined, {\n          dedupe: true,\n          updateExisting: false,\n          import: false,\n        });\n      } catch (err: any) {\n        this.logger.error(`failed installing packages`, err);\n        this.logger.consoleError(`failed installing packages, see the log for full stacktrace. error: ${err.message}`);\n      }\n    }\n\n    const getSnapOrTagResults = async () => {\n      // if one of the component has conflict, don't snap-merge. otherwise, some of the components would be snap-merged\n      // and some not. besides the fact that it could by mistake tag dependent, it's a confusing state. better not snap.\n      if (noSnap || leftUnresolvedConflicts || componentsHasConfigMergeConflicts) {\n        return null;\n      }\n      if (tag) {\n        const idsToTag = allComponentsStatus.map((c) => c.id);\n        const results = await this.tagAllLaneComponent(idsToTag, snapMessage, build);\n        if (!results) return null;\n        const { taggedComponents, autoTaggedResults, removedComponents } = results;\n        return { snappedComponents: taggedComponents, autoSnappedResults: autoTaggedResults, removedComponents };\n      }\n      return this.snapResolvedComponents(consumer, snapMessage, build);\n    };\n    let mergeSnapResults: ApplyVersionResults['mergeSnapResults'] = null;\n    let mergeSnapError: Error | undefined;\n    const bitMapSnapshot = this.workspace.bitMap.takeSnapshot();\n    try {\n      mergeSnapResults = await getSnapOrTagResults();\n    } catch (err: any) {\n      mergeSnapError = err;\n      this.workspace.bitMap.restoreFromSnapshot(bitMapSnapshot);\n    }\n\n    return {\n      components: componentsResults.map((c) => c.applyVersionResult),\n      failedComponents,\n      removedComponents: [...componentIdsToRemove, ...(mergeSnapResults?.removedComponents || [])],\n      mergeSnapResults,\n      mergeSnapError,\n      leftUnresolvedConflicts,\n      workspaceDepsUpdates,\n    };\n  }\n\n  private async generateConfigMergeConflictFileForAll(\n    allConfigMerge: ConfigMergeResult[],\n    workspaceDepsConflicts?: WorkspaceDepsConflicts\n  ) {\n    const configMergeFile = this.workspace.getConflictMergeFile();\n    if (workspaceDepsConflicts) {\n      const workspaceConflict = new ConfigMergeResult('WORKSPACE', 'ours', 'theirs', [\n        {\n          id: DependencyResolverAspect.id,\n          conflict: workspaceDepsConflicts,\n        },\n      ]);\n      allConfigMerge.unshift(workspaceConflict);\n    }\n    allConfigMerge.forEach((configMerge) => {\n      const conflict = configMerge.generateMergeConflictFile();\n      if (!conflict) return;\n      configMergeFile.addConflict(configMerge.compIdStr, conflict);\n    });\n    if (configMergeFile.hasConflict()) {\n      await configMergeFile.write();\n    }\n  }\n\n  private async updateWorkspaceJsoncWithDepsIfNeeded(\n    allConfigMerge: ConfigMergeResult[]\n  ): Promise<{ workspaceDepsUpdates?: WorkspaceDepsUpdates; workspaceDepsConflicts?: WorkspaceDepsConflicts }> {\n    const allResults = allConfigMerge.map((c) => c.getDepsResolverResult());\n\n    // aggregate all dependencies that can be updated (not conflicting)\n    const nonConflictDeps: { [pkgName: string]: string[] } = {};\n    const nonConflictSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfig = configMerge.getDepsResolverResult()?.mergedConfig;\n      if (!mergedConfig || mergedConfig === '-') return;\n      const mergedConfigPolicy = mergedConfig.policy || {};\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigPolicy[depField]) return;\n        mergedConfigPolicy[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (nonConflictDeps[pkg.name]) {\n            if (!nonConflictDeps[pkg.name].includes(pkg.version)) nonConflictDeps[pkg.name].push(pkg.version);\n            nonConflictSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          nonConflictDeps[pkg.name] = [pkg.version];\n          nonConflictSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    // aggregate all dependencies that have conflicts\n    const conflictDeps: { [pkgName: string]: string[] } = {};\n    const conflictDepsSources: { [pkgName: string]: string[] } = {}; // for logging/debugging purposes\n    allConfigMerge.forEach((configMerge) => {\n      const mergedConfigConflict = configMerge.getDepsResolverResult()?.conflict;\n      if (!mergedConfigConflict) return;\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!mergedConfigConflict[depField]) return;\n        mergedConfigConflict[depField].forEach((pkg: PkgEntry) => {\n          if (pkg.force) return; // we only care about auto-detected dependencies\n          if (conflictDeps[pkg.name]) {\n            if (!conflictDeps[pkg.name].includes(pkg.version)) conflictDeps[pkg.name].push(pkg.version);\n            conflictDepsSources[pkg.name].push(configMerge.compIdStr);\n            return;\n          }\n          conflictDeps[pkg.name] = [pkg.version];\n          conflictDepsSources[pkg.name] = [configMerge.compIdStr];\n        });\n      });\n    });\n\n    const notConflictedPackages = Object.keys(nonConflictDeps);\n    const conflictedPackages = Object.keys(conflictDeps);\n    if (!notConflictedPackages.length && !conflictedPackages.length) return {};\n\n    const workspaceConfig = this.config.workspaceConfig;\n    if (!workspaceConfig) throw new Error(`updateWorkspaceJsoncWithDepsIfNeeded unable to get workspace config`);\n    const depResolver = workspaceConfig.extensions.findCoreExtension(DependencyResolverAspect.id);\n    const policy = depResolver?.config.policy;\n    if (!policy) {\n      return {};\n    }\n\n    // calculate the workspace.json updates\n    const workspaceJsonUpdates = {};\n    notConflictedPackages.forEach((pkgName) => {\n      if (nonConflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      DEPENDENCIES_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return; // doesn't exists in the workspace.json\n        const currentVer = policy[depField][pkgName];\n        const newVer = nonConflictDeps[pkgName][0];\n        if (currentVer === newVer) return;\n        workspaceJsonUpdates[pkgName] = [currentVer, newVer];\n        policy[depField][pkgName] = newVer;\n        this.logger.debug(\n          `update workspace.jsonc: ${pkgName} from ${currentVer} to ${newVer}. Triggered by: ${nonConflictSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n\n    // calculate the workspace.json conflicts\n    const WS_DEPS_FIELDS = ['dependencies', 'peerDependencies'];\n    const workspaceJsonConflicts = { dependencies: [], peerDependencies: [] };\n    const conflictPackagesToRemoveFromConfigMerge: string[] = [];\n    conflictedPackages.forEach((pkgName) => {\n      if (conflictDeps[pkgName].length > 1) {\n        // we only want the deps that the other lane has them in the workspace.json and that all comps use the same dep.\n        return;\n      }\n      const conflictRaw = conflictDeps[pkgName][0];\n      const [, currentVal, otherVal] = conflictRaw.split('::');\n\n      WS_DEPS_FIELDS.forEach((depField) => {\n        if (!policy[depField]?.[pkgName]) return;\n        const currentVerInWsJson = policy[depField][pkgName];\n        if (!currentVerInWsJson) return;\n        // the version is coming from the workspace.jsonc\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        if (semver.satisfies(otherVal, currentVerInWsJson)) {\n          // the other version is compatible with the current version in the workspace.json\n          return;\n        }\n        workspaceJsonConflicts[depField].push({\n          name: pkgName,\n          version: conflictRaw.replace(currentVal, currentVerInWsJson),\n          force: false,\n        });\n        conflictPackagesToRemoveFromConfigMerge.push(pkgName);\n        this.logger.debug(\n          `conflict workspace.jsonc: ${pkgName} current: ${currentVerInWsJson}, other: ${otherVal}. Triggered by: ${conflictDepsSources[\n            pkgName\n          ].join(', ')}`\n        );\n      });\n    });\n    WS_DEPS_FIELDS.forEach((depField) => {\n      if (isEmpty(workspaceJsonConflicts[depField])) delete workspaceJsonConflicts[depField];\n    });\n\n    if (conflictPackagesToRemoveFromConfigMerge.length) {\n      allResults.forEach((result) => {\n        if (result?.conflict) {\n          DEPENDENCIES_FIELDS.forEach((depField) => {\n            if (!result.conflict?.[depField]) return;\n            result.conflict[depField] = result.conflict?.[depField].filter(\n              (dep) => !conflictPackagesToRemoveFromConfigMerge.includes(dep.name)\n            );\n            if (!result.conflict[depField].length) delete result.conflict[depField];\n          });\n          if (isEmpty(result.conflict)) result.conflict = undefined;\n        }\n      });\n    }\n\n    if (Object.keys(workspaceJsonUpdates).length) {\n      await workspaceConfig.write({ reasonForChange: 'merge (update dependencies)' });\n    }\n\n    this.logger.debug('final workspace.jsonc updates', workspaceJsonUpdates);\n    this.logger.debug('final workspace.jsonc conflicts', workspaceJsonConflicts);\n\n    return {\n      workspaceDepsUpdates: Object.keys(workspaceJsonUpdates).length ? workspaceJsonUpdates : undefined,\n      workspaceDepsConflicts: Object.keys(workspaceJsonConflicts).length ? workspaceJsonConflicts : undefined,\n    };\n  }\n\n  /**\n   * this function gets called from two different commands:\n   * 1. \"bit merge <ids...>\", when merging a component from a remote to the local.\n   * in this case, the remote and local are on the same lane or both on main.\n   * 2. \"bit lane merge\", when merging from one lane to another.\n   */\n  async getMergeStatus(\n    bitIds: ComponentID[], // the id.version is the version we want to merge to the current component\n    currentLane: Lane | null, // currently checked out lane. if on main, then it's null.\n    otherLane?: Lane | null, // the lane we want to merged to our lane. (null if it's \"main\").\n    options?: MergeStatusProviderOptions\n  ): Promise<ComponentMergeStatus[]> {\n    const mergeStatusProvider = new MergeStatusProvider(\n      this.workspace,\n      this.logger,\n      this.importer,\n      currentLane || undefined,\n      otherLane || undefined,\n      options\n    );\n    return mergeStatusProvider.getStatus(bitIds);\n  }\n\n  private async applyVersionMultiple(\n    succeededComponents: ComponentMergeStatus[],\n    otherLaneId: LaneId,\n    mergeStrategy: MergeStrategy,\n    currentLane: Lane | null\n  ): Promise<ApplyVersionWithComps[]> {\n    const componentsResults = await mapSeries(\n      succeededComponents,\n      async ({ currentComponent, id, mergeResults, resolvedUnrelated, configMergeResult }) => {\n        const modelComponent = await this.workspace.consumer.scope.getModelComponent(id);\n        const updatedLaneId = otherLaneId.isDefault() ? LaneId.from(otherLaneId.name, id.scope as string) : otherLaneId;\n        return this.applyVersion({\n          currentComponent,\n          id,\n          mergeResults,\n          mergeStrategy,\n          remoteHead: modelComponent.getRef(id.version as string) as Ref,\n          otherLaneId: updatedLaneId,\n          currentLane,\n          resolvedUnrelated,\n          configMergeResult,\n        });\n      }\n    );\n\n    const compsToWrite = compact(componentsResults.map((c) => c.legacyCompToWrite));\n\n    const manyComponentsWriterOpts = {\n      consumer: this.workspace.consumer,\n      components: compsToWrite,\n      skipDependencyInstallation: true,\n      writeConfig: false, // @todo: should write if config exists before, needs to figure out how to do it.\n      reasonForBitmapChange: 'merge',\n    };\n    await this.componentWriter.writeMany(manyComponentsWriterOpts);\n\n    return componentsResults;\n  }\n\n  private async applyVersion({\n    currentComponent,\n    id,\n    mergeResults,\n    mergeStrategy,\n    remoteHead,\n    otherLaneId,\n    currentLane,\n    resolvedUnrelated,\n    configMergeResult,\n  }: {\n    currentComponent: ConsumerComponent | null | undefined;\n    id: ComponentID;\n    mergeResults: MergeResultsThreeWay | null | undefined;\n    mergeStrategy: MergeStrategy;\n    remoteHead: Ref;\n    otherLaneId: LaneId;\n    currentLane: Lane | null;\n    resolvedUnrelated?: ResolveUnrelatedData;\n    configMergeResult?: ConfigMergeResult;\n  }): Promise<ApplyVersionWithComps> {\n    const consumer = this.workspace.consumer;\n    let filesStatus = {};\n    const unmergedComponent: UnmergedComponent = {\n      id: { name: id.fullName, scope: id.scope },\n      head: remoteHead,\n      laneId: otherLaneId,\n    };\n    id = currentComponent ? currentComponent.id : id;\n\n    const modelComponent = await consumer.scope.getModelComponent(id);\n\n    const addToCurrentLane = (head: Ref) => {\n      if (!currentLane) throw new Error('currentLane must be defined when adding to the lane');\n      if (otherLaneId.isDefault()) {\n        const isPartOfLane = currentLane.components.find((c) => c.id.isEqualWithoutVersion(id));\n        if (!isPartOfLane) return;\n      }\n      currentLane.addComponent({ id, head });\n    };\n\n    const handleResolveUnrelated = (legacyCompToWrite?: ConsumerComponent) => {\n      if (!currentComponent) throw new Error('currentComponent must be defined when resolvedUnrelated');\n      // because when on a main, we don't allow merging lanes with unrelated. we asks users to switch to the lane\n      // first and then merge with --resolve-unrelated\n      if (!currentLane) throw new Error('currentLane must be defined when resolvedUnrelated');\n      if (!resolvedUnrelated) throw new Error('resolvedUnrelated must be populated');\n      addToCurrentLane(resolvedUnrelated.headOnCurrentLane);\n      unmergedComponent.unrelated = {\n        unrelatedHead: resolvedUnrelated.unrelatedHead,\n        headOnCurrentLane: resolvedUnrelated.headOnCurrentLane,\n        unrelatedLaneId: resolvedUnrelated.unrelatedLaneId,\n      };\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent, legacyCompToWrite };\n    };\n\n    const markAllFilesAsUnchanged = () => {\n      if (!currentComponent) throw new Error(`applyVersion expect to get currentComponent for ${id.toString()}`);\n      currentComponent.files.forEach((file) => {\n        filesStatus[pathNormalizeToLinux(file.relative)] = FileStatus.unchanged;\n      });\n    };\n    if (mergeResults && mergeResults.hasConflicts && mergeStrategy === MergeOptions.ours) {\n      markAllFilesAsUnchanged();\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n      return { applyVersionResult: { id, filesStatus }, component: currentComponent || undefined };\n    }\n    if (resolvedUnrelated?.strategy === 'ours') {\n      markAllFilesAsUnchanged();\n      return handleResolveUnrelated();\n    }\n    const remoteId = id.changeVersion(remoteHead.toString());\n    const idToLoad = !mergeResults || mergeStrategy === MergeOptions.theirs ? remoteId : id;\n    const legacyComponent = await consumer.loadComponentFromModelImportIfNeeded(idToLoad);\n    if (mergeResults && mergeStrategy === MergeOptions.theirs) {\n      // in this case, we don't want to update .bitmap with the version of the remote. we want to keep the same version\n      legacyComponent.version = id.version;\n    }\n    const files = legacyComponent.files;\n    updateFileStatus(files, filesStatus, currentComponent || undefined);\n\n    if (mergeResults) {\n      // update files according to the merge results\n      const { filesStatus: modifiedStatus, modifiedFiles } = applyModifiedVersion(files, mergeResults, mergeStrategy);\n      legacyComponent.files = modifiedFiles;\n      filesStatus = { ...filesStatus, ...modifiedStatus };\n    }\n\n    await removeFilesIfNeeded(filesStatus, currentComponent || undefined);\n\n    if (configMergeResult) {\n      const successfullyMergedConfig = configMergeResult.getSuccessfullyMergedConfig();\n      if (successfullyMergedConfig) {\n        unmergedComponent.mergedConfig = successfullyMergedConfig;\n        // no need to `unmergedComponents.addEntry` here. it'll be added in the next lines inside `if (mergeResults)`.\n        // because if `configMergeResult` is set, `mergeResults` must be set as well. both happen on diverge.\n      }\n    }\n\n    // if mergeResults, the head snap is going to be updated on a later phase when snapping with two parents\n    // otherwise, update the head of the current lane or main\n    if (mergeResults) {\n      if (mergeResults.hasConflicts && mergeStrategy === MergeOptions.manual) {\n        unmergedComponent.unmergedPaths = mergeResults.modifiedFiles.filter((f) => f.conflict).map((f) => f.filePath);\n      }\n      consumer.scope.objects.unmergedComponents.addEntry(unmergedComponent);\n    } else if (currentLane) {\n      if (resolvedUnrelated) {\n        // must be \"theirs\"\n        return handleResolveUnrelated(legacyComponent);\n      }\n      addToCurrentLane(remoteHead);\n    } else {\n      // this is main\n      modelComponent.setHead(remoteHead);\n      // mark it as local, otherwise, when importing this component from a remote, it'll override it.\n      modelComponent.markVersionAsLocal(remoteHead.toString());\n      consumer.scope.objects.add(modelComponent);\n    }\n\n    return {\n      applyVersionResult: { id, filesStatus },\n      component: currentComponent || undefined,\n      legacyCompToWrite: legacyComponent,\n    };\n  }\n\n  private async abortMerge(values: string[]): Promise<ApplyVersionResults> {\n    const consumer = this.workspace.consumer;\n    const ids = await this.getIdsForUnmerged(values);\n    const results = await this.checkout.checkout({ ids, reset: true });\n    ids.forEach((id) => consumer.scope.objects.unmergedComponents.removeComponent(id));\n    await consumer.scope.objects.unmergedComponents.write();\n    return { abortedComponents: results.components };\n  }\n\n  private async resolveMerge(values: string[], snapMessage: string, build: boolean): Promise<ApplyVersionResults> {\n    const ids = await this.getIdsForUnmerged(values);\n    // @ts-ignore AUTO-ADDED-AFTER-MIGRATION-PLEASE-FIX!\n    const { snappedComponents } = await this.snapping.snap({\n      legacyBitIds: ComponentIdList.fromArray(ids.map((id) => id)),\n      build,\n      message: snapMessage,\n    });\n    return { resolvedComponents: snappedComponents };\n  }\n\n  private async getAllComponentsStatus(\n    bitIds: ComponentID[],\n    laneId: LaneId,\n    localLaneObject: Lane | null\n  ): Promise<ComponentMergeStatus[]> {\n    const ids = await Promise.all(\n      bitIds.map(async (bitId) => {\n        const remoteScopeName = laneId.isDefault() ? bitId.scope : laneId.scope;\n        const remoteLaneId = LaneId.from(laneId.name, remoteScopeName as string);\n        const remoteHead = await this.workspace.consumer.scope.objects.remoteLanes.getRef(remoteLaneId, bitId);\n        const laneIdStr = remoteLaneId.toString();\n        if (!remoteHead) {\n          throw new BitError(`unable to find a remote head of \"${bitId.toStringWithoutVersion()}\" in \"${laneIdStr}\"`);\n        }\n        return bitId.changeVersion(remoteHead.toString());\n      })\n    );\n\n    return this.getMergeStatus(ids, localLaneObject, localLaneObject, { shouldSquash: false });\n  }\n\n  private async snapResolvedComponents(\n    consumer: Consumer,\n    snapMessage: string,\n    build: boolean\n  ): Promise<SnapResults | null> {\n    const unmergedComponents = consumer.scope.objects.unmergedComponents.getComponents();\n    this.logger.debug(`merge-snaps, snapResolvedComponents, total ${unmergedComponents.length.toString()} components`);\n    if (!unmergedComponents.length) return null;\n    const ids = ComponentIdList.fromArray(unmergedComponents.map((r) => ComponentID.fromObject(r.id)));\n    return this.snapping.snap({\n      legacyBitIds: ids,\n      build,\n      message: snapMessage,\n    });\n  }\n\n  private async tagAllLaneComponent(\n    idsToTag: ComponentID[],\n    tagMessage: string,\n    build: boolean\n  ): Promise<TagResults | null> {\n    const ids = idsToTag.map((id) => {\n      return id.toStringWithoutVersion();\n    });\n    this.logger.debug(`merge-snaps, tagResolvedComponents, total ${idsToTag.length.toString()} components`);\n    return this.snapping.tag({\n      ids,\n      build,\n      message: tagMessage,\n      unmodified: true,\n    });\n  }\n\n  private async getIdsForUnmerged(idsStr?: string[]): Promise<ComponentID[]> {\n    if (idsStr && idsStr.length) {\n      const componentIds = await this.workspace.resolveMultipleComponentIds(idsStr);\n      componentIds.forEach((id) => {\n        const entry = this.workspace.consumer.scope.objects.unmergedComponents.getEntry(id);\n        if (!entry) {\n          throw new GeneralError(`unable to merge-resolve ${id.toString()}, it is not marked as unresolved`);\n        }\n      });\n      return componentIds;\n    }\n    const unresolvedComponents = this.workspace.consumer.scope.objects.unmergedComponents.getComponents();\n    if (!unresolvedComponents.length) throw new GeneralError(`all components are resolved already, nothing to do`);\n    return unresolvedComponents.map((u) => ComponentID.fromObject(u.id));\n  }\n\n  private async getComponentsToMerge(consumer: Consumer, ids: string[]): Promise<ComponentID[]> {\n    const componentsList = new ComponentsList(consumer);\n    if (!ids.length) {\n      const mergePending = await componentsList.listMergePendingComponents();\n      return mergePending.map((c) => c.id);\n    }\n    if (hasWildcard(ids)) {\n      return componentsList.listComponentsByIdsWithWildcard(ids);\n    }\n    return ids.map((id) => consumer.getParsedId(id));\n  }\n\n  static slots = [];\n  static dependencies = [\n    CLIAspect,\n    WorkspaceAspect,\n    SnappingAspect,\n    CheckoutAspect,\n    InstallAspect,\n    LoggerAspect,\n    ComponentWriterAspect,\n    ImporterAspect,\n    ConfigAspect,\n    RemoveAspect,\n    GlobalConfigAspect,\n  ];\n  static runtime = MainRuntime;\n  static async provider([\n    cli,\n    workspace,\n    snapping,\n    checkout,\n    install,\n    loggerMain,\n    compWriter,\n    importer,\n    config,\n    remove,\n    globalConfig,\n  ]: [\n    CLIMain,\n    Workspace,\n    SnappingMain,\n    CheckoutMain,\n    InstallMain,\n    LoggerMain,\n    ComponentWriterMain,\n    ImporterMain,\n    ConfigMain,\n    RemoveMain,\n    GlobalConfigMain\n  ]) {\n    const logger = loggerMain.createLogger(MergingAspect.id);\n    const merging = new MergingMain(\n      workspace,\n      install,\n      snapping,\n      checkout,\n      logger,\n      compWriter,\n      importer,\n      config,\n      remove\n    );\n    cli.register(new MergeCmd(merging, globalConfig));\n    return merging;\n  }\n}\n\nMergingAspect.addRuntime(MergingMain);\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/merging",
-  "version": "1.0.112",
+  "version": "1.0.114",
   "homepage": "https://bit.cloud/teambit/component/merging",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "merging",
-    "version": "1.0.112"
+    "version": "1.0.114"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -18,20 +18,20 @@
     "@teambit/bit-error": "0.0.404",
     "@teambit/lane-id": "0.0.311",
     "@teambit/harmony": "0.4.6",
-    "@teambit/dependency-resolver": "1.0.112",
-    "@teambit/builder": "1.0.112",
-    "@teambit/envs": "1.0.112",
+    "@teambit/dependency-resolver": "1.0.114",
+    "@teambit/builder": "1.0.114",
+    "@teambit/envs": "1.0.114",
     "@teambit/logger": "0.0.935",
     "@teambit/cli": "0.0.842",
     "@teambit/global-config": "0.0.844",
-    "@teambit/importer": "1.0.112",
-    "@teambit/workspace": "1.0.112",
-    "@teambit/checkout": "1.0.112",
-    "@teambit/component-writer": "1.0.112",
-    "@teambit/config": "0.0.863",
-    "@teambit/install": "1.0.112",
-    "@teambit/remove": "1.0.112",
-    "@teambit/snapping": "1.0.112"
+    "@teambit/importer": "1.0.114",
+    "@teambit/workspace": "1.0.114",
+    "@teambit/checkout": "1.0.114",
+    "@teambit/component-writer": "1.0.114",
+    "@teambit/config": "0.0.865",
+    "@teambit/install": "1.0.114",
+    "@teambit/remove": "1.0.114",
+    "@teambit/snapping": "1.0.114"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",