@teambit/merging 1.0.161 → 1.0.162

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { MergingAspect } from './merging.aspect';
 export { mergeReport, applyVersionReport, conflictSummaryReport, installationErrorOutput, compilationErrorOutput, getRemovedOutput, getAddedOutput, getWorkspaceConfigUpdateOutput, } from './merge-cmd';
+export { compIsAlreadyMergedMsg } from './merge-status-provider';
 export type { MergingMain, ComponentMergeStatus, ApplyVersionResults, ApplyVersionResult, FilesStatus, FailedComponents, } from './merging.main.runtime';
 export default MergingAspect;
 export { MergingAspect };

package/dist/index.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "applyVersionReport", {
     return _mergeCmd().applyVersionReport;
   }
 });
+Object.defineProperty(exports, "compIsAlreadyMergedMsg", {
+  enumerable: true,
+  get: function () {
+    return _mergeStatusProvider().compIsAlreadyMergedMsg;
+  }
+});
 Object.defineProperty(exports, "compilationErrorOutput", {
   enumerable: true,
   get: function () {
@@ -72,6 +78,13 @@ function _mergeCmd() {
   };
   return data;
 }
+function _mergeStatusProvider() {
+  const data = require("./merge-status-provider");
+  _mergeStatusProvider = function () {
+    return data;
+  };
+  return data;
+}
 var _default = exports.default = _merging().MergingAspect;
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_merging","data","require","_mergeCmd","_default","exports","default","MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n  getAddedOutput,\n  getWorkspaceConfigUpdateOutput,\n} from './merge-cmd';\nexport type {\n  MergingMain,\n  ComponentMergeStatus,\n  ApplyVersionResults,\n  ApplyVersionResult,\n  FilesStatus,\n  FailedComponents,\n} from './merging.main.runtime';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AASqB,IAAAG,QAAA,GAAAC,OAAA,CAAAC,OAAA,GASNC,wBAAa"}
+{"version":3,"names":["_merging","data","require","_mergeCmd","_mergeStatusProvider","_default","exports","default","MergingAspect"],"sources":["index.ts"],"sourcesContent":["import { MergingAspect } from './merging.aspect';\n\nexport {\n  mergeReport,\n  applyVersionReport,\n  conflictSummaryReport,\n  installationErrorOutput,\n  compilationErrorOutput,\n  getRemovedOutput,\n  getAddedOutput,\n  getWorkspaceConfigUpdateOutput,\n} from './merge-cmd';\nexport { compIsAlreadyMergedMsg } from './merge-status-provider';\nexport type {\n  MergingMain,\n  ComponentMergeStatus,\n  ApplyVersionResults,\n  ApplyVersionResult,\n  FilesStatus,\n  FailedComponents,\n} from './merging.main.runtime';\nexport default MergingAspect;\nexport { MergingAspect };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAAA,SAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,QAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAE,UAAA;EAAA,MAAAF,IAAA,GAAAC,OAAA;EAAAC,SAAA,YAAAA,CAAA;IAAA,OAAAF,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAUA,SAAAG,qBAAA;EAAA,MAAAH,IAAA,GAAAC,OAAA;EAAAE,oBAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAiE,IAAAI,QAAA,GAAAC,OAAA,CAAAC,OAAA,GASlDC,wBAAa"}

package/dist/merge-status-provider.d.ts

@@ -4,6 +4,7 @@ import { ComponentID } from '@teambit/component-id';
 import { Lane } from '@teambit/legacy/dist/scope/models';
 import { ImporterMain } from '@teambit/importer';
 import { Logger } from '@teambit/logger';
+import { ScopeMain } from '@teambit/scope';
 import { ComponentMergeStatus } from './merging.main.runtime';
 export type MergeStatusProviderOptions = {
     resolveUnrelated?: MergeStrategy;
@@ -11,14 +12,16 @@ export type MergeStatusProviderOptions = {
     ignoreConfigChanges?: boolean;
     shouldSquash?: boolean;
 };
+export declare const compIsAlreadyMergedMsg = "component is already merged";
 export declare class MergeStatusProvider {
-    private workspace;
+    private scope;
     private logger;
     private importer;
     private options;
+    private workspace?;
     private currentLane?;
     private otherLane?;
-    constructor(workspace: Workspace, logger: Logger, importer: ImporterMain, options: MergeStatusProviderOptions, currentLane?: Lane | undefined, // currently checked out lane. if on main, then it's undefined.
+    constructor(scope: ScopeMain, logger: Logger, importer: ImporterMain, options: MergeStatusProviderOptions, workspace?: Workspace | undefined, currentLane?: Lane | undefined, // currently checked out lane. if on main, then it's undefined.
     otherLane?: Lane | undefined);
     getStatus(bitIds: ComponentID[]): Promise<ComponentMergeStatus[]>;
     private getComponentMergeStatus;

package/dist/merge-status-provider.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MergeStatusProvider = void 0;
+exports.compIsAlreadyMergedMsg = exports.MergeStatusProvider = void 0;
 function _pMapSeries() {
   const data = _interopRequireDefault(require("p-map-series"));
   _pMapSeries = function () {
@@ -73,15 +73,17 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+const compIsAlreadyMergedMsg = exports.compIsAlreadyMergedMsg = 'component is already merged';
 class MergeStatusProvider {
-  constructor(workspace, logger, importer, options, currentLane,
+  constructor(scope, logger, importer, options, workspace, currentLane,
   // currently checked out lane. if on main, then it's undefined.
   otherLane // the lane we want to merged to our lane. (undefined if it's "main").
   ) {
-    this.workspace = workspace;
+    this.scope = scope;
     this.logger = logger;
     this.importer = importer;
     this.options = options;
+    this.workspace = workspace;
     this.currentLane = currentLane;
     this.otherLane = otherLane;
   }
@@ -106,7 +108,7 @@ class MergeStatusProvider {
       return (0, _lodash().compact)(versionsToImport).map(v => compStatus.id.changeVersion(v.toString()));
     }).flat();
     const reason = shouldImportHistoryOfOtherLane ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}` : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;
-    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(_componentId().ComponentIdList.fromArray(toImport), {
+    await this.scope.legacyScope.scopeImporter.importWithoutDeps(_componentId().ComponentIdList.fromArray(toImport), {
       lane: this.otherLane,
       cache: true,
       includeVersionHistory: false,
@@ -115,7 +117,7 @@ class MergeStatusProvider {
     const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(c => !c.mergeProps);
     const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter(c => c.mergeProps);
     const getComponentsStatusNeedMerge = async () => {
-      const tmp = new (_repositories().Tmp)(this.workspace.consumer.scope);
+      const tmp = new (_repositories().Tmp)(this.scope.legacyScope);
       try {
         const componentsStatus = await Promise.all(compStatusNeedMerge.map(compStatus => this.getComponentMergeStatus(compStatus)));
         await tmp.clear();
@@ -142,7 +144,7 @@ class MergeStatusProvider {
       currentId,
       modelComponent
     } = mergeProps;
-    const repo = this.workspace.consumer.scope.objects;
+    const repo = this.scope.legacyScope.objects;
     if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);
     if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);
     const baseSnap = divergeData.commonSnapBeforeDiverge; // must be set when isTrueMerge
@@ -157,11 +159,11 @@ other:   ${otherLaneHead.toString()}`);
     const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : _laneId().DEFAULT_LANE;
     const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;
     const otherLabel = `${otherLaneHead.toString()} (${otherLaneName === currentLaneName ? 'incoming' : otherLaneName})`;
-    const workspaceIds = await this.workspace.listIds();
+    const workspaceIds = (await this.workspace?.listIds()) || this.currentLane?.toComponentIds() || [];
     const configMerger = new (_configMerger().ComponentConfigMerger)(id.toStringWithoutVersion(), workspaceIds, this.otherLane, currentComponent.extensions, baseComponent.extensions, otherComponent.extensions, currentLabel, otherLabel, this.logger, this.options.mergeStrategy);
     const configMergeResult = configMerger.merge();
     const mergeResults = await (0, _threeWayMerge().default)({
-      consumer: this.workspace.consumer,
+      scope: this.scope.legacyScope,
       otherComponent,
       otherLabel,
       currentComponent,
@@ -185,25 +187,25 @@ other:   ${otherLaneHead.toString()}`);
     return componentStatus;
   }
   async getComponentStatusBeforeMergeAttempt(id) {
-    const consumer = this.workspace.consumer;
+    const consumer = this.workspace?.consumer;
     const componentStatus = {
       id
     };
-    const modelComponent = await consumer.scope.getModelComponentIfExist(id);
+    const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);
     if (!modelComponent) {
       return this.returnUnmerged(id, `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`);
     }
-    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id);
+    const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);
     if (unmerged) {
       return this.returnUnmerged(id, `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`);
     }
-    const repo = consumer.scope.objects;
+    const repo = this.scope.legacyScope.objects;
     const version = id.version;
     const otherLaneHead = modelComponent.getRef(version);
-    const existingBitMapId = consumer.bitMap.getComponentIdIfExist(id, {
+    const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, {
       ignoreVersion: true
     });
-    const componentOnOther = await modelComponent.loadVersion(version, consumer.scope.objects);
+    const componentOnOther = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);
     const idOnCurrentLane = this.currentLane?.getComponent(id);
     if (componentOnOther.isRemoved()) {
       // if exist in current lane, we want the current lane to get the soft-remove update.
@@ -245,8 +247,9 @@ other:   ${otherLaneHead.toString()}`);
       });
     }
     const getCurrentComponent = () => {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       if (existingBitMapId) return consumer.loadComponent(existingBitMapId);
-      return consumer.scope.getConsumerComponent(currentId);
+      return this.scope.legacyScope.getConsumerComponent(currentId);
     };
     const currentComponent = await getCurrentComponent();
     if (currentComponent.isRemoved()) {
@@ -271,6 +274,7 @@ other:   ${otherLaneHead.toString()}`);
       }
     }
     const isModified = async () => {
+      if (!consumer || !this.workspace) return undefined;
       const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);
       if (!componentModificationStatus.modified) return undefined;
       if (!existingBitMapId) return undefined;
@@ -292,19 +296,21 @@ other:   ${otherLaneHead.toString()}`);
     const divergeData = await (0, _getDivergeData().getDivergeData)({
       repo,
       modelComponent,
+      sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version),
+      // not sure if needs to check for this.workspace
       targetHead: otherLaneHead,
       throws: false
     });
     if (divergeData.err) {
       if (!(divergeData.err instanceof _noCommonSnap().NoCommonSnap) || !this.options?.resolveUnrelated) {
-        return this.returnUnmerged(id, `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`);
+        return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);
       }
       return this.handleNoCommonSnap(modelComponent, id, otherLaneHead, currentComponent, componentOnOther, divergeData);
     }
     if (!divergeData.isDiverged()) {
       if (divergeData.isSourceAhead()) {
-        // do nothing!
-        return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);
+        // component is ahead nothing to merge.
+        return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);
       }
       if (divergeData.isTargetAhead()) {
         // just override with the model data
@@ -315,7 +321,7 @@ other:   ${otherLaneHead.toString()}`);
         });
       }
       // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal
-      return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);
+      return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);
     }
 
     // it's diverged and needs merge operation
@@ -338,8 +344,7 @@ other:   ${otherLaneHead.toString()}`);
       resolveUnrelated = 'theirs';
     }
     if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);
-    const consumer = this.workspace.consumer;
-    const repo = consumer.scope.objects;
+    const repo = this.scope.legacyScope.objects;
     const mainHead = modelComponent.head;
     const returnAccordingToOurs = (headToSaveInLane, unrelatedHead, unrelatedLaneId) => {
       return {

package/dist/merge-status-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","MergeStatusProvider","constructor","workspace","logger","importer","options","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","scope","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","consumer","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","componentModificationStatus","getComponentStatusById","modified","undefined","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","sourceHead","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane","exports"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  mergeStrategy: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n};\n\nexport class MergeStatusProvider {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private importer: ImporterMain,\n    private options: MergeStatusProviderOptions,\n    private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n    private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n  ) {}\n\n  async getStatus(\n    bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      (!this.currentLane || // on main. we need all history in order to push each component to its remote\n        this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.workspace.consumer.scope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentMergeStatus(\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const repo = this.workspace.consumer.scope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n    const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = await this.workspace.listIds();\n    const configMerger = new ComponentConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      this.otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger,\n      this.options.mergeStrategy\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      consumer: this.workspace.consumer,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return { currentComponent, id, mergeResults, divergeData, configMergeResult };\n  }\n\n  private returnUnmerged(\n    id: ComponentID,\n    msg: string,\n    unmergedLegitimately = false\n  ): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unchangedMessage = msg;\n    componentStatus.unchangedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: ComponentID // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await consumer.scope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = consumer.scope.objects.unmergedComponents.getEntry(id);\n    if (unmerged) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n      );\n    }\n    const repo = consumer.scope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, consumer.scope.objects);\n    const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n    if (componentOnOther.isRemoved()) {\n      // if exist in current lane, we want the current lane to get the soft-remove update.\n      // or if it was removed with --update-main, we want to merge it so then main will get the update.\n      const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\n      if (shouldMerge) {\n        // remove the component from the workspace if exist.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n        // on lane, if it's not part of the current lane, don't merge it.\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (this.currentLane) {\n        if (!idOnCurrentLane) return null;\n        return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n    }\n    const getCurrentComponent = () => {\n      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);\n      return consumer.scope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.isRemoved()) {\n      // we have a few options:\n      // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n      // this lane. (even when main is ahead, we don't want to merge it).\n      // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // option #2 and #3 above\n        : true; // it's main. option #1 above.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return undefined;\n      if (!existingBitMapId) return undefined;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n      if (isSourceCodeModified) return 'code';\n      return 'config';\n    };\n\n    const modifiedType = await isModified();\n    if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n      return this.returnUnmerged(\n        id,\n        `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n      );\n    }\n    if (modifiedType === 'code') {\n      return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n    }\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. error: ${divergeData.err.message}`\n        );\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // do nothing!\n        return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is ahead, nothing to merge`, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return this.returnUnmerged(id, `component ${currentComponent.id.toString()} is already merged`, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n\n    return { ...componentStatus, currentComponent, mergeProps, divergeData };\n  }\n\n  private async handleNoCommonSnap(\n    modelComponent: ModelComponent,\n    id: ComponentID,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const consumer = this.workspace.consumer;\n    const repo = consumer.scope.objects;\n    const mainHead = modelComponent.head;\n\n    const returnAccordingToOurs = (\n      headToSaveInLane: Ref,\n      unrelatedHead: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      return {\n        currentComponent,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'ours',\n          headOnCurrentLane: headToSaveInLane,\n          unrelatedHead,\n          unrelatedLaneId,\n        },\n      };\n    };\n    const returnAccordingToTheirs = (\n      resolvedRef: Ref,\n      unrelatedHeadRef: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      // just override with the model data\n      return {\n        currentComponent,\n        componentFromModel: componentOnOther,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'theirs',\n          headOnCurrentLane: resolvedRef,\n          unrelatedHead: unrelatedHeadRef,\n          unrelatedLaneId,\n        },\n      };\n    };\n\n    const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n    if (!currentVersionRef)\n      throw new Error(\n        `handleNoCommonSnap, unable to get ref of current version \"${\n          currentComponent.id.version\n        }\" for \"${id.toString()}\"`\n      );\n    const otherVersionRef = modelComponent.getRef(id.version as string);\n    if (!otherVersionRef)\n      throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n    if (mainHead) {\n      const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n        const divergeDataFromMain = await getDivergeData({\n          repo,\n          modelComponent,\n          sourceHead: hashToCompare,\n          targetHead: mainHead,\n          throws: false,\n        });\n        if (!divergeDataFromMain.err) return true;\n        return !(divergeDataFromMain.err instanceof NoCommonSnap);\n      };\n      const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n      const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n      if (!hasResolvedLocally && !hasResolvedRemotely) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n        );\n      }\n      const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n      const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n      if (resolveUnrelated === 'ours') {\n        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      if (resolveUnrelated === 'theirs') {\n        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      throw new Error(\n        `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n      );\n    }\n\n    const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n    const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n    if (resolveUnrelated === 'ours') {\n      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n    }\n    if (resolveUnrelated === 'theirs') {\n      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n    }\n    throw new Error(\n      `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n    );\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_componentId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","obj","__esModule","default","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","compIsAlreadyMergedMsg","exports","MergeStatusProvider","constructor","scope","logger","importer","options","workspace","currentLane","otherLane","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","shouldImportHistoryOfOtherLane","shouldSquash","toImport","map","compStatus","divergeData","versionsToImport","commonSnapBeforeDiverge","snapsOnTargetOnly","compact","v","changeVersion","toString","flat","reason","legacyScope","scopeImporter","importWithoutDeps","ComponentIdList","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","toComponentIds","configMerger","ComponentConfigMerger","extensions","mergeStrategy","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unchangedMessage","unchangedLegitimately","consumer","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","getRef","existingBitMapId","bitMap","getComponentIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetNotAhead","isTargetAhead","shouldIgnore","isModified","undefined","componentModificationStatus","getComponentStatusById","modified","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","sourceHead","NoCommonSnap","resolveUnrelated","message","handleNoCommonSnap","isDiverged","isSourceAhead","mainHead","returnAccordingToOurs","headToSaveInLane","unrelatedHead","unrelatedLaneId","resolvedUnrelated","strategy","headOnCurrentLane","returnAccordingToTheirs","resolvedRef","unrelatedHeadRef","currentVersionRef","otherVersionRef","hasResolvedFromMain","hashToCompare","divergeDataFromMain","hasResolvedLocally","getHeadRegardlessOfLane","hasResolvedRemotely","refToSaveInLane"],"sources":["merge-status-provider.ts"],"sourcesContent":["import { Workspace } from '@teambit/workspace';\nimport { MergeStrategy } from '@teambit/legacy/dist/consumer/versions-ops/merge-version';\nimport mapSeries from 'p-map-series';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { DEFAULT_LANE, LaneId } from '@teambit/lane-id';\nimport { getDivergeData } from '@teambit/legacy/dist/scope/component-ops/get-diverge-data';\nimport { Lane, ModelComponent, Version } from '@teambit/legacy/dist/scope/models';\nimport { Ref } from '@teambit/legacy/dist/scope/objects';\nimport { Tmp } from '@teambit/legacy/dist/scope/repositories';\nimport ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';\nimport { ImporterMain } from '@teambit/importer';\nimport { Logger } from '@teambit/logger';\nimport { compact } from 'lodash';\nimport threeWayMerge from '@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge';\nimport { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';\nimport { NoCommonSnap } from '@teambit/legacy/dist/scope/exceptions/no-common-snap';\nimport { ComponentConfigMerger } from '@teambit/config-merger';\nimport { ScopeMain } from '@teambit/scope';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport type MergeStatusProviderOptions = {\n  resolveUnrelated?: MergeStrategy;\n  mergeStrategy: MergeStrategy;\n  ignoreConfigChanges?: boolean;\n  shouldSquash?: boolean;\n};\n\nexport const compIsAlreadyMergedMsg = 'component is already merged';\nexport class MergeStatusProvider {\n  constructor(\n    private scope: ScopeMain,\n    private logger: Logger,\n    private importer: ImporterMain,\n    private options: MergeStatusProviderOptions,\n    private workspace?: Workspace,\n    private currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.\n    private otherLane?: Lane // the lane we want to merged to our lane. (undefined if it's \"main\").\n  ) {}\n\n  async getStatus(\n    bitIds: ComponentID[] // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatus[]> {\n    if (!this.currentLane && this.otherLane) {\n      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());\n    }\n    const componentStatusBeforeMergeAttempt = await mapSeries(bitIds, (id) =>\n      this.getComponentStatusBeforeMergeAttempt(id)\n    );\n    // whether or not we need to import the gap between the common-snap and the other lane.\n    // the common-snap itself we need anyway in order to get the files hash/content for checking conflicts.\n    const shouldImportHistoryOfOtherLane =\n      !this.options?.shouldSquash && // when squashing, no need for all history, only the head is going to be pushed\n      (!this.currentLane || // on main. we need all history in order to push each component to its remote\n        this.currentLane.scope !== this.otherLane?.scope); // on lane, but the other lane is from a different scope. we need all history in order to push to the current lane's scope\n    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = [compStatus.divergeData.commonSnapBeforeDiverge];\n        if (shouldImportHistoryOfOtherLane) {\n          versionsToImport.push(...compStatus.divergeData.snapsOnTargetOnly);\n        }\n        return compact(versionsToImport).map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n    const reason = shouldImportHistoryOfOtherLane\n      ? `for filling the gap between the common-snap and the head of ${this.otherLane?.id() || 'main'}`\n      : `for getting the common-snap between ${this.currentLane?.id() || 'main'} and ${this.otherLane?.id() || 'main'}`;\n    await this.scope.legacyScope.scopeImporter.importWithoutDeps(ComponentIdList.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\n      reason,\n    });\n\n    const compStatusNotNeedMerge = componentStatusBeforeMergeAttempt.filter(\n      (c) => !c.mergeProps\n    ) as ComponentMergeStatus[];\n    const compStatusNeedMerge = componentStatusBeforeMergeAttempt.filter((c) => c.mergeProps);\n\n    const getComponentsStatusNeedMerge = async (): Promise<ComponentMergeStatus[]> => {\n      const tmp = new Tmp(this.scope.legacyScope);\n      try {\n        const componentsStatus = await Promise.all(\n          compStatusNeedMerge.map((compStatus) => this.getComponentMergeStatus(compStatus))\n        );\n        await tmp.clear();\n        return componentsStatus;\n      } catch (err: any) {\n        await tmp.clear();\n        throw err;\n      }\n    };\n    const results = await getComponentsStatusNeedMerge();\n\n    results.push(...compStatusNotNeedMerge);\n    return results;\n  }\n\n  private async getComponentMergeStatus(\n    componentMergeStatusBeforeMergeAttempt: ComponentMergeStatusBeforeMergeAttempt\n  ) {\n    const { id, divergeData, currentComponent, mergeProps } = componentMergeStatusBeforeMergeAttempt;\n    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);\n    const { otherLaneHead, currentId, modelComponent } = mergeProps;\n    const repo = this.scope.legacyScope.objects;\n    if (!divergeData) throw new Error(`getDivergedMergeStatus, divergeData is missing for ${id.toString()}`);\n    if (!currentComponent) throw new Error(`getDivergedMergeStatus, currentComponent is missing for ${id.toString()}`);\n\n    const baseSnap = divergeData.commonSnapBeforeDiverge as Ref; // must be set when isTrueMerge\n    this.logger.debug(`merging snaps details:\nid:      ${id.toStringWithoutVersion()}\nbase:    ${baseSnap.toString()}\ncurrent: ${currentId.version}\nother:   ${otherLaneHead.toString()}`);\n    const baseComponent: Version = await modelComponent.loadVersion(baseSnap.toString(), repo);\n    const otherComponent: Version = await modelComponent.loadVersion(otherLaneHead.toString(), repo);\n\n    const currentLaneName = this.currentLane?.toLaneId().toString() || 'main';\n    const otherLaneName = this.otherLane ? this.otherLane.toLaneId().toString() : DEFAULT_LANE;\n    const currentLabel = `${currentId.version} (${currentLaneName === otherLaneName ? 'current' : currentLaneName})`;\n    const otherLabel = `${otherLaneHead.toString()} (${\n      otherLaneName === currentLaneName ? 'incoming' : otherLaneName\n    })`;\n    const workspaceIds = (await this.workspace?.listIds()) || this.currentLane?.toComponentIds() || [];\n    const configMerger = new ComponentConfigMerger(\n      id.toStringWithoutVersion(),\n      workspaceIds,\n      this.otherLane,\n      currentComponent.extensions,\n      baseComponent.extensions,\n      otherComponent.extensions,\n      currentLabel,\n      otherLabel,\n      this.logger,\n      this.options.mergeStrategy\n    );\n    const configMergeResult = configMerger.merge();\n\n    const mergeResults = await threeWayMerge({\n      scope: this.scope.legacyScope,\n      otherComponent,\n      otherLabel,\n      currentComponent,\n      currentLabel,\n      baseComponent,\n    });\n    return {\n      currentComponent,\n      id,\n      mergeResults,\n      divergeData,\n      configMergeResult,\n    };\n  }\n\n  private returnUnmerged(\n    id: ComponentID,\n    msg: string,\n    unmergedLegitimately = false\n  ): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unchangedMessage = msg;\n    componentStatus.unchangedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: ComponentID // the id.version is the version we want to merge to the current component\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const consumer = this.workspace?.consumer;\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    const modelComponent = await this.scope.legacyScope.getModelComponentIfExist(id);\n    if (!modelComponent) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toString()} is on the lane/main but its objects were not found, please re-import the lane`\n      );\n    }\n    const unmerged = this.scope.legacyScope.objects.unmergedComponents.getEntry(id);\n    if (unmerged) {\n      return this.returnUnmerged(\n        id,\n        `component ${id.toStringWithoutVersion()} is in during-merge state a previous merge, please snap/tag it first (or use bit merge --resolve/--abort/ bit lane merge-abort)`\n      );\n    }\n    const repo = this.scope.legacyScope.objects;\n    const version = id.version as string;\n    const otherLaneHead = modelComponent.getRef(version);\n    const existingBitMapId = consumer?.bitMap.getComponentIdIfExist(id, { ignoreVersion: true });\n    const componentOnOther: Version = await modelComponent.loadVersion(version, this.scope.legacyScope.objects);\n    const idOnCurrentLane = this.currentLane?.getComponent(id);\n\n    if (componentOnOther.isRemoved()) {\n      // if exist in current lane, we want the current lane to get the soft-remove update.\n      // or if it was removed with --update-main, we want to merge it so then main will get the update.\n      const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();\n      if (shouldMerge) {\n        // remove the component from the workspace if exist.\n        componentStatus.shouldBeRemoved = true;\n      } else {\n        // on main, don't merge soft-removed components unless it's marked with removeOnMain.\n        // on lane, if it's not part of the current lane, don't merge it.\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n    const getCurrentId = () => {\n      if (existingBitMapId) return existingBitMapId;\n      if (this.currentLane) {\n        if (!idOnCurrentLane) return null;\n        return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());\n      }\n      // it's on main\n      const head = modelComponent.getHeadAsTagIfExist();\n      if (head) {\n        return id.changeVersion(head);\n      }\n      return null;\n    };\n    const currentId = getCurrentId();\n    if (!currentId) {\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      return { ...componentStatus, componentFromModel: componentOnOther, divergeData };\n    }\n    const getCurrentComponent = () => {\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n      if (existingBitMapId) return consumer!.loadComponent(existingBitMapId);\n      return this.scope.legacyScope.getConsumerComponent(currentId);\n    };\n    const currentComponent = await getCurrentComponent();\n    if (currentComponent.isRemoved()) {\n      // we have a few options:\n      // 1. \"other\" is main. in this case, we don't care what happens on main, we want the component to stay deleted on\n      // this lane. (even when main is ahead, we don't want to merge it).\n      // 2. other is ahead. in this case, other recovered the component. so we can continue with the merge.\n      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the\n      // merge-config will show a config conflict of the remove aspect.\n      // 3. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      const isTargetNotAhead = !divergeData.err && !divergeData.isTargetAhead();\n      const shouldIgnore = this.otherLane\n        ? isTargetNotAhead // option #2 and #3 above\n        : true; // it's main. option #1 above.\n      if (shouldIgnore) {\n        return this.returnUnmerged(id, `component has been removed`, true);\n      }\n    }\n\n    const isModified = async (): Promise<undefined | 'code' | 'config'> => {\n      if (!consumer || !this.workspace) return undefined;\n      const componentModificationStatus = await this.workspace.getComponentStatusById(currentComponent.id);\n      if (!componentModificationStatus.modified) return undefined;\n      if (!existingBitMapId) return undefined;\n      const baseComponent = await modelComponent.loadVersion(\n        existingBitMapId.version as string,\n        consumer.scope.objects\n      );\n      const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);\n      if (isSourceCodeModified) return 'code';\n      return 'config';\n    };\n\n    const modifiedType = await isModified();\n    if (modifiedType === 'config' && !this.options?.ignoreConfigChanges) {\n      return this.returnUnmerged(\n        id,\n        `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`\n      );\n    }\n    if (modifiedType === 'code') {\n      return this.returnUnmerged(id, `component is modified, please snap/tag it first`);\n    }\n\n    if (!otherLaneHead) {\n      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);\n    }\n    const divergeData = await getDivergeData({\n      repo,\n      modelComponent,\n      sourceHead: this.workspace ? undefined : modelComponent.getRef(currentId.version as string), // not sure if needs to check for this.workspace\n      targetHead: otherLaneHead,\n      throws: false,\n    });\n    if (divergeData.err) {\n      if (!(divergeData.err instanceof NoCommonSnap) || !this.options?.resolveUnrelated) {\n        return this.returnUnmerged(id, `unable to traverse history. error: ${divergeData.err.message}`);\n      }\n      return this.handleNoCommonSnap(\n        modelComponent,\n        id,\n        otherLaneHead,\n        currentComponent,\n        componentOnOther,\n        divergeData\n      );\n    }\n    if (!divergeData.isDiverged()) {\n      if (divergeData.isSourceAhead()) {\n        // component is ahead nothing to merge.\n        return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n      }\n      if (divergeData.isTargetAhead()) {\n        // just override with the model data\n        return {\n          ...componentStatus,\n          currentComponent,\n          componentFromModel: componentOnOther,\n          divergeData,\n        };\n      }\n      // we know that localHead and remoteHead are set, so if none of them is ahead they must be equal\n      return this.returnUnmerged(id, compIsAlreadyMergedMsg, true);\n    }\n\n    // it's diverged and needs merge operation\n    const mergeProps = {\n      otherLaneHead,\n      currentId,\n      modelComponent,\n    };\n\n    return { ...componentStatus, currentComponent, mergeProps, divergeData };\n  }\n\n  private async handleNoCommonSnap(\n    modelComponent: ModelComponent,\n    id: ComponentID,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    let { resolveUnrelated } = this.options || {};\n    if (currentComponent.isRemoved()) {\n      resolveUnrelated = 'theirs';\n    }\n    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);\n    const repo = this.scope.legacyScope.objects;\n    const mainHead = modelComponent.head;\n\n    const returnAccordingToOurs = (\n      headToSaveInLane: Ref,\n      unrelatedHead: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      return {\n        currentComponent,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'ours',\n          headOnCurrentLane: headToSaveInLane,\n          unrelatedHead,\n          unrelatedLaneId,\n        },\n      };\n    };\n    const returnAccordingToTheirs = (\n      resolvedRef: Ref,\n      unrelatedHeadRef: Ref,\n      unrelatedLaneId: LaneId\n    ): ComponentMergeStatusBeforeMergeAttempt => {\n      // just override with the model data\n      return {\n        currentComponent,\n        componentFromModel: componentOnOther,\n        id,\n        divergeData,\n        resolvedUnrelated: {\n          strategy: 'theirs',\n          headOnCurrentLane: resolvedRef,\n          unrelatedHead: unrelatedHeadRef,\n          unrelatedLaneId,\n        },\n      };\n    };\n\n    const currentVersionRef = modelComponent.getRef(currentComponent.id.version as string);\n    if (!currentVersionRef)\n      throw new Error(\n        `handleNoCommonSnap, unable to get ref of current version \"${\n          currentComponent.id.version\n        }\" for \"${id.toString()}\"`\n      );\n    const otherVersionRef = modelComponent.getRef(id.version as string);\n    if (!otherVersionRef)\n      throw new Error(`handleNoCommonSnap, unable to get ref of other version \"${id.version}\" for \"${id.toString()}\"`);\n\n    if (mainHead) {\n      const hasResolvedFromMain = async (hashToCompare: Ref | null) => {\n        const divergeDataFromMain = await getDivergeData({\n          repo,\n          modelComponent,\n          sourceHead: hashToCompare,\n          targetHead: mainHead,\n          throws: false,\n        });\n        if (!divergeDataFromMain.err) return true;\n        return !(divergeDataFromMain.err instanceof NoCommonSnap);\n      };\n      const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane() as Ref);\n      const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);\n      if (!hasResolvedLocally && !hasResolvedRemotely) {\n        return this.returnUnmerged(\n          id,\n          `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.\nit was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`\n        );\n      }\n      const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;\n      const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;\n      if (resolveUnrelated === 'ours') {\n        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      if (resolveUnrelated === 'theirs') {\n        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n      }\n      throw new Error(\n        `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n      );\n    }\n\n    const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;\n    const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;\n    if (resolveUnrelated === 'ours') {\n      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, this.otherLane?.toLaneId() as LaneId);\n    }\n    if (resolveUnrelated === 'theirs') {\n      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, this.currentLane?.toLaneId() as LaneId);\n    }\n    throw new Error(\n      `unsupported strategy \"${resolveUnrelated}\" of resolve-unrelated. supported strategies are: [ours, theirs]`\n    );\n  }\n}\n"],"mappings":"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"}

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

@@ -20,6 +20,7 @@ import { CheckoutMain, ComponentStatusBase } from '@teambit/checkout';
 import { ConfigMergerMain, ConfigMergeResult, WorkspaceConfigUpdateResult } from '@teambit/config-merger';
 import { SnapsDistance } from '@teambit/legacy/dist/scope/component-ops/snaps-distance';
 import { InstallMain } from '@teambit/install';
+import { ScopeMain } from '@teambit/scope';
 import { MergeStatusProviderOptions } from './merge-status-provider';
 type ResolveUnrelatedData = {
     strategy: MergeStrategy;
@@ -50,6 +51,12 @@ export type FailedComponents = {
 export type FilesStatus = {
     [fileName: string]: keyof typeof FileStatus;
 };
+export type MergeSnapResults = {
+    snappedComponents: ConsumerComponent[];
+    autoSnappedResults: AutoTagResult[];
+    removedComponents?: ComponentIdList;
+    exportedIds?: ComponentID[];
+} | null;
 export type ApplyVersionResult = {
     id: ComponentID;
     filesStatus: FilesStatus;
@@ -62,11 +69,7 @@ export type ApplyVersionResults = {
     addedComponents?: ComponentID[];
     resolvedComponents?: ConsumerComponent[];
     abortedComponents?: ApplyVersionResult[];
-    mergeSnapResults?: {
-        snappedComponents: ConsumerComponent[];
-        autoSnappedResults: AutoTagResult[];
-        removedComponents?: ComponentIdList;
-    } | null;
+    mergeSnapResults?: MergeSnapResults;
     mergeSnapError?: Error;
     leftUnresolvedConflicts?: boolean;
     verbose?: boolean;
@@ -78,6 +81,7 @@ export type ApplyVersionResults = {
 };
 export declare class MergingMain {
     private workspace;
+    private scope;
     private install;
     private snapping;
     private checkout;
@@ -87,7 +91,7 @@ export declare class MergingMain {
     private config;
     private remove;
     private configMerger;
-    constructor(workspace: Workspace, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain);
+    constructor(workspace: Workspace, scope: ScopeMain, install: InstallMain, snapping: SnappingMain, checkout: CheckoutMain, logger: Logger, componentWriter: ComponentWriterMain, importer: ImporterMain, config: ConfigMain, remove: RemoveMain, configMerger: ConfigMergerMain);
     merge(ids: string[], mergeStrategy: MergeStrategy, abort: boolean, resolve: boolean, noSnap: boolean, message: string, build: boolean, skipDependencyInstallation: boolean): Promise<ApplyVersionResults>;
     /**
      * when user is on main, it merges the remote main components into local.
@@ -129,9 +133,10 @@ export declare class MergingMain {
     static slots: never[];
     static dependencies: import("@teambit/harmony").Aspect[];
     static runtime: import("@teambit/harmony").RuntimeDefinition;
-    static provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [
+    static provider([cli, workspace, scope, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [
         CLIMain,
         Workspace,
+        ScopeMain,
         SnappingMain,
         CheckoutMain,
         InstallMain,