@teambit/merging 0.0.455 → 0.0.457

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

@@ -0,0 +1,25 @@
+import { Workspace } from '@teambit/workspace';
+import { BitId } from '@teambit/legacy/dist/bit-id';
+import { Lane } from '@teambit/legacy/dist/scope/models';
+import { ImporterMain } from '@teambit/importer';
+import { Logger } from '@teambit/logger';
+import { ComponentMergeStatus } from './merging.main.runtime';
+export declare class MergeStatusProvider {
+    private workspace;
+    private logger;
+    private importer;
+    private currentLane?;
+    private otherLane?;
+    private options?;
+    constructor(workspace: Workspace, logger: Logger, importer: ImporterMain, currentLane?: Lane | undefined, // currently checked out lane. if on main, then it's undefined.
+    otherLane?: Lane | undefined, // the lane we want to merged to our lane. (undefined if it's "main").
+    options?: {
+        resolveUnrelated?: "manual" | "ours" | "theirs" | undefined;
+        ignoreConfigChanges?: boolean | undefined;
+    } | undefined);
+    getStatus(bitIds: BitId[]): Promise<ComponentMergeStatus[]>;
+    private getComponentMergeStatus;
+    private returnUnmerged;
+    private getComponentStatusBeforeMergeAttempt;
+    private handleNoCommonSnap;
+}

package/dist/merge-status-provider.js

@@ -0,0 +1,415 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+require("core-js/modules/es.array.flat.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.unscopables.flat.js");
+require("core-js/modules/es.promise.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MergeStatusProvider = void 0;
+function _defineProperty2() {
+  const data = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+  _defineProperty2 = function () {
+    return data;
+  };
+  return data;
+}
+function _pMapSeries() {
+  const data = _interopRequireDefault(require("p-map-series"));
+  _pMapSeries = function () {
+    return data;
+  };
+  return data;
+}
+function _bitId() {
+  const data = require("@teambit/legacy/dist/bit-id");
+  _bitId = function () {
+    return data;
+  };
+  return data;
+}
+function _laneId() {
+  const data = require("@teambit/lane-id");
+  _laneId = function () {
+    return data;
+  };
+  return data;
+}
+function _getDivergeData() {
+  const data = require("@teambit/legacy/dist/scope/component-ops/get-diverge-data");
+  _getDivergeData = function () {
+    return data;
+  };
+  return data;
+}
+function _repositories() {
+  const data = require("@teambit/legacy/dist/scope/repositories");
+  _repositories = function () {
+    return data;
+  };
+  return data;
+}
+function _lodash() {
+  const data = require("lodash");
+  _lodash = function () {
+    return data;
+  };
+  return data;
+}
+function _threeWayMerge() {
+  const data = _interopRequireDefault(require("@teambit/legacy/dist/consumer/versions-ops/merge-version/three-way-merge"));
+  _threeWayMerge = function () {
+    return data;
+  };
+  return data;
+}
+function _noCommonSnap() {
+  const data = require("@teambit/legacy/dist/scope/exceptions/no-common-snap");
+  _noCommonSnap = function () {
+    return data;
+  };
+  return data;
+}
+function _configMerger() {
+  const data = require("./config-merger");
+  _configMerger = function () {
+    return data;
+  };
+  return data;
+}
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2().default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+class MergeStatusProvider {
+  constructor(workspace, logger, importer, 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").
+  options) {
+    this.workspace = workspace;
+    this.logger = logger;
+    this.importer = importer;
+    this.currentLane = currentLane;
+    this.otherLane = otherLane;
+    this.options = options;
+  }
+  async getStatus(bitIds) {
+    if (!this.currentLane && this.otherLane) {
+      await this.importer.importObjectsFromMainIfExist(this.otherLane.toBitIds().toVersionLatest());
+    }
+    const componentStatusBeforeMergeAttempt = await (0, _pMapSeries().default)(bitIds, id => this.getComponentStatusBeforeMergeAttempt(id));
+    const toImport = componentStatusBeforeMergeAttempt.map(compStatus => {
+      if (!compStatus.divergeData) return [];
+      const versionsToImport = (0, _lodash().compact)([...compStatus.divergeData.snapsOnTargetOnly, compStatus.divergeData.commonSnapBeforeDiverge]);
+      return versionsToImport.map(v => compStatus.id.changeVersion(v.toString()));
+    }).flat();
+    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(_bitId().BitIds.fromArray(toImport), {
+      lane: this.otherLane,
+      cache: true,
+      includeVersionHistory: false
+    });
+    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);
+      try {
+        const componentsStatus = await Promise.all(compStatusNeedMerge.map(compStatus => this.getComponentMergeStatus(compStatus)));
+        await tmp.clear();
+        return componentsStatus;
+      } catch (err) {
+        await tmp.clear();
+        throw err;
+      }
+    };
+    const results = await getComponentsStatusNeedMerge();
+    results.push(...compStatusNotNeedMerge);
+    return results;
+  }
+  async getComponentMergeStatus(componentMergeStatusBeforeMergeAttempt) {
+    var _this$currentLane;
+    const {
+      id,
+      divergeData,
+      currentComponent,
+      mergeProps
+    } = componentMergeStatusBeforeMergeAttempt;
+    if (!mergeProps) throw new Error(`getDivergedMergeStatus, mergeProps is missing for ${id.toString()}`);
+    const {
+      otherLaneHead,
+      currentId,
+      modelComponent
+    } = mergeProps;
+    const repo = this.workspace.consumer.scope.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
+    this.logger.debug(`merging snaps details:
+id:      ${id.toStringWithoutVersion()}
+base:    ${baseSnap.toString()}
+current: ${currentId.version}
+other:   ${otherLaneHead.toString()}`);
+    const baseComponent = await modelComponent.loadVersion(baseSnap.toString(), repo);
+    const otherComponent = await modelComponent.loadVersion(otherLaneHead.toString(), repo);
+    const currentLaneName = ((_this$currentLane = this.currentLane) === null || _this$currentLane === void 0 ? void 0 : _this$currentLane.toLaneId().toString()) || 'main';
+    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 configMerger = new (_configMerger().ConfigMerger)(id.toStringWithoutVersion(), workspaceIds, this.otherLane, currentComponent.extensions, baseComponent.extensions, otherComponent.extensions, currentLabel, otherLabel, this.logger);
+    const configMergeResult = configMerger.merge();
+    const mergeResults = await (0, _threeWayMerge().default)({
+      consumer: this.workspace.consumer,
+      otherComponent,
+      otherLabel,
+      currentComponent,
+      currentLabel,
+      baseComponent
+    });
+    return {
+      currentComponent,
+      id,
+      mergeResults,
+      divergeData,
+      configMergeResult
+    };
+  }
+  returnUnmerged(id, msg, unmergedLegitimately = false) {
+    const componentStatus = {
+      id
+    };
+    componentStatus.unmergedMessage = msg;
+    componentStatus.unmergedLegitimately = unmergedLegitimately;
+    return componentStatus;
+  }
+  async getComponentStatusBeforeMergeAttempt(id) {
+    var _this$currentLane2, _this$options;
+    const consumer = this.workspace.consumer;
+    const componentStatus = {
+      id
+    };
+    const modelComponent = await consumer.scope.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.name);
+    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 version = id.version;
+    const otherLaneHead = modelComponent.getRef(version);
+    const existingBitMapId = consumer.bitMap.getBitIdIfExist(id, {
+      ignoreVersion: true
+    });
+    const componentOnOther = await modelComponent.loadVersion(version, consumer.scope.objects);
+    const idOnCurrentLane = (_this$currentLane2 = this.currentLane) === null || _this$currentLane2 === void 0 ? void 0 : _this$currentLane2.getComponent(id);
+    if (componentOnOther.isRemoved()) {
+      // if exist in current lane, we want the current lane to get the soft-remove update.
+      // or if it was removed with --update-main, we want to merge it so then main will get the update.
+      const shouldMerge = idOnCurrentLane || componentOnOther.shouldRemoveFromMain();
+      if (shouldMerge) {
+        // remove the component from the workspace if exist.
+        componentStatus.shouldBeRemoved = true;
+      } else {
+        // on main, don't merge soft-removed components unless it's marked with removeOnMain.
+        // on lane, if it's not part of the current lane, don't merge it.
+        return this.returnUnmerged(id, `component has been removed`, true);
+      }
+    }
+    const getCurrentId = () => {
+      if (existingBitMapId) return existingBitMapId;
+      if (this.currentLane) {
+        if (!idOnCurrentLane) return null;
+        return idOnCurrentLane.id.changeVersion(idOnCurrentLane.head.toString());
+      }
+      // it's on main
+      const head = modelComponent.getHeadAsTagIfExist();
+      if (head) {
+        return id.changeVersion(head);
+      }
+      return null;
+    };
+    const currentId = getCurrentId();
+    if (!currentId) {
+      const divergeData = await (0, _getDivergeData().getDivergeData)({
+        repo,
+        modelComponent,
+        targetHead: otherLaneHead,
+        throws: false
+      });
+      return _objectSpread(_objectSpread({}, componentStatus), {}, {
+        componentFromModel: componentOnOther,
+        divergeData
+      });
+    }
+    const getCurrentComponent = () => {
+      if (existingBitMapId) return consumer.loadComponent(existingBitMapId);
+      return consumer.scope.getConsumerComponent(currentId);
+    };
+    const currentComponent = await getCurrentComponent();
+    if (currentComponent.isRemoved()) {
+      // we have a few options:
+      // 1. other is ahead. in this case, other recovered the component. so we can continue with the merge.
+      // it is possible that it is diverged, in which case, still continue with the merge, and later on, the
+      // merge-config will show a config conflict of the remove aspect.
+      // 2. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.
+      // 3. there are errors when calculating the divergeData, e.g. no snap in common. in such cases, we assume
+      // there are issues with this component, and is better not to merge it.
+      const divergeData = await (0, _getDivergeData().getDivergeData)({
+        repo,
+        modelComponent,
+        targetHead: otherLaneHead,
+        throws: false
+      });
+      if (divergeData.err || !divergeData.isTargetAhead()) {
+        return this.returnUnmerged(id, `component has been removed`, true);
+      }
+    }
+    const isModified = async () => {
+      const componentModificationStatus = await consumer.getComponentStatusById(currentComponent.id);
+      if (!componentModificationStatus.modified) return undefined;
+      if (!existingBitMapId) return undefined;
+      const baseComponent = await modelComponent.loadVersion(existingBitMapId.version, consumer.scope.objects);
+      const isSourceCodeModified = await consumer.isComponentSourceCodeModified(baseComponent, currentComponent);
+      if (isSourceCodeModified) return 'code';
+      return 'config';
+    };
+    const modifiedType = await isModified();
+    if (modifiedType === 'config' && !((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.ignoreConfigChanges)) {
+      return this.returnUnmerged(id, `component has config changes, please snap/tag it first. alternatively, use --ignore-config-changes flag to bypass`);
+    }
+    if (modifiedType === 'code') {
+      return this.returnUnmerged(id, `component is modified, please snap/tag it first`);
+    }
+    if (!otherLaneHead) {
+      throw new Error(`merging: unable finding a hash for the version ${version} of ${id.toString()}`);
+    }
+    const divergeData = await (0, _getDivergeData().getDivergeData)({
+      repo,
+      modelComponent,
+      targetHead: otherLaneHead,
+      throws: false
+    });
+    if (divergeData.err) {
+      var _this$options2;
+      if (!(divergeData.err instanceof _noCommonSnap().NoCommonSnap) || !((_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.resolveUnrelated)) {
+        return this.returnUnmerged(id, `unable to traverse ${currentComponent.id.toString()} 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);
+      }
+      if (divergeData.isTargetAhead()) {
+        // just override with the model data
+        return _objectSpread(_objectSpread({}, componentStatus), {}, {
+          currentComponent,
+          componentFromModel: componentOnOther,
+          divergeData
+        });
+      }
+      // 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);
+    }
+
+    // it's diverged and needs merge operation
+    const mergeProps = {
+      otherLaneHead,
+      currentId,
+      modelComponent
+    };
+    return _objectSpread(_objectSpread({}, componentStatus), {}, {
+      currentComponent,
+      mergeProps,
+      divergeData
+    });
+  }
+  async handleNoCommonSnap(modelComponent, id, otherLaneHead, currentComponent, componentOnOther, divergeData) {
+    const {
+      resolveUnrelated
+    } = this.options || {};
+    if (!resolveUnrelated) throw new Error(`handleNoCommonSnap expects resolveUnrelated to be set`);
+    const consumer = this.workspace.consumer;
+    const repo = consumer.scope.objects;
+    const mainHead = modelComponent.head;
+    const returnAccordingToOurs = (headToSaveInLane, unrelatedHead, unrelatedLaneId) => {
+      return {
+        currentComponent,
+        id,
+        divergeData,
+        resolvedUnrelated: {
+          strategy: 'ours',
+          headOnCurrentLane: headToSaveInLane,
+          unrelatedHead,
+          unrelatedLaneId
+        }
+      };
+    };
+    const returnAccordingToTheirs = (resolvedRef, unrelatedHeadRef, unrelatedLaneId) => {
+      // just override with the model data
+      return {
+        currentComponent,
+        componentFromModel: componentOnOther,
+        id,
+        divergeData,
+        resolvedUnrelated: {
+          strategy: 'theirs',
+          headOnCurrentLane: resolvedRef,
+          unrelatedHead: unrelatedHeadRef,
+          unrelatedLaneId
+        }
+      };
+    };
+    const currentVersionRef = modelComponent.getRef(currentComponent.id.version);
+    if (!currentVersionRef) throw new Error(`handleNoCommonSnap, unable to get ref of current version "${currentComponent.id.version}" for "${id.toString()}"`);
+    const otherVersionRef = modelComponent.getRef(id.version);
+    if (!otherVersionRef) throw new Error(`handleNoCommonSnap, unable to get ref of other version "${id.version}" for "${id.toString()}"`);
+    if (mainHead) {
+      const hasResolvedFromMain = async hashToCompare => {
+        const divergeDataFromMain = await (0, _getDivergeData().getDivergeData)({
+          repo,
+          modelComponent,
+          sourceHead: hashToCompare,
+          targetHead: mainHead,
+          throws: false
+        });
+        if (!divergeDataFromMain.err) return true;
+        return !(divergeDataFromMain.err instanceof _noCommonSnap().NoCommonSnap);
+      };
+      const hasResolvedLocally = await hasResolvedFromMain(modelComponent.getHeadRegardlessOfLane());
+      const hasResolvedRemotely = await hasResolvedFromMain(otherLaneHead);
+      if (!hasResolvedLocally && !hasResolvedRemotely) {
+        return this.returnUnmerged(id, `unable to traverse ${currentComponent.id.toString()} history. the main-head ${mainHead.toString()} doesn't appear in both lanes.
+it was probably created in each lane separately and it also exists on main. please merge main first to one of these lanes`);
+      }
+      const refToSaveInLane = hasResolvedLocally ? currentVersionRef : otherVersionRef;
+      const unrelatedHeadRef = hasResolvedLocally ? otherVersionRef : currentVersionRef;
+      if (resolveUnrelated === 'ours') {
+        var _this$currentLane3;
+        return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, (_this$currentLane3 = this.currentLane) === null || _this$currentLane3 === void 0 ? void 0 : _this$currentLane3.toLaneId());
+      }
+      if (resolveUnrelated === 'theirs') {
+        var _this$currentLane4;
+        return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, (_this$currentLane4 = this.currentLane) === null || _this$currentLane4 === void 0 ? void 0 : _this$currentLane4.toLaneId());
+      }
+      throw new Error(`unsupported strategy "${resolveUnrelated}" of resolve-unrelated. supported strategies are: [ours, theirs]`);
+    }
+    const refToSaveInLane = resolveUnrelated === 'ours' ? currentVersionRef : otherVersionRef;
+    const unrelatedHeadRef = resolveUnrelated === 'ours' ? otherVersionRef : currentVersionRef;
+    if (resolveUnrelated === 'ours') {
+      var _this$otherLane;
+      return returnAccordingToOurs(refToSaveInLane, unrelatedHeadRef, (_this$otherLane = this.otherLane) === null || _this$otherLane === void 0 ? void 0 : _this$otherLane.toLaneId());
+    }
+    if (resolveUnrelated === 'theirs') {
+      var _this$currentLane5;
+      return returnAccordingToTheirs(refToSaveInLane, unrelatedHeadRef, (_this$currentLane5 = this.currentLane) === null || _this$currentLane5 === void 0 ? void 0 : _this$currentLane5.toLaneId());
+    }
+    throw new Error(`unsupported strategy "${resolveUnrelated}" of resolve-unrelated. supported strategies are: [ours, theirs]`);
+  }
+}
+exports.MergeStatusProvider = MergeStatusProvider;
+
+//# sourceMappingURL=merge-status-provider.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_bitId","_laneId","_getDivergeData","_repositories","_lodash","_threeWayMerge","_noCommonSnap","_configMerger","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","MergeStatusProvider","constructor","workspace","logger","importer","currentLane","otherLane","options","getStatus","bitIds","importObjectsFromMainIfExist","toBitIds","toVersionLatest","componentStatusBeforeMergeAttempt","mapSeries","id","getComponentStatusBeforeMergeAttempt","toImport","map","compStatus","divergeData","versionsToImport","compact","snapsOnTargetOnly","commonSnapBeforeDiverge","v","changeVersion","toString","flat","consumer","scope","scopeImporter","importWithoutDeps","BitIds","fromArray","lane","cache","includeVersionHistory","compStatusNotNeedMerge","c","mergeProps","compStatusNeedMerge","getComponentsStatusNeedMerge","tmp","Tmp","componentsStatus","Promise","all","getComponentMergeStatus","clear","err","results","componentMergeStatusBeforeMergeAttempt","_this$currentLane","currentComponent","Error","otherLaneHead","currentId","modelComponent","repo","objects","baseSnap","debug","toStringWithoutVersion","version","baseComponent","loadVersion","otherComponent","currentLaneName","toLaneId","otherLaneName","DEFAULT_LANE","currentLabel","otherLabel","workspaceIds","listIds","configMerger","ConfigMerger","extensions","configMergeResult","merge","mergeResults","threeWayMerge","returnUnmerged","msg","unmergedLegitimately","componentStatus","unmergedMessage","_this$currentLane2","_this$options","getModelComponentIfExist","unmerged","unmergedComponents","getEntry","name","getRef","existingBitMapId","bitMap","getBitIdIfExist","ignoreVersion","componentOnOther","idOnCurrentLane","getComponent","isRemoved","shouldMerge","shouldRemoveFromMain","shouldBeRemoved","getCurrentId","head","getHeadAsTagIfExist","getDivergeData","targetHead","throws","componentFromModel","getCurrentComponent","loadComponent","getConsumerComponent","isTargetAhead","isModified","componentModificationStatus","getComponentStatusById","modified","undefined","isSourceCodeModified","isComponentSourceCodeModified","modifiedType","ignoreConfigChanges","_this$options2","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","_this$currentLane3","_this$currentLane4","_this$otherLane","_this$currentLane5","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 { BitId, BitIds } from '@teambit/legacy/dist/bit-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 { ConfigMerger } from './config-merger';\nimport { ComponentMergeStatus, ComponentMergeStatusBeforeMergeAttempt } from './merging.main.runtime';\n\nexport class MergeStatusProvider {\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private importer: ImporterMain,\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    private options?: { resolveUnrelated?: MergeStrategy; ignoreConfigChanges?: boolean }\n  ) {}\n\n  async getStatus(\n    bitIds: BitId[] // 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    const toImport = componentStatusBeforeMergeAttempt\n      .map((compStatus) => {\n        if (!compStatus.divergeData) return [];\n        const versionsToImport = compact([\n          ...compStatus.divergeData.snapsOnTargetOnly,\n          compStatus.divergeData.commonSnapBeforeDiverge,\n        ]);\n        return versionsToImport.map((v) => compStatus.id.changeVersion(v.toString()));\n      })\n      .flat();\n\n    await this.workspace.consumer.scope.scopeImporter.importWithoutDeps(BitIds.fromArray(toImport), {\n      lane: this.otherLane,\n      cache: true,\n      includeVersionHistory: false,\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 ConfigMerger(\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    );\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(id: BitId, msg: string, unmergedLegitimately = false): ComponentMergeStatusBeforeMergeAttempt {\n    const componentStatus: ComponentMergeStatusBeforeMergeAttempt = { id };\n    componentStatus.unmergedMessage = msg;\n    componentStatus.unmergedLegitimately = unmergedLegitimately;\n    return componentStatus;\n  }\n\n  private async getComponentStatusBeforeMergeAttempt(\n    id: BitId // 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.name);\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.getBitIdIfExist(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 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      // 2. other is not ahead. in this case, just ignore this component, no point to merge it, we want it removed.\n      // 3. there are errors when calculating the divergeData, e.g. no snap in common. in such cases, we assume\n      // there are issues with this component, and is better not to merge it.\n      const divergeData = await getDivergeData({ repo, modelComponent, targetHead: otherLaneHead, throws: false });\n      if (divergeData.err || !divergeData.isTargetAhead()) {\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 consumer.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: BitId,\n    otherLaneHead: Ref,\n    currentComponent: ConsumerComponent,\n    componentOnOther?: Version,\n    divergeData?: SnapsDistance\n  ): Promise<ComponentMergeStatusBeforeMergeAttempt> {\n    const { resolveUnrelated } = this.options || {};\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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"}

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

@@ -23,7 +23,9 @@ import { InstallMain } from '@teambit/install';
 import { ConfigMergeResult } from './config-merge-result';
 declare type ResolveUnrelatedData = {
     strategy: MergeStrategy;
-    head: Ref;
+    headOnCurrentLane: Ref;
+    unrelatedHead: Ref;
+    unrelatedLaneId: LaneId;
 };
 export declare type WorkspaceDepsUpdates = {
     [pkgName: string]: [string, string];
@@ -119,8 +121,6 @@ export declare class MergingMain {
         resolveUnrelated?: MergeStrategy;
         ignoreConfigChanges?: boolean;
     }): Promise<ComponentMergeStatus[]>;
-    private getComponentStatusBeforeMergeAttempt;
-    private getComponentMergeStatus;
     private applyVersion;
     private abortMerge;
     private resolveMerge;